~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for `pageant-dirhandle': a new wrapper functions `request_file()' maintains
[sgt/putty]
/
windows
/
window.c
diff --git
a/windows/window.c
b/windows/window.c
index
8046774
..
b3d350b
100644
(file)
--- a/
windows/window.c
+++ b/
windows/window.c
@@
-166,8
+166,6
@@
static HPALETTE pal;
static LPLOGPALETTE logpal;
static RGBTRIPLE defpal[NALLCOLOURS];
static LPLOGPALETTE logpal;
static RGBTRIPLE defpal[NALLCOLOURS];
-static HWND hwnd;
-
static HBITMAP caretbm;
static int dbltime, lasttime, lastact;
static HBITMAP caretbm;
static int dbltime, lasttime, lastact;
@@
-342,13
+340,13
@@
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
if (p && p >= r) r = p+1;
q = strrchr(b, ':');
if (q && q >= r) r = q+1;
if (p && p >= r) r = p+1;
q = strrchr(b, ':');
if (q && q >= r) r = q+1;
- strcpy(r,
"putty.hlp"
);
+ strcpy(r,
PUTTY_HELP_FILE
);
if ( (fp = fopen(b, "r")) != NULL) {
help_path = dupstr(b);
fclose(fp);
} else
help_path = NULL;
if ( (fp = fopen(b, "r")) != NULL) {
help_path = dupstr(b);
fclose(fp);
} else
help_path = NULL;
- strcpy(r,
"putty.cnt"
);
+ strcpy(r,
PUTTY_HELP_CONTENTS
);
if ( (fp = fopen(b, "r")) != NULL) {
help_has_contents = TRUE;
fclose(fp);
if ( (fp = fopen(b, "r")) != NULL) {
help_has_contents = TRUE;
fclose(fp);
@@
-1862,7
+1860,7
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
if (!cfg.warn_on_close || session_closed ||
MessageBox(hwnd,
"Are you sure you want to close this session?",
if (!cfg.warn_on_close || session_closed ||
MessageBox(hwnd,
"Are you sure you want to close this session?",
- str, MB_ICONWARNING | MB_OKCANCEL | MB_DEFBUTTON
2
)
+ str, MB_ICONWARNING | MB_OKCANCEL | MB_DEFBUTTON
1
)
== IDOK)
DestroyWindow(hwnd);
sfree(str);
== IDOK)
DestroyWindow(hwnd);
sfree(str);