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

some warning fixes (fear the msvc)

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3758
This commit is contained in:
Sebastian Strohhäcker 2011-11-17 23:04:05 +00:00
parent 333da22de6
commit 6f5930ee92
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/dos/drive_cache.cpp
View file

@ -455,13 +455,13 @@ Bits DOS_Drive_Cache::GetLongName(CFileInfo* curDir, char* shortName) {
// else it's most likely a Wine style short name ABCD~###, # = not dot (length at least 8)
// The above test is rather strict as the following loop can be really slow if filelist_size is large.
char buff[CROSS_LEN];
for (Bits i = 0; i < filelist_size; i++) {
for (Bitu i = 0; i < filelist_size; i++) {
res = wine_hash_short_file_name(curDir->fileList[i]->orgname,buff);
buff[res] = 0;
if (!strcmp(shortName,buff)) {
// Found
strcpy(shortName,curDir->fileList[i]->orgname);
return i;
return (Bits)i;
}
}
#endif

7
src/ints/mouse.cpp
View file

@ -587,7 +587,8 @@ void Mouse_NewVideoMode(void) {
/* Get the correct resolution from the current video mode */
Bit8u mode = mem_readb(BIOS_VIDEO_MODE);
if(mode == mouse.mode) {LOG(LOG_MOUSE,LOG_NORMAL)("New video is the same as the old"); /*return;*/}
mouse.gran_x = mouse.gran_y = 0xffff;
mouse.gran_x = (Bit16s)0xffff;
mouse.gran_y = (Bit16s)0xffff;
switch (mode) {
case 0x00:
case 0x01:
@ -595,7 +596,7 @@ void Mouse_NewVideoMode(void) {
case 0x03:
case 0x07: {
mouse.gran_x = (mode<2)?0xfff0:0xfff8;
mouse.gran_y = 0xfff8;
mouse.gran_y = (Bit16s)0xfff8;
Bitu rows = real_readb(BIOSMEM_SEG,BIOSMEM_NB_ROWS);
if ((rows == 0) || (rows > 250)) rows = 25 - 1;
mouse.max_y = 8*(rows+1) - 1;
@ -610,7 +611,7 @@ void Mouse_NewVideoMode(void) {
case 0x0d:
case 0x0e:
case 0x13:
if (mode == 0x0d || mode == 0x13) mouse.gran_x = 0xfffe;
if (mode == 0x0d || mode == 0x13) mouse.gran_x = (Bit16s)0xfffe;
mouse.max_y = 199;
break;
case 0x0f: