kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates all constants for TS_INFO_PACKET flags to

Browse Source 
much names in specification.



git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/rdesktop/trunk@1817 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Henrik Andersson 2014-06-27 13:49:19 +00:00
parent 1c97aa5be1
commit a87ed59ad4
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
constants.h
View File

@ -318,13 +318,16 @@ enum RDP_INPUT_DEVICE
#define RDP_SOURCE "MSTSC" #define RDP_SOURCE "MSTSC"
/* Logon flags */ /* Logon flags */
#define RDP_LOGON_AUTO 0x0008 #define RDP_INFO_MOUSE 0x00000001
#define RDP_LOGON_NORMAL 0x0033 #define RDP_INFO_DISABLECTRLALTDEL 0x00000002
#define RDP_LOGON_COMPRESSION 0x0080 /* mppc compression with 8kB histroy buffer */ #define RDP_INFO_AUTOLOGON 0x00000008
#define RDP_LOGON_ENABLEWINDOWSKEY 0x0100 #define RDP_INFO_UNICODE 0x00000010
#define RDP_LOGON_COMPRESSION2 0x0200 /* rdp5 mppc compression with 64kB history buffer */ #define RDP_INFO_MAXIMIZESHELL 0x00000020
#define RDP_LOGON_LEAVE_AUDIO 0x2000 #define RDP_INFO_COMPRESSION 0x00000080 /* mppc compression with 8kB histroy buffer */
#define RDP_LOGON_PASSWORD_IS_SC_PIN 0x40000 #define RDP_INFO_ENABLEWINDOWSKEY 0x00000100
#define RDP_INFO_COMPRESSION2 0x00000200 /* rdp5 mppc compression with 64kB history buffer */
#define RDP_INFO_REMOTE_CONSOLE_AUDIO 0x00002000
#define RDP_INFO_PASSWORD_IS_SC_PIN 0x00040000
#define RDP5_DISABLE_NOTHING 0x00 #define RDP5_DISABLE_NOTHING 0x00
#define RDP5_NO_WALLPAPER 0x01 #define RDP5_NO_WALLPAPER 0x01

16
rdesktop.c
View File

@ -554,7 +554,11 @@ main(int argc, char *argv[])
act.sa_flags = 0; act.sa_flags = 0;
sigaction(SIGPIPE, &act, NULL); sigaction(SIGPIPE, &act, NULL);
flags = RDP_LOGON_NORMAL | RDP_LOGON_ENABLEWINDOWSKEY; /* setup default flags for TS_INFO_PACKET */
flags = RDP_INFO_MOUSE | RDP_INFO_DISABLECTRLALTDEL
| RDP_INFO_UNICODE | RDP_INFO_MAXIMIZESHELL
| RDP_INFO_ENABLEWINDOWSKEY;
prompt_password = False; prompt_password = False;
g_seamless_spawn_cmd[0] = domain[0] = g_password[0] = shell[0] = directory[0] = 0; g_seamless_spawn_cmd[0] = domain[0] = g_password[0] = shell[0] = directory[0] = 0;
g_embed_wnd = 0; g_embed_wnd = 0;
@ -624,7 +628,7 @@ main(int argc, char *argv[])
} }
STRNCPY(g_password, optarg, sizeof(g_password)); STRNCPY(g_password, optarg, sizeof(g_password));
flags |= RDP_LOGON_AUTO; flags |= RDP_INFO_AUTOLOGON;
/* try to overwrite argument so it won't appear in ps */ /* try to overwrite argument so it won't appear in ps */
p = optarg; p = optarg;
@ -772,7 +776,7 @@ main(int argc, char *argv[])
case 'z': case 'z':
DEBUG(("rdp compression enabled\n")); DEBUG(("rdp compression enabled\n"));
flags |= (RDP_LOGON_COMPRESSION | RDP_LOGON_COMPRESSION2); flags |= (RDP_INFO_COMPRESSION | RDP_INFO_COMPRESSION2);
break; break;
case 'x': case 'x':
@ -812,7 +816,7 @@ main(int argc, char *argv[])
while ((p = next_arg(optarg, ','))) while ((p = next_arg(optarg, ',')))
{ {
if (str_startswith(optarg, "remote")) if (str_startswith(optarg, "remote"))
flags |= RDP_LOGON_LEAVE_AUDIO; flags |= RDP_INFO_REMOTE_CONSOLE_AUDIO;
if (str_startswith(optarg, "local")) if (str_startswith(optarg, "local"))
#ifdef WITH_RDPSND #ifdef WITH_RDPSND
@ -1059,7 +1063,7 @@ main(int argc, char *argv[])
if (prompt_password && read_password(g_password, sizeof(g_password))) if (prompt_password && read_password(g_password, sizeof(g_password)))
flags |= RDP_LOGON_AUTO; flags |= RDP_INFO_AUTOLOGON;
if (g_title[0] == 0) if (g_title[0] == 0)
{ {
@ -1118,7 +1122,7 @@ main(int argc, char *argv[])
g_username = (char *) xmalloc(strlen(g_redirect_username) + 1); g_username = (char *) xmalloc(strlen(g_redirect_username) + 1);
STRNCPY(g_username, g_redirect_username, strlen(g_redirect_username) + 1); STRNCPY(g_username, g_redirect_username, strlen(g_redirect_username) + 1);
STRNCPY(server, g_redirect_server, sizeof(server)); STRNCPY(server, g_redirect_server, sizeof(server));
flags |= RDP_LOGON_AUTO; flags |= RDP_INFO_AUTOLOGON;
fprintf(stderr, "Redirected to %s@%s session %d.\n", fprintf(stderr, "Redirected to %s@%s session %d.\n",
g_redirect_username, g_redirect_server, g_redirect_session_id); g_redirect_username, g_redirect_server, g_redirect_session_id);