- Add support for user name settings.
- Obtain user name / domain hints from registry.
- Pass user/domain info to the server if available.
- Add Czech translation.

svn path=/trunk/; revision=55008
This commit is contained in:
Kamil Hornicek 2012-01-19 02:27:20 +00:00
parent 284faf3581
commit f89a2404f3
27 changed files with 211 additions and 4 deletions

View file

@ -98,6 +98,61 @@ OnTabWndSelChange(PINFO pInfo)
}
static VOID
LoadUsernameHint(HWND hDlg, INT iCur)
{
WCHAR szValue[MAXVALUE+1000];
WCHAR szName[MAX_KEY_NAME];
WCHAR szKeyName[] = L"Software\\Microsoft\\Terminal Server Client\\Servers";
PWCHAR lpAddress;
HKEY hKey;
HKEY hSubKey;
LONG lRet = ERROR_SUCCESS;
INT iIndex = 0;
DWORD dwSize = MAX_KEY_NAME;
SendDlgItemMessageW(hDlg, IDC_SERVERCOMBO, CB_GETLBTEXT, (WPARAM)iCur, (LPARAM)szValue);
/* remove possible port number */
lpAddress = wcstok(szValue, L":");
if (lpAddress == NULL)
return;
if (RegOpenKeyExW(HKEY_CURRENT_USER,
szKeyName,
0,
KEY_READ,
&hKey) == ERROR_SUCCESS)
{
while (lRet == ERROR_SUCCESS)
{
dwSize = MAX_KEY_NAME;
lRet = RegEnumKeyExW(hKey, iIndex, szName, &dwSize, NULL, NULL, NULL, NULL);
if(lRet == ERROR_SUCCESS && wcscmp(szName, lpAddress) == 0)
{
if(RegOpenKeyExW(hKey, szName, 0, KEY_READ, &hSubKey) != ERROR_SUCCESS)
break;
dwSize = MAXVALUE;
if(RegQueryValueExW(hKey, L"UsernameHint", 0, NULL, (LPBYTE)szValue, &dwSize) == ERROR_SUCCESS)
{
SetDlgItemTextW(hDlg, IDC_NAMEEDIT, szValue);
}
RegCloseKey(hSubKey);
break;
}
iIndex++;
}
RegCloseKey(hKey);
}
}
static VOID
FillServerAddesssCombo(PINFO pInfo)
{
@ -107,6 +162,7 @@ FillServerAddesssCombo(PINFO pInfo)
LONG ret = ERROR_SUCCESS;
DWORD size;
INT i = 0;
BOOL found = FALSE;
if (RegOpenKeyExW(HKEY_CURRENT_USER,
KeyName,
@ -152,6 +208,7 @@ FillServerAddesssCombo(PINFO pInfo)
CB_ADDSTRING,
0,
(LPARAM)lpAddress);
found = TRUE;
}
HeapFree(GetProcessHeap(),
@ -177,6 +234,17 @@ FillServerAddesssCombo(PINFO pInfo)
0,
(LPARAM)Name);
}
if(found)
{
SendDlgItemMessageW(pInfo->hGeneralPage,
IDC_SERVERCOMBO,
CB_SETCURSEL,
0,
0);
LoadUsernameHint(pInfo->hGeneralPage, 0);
}
}
@ -194,6 +262,16 @@ ReLoadGeneralPage(PINFO pInfo)
IDC_SERVERCOMBO,
lpText);
}
/* set user name */
lpText = GetStringFromSettings(pInfo->pRdpSettings,
L"username");
if (lpText)
{
SetDlgItemTextW(pInfo->hGeneralPage,
IDC_NAMEEDIT,
lpText);
}
}
@ -279,15 +357,18 @@ GeneralDlgProc(HWND hDlg,
CB_GETCURSEL,
0,
0);
cur++;
last = SendDlgItemMessageW(hDlg,
IDC_SERVERCOMBO,
CB_GETCOUNT,
0,
0);
if (cur == last)
if ((cur + 1) == last)
MessageBoxW(hDlg, L"SMB is not yet supported", L"RDP error", MB_ICONERROR);
else
{
LoadUsernameHint(hDlg, cur);
}
}
break;

View file

@ -11,6 +11,7 @@ BEGIN
LTEXT "Сървър:",IDC_STATIC,37,41,30,8
LTEXT "Потребител:",IDC_STATIC,37,58,48,8
COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "Запис",IDC_SAVE,67,139,50,14
PUSHBUTTON "Запис като...",IDC_SAVEAS,123,139,50,14
PUSHBUTTON "Отваряне...",IDC_OPEN,177,139,50,14

View file

@ -11,6 +11,7 @@ BEGIN
LTEXT "Servidor:",IDC_STATIC,47,41,25,8
LTEXT "Nom d'usuari:",IDC_STATIC,47,58,38,8
COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "Desa",IDC_SAVE,67,139,50,14
PUSHBUTTON "Desa com...",IDC_SAVEAS,123,139,50,14
PUSHBUTTON "Obre...",IDC_OPEN,177,139,50,14

View file

@ -0,0 +1,64 @@
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
IDD_GENERAL DIALOGEX 0, 0, 242, 175
STYLE DS_SHELLFONT | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Přihlašovací údaje",IDC_STATIC,7,7,228,89
GROUPBOX "Nastavení spojení",IDC_STATIC,7,103,228,65
ICON "", IDC_LOGONICON, 15,19,20,20
LTEXT "Zadejte adresu serveru",IDC_STATIC,47,24,81,8
LTEXT "Server:",IDC_STATIC,47,41,25,8
LTEXT "Uživatelské jméno:",IDC_STATIC,47,58,60,8
COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "Uložit",IDC_SAVE,67,139,50,14
PUSHBUTTON "Uložit jako...",IDC_SAVEAS,123,139,50,14
PUSHBUTTON "Otevřít...",IDC_OPEN,177,139,50,14
ICON "", IDC_CONNICON, 16,114,20,20
LTEXT "Uložit současné nastavení nebo načíst nastavení ze souboru",IDC_STATIC,50,115,172,20
END
IDD_DISPLAY DIALOGEX 0, 0, 242, 175
STYLE DS_SHELLFONT | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Velikost vzdálené plochy",IDC_STATIC,7,7,228,68
GROUPBOX "Barvy",IDC_STATIC,7,83,228,85
ICON "", IDC_REMICON, 15,19,20,20
ICON "", IDC_COLORSICON, 15,98,20,20
LTEXT "Nastavením posuvníku do krajní pravé polohy zvolíte režim celé obrazovky",IDC_STATIC,53,22,175,21
CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17
COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10
LTEXT "Poznámka: Toto nastavení může být změněno nastavením na serveru",IDC_STATIC,56,143,165,18
LTEXT "Méně",IDC_STATIC,35,42,16,8
LTEXT "Více",IDC_STATIC,189,42,17,8
LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER
END
IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Připojení ke vzdálené ploše"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Připojit",IDOK,147,245,50,14
PUSHBUTTON "Storno",IDCANCEL,203,245,50,14
CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,50,246,190
END
STRINGTABLE
BEGIN
IDS_TAB_GENERAL "Obecné"
IDS_TAB_DISPLAY "Zobrazení"
IDS_256COLORS "256 Barev"
IDS_HIGHCOLOR15 "32,768 Barev (15 bit)"
IDS_HIGHCOLOR16 "65,536 Barev (16 bit)"
IDS_HIGHCOLOR24 "16,777,216 Barev (24 bit)"
IDS_PIXEL "%lux%lu Pixelů"
IDS_FULLSCREEN "Celá obrazovka"
IDS_BROWSESERVER "<Najít další...>"
IDS_HEADERTEXT1 "Vzdálená plocha"
IDS_HEADERTEXT2 "Připojení"
END

View file

@ -11,6 +11,7 @@ BEGIN
LTEXT "Server:",IDC_STATIC,47,41,25,8
LTEXT "Benutzername:",IDC_STATIC,47,58,50,8
COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "Speichern",IDC_SAVE,67,139,50,14
PUSHBUTTON "Speichern unter",IDC_SAVEAS,120,139,55,14
PUSHBUTTON "Öffnen...",IDC_OPEN,177,139,50,14

View file

@ -11,6 +11,7 @@ BEGIN
LTEXT "Διακομιστής:",IDC_STATIC,47,41,30,8
LTEXT "Όνομα χρήστη:",IDC_STATIC,47,58,38,8
COMBOBOX IDC_SERVERCOMBO,89,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "Αποθήκευση",IDC_SAVE,67,139,50,14
PUSHBUTTON "Αποθήκευση Ως...",IDC_SAVEAS,123,139,50,14
PUSHBUTTON "Άνοιγμα...",IDC_OPEN,177,139,50,14

View file

@ -11,6 +11,7 @@ BEGIN
LTEXT "Server:",IDC_STATIC,47,41,25,8
LTEXT "User name:",IDC_STATIC,47,58,38,8
COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "Save",IDC_SAVE,67,139,50,14
PUSHBUTTON "Save As...",IDC_SAVEAS,123,139,50,14
PUSHBUTTON "Open...",IDC_OPEN,177,139,50,14

View file

@ -16,6 +16,7 @@ BEGIN
LTEXT "Servidor:",IDC_STATIC,47,41,28,8
LTEXT "Nombre de usuario:",IDC_STATIC,47,58,70,8
COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "Guardar",IDC_SAVE,60,139,50,14 //67
PUSHBUTTON "Guardar Como...",IDC_SAVEAS,115,139,58,14 //123,50
PUSHBUTTON "Abrir...",IDC_OPEN,177,139,50,14

View file

@ -11,6 +11,7 @@ BEGIN
LTEXT "Serveur:",IDC_STATIC,47,41,25,8
LTEXT "Nom d'utilisateur:",IDC_STATIC,47,58,38,8
COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "Enregistrer",IDC_SAVE,67,139,50,14
PUSHBUTTON "Enregistrer Sous...",IDC_SAVEAS,123,139,50,14
PUSHBUTTON "Ouvrir...",IDC_OPEN,177,139,50,14

View file

@ -11,6 +11,7 @@ BEGIN
LTEXT "Computer:",IDC_STATIC,47,41,35,8
LTEXT "Nome utente:",IDC_STATIC,47,58,68,8
COMBOBOX IDC_SERVERCOMBO,90,39,136,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "Salva",IDC_SAVE,43,139,58,14
PUSHBUTTON "Salva con nome",IDC_SAVEAS,107,139,58,14
PUSHBUTTON "Apri",IDC_OPEN,169,139,58,14

View file

@ -11,6 +11,7 @@ BEGIN
LTEXT "サーバ:",IDC_STATIC,47,41,25,8
LTEXT "ユーザー名:",IDC_STATIC,47,58,38,8
COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "保存",IDC_SAVE,67,139,50,14
PUSHBUTTON "名前を付けて保存...",IDC_SAVEAS,123,139,50,14
PUSHBUTTON "開く...",IDC_OPEN,177,139,50,14

View file

@ -15,6 +15,7 @@ BEGIN
LTEXT "서버 주소:",IDC_STATIC,47,41,25,8
LTEXT "사용자 이름:",IDC_STATIC,47,58,38,8
COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "저장",IDC_SAVE,67,139,50,14
PUSHBUTTON "다른 이름으로 저장...",IDC_SAVEAS,123,139,50,14
PUSHBUTTON "열기...",IDC_OPEN,177,139,50,14

View file

@ -13,6 +13,7 @@ BEGIN
LTEXT "Serveris:",IDC_STATIC,47,41,30,8
LTEXT "Vartotojo vardas:",IDC_STATIC,47,58,60,8
COMBOBOX IDC_SERVERCOMBO,107,39,113,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "Saugoti",IDC_SAVE,67,139,50,14
PUSHBUTTON "Saugoti kaip...",IDC_SAVEAS,123,139,50,14
PUSHBUTTON "Atidaryti...",IDC_OPEN,177,139,50,14

View file

@ -11,6 +11,7 @@ BEGIN
LTEXT "Server:",IDC_STATIC,47,41,25,8
LTEXT "Brukernavn:",IDC_STATIC,47,58,38,8
COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "Lagre",IDC_SAVE,67,139,50,14
PUSHBUTTON "Lagre som...",IDC_SAVEAS,123,139,50,14
PUSHBUTTON "Åpne...",IDC_OPEN,177,139,50,14

View file

@ -21,6 +21,7 @@ BEGIN
LTEXT "Serwer:",IDC_STATIC,39,42,29,8
LTEXT "Nazwa użytkownika:",IDC_STATIC,39,57,42,18
COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "Zapisz",IDC_SAVE,67,139,50,14
PUSHBUTTON "Zapisz jako...",IDC_SAVEAS,123,139,50,14
PUSHBUTTON "Otwórz...",IDC_OPEN,177,139,50,14

View file

@ -18,6 +18,7 @@ BEGIN
LTEXT "Server:", IDC_STATIC,47,41,25,8
LTEXT "Nume utilizator:", IDC_STATIC,47,58,58,8
COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "Pă&strează", IDC_SAVE,57,139,50,14
PUSHBUTTON "&Păstrare în…", IDC_SAVEAS,112,139,60,14
PUSHBUTTON "&Deschidere…", IDC_OPEN,177,139,50,14

View file

@ -11,6 +11,7 @@ BEGIN
LTEXT "Сервер:",IDC_STATIC,52,41,31,8
LTEXT "Имя пользователя:",IDC_STATIC,15,58,67,8
COMBOBOX IDC_SERVERCOMBO,86,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "Сохранить",IDC_SAVE,49,139,50,14
PUSHBUTTON "Сохранить как...",IDC_SAVEAS,103,139,70,14
PUSHBUTTON "Открыть...",IDC_OPEN,177,139,50,14

View file

@ -15,6 +15,7 @@ BEGIN
LTEXT "Server:",IDC_STATIC,47,41,25,8
LTEXT "Používateľské meno:",IDC_STATIC,47,58,38,8
COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "&Uložiť",IDC_SAVE,67,139,50,14
PUSHBUTTON "Uložiť &ako...",IDC_SAVEAS,123,139,50,14
PUSHBUTTON "&Otvoriť...",IDC_OPEN,177,139,50,14

View file

@ -18,6 +18,7 @@ BEGIN
LTEXT "Server:",IDC_STATIC,47,41,25,8
LTEXT "Användarnamn:",IDC_STATIC,47,58,38,8
COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "Spara",IDC_SAVE,67,139,50,14
PUSHBUTTON "Spara som...",IDC_SAVEAS,123,139,50,14
PUSHBUTTON "Öppna...",IDC_OPEN,177,139,50,14

View file

@ -19,6 +19,7 @@ BEGIN
LTEXT "Сервер:",IDC_STATIC,47,41,27,8
LTEXT "Користувач:",IDC_STATIC,47,58,41,8
COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "Зберегти",IDC_SAVE,67,139,50,14
PUSHBUTTON "Зберегти як...",IDC_SAVEAS,123,139,50,14
PUSHBUTTON "Відкрити...",IDC_OPEN,177,139,50,14

View file

@ -15,6 +15,7 @@ BEGIN
LTEXT "服务器:",IDC_STATIC,47,41,25,8
LTEXT "用户名:",IDC_STATIC,47,58,38,8
COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "保存",IDC_SAVE,67,139,50,14
PUSHBUTTON "另存为...",IDC_SAVEAS,123,139,50,14
PUSHBUTTON "打开...",IDC_OPEN,177,139,50,14

View file

@ -18,6 +18,7 @@ BEGIN
LTEXT "伺服器:",IDC_STATIC,47,41,25,8
LTEXT "用戶名:",IDC_STATIC,47,58,38,8
COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
PUSHBUTTON "儲存",IDC_SAVE,67,139,50,14
PUSHBUTTON "另存為...",IDC_SAVEAS,123,139,50,14
PUSHBUTTON "開啟...",IDC_OPEN,177,139,50,14

View file

@ -17,7 +17,7 @@
#define MAXKEY 256
#define MAXVALUE 256
#define NUM_SETTINGS 4
#define NUM_SETTINGS 5
extern LPWSTR lpSettings[];
typedef struct _SETTINGS

View file

@ -16,6 +16,7 @@
#define IDC_GEOSLIDER 1012
#define IDC_BPPCOMBO 1013
#define IDC_SETTINGS_RESOLUTION_TEXT 1014
#define IDC_NAMEEDIT 1015
#define IDC_LOGONICON 1016
#define IDC_CONNICON 1017

View file

@ -16,6 +16,7 @@ IDB_SPECT BITMAP "res/spectrum.bmp"
#pragma code_page(65001)
#include "lang/bg-BG.rc"
#include "lang/ca-ES.rc"
#include "lang/cs-CZ.rc"
#include "lang/de-DE.rc"
#include "lang/el-GR.rc"
#include "lang/en-US.rc"

View file

@ -8,6 +8,7 @@ LPWSTR lpSettings[NUM_SETTINGS] =
L"desktopheight",
L"session bpp",
L"full address",
L"username",
};
VOID
@ -63,6 +64,17 @@ SaveAllSettings(PINFO pInfo)
ret);
}
}
/* user name */
if (GetDlgItemText(pInfo->hGeneralPage,
IDC_NAMEEDIT,
szValue,
MAXVALUE))
{
SetStringToSettings(pInfo->pRdpSettings,
L"username",
szValue);
}
}

View file

@ -982,6 +982,33 @@ GetPortNumber(PCHAR szAddress)
return iPort;
}
static VOID
SetDomainAndUsername(PCHAR pName)
{
PCHAR pDomain;
PCHAR pUsername;
strcpy(g_domain, "");
strcpy(g_username, "");
pDomain = strtok(pName, "\\");
if(pDomain == NULL)
return;
pUsername = strtok(NULL, "\\");
if(pUsername == NULL)
{
strcpy(g_username, pDomain);
return;
}
strcpy(g_username, pUsername);
strcpy(g_domain, pDomain);
return;
}
static BOOL
ParseCommandLine(LPWSTR lpCmdLine,
PRDPSETTINGS pRdpSettings,
@ -1077,7 +1104,8 @@ wWinMain(HINSTANCE hInstance,
/* GetPortNumber also removes possible trailing port number from address */
g_tcp_port_rdp = GetPortNumber(szValue);
strcpy(g_servername, szValue);
strcpy(g_username, "");
uni_to_str(szValue, GetStringFromSettings(pRdpSettings, L"username"));
SetDomainAndUsername(szValue);
strcpy(g_password, "");
g_server_depth = GetIntegerFromSettings(pRdpSettings, L"session bpp");
if (g_server_depth > 16) g_server_depth = 16; /* hack, we don't support 24bpp yet */