--- dosbox-0.63.orig/README +++ dosbox-0.63/README @@ -324,6 +324,9 @@ DOSBox. It also allows you to change the drive's letter identification for programs that demand specific drive letters. + When mounting a cdrom in linux, (on the host (not in dosbox)) use the + unhide option. + For example: Touche: Adventures of The Fifth Musketeer must be run on your C: drive. Using DOSBox and its mount command, you can trick into thinking it is on C drive while placing it where you want it. For example, if the game @@ -415,7 +418,7 @@ A utility to mount disk images and CD-ROM images in DOSBox. IMGMOUNT DRIVE [imagefile] -t [image_type] -fs [image_format] - -size [sectorsbytesize, sectorsperhead, heads, cylinders] + -size [sectorsbytesize,sectorsperhead,heads,cylinders] imagefile location of the image files to mount in DOSBox. The location is on a @@ -451,7 +454,8 @@ -size The Cylinders, Heads and Sectors specification of the drive. - Required to mount hard drive images. + Required to mount hard drive images. No spaces between the different + numbers!!! (correct: 512,63,16,142 not correct: 512, 63, 16, 142) An example of CD-ROM images: 1a. mount c /tmp --- dosbox-0.63.orig/config.guess +++ dosbox-0.63/config.guess @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2004-08-13' +timestamp='2005-04-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -53,7 +53,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -319,6 +319,9 @@ *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit 0 ;; *:OS400:*:*) echo powerpc-ibm-os400 exit 0 ;; @@ -342,7 +345,7 @@ DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; esac ;; @@ -801,6 +804,9 @@ i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit 0 ;; + amd64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin exit 0 ;; @@ -824,6 +830,12 @@ cris:Linux:*:*) echo cris-axis-linux-gnu exit 0 ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit 0 ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -1128,6 +1140,10 @@ # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 exit 0 ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit 0 ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos @@ -1188,6 +1204,9 @@ *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit 0 ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; @@ -1241,7 +1260,10 @@ A*) echo alpha-dec-vms && exit 0 ;; I*) echo ia64-dec-vms && exit 0 ;; V*) echo vax-dec-vms && exit 0 ;; - esac + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1401,7 +1423,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess +and + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be --- dosbox-0.63.orig/config.sub +++ dosbox-0.63/config.sub @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2004-06-24' +timestamp='2005-04-22' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -70,7 +70,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -231,13 +231,14 @@ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -262,12 +263,13 @@ | pyramid \ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ + | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -298,7 +300,7 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ - | bs2000-* \ + | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ @@ -310,7 +312,7 @@ | ip2k-* | iq2000-* \ | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -336,15 +338,16 @@ | romp-* | rs6000-* \ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; @@ -457,6 +460,9 @@ crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; @@ -486,6 +492,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -1026,6 +1036,10 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1294,6 +1308,9 @@ -kaos*) os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *) --- dosbox-0.63.orig/src/dosbox.cpp +++ dosbox-0.63/src/dosbox.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: dosbox.cpp,v 1.80 2004/09/21 19:32:15 qbix79 Exp $ */ +/* $Id: dosbox.cpp,v 1.81 2004/12/07 21:49:06 qbix79 Exp $ */ #include #include @@ -260,7 +260,6 @@ secprop->AddInitFunction(&DMA_Init); secprop->AddInitFunction(&VGA_Init); secprop->AddInitFunction(&KEYBOARD_Init); - secprop->AddInitFunction(&MOUSE_Init); secprop->AddInitFunction(&JOYSTICK_Init); secprop=control->AddSection_prop("mixer",&MIXER_Init); @@ -353,6 +352,7 @@ ); secprop=control->AddSection_prop("bios",&BIOS_Init); secprop->AddInitFunction(&INT10_Init); + secprop->AddInitFunction(&MOUSE_Init); //Must be after int10 as it uses CurMode /* All the DOS Related stuff, which will eventually start up in the shell */ //TODO Maybe combine most of the dos stuff in one section like ems,xms --- dosbox-0.63.orig/src/dos/dos.cpp +++ dosbox-0.63/src/dos/dos.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: dos.cpp,v 1.77 2004/11/16 14:24:52 qbix79 Exp $ */ +/* $Id: dos.cpp,v 1.79 2004/12/04 08:02:09 qbix79 Exp $ */ #include #include @@ -30,11 +30,14 @@ #include "regs.h" #include "dos_inc.h" #include "setup.h" +#include "support.h" DOS_Block dos; DOS_InfoBlock dos_infoblock; -Bit8u dos_copybuf[0x10000]; +#define DOS_COPYBUFSIZE 0x10000 +Bit8u dos_copybuf[DOS_COPYBUFSIZE]; + static Bitu call_20,call_21,call_25,call_26,call_27,call_28,call_29; void DOS_SetError(Bit16u code) { @@ -89,8 +92,9 @@ } default: { - Bit8u c=reg_dl;Bit16u n=1; + Bit8u c = reg_dl;Bit16u n = 1; DOS_WriteFile(STDOUT,&c,&n); + reg_al = reg_dl; } break; }; @@ -346,6 +350,11 @@ case 0:reg_dl=dos.breakcheck;break; /* Get the breakcheck flag */ case 1:dos.breakcheck=(reg_dl>0);break; /* Set the breakcheck flag */ case 2:{bool old=dos.breakcheck;dos.breakcheck=(reg_dl>0);reg_dl=old;}break; + case 3: /* Get cpsw */ + /* Fallthrough */ + case 4: /* Set cpsw */ + LOG(LOG_DOSMISC,LOG_ERROR)("Someone playing with cpsw %x",reg_ax); + break; case 5:reg_dl=3;break;//TODO should be z /* Always boot from c: :) */ case 6: /* Get true version number */ reg_bl=dos.version.major; @@ -396,7 +405,7 @@ case 0x38: /* Set Country Code */ if (reg_al==0) { /* Get country specidic information */ PhysPt dest = SegPhys(ds)+reg_dx; - MEM_BlockWrite(dest,dos.tables.country,0x22); + MEM_BlockWrite(dest,dos.tables.country,0x18); reg_bx = 0x01; CALLBACK_SCF(false); break; @@ -800,14 +809,15 @@ case 0x65: /* Get extented country information and a lot of other useless shit*/ { /* Todo maybe fully support this for now we set it standard for USA */ LOG(LOG_DOSMISC,LOG_ERROR)("DOS:65:Extended country information call %X",reg_ax); - if(reg_cx < 0x05 ) { + if((reg_al <= 0x07) && (reg_cx < 0x05)) { DOS_SetError(DOSERR_FUNCTION_NUMBER_INVALID); CALLBACK_SCF(true); break; } + Bitu len = 0; /* For 0x21 and 0x22 */ PhysPt data=SegPhys(es)+reg_di; switch (reg_al) { - case 1: + case 0x01: mem_writeb(data + 0x00,reg_al); mem_writew(data + 0x01,0x26); mem_writew(data + 0x03,1); @@ -819,15 +829,40 @@ } CALLBACK_SCF(false); break; - case 2: // Get pointer to uppercase table - case 3: // Get pointer to lowercase table - case 4: // Get pointer to filename uppercase table - case 5: // Get pointer to filename terminator table - case 6: // Get pointer to collating sequence table - case 7: // Get pointer to double byte char set table - mem_writeb(data,reg_al); - mem_writed(data+1,dos.tables.dcbs); //used to be 0 - reg_cx=5; + case 0x02: // Get pointer to uppercase table + case 0x03: // Get pointer to lowercase table + case 0x04: // Get pointer to filename uppercase table + case 0x05: // Get pointer to filename terminator table + case 0x06: // Get pointer to collating sequence table + case 0x07: // Get pointer to double byte char set table + mem_writeb(data + 0x00, reg_al); + mem_writed(data + 0x01, dos.tables.dcbs); //used to be 0 + reg_cx = 5; + CALLBACK_SCF(false); + break; + case 0x20: /* Capitalize Character */ + { + int in = reg_dl; + int out = toupper(in); + reg_dl = out; + } + CALLBACK_SCF(false); + break; + case 0x21: /* Capitalize String (cx=length) */ + case 0x22: /* Capatilize ASCIZ string */ + data = SegPhys(ds) + reg_dx; + if(reg_al == 0x21) len = reg_cx; + else len = mem_strlen(data); /* Is limited to 1024 */ + + if(len > DOS_COPYBUFSIZE - 1) E_Exit("DOS:0x65 Buffer overflow"); + if(len) { + MEM_BlockRead(data,dos_copybuf,len); + dos_copybuf[len] = 0; + //No upcase as String(0x21) might be multiple asciz strings + for(Bitu count = 0; count < len;count++) + dos_copybuf[count] = toupper(*reinterpret_cast(dos_copybuf+count)); + MEM_BlockWrite(data,dos_copybuf,len); + } CALLBACK_SCF(false); break; default: --- dosbox-0.63.orig/src/dos/drive_cache.cpp +++ dosbox-0.63/src/dos/drive_cache.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: drive_cache.cpp,v 1.40 2004/11/13 12:08:43 qbix79 Exp $ */ +/* $Id: drive_cache.cpp,v 1.41 2004/12/16 10:30:15 qbix79 Exp $ */ #include "drives.h" #include "dos_inc.h" @@ -317,7 +317,8 @@ { char* cpos = strchr(shortName,'~'); if (cpos) { - Bits compareCount1 = (int)cpos - (int)shortName; +/* the following code is replaced as it's not safe when char* is 64 bits */ +/* Bits compareCount1 = (int)cpos - (int)shortName; char* endPos = strchr(cpos,'.'); Bitu numberSize = endPos ? int(endPos)-int(cpos) : strlen(cpos); @@ -327,6 +328,18 @@ compareCount2 -= numberSize; if (compareCount2>compareCount1) compareCount1 = compareCount2; +*/ + size_t compareCount1 = strcspn(shortName,"~"); + size_t numberSize = strcspn(cpos,"."); + size_t compareCount2 = strcspn(compareName,"."); + if(compareCount2 > 8) compareCount2 = 8; + /* We want + * compareCount2 -= numberSize; + * if (compareCount2>compareCount1) compareCount1 = compareCount2; + * but to prevent negative numbers: + */ + if(compareCount2 > compareCount1 + numberSize) + compareCount1 = compareCount2 - numberSize; return strncmp(compareName,shortName,compareCount1); } return strcmp(compareName,shortName); --- dosbox-0.63.orig/src/dos/drive_fat.cpp +++ dosbox-0.63/src/dos/drive_fat.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: drive_fat.cpp,v 1.6 2004/11/03 23:13:54 qbix79 Exp $ */ +/* $Id: drive_fat.cpp,v 1.7 2004/11/24 23:04:45 canadacow Exp $ */ #include #include @@ -37,6 +37,9 @@ #define FAT16 1 #define FAT32 2 +Bit8u fatSectBuffer[1024]; +Bit32u curFatSect; + class fatFile : public DOS_File { public: fatFile(const char* name, Bit32u startCluster, Bit32u fileLen, fatDrive *useDrive); @@ -125,13 +128,13 @@ currentSector = myDrive->getAbsoluteSectFromBytePos(firstCluster, seekpos); if(currentSector == 0) { /* EOC reached before EOF */ - LOG_MSG("EOC reached before EOF, seekpos %d, filelen %d", seekpos, filelength); + //LOG_MSG("EOC reached before EOF, seekpos %d, filelen %d", seekpos, filelength); *size = sizecount; return true; } curSectOff = 0; myDrive->loadedDisk->Read_AbsoluteSector(currentSector, sectorBuffer); - LOG_MSG("Reading absolute sector at %d for seekpos %d", currentSector, seekpos); + //LOG_MSG("Reading absolute sector at %d for seekpos %d", currentSector, seekpos); } --sizedec; sizecount++; @@ -147,12 +150,16 @@ Bit16u sizedec, sizecount; sizedec = *size; sizecount = 0; + while(sizedec != 0) { /* Increase filesize if necessary */ if(seekpos >= filelength) { if(filelength == 0) { firstCluster = myDrive->getFirstFreeClust(); myDrive->allocateCluster(firstCluster, 0); + currentSector = myDrive->getAbsoluteSectFromBytePos(firstCluster, seekpos); + myDrive->loadedDisk->Read_AbsoluteSector(currentSector, sectorBuffer); + loadedSector = true; } filelength = seekpos+1; } @@ -248,8 +255,7 @@ Bit32u clustValue; - /* Load two sectors at once for FAT12 */ - Bit8u sectbuffer[1024]; + switch(fattype) { case FAT12: @@ -265,12 +271,16 @@ fatsectnum = bootbuffer.reservedsectors + (fatoffset / bootbuffer.bytespersector) + partSectOff; fatentoff = fatoffset % bootbuffer.bytespersector; - loadedDisk->Read_AbsoluteSector(fatsectnum, §buffer[0]); - loadedDisk->Read_AbsoluteSector(fatsectnum+1, §buffer[512]); + if(curFatSect != fatsectnum) { + /* Load two sectors at once for FAT12 */ + loadedDisk->Read_AbsoluteSector(fatsectnum, &fatSectBuffer[0]); + loadedDisk->Read_AbsoluteSector(fatsectnum+1, &fatSectBuffer[512]); + curFatSect = fatsectnum; + } switch(fattype) { case FAT12: - clustValue = *((Bit16u *)§buffer[fatentoff]); + clustValue = *((Bit16u *)&fatSectBuffer[fatentoff]); if(clustNum & 0x1) { clustValue >>= 4; } else { @@ -278,10 +288,10 @@ } break; case FAT16: - clustValue = *((Bit16u *)§buffer[fatentoff]); + clustValue = *((Bit16u *)&fatSectBuffer[fatentoff]); break; case FAT32: - clustValue = *((Bit32u *)§buffer[fatentoff]); + clustValue = *((Bit32u *)&fatSectBuffer[fatentoff]); break; } @@ -295,9 +305,6 @@ Bit32u tmpValue; - /* Load two sectors at once for FAT12 */ - Bit8u sectbuffer[1024]; - switch(fattype) { case FAT12: fatoffset = clustNum + (clustNum / 2); @@ -312,12 +319,16 @@ fatsectnum = bootbuffer.reservedsectors + (fatoffset / bootbuffer.bytespersector) + partSectOff; fatentoff = fatoffset % bootbuffer.bytespersector; - loadedDisk->Read_AbsoluteSector(fatsectnum, §buffer[0]); - loadedDisk->Read_AbsoluteSector(fatsectnum+1, §buffer[512]); + if(curFatSect != fatsectnum) { + /* Load two sectors at once for FAT12 */ + loadedDisk->Read_AbsoluteSector(fatsectnum, &fatSectBuffer[0]); + loadedDisk->Read_AbsoluteSector(fatsectnum+1, &fatSectBuffer[512]); + curFatSect = fatsectnum; + } switch(fattype) { case FAT12: - tmpValue = *((Bit16u *)§buffer[fatentoff]); + tmpValue = *((Bit16u *)&fatSectBuffer[fatentoff]); if(clustNum & 0x1) { clustValue &= 0xfff; clustValue <<= 4; @@ -329,19 +340,19 @@ tmpValue &= 0xf000; tmpValue |= clustValue; } - *((Bit16u *)§buffer[fatentoff]) = tmpValue; + *((Bit16u *)&fatSectBuffer[fatentoff]) = tmpValue; break; case FAT16: - *((Bit16u *)§buffer[fatentoff]) = clustValue; + *((Bit16u *)&fatSectBuffer[fatentoff]) = clustValue; break; case FAT32: - *((Bit32u *)§buffer[fatentoff]) = clustValue; + *((Bit32u *)&fatSectBuffer[fatentoff]) = clustValue; break; } int fc; for(fc=0;fcWrite_AbsoluteSector(fatsectnum + (fc * bootbuffer.sectorsperfat), §buffer[0]); - loadedDisk->Write_AbsoluteSector(fatsectnum+1+(fc * bootbuffer.sectorsperfat), §buffer[512]); + loadedDisk->Write_AbsoluteSector(fatsectnum + (fc * bootbuffer.sectorsperfat), &fatSectBuffer[0]); + loadedDisk->Write_AbsoluteSector(fatsectnum+1+(fc * bootbuffer.sectorsperfat), &fatSectBuffer[512]); } } @@ -355,7 +366,7 @@ char * findFile; strcpy(dirtoken,fullname); - LOG_MSG("Testing for filename %s", fullname); + //LOG_MSG("Testing for filename %s", fullname); findDir = strtok(dirtoken,"\\"); findFile = findDir; while(findDir != NULL) { @@ -378,7 +389,7 @@ /* Skip if testing in root directory */ if ((len>0) && (filename[len-1]!='\\')) { - LOG_MSG("Testing for filename %s", filename); + //LOG_MSG("Testing for filename %s", filename); findDir = strtok(dirtoken,"\\"); findFile = findDir; while(findDir != NULL) { @@ -418,7 +429,7 @@ /* Skip if testing for root directory */ if ((len>0) && (dir[len-1]!='\\')) { - LOG_MSG("Testing for dir %s", dir); + //LOG_MSG("Testing for dir %s", dir); findDir = strtok(dirtoken,"\\"); while(findDir != NULL) { imgDTA->SetupSearch(0,DOS_ATTR_DIRECTORY,findDir); @@ -449,7 +460,7 @@ } Bit32u fatDrive::getAbsoluteSectFromBytePos(Bit32u startClustNum, Bit32u bytePos) { - return getAbsoluteSectFromChain(startClustNum, bytePos / bootbuffer.bytespersector); + return getAbsoluteSectFromChain(startClustNum, bytePos / bootbuffer.bytespersector); } Bit32u fatDrive::getAbsoluteSectFromChain(Bit32u startClustNum, Bit32u logicalSector) { @@ -473,13 +484,14 @@ if(testvalue >= 0xfffffff8) isEOF = true; break; } - if((isEOF) && (skipClust>1)) { + if((isEOF) && (skipClust>=1)) { //LOG_MSG("End of cluster chain reached before end of logical sector seek!"); return 0; } currentClust = testvalue; --skipClust; } + return (getClustFirstSect(currentClust) + sectClust); } @@ -559,6 +571,7 @@ /* Point cluster to new cluster in chain */ setClusterValue(prevCluster, useCluster); + //LOG_MSG("Chaining cluser %d to %d", prevCluster, useCluster); } switch(fattype) { @@ -667,8 +680,8 @@ /* There is no cluster 0, this means we are in the root directory */ cwdDirCluster = 0; - - + memset(fatSectBuffer,0,1024); + curFatSect = 0xffffffff; } @@ -698,7 +711,7 @@ } -bool fatDrive::isRemote(void) { return false; } +bool fatDrive::isRemote(void) { return false; } bool fatDrive::isRemovable(void) { return false; } Bit8u fatDrive::GetMediaByte(void) { return loadedDisk->GetBiosType(); } --- dosbox-0.63.orig/src/gui/midi_alsa.h +++ dosbox-0.63/src/gui/midi_alsa.h @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: midi_alsa.h,v 1.9 2004/08/04 09:12:54 qbix79 Exp $ */ +/* $Id: midi_alsa.h,v 1.10 2004/12/16 11:17:42 qbix79 Exp $ */ #define ALSA_PCM_OLD_HW_PARAMS_API #define ALSA_PCM_OLD_SW_PARAMS_API @@ -112,7 +112,7 @@ } break; default: - LOG(LOG_MISC,LOG_WARN)("ALSA:Unknown Command: %08x", (int)msg); + LOG(LOG_MISC,LOG_WARN)("ALSA:Unknown Command: %08lx", (long)msg); send_event(1); break; } --- dosbox-0.63.orig/src/ints/mouse.cpp +++ dosbox-0.63/src/ints/mouse.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: mouse.cpp,v 1.42 2004/08/04 09:12:56 qbix79 Exp $ */ +/* $Id: mouse.cpp,v 1.43 2004/12/07 21:49:13 qbix79 Exp $ */ #include #include @@ -407,11 +407,10 @@ void Mouse_CursorMoved(float x,float y) { float dx = x * mouse.pixelPerMickey_x; float dy = y * mouse.pixelPerMickey_y; - if((fabs(x) > 1.0) || (mouse.senv_y < 1.0)) dx *= mouse.senv_x; + if((fabs(x) > 1.0) || (mouse.senv_x < 1.0)) dx *= mouse.senv_x; if((fabs(y) > 1.0) || (mouse.senv_y < 1.0)) dy *= mouse.senv_y; - mouse.mickey_x += dx; mouse.mickey_y += dy; mouse.x += dx; @@ -543,8 +542,8 @@ mouse.min_x = 0; mouse.min_y = 0; // Dont set max coordinates here. it is done by SetResolution! - mouse.x = static_cast(mouse.max_x / 2); - mouse.y = static_cast(mouse.max_y / 2); + mouse.x = static_cast((mouse.max_x + 1)/ 2); + mouse.y = static_cast((mouse.max_y + 1)/ 2); mouse.events = 0; mouse.mickey_x = 0; mouse.mickey_y = 0; @@ -580,6 +579,12 @@ static void mouse_reset(void) { //Much to empty Mouse_NewVideoMode contains stuff that should be in here + + /* Remove drawn mouse Legends of Valor */ + if (CurMode->type!=M_TEXT) RestoreCursorBackground(); + else RestoreCursorBackgroundText(); + mouse.shown = -1; + Mouse_NewVideoMode(); mouse.sub_mask=0; @@ -589,8 +594,6 @@ mouse.senv_y=1.0; - - //Added this for cd-v19 } static Bitu INT33_Handler(void) { @@ -613,8 +616,8 @@ break; case 0x02: /* Hide Mouse */ { - if (CurMode->type!=M_TEXT) RestoreCursorBackground(); - else RestoreCursorBackgroundText(); + if (CurMode->type!=M_TEXT) RestoreCursorBackground(); + else RestoreCursorBackgroundText(); mouse.shown--; } break; @@ -624,8 +627,14 @@ reg_dx=POS_Y; break; case 0x04: /* Position Mouse */ - mouse.x = static_cast(((reg_cx > mouse.max_x) ? mouse.max_x : reg_cx)); - mouse.y = static_cast(((reg_dx > mouse.max_y) ? mouse.max_y : reg_dx)); + if(reg_cx > mouse.max_x) mouse.x = static_cast(mouse.max_x); + else if (mouse.min_x > reg_cx) mouse.x = static_cast(mouse.min_x); + else mouse.x = static_cast(reg_cx); + + if(reg_dx > mouse.max_y) mouse.y = static_cast(mouse.max_y); + else if (mouse.min_y > reg_dx) mouse.y = static_cast(mouse.min_y); + else mouse.y = static_cast(reg_dx); + DrawCursor(); break; case 0x05: /* Return Button Press Data */ @@ -906,6 +915,7 @@ CALLBACK_Setup(call_ps2,&PS2_Handler,CB_IRET,"ps2 bios callback"); ps2_callback=CALLBACK_RealPointer(call_ps2); memset(&mouse,0,sizeof(mouse)); + mouse.shown=-1; //Hide mouse on startup mouse_reset_hardware(); mouse_reset(); } --- dosbox-0.63.orig/src/ints/bios.cpp +++ dosbox-0.63/src/ints/bios.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: bios.cpp,v 1.36 2004/10/23 15:15:06 qbix79 Exp $ */ +/* $Id: bios.cpp,v 1.37 2004/12/08 22:39:49 qbix79 Exp $ */ #include #include "dosbox.h" @@ -238,7 +238,7 @@ } break; case 0x84: /* BIOS - JOYSTICK SUPPORT (XT after 11/8/82,AT,XT286,PS) */ - if (reg_dx==0x0000) { + if (reg_dx == 0x0000) { // Get Joystick button status if (JOYSTICK_IsEnabled(0) || JOYSTICK_IsEnabled(1)) { reg_al = (JOYSTICK_GetButton(0,0)<<7)|(JOYSTICK_GetButton(0,1)<<6); @@ -249,15 +249,25 @@ reg_ax = 0x00f0; reg_dx = 0x0201; CALLBACK_SCF(true); } - } else if (reg_dx==0x0001) { - if (JOYSTICK_IsEnabled(0) || JOYSTICK_IsEnabled(1)) { - reg_ax = (Bit16u)JOYSTICK_GetMove_X(0); - reg_bx = (Bit16u)JOYSTICK_GetMove_Y(0); - reg_cx = (Bit16u)JOYSTICK_GetMove_X(1); - reg_dx = (Bit16u)JOYSTICK_GetMove_Y(1); + } else if (reg_dx == 0x0001) { + if (JOYSTICK_IsEnabled(0)) { + reg_ax = (Bit16u)(JOYSTICK_GetMove_X(0)*127+128); + reg_bx = (Bit16u)(JOYSTICK_GetMove_Y(0)*127+128); + if(JOYSTICK_IsEnabled(1)) { + reg_cx = (Bit16u)(JOYSTICK_GetMove_X(1)*127+128); + reg_dx = (Bit16u)(JOYSTICK_GetMove_Y(1)*127+128); + } + else { + reg_cx = reg_dx = 0; + } + CALLBACK_SCF(false); + } else if (JOYSTICK_IsEnabled(1)) { + reg_ax = reg_bx = 0; + reg_cx = (Bit16u)(JOYSTICK_GetMove_X(1)*127+128); + reg_dx = (Bit16u)(JOYSTICK_GetMove_Y(1)*127+128); CALLBACK_SCF(false); } else { - reg_ax=reg_bx=reg_cx=reg_dx=0; + reg_ax = reg_bx = reg_cx = reg_dx = 0; CALLBACK_SCF(true); } } else { --- dosbox-0.63.orig/debian/control.in +++ dosbox-0.63/debian/control.in @@ -0,0 +1,20 @@ +Source: dosbox +Section: otherosfs +Priority: optional +Maintainer: Peter Veenstra +Build-Depends: debhelper (>> 4.0.0), libsdl1.2-dev , libpng12-dev, libsdl-net1.2-dev, libsdl-sound1.2-dev, libasound2-dev [@linux-gnu@], type-handling (>= 0.2.1) +Standards-Version: 3.6.1 + +Package: dosbox +Architecture: any +Depends: ${shlibs:Depends} +Description: A x86 emulator with Tandy/Herc/CGA/EGA/VGA graphics, sound and DOS + Dosbox is a x86 emulator with Tandy/Hercules/CGA/EGA/VGA graphics, + sound and DOS. It's been designed to run old DOS-games under platforms that + don't support it. (Win2k/XP/FreeBSD/Linux) + . + The folowing legacy sound devices are emulated: PC Speaker, Creative + CMS/Gameblaster, Tandy 3 voice, Adlib, Sound Blaster Pro, Disney Soundsource + and a Gravis Ultrasound. MPU-401 is forwarded to the host. + . + Homepage: http://dosbox.sourceforge.net/ --- dosbox-0.63.orig/debian/control +++ dosbox-0.63/debian/control @@ -0,0 +1,20 @@ +Source: dosbox +Section: otherosfs +Priority: optional +Maintainer: Peter Veenstra +Build-Depends: debhelper (>> 4.0.0), libsdl1.2-dev , libpng12-dev, libsdl-net1.2-dev, libsdl-sound1.2-dev, libasound2-dev [i386 ia64 alpha amd64 arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], type-handling (>= 0.2.1) +Standards-Version: 3.6.1 + +Package: dosbox +Architecture: any +Depends: ${shlibs:Depends} +Description: A x86 emulator with Tandy/Herc/CGA/EGA/VGA graphics, sound and DOS + Dosbox is a x86 emulator with Tandy/Hercules/CGA/EGA/VGA graphics, + sound and DOS. It's been designed to run old DOS-games under platforms that + don't support it. (Win2k/XP/FreeBSD/Linux) + . + The folowing legacy sound devices are emulated: PC Speaker, Creative + CMS/Gameblaster, Tandy 3 voice, Adlib, Sound Blaster Pro, Disney Soundsource + and a Gravis Ultrasound. MPU-401 is forwarded to the host. + . + Homepage: http://dosbox.sourceforge.net/ --- dosbox-0.63.orig/debian/changelog +++ dosbox-0.63/debian/changelog @@ -0,0 +1,106 @@ +dosbox (0.63-2.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/control.in: Fix FTBFS bug by removing the obsolete + alsa-headers from the Build-Depends (Closes: #319430). + + -- Roger Leigh Sun, 31 Jul 2005 15:34:15 +0100 + +dosbox (0.63-2) unstable; urgency=low + + * Fix compilation on amd64/gcc-4.0 (Closes: #285645) + * Fix compilation on kfreebsd-gnu (Closes: #278598) + * Patched code up to cvs of 16 december 2004. + Fixes various small bugs. + * Improved documentation (Closes: #284500, #283570) + * Build on unstable (Closes: #284032) + * Change maintainer emailaddress. + + -- Peter Veenstra Thu, 16 Dec 2004 16:00:08 +0100 + +dosbox (0.63-1) unstable; urgency=low + + * New stable upstream release. ( Closes: #275616, #183937 ) + + -- Peter Veenstra Fri, 19 Nov 2004 11:27:08 +0100 + +dosbox (0.61-4) unstable; urgency=low + + * Fix compilation with GCC 3.4 + * Added more information about dynamic cpu core (Closes: #265319) + * Changed CFLAGS to CXXFLAGS (Closes: #260026) + * Disabled internal modem in configfile as it tries to open a protected port. + + -- Peter Veenstra Mon, 23 Aug 2004 13:56:08 +0100 + +dosbox (0.61-3) unstable; urgency=low + + * Fixed Overlay colour problems at PPC. (Closes: #235293) + * Added quotes aroung menu tags to keep lintian silent. + + -- Peter Veenstra Tue, 2 Mar 2004 15:56:08 +0100 + +dosbox (0.61-2) unstable; urgency=low + + * Recompiled under unstable. (Closes: #231352) + * Description lines were too long + * Disabled opengl, unless it's specified in configfile. + + -- Peter Veenstra Fri, 13 Feb 2004 12:30:40 +0100 + +dosbox (0.61-1) unstable; urgency=low + + * New upstream release (Closes: #229896 ) + + -- Peter Veenstra Wed, 04 Feb 2004 11:00:31 +0100 + +dosbox (0.60-3) unstable; urgency=low + + * Build against alsa (Closes: #216822 ) + * Added information about old configfiles (Closes: #217095 ) + * Added patch for G/S descriptor for ppc. + * Fixed unintentional disabling of the internal modem and disney soundsource + * Enabled Core-inline. + * Added a sample configfile dosbox.conf.example + + -- Peter Veenstra Wed, 29 Oct 2003 15:00:31 +0100 + +dosbox (0.60-2) unstable; urgency=low + + * changed buildtime dependency from libsdl-net1.2 to libsdl-net1.2-dev + + -- Peter Veenstra Mon, 20 Oct 2003 19:46:32 +0200 + +dosbox (0.60-1) unstable; urgency=low + + * New upstream release + * Added patches for ppc parityflag + * patched core_normal in non-debug mode to handle opcode 106 + + -- Peter Veenstra Mon, 20 Oct 2003 19:46:10 +0200 + +dosbox (0.58-3) unstable; urgency=low + + * Fixed ppc problems with the internal filesystem ( Closes: #185012 ) + + -- Peter Veenstra Tue, 23 Sep 2003 21:03:37 +0200 + +dosbox (0.58-2) unstable; urgency=low + + * GCC3.X transition. + * Backported fixes to drivechache and the cdrom. + + -- Peter Veenstra Mon, 18 Aug 2003 14:04:17 +0200 + +dosbox (0.58-1) unstable; urgency=low + + * New upstream release + + -- Peter Veenstra Mon, 31 Mar 2003 13:36:23 +0200 + +dosbox (0.57cvs20030220-1) unstable; urgency=low + + * Initial Release. (Closes #155923) + + -- Peter Veenstra Thu, 20 Feb 2003 12:50:16 +0100 + --- dosbox-0.63.orig/debian/rules +++ dosbox-0.63/debian/rules @@ -0,0 +1,110 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatibility version to use. +export DH_COMPAT=4 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +CXXFLAGS = -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CXXFLAGS += -O0 +else + CXXFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +config.status: configure + dh_testdir + # Add here commands to configure the package. + CXXFLAGS="$(CXXFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-alsa --enable-core-inline + + +build: build-stamp + +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + #/usr/bin/docbook-to-man debian/dosbox.sgml > dosbox.1 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) distclean +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + cat debian/control.in \ + | sed "s/@linux-gnu@/`type-handling any linux-gnu`/g" \ + > debian/control + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/dosbox. + $(MAKE) install prefix=$(CURDIR)/debian/dosbox/usr + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot +# dh_installdebconf + dh_installdocs +# dh_installexamples + dh_installmenu +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron + dh_installman +# dh_installinfo +# dh_undocumented + dh_installchangelogs ChangeLog + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_makeshlibs + dh_installdeb +# dh_perl + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- dosbox-0.63.orig/debian/menu +++ dosbox-0.63/debian/menu @@ -0,0 +1,3 @@ +?package(dosbox):needs="X11" section="Apps/Emulators" \ + title="DOSBox" command="/usr/bin/dosbox" + --- dosbox-0.63.orig/debian/dosbox.conf.example +++ dosbox-0.63/debian/dosbox.conf.example @@ -0,0 +1,168 @@ +[sdl] +# fullscreen -- Start dosbox directly in fullscreen. +# fulldouble -- Use double buffering in fullscreen. +# fullfixed -- Don't resize the screen when in fullscreen. +#==== New in 0.63 replaces fullwidth/height ==== +# fullresolution -- What resolution to use for fullscreen, use together with fullfixed. +# output -- What to use for output: surface,overlay,opengl,openglnb. +# hwscale -- Extra scaling of window if the output device supports hardware scaling. +# autolock -- Mouse will automatically lock, if you click on the screen. +# sensitiviy -- Mouse sensitivity. +# waitonerror -- Wait before closing the console if dosbox has an error. +#==== New 0.63 ==== +# priority -- Priority levels for dosbox: lower,normal,higher,highest. +# Second entry behind the comma is for when dosbox is not focused/minimized. +# mapperfile -- File used to load/save the key/event mappings from. + +fullscreen=false +fulldouble=false +fullfixed=false +fullresolution=1024x768 +output=surface +hwscale=1.00 +autolock=true +sensitivity=100 +waitonerror=true +priority=higher,normal +mapperfile=mapper.txt + +[dosbox] +# language -- Select another language file. +# memsize -- Amount of memory dosbox has in megabytes. +# machine -- The type of machine tries to emulate:hercules,cga,tandy,vga. +#==== New in 0.63 ==== +# captures -- Directory where things like wave,midi,screenshot get captured. + +language= +machine=vga +captures=capture +memsize=16 + +[render] +# frameskip -- How many frames dosbox skips before drawing one. +# aspect -- Do aspect correction. +# scaler -- Scaler used to enlarge/enhance low resolution modes. +# Supported are none,normal2x,advmame2x,advmame3x,advinterp2x,interp2x,tv2x. + +frameskip=0 +aspect=false +scaler=normal2x + +[cpu] +# core -- CPU Core used in emulation: simple,normal,full,dynamic(x66 only! NOT entirely STABLE). +# cycles -- Amount of instructions dosbox tries to emulate each millisecond. +# Setting this higher than your machine can handle is bad! +# cycleup -- Amount of cycles to increase/decrease with keycombo. +# cycledown Setting it lower than 100 will be a percentage. + +core=normal +cycles=3000 +cycleup=500 +cycledown=20 + +[mixer] +# nosound -- Enable silent mode, sound is still emulated though. +# rate -- Mixer sample rate, setting any devices higher than this will +# probably lower their sound quality. +# blocksize -- Mixer block size, larger blocks might help sound stuttering +# but sound will also be more lagged. +#==== New in 0.63 ==== +# prebuffer -- How many milliseconds of data to keep on top of the blocksize. + +nosound=false +rate=22050 +blocksize=2048 +prebuffer=10 + +[midi] +# mpu401 -- Enable MPU-401 Emulation. +#==== New in 0.63 ==== +# intelligent -- Operate in Intelligent mode. +# device -- Device that will receive the MIDI data from MPU-401. +# This can be default,alsa,oss,win32,coreaudio,none. +# config -- Special configuration options for the device. + +mpu401=true +intelligent=true +device=default +config= + +[sblaster] +#==== Got completely rewritten in 0.63 ==== +# type -- Type of sblaster to emulate:none,sb1,sb2,sbpro1,sbpro2,sb16. +# base,irq,dma,hdma -- The IO/IRQ/DMA/High DMA address of the soundblaster. +# mixer -- Allow the soundblaster mixer to modify the dosbox mixer. +# oplmode -- Type of OPL emulation: auto,cms,opl2,dualopl2,opl3. +# On auto the mode is determined by sblaster type. +# oplrate -- Sample rate of OPL music emulation. + +type=sb16 +base=220 +irq=7 +dma=1 +hdma=5 +mixer=true +oplmode=auto +oplrate=22050 + +[gus] +# gus -- Enable the Gravis Ultrasound emulation. +# base,irq1,irq2,dma1,dma2 -- The IO/IRQ/DMA addresses of the +# Gravis Ultrasound. (Same IRQ's and DMA's are OK.) +# rate -- Sample rate of Ultrasound emulation. +# ultradir -- Path to Ultrasound directory. In this directory +# there should be a MIDI directory that contains +# the patch files for GUS playback. Patch sets used +# with Timidity should work fine. + +gus=true +rate=22050 +base=240 +irq1=5 +irq2=5 +dma1=3 +dma2=3 +ultradir=C:\ULTRASND + +[speaker] +# pcspeaker -- Enable PC-Speaker emulation. +# pcrate -- Sample rate of the PC-Speaker sound generation. +# tandyrate -- Sample rate of the Tandy 3-Voice generation. +# Tandysound emulation is present if machine is set to tandy. +# disney -- Enable Disney Sound Source emulation. + +pcspeaker=true +pcrate=22050 +tandyrate=22050 +disney=true + +[bios] +# Nothing to setup yet! + + +[dos] +# xms -- Enable XMS support. +# ems -- Enable EMS support. + +xms=true +ems=true + +[modem] +# modem -- Enable virtual modem emulation. +# comport -- COM Port modem is connected to. +# listenport -- TCP Port the modem listens on for incoming connections. + +modem=false +comport=2 +listenport=23 + +[ipx] +#==== New in 0.63 ==== +# ipx -- Enable ipx over UDP/IP emulation. + +ipx=false + +[autoexec] +# Lines in this section will be run at startup. + + --- dosbox-0.63.orig/debian/copyright +++ dosbox-0.63/debian/copyright @@ -0,0 +1,33 @@ +This package was debianized by Peter Veenstra on +Thu, 20 Feb 2003 12:03:16 +0100. + +It was downloaded from www.sourceforge.net/projects/dosbox + +Upstream Authors: The DOSBox-Team : + Sjoerd v.d. Berg + Peter Veenstra + Felix Jakschitsch + Ulf Wohlers + Tommy Frössman + Dean Beeler + +Copyright: +Copyright (C) 2002-2004 The DOSBox Team + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +On Debian systems, the complete text of the GNU General Public +License can be found in /usr/share/common-licenses/GPL file. + --- dosbox-0.63.orig/debian/docs +++ dosbox-0.63/debian/docs @@ -0,0 +1,4 @@ +NEWS +README +THANKS +debian/dosbox.conf.example --- dosbox-0.63.orig/debian/README.Debian +++ dosbox-0.63/debian/README.Debian @@ -0,0 +1,36 @@ +dosbox for Debian +----------------- + +dosbox its configfiles are never backwards compatible. If you run into errors +please remove your configfile and see if it helps. +See the include dosbox.conf.example for valid options and +valid optionvalues. It's in general a good idea to create a new configfile +when there is a new version of dosbox. + +When using the dynamic cpu core, be prepared for crashes. It's very new, but +gives good results with some games. Errors like : +"Exit to error: CacheBlock overrun" +happen with the dynamic core. Just switch back to normal if this occurs. + +0.63 comes with new keyboard handling. Try imagining that you are behind an +US keyboard and if that doesn't work: +start dosbox with the -startmapper switch. + + +Debian specific changes: +version 0.63-2 is patched up to the cvs of 16 december 2004 with the +following exceptions: +- The pic code changes are omitted (still work in progress) +- The mpu401 code changes are omitted (depends on the pic code) + +This brings the following fixes: +- Improved bios joystick support. +- Fix some mouse issues. +- Fixes compilation on gcc4.0 and amd64. +- Fix some image writing code. +- Add some missing dos calls. + +When mounting cdroms (on the host/not in dosbox), specify the unhide option +if you run into problems. + +-- Peter Veenstra Thu, 16 Dec 2004 15:30:36 +0100