Merge branch 'upstream' into vt

Author: cracyc

msdos.cpp

@@ -4065,17 +4065,13 @@ int main(int argc, char *argv[], char *envp[])
 		main_thread_id = GetCurrentThreadId();
 	}
 
-	get_console_buffer_success = (MyGetConsoleScreenBufferInfo(hStdout, &csbi) != 0);
-	get_console_cursor_success = use_vt ? false : (GetConsoleCursorInfo(hStdout, &ci) != 0);
 	if(set_code_page) {
 		set_input_code_page(code_page);
 		set_output_code_page(code_page);
 	}
-	get_console_font_success = get_console_font_info(&fi);
+	get_console_buffer_success = (MyGetConsoleScreenBufferInfo(hStdout, &csbi) != 0);
+	get_console_cursor_success = use_vt ? false : (GetConsoleCursorInfo(hStdout, &ci) != 0);	get_console_font_success = get_console_font_info(&fi);
 
-	if(!get_console_cursor_success) {
-		ci.bVisible = TRUE;
-	}
 	if(!get_console_cursor_success) {
 		ci.bVisible = TRUE;
 	}
@@ -4440,6 +4436,7 @@ bool update_console_input()
 						};
 						bool prev_status = mouse.buttons[j].status;
 						mouse.buttons[j].status = ((ir[i].Event.MouseEvent.dwButtonState & bits[j]) != 0);
+						
 						if(!prev_status && mouse.buttons[j].status) {
 							mouse.buttons[j].pressed_times++;
 							mouse.buttons[j].pressed_position.x = mouse.position.x;
@@ -4693,6 +4690,7 @@ bool update_console_input()
 					result = key_changed = true;
 					// IME may be on and it may causes screen scroll up and cursor position change
 					cursor_moved = true;
+					
 					if(ir[i].Event.KeyEvent.dwControlKeyState == 0x80000000) {
 						ir[i].Event.KeyEvent.bKeyDown = FALSE;
 						ir[i].Event.KeyEvent.dwControlKeyState = 0;
@@ -5532,7 +5530,6 @@ bool msdos_is_device_path(const char *path)
 	if(!strnicmp(path, "\\DEV\\", 5)) {
 		path += 5;
 	}
-	
 	if(GetFullPathNameA(path, MAX_PATH, full, &name) != 0) {
 		if(_stricmp(full, "\\\\.\\AUX" ) == 0 ||
 		   _stricmp(full, "\\\\.\\CON" ) == 0 ||
@@ -5945,11 +5942,10 @@ int msdos_open_device(const char *path, int oflag, int *sio_port, int *lpt_port)
 	int fd = -1;
 
 	*sio_port = *lpt_port = 0;
-
+	
 	if(!strnicmp(path, "\\DEV\\", 5)) {
 		path += 5;
 	}
-	
 	if(msdos_is_con_path(path)) {
 		// MODE.COM opens CON device with read/write mode :-(
 		if((oflag & (_O_RDONLY | _O_WRONLY | _O_RDWR)) == _O_RDWR) {
@@ -5979,7 +5975,6 @@ UINT16 msdos_device_info(const char *path)
 	if(!strnicmp(path, "\\DEV\\", 5)) {
 		path += 5;
 	}
-
 	if(msdos_is_con_path(path)) {
 		return(0x80d3);
 	} else if(msdos_is_comm_path(path)) {
@@ -9018,29 +9013,33 @@ void pcbios_update_cursor_position()
 	mem[0x451 + mem[0x462] * 2] = csbi.dwCursorPosition.Y - scr_top;
 }
 
+int get_scan_lines()
+{
+	switch(mem[0x489] & 0x90) {
+	case 0x00:
+		return 350;
+	case 0x10:
+		return 400;
+	case 0x80:
+		return 200;
+//	case 0x90:
+//		return 480;
+	}
+	return 400;
+}
+
 inline void pcbios_int_10h_00h()
 {
 	switch(CPU_AL & 0x7f) {
 	case 0x70: // V-Text Mode
 	case 0x71: // Extended CGA V-Text Mode
 		pcbios_set_console_size(scr_width, scr_height, !(CPU_AL & 0x80));
 		break;
-	case 0x03: { // CGA Text Mode
-		int lines = 400;
-		switch(mem[0x489] & 0x90)
-		{
-			case 0x00:
-				lines = 350;
-				break;
-			case 0x80:
-				lines = 200;
-				break;
-		}
+	case 0x03: // CGA Text Mode
 		change_console_size(80, 25); // for Windows10
 		pcbios_set_font_size(font_width, font_height);
-		pcbios_set_console_size(80, lines / 16, !(CPU_AL & 0x80));
+		pcbios_set_console_size(80, get_scan_lines() / 16, !(CPU_AL & 0x80));
 		break;
-	}
 	case 0x73: // Extended CGA Text Mode
 	case 0x64: // J-3100 DCGA (mono)
 	case 0x65: // J-3100 DCGA
@@ -9436,10 +9435,27 @@ inline void pcbios_int_10h_0fh()
 
 inline void pcbios_int_10h_10h()
 {
+	static UINT8 palette[17] = {
+		0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+		0x00
+	};
+	
 	switch(CPU_AL) {
+	case 0x01:
+		palette[16] = CPU_BH;
+		break;
+	case 0x02:
+		memcpy(palette, mem + CPU_ES_BASE + CPU_DX, sizeof(palette));
+		break;
 	case 0x03:
 		mem[0x465] &= ~0x20 | (CPU_BL << 5);
 		break;
+	case 0x08:
+		CPU_BH = palette[16];
+		break;
+	case 0x09:
+		memcpy(mem + CPU_ES_BASE + CPU_DX, palette, sizeof(palette));
+		break;
 	default:
 		unimplemented_10h("int %02Xh (AX=%04X BX=%04X CX=%04X DX=%04X SI=%04X DI=%04X DS=%04X ES=%04X)\n", 0x10, CPU_AX, CPU_BX, CPU_CX, CPU_DX, CPU_SI, CPU_DI, CPU_DS, CPU_ES);
 		CPU_SET_C_FLAG(1);
@@ -9473,7 +9489,7 @@ inline void pcbios_int_10h_11h()
 					}
 				}
 			}
-			pcbios_set_console_size(80, lines / CPU_BH, true);
+			pcbios_set_console_size(80, get_scan_lines() / CPU_BH, true);
 		}
 		break;
 	case 0x01:
@@ -9488,7 +9504,7 @@ inline void pcbios_int_10h_11h()
 				}
 			}
 		}
-		pcbios_set_console_size(80, lines / 14, true); // 28 = 25 * 16 / 14
+		pcbios_set_console_size(80, get_scan_lines() / 14, true);
 		break;
 	case 0x02:
 	case 0x12:
@@ -9507,13 +9523,13 @@ inline void pcbios_int_10h_11h()
 				pcbios_set_font_size(font_width, font_height);
 			}
 		}
-		pcbios_set_console_size(80, lines / 8, true); // 50 = 25 * 16 / 8
+		pcbios_set_console_size(80, get_scan_lines() / 8, true);
 		break;
 	case 0x04:
 	case 0x14:
 		change_console_size(80, 25); // for Windows10
 		pcbios_set_font_size(font_width, font_height);
-		pcbios_set_console_size(80, lines / 16, true);
+		pcbios_set_console_size(80, get_scan_lines() / 16, true);
 		break;
 	case 0x18:
 		change_console_size(80, 25); // for Windows10
@@ -9535,27 +9551,31 @@ inline void pcbios_int_10h_11h()
 
 inline void pcbios_int_10h_12h()
 {
+	UINT8 modebits;
+	
 	switch(CPU_BL) {
 	case 0x10:
 		CPU_BX = 0x0003;
 		CPU_CX = 0x0009;
 		break;
 	case 0x30:
-		UINT8 modebits;
+		modebits = mem[0x489] & 0x90;
 		switch(CPU_AL) {
-			case 0:
-				modebits = 0x80;
-				break;
-			case 1:
-				modebits = 0x00;
-				break;
-			case 2:
-				modebits = 0x10;
-				break;
-			default:
-				return;
+		case 0:
+			modebits = 0x80;
+			break;
+		case 1:
+			modebits = 0x00;
+			break;
+		case 2:
+			modebits = 0x10;
+			break;
+//		case 3:
+//			modebits = 0x90;
+//			break;
 		}
-		mem[0x489] |= (mem[0x489] & ~0x90) | modebits;
+		mem[0x489] = (mem[0x489] & ~0x90) | modebits;
+		CPU_AL = 0x12; // success
 		break;
 	}
 }
@@ -9580,8 +9600,10 @@ inline void pcbios_int_10h_13h()
 			MyGetConsoleScreenBufferInfo(hStdout, &csbi);
 			MySetConsoleCursorPosition(hStdout, co);
 
-			MySetConsoleTextAttribute(hStdout, CPU_BL);
-			WriteConsoleA(hStdout, &mem[ofs], CPU_CX, NULL, NULL);
+			if(csbi.wAttributes != CPU_BL) {
+				MySetConsoleTextAttribute(hStdout, CPU_BL);
+			}
+			WriteConsoleA(hStdout, &mem[ofs], CPU_CX, &num, NULL);
 
 			if(csbi.wAttributes != CPU_BL) {
 				MySetConsoleTextAttribute(hStdout, csbi.wAttributes);
@@ -9942,9 +9964,14 @@ inline void pcbios_int_10h_efh()
 
 inline void pcbios_int_10h_fah()
 {
-	// just return something, used for mouse driver detection
-	CPU_LOAD_SREG(CPU_ES_INDEX, 0xffff);
-	CPU_BX = 0x0005;
+	if(CPU_BX == 0x0000) {
+		// just return something, used for mouse driver detection
+		CPU_LOAD_SREG(CPU_ES_INDEX, 0xffff);
+		CPU_BX = 0x0005;
+	} else {
+		unimplemented_10h("int %02Xh (AX=%04X BX=%04X CX=%04X DX=%04X SI=%04X DI=%04X DS=%04X ES=%04X)\n", 0x10, CPU_AX, CPU_BX, CPU_CX, CPU_DX, CPU_SI, CPU_DI, CPU_DS, CPU_ES);
+		CPU_SET_C_FLAG(1);
+	}
 }
 
 inline void pcbios_int_10h_feh()