X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwsettings.c;h=d628913cdd98480d0aa65f260c3418506d66dcfe;hb=085982e238267d18e0c6b192ca25a7b998631a42;hp=86a94175a567e56ac30c14d14cd84c6e9aca3594;hpb=be12082df5c3ef2c7ef9fe133d1ff397acec7a33;p=xboard.git

diff --git a/winboard/wsettings.c b/winboard/wsettings.c
index 86a9417..d628913 100644
--- a/winboard/wsettings.c
+++ b/winboard/wsettings.c
@@ -326,8 +326,8 @@ GetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
 // read out all controls, and if value is altered, remember it and send it to the engine
 {
     HANDLE hwndCombo;
-    int i, k, new=0, changed=0;
-    char **choices, newText[MSG_SIZ], buf[MSG_SIZ];
+    int i, k, new=0, changed=0, len;
+    char **choices, newText[MSG_SIZ], buf[MSG_SIZ], *text;
     BOOL success;
 
     for(i=0; i<layout; i++) {
@@ -346,11 +346,15 @@ GetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
 	    case TextBox:
 	    case FileName:
 	    case PathName:
-		success = GetDlgItemText( hDlg, 2001+2*i, newText, MSG_SIZ - strlen(optionList[j].name) - 9 );
+		if(cps) len = MSG_SIZ - strlen(optionList[j].name) - 9, text = newText;
+		else    len = GetWindowTextLength(GetDlgItem(hDlg, 2001+2*i)) + 1, text = (char*) malloc(len);
+		success = GetDlgItemText( hDlg, 2001+2*i, text, len );
 		if(!success) break;
 		if(!cps) {
+		    char *p;
 		    if(*(char**)optionList[j].target) free(*(char**)optionList[j].target);
-		    *(char**)optionList[j].target = strdup(newText);
+		    *(char**)optionList[j].target = p = text;
+		    while(*p++ = *text++) if(p[-1] == '\r') p--; // crush CR
 		    break;
 		}
 		changed = strcmp(optionList[j].textValue, newText) != 0;
@@ -392,10 +396,12 @@ GetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
     if(!cps && okFunc) ((ButtonCallback*) okFunc)(0);
 }
 
+char *defaultExt[] = { NULL, "pgn", "fen", "exe", "trn", "bin", "log", "ini" };
+
 LRESULT CALLBACK SettingsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     char buf[MSG_SIZ];
-    int i, j;
+    int i, j, ext;
 
     switch( message )
     {
@@ -441,7 +447,8 @@ LRESULT CALLBACK SettingsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
 		          ofn.hwndOwner = hDlg;
 		          ofn.hInstance = hInst;
 		          ofn.lpstrFilter = filter;
-			  ofn.nFilterIndex      = 1L + (activeCps ? 0 : activeList[layoutList[(i-2000)/2+1]].max);
+			  ofn.nFilterIndex      = 1L + (ext = activeCps ? 0 : activeList[layoutList[(i-2000)/2+1]].max);
+			  ofn.lpstrDefExt       = defaultExt[ext];
 		          ofn.lpstrFile = buf;
 		          ofn.nMaxFile = sizeof(buf);
 		          ofn.lpstrTitle = _("Choose File");