patch: automount for windows \ VOGONS

Reply 1 of 16, by HunterZ

Posted on 2005-05-25, 22:44

HunterZ Offline

Rank l33t++

Rank: l33t++
Posts: 6171
Joined: 2003-01-31, 19:04
Location: Seattle

That's an interesting idea. Not sure that it's super-useful though unless you could somehow make it smart enough to automatically mount floppy and cdrom drives correctly too (a non-trivial task considering the different modes and such that are possible).

Reply 2 of 16, by Qbix

Posted on 2005-05-26, 07:39

Qbix Offline

Rank DOSBox Author

Rank: DOSBox Author
Posts: 11233
Joined: 2002-11-27, 14:50
Location: Fryslan

well that isn't very hard. we detect certain features about the drives ourselves as well. there a few windows call which tell you the drive type

I didn't look at the patch yet but We never implemented automounting ourselves for a reason.

maybe I can live with it if it happens only if you want to change to a non-mounted drive and asks for yes/no

Water flows down the stream
How to ask questions the smart way!

Reply 3 of 16, by ih8registrations

Posted on 2005-05-26, 08:28

ih8registrations Offline

Rank Oldbie

Rank: Oldbie
Posts: 931
Joined: 2003-07-25, 17:20

I'd imagine the same reason why I didn't auto for delete and friends; errant or malicious batch file/exes. I've added exclusion of drive c and yet to be written is having automount only work from keyboard input. Once something is mounted though, auto or manual, are once again exposed to such a risk. For that, another safety precaution could be to add a confirmation for delete/overwrite/modify when coming from batch or exe.

Reply 4 of 16, by user222

Posted on 2005-08-26, 03:41

user222 Offline

Rank Member

Rank: Member
Posts: 107
Joined: 2005-01-20, 12:47

A bug in the automount patch: typing "t" or "test" attempt to mount "t:\".

Reply 5 of 16, by ykhwong

Posted on 2005-09-01, 13:49

ykhwong Offline

Rank Oldbie

Rank: Oldbie
Posts: 627
Joined: 2004-03-17, 15:35

In shell_misc.cpp, remove all the lines related to the handling of execution from a different drive.
It will fix the bug. However, typing "d:\game\game.exe" without mounting D as a drive will not work (even though you have d:\game\game.exe in your real hard/floppy drive).

Last edited by ykhwong on 2006-06-04, 13:59. Edited 1 time in total.

Reply 6 of 16, by ykhwong

Posted on 2006-06-04, 13:55

ykhwong Offline

Rank Oldbie

Rank: Oldbie
Posts: 627
Joined: 2004-03-17, 15:35

I modified your auto-mount patch a little bit. (and removed part of it for a bug)
This patch handles cd-rom drive, too.

1. General

1Index: src/shell/shell_misc.cpp
2===================================================================
3RCS file: /cvsroot/dosbox/dosbox/src/shell/shell_misc.cpp,v
4retrieving revision 1.38
5diff -u -b -r1.38 shell_misc.cpp
6--- src/shell/shell_misc.cpp	21 Apr 2005 21:17:46 -0000	1.38
7+++ src/shell/shell_misc.cpp	25 May 2005 22:20:56 -0000
8@@ -26,6 +26,7 @@
9 #include "regs.h"
10 #include "callback.h"
11 #include "support.h"
12+#include "../dos/cdrom.h"
13 
14 void DOS_Shell::ShowPrompt(void) {
15 	Bit8u drive=DOS_GetDefaultDrive()+'A';
16@@ -349,6 +349,36 @@
17 	if ((strcmp(name + 1, ":") == 0) && isalpha(*name))
18 	{
19 		if (!DOS_SetDrive(toupper(name[0])-'A')) {
20+#ifdef WIN32
21+			// automount: attempt direct letter to drive map.
22+			char mountstring[DOS_PATHLENGTH+CROSS_LEN+20];
23+			int num = SDL_CDNumDrives();
24+			char cdcount[200]={0};
25+			char cdcount2[200]={0};
26+			sprintf(cdcount,"");
27+			for (int i=0; i<num; i++) {
28+			strcat(cdcount,SDL_CDName(i));
29+			strcat(cdcount," ");
30+			};
31+			sprintf(cdcount2,"%s",name);
32+			strcat(cdcount2,"\\");
33+
34+			bool cdcount3 = false;
35+			*cdcount2=toupper(*cdcount2);
36+			char* temp = strstr(cdcount,cdcount2);
37+			if(temp) cdcount3=true;
38+			strcpy(mountstring,"MOUNT ");
39+			strcat(mountstring,name);
40+			strcat(mountstring," ");
41+			if(cdcount3) {
42+				strcat(mountstring,"-t cdrom");
43+				strcat(mountstring," ");
44+			}
45+			strcat(mountstring,name);
46+			strcat(mountstring,"\\");
47+			this->ParseLine(mountstring);
48+			if (!DOS_SetDrive(toupper(name[0])-'A'))
49+#endif 
50 			WriteOut(MSG_Get("SHELL_EXECUTE_DRIVE_NOT_FOUND"),toupper(name[0]));
51 		}
52 		return true;

2. Added -ioctl to cd-rom mount

1Index: src/shell/shell_misc.cpp
2===================================================================
3RCS file: /cvsroot/dosbox/dosbox/src/shell/shell_misc.cpp,v
4retrieving revision 1.38
5diff -u -b -r1.38 shell_misc.cpp
6--- src/shell/shell_misc.cpp	21 Apr 2005 21:17:46 -0000	1.38
7+++ src/shell/shell_misc.cpp	25 May 2005 22:20:56 -0000
8@@ -26,6 +26,7 @@
9 #include "regs.h"
10 #include "callback.h"
11 #include "support.h"
12+#include "../dos/cdrom.h"
13 
14 void DOS_Shell::ShowPrompt(void) {
15 	Bit8u drive=DOS_GetDefaultDrive()+'A';
16@@ -349,6 +349,36 @@
17 	if ((strcmp(name + 1, ":") == 0) && isalpha(*name))
18 	{
19 		if (!DOS_SetDrive(toupper(name[0])-'A')) {
20+#ifdef WIN32
21+			// automount: attempt direct letter to drive map.
22+			char mountstring[DOS_PATHLENGTH+CROSS_LEN+20];
23+			// cd-rom mount
24+			int num = SDL_CDNumDrives();
25+			char cdcount[200]={0};
26+			char cdcount2[200]={0};
27+			sprintf(cdcount,"");
28+			for (int i=0; i<num; i++) {
29+			strcat(cdcount,SDL_CDName(i));
30+			strcat(cdcount," ");
31+			};
32+			sprintf(cdcount2,"%s",name);
33+			strcat(cdcount2,"\\");
34+
35+			bool cdcount3 = false;
36+			*cdcount2=toupper(*cdcount2);
37+			char* temp = strstr(cdcount,cdcount2);
38+			if(temp) cdcount3=true;
39+			strcpy(mountstring,"MOUNT ");
40+			strcat(mountstring,name);
41+			strcat(mountstring," ");
42+			if(cdcount3) strcat(mountstring,"-t cdrom ");
43+			strcat(mountstring,name);
44+			strcat(mountstring,"\\");
45+			if(cdcount3) strcat(mountstring," -ioctl");
46+			
47+			this->ParseLine(mountstring);
48+			if (!DOS_SetDrive(toupper(name[0])-'A'))
49+#endif 
50 			WriteOut(MSG_Get("SHELL_EXECUTE_DRIVE_NOT_FOUND"),toupper(name[0]));
51 		}
52 		return true;

Last edited by ykhwong on 2006-06-04, 18:11. Edited 2 times in total.

Reply 7 of 16, by ih8registrations

Posted on 2006-06-04, 13:56

ih8registrations Offline

Rank Oldbie

Rank: Oldbie
Posts: 931
Joined: 2003-07-25, 17:20

Sounds good. I was considering revisiting the patch considering the recent interest, but you saved me the trouble;)

Reply 8 of 16, by ykhwong

Posted on 2006-11-10, 03:54

ykhwong Offline

Rank Oldbie

Rank: Oldbie
Posts: 627
Joined: 2004-03-17, 15:35

This patch now handles floppy drive.
Added boolean 'automount' into configuration.

1Index: src/shell/shell_misc.cpp
2===================================================================
3RCS file: /cvsroot/dosbox/dosbox/src/shell/shell_misc.cpp,v
4retrieving revision 1.38
5diff -u -b -r1.38 shell_misc.cpp
6--- src/shell/shell_misc.cpp	21 Apr 2005 21:17:46 -0000	1.38
7+++ src/shell/shell_misc.cpp	25 May 2005 22:20:56 -0000
8@@ -26,6 +26,9 @@
9 #include "regs.h"
10 #include "callback.h"
11 #include "support.h"
12+#ifdef WIN32
13+#include "../dos/cdrom.h"
14+#endif 
15 
16 void DOS_Shell::ShowPrompt(void) {
17 	Bit8u drive=DOS_GetDefaultDrive()+'A';
18@@ -349,6 +349,27 @@
19 	if ((strcmp(name + 1, ":") == 0) && isalpha(*name))
20 	{
21 		if (!DOS_SetDrive(toupper(name[0])-'A')) {
22+#ifdef WIN32
23+			Section * sec = control->GetSection("dos");
24+			Section_prop * section=static_cast<Section_prop *>(sec);
25+			bool automount = section->Get_bool("automount");
26+			if(automount)
27+			{
28+			// automount: attempt direct letter to drive map.
29+			char mountstring[DOS_PATHLENGTH+CROSS_LEN+20];
30+			sprintf(mountstring,"MOUNT %s ",name);
31+			const char * drivename = name;
32+			if(GetDriveType(drivename)==DRIVE_CDROM) strcat(mountstring,"-t cdrom ");
33+			else if(GetDriveType(drivename)==DRIVE_REMOVABLE) strcat(mountstring,"-t floppy ");
34+			strcat(mountstring,name);
35+			strcat(mountstring,"\\");
36+			if(GetDriveType(drivename)==DRIVE_CDROM) strcat(mountstring," -ioctl");
37+			
38+			this->ParseLine(mountstring);
39+			}
40+failed:
41+			if (!DOS_SetDrive(toupper(name[0])-'A'))
42+#endif
43 			WriteOut(MSG_Get("SHELL_EXECUTE_DRIVE_NOT_FOUND"),toupper(name[0]));
44 		}
45 		return true;
46--- ./src/dosbox.cpp	Mon Jul 31 16:45:04 2006
47+++ ./src/dosbox.cpp	Mon Jul 31 16:32:26 2006
48@@ -592,11 +592,17 @@
49 	secprop->Add_string("umb","true");
50 	secprop->AddInitFunction(&DOS_KeyboardLayout_Init,true);
51 	secprop->Add_string("keyboardlayout", "none");
52+#ifdef WIN32
53+	secprop->Add_bool("automount","true");
54+#endif 
55 	MSG_Add("DOS_CONFIGFILE_HELP",
56 		"xms -- Enable XMS support.\n"
57 		"ems -- Enable EMS support.\n"
58 		"umb -- Enable UMB support (false,true,max).\n"
59 		"keyboardlayout -- Language code of the keyboard layout (or none).\n"
60+#ifdef WIN32

…Show last 5 lines

61+		"automount -- Enable automount.\n"
62+#endif 
63 	);
64 	// Mscdex
65 	secprop->AddInitFunction(&MSCDEX_Init);

Attachments

Filename

automount.diff

File size

2.24 KiB

Downloads

195 downloads

File license

Fair use/fair dealing exception

Reply 9 of 16, by MiniMax

Posted on 2006-11-10, 11:16

MiniMax Offline

Rank Moderator

Rank: Moderator
Posts: 5128
Joined: 2004-01-18, 04:15
Location: Stockholm, Sweden, Europe, Earth Interests: Old games & young women

Uh uh - this sounds convenient, but also dangerous to me. Like the way Windows likes to autoplay my CD's/DVD's, hide file extensions, etc.

I would like to see more control of what gets auto-mounted and when.

I want something that allows me to declare auto-mounting of drive C for unsafe, but D and E and all local read-only media for safe. Give me something like

1# automount - Allow DOSBox to automatically mount drives: true, false, paths
2# autopaths - List of paths that are safe to automount when automount=paths.
3automount=paths
4autopaths=D:\ E:\ /mnt/cdrom

Reply 10 of 16, by wd

Posted on 2006-11-10, 11:29

wd Offline

Rank DOSBox Author

Rank: DOSBox Author
Posts: 10813
Joined: 2003-12-03, 21:23

Also imo it's dangerous because it removes the responsibility of the user.
And with the availability of frontends there's not much need for it anyways.

Still the general idea of avoiding mount is nice.

Reply 11 of 16, by MiniMax

Posted on 2006-11-10, 11:48

MiniMax Offline

Rank Moderator

Rank: Moderator
Posts: 5128
Joined: 2004-01-18, 04:15
Location: Stockholm, Sweden, Europe, Earth Interests: Old games & young women

Maybe a more intelligent mount command is what is needed? Something that will try to detect the type of media being mounted and automagically use the correct mount type (-t), label, ioctl, cd-number, aspi, ...

It seems to me that we spend a lot of time asking newbies about how they mounted their virtual drives, and suggest adding this and that option.

Reply 12 of 16, by wd

Posted on 2006-11-10, 12:51

wd Offline

Rank DOSBox Author

Rank: DOSBox Author
Posts: 10813
Joined: 2003-12-03, 21:23

> It seems to me that we spend a lot of time asking newbies about how
> they mounted their virtual drives, and suggest adding this and that option.

But frontends seem to be the more straightforward solution to this,
maybe their use should be forced even more at least for first time
users and newbies.

Reply 13 of 16, by DosFreak

Posted on 2006-11-10, 13:06

DosFreak Offline

Rank l33t++

Rank: l33t++
Posts: 12965
Joined: 2002-06-30, 16:35
Location: Milliways

I agree. The work on frontends lately has been amazing....even tho I don't use them. 😀

How To Ask Questions The Smart Way
Make your games work offline

Reply 14 of 16, by ykhwong

Posted on 2006-11-10, 20:04

ykhwong Offline

Rank Oldbie

Rank: Oldbie
Posts: 627
Joined: 2004-03-17, 15:35

The follwing idea was actually made to ask users to automount drives before as you see the screenshot.
I also agree that using frontend is the best choice to easily mount drives.
However, lots of newbies in my page have difficulties with mount drives in dosbox as Minimax mentioned. (Some of them do not try to use even frontends though I posted a thread about the introduction of recent frontends)

The current automount patch is basically planned to work only in win32 by ih8registrations, so it will not work on other platforms.

Attachments

Filename

iii.PNG

File size

13.01 KiB

Views

1971 views

File license

Fair use/fair dealing exception

Last edited by ykhwong on 2006-11-11, 07:31. Edited 1 time in total.

Reply 15 of 16, by MiniMax

Posted on 2006-11-11, 01:17

MiniMax Offline

Rank Moderator

Rank: Moderator
Posts: 5128
Joined: 2004-01-18, 04:15
Location: Stockholm, Sweden, Europe, Earth Interests: Old games & young women

ykhwong - I think the newbie that blindly tries to switch to C: and D: will be very confused when confronted with that question.

S/he will have no idea what all that mounting is about. They will start looking for a horse to mount and ride off into the sunset...

Better rephrase it and ask the newbie something like this:

1Z:\>c:
2Do really you want to give DOSBox access to everything on your real C: drive? Yes or no?
3
4Z:\>d:
5Do really you want to give DOSBox access to everything on your real D: drive? Yes or no?
6
7Z:\>g:
8Do you want to give DOSBox access to your real  CD/DVD-ROM drive? Yes or no?
9
10Z:\>i:
11Do you want to give DOSBox access to your real  CD/DVD-ROM drive? Yes or no?

Last edited by MiniMax on 2006-11-11, 15:15. Edited 1 time in total.

Reply 16 of 16, by ykhwong

Posted on 2006-11-11, 03:24

ykhwong Offline

Rank Oldbie

Rank: Oldbie
Posts: 627
Joined: 2004-03-17, 15:35

oops.. It makes sense. Thanks for the suggestion. 😀

1--- ./src/shell/shell.cpp	Sat Nov 11 06:52:04 2006
2+++ ./src/shell/shell.cpp	Sat Nov 11 06:54:00 2006
3@@ -466,6 +466,10 @@
4 	MSG_Add("SHELL_CMD_DIR_BYTES_USED","%5d File(s) %17s Bytes.\n");
5 	MSG_Add("SHELL_CMD_DIR_BYTES_FREE","%5d Dir(s)  %17s Bytes free.\n");
6 	MSG_Add("SHELL_EXECUTE_DRIVE_NOT_FOUND","Drive %c does not exist!\nYou must \033[31mmount\033[0m it first. Type \033[1;33mintro\033[0m or \033[1;33mintro mount\033[0m for more information.\n");
7+	MSG_Add("SHELL_EXECUTE_DRIVE_ACCESS_CDROM","Do you really want to give DOSBox access to your real CD-ROM drive %c [Y/N]?");
8+	MSG_Add("SHELL_EXECUTE_DRIVE_ACCESS_FLOPPY","Do you really want to give DOSBox access to your real floppy drive %c [Y/N]?");
9+	MSG_Add("SHELL_EXECUTE_DRIVE_ACCESS_FIXED","Do you really want to give DOSBox access to your real drive %c [Y/N]?");
10+	MSG_Add("SHELL_EXECUTE_DRIVE_ACCESS_WARNING_WIN","Mounting c:\\ is NOT recommended.\n");
11 	MSG_Add("SHELL_EXECUTE_ILLEGAL_COMMAND","Illegal command: %s.\n");
12 	MSG_Add("SHELL_CMD_PAUSE","Press any key to continue.\n");
13 	MSG_Add("SHELL_CMD_PAUSE_HELP","Waits for 1 keystroke to continue.\n");
14--- src/shell/shell_misc.cpp	21 Apr 2005 21:17:46 -0000	1.38
15+++ src/shell/shell_misc.cpp	25 May 2005 22:20:56 -0000
16@@ -26,6 +26,9 @@
17 #include "regs.h"
18 #include "callback.h"
19 #include "support.h"
20+#ifdef WIN32
21+#include "../dos/cdrom.h"
22+#endif 
23 
24 void DOS_Shell::ShowPrompt(void) {
25 	Bit8u drive=DOS_GetDefaultDrive()+'A';
26@@ -349,7 +349,68 @@
27 	/* check for a drive change */
28 	if (((strcmp(name + 1, ":") == 0) || (strcmp(name + 1, ":\\") == 0)) && isalpha(*name))
29 	{
30+		if (strrchr(name,'\\')) { WriteOut(MSG_Get("SHELL_EXECUTE_ILLEGAL_COMMAND"),name); return true; }
31 		if (!DOS_SetDrive(toupper(name[0])-'A')) {
32+#ifdef WIN32
33+			// automount: attempt direct letter to drive map.
34+			if((GetDriveType(name)==DRIVE_FIXED) && (strcasecmp(name,"c:")==0)) WriteOut(MSG_Get("SHELL_EXECUTE_DRIVE_ACCESS_WARNING_WIN"));
35+first_1:
36+			if(GetDriveType(name)==DRIVE_CDROM) WriteOut(MSG_Get("SHELL_EXECUTE_DRIVE_ACCESS_CDROM"),toupper(name[0]));
37+			else if(GetDriveType(name)==DRIVE_REMOVABLE) WriteOut(MSG_Get("SHELL_EXECUTE_DRIVE_ACCESS_FLOPPY"),toupper(name[0]));
38+			else if(GetDriveType(name)==DRIVE_FIXED) WriteOut(MSG_Get("SHELL_EXECUTE_DRIVE_ACCESS_FIXED"),toupper(name[0]));
39+			else { WriteOut(MSG_Get("SHELL_EXECUTE_DRIVE_NOT_FOUND"),toupper(name[0])); return true; }
40+first_2:
41+		Bit8u c;Bit16u n=1;
42+		DOS_ReadFile (STDIN,&c,&n);
43+		do switch (c)
44+		{
45+			case 'n':			case 'N':
46+			{
47+				DOS_WriteFile (STDOUT,&c, &n);
48+				DOS_ReadFile (STDIN,&c,&n);
49+				do switch (c) {
50+					case 0xD: WriteOut("\n\n"); WriteOut(MSG_Get("SHELL_EXECUTE_DRIVE_NOT_FOUND"),toupper(name[0])); return true;
51+					case 0x08: WriteOut("\b \b"); goto first_2;
52+				} while (DOS_ReadFile (STDIN,&c,&n));
53+			}
54+			case 'y':			case 'Y':
55+			{
56+				DOS_WriteFile (STDOUT,&c, &n);
57+				DOS_ReadFile (STDIN,&c,&n);
58+				do switch (c) {
59+					case 0xD: WriteOut("\n"); goto continue_1;
60+					case 0x08: WriteOut("\b \b"); goto first_2;

…Show last 34 lines

61+				} while (DOS_ReadFile (STDIN,&c,&n));
62+			}
63+			case 0xD: WriteOut("\n"); goto first_1;
64+			case '\t': case 0x08: goto first_2;
65+			default:
66+			{
67+				DOS_WriteFile (STDOUT,&c, &n);
68+				DOS_ReadFile (STDIN,&c,&n);
69+				do switch (c) {
70+					case 0xD: WriteOut("\n");goto first_1;
71+					case 0x08: WriteOut("\b \b"); goto first_2;
72+				} while (DOS_ReadFile (STDIN,&c,&n));
73+				goto first_2;
74+			}
75+		} while (DOS_ReadFile (STDIN,&c,&n));
76+
77+continue_1:
78+
79+			char mountstring[DOS_PATHLENGTH+CROSS_LEN+20];
80+			sprintf(mountstring,"MOUNT %s ",name);
81+
82+			if(GetDriveType(name)==DRIVE_CDROM) strcat(mountstring,"-t cdrom ");
83+			else if(GetDriveType(name)==DRIVE_REMOVABLE) strcat(mountstring,"-t floppy ");
84+			strcat(mountstring,name);
85+			strcat(mountstring,"\\");
86+			if(GetDriveType(name)==DRIVE_CDROM) strcat(mountstring," -ioctl");
87+			
88+			this->ParseLine(mountstring);
89+failed:
90+			if (!DOS_SetDrive(toupper(name[0])-'A'))
91+#endif
92 			WriteOut(MSG_Get("SHELL_EXECUTE_DRIVE_NOT_FOUND"),toupper(name[0]));
93 		}
94 		return true;

Attachments

Filename

automount.diff

File size

4.09 KiB

Downloads

192 downloads

File license

Fair use/fair dealing exception

Main menu

Common searches