Removed some DOS only code from other ports.

2006-02-15 00:27:53 +00:00
parent ad5d82cc0c
commit 0b6a01e206
17 changed files with 882 additions and 914 deletions
--- a/zsnes/src/Makefile.in
+++ b/zsnes/src/Makefile.in
@@ -74,8 +74,7 @@ VIDEOBJ=${VIDEODIR}/makev16b.o ${VIDEODIR}/makev16t.o ${VIDEODIR}/makevid.o\
 WINOBJ=${WINDIR}/copyvwin.o ${WINDIR}/sdlintrf.o ${WINDIR}/sdllink.o @GL_DRAW@\
 	${WINDIR}/sw_draw.o ${WINDIR}/zfilew.o

-WINDOSOBJ=${DOSDIR}/debug.o ${DOSDIR}/joy.o ${DOSDIR}/vesa2.o\
-	${DOSDIR}/initvid.o ${DOSDIR}/sw.o ${DOSDIR}/gppro.o ${DOSDIR}/vesa12.o
+WINDOSOBJ=${DOSDIR}/debug.o ${DOSDIR}/joy.o ${DOSDIR}/vesa2.o

 ZIPOBJ=${ZIPDIR}/unzip.o ${ZIPDIR}/zpng.o

@@ -196,11 +195,7 @@ ${CPUDIR}/tablec.o: ${CPUDIR}/tablec.asm macros.mac ${CPUDIR}/65816dc.inc\
 	${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816c.inc

 ${DOSDIR}/debug.o: ${DOSDIR}/debug.asm macros.mac
-${DOSDIR}/gppro.o: ${DOSDIR}/gppro.asm macros.mac
-${DOSDIR}/initvid.o: ${DOSDIR}/initvid.asm macros.mac ${DOSDIR}/vga.inc
 ${DOSDIR}/joy.o: ${DOSDIR}/joy.asm macros.mac
-${DOSDIR}/sw.o: ${DOSDIR}/sw.asm macros.mac
-${DOSDIR}/vesa12.o: ${DOSDIR}/vesa12.asm macros.mac
 ${DOSDIR}/vesa2.o: ${DOSDIR}/vesa2.asm macros.mac

 ${EFFECTSDIR}/burn.o: ${EFFECTSDIR}/burn.c
@@ -271,7 +266,7 @@ ${VIDEODIR}/sw_draw.o: ${VIDEODIR}/sw_draw.asm macros.mac
 ${WINDIR}/copyvwin.o: ${WINDIR}/copyvwin.asm macros.mac
 ${WINDIR}/gl_draw.o: ${WINDIR}/gl_draw.c gblhdr.h
 ${WINDIR}/sdlintrf.o: ${WINDIR}/sdlintrf.asm macros.mac
-${WINDIR}/sdllink.o: ${WINDIR}/sdllink.c gblhdr.h ${WINDIR}/sw_draw.h\
+${WINDIR}/sdllink.o: ${WINDIR}/sdllink.c asm_call.h gblhdr.h ${WINDIR}/sw_draw.h\
 	${WINDIR}/gl_draw.h
 ${WINDIR}/sw_draw.o: ${WINDIR}/sw_draw.c gblhdr.h
 ${WINDIR}/zfilew.o: ${WINDIR}/zfilew.c
--- a/zsnes/src/SConstruct
+++ b/zsnes/src/SConstruct
@@ -75,10 +75,6 @@ dossrc = Split('''
 	dos/debug.asm
 	dos/joy.asm
 	dos/vesa2.asm
-	dos/initvid.asm
-	dos/sw.asm
-	dos/gppro.asm
-	dos/vesa12.asm
 ''')
 effectssrc = Split('''
 	effects/burn.c
--- a/zsnes/src/cpu/execute.asm
+++ b/zsnes/src/cpu/execute.asm
@@ -35,7 +35,7 @@ EXTSYM tableadc,SA1UpdateDPage,Makemode7Table,nextmenupopup,MovieProcessing
 EXTSYM DosExit,InitDir,InitDrive,createnewcfg,sfxramdata,deinitvideo
 EXTSYM SFXEnable,wramdata,cycpbl,cycpblt,irqon,spcon
 EXTSYM multchange,romispal,scrndis,sprlefttot,sprleftpr,processsprites
-EXTSYM cachesprites,NextLineStart,FlipWait,LastLineStart,opcjmptab,CheatOn
+EXTSYM cachesprites,opcjmptab,CheatOn
 EXTSYM INTEnab,JoyCRead,NMIEnab,NumCheats,CurrentExecSA1,ReadInputDevice
 EXTSYM StartDrawNewGfx,VIRQLoc,cachevideo,cfield,cheatdata,curblank,curnmi
 EXTSYM curypos,cycpl,doirqnext,drawline,exechdma,hdmadelay,intrset,newengen
@@ -58,7 +58,7 @@ EXTSYM ResetDuringMovie,EMUPauseKey,INCRFrameKey,MovieWaiting,NoInputRead
 EXTSYM AllocatedRewindStates,PauseFrameMode,RestorePauseFrame,BackupPauseFrame

 %ifdef __MSDOS__
-EXTSYM dssel,Game60hzcall
+EXTSYM dssel,Game60hzcall,NextLineStart,FlipWait,LastLineStart
 %endif

 SECTION .data
@@ -763,6 +763,7 @@ NEWSYM exitloop
 ALIGN16

 %macro FlipCheck 0
+%ifdef __MSDOS__
   cmp byte[FlipWait],0
   je %%noflip
   push edx
@@ -787,6 +788,7 @@ ALIGN16
   pop eax
   pop edx
 %%noflip
+%endif
 %endmacro

 NEWSYM execute
--- a/zsnes/src/dos/dosintrf.asm
+++ b/zsnes/src/dos/dosintrf.asm
@@ -38,7 +38,7 @@ EXTSYM DSPDisable,SBInt,PICMaskP,SBIrq,SBHandler,InitSB,handler8h
 EXTSYM handler9h,init60hz,Interror,init18_2hz,DeInitSPC,GUIinit36_4hz
 EXTSYM GUIoldhand9s,GUIoldhand9o,GUIoldhand8s,GUIoldhand8o,GUIhandler9h
 EXTSYM GUIhandler8h,GUIinit18_2hz,dosmakepal,doschangepal,dosinitvideo
-EXTSYM dosinitvideo2,DosDrawScreen,cvidmode,vidbuffer,GUICPC,DosDrawScreenB
+EXTSYM DosDrawScreen,cvidmode,vidbuffer,GUICPC,DosDrawScreenB
 EXTSYM DOSClearScreen,DosUpdateDevices,DOSJoyRead,pl1contrl,pl2contrl,pl3contrl
 EXTSYM pl4contrl,pl5contrl
 EXTSYM GrayscaleMode
@@ -871,8 +871,6 @@ NEWSYM saveselectpal
 ; ** init video mode functions **
 NEWSYM initvideo  ; Returns 1 in videotroub if trouble occurs
    jmp dosinitvideo
-NEWSYM initvideo2 ; ModeQ scanline re-init (Keep blank on non-dos ports)
-    jmp dosinitvideo2
 NEWSYM deinitvideo
    mov al,[previdmode]
    mov ah,0
--- a/zsnes/src/dos/initvid.asm
+++ b/zsnes/src/dos/initvid.asm
@@ -22,23 +22,13 @@

 %include "macros.mac"

-EXTSYM InitVesa2,cbitmode,cvidmode,makepal,scanlines,selcA000,vesa2_bits
-EXTSYM vesa2_x,vesa2_y,vesa2selec,InitVesa12,videotroub
-
-%ifdef __MSDOS__
-EXTSYM cscopymodeq,cscopymodex
-%endif
-
-SECTION .bss
-
-NEWSYM clearfilter, resw 1
-NEWSYM res640, resb 1
-NEWSYM res480, resb 1
+EXTSYM InitVesa2,cbitmode,cvidmode,dosmakepal,scanlines,selcA000,vesa2_bits
+EXTSYM vesa2_x,vesa2_y,vesa2selec,InitVesa12,videotroub,cscopymodeq,cscopymodex
+EXTSYM res640,res480


 SECTION .text
-
-NEWSYM dosinitvideo2
+NEWSYM initvideo2
    cmp byte[cvidmode],2
    jne .nomodeq
    jmp dosinitvideo.initmodeq256
@@ -103,11 +93,9 @@ NEWSYM dosinitvideo
 ;*******************************************************

 .initmodeq224
-%ifdef __MSDOS__
    SetVGAMode .Mode256x224c
    call cscopymodeq
-%endif
-    call makepal
+    call dosmakepal
    ret

 ;*******************************************************
@@ -115,11 +103,9 @@ NEWSYM dosinitvideo
 ;*******************************************************

 .initmodeq240
-%ifdef __MSDOS__
    SetVGAMode .Mode256x240c
    call cscopymodeq
-%endif
-    call makepal
+    call dosmakepal
    ret

 ;*******************************************************
@@ -127,7 +113,6 @@ NEWSYM dosinitvideo
 ;*******************************************************

 .initmodeq256
-%ifdef __MSDOS__
    cmp byte[scanlines],1
    je near .scanlines
    SetVGAMode .Mode256x256c
@@ -137,8 +122,7 @@ NEWSYM dosinitvideo
    jmp .done
 .done
    call cscopymodeq
-%endif
-    call makepal
+    call dosmakepal
    ret


@@ -147,11 +131,9 @@ NEWSYM dosinitvideo
 ;*******************************************************

 .initmodex224
-%ifdef __MSDOS__
    SetVGAMode .Mode320x224
    call cscopymodex
-%endif
-    call makepal
+    call dosmakepal
    ret

 ;*******************************************************
@@ -159,11 +141,9 @@ NEWSYM dosinitvideo
 ;*******************************************************

 .initmodex240
-%ifdef __MSDOS__
    SetVGAMode .Mode320x240
    call cscopymodex
-%endif
-    call makepal
+    call dosmakepal
    ret

 ;*******************************************************
@@ -171,7 +151,6 @@ NEWSYM dosinitvideo
 ;*******************************************************

 .initmodex256
-%ifdef __MSDOS__
    cmp byte[scanlines],1
    je near .scanlines2
    SetVGAMode .Mode320x256
@@ -181,8 +160,7 @@ NEWSYM dosinitvideo
    jmp .done2
 .done2
    call cscopymodex
-%endif
-    call makepal
+    call dosmakepal
    ret


@@ -200,7 +178,7 @@ NEWSYM dosinitvideo
    jne .notrouble
    ret
 .notrouble
-    call makepal
+    call dosmakepal
    ; clear screen (320*240 bytes)
    push es
    mov ax,[vesa2selec]
@@ -258,7 +236,7 @@ NEWSYM dosinitvideo
    jne .notrouble3
    ret
 .notrouble3
-    call makepal
+    call dosmakepal
    ; clear screen (640*480 bytes)
    push es
    mov ax,[vesa2selec]
@@ -318,7 +296,7 @@ NEWSYM dosinitvideo
    jne .notrouble11
    ret
 .notrouble11
-    call makepal
+    call dosmakepal
    ; clear screen (800*600 bytes)
    push es
    mov ax,[vesa2selec]
@@ -377,7 +355,7 @@ NEWSYM dosinitvideo
    jne .notrouble5
    ret
 .notrouble5
-    call makepal
+    call dosmakepal
    ; clear screen (320*480 bytes)
    push es
    mov ax,[vesa2selec]
@@ -436,7 +414,7 @@ NEWSYM dosinitvideo
    jne .notrouble7
    ret
 .notrouble7
-    call makepal
+    call dosmakepal
    ; clear screen (512*384 bytes)
    push es
    mov ax,[vesa2selec]
@@ -494,7 +472,7 @@ NEWSYM dosinitvideo
    jne .notrouble9
    ret
 .notrouble9
-    call makepal
+    call dosmakepal
    ; clear screen (640*400 bytes)
    push es
    mov ax,[vesa2selec]
--- a/zsnes/src/dos/joy.asm
+++ b/zsnes/src/dos/joy.asm
@@ -22,11 +22,15 @@

 %include "macros.mac"

-EXTSYM WhichSW,_SW1,_SW2,_readSideWinder,_SWCount,_SW3,_SW4,delay,pl1contrl
+EXTSYM WhichSW,delay,pl1contrl
 EXTSYM pl2contrl,pl1p209,pl2p209,pl3p209,pl4p209,pl3contrl,pl4contrl,pressed
-EXTSYM read_gpp,pl5contrl,pl5p209,CalibXmin,CalibYmin,CalibXmax,CalibYmax
+EXTSYM pl5contrl,pl5p209,CalibXmin,CalibYmin,CalibXmax,CalibYmax
 EXTSYM CalibXmin209,CalibYmin209,CalibXmax209,CalibYmax209

+%ifdef __MSDOS__
+EXTSYM read_gpp,_readSideWinder,_SW1,_SW2,_SW3,_SW4,_SWCount
+%endif
+
 SECTION .data
 NEWSYM JoyAltrn2,  db 2
 SECTION .bss
@@ -188,6 +192,7 @@ NEWSYM GetCoords3
  sti
  ret

+%ifdef __MSDOS__
 NEWSYM DosUpdateDevices
    mov byte[PPad],0
    mov byte[JoyQuant],0
@@ -494,10 +499,6 @@ NEWSYM DosUpdateDevices
 .none2
    ret

-SECTION .data
-NEWSYM JoyReadControl, db 0
-SECTION .text
-
 JoyRead209:
   cmp byte[JoyAltrn],1
   jne near .noanalog
@@ -907,7 +908,7 @@ GamePadPro2:
 .error
   ret

-NEWSYM SideWinder
+SideWinder:
  mov al,[NumSWs]
  mov [_SWCount],al
  mov dx,201h
@@ -1089,7 +1090,7 @@ GamePadPro2209:
 .error
   ret

-NEWSYM SideWinder209
+SideWinder209:
  mov al,[NumSWs209]
  mov [_SWCount],al
  mov dx,209h
@@ -1223,7 +1224,7 @@ NEWSYM SideWinder209
 %%nobutton
 %endmacro

-NEWSYM GetParallelPlayer1
+GetParallelPlayer1:
    mov dx, 0378h
    mov byte[pressed+180h],0
    mov byte[pressed+181h],0
@@ -1251,7 +1252,7 @@ NEWSYM GetParallelPlayer1
    PPortHelp 0F9h, 40h, 18Bh
    ret

-NEWSYM GetParallelPlayer2
+GetParallelPlayer2:
    mov dx, 0378h
    mov byte[pressed+190h],0
    mov byte[pressed+191h],0
@@ -1279,7 +1280,7 @@ NEWSYM GetParallelPlayer2
    PPortHelp 0F9h, 20h, 19Bh
    ret

-NEWSYM GetParallelPlayer3
+GetParallelPlayer3:
    mov dx, 0378h
    mov byte[pressed+1A0h],0
    mov byte[pressed+1A1h],0
@@ -1307,7 +1308,7 @@ NEWSYM GetParallelPlayer3
    PPortHelp 0F9h, 10h, 1ABh
    ret

-NEWSYM GetParallelPlayer4
+GetParallelPlayer4:
    mov dx, 0378h
    mov byte[pressed+1B0h],0
    mov byte[pressed+1B1h],0
@@ -1335,7 +1336,7 @@ NEWSYM GetParallelPlayer4
    PPortHelp 0F9h, 08h, 1BBh
    ret

-NEWSYM GetParallelPlayer5
+GetParallelPlayer5:
    mov dx, 0378h
    mov byte[pressed+1c0h],0
    mov byte[pressed+1c1h],0
@@ -1674,3 +1675,4 @@ NEWSYM SetInputDevice209
 .nopp5
 .exit
    ret
+%endif
--- a/zsnes/src/dos/vesa12.asm
+++ b/zsnes/src/dos/vesa12.asm
@@ -91,8 +91,7 @@ NEWSYM InitVesa12
    mov edi,RMREGS
    mov dword[fs:0],'VBE1'      ; Request VBE 2.0 info
    mov dword[RMREGS.eax],4f00h
-	mov word[RMREGS.es],ax		; Real mode segment of DOS
-					; buffer
+    mov [RMREGS.es],ax      ; Real mode segment of DOS buffer
    mov dword[RMREGS.edi],0

    push es
@@ -491,10 +490,8 @@ NEWSYM InitVesa12
    cmp cx,[vesa2_x]
    je .correctwidth

-	mov eax,4f06h			; VBE Set/Get logical scan line
-					; length
-	mov ebx,0			; Set scan line length in
-					; pixels
+    mov eax,4f06h           ; VBE Set/Get logical scan line length
+    mov ebx,0               ; Set scan line length in pixels
    mov ecx, [vesa2_x]      ; Desired screen width
    int 10h
    cmp ax,04fh
--- a/zsnes/src/dos/vesa2.asm
+++ b/zsnes/src/dos/vesa2.asm
@@ -134,6 +134,7 @@ NEWSYM genfulladdtabng
    jnz .loopers
    ret

+%ifdef __MSDOS__
 NEWSYM VESA2EXITTODOS
    mov byte[videotroub],1
    cmp byte[ExitFromGUI],0
@@ -180,9 +181,7 @@ NEWSYM InitVesa2
    jmp VESA2EXITTODOS

 .gotmem
-	mov fs,dx			; FS now points to the DOS
-					; buffer
-
+    mov fs,dx   ; FS now points to the DOS buffer

    ;--------------------------------------------------;
     ; Now, get information about the video card into ;
@@ -192,8 +191,7 @@ NEWSYM InitVesa2
    mov edi,RMREGS
    mov dword[fs:0],'VBE2'   ; Request VBE 2.0 info
    mov dword[RMREGS.eax],4f00h
-	mov word[RMREGS.es],ax		; Real mode segment of DOS
-					; buffer
+    mov [RMREGS.es],ax       ; Real mode segment of DOS buffer
    mov dword[RMREGS.edi],0

    push es
@@ -573,16 +571,14 @@ NEWSYM InitVesa2
    ;---------------------------------------------;

    .linearavailable
-	or word[vesamode],4000h		; Convert mode to its LFB
-					; equivalent
+    or word[vesamode],4000h  ; Convert mode to its LFB equivalent
    mov ebx,[fs:28h]         ; Read in physical base ptr

    mov cx,bx
    shr ebx,16
    mov si,[noblocks]
-	xor edi,edi			; Since noblocks = number of
-					; 64k blocks, these lines leave
-					; si:di holding byte size
+    xor edi,edi         ; Since noblocks = number of 64k blocks,
+                        ; these lines leave si:di holding byte size
    mov eax,800h
    int 31h
    jnc .mappedphysicalarea
@@ -629,10 +625,8 @@ NEWSYM InitVesa2
    cmp cx,[vesa2_x]
    je .correctwidth

-	mov eax,4f06h			; VBE Set/Get logical scan line
-					; length
-	mov ebx,0			; Set scan line length in
-					; pixels
+    mov eax,4f06h           ; VBE Set/Get logical scan line length
+    mov ebx,0               ; Set scan line length in pixels
    mov ecx, [vesa2_x]      ; Desired screen width
    int 10h
    cmp ax,04fh
@@ -759,5 +753,4 @@ NEWSYM RMREGS
 .ss   resw 1
 .spare   times 20 resd 1
 ;----------------------------------------------------------------------
-
-
+%endif
--- a/zsnes/src/dos/vga.inc
+++ b/zsnes/src/dos/vga.inc
@@ -20,7 +20,6 @@

 ; by kode54, stainless

-%ifdef __MSDOS__
 %macro SetVGAMode 1
    mov byte[cbitmode],0

@@ -152,5 +151,3 @@ SECTION .data


 SECTION .text
-%endif
-
--- a/zsnes/src/gui/gui.asm
+++ b/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
--- a/zsnes/src/gui/guimisc.inc
+++ b/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
--- a/zsnes/src/gui/guimouse.inc
+++ b/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
--- a/zsnes/src/gui/guitools.inc
+++ b/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
--- a/zsnes/src/linux/sdlintrf.asm
+++ b/zsnes/src/linux/sdlintrf.asm
@@ -698,9 +698,6 @@ NEWSYM initvideo  ; Returns 1 in videotroub if trouble occurs
   ret


-NEWSYM initvideo2 ; ModeQ scanline re-init (Keep blank on non-dos ports)
-    ret
-
 NEWSYM deinitvideo
    ret

--- a/zsnes/src/makefile.ms
+++ b/zsnes/src/makefile.ms
@@ -161,8 +161,7 @@ CPUOBJ=${CPUDIR}/dma${OE} ${CPUDIR}/dsp${OE} ${CPUDIR}/dspproc${OE}\
 	${CPUDIR}/stable${OE} ${CPUDIR}/table${OE} ${CPUDIR}/tableb${OE}\
 	${CPUDIR}/tablec${OE}

-DOSOBJORIG=${DOSDIR}/debug${OE} ${DOSDIR}/joy${OE} ${DOSDIR}/vesa2${OE}\
-	${DOSDIR}/initvid${OE} ${DOSDIR}/sw${OE} ${DOSDIR}/gppro${OE} ${DOSDIR}/vesa12${OE}
+DOSOBJORIG=${DOSDIR}/debug${OE} ${DOSDIR}/joy${OE} ${DOSDIR}/vesa2${OE}

 EFFECTSOBJ=${EFFECTSDIR}/burn${OE} ${EFFECTSDIR}/water${OE} ${EFFECTSDIR}/smoke${OE}

@@ -199,7 +198,8 @@ ZIPOBJ=${ZIPDIR}/unzip${OE} ${ZIPDIR}/zpng${OE}
 OBJSORIG=${CHIPSOBJ} ${CPUOBJ} ${GUIOBJ} ${VIDEOBJ} ${MAINOBJ} ${ZIPOBJ} ${EFFECTSOBJ} ${JMAOBJ}

 ifeq (${OS},__MSDOS__)
-DOSOBJ=${DOSOBJORIG} ${DOSDIR}/dosintrf${OE} ${DOSDIR}/sound${OE} ${DOSDIR}/zfile${OE}
+DOSOBJ=${DOSOBJORIG} ${DOSDIR}/dosintrf${OE} ${DOSDIR}/gppro${OE} ${DOSDIR}/initvid${OE}\
+	${DOSDIR}/sound${OE} ${DOSDIR}/sw${OE} ${DOSDIR}/vesa12${OE} ${DOSDIR}/zfile${OE}
 OBJS=${OBJSORIG} ${DOSOBJ}
 DELETEOBJS=${OBJSORIG} ${DOSOBJ}
 endif
--- a/zsnes/src/video/copyvid.inc
+++ b/zsnes/src/video/copyvid.inc
@@ -1542,6 +1542,10 @@ NEWSYM copyvesa2640x400x16b
 ;*******************************************************
 %endif

+SECTION .bss
+NEWSYM res640, resb 1
+NEWSYM res480, resb 1
+
 SECTION .data

 NEWSYM EagleHold, dd 0
--- a/zsnes/src/video/procvid.asm
+++ b/zsnes/src/video/procvid.asm
@@ -25,7 +25,7 @@
 EXTSYM BGMA,V8Mode,antienab,cacheud,cbitmode,ccud,cfield,cgram,coladdb,coladdg
 EXTSYM coladdr,curblank,curfps,cvidmode,delay,extlatch,fnamest,En2xSaI
 EXTSYM gammalevel,hirestiledat,ignor512,latchx,latchy,maxbr,ForceNewGfxOff
-EXTSYM newengen,nextframe,objptr,pressed,prevpal,res512switch,res640,resolutn
+EXTSYM newengen,nextframe,objptr,pressed,prevpal,res512switch,resolutn
 EXTSYM romispal,scaddtype,scanlines,selcA000,snesmouse,t1cc,vcache4b,vesa2_bpos
 EXTSYM spritetablea,vesa2_clbit,vesa2_gpos,vesa2_rpos,vesa2red10,vesa2selec
 EXTSYM vidbuffer,vram,KeyStateSelct,soundon,Open_File,Read_File