valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Even our comments and status messages have less bugs now (jomalin)

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3764
This commit is contained in:
Peter Veenstra 2011-12-08 12:47:04 +00:00
parent fc1ffcc528
commit a7af902f2f
19 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/debug/debug.cpp
View file

@ -402,7 +402,7 @@ void CBreakpoint::ActivateBreakpoints(PhysPt adr, bool activate)
CBreakpoint* bp;
for(i=BPoints.begin(); i != BPoints.end(); i++) {
bp = (*i);
// Do not activate, when bp is an actual adress
// Do not activate, when bp is an actual address
if (activate && (bp->GetType()==BKPNT_PHYSICAL) && (bp->GetLocation()==adr)) {
// Do not activate :)
continue;
@ -681,7 +681,7 @@ static void DrawData(void) {
Bit32u address;
/* Data win */
for (int y=0; y<8; y++) {
// Adress
// Address
if (add<0x10000) mvwprintw (dbg.win_data,1+y,0,"%04X:%04X ",dataSeg,add);
else mvwprintw (dbg.win_data,1+y,0,"%04X:%08X ",dataSeg,add);
for (int x=0; x<16; x++) {
@ -2424,7 +2424,7 @@ void DEBUG_HeavyWriteLogInstruction(void) {
out << hex << noshowbase << setfill('0') << uppercase;
Bit32u startLog = logCount;
do {
// Write Intructions
// Write Instructions
TLogInst & inst = logInst[startLog];
out << setw(4) << inst.s_cs << ":" << setw(8) << inst.eip << " "
<< inst.dline << " " << inst.res << " EAX:" << setw(8)<< inst.eax

2
src/gui/sdl_mapper.cpp
View file

@ -2107,7 +2107,7 @@ static void CreateDefaultBinds(void) {
}
void MAPPER_AddHandler(MAPPER_Handler * handler,MapKeys key,Bitu mods,char const * const eventname,char const * const buttonname) {
//Check if it allready exists=> if so return.
//Check if it already exists=> if so return.
for(CHandlerEventVector_it it=handlergroup.begin();it!=handlergroup.end();it++)
if(strcmp((*it)->buttonname,buttonname) == 0) return;

2
src/gui/sdlmain.cpp
View file

@ -1916,7 +1916,7 @@ int main(int argc, char* argv[]) {
Section_prop * sdl_sec=static_cast<Section_prop *>(control->GetSection("sdl"));
if (control->cmdline->FindExist("-fullscreen") || sdl_sec->Get_bool("fullscreen")) {
if(!sdl.desktop.fullscreen) { //only switch if not allready in fullscreen
if(!sdl.desktop.fullscreen) { //only switch if not already in fullscreen
GFX_SwitchFullScreen();
}
}

2
src/hardware/hardware.cpp
View file

@ -323,7 +323,7 @@ void CAPTURE_AddImage(Bitu width, Bitu height, Bitu bpp, Bitu pitch, Bitu flags,
/* Open the actual file */
FILE * fp=OpenCaptureFile("Screenshot",".png");
if (!fp) goto skip_shot;
/* First try to alloacte the png structures */
/* First try to allocate the png structures */
png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL,NULL, NULL);
if (!png_ptr) goto skip_shot;
info_ptr = png_create_info_struct(png_ptr);

2
src/hardware/mixer.cpp
View file

@ -601,7 +601,7 @@ MixerChannel* MixerObject::Install(MIXER_Handler handler,Bitu freq,const char *
installed = true;
return MIXER_AddChannel(handler,freq,name);
} else {
E_Exit("allready added mixer channel.");
E_Exit("already added mixer channel.");
return 0; //Compiler happy
}
}

4
src/hardware/serialport/libserial.cpp
View file

@ -197,7 +197,7 @@ int SERIAL_getextchar(COMPORT port) {
char chRead;
int retval = 0;
// receive a byte; TODO communicate faliure
// receive a byte; TODO communicate failure
if (ReadFile (port->porthandle, &chRead, 1, &dwRead, NULL)) {
if (dwRead) {
// check for errors
@ -580,7 +580,7 @@ int SERIAL_getextchar(COMPORT port) {
char chRead;
int retval = 0;
// receive a byte; TODO communicate faliure
// receive a byte; TODO communicate failure
if (DosRead(port->porthandle, &chRead, 1, &dwRead) == NO_ERROR) {
if (dwRead) {
// check for errors; will OS/2 clear the error on reading its data?

2
src/hardware/vga_draw.cpp
View file

@ -82,7 +82,7 @@ static Bit8u * VGA_Draw_CGA16_Line(Bitu vidstart, Bitu line) {
//Generate a temporary bitline to calculate the avarage
//over bit-2 bit-1 bit bit+1.
//Combine this number with the current colour to get
//an unique index in the pallete. Or it with bit 7 as they are stored
//an unique index in the pallette. Or it with bit 7 as they are stored
//in the upperpart to keep them from interfering the regular cga stuff
for(Bitu x = 0; x < 640; x++)

2
src/hardware/vga_s3.cpp
View file

@ -341,7 +341,7 @@ void SVGA_S3_WriteCRTC(Bitu reg,Bitu val,Bitu iolen) {
vga.svga.bank_write = vga.svga.bank_read;
VGA_SetupHandlers();
break;
case 0x6b: // BIOS scratchpad: LFB adress
case 0x6b: // BIOS scratchpad: LFB address
vga.s3.reg_6b=(Bit8u)val;
break;
default:

2
src/ints/bios_disk.cpp
View file

@ -104,7 +104,7 @@ void swapInDisks(void) {
Bits swapPos = swapPosition;
int i;
/* Check to make sure there's atleast one setup image */
/* Check to make sure that there is at least one setup image */
for(i=0;i<MAX_SWAPPABLE_DISKS;i++) {
if(diskSwap[i]!=NULL) {
allNull = false;

4
src/ints/bios_keyboard.cpp
View file

@ -546,7 +546,7 @@ static Bitu INT16_Handler(void) {
reg_ax=temp;
}
break;
case 0x02: /* GET SHIFT FlAGS */
case 0x02: /* GET SHIFT FLAGS */
reg_al=mem_readb(BIOS_KEYBOARD_FLAGS1);
break;
case 0x03: /* SET TYPEMATIC RATE AND DELAY */
@ -594,7 +594,7 @@ static void InitBiosSegment(void) {
mem_writew(BIOS_KEYBOARD_BUFFER_HEAD,0x1e);
mem_writew(BIOS_KEYBOARD_BUFFER_TAIL,0x1e);
Bit8u flag1 = 0;
Bit8u leds = 16; /* Ack recieved */
Bit8u leds = 16; /* Ack received */
#if SDL_VERSION_ATLEAST(1, 2, 14)
//Nothing, mapper handles all.

2
src/ints/ems.cpp
View file

@ -1079,7 +1079,7 @@ static Bitu V86_Monitor() {
reg_esp+=6; // skip ip of CALL and error code of EXCEPTION 0x0d
/* Get adress of faulting instruction */
/* Get address of faulting instruction */
Bit16u v86_cs=mem_readw(SegPhys(ss)+((reg_esp+4) & cpu.stack.mask));
Bit16u v86_ip=mem_readw(SegPhys(ss)+((reg_esp+0) & cpu.stack.mask));
Bit8u v86_opcode=mem_readb((v86_cs<<4)+v86_ip);

2
src/ints/int10.cpp
View file

@ -375,7 +375,7 @@ graphics_chars:
reg_al=0x12;
break;
}
case 0x32: /* Video adressing */
case 0x32: /* Video addressing */
if (!IS_VGA_ARCH) break;
LOG(LOG_INT10,LOG_ERROR)("Function 12:Call %2X not handled",reg_bl);
if (svgaCard==SVGA_TsengET4K) reg_al&=1;

4
src/ints/int10_memory.cpp
View file

@ -49,7 +49,7 @@ void INT10_LoadFont(PhysPt font,bool reload,Bitu count,Bitu offset,Bitu map,Bitu
PhysPt ftwhere=PhysMake(0xa000,map_offset[map & 0x7]+(Bit16u)(offset*32));
IO_Write(0x3c4,0x2);IO_Write(0x3c5,0x4); //Enable plane 2
IO_Write(0x3ce,0x6);Bitu old_6=IO_Read(0x3cf);
IO_Write(0x3cf,0x0); //Disable odd/even and a0000 adressing
IO_Write(0x3cf,0x0); //Disable odd/even and a0000 addressing
for (Bitu i=0;i<count;i++) {
MEM_BlockCopy(ftwhere,font,height);
ftwhere+=32;
@ -57,7 +57,7 @@ void INT10_LoadFont(PhysPt font,bool reload,Bitu count,Bitu offset,Bitu map,Bitu
}
IO_Write(0x3c4,0x2);IO_Write(0x3c5,0x3); //Enable textmode planes (0,1)
IO_Write(0x3ce,0x6);
if (IS_VGA_ARCH) IO_Write(0x3cf,(Bit8u)old_6); //odd/even and b8000 adressing
if (IS_VGA_ARCH) IO_Write(0x3cf,(Bit8u)old_6); //odd/even and b8000 addressing
else IO_Write(0x3cf,0x0e);
/* Reload tables and registers with new values based on this height */
if (reload) {

2
src/ints/int10_modes.cpp
View file

@ -405,7 +405,7 @@ static void FinishSetMode(bool clearmem) {
case M_LIN15:
case M_LIN16:
case M_LIN32:
/* Hack we just acess the memory directly */
/* Hack we just access the memory directly */
memset(vga.mem.linear,0,vga.vmemsize);
memset(vga.fastmem, 0, vga.vmemsize<<1);
}

2
src/ints/int10_pal.cpp
View file

@ -321,7 +321,7 @@ void INT10_SetBackgroundBorder(Bit8u val) {
}
else if (IS_EGAVGA_ARCH) {
val = ((val << 1) & 0x10) | (val & 0x7);
/* Aways set the overscan color */
/* Always set the overscan color */
INT10_SetSinglePaletteRegister( 0x11, val );
/* Don't set any extra colors when in text mode */
if (CurMode->mode <= 3)

2
src/misc/messages.cpp
View file

@ -98,7 +98,7 @@ static void LoadMessageFile(const char * fname) {
strcpy(name,linein+1);
/* End of string marker */
} else if (linein[0]=='.') {
/* Replace/Add the string to the internal langaugefile */
/* Replace/Add the string to the internal languagefile */
/* Remove last newline (marker is \n.\n) */
size_t ll = strlen(string);
if(ll && string[ll - 1] == '\n') string[ll - 1] = 0; //Second if should not be needed, but better be safe.

6
src/shell/shell.cpp
View file

@ -49,14 +49,14 @@ typedef std::list<std::string>::iterator auto_it;
void VFILE_Remove(const char *name);
void AutoexecObject::Install(const std::string &in) {
if(GCC_UNLIKELY(installed)) E_Exit("autoexec: allready created %s",buf.c_str());
if(GCC_UNLIKELY(installed)) E_Exit("autoexec: already created %s",buf.c_str());
installed = true;
buf = in;
autoexec_strings.push_back(buf);
this->CreateAutoexec();
//autoexec.bat is normally created AUTOEXEC_Init.
//But if we are allready running (first_shell)
//But if we are already running (first_shell)
//we have to update the envirionment to display changes
if(first_shell) {
@ -77,7 +77,7 @@ void AutoexecObject::Install(const std::string &in) {
}
void AutoexecObject::InstallBefore(const std::string &in) {
if(GCC_UNLIKELY(installed)) E_Exit("autoexec: allready created %s",buf.c_str());
if(GCC_UNLIKELY(installed)) E_Exit("autoexec: already created %s",buf.c_str());
installed = true;
buf = in;
autoexec_strings.push_front(buf);

2
src/shell/shell_cmds.cpp
View file

@ -287,7 +287,7 @@ void DOS_Shell::CMD_ECHO(char * args){
args++;//skip first character. either a slash or dot or space
size_t len = strlen(args); //TODO check input of else ook nodig is.
if(len && args[len - 1] == '\r') {
LOG(LOG_MISC,LOG_WARN)("Hu ? carriage return allready present. Is this possible?");
LOG(LOG_MISC,LOG_WARN)("Hu ? carriage return already present. Is this possible?");
WriteOut("%s\n",args);
} else WriteOut("%s\r\n",args);
}

2
src/shell/shell_misc.cpp
View file

@ -299,7 +299,7 @@ void DOS_Shell::InputCommand(char * line) {
}
res=DOS_FindNext();
}
/* Add excutable list to front of completion list. */
/* Add executable list to front of completion list. */
std::copy(executable.begin(),executable.end(),std::front_inserter(l_completion));
it_completion = l_completion.begin();
dos.dta(save_dta);