[khornicek] 55008: [MSTSC] - 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.
Author: khornicek Date: Thu Jan 19 02:27:20 2012 New Revision: 55008
URL: http://svn.reactos.org/svn/reactos?rev=55008&view=rev Log: [MSTSC] - 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.
Added: trunk/reactos/base/applications/mstsc/lang/cs-CZ.rc (with props) Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/lang/bg-BG.rc trunk/reactos/base/applications/mstsc/lang/ca-ES.rc trunk/reactos/base/applications/mstsc/lang/de-DE.rc trunk/reactos/base/applications/mstsc/lang/el-GR.rc trunk/reactos/base/applications/mstsc/lang/en-US.rc trunk/reactos/base/applications/mstsc/lang/es-ES.rc trunk/reactos/base/applications/mstsc/lang/fr-FR.rc trunk/reactos/base/applications/mstsc/lang/it-IT.rc trunk/reactos/base/applications/mstsc/lang/ja-JP.rc trunk/reactos/base/applications/mstsc/lang/ko-KR.rc trunk/reactos/base/applications/mstsc/lang/lt-LT.rc trunk/reactos/base/applications/mstsc/lang/no-NO.rc trunk/reactos/base/applications/mstsc/lang/pl-PL.rc trunk/reactos/base/applications/mstsc/lang/ro-RO.rc trunk/reactos/base/applications/mstsc/lang/ru-RU.rc trunk/reactos/base/applications/mstsc/lang/sk-SK.rc trunk/reactos/base/applications/mstsc/lang/sv-SE.rc trunk/reactos/base/applications/mstsc/lang/uk-UA.rc trunk/reactos/base/applications/mstsc/lang/zh-CN.rc trunk/reactos/base/applications/mstsc/lang/zh-TW.rc trunk/reactos/base/applications/mstsc/precomp.h trunk/reactos/base/applications/mstsc/resource.h trunk/reactos/base/applications/mstsc/rsrc.rc trunk/reactos/base/applications/mstsc/settings.c trunk/reactos/base/applications/mstsc/win32.c
Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/con... ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -99,6 +99,61 @@
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) { HKEY hKey; @@ -107,6 +162,7 @@ LONG ret = ERROR_SUCCESS; DWORD size; INT i = 0; + BOOL found = FALSE;
if (RegOpenKeyExW(HKEY_CURRENT_USER, KeyName, @@ -152,6 +208,7 @@ CB_ADDSTRING, 0, (LPARAM)lpAddress); + found = TRUE; }
HeapFree(GetProcessHeap(), @@ -177,6 +234,17 @@ 0, (LPARAM)Name); } + + if(found) + { + SendDlgItemMessageW(pInfo->hGeneralPage, + IDC_SERVERCOMBO, + CB_SETCURSEL, + 0, + 0); + LoadUsernameHint(pInfo->hGeneralPage, 0); + } + }
@@ -192,6 +260,16 @@ { SetDlgItemTextW(pInfo->hGeneralPage, IDC_SERVERCOMBO, + lpText); + } + + /* set user name */ + lpText = GetStringFromSettings(pInfo->pRdpSettings, + L"username"); + if (lpText) + { + SetDlgItemTextW(pInfo->hGeneralPage, + IDC_NAMEEDIT, lpText); } } @@ -279,15 +357,18 @@ 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;
Modified: trunk/reactos/base/applications/mstsc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/bg-BG.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ca-ES.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ 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
Added: trunk/reactos/base/applications/mstsc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/mstsc/lang/cs-CZ.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -1,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
Propchange: trunk/reactos/base/applications/mstsc/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/base/applications/mstsc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/de-DE.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/el-GR.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/en-US.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/es-ES.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -16,6 +16,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/fr-FR.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/it-IT.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ja-JP.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ko-KR.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -15,6 +15,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/lt-LT.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -13,6 +13,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/no-NO.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/pl-PL.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -21,6 +21,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ro-RO.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -18,6 +18,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ru-RU.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/sk-SK.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -15,6 +15,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/sv-SE.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -18,6 +18,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/uk-UA.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -19,6 +19,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/zh-CN.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -15,6 +15,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/lan... ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/zh-TW.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -18,6 +18,7 @@ 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
Modified: trunk/reactos/base/applications/mstsc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pre... ============================================================================== --- trunk/reactos/base/applications/mstsc/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/precomp.h [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -17,7 +17,7 @@
#define MAXKEY 256 #define MAXVALUE 256 -#define NUM_SETTINGS 4 +#define NUM_SETTINGS 5 extern LPWSTR lpSettings[];
typedef struct _SETTINGS
Modified: trunk/reactos/base/applications/mstsc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/res... ============================================================================== --- trunk/reactos/base/applications/mstsc/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/resource.h [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -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
Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rsr... ============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -16,6 +16,7 @@ #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"
Modified: trunk/reactos/base/applications/mstsc/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/set... ============================================================================== --- trunk/reactos/base/applications/mstsc/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/settings.c [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -8,6 +8,7 @@ L"desktopheight", L"session bpp", L"full address", + L"username", };
VOID @@ -63,6 +64,17 @@ ret); } } + + /* user name */ + if (GetDlgItemText(pInfo->hGeneralPage, + IDC_NAMEEDIT, + szValue, + MAXVALUE)) + { + SetStringToSettings(pInfo->pRdpSettings, + L"username", + szValue); + } }
Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/win... ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/win32.c [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -982,6 +982,33 @@ 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 @@ /* 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 */
-
khornicek＠svn.reactos.org