projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When loading SSH-2 key, ignore passphrase argument if key is unencrypted.
[u/mdw/putty]
/
winmisc.c
diff --git
a/winmisc.c
b/winmisc.c
index
916e988
..
a524b96
100644
(file)
--- a/
winmisc.c
+++ b/
winmisc.c
@@
-8,6
+8,8
@@
#include "putty.h"
#include "winstuff.h"
#include "putty.h"
#include "winstuff.h"
+OSVERSIONINFO osVersion;
+
void platform_get_x11_auth(char *display, int *proto,
unsigned char *data, int *datalen)
{
void platform_get_x11_auth(char *display, int *proto,
unsigned char *data, int *datalen)
{
@@
-37,6
+39,21
@@
int filename_is_null(Filename fn)
return !*fn.path;
}
return !*fn.path;
}
+char *get_username(void)
+{
+ DWORD namelen;
+ char *user;
+
+ namelen = 0;
+ if (GetUserName(NULL, &namelen) == FALSE)
+ return NULL;
+
+ user = snewn(namelen, char);
+ GetUserName(user, &namelen);
+
+ return user;
+}
+
int SaneDialogBox(HINSTANCE hinst,
LPCTSTR tmpl,
HWND hwndparent,
int SaneDialogBox(HINSTANCE hinst,
LPCTSTR tmpl,
HWND hwndparent,
@@
-88,6
+105,13
@@
void SaneEndDialog(HWND hwnd, int ret)
SetWindowLong(hwnd, BOXFLAGS, DF_END);
}
SetWindowLong(hwnd, BOXFLAGS, DF_END);
}
+BOOL init_winver(void)
+{
+ ZeroMemory(&osVersion, sizeof(osVersion));
+ osVersion.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
+ return GetVersionEx ( (OSVERSIONINFO *) &osVersion);
+}
+
#ifdef DEBUG
static FILE *debug_fp = NULL;
static HANDLE debug_hdl = INVALID_HANDLE_VALUE;
#ifdef DEBUG
static FILE *debug_fp = NULL;
static HANDLE debug_hdl = INVALID_HANDLE_VALUE;