port most of r38990 from trunk

git-svn-id: https://svn.r-project.org/R/branches/R-2-3-patches@38992 00db46b3-68df-0310-9c12-caf00c1e9a41

src/gnuwin32/CHANGES

@@ -28,6 +28,10 @@ and Administration Manual'.  (Thanks to David del Campo (Dept of
 Statistics, University of Oxford) for suggesting WiX and building a
 prototype installer.)
 
+It was intended that saving the GUI preferences would default to the
+home directory, but Windows only accepted paths with \ separators at
+that point, ignoring others with no error message.
+
 
 
 R 2.3.1
@@ -49,7 +53,7 @@ a message about 'outer margins too large'. (PR#8857)
 
 Sys.setlocale() interprets LC_CTYPE=C as a request for CP1252, as the
 startup code long has.  (This is necessary to avoid various crashes
-in the runtime code.)
+in the MinGW runtime code.)
 
 
 

src/gnuwin32/graphapp/dialogs.c

@@ -244,7 +244,7 @@ char *askfilesavewithdir(char *title, char *default_name, char *dir)
 {
 	int i;
 	OPENFILENAME ofn;
-        char cwd[MAX_PATH];
+        char *p, cwd[MAX_PATH];
 
 	if (! default_name)
 		default_name = "";
@@ -262,10 +262,12 @@ char *askfilesavewithdir(char *title, char *default_name, char *dir)
 	ofn.nMaxFile        = BUFSIZE;
 	ofn.lpstrFileTitle  = NULL;
 	ofn.nMaxFileTitle   = _MAX_FNAME + _MAX_EXT;
-	if(dir && strlen(dir) > 0)
-	    ofn.lpstrInitialDir = dir;
-	else {
-	    if (GetCurrentDirectory(MAX_PATH,cwd))
+	if(dir && strlen(dir) > 0) {
+	    strcpy(cwd, dir);
+	    for(p = cwd; *p; p++) if(*p == '/') *p = '\\';
+	    ofn.lpstrInitialDir = cwd;
+	} else {
+	    if (GetCurrentDirectory(MAX_PATH, cwd))
 		ofn.lpstrInitialDir = cwd;
 	    else
 		ofn.lpstrInitialDir = NULL;