Mercurial > hg > xemacs-beta
changeset 672:42a8626b741e
[xemacs-hg @ 2001-10-26 02:42:53 by andyp]
more netinstaller fixes
| author | andyp |
|---|---|
| date | Fri, 26 Oct 2001 02:42:53 +0000 |
| parents | 53ec80338ec1 |
| children | 685b588e92d8 |
| files | netinstall/ChangeLog netinstall/desktop.cc netinstall/geturl.cc netinstall/nio-ftp.cc netinstall/res.rc netinstall/resource.h netinstall/state.h |
| diffstat | 7 files changed, 49 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/netinstall/ChangeLog Mon Oct 01 12:47:10 2001 +0000 +++ b/netinstall/ChangeLog Fri Oct 26 02:42:53 2001 +0000 @@ -1,3 +1,20 @@ +2001-10-25 Andy Piper <andy@xemacs.org> + + * desktop.cc: + * desktop.cc (do_desktop_setup): + * desktop.cc (load_dialog): + * desktop.cc (save_dialog): + * desktop.cc (do_desktop): handle idl file registration. + * geturl.cc (dialog): warning removal. + * geturl.cc (get_url_to_string): + * geturl.cc (get_url_to_file): make sure the nio gets deleted + after use, this also closes the inbound socket. + * nio-ftp.cc (ftp_line): fix from cygwin installer. + * nio-ftp.cc (NetIO_FTP): fix typeo. + * res.rc: support idl types. + * resource.h (IDC_IDL_TYPE): ditto. + * state.h: ditto. + 2001-09-24 Andy Piper <andy@xemacs.org> * desktop.cc: @@ -305,6 +322,6 @@ * all: port from cygwin setup. -%%% $Id: ChangeLog,v 1.8 2001/09/25 02:35:32 andyp Exp $ -$Revision: 1.8 $ +%%% $Id: ChangeLog,v 1.9 2001/10/26 02:42:53 andyp Exp $ +$Revision: 1.9 $
--- a/netinstall/desktop.cc Mon Oct 01 12:47:10 2001 +0000 +++ b/netinstall/desktop.cc Fri Oct 26 02:42:53 2001 +0000 @@ -316,6 +316,11 @@ log (0, "Registering .txt files"); setup_explorer ("txt", "Text file", batname); } + if (reg_idl) + { + log (0, "Registering .idl files"); + setup_explorer ("idl", "OMG IDL file", batname); + } } } } @@ -328,6 +333,7 @@ static int cppt[] = { IDC_CPP_TYPE, 0 }; static int elispt[] = { IDC_ELISP_TYPE, 0 }; static int txtt[] = { IDC_TXT_TYPE, 0 }; +static int idlt[] = { IDC_IDL_TYPE, 0 }; static void check_if_enable_next (HWND h) @@ -345,6 +351,7 @@ rbset (h, cppt, reg_cpp); rbset (h, elispt, reg_elisp); rbset (h, txtt, reg_txt); + rbset (h, idlt, reg_idl); check_if_enable_next (h); } @@ -418,6 +425,7 @@ reg_cpp = rbget (h, cppt); reg_elisp = rbget (h, elispt); reg_txt = rbget (h, txtt); + reg_idl = rbget (h, idlt); } static BOOL @@ -487,6 +495,7 @@ reg_java = IDC_JAVA_TYPE; reg_elisp = IDC_ELISP_TYPE; reg_txt = IDC_TXT_TYPE; + reg_idl = IDC_IDL_TYPE; } else { @@ -497,6 +506,7 @@ reg_java = 0; reg_elisp = 0; reg_txt = 0; + reg_idl = 0; } int rv = 0;
--- a/netinstall/geturl.cc Mon Oct 01 12:47:10 2001 +0000 +++ b/netinstall/geturl.cc Fri Oct 26 02:42:53 2001 +0000 @@ -72,10 +72,10 @@ dialog (void *) { MSG m; - HWND gw_dialog = CreateDialog (hinstance, MAKEINTRESOURCE (IDD_DLSTATUS), + HWND lgw_dialog = CreateDialog (hinstance, MAKEINTRESOURCE (IDD_DLSTATUS), 0, dialog_proc); - ShowWindow (gw_dialog, SW_SHOWNORMAL); - UpdateWindow (gw_dialog); + ShowWindow (lgw_dialog, SW_SHOWNORMAL); + UpdateWindow (lgw_dialog); while (GetMessage (&m, 0, 0, 0) > 0) { TranslateMessage (&m); DispatchMessage (&m); @@ -197,6 +197,10 @@ bufs = tmp; } *rvp = 0; + + if (n) + delete n; + return rv; } @@ -244,6 +248,9 @@ fclose (f); + if (n) + delete n; + return 0; }
--- a/netinstall/nio-ftp.cc Mon Oct 01 12:47:10 2001 +0000 +++ b/netinstall/nio-ftp.cc Fri Oct 26 02:42:53 2001 +0000 @@ -43,7 +43,7 @@ last_line = s->gets (); log (LOG_BABBLE, "ftp > %s", last_line); } while (last_line && (!isdigit (last_line[0]) || last_line[3] != ' ')); - return atoi (last_line ? last_line : "0"); + return atoi (last_line ?: "0"); } NetIO_FTP::NetIO_FTP (char *Purl) @@ -73,7 +73,7 @@ code = ftp_line (c); if (code == 331) { - c->printf ("PASS xenacs-setup@\r\n"); + c->printf ("PASS xemacs-setup@\r\n"); code = ftp_line (c); }
--- a/netinstall/res.rc Mon Oct 01 12:47:10 2001 +0000 +++ b/netinstall/res.rc Fri Oct 26 02:42:53 2001 +0000 @@ -147,15 +147,15 @@ CAPTION "XEmacs Setup" FONT 8, "MS Sans Serif" BEGIN - PUSHBUTTON "Next >",IDOK,199,176,45,15, WS_GROUP + PUSHBUTTON "Next >",IDOK,199,176,45,15,WS_GROUP PUSHBUTTON "< Back",IDC_BACK,154,176,45,15 PUSHBUTTON "Cancel",IDCANCEL,256,176,45,15 LTEXT "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP LTEXT "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP LTEXT "Setup will use the following connection method.", - IDC_STATIC,112,11,170,17, NOT WS_GROUP + IDC_STATIC,112,11,170,17,NOT WS_GROUP LTEXT "To exit setup click Cancel at any time.",IDC_STATIC,112, - 32,166,17, NOT WS_GROUP + 32,166,17,NOT WS_GROUP CONTROL "Use IE5 Settings",IDC_NET_IE5,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,128,93,69,10 CONTROL "Direct Connection",IDC_NET_DIRECT,"Button", @@ -347,6 +347,7 @@ LTEXT "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP LTEXT "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP CONTROL "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62 + CONTROL "IDL",IDC_IDL_TYPE,"Button",BS_AUTOCHECKBOX,209,116,38,8 END @@ -469,6 +470,7 @@ BEGIN VERTGUIDE, 113 VERTGUIDE, 209 + HORZGUIDE, 124 END END #endif // APSTUDIO_INVOKED @@ -514,7 +516,7 @@ IDS_ERR_OPEN_READ "Can't open %s for reading: %s" IDS_ROOT_ABSOLUTE "The install directory must be absolute, with both a drive letter and leading slash, like C:\\Cygwin" IDS_DOWNLOAD_COMPLETE "Download Complete" - IDS_CVSID "\n%%% $Id: res.rc,v 1.5 2001/09/25 02:35:32 andyp Exp $\n" + IDS_CVSID "\n%%% $Id: res.rc,v 1.6 2001/10/26 02:42:53 andyp Exp $\n" IDS_NOLOGFILE "Cannot open log file %s for writing" IDS_UNINSTALL_COMPLETE "Uninstalls complete." IDS_WININET "Unable to find or load the Internet Explorer 5 DLLs"
--- a/netinstall/resource.h Mon Oct 01 12:47:10 2001 +0000 +++ b/netinstall/resource.h Fri Oct 26 02:42:53 2001 +0000 @@ -105,6 +105,7 @@ #define IDC_UNINS_PKG 1047 #define IDC_ELISP_TYPE 1047 #define IDC_UNINS_FILE 1048 +#define IDC_IDL_TYPE 1048 #define IDC_UNINS_DISKFULL 1049 #define IDC_UNINS_IPROGRESS 1050 #define IDC_UNINS_PPROGRESS 1051