Differences From Artifact [e956a417c2]:

• File window.c — part of check-in [483cb38b72] at 2003-01-14 12:28:23 on branch trunk — Deglobalise the Unicode module. Despite all my grand plans, I've just done this the very simple way - bundle all the globals into a data structure and pass pointers around. One particularly ugly wart is that wc_to_mb now takes a pointer to this structure as an argument (optional, may be NULL, and unused in any Unicode layer that's even marginally less of a mess than the Windows one). I do need to do this properly at some point, but for now this should just about be adequate. As usual, the Mac port has not been updated. (user: simon size: 119162)

To Artifact [1390de5af6]:

• File window.c — part of check-in [10b8c5f189] at 2003-01-15 08:51:54 on branch trunk — Use set_icon and set_title rather than SetWindowText. Should fix inactive-title. (user: owen size: 119232)

902
903
904
905
906
907
908
909

910
911
912
913
914
915
916

    vsprintf(stuff, fmt, ap);
    va_end(ap);
    MessageBox(hwnd, stuff, "PuTTY Fatal Error", MB_ICONERROR | MB_OK);
    if (cfg.close_on_exit == COE_ALWAYS)
	PostQuitMessage(1);
    else {
	session_closed = TRUE;
	SetWindowText(hwnd, "PuTTY (inactive)");

    }
}

/*
 * Report an error at the command-line parsing stage.
 */
void cmdline_error(char *fmt, ...)

|
>

902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917

    vsprintf(stuff, fmt, ap);
    va_end(ap);
    MessageBox(hwnd, stuff, "PuTTY Fatal Error", MB_ICONERROR | MB_OK);
    if (cfg.close_on_exit == COE_ALWAYS)
	PostQuitMessage(1);
    else {
	session_closed = TRUE;
	set_icon(NULL, "PuTTY (inactive)");
	set_title(NULL, "PuTTY (inactive)");
    }
}

/*
 * Report an error at the command-line parsing stage.
 */
void cmdline_error(char *fmt, ...)

946
947
948
949
950
951
952
953

954
955
956
957
958
959
960

    if (ret == 0 && !session_closed) {
	/* Abnormal exits will already have set session_closed and taken
	 * appropriate action. */
	if (cfg.close_on_exit == COE_ALWAYS ||
	    cfg.close_on_exit == COE_NORMAL) PostQuitMessage(0);
	else {
	    session_closed = TRUE;
	    SetWindowText(hwnd, "PuTTY (inactive)");

	    MessageBox(hwnd, "Connection closed by remote host",
		       "PuTTY", MB_OK | MB_ICONINFORMATION);
	}
    }
}

/*

|
>

947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962

    if (ret == 0 && !session_closed) {
	/* Abnormal exits will already have set session_closed and taken
	 * appropriate action. */
	if (cfg.close_on_exit == COE_ALWAYS ||
	    cfg.close_on_exit == COE_NORMAL) PostQuitMessage(0);
	else {
	    session_closed = TRUE;
	    set_icon(NULL, "PuTTY (inactive)");
	    set_title(NULL, "PuTTY (inactive)");
	    MessageBox(hwnd, "Connection closed by remote host",
		       "PuTTY", MB_OK | MB_ICONINFORMATION);
	}
    }
}

/*