~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extra diagnostics in the hope that we can track down the problem with
[sgt/putty]
/
pageant.c
diff --git
a/pageant.c
b/pageant.c
index
6f94262
..
50ac337
100644
(file)
--- a/
pageant.c
+++ b/
pageant.c
@@
-170,7
+170,7
@@
static int CALLBACK AboutProc (HWND hwnd, UINT msg,
*/
static int CALLBACK PassphraseProc(HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam) {
*/
static int CALLBACK PassphraseProc(HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam) {
- static char *passphrase;
+ static char *passphrase
= NULL
;
struct PassphraseProcStruct *p;
switch (msg) {
struct PassphraseProcStruct *p;
switch (msg) {
@@
-197,6
+197,7
@@
static int CALLBACK PassphraseProc(HWND hwnd, UINT msg,
if (p->comment)
SetDlgItemText(hwnd, 101, p->comment);
*passphrase = 0;
if (p->comment)
SetDlgItemText(hwnd, 101, p->comment);
*passphrase = 0;
+ SetDlgItemText (hwnd, 102, passphrase);
return 0;
case WM_COMMAND:
switch (LOWORD(wParam)) {
return 0;
case WM_COMMAND:
switch (LOWORD(wParam)) {
@@
-210,7
+211,7
@@
static int CALLBACK PassphraseProc(HWND hwnd, UINT msg,
EndDialog (hwnd, 0);
return 0;
case 102: /* edit box */
EndDialog (hwnd, 0);
return 0;
case 102: /* edit box */
- if (
HIWORD(wParam) == EN_CHANGE
) {
+ if (
(HIWORD(wParam) == EN_CHANGE) && passphrase
) {
GetDlgItemText (hwnd, 102, passphrase, PASSPHRASE_MAXLEN-1);
passphrase[PASSPHRASE_MAXLEN-1] = '\0';
}
GetDlgItemText (hwnd, 102, passphrase, PASSPHRASE_MAXLEN-1);
passphrase[PASSPHRASE_MAXLEN-1] = '\0';
}
@@
-1094,11
+1095,11
@@
static LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
if (mapname[cds->cbData - 1] != '\0')
return 0; /* failure to be ASCIZ! */
#ifdef DEBUG_IPC
if (mapname[cds->cbData - 1] != '\0')
return 0; /* failure to be ASCIZ! */
#ifdef DEBUG_IPC
- debug(("mapname is :%s:\
r\
n", mapname));
+ debug(("mapname is :%s:\n", mapname));
#endif
filemap = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, mapname);
#ifdef DEBUG_IPC
#endif
filemap = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, mapname);
#ifdef DEBUG_IPC
- debug(("filemap is %p\
r\
n", filemap));
+ debug(("filemap is %p\n", filemap));
#endif
if (filemap != NULL && filemap != INVALID_HANDLE_VALUE) {
int rc;
#endif
if (filemap != NULL && filemap != INVALID_HANDLE_VALUE) {
int rc;
@@
-1107,7
+1108,7
@@
static LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
if ((proc = OpenProcess(MAXIMUM_ALLOWED, FALSE,
GetCurrentProcessId())) == NULL) {
#ifdef DEBUG_IPC
if ((proc = OpenProcess(MAXIMUM_ALLOWED, FALSE,
GetCurrentProcessId())) == NULL) {
#ifdef DEBUG_IPC
- debug(("couldn't get handle for process\
r\
n"));
+ debug(("couldn't get handle for process\n"));
#endif
return 0;
}
#endif
return 0;
}
@@
-1116,7
+1117,7
@@
static LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
&procowner, NULL, NULL, NULL,
&psd2) != ERROR_SUCCESS) {
#ifdef DEBUG_IPC
&procowner, NULL, NULL, NULL,
&psd2) != ERROR_SUCCESS) {
#ifdef DEBUG_IPC
- debug(("couldn't get owner info for process\
r\
n"));
+ debug(("couldn't get owner info for process\n"));
#endif
CloseHandle(proc);
return 0; /* unable to get security info */
#endif
CloseHandle(proc);
return 0; /* unable to get security info */
@@
-1127,30
+1128,30
@@
static LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
&mapowner, NULL, NULL, NULL,
&psd1) != ERROR_SUCCESS)) {
#ifdef DEBUG_IPC
&mapowner, NULL, NULL, NULL,
&psd1) != ERROR_SUCCESS)) {
#ifdef DEBUG_IPC
- debug(("couldn't get owner info for filemap: %d\
r\
n", rc));
+ debug(("couldn't get owner info for filemap: %d\n", rc));
#endif
return 0;
}
#ifdef DEBUG_IPC
#endif
return 0;
}
#ifdef DEBUG_IPC
- debug(("got security stuff\
r\
n"));
+ debug(("got security stuff\n"));
#endif
if (!EqualSid(mapowner, procowner))
return 0; /* security ID mismatch! */
#ifdef DEBUG_IPC
#endif
if (!EqualSid(mapowner, procowner))
return 0; /* security ID mismatch! */
#ifdef DEBUG_IPC
- debug(("security stuff matched\
r\
n"));
+ debug(("security stuff matched\n"));
#endif
LocalFree(psd1);
LocalFree(psd2);
} else {
#ifdef DEBUG_IPC
#endif
LocalFree(psd1);
LocalFree(psd2);
} else {
#ifdef DEBUG_IPC
- debug(("security APIs not present\
r\
n"));
+ debug(("security APIs not present\n"));
#endif
}
#endif
p = MapViewOfFile(filemap, FILE_MAP_WRITE, 0, 0, 0);
#ifdef DEBUG_IPC
#endif
}
#endif
p = MapViewOfFile(filemap, FILE_MAP_WRITE, 0, 0, 0);
#ifdef DEBUG_IPC
- debug(("p is %p\
r\
n", p));
- {int i; for(i=0;i<5;i++)debug(("p[%d]=%02x\
r\
n", i, ((unsigned char *)p)[i]));}
+ debug(("p is %p\n", p));
+ {int i; for(i=0;i<5;i++)debug(("p[%d]=%02x\n", i, ((unsigned char *)p)[i]));}
#endif
answer_msg(p);
ret = 1;
#endif
answer_msg(p);
ret = 1;