#include <limits.h>
#include <assert.h>
+#ifdef __WINE__
+#define NO_MULTIMON /* winelib doesn't have this */
+#endif
+
#ifndef NO_MULTIMON
#define COMPILE_MULTIMON_STUBS
#endif
#include "terminal.h"
#include "storage.h"
#include "win_res.h"
+#include "winsecur.h"
#ifndef NO_MULTIMON
#include <multimon.h>
#define WHEEL_DELTA 120
#endif
+/* VK_PACKET, used to send Unicode characters in WM_KEYDOWNs */
+#ifndef VK_PACKET
+#define VK_PACKET 0xE7
+#endif
+
static Mouse_Button translate_button(Mouse_Button button);
static LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
const int share_can_be_upstream = TRUE;
/* Dummy routine, only required in plink. */
-void ldisc_update(void *frontend, int echo, int edit)
+void frontend_echoedit_update(void *frontend, int echo, int edit)
{
}
+int frontend_is_utf8(void *frontend)
+{
+ return ucsdata.line_codepage == CP_UTF8;
+}
+
char *get_ttymode(void *frontend, const char *mode)
{
return term_get_ttymode(term, mode);
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
{
- WNDCLASS wndclass;
MSG msg;
HRESULT hr;
int guess_width, guess_height;
+ dll_hijacking_protection();
+
hinst = inst;
hwnd = NULL;
flags = FLAG_VERBOSE | FLAG_INTERACTIVE;
InitCommonControls();
+ /* Set Explicit App User Model Id so that jump lists don't cause
+ PuTTY to hang on to removable media. */
+
+ set_explicit_app_user_model_id();
+
/* Ensure a Maximize setting in Explorer doesn't maximise the
* config box. */
defuse_showwindow();
* Process a couple of command-line options which are more
* easily dealt with before the line is broken up into words.
* These are the old-fashioned but convenient @sessionname and
- * the internal-use-only &sharedmemoryhandle, neither of which
- * are combined with anything else.
+ * the internal-use-only &sharedmemoryhandle, plus the &R
+ * prefix for -restrict-acl, all of which are used by PuTTYs
+ * auto-launching each other via System-menu options.
*/
while (*p && isspace(*p))
p++;
+ if (*p == '&' && p[1] == 'R' &&
+ (!p[2] || p[2] == '@' || p[2] == '&')) {
+ /* &R restrict-acl prefix */
+ restrict_process_acl();
+ restricted_acl = TRUE;
+ p += 2;
+ }
+
if (*p == '@') {
/*
* An initial @ means that the whole of the rest of the
cleanup_exit(0);
}
allow_launch = TRUE;
- } else {
+ } else if (!*p) {
+ /* Do-nothing case for an empty command line - or rather,
+ * for a command line that's empty _after_ we strip off
+ * the &R prefix. */
+ } else {
/*
* Otherwise, break up the command line and deal with
* it sensibly.
i++; /* skip next argument */
} else if (ret == 1) {
continue; /* nothing further needs doing */
- } else if (!strcmp(p, "-cleanup") ||
- !strcmp(p, "-cleanup-during-uninstall")) {
+ } else if (!strcmp(p, "-cleanup")) {
/*
* `putty -cleanup'. Remove all registry
* entries associated with PuTTY, and also find
* and delete the random seed file.
*/
char *s1, *s2;
- /* Are we being invoked from an uninstaller? */
- if (!strcmp(p, "-cleanup-during-uninstall")) {
- s1 = dupprintf("Remove saved sessions and random seed file?\n"
- "\n"
- "If you hit Yes, ALL Registry entries associated\n"
- "with %s will be removed, as well as the\n"
- "random seed file. THIS PROCESS WILL\n"
- "DESTROY YOUR SAVED SESSIONS.\n"
- "(This only affects the currently logged-in user.)\n"
- "\n"
- "If you hit No, uninstallation will proceed, but\n"
- "saved sessions etc will be left on the machine.",
- appname);
- s2 = dupprintf("%s Uninstallation", appname);
- } else {
- s1 = dupprintf("This procedure will remove ALL Registry entries\n"
- "associated with %s, and will also remove\n"
- "the random seed file. (This only affects the\n"
- "currently logged-in user.)\n"
- "\n"
- "THIS PROCESS WILL DESTROY YOUR SAVED SESSIONS.\n"
- "Are you really sure you want to continue?",
- appname);
- s2 = dupprintf("%s Warning", appname);
- }
+ s1 = dupprintf("This procedure will remove ALL Registry entries\n"
+ "associated with %s, and will also remove\n"
+ "the random seed file. (This only affects the\n"
+ "currently logged-in user.)\n"
+ "\n"
+ "THIS PROCESS WILL DESTROY YOUR SAVED SESSIONS.\n"
+ "Are you really sure you want to continue?",
+ appname);
+ s2 = dupprintf("%s Warning", appname);
if (message_box(s1, s2,
MB_YESNO | MB_ICONWARNING | MB_DEFBUTTON2,
HELPCTXID(option_cleanup)) == IDYES) {
}
if (!prev) {
+ WNDCLASSW wndclass;
+
wndclass.style = 0;
wndclass.lpfnWndProc = WndProc;
wndclass.cbClsExtra = 0;
wndclass.hCursor = LoadCursor(NULL, IDC_IBEAM);
wndclass.hbrBackground = NULL;
wndclass.lpszMenuName = NULL;
- wndclass.lpszClassName = appname;
+ wndclass.lpszClassName = dup_mb_to_wc(DEFAULT_CODEPAGE, 0, appname);
- RegisterClass(&wndclass);
+ RegisterClassW(&wndclass);
}
memset(&ucsdata, 0, sizeof(ucsdata));
{
int winmode = WS_OVERLAPPEDWINDOW | WS_VSCROLL;
int exwinmode = 0;
+ wchar_t *uappname = dup_mb_to_wc(DEFAULT_CODEPAGE, 0, appname);
if (!conf_get_int(conf, CONF_scrollbar))
winmode &= ~(WS_VSCROLL);
if (conf_get_int(conf, CONF_resize_action) == RESIZE_DISABLED)
exwinmode |= WS_EX_TOPMOST;
if (conf_get_int(conf, CONF_sunken_edge))
exwinmode |= WS_EX_CLIENTEDGE;
- hwnd = CreateWindowEx(exwinmode, appname, appname,
- winmode, CW_USEDEFAULT, CW_USEDEFAULT,
- guess_width, guess_height,
- NULL, NULL, inst, NULL);
+ hwnd = CreateWindowExW(exwinmode, uappname, uappname,
+ winmode, CW_USEDEFAULT, CW_USEDEFAULT,
+ guess_width, guess_height,
+ NULL, NULL, inst, NULL);
+ sfree(uappname);
}
/*
AppendMenu(m, MF_SEPARATOR, 0, 0);
AppendMenu(m, MF_ENABLED, IDM_NEWSESS, "Ne&w Session...");
AppendMenu(m, MF_ENABLED, IDM_DUPSESS, "&Duplicate Session");
- AppendMenu(m, MF_POPUP | MF_ENABLED, (UINT) savedsess_menu,
+ AppendMenu(m, MF_POPUP | MF_ENABLED, (UINT_PTR) savedsess_menu,
"Sa&ved Sessions");
AppendMenu(m, MF_ENABLED, IDM_RECONF, "Chan&ge Settings...");
AppendMenu(m, MF_SEPARATOR, 0, 0);
}
}
+ if (restricted_acl) {
+ logevent(NULL, "Running with restricted process ACL");
+ }
+
start_backend();
/*
} else
sfree(handles);
- if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
+ while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) {
if (msg.message == WM_QUIT)
goto finished; /* two-level break */
if (!(IsWindow(logbox) && IsDialogMessage(logbox, &msg)))
- DispatchMessage(&msg);
+ DispatchMessageW(&msg);
+
+ /*
+ * WM_NETEVENT messages seem to jump ahead of others in
+ * the message queue. I'm not sure why; the docs for
+ * PeekMessage mention that messages are prioritised in
+ * some way, but I'm unclear on which priorities go where.
+ *
+ * Anyway, in practice I observe that WM_NETEVENT seems to
+ * jump to the head of the queue, which means that if we
+ * were to only process one message every time round this
+ * loop, we'd get nothing but NETEVENTs if the server
+ * flooded us with data, and stop responding to any other
+ * kind of window message. So instead, we keep on round
+ * this loop until we've consumed at least one message
+ * that _isn't_ a NETEVENT, or run out of messages
+ * completely (whichever comes first). And we don't go to
+ * run_toplevel_callbacks (which is where the netevents
+ * are actually processed, causing fresh NETEVENT messages
+ * to appear) until we've done this.
+ */
+ if (msg.message != WM_NETEVENT)
+ break;
}
run_toplevel_callbacks();
saved_menu = new_menu; /* XXX lame stacking */
new_menu = CreatePopupMenu();
AppendMenu(saved_menu, MF_POPUP | MF_ENABLED,
- (UINT) new_menu, specials[i].name);
+ (UINT_PTR) new_menu, specials[i].name);
break;
case TS_EXITMENU:
nesting--;
for (j = 0; j < lenof(popup_menus); j++) {
if (specials_menu) {
/* XXX does this free up all submenus? */
- DeleteMenu(popup_menus[j].menu, (UINT)specials_menu, MF_BYCOMMAND);
+ DeleteMenu(popup_menus[j].menu, (UINT_PTR)specials_menu,
+ MF_BYCOMMAND);
DeleteMenu(popup_menus[j].menu, IDM_SPECIALSEP, MF_BYCOMMAND);
}
if (new_menu) {
InsertMenu(popup_menus[j].menu, IDM_SHOWLOG,
MF_BYCOMMAND | MF_POPUP | MF_ENABLED,
- (UINT) new_menu, "S&pecial Command");
+ (UINT_PTR) new_menu, "S&pecial Command");
InsertMenu(popup_menus[j].menu, IDM_SHOWLOG,
MF_BYCOMMAND | MF_SEPARATOR, IDM_SPECIALSEP, 0);
}
/*
* Print a message box and close the connection.
*/
-void connection_fatal(void *frontend, char *fmt, ...)
+void connection_fatal(void *frontend, const char *fmt, ...)
{
va_list ap;
char *stuff, morestuff[100];
/*
* Report an error at the command-line parsing stage.
*/
-void cmdline_error(char *fmt, ...)
+void cmdline_error(const char *fmt, ...)
{
va_list ap;
char *stuff, morestuff[100];
if (cset == OEM_CHARSET)
ucsdata.font_codepage = GetOEMCP();
else
- if (TranslateCharsetInfo ((DWORD *) cset, &info, TCI_SRCCHARSET))
+ if (TranslateCharsetInfo ((DWORD *)(ULONG_PTR)cset,
+ &info, TCI_SRCCHARSET))
ucsdata.font_codepage = info.ciACP;
else
ucsdata.font_codepage = -1;
case IDM_SAVEDSESS:
{
char b[2048];
- char c[30], *cl;
- int freecl = FALSE;
+ char *cl;
+ const char *argprefix;
BOOL inherit_handles;
STARTUPINFO si;
PROCESS_INFORMATION pi;
HANDLE filemap = NULL;
+ if (restricted_acl)
+ argprefix = "&R";
+ else
+ argprefix = "";
+
if (wParam == IDM_DUPSESS) {
/*
* Allocate a file-mapping memory chunk for the
}
}
inherit_handles = TRUE;
- sprintf(c, "putty &%p:%u", filemap, (unsigned)size);
- cl = c;
+ cl = dupprintf("putty %s&%p:%u", argprefix,
+ filemap, (unsigned)size);
} else if (wParam == IDM_SAVEDSESS) {
unsigned int sessno = ((lParam - IDM_SAVED_MIN)
/ MENU_SAVED_STEP) + 1;
if (sessno < (unsigned)sesslist.nsessions) {
- char *session = sesslist.sessions[sessno];
- cl = dupprintf("putty @%s", session);
+ const char *session = sesslist.sessions[sessno];
+ cl = dupprintf("putty %s@%s", argprefix, session);
inherit_handles = FALSE;
- freecl = TRUE;
} else
break;
} else /* IDM_NEWSESS */ {
- cl = NULL;
+ cl = dupprintf("putty%s%s",
+ *argprefix ? " " : "",
+ argprefix);
inherit_handles = FALSE;
}
if (filemap)
CloseHandle(filemap);
- if (freecl)
- sfree(cl);
+ sfree(cl);
}
break;
case IDM_RESTART:
* Flush the line discipline's edit buffer in the
* case where local editing has just been disabled.
*/
- ldisc_configure(ldisc, conf);
- if (ldisc)
- ldisc_send(ldisc, NULL, 0, 0);
+ if (ldisc) {
+ ldisc_configure(ldisc, conf);
+ ldisc_echoedit_update(ldisc);
+ }
if (pal)
DeleteObject(pal);
logpal = NULL;
case IDM_RESET:
term_pwron(term, TRUE);
if (ldisc)
- ldisc_send(ldisc, NULL, 0, 0);
+ ldisc_echoedit_update(ldisc);
break;
case IDM_ABOUT:
showabout(hwnd);
unsigned char buf[20];
int len;
- if (wParam == VK_PROCESSKEY) { /* IME PROCESS key */
+ if (wParam == VK_PROCESSKEY || /* IME PROCESS key */
+ wParam == VK_PACKET) { /* 'this key is a Unicode char' */
if (message == WM_KEYDOWN) {
MSG m;
m.hwnd = hwnd;
} else {
len = TranslateKey(message, wParam, lParam, buf);
if (len == -1)
- return DefWindowProc(hwnd, message, wParam, lParam);
+ return DefWindowProcW(hwnd, message, wParam, lParam);
if (len != 0) {
/*
*/
term_seen_key_event(term);
if (ldisc)
- ldisc_send(ldisc, buf, len, 1);
+ ldisc_send(ldisc, (char *)buf, len, 1);
show_mouseptr(0);
}
}
case WM_IME_CHAR:
if (wParam & 0xFF00) {
- unsigned char buf[2];
+ char buf[2];
buf[1] = wParam;
buf[0] = wParam >> 8;
* we're ready to cope.
*/
{
- char c = (unsigned char)wParam;
- term_seen_key_event(term);
- if (ldisc)
- lpage_send(ldisc, CP_ACP, &c, 1, 1);
+ static wchar_t pending_surrogate = 0;
+ wchar_t c = wParam;
+
+ if (IS_HIGH_SURROGATE(c)) {
+ pending_surrogate = c;
+ } else if (IS_SURROGATE_PAIR(pending_surrogate, c)) {
+ wchar_t pair[2];
+ pair[0] = pending_surrogate;
+ pair[1] = c;
+ term_seen_key_event(term);
+ luni_send(ldisc, pair, 2, 1);
+ } else if (!IS_SURROGATE(c)) {
+ term_seen_key_event(term);
+ luni_send(ldisc, &c, 1, 1);
+ }
}
return 0;
case WM_SYSCOLORCHANGE:
* Any messages we don't process completely above are passed through to
* DefWindowProc() for default processing.
*/
- return DefWindowProc(hwnd, message, wParam, lParam);
+ return DefWindowProcW(hwnd, message, wParam, lParam);
}
/*
*p++ = "hH\010\010"[shift_state & 3];
return p - output;
case VK_NUMPAD5:
- *p++ = shift_state ? '.' : '.';
+ *p++ = '.';
return p - output;
case VK_NUMPAD6:
*p++ = "lL\014\014"[shift_state & 3];
break;
}
if (xkey) {
- p += format_arrow_key(p, term, xkey, shift_state);
+ p += format_arrow_key((char *)p, term, xkey, shift_state);
return p - output;
}
}
/*
* Print a message box and perform a fatal exit.
*/
-void fatalbox(char *fmt, ...)
+void fatalbox(const char *fmt, ...)
{
va_list ap;
char *stuff, morestuff[100];
/*
* Print a modal (Really Bad) message box and perform a fatal exit.
*/
-void modalfatalbox(char *fmt, ...)
+void modalfatalbox(const char *fmt, ...)
{
va_list ap;
char *stuff, morestuff[100];
/*
* Print a message box and don't close the connection.
*/
-void nonfatal(char *fmt, ...)
+void nonfatal(const char *fmt, ...)
{
va_list ap;
char *stuff, morestuff[100];
return TRUE; /* do respond to incoming EOF with outgoing */
}
-int get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
+int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen)
{
int ret;
ret = cmdline_get_passwd_input(p, in, inlen);
projects / PuTTY.git / blobdiff