projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Weaken the assertion in general_textout(). It was failing in the
[u/mdw/putty]
/
windows
/
window.c
diff --git
a/windows/window.c
b/windows/window.c
index
7f23767
..
b2dd5e6
100644
(file)
--- a/
windows/window.c
+++ b/
windows/window.c
@@
-1325,7
+1325,7
@@
debug(("\n rect: [%d,%d %d,%d]\n", newrc.left, newrc.top, newrc.right,
#ifdef FIXME_REMOVE_BEFORE_CHECKIN
debug(("general_textout: done, xn=%d\n", xn));
#endif
#ifdef FIXME_REMOVE_BEFORE_CHECKIN
debug(("general_textout: done, xn=%d\n", xn));
#endif
- assert(xn - x
=
= lprc->right - lprc->left);
+ assert(xn - x
>
= lprc->right - lprc->left);
}
/*
}
/*
@@
-2247,7
+2247,7
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
term_copyall(term);
break;
case IDM_PASTE:
term_copyall(term);
break;
case IDM_PASTE:
-
term_do_paste(term
);
+
request_paste(NULL
);
break;
case IDM_CLRSB:
term_clrsb(term);
break;
case IDM_CLRSB:
term_clrsb(term);
@@
-3813,7
+3813,7
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
return 0;
}
if (wParam == VK_INSERT && shift_state == 1) {
return 0;
}
if (wParam == VK_INSERT && shift_state == 1) {
-
term_do_paste(term
);
+
request_paste(NULL
);
return 0;
}
if (left_alt && wParam == VK_F4 && cfg.alt_f4) {
return 0;
}
if (left_alt && wParam == VK_F4 && cfg.alt_f4) {
@@
-4920,8
+4920,6
@@
static DWORD WINAPI clipboard_read_threadfunc(void *param)
static int process_clipdata(HGLOBAL clipdata, int unicode)
{
static int process_clipdata(HGLOBAL clipdata, int unicode)
{
- static wchar_t *converted = 0;
-
sfree(clipboard_contents);
clipboard_contents = NULL;
clipboard_length = 0;
sfree(clipboard_contents);
clipboard_contents = NULL;
clipboard_length = 0;