Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [CONSOLE] Italian translation update (#466)
by Bișoc George 03 Apr '18

03 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76c561e5f443877402025… commit 76c561e5f44387740202515bbcc71ba02f947a67 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Tue Apr 3 12:58:54 2018 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Tue Apr 3 12:58:54 2018 +0200 [CONSOLE] Italian translation update (#466) - Strings translated - Typo fixed --- dll/cpl/console/lang/it-IT.rc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/cpl/console/lang/it-IT.rc b/dll/cpl/console/lang/it-IT.rc index fe7dfda616..b9bbfc769e 100644 --- a/dll/cpl/console/lang/it-IT.rc +++ b/dll/cpl/console/lang/it-IT.rc @@ -27,7 +27,7 @@ BEGIN GROUPBOX "Opzioni di modifica", IDC_STATIC, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP AUTOCHECKBOX "Modalità &Modifica rapida", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP AUTOCHECKBOX "Modalità &Inserimento", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31 + GROUPBOX "Codice Pagina", IDC_STATIC, 7, 170, 238, 31 COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END @@ -38,15 +38,15 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Anteprima:", IDC_STATIC, 7, 7, 115, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "WinPreview", WS_BORDER | WS_CHILD | WS_VISIBLE, 7, 20, 115, 70 - LTEXT "Dimansione:", IDC_STATIC, 130, 7, 45, 10 + LTEXT "Dimensione:", IDC_STATIC, 130, 7, 45, 10 LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP - AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP - AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP + AUTORADIOBUTTON "pi&xel", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP + AUTORADIOBUTTON "&punti", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "&Font", IDC_STATIC, 10, 105, 35, 10 - AUTOCHECKBOX "&Grassetto fonts", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 + AUTOCHECKBOX "&Grassetto font", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50 + GROUPBOX "Font Selezionate", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50 CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE LTEXT "Ogni carattere è:", IDC_STATIC, 125, 166, 85, 10 LTEXT "larghezza in pixel\naltezza in pixel", IDC_STATIC, 138, 180, 100, 20 @@ -148,9 +148,9 @@ END STRINGTABLE BEGIN - IDS_CPLNAME "Console" - IDS_CPLDESCRIPTION "Configura le proprietà della console." + IDS_CPLNAME "Consola" + IDS_CPLDESCRIPTION "Configura le proprietà della consola." IDS_APPLY_SHORTCUT_ALL "Modifica il collegamento che ha attivato questa finestra" - IDS_RASTERFONTS "Raster Fonts" - IDS_GROUPBOX_FONT_NAME "Selected Font: " + IDS_RASTERFONTS "Font a Raster" + IDS_GROUPBOX_FONT_NAME "Font Selezionate: " END

1 0

01/01: [RAPPS] Use FTP in passive mode
by Alexander Shaposhnikov 02 Apr '18

02 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6d2172cccd5262d1a7e8… commit a6d2172cccd5262d1a7e8a82693ab73469274b14 Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Tue Apr 3 00:44:12 2018 +0300 Commit: Alexander Shaposhnikov <sanchaez(a)reactos.org> CommitDate: Tue Apr 3 00:47:08 2018 +0300 [RAPPS] Use FTP in passive mode This should finally fix FTP downloads in RAPPS. --- base/applications/rapps/loaddlg.cpp | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index d8f659b219..fe9ec04dec 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -603,6 +603,8 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) LPCWSTR szCaption = static_cast<DownloadParam*>(param)->szCaption; ATL::CStringW szNewCaption; + const DWORD dwUrlConnectFlags = INTERNET_FLAG_DONT_CACHE | INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_KEEP_CONNECTION; + if (InfoArray.GetSize() <= 0) { MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD); @@ -709,16 +711,6 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) if (!hOpen) goto end; - hFile = InternetOpenUrlW(hOpen, InfoArray[iAppId].szUrl.GetString(), NULL, 0, - INTERNET_FLAG_DONT_CACHE | INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_KEEP_CONNECTION, - 0); - - if (!hFile) - { - MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD2); - goto end; - } - dwStatusLen = sizeof(dwStatus); memset(&urlComponents, 0, sizeof(urlComponents)); @@ -737,6 +729,15 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) if (urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS) { + hFile = InternetOpenUrlW(hOpen, InfoArray[iAppId].szUrl.GetString(), NULL, 0, + dwUrlConnectFlags, + 0); + if (!hFile) + { + MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD2); + goto end; + } + // query connection if (!HttpQueryInfoW(hFile, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &dwStatus, &dwStatusLen, NULL)) goto end; @@ -753,6 +754,16 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) if (urlComponents.nScheme == INTERNET_SCHEME_FTP) { + // force passive mode on FTP + hFile = InternetOpenUrlW(hOpen, InfoArray[iAppId].szUrl.GetString(), NULL, 0, + dwUrlConnectFlags | INTERNET_FLAG_PASSIVE, + 0); + if (!hFile) + { + MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD2); + goto end; + } + dwContentLen = FtpGetFileSize(hFile, &dwStatus); }

1 0

01/01: [NET] Implement the NET CONFIG WORKSTATION command
by Eric Kohl 02 Apr '18

02 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3031de8eeda1cb368cc03… commit 3031de8eeda1cb368cc037018f30a5d5d5ec2654 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Apr 2 23:13:50 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Apr 2 23:13:50 2018 +0200 [NET] Implement the NET CONFIG WORKSTATION command --- base/applications/network/net/cmdConfig.c | 76 ++++++++++++++++++++++++++++- base/applications/network/net/lang/en-US.rc | 9 +++- base/applications/network/net/lang/es-ES.rc | 9 +++- base/applications/network/net/lang/ro-RO.rc | 9 +++- base/applications/network/net/lang/ru-RU.rc | 9 +++- base/applications/network/net/lang/tr-TR.rc | 9 +++- base/applications/network/net/lang/zh-CN.rc | 9 +++- base/applications/network/net/lang/zh-TW.rc | 9 +++- base/applications/network/net/resource.h | 25 ++++++---- 9 files changed, 146 insertions(+), 18 deletions(-) diff --git a/base/applications/network/net/cmdConfig.c b/base/applications/network/net/cmdConfig.c index bc84a877af..e4f65cfc23 100644 --- a/base/applications/network/net/cmdConfig.c +++ b/base/applications/network/net/cmdConfig.c @@ -36,10 +36,13 @@ DisplayServerConfig(VOID) ConPrintf(StdOut, L"%s\n\n", ServerInfo->sv102_comment); PrintPaddedResourceString(IDS_CONFIG_SERVER_VERSION, nPaddedLength); - ConPuts(StdOut, L"...\n"); + ConPrintf(StdOut, L"%lu.%lu\n", + ServerInfo->sv102_version_major, + ServerInfo->sv102_version_minor); ConResPuts(StdOut, IDS_CONFIG_SERVER_ACTIVE); - for (i = 0; i < dwTotal; i++) + ConPuts(StdOut, L"\n"); + for (i = 0; i < dwRead; i++) { ConPrintf(StdOut, L" %s (%s)\n", &TransportInfo[i].svti0_transportname[8], @@ -78,6 +81,75 @@ static INT DisplayWorkstationConfig(VOID) { + PWKSTA_INFO_100 WorkstationInfo = NULL; + PWKSTA_USER_INFO_1 UserInfo = NULL; + PWKSTA_TRANSPORT_INFO_0 TransportInfo = NULL; + DWORD dwRead = 0, dwTotal = 0, i; + INT nPaddedLength = 38; + NET_API_STATUS Status; + + Status = NetWkstaGetInfo(NULL, 100, (PBYTE*)&WorkstationInfo); + if (Status != NERR_Success) + goto done; + + Status = NetWkstaUserGetInfo(NULL, 1, (PBYTE*)&UserInfo); + if (Status != NERR_Success) + goto done; + + Status = NetWkstaTransportEnum(NULL, + 0, + (PBYTE*)&TransportInfo, + MAX_PREFERRED_LENGTH, + &dwRead, + &dwTotal, + NULL); + if (Status != NERR_Success) + goto done; + + PrintPaddedResourceString(IDS_CONFIG_WORKSTATION_NAME, nPaddedLength); + ConPrintf(StdOut, L"\\\\%s\n", WorkstationInfo->wki100_computername); + + PrintPaddedResourceString(IDS_CONFIG_WORKSTATION_FULLNAME, nPaddedLength); + ConPuts(StdOut, L"...\n"); + + PrintPaddedResourceString(IDS_CONFIG_WORKSTATION_USERNAME, nPaddedLength); + ConPrintf(StdOut, L"%s\n", UserInfo->wkui1_username); + + ConPuts(StdOut, L"\n"); + + ConResPuts(StdOut, IDS_CONFIG_WORKSTATION_ACTIVE); + ConPuts(StdOut, L"\n"); + for (i = 0; i < dwRead; i++) + { + ConPrintf(StdOut, L" %s (%s)\n", + &TransportInfo[i].wkti0_transport_name[8], + TransportInfo[i].wkti0_transport_address); + } + ConPuts(StdOut, L"\n"); + + PrintPaddedResourceString(IDS_CONFIG_WORKSTATION_VERSION, nPaddedLength); + ConPrintf(StdOut, L"%lu.%lu\n", + WorkstationInfo->wki100_ver_major, + WorkstationInfo->wki100_ver_minor); + + ConPuts(StdOut, L"\n"); + + PrintPaddedResourceString(IDS_CONFIG_WORKSTATION_DOMAIN, nPaddedLength); + ConPrintf(StdOut, L"%s\n", WorkstationInfo->wki100_langroup); + + PrintPaddedResourceString(IDS_CONFIG_WORKSTATION_LOGON, nPaddedLength); + ConPrintf(StdOut, L"%s\n", UserInfo->wkui1_logon_domain); + +done: + if (TransportInfo != NULL) + NetApiBufferFree(TransportInfo); + + if (UserInfo != NULL) + NetApiBufferFree(UserInfo); + + if (WorkstationInfo != NULL) + NetApiBufferFree(WorkstationInfo); + return 0; } diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index 23d498a194..3b89b498a7 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -168,11 +168,18 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_CONFIG_SERVER_NAME "Server Name" IDS_CONFIG_SERVER_COMMENT "Server Comment" IDS_CONFIG_SERVER_VERSION "Software version" - IDS_CONFIG_SERVER_ACTIVE "Server is active on\n" + IDS_CONFIG_SERVER_ACTIVE "Server is active on" IDS_CONFIG_SERVER_HIDDEN "Server hidden" IDS_CONFIG_SERVER_USERS "Maximum Logged On Users" IDS_CONFIG_SERVER_FILES "Maximum open files per session" IDS_CONFIG_SERVER_IDLE "Idle session time (min)" + IDS_CONFIG_WORKSTATION_NAME "Computer name" + IDS_CONFIG_WORKSTATION_FULLNAME "Full Computer name" + IDS_CONFIG_WORKSTATION_USERNAME "User name" + IDS_CONFIG_WORKSTATION_ACTIVE "Workstation is active on" + IDS_CONFIG_WORKSTATION_VERSION "Software version" + IDS_CONFIG_WORKSTATION_DOMAIN "Workstation domain" + IDS_CONFIG_WORKSTATION_LOGON "Logon domain" IDS_LOCALGROUP_ALIASES "Aliases for \\\\%s" IDS_LOCALGROUP_ALIAS_NAME "Alias name" diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index 718250baa1..9db547f02e 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -170,11 +170,18 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_CONFIG_SERVER_NAME "Server Name" IDS_CONFIG_SERVER_COMMENT "Server Comment" IDS_CONFIG_SERVER_VERSION "Software version" - IDS_CONFIG_SERVER_ACTIVE "Server is active on\n" + IDS_CONFIG_SERVER_ACTIVE "Server is active on" IDS_CONFIG_SERVER_HIDDEN "Server hidden" IDS_CONFIG_SERVER_USERS "Maximum Logged On Users" IDS_CONFIG_SERVER_FILES "Maximum open files per session" IDS_CONFIG_SERVER_IDLE "Idle session time (min)" + IDS_CONFIG_WORKSTATION_NAME "Computer name" + IDS_CONFIG_WORKSTATION_FULLNAME "Full Computer name" + IDS_CONFIG_WORKSTATION_USERNAME "User name" + IDS_CONFIG_WORKSTATION_ACTIVE "Workstation is active on" + IDS_CONFIG_WORKSTATION_VERSION "Software version" + IDS_CONFIG_WORKSTATION_DOMAIN "Workstation domain" + IDS_CONFIG_WORKSTATION_LOGON "Logon domain" IDS_LOCALGROUP_ALIASES "Alias de \\\\%s" IDS_LOCALGROUP_ALIAS_NAME "Nombre del alias" diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index eae85bcd36..4f0e3e2456 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -173,11 +173,18 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_CONFIG_SERVER_NAME "Server Name" IDS_CONFIG_SERVER_COMMENT "Server Comment" IDS_CONFIG_SERVER_VERSION "Software version" - IDS_CONFIG_SERVER_ACTIVE "Server is active on\n" + IDS_CONFIG_SERVER_ACTIVE "Server is active on" IDS_CONFIG_SERVER_HIDDEN "Server hidden" IDS_CONFIG_SERVER_USERS "Maximum Logged On Users" IDS_CONFIG_SERVER_FILES "Maximum open files per session" IDS_CONFIG_SERVER_IDLE "Idle session time (min)" + IDS_CONFIG_WORKSTATION_NAME "Computer name" + IDS_CONFIG_WORKSTATION_FULLNAME "Full Computer name" + IDS_CONFIG_WORKSTATION_USERNAME "User name" + IDS_CONFIG_WORKSTATION_ACTIVE "Workstation is active on" + IDS_CONFIG_WORKSTATION_VERSION "Software version" + IDS_CONFIG_WORKSTATION_DOMAIN "Workstation domain" + IDS_CONFIG_WORKSTATION_LOGON "Logon domain" IDS_LOCALGROUP_ALIASES "Alias pentru \\\\%s" IDS_LOCALGROUP_ALIAS_NAME "Nume alias" diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index 7466edaf34..f60c5ad118 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -169,11 +169,18 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_CONFIG_SERVER_NAME "Server Name" IDS_CONFIG_SERVER_COMMENT "Server Comment" IDS_CONFIG_SERVER_VERSION "Software version" - IDS_CONFIG_SERVER_ACTIVE "Server is active on\n" + IDS_CONFIG_SERVER_ACTIVE "Server is active on" IDS_CONFIG_SERVER_HIDDEN "Server hidden" IDS_CONFIG_SERVER_USERS "Maximum Logged On Users" IDS_CONFIG_SERVER_FILES "Maximum open files per session" IDS_CONFIG_SERVER_IDLE "Idle session time (min)" + IDS_CONFIG_WORKSTATION_NAME "Computer name" + IDS_CONFIG_WORKSTATION_FULLNAME "Full Computer name" + IDS_CONFIG_WORKSTATION_USERNAME "User name" + IDS_CONFIG_WORKSTATION_ACTIVE "Workstation is active on" + IDS_CONFIG_WORKSTATION_VERSION "Software version" + IDS_CONFIG_WORKSTATION_DOMAIN "Workstation domain" + IDS_CONFIG_WORKSTATION_LOGON "Logon domain" IDS_LOCALGROUP_ALIASES "Псевдонимы для \\\\%s" IDS_LOCALGROUP_ALIAS_NAME "Имя псевдонима" diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index 2fd0e2f4d7..a9a3863424 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -169,11 +169,18 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_CONFIG_SERVER_NAME "Server Name" IDS_CONFIG_SERVER_COMMENT "Server Comment" IDS_CONFIG_SERVER_VERSION "Software version" - IDS_CONFIG_SERVER_ACTIVE "Server is active on\n" + IDS_CONFIG_SERVER_ACTIVE "Server is active on" IDS_CONFIG_SERVER_HIDDEN "Server hidden" IDS_CONFIG_SERVER_USERS "Maximum Logged On Users" IDS_CONFIG_SERVER_FILES "Maximum open files per session" IDS_CONFIG_SERVER_IDLE "Idle session time (min)" + IDS_CONFIG_WORKSTATION_NAME "Computer name" + IDS_CONFIG_WORKSTATION_FULLNAME "Full Computer name" + IDS_CONFIG_WORKSTATION_USERNAME "User name" + IDS_CONFIG_WORKSTATION_ACTIVE "Workstation is active on" + IDS_CONFIG_WORKSTATION_VERSION "Software version" + IDS_CONFIG_WORKSTATION_DOMAIN "Workstation domain" + IDS_CONFIG_WORKSTATION_LOGON "Logon domain" IDS_LOCALGROUP_ALIASES "\\\\%s için başka adlar" IDS_LOCALGROUP_ALIAS_NAME "Başka ad" diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index 471b102b13..a8946a0005 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -169,11 +169,18 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_CONFIG_SERVER_NAME "Server Name" IDS_CONFIG_SERVER_COMMENT "Server Comment" IDS_CONFIG_SERVER_VERSION "Software version" - IDS_CONFIG_SERVER_ACTIVE "Server is active on\n" + IDS_CONFIG_SERVER_ACTIVE "Server is active on" IDS_CONFIG_SERVER_HIDDEN "Server hidden" IDS_CONFIG_SERVER_USERS "Maximum Logged On Users" IDS_CONFIG_SERVER_FILES "Maximum open files per session" IDS_CONFIG_SERVER_IDLE "Idle session time (min)" + IDS_CONFIG_WORKSTATION_NAME "Computer name" + IDS_CONFIG_WORKSTATION_FULLNAME "Full Computer name" + IDS_CONFIG_WORKSTATION_USERNAME "User name" + IDS_CONFIG_WORKSTATION_ACTIVE "Workstation is active on" + IDS_CONFIG_WORKSTATION_VERSION "Software version" + IDS_CONFIG_WORKSTATION_DOMAIN "Workstation domain" + IDS_CONFIG_WORKSTATION_LOGON "Logon domain" IDS_LOCALGROUP_ALIASES "\\\\%s 的别名" IDS_LOCALGROUP_ALIAS_NAME "别名名称" diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index 0eba14dc92..8f400f4be0 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -169,11 +169,18 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_CONFIG_SERVER_NAME "Server Name" IDS_CONFIG_SERVER_COMMENT "Server Comment" IDS_CONFIG_SERVER_VERSION "Software version" - IDS_CONFIG_SERVER_ACTIVE "Server is active on\n" + IDS_CONFIG_SERVER_ACTIVE "Server is active on" IDS_CONFIG_SERVER_HIDDEN "Server hidden" IDS_CONFIG_SERVER_USERS "Maximum Logged On Users" IDS_CONFIG_SERVER_FILES "Maximum open files per session" IDS_CONFIG_SERVER_IDLE "Idle session time (min)" + IDS_CONFIG_WORKSTATION_NAME "Computer name" + IDS_CONFIG_WORKSTATION_FULLNAME "Full Computer name" + IDS_CONFIG_WORKSTATION_USERNAME "User name" + IDS_CONFIG_WORKSTATION_ACTIVE "Workstation is active on" + IDS_CONFIG_WORKSTATION_VERSION "Software version" + IDS_CONFIG_WORKSTATION_DOMAIN "Workstation domain" + IDS_CONFIG_WORKSTATION_LOGON "Logon domain" IDS_LOCALGROUP_ALIASES "別名 \\\\%s" IDS_LOCALGROUP_ALIAS_NAME "別名名稱" diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index 10e01d1906..edcb94c7fe 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -86,15 +86,22 @@ #define IDS_ACCOUNTS_STANDALONE_SERVER 212 #define IDS_ACCOUNTS_WORKSTATION 213 -#define IDS_CONFIG_TEXT 230 -#define IDS_CONFIG_SERVER_NAME 231 -#define IDS_CONFIG_SERVER_COMMENT 232 -#define IDS_CONFIG_SERVER_VERSION 233 -#define IDS_CONFIG_SERVER_ACTIVE 234 -#define IDS_CONFIG_SERVER_HIDDEN 235 -#define IDS_CONFIG_SERVER_USERS 236 -#define IDS_CONFIG_SERVER_FILES 237 -#define IDS_CONFIG_SERVER_IDLE 238 +#define IDS_CONFIG_TEXT 230 +#define IDS_CONFIG_SERVER_NAME 231 +#define IDS_CONFIG_SERVER_COMMENT 232 +#define IDS_CONFIG_SERVER_VERSION 233 +#define IDS_CONFIG_SERVER_ACTIVE 234 +#define IDS_CONFIG_SERVER_HIDDEN 235 +#define IDS_CONFIG_SERVER_USERS 236 +#define IDS_CONFIG_SERVER_FILES 237 +#define IDS_CONFIG_SERVER_IDLE 238 +#define IDS_CONFIG_WORKSTATION_NAME 239 +#define IDS_CONFIG_WORKSTATION_FULLNAME 240 +#define IDS_CONFIG_WORKSTATION_USERNAME 241 +#define IDS_CONFIG_WORKSTATION_ACTIVE 242 +#define IDS_CONFIG_WORKSTATION_VERSION 243 +#define IDS_CONFIG_WORKSTATION_DOMAIN 244 +#define IDS_CONFIG_WORKSTATION_LOGON 245 #define IDS_LOCALGROUP_ALIASES 300

1 0

01/01: [RAPPS] Fix FTP downloads
by Alexander Shaposhnikov 02 Apr '18

02 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3261bbb7b95e60b9ce2d5… commit 3261bbb7b95e60b9ce2d5dd23342a8b91659e6af Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Mon Apr 2 23:51:35 2018 +0300 Commit: Alexander Shaposhnikov <sanchaez(a)reactos.org> CommitDate: Mon Apr 2 23:55:05 2018 +0300 [RAPPS] Fix FTP downloads --- base/applications/rapps/loaddlg.cpp | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 5c8d6c217f..d8f659b219 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -719,15 +719,6 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) goto end; } - if (!HttpQueryInfoW(hFile, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &dwStatus, &dwStatusLen, NULL)) - goto end; - - if (dwStatus != HTTP_STATUS_OK) - { - MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD); - goto end; - } - dwStatusLen = sizeof(dwStatus); memset(&urlComponents, 0, sizeof(urlComponents)); @@ -745,10 +736,25 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) dwContentLen = 0; if (urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS) - HttpQueryInfoW(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwStatusLen, 0); + { + // query connection + if (!HttpQueryInfoW(hFile, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &dwStatus, &dwStatusLen, NULL)) + goto end; + + if (dwStatus != HTTP_STATUS_OK) + { + MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD); + goto end; + } + + // query content length + HttpQueryInfoW(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwStatusLen, NULL); + } if (urlComponents.nScheme == INTERNET_SCHEME_FTP) + { dwContentLen = FtpGetFileSize(hFile, &dwStatus); + } if (!dwContentLen) {

1 0

01/01: [EXPLORER] Handle WM_CONTEXTMENU message in CNotifyToolbar and BN_CLICKED notification in CSysPagerWnd.
by Hermès Bélusca-Maïto 02 Apr '18

02 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4127024b0d7ef28e041fa… commit 4127024b0d7ef28e041fa61896b3eadcafd2fe36 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Apr 2 21:06:09 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Apr 2 21:13:35 2018 +0200 [EXPLORER] Handle WM_CONTEXTMENU message in CNotifyToolbar and BN_CLICKED notification in CSysPagerWnd. With these, we generate the WM_CONTEXTMENU and NIN_(KEY)SELECT shell icon notifications that applications expect when they handle shell notification icons with uVersion >= 3. This fixes in particular the previously unresponsive icon of KVIrc 4.x, and more generally *all* the notifiation icons of Qt applications. CORE-10605 #resolve --- base/shell/explorer/syspager.cpp | 110 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 105 insertions(+), 5 deletions(-) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 5340ba4921..1755ebedde 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -165,12 +165,14 @@ public: bool SendNotifyCallback(InternalIconData* notifyItem, UINT uMsg); private: + LRESULT OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); VOID SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wParam); LRESULT OnMouseEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnTooltipShow(INT uCode, LPNMHDR hdr, BOOL& bHandled); public: BEGIN_MSG_MAP(CNotifyToolbar) + MESSAGE_HANDLER(WM_CONTEXTMENU, OnCtxMenu) MESSAGE_RANGE_HANDLER(WM_MOUSEFIRST, WM_MOUSELAST, OnMouseEvent) NOTIFY_CODE_HANDLER(TTN_SHOW, OnTooltipShow) END_MSG_MAP() @@ -201,6 +203,7 @@ public: LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnGetInfoTip(INT uCode, LPNMHDR hdr, BOOL& bHandled); LRESULT OnCustomDraw(INT uCode, LPNMHDR hdr, BOOL& bHandled); + LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnBalloonPop(UINT uCode, LPNMHDR hdr, BOOL& bHandled); @@ -240,6 +243,7 @@ public: MESSAGE_HANDLER(WM_CREATE, OnCreate) MESSAGE_HANDLER(WM_DESTROY, OnDestroy) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) + MESSAGE_HANDLER(WM_COMMAND, OnCommand) MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_CONTEXTMENU, OnCtxMenu) MESSAGE_HANDLER(WM_TIMER, OnTimer) @@ -1015,6 +1019,54 @@ VOID CNotifyToolbar::ResizeImagelist() SetButtonSize(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON)); } +LRESULT CNotifyToolbar::OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + bHandled = FALSE; + + /* + * WM_CONTEXTMENU message can be generated either by the mouse, + * in which case lParam encodes the mouse coordinates where the + * user right-clicked the mouse, or can be generated by (Shift-)F10 + * keyboard press, in which case lParam equals -1. + */ + INT iBtn = GetHotItem(); + if (iBtn < 0) + return 0; + + InternalIconData* notifyItem = GetItemData(iBtn); + + if (!::IsWindow(notifyItem->hWnd)) + return 0; + + if (notifyItem->uVersionCopy >= NOTIFYICON_VERSION) + { + /* Transmit the WM_CONTEXTMENU message if the notification icon supports it */ + ::SendNotifyMessage(notifyItem->hWnd, + notifyItem->uCallbackMessage, + notifyItem->uID, + WM_CONTEXTMENU); + } + else if (lParam == -1) + { + /* + * Otherwise, and only if the WM_CONTEXTMENU message was generated + * from the keyboard, simulate right-click mouse messages. This is + * not needed if the message came from the mouse because in this + * case the right-click mouse messages were already sent together. + */ + ::SendNotifyMessage(notifyItem->hWnd, + notifyItem->uCallbackMessage, + notifyItem->uID, + WM_RBUTTONDOWN); + ::SendNotifyMessage(notifyItem->hWnd, + notifyItem->uCallbackMessage, + notifyItem->uID, + WM_RBUTTONUP); + } + + return 0; +} + bool CNotifyToolbar::SendNotifyCallback(InternalIconData* notifyItem, UINT uMsg) { if (!::IsWindow(notifyItem->hWnd)) @@ -1045,10 +1097,10 @@ bool CNotifyToolbar::SendNotifyCallback(InternalIconData* notifyItem, UINT uMsg) } else { - SendMessage(notifyItem->hWnd, - notifyItem->uCallbackMessage, - notifyItem->uID, - uMsg); + ::SendMessage(notifyItem->hWnd, + notifyItem->uCallbackMessage, + notifyItem->uID, + uMsg); } return false; } @@ -1087,7 +1139,6 @@ VOID CNotifyToolbar::SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wPar LRESULT CNotifyToolbar::OnMouseEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; - INT iBtn = HitTest(&pt); if (iBtn >= 0) @@ -1376,6 +1427,55 @@ LRESULT CSysPagerWnd::OnCustomDraw(INT uCode, LPNMHDR hdr, BOOL& bHandled) return TRUE; } +LRESULT CSysPagerWnd::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + bHandled = FALSE; + + /* Handles the BN_CLICKED notifications sent by the CNotifyToolbar member */ + if (HIWORD(wParam) != BN_CLICKED) + return 0; + + INT iBtn = LOWORD(wParam); + if (iBtn < 0) + return 0; + + InternalIconData* notifyItem = Toolbar.GetItemData(iBtn); + + if (!::IsWindow(notifyItem->hWnd)) + return 0; + + // TODO: Improve keyboard handling by looking whether one presses + // on ENTER, etc..., which roughly translates into "double-clicking". + + if (notifyItem->uVersionCopy >= NOTIFYICON_VERSION) + { + /* Use new-style notifications if the notification icon supports them */ + ::SendNotifyMessage(notifyItem->hWnd, + notifyItem->uCallbackMessage, + notifyItem->uID, + NIN_SELECT); // TODO: Distinguish with NIN_KEYSELECT + } + else if (lParam == -1) + { + /* + * Otherwise, and only if the icon was selected via the keyboard, + * simulate right-click mouse messages. This is not needed if the + * selection was done by mouse because in this case the mouse + * messages were already sent. + */ + ::SendNotifyMessage(notifyItem->hWnd, + notifyItem->uCallbackMessage, + notifyItem->uID, + WM_LBUTTONDOWN); // TODO: Distinguish with double-click WM_LBUTTONDBLCLK + ::SendNotifyMessage(notifyItem->hWnd, + notifyItem->uCallbackMessage, + notifyItem->uID, + WM_LBUTTONUP); + } + + return 0; +} + LRESULT CSysPagerWnd::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { LRESULT Ret = TRUE;

1 0

01/01: [RAPPS] Update rapps .cab download link
by Alexander Shaposhnikov 02 Apr '18

02 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb819f1528f078a9ac7b9… commit bb819f1528f078a9ac7b91c32e058e1d05f05052 Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Mon Apr 2 21:00:10 2018 +0300 Commit: Alexander Shaposhnikov <sanchaez(a)reactos.org> CommitDate: Mon Apr 2 22:11:11 2018 +0300 [RAPPS] Update rapps .cab download link This replaces old link to svn.reactos.org with rapps.reactos.org which is a new stable location for RAPPS database and future community website. That said, svn.reactos.org link will be kept for some time. TODO: make this a configurable value. CORE-14351 --- base/applications/rapps/include/defines.h | 2 +- base/applications/rapps/loaddlg.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/rapps/include/defines.h b/base/applications/rapps/include/defines.h index 31feb26828..921391c5c7 100644 --- a/base/applications/rapps/include/defines.h +++ b/base/applications/rapps/include/defines.h @@ -29,7 +29,7 @@ #include "resource.h" #include "winmain.h" -#define APPLICATION_DATABASE_URL L"https://svn.reactos.org/packages/rappmgr.cab" +#define APPLICATION_DATABASE_URL L"https://rapps.reactos.org/rappmgr.cab" #define MAX_STR_LEN 256 enum AppsCategories diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 30aa4a2f3c..5c8d6c217f 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -48,7 +48,7 @@ #ifdef USE_CERT_PINNING #define CERT_ISSUER_INFO "US\r\nLet's Encrypt\r\nLet's Encrypt Authority X3" -#define CERT_SUBJECT_INFO "svn.reactos.org" +#define CERT_SUBJECT_INFO "rapps.reactos.org" #endif enum DownloadStatus

1 0

01/01: [WINLOGON] Fix shutdown timeout format string for long timeout
by Eric Kohl 02 Apr '18

02 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3318d8d5be273f92f77bd… commit 3318d8d5be273f92f77bda4debd8b9cfa25ea599 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Apr 2 18:52:47 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Apr 2 19:09:13 2018 +0200 [WINLOGON] Fix shutdown timeout format string for long timeout - Use the "%d days" format for timeouts longer than a day. - Fail if timeout is 10 years or longer. - TODO: Replace format strings by resources. German WinXP uses "%d days" instead of "%d Tage". We can do better! ;-) --- base/system/winlogon/shutdown.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/base/system/winlogon/shutdown.c b/base/system/winlogon/shutdown.c index d09368664a..42452ca067 100644 --- a/base/system/winlogon/shutdown.c +++ b/base/system/winlogon/shutdown.c @@ -16,6 +16,8 @@ /* DEFINES *******************************************************************/ #define SHUTDOWN_TIMER_ID 2000 +#define SECONDS_PER_DAY 86400 +#define SECONDS_PER_DECADE 315360000 /* STRUCTS *******************************************************************/ @@ -46,16 +48,25 @@ OnTimer( HWND hwndDlg, PSYS_SHUTDOWN_PARAMS pShutdownParams) { - WCHAR szBuffer[10]; - INT iSeconds, iMinutes, iHours; + WCHAR szBuffer[12]; + INT iSeconds, iMinutes, iHours, iDays; - iSeconds = (INT)pShutdownParams->dwTimeout; - iHours = iSeconds / 3600; - iSeconds -= iHours * 3600; - iMinutes = iSeconds / 60; - iSeconds -= iMinutes * 60; + if (pShutdownParams->dwTimeout < SECONDS_PER_DAY) + { + iSeconds = (INT)pShutdownParams->dwTimeout; + iHours = iSeconds / 3600; + iSeconds -= iHours * 3600; + iMinutes = iSeconds / 60; + iSeconds -= iMinutes * 60; + + swprintf(szBuffer, L"%02d:%02d:%02d", iHours, iMinutes, iSeconds); + } + else + { + iDays = (INT)(pShutdownParams->dwTimeout / SECONDS_PER_DAY); + swprintf(szBuffer, L"%d days", iDays); + } - swprintf(szBuffer, L"%02d:%02d:%02d", iHours, iMinutes, iSeconds); SetDlgItemTextW(hwndDlg, IDC_SYSSHUTDOWNTIMELEFT, szBuffer); if (pShutdownParams->dwTimeout == 0) @@ -185,6 +196,10 @@ StartSystemShutdown( { HANDLE hThread; + /* Fail if the timeout is 10 years or more */ + if (dwTimeout >= SECONDS_PER_DECADE) + return ERROR_INVALID_PARAMETER; + if (_InterlockedCompareExchange8((volatile char*)&g_ShutdownParams.bShuttingDown, TRUE, FALSE) == TRUE) return ERROR_SHUTDOWN_IN_PROGRESS;

1 0

01/01: [TRACERT] Use ConUtils lib and update de-DE.rc CORE-14265
by Joachim Henze 02 Apr '18

02 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d66048b162fe35002404… commit 3d66048b162fe350024045e50a1852b1f4bd1516 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Apr 2 18:10:31 2018 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Apr 2 18:10:31 2018 +0200 [TRACERT] Use ConUtils lib and update de-DE.rc CORE-14265 Most likely this also improves formerly unprintable characters for fr-FR, it-IT, ro-RO, ru-RU, zh-CN. --- base/applications/network/tracert/CMakeLists.txt | 4 ++- base/applications/network/tracert/lang/de-DE.rc | 41 +++++++++++++----------- base/applications/network/tracert/tracert.cpp | 10 ++++-- 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/base/applications/network/tracert/CMakeLists.txt b/base/applications/network/tracert/CMakeLists.txt index 132f7fc6de..f1a3a58389 100644 --- a/base/applications/network/tracert/CMakeLists.txt +++ b/base/applications/network/tracert/CMakeLists.txt @@ -1,5 +1,7 @@ +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) add_executable(tracert tracert.cpp tracert.rc) set_module_type(tracert win32cui UNICODE) -add_importlibs(tracert ws2_32 iphlpapi user32 msvcrt kernel32 ntdll) +target_link_libraries(tracert conutils ${PSEH_LIB}) +add_importlibs(tracert ws2_32 iphlpapi msvcrt kernel32 ntdll) add_cd_file(TARGET tracert DESTINATION reactos/system32 FOR all) diff --git a/base/applications/network/tracert/lang/de-DE.rc b/base/applications/network/tracert/lang/de-DE.rc index dae8fce082..220d3a01d4 100644 --- a/base/applications/network/tracert/lang/de-DE.rc +++ b/base/applications/network/tracert/lang/de-DE.rc @@ -1,26 +1,31 @@ +/* + * FILE: base/applications/network/tracert/de-DE.rc + * PURPOSE: German translations for ReactOS Tracert Command + * TRANSLATORS: reactosfanboy <Joachim.Henze(a)reactos.org> + */ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_USAGE "\r\n\ -Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ -Options:\r\n\ - -d Do not resolve addresses to hostnames.\r\n\ - -h maximum_hops Maximum number of hops to search for target.\r\n\ - -j host-list Loose source route along host-list.\r\n\ - -w timeout Wait timeout milliseconds for each reply.\r\n\ - -4 Force using IPv4.\r\n\ - -6 Force using IPv6.\r\n\ +Syntax: tracert [-d] [-h maximum_hops] [-j Hostliste] [-w Zeitlimit] Zielname \r\n\r\n\ +Optionen:\r\n\ + -d Adressen nicht in Hostnamen auflösen.\r\n\ + -h maximum_hops Maximale Sprunganzahl bei Zielsuche.\r\n\ + -j Hostliste 'Loose Source Route' gemäß Hostliste.\r\n\ + -w Zeitlimit Zeitlimit in Millisekunden für eine Antwort.\r\n\ + -4 erzwingt IPv4.\r\n\ + -6 erzwingt IPv6.\r\n\ \r\n" - IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" - IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" - IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" - IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + IDS_INVALID_OPTION "%1 ist keine gültige Befehlsoption.\r\n" + IDS_TRACE_INFO "\r\nRoutenverfolgung zu %1 [%2]\r\nüber maximal %3!u! Hops:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nRoutenverfolgung beendet.\r\n" + IDS_UNABLE_RESOLVE "Der Zielname %1 konnte nicht aufgelöst werden.\r\n" - IDS_GEN_FAILURE "General failure.\r\n" - IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" + IDS_GEN_FAILURE "Allgemeiner Fehler.\r\n" + IDS_TRANSMIT_FAILED "Übertragungsfehler. (Fehler %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" @@ -29,9 +34,9 @@ Options:\r\n\ IDS_HOP_RES_INFO "%1 [%2]" IDS_HOP_IP_INFO "%1" IDS_LINEBREAK "\r\n" - IDS_REQ_TIMED_OUT "Request timed out.\r\n" - IDS_HOP_RESPONSE " reports: " - IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" - IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" + IDS_REQ_TIMED_OUT "Zeitüberschreitung der Anforderung.\r\n" + IDS_HOP_RESPONSE " Antwort: " + IDS_DEST_HOST_UNREACHABLE "Zielhost nicht erreichbar.\r\n" + IDS_DEST_NET_UNREACHABLE "Zielnetz nicht erreichbar.\r\n" END diff --git a/base/applications/network/tracert/tracert.cpp b/base/applications/network/tracert/tracert.cpp index 1b52d56650..d90a78a52a 100644 --- a/base/applications/network/tracert/tracert.cpp +++ b/base/applications/network/tracert/tracert.cpp @@ -8,15 +8,16 @@ */ #ifdef __REACTOS__ +#define USE_CONUTILS #define WIN32_NO_STATUS #include <stdarg.h> #include <windef.h> #include <winbase.h> #include <winuser.h> #define _INC_WINDOWS -#include <stdio.h> #include <stdlib.h> #include <winsock2.h> +#include <conutils.h> #else #include <winsock2.h> #include <Windows.h> @@ -144,7 +145,7 @@ OutputText( return Ret; } #else -#define OutputText(Id, ...) ConResPrintf(StdOut, Id, __VA_ARGS__) +#define OutputText(Id, ...) ConResMsgPrintfEx(StdOut, NULL, 0, Id, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), ##__VA_ARGS__) #endif //USE_CONUTILS static @@ -554,6 +555,11 @@ ParseCmdline(int argc, wchar_t *argv[]) EXTERN_C int wmain(int argc, wchar_t *argv[]) { +#ifdef USE_CONUTILS + /* Initialize the Console Standard Streams */ + ConInitStdStreams(); +#endif + Info.ResolveAddresses = true; Info.MaxHops = 30; Info.Timeout = 4000;

1 0

01/01: [EXPLORER] Add missing 'break' statements. Spotted by mudhead. CORE-14518
by Hermès Bélusca-Maïto 02 Apr '18

02 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f108ac8a87d460af611b… commit 2f108ac8a87d460af611b443a581718bfd507a6e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Apr 2 16:12:25 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Apr 2 16:12:25 2018 +0200 [EXPLORER] Add missing 'break' statements. Spotted by mudhead. CORE-14518 --- base/shell/explorer/syspager.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index fa2aa73b36..5340ba4921 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -1283,9 +1283,11 @@ BOOL CSysPagerWnd::NotifyIcon(DWORD dwMessage, _In_ CONST NOTIFYICONDATA *iconDa (void)AddIconToWatcher(iconData); } break; + case NIM_MODIFY: ret = Toolbar.UpdateButton(iconData); break; + case NIM_DELETE: ret = Toolbar.RemoveButton(iconData); if (ret == TRUE) @@ -1293,11 +1295,16 @@ BOOL CSysPagerWnd::NotifyIcon(DWORD dwMessage, _In_ CONST NOTIFYICONDATA *iconDa (void)RemoveIconFromWatcher(iconData); } break; + case NIM_SETFOCUS: Toolbar.SetFocus(); ret = TRUE; + break; + case NIM_SETVERSION: ret = Toolbar.SwitchVersion(iconData); + break; + default: TRACE("NotifyIcon received with unknown code %d.\n", dwMessage); return FALSE;

1 0

01/01: [WINLOGON] Fix some dialog control dimensions.
by Hermès Bélusca-Maïto 02 Apr '18

02 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2da4999011fb491805817… commit 2da4999011fb491805817e2eff22fe5fedf072be Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Apr 2 01:23:19 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Apr 2 15:05:25 2018 +0200 [WINLOGON] Fix some dialog control dimensions. --- base/system/winlogon/lang/cs-CZ.rc | 4 ++-- base/system/winlogon/lang/el-GR.rc | 4 ++-- base/system/winlogon/lang/fr-FR.rc | 6 +++--- base/system/winlogon/lang/he-IL.rc | 2 +- base/system/winlogon/lang/hu-HU.rc | 2 +- base/system/winlogon/lang/id-ID.rc | 2 +- base/system/winlogon/lang/ms-MY.rc | 4 ++-- base/system/winlogon/lang/pl-PL.rc | 4 ++-- base/system/winlogon/lang/pt-BR.rc | 2 +- base/system/winlogon/lang/ro-RO.rc | 2 +- base/system/winlogon/lang/ru-RU.rc | 4 ++-- base/system/winlogon/lang/sk-SK.rc | 2 +- base/system/winlogon/lang/sq-AL.rc | 2 +- base/system/winlogon/lang/tr-TR.rc | 2 +- base/system/winlogon/lang/uk-UA.rc | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/base/system/winlogon/lang/cs-CZ.rc b/base/system/winlogon/lang/cs-CZ.rc index a5aee95484..0647df4545 100644 --- a/base/system/winlogon/lang/cs-CZ.rc +++ b/base/system/winlogon/lang/cs-CZ.rc @@ -5,9 +5,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Vypnutí počítače" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Nyní můžete Váš počítač bez obav vypnout.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Nyní můžete Váš počítač bez obav vypnout.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Restartovat", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Restartovat", IDC_BTNSHTDOWNCOMPUTER, 58, 32, 48, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 diff --git a/base/system/winlogon/lang/el-GR.rc b/base/system/winlogon/lang/el-GR.rc index f1b6eee22d..c1fa72745a 100644 --- a/base/system/winlogon/lang/el-GR.rc +++ b/base/system/winlogon/lang/el-GR.rc @@ -5,9 +5,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Τερματισμός Υπολογιστή" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Τώρα είναι ασφαλές να κλείσετε τον υπολογιστή σας.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Τώρα είναι ασφαλές να κλείσετε τον υπολογιστή σας.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Επανεκκίνηση", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Επανεκκίνηση", IDC_BTNSHTDOWNCOMPUTER, 58, 32, 48, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 diff --git a/base/system/winlogon/lang/fr-FR.rc b/base/system/winlogon/lang/fr-FR.rc index e9cba337c9..b1f9b92512 100644 --- a/base/system/winlogon/lang/fr-FR.rc +++ b/base/system/winlogon/lang/fr-FR.rc @@ -7,9 +7,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Arrêter l'ordinateur" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Vous pouvez maintenant éteindre votre ordinateur en toute sécurité", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Vous pouvez maintenant éteindre votre ordinateur en toute sécurité.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Redémarrer", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Redémarrer", IDC_BTNSHTDOWNCOMPUTER, 58, 32, 48, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 @@ -17,7 +17,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Échec de l'interface utilisateur" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Le chargement du DLL %s de l'interface utilisateur a échoué", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Le chargement du DLL %s de l'interface utilisateur a échoué.", IDC_GINALOADFAILED, 39, 16, 156, 24 LTEXT "Contactez votre administrateur système pour remplacer la DLL, ou restaurez la DLL originale.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 DEFPUSHBUTTON "&Redémarrer", 1, 80, 91, 68, 14 END diff --git a/base/system/winlogon/lang/he-IL.rc b/base/system/winlogon/lang/he-IL.rc index ebf4b2fb14..d4f3785850 100644 --- a/base/system/winlogon/lang/he-IL.rc +++ b/base/system/winlogon/lang/he-IL.rc @@ -19,7 +19,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ספריית הקישור הדינאמי %s של ממשק ההתחברות נכשלה להטען.", IDC_GINALOADFAILED, 39, 16, 156, 24 LTEXT "פנה אל מנהל המערכת שלך כדי להחליף את הDLL, או תשחזר את הDLL המקורי.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 - DEFPUSHBUTTON "הפעל מחדש", 1, 59, 32, 49, 14 + DEFPUSHBUTTON "הפעל מחדש", 1, 80, 91, 68, 14 END IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 diff --git a/base/system/winlogon/lang/hu-HU.rc b/base/system/winlogon/lang/hu-HU.rc index c0c8974e8a..ef62ded49e 100644 --- a/base/system/winlogon/lang/hu-HU.rc +++ b/base/system/winlogon/lang/hu-HU.rc @@ -9,7 +9,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Mostmár biztonságos a gép kikapcsolása.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Újraindítás", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Újraindítás", IDC_BTNSHTDOWNCOMPUTER, 60, 32, 44, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 diff --git a/base/system/winlogon/lang/id-ID.rc b/base/system/winlogon/lang/id-ID.rc index 9cc54d5632..129140fff3 100644 --- a/base/system/winlogon/lang/id-ID.rc +++ b/base/system/winlogon/lang/id-ID.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Matikan Komputer" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Sekarang aman untuk mematikan komputer anda.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Sekarang aman untuk mematikan komputer anda.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 DEFPUSHBUTTON "&Mulai Lagi", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 END diff --git a/base/system/winlogon/lang/ms-MY.rc b/base/system/winlogon/lang/ms-MY.rc index fa4cca5d5f..2d2bfff416 100644 --- a/base/system/winlogon/lang/ms-MY.rc +++ b/base/system/winlogon/lang/ms-MY.rc @@ -7,9 +7,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Memadam komputer" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Kini, adalah selamat untuk memadamkan komputer anda.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Kini, adalah selamat untuk memadamkan komputer anda.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "Mula semula(&R)", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "Mula semula(&R)", IDC_BTNSHTDOWNCOMPUTER, 52, 32, 60, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 diff --git a/base/system/winlogon/lang/pl-PL.rc b/base/system/winlogon/lang/pl-PL.rc index 2c3f93c311..ae112f0944 100644 --- a/base/system/winlogon/lang/pl-PL.rc +++ b/base/system/winlogon/lang/pl-PL.rc @@ -12,9 +12,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Wyłączanie komputera" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Możesz teraz bezpiecznie wyłączyć komputer.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Możesz teraz bezpiecznie wyłączyć komputer.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Uruchom ponownie", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Uruchom ponownie", IDC_BTNSHTDOWNCOMPUTER, 48, 32, 68, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 diff --git a/base/system/winlogon/lang/pt-BR.rc b/base/system/winlogon/lang/pt-BR.rc index 346887795c..7715d3242c 100644 --- a/base/system/winlogon/lang/pt-BR.rc +++ b/base/system/winlogon/lang/pt-BR.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Desligar Computador" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "O seu computador pode ser desligado com segurança.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "O seu computador pode ser desligado com segurança.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 DEFPUSHBUTTON "&Restart", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 END diff --git a/base/system/winlogon/lang/ro-RO.rc b/base/system/winlogon/lang/ro-RO.rc index f7684533d0..ae51afc224 100644 --- a/base/system/winlogon/lang/ro-RO.rc +++ b/base/system/winlogon/lang/ro-RO.rc @@ -14,7 +14,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Oprire calculator" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Acum puteți închide calculatorul în siguranță.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Acum puteți închide calculatorul în siguranță.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 DEFPUSHBUTTON "&Repornire", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 END diff --git a/base/system/winlogon/lang/ru-RU.rc b/base/system/winlogon/lang/ru-RU.rc index 479b0dd062..e38d1ff591 100644 --- a/base/system/winlogon/lang/ru-RU.rc +++ b/base/system/winlogon/lang/ru-RU.rc @@ -5,9 +5,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Выключение компьютера" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Теперь можно безопасно выключить компьютер.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Теперь можно безопасно выключить компьютер.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Перезагрузка", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Перезагрузка", IDC_BTNSHTDOWNCOMPUTER, 52, 32, 60, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 diff --git a/base/system/winlogon/lang/sk-SK.rc b/base/system/winlogon/lang/sk-SK.rc index 036ef00272..59447f5e04 100644 --- a/base/system/winlogon/lang/sk-SK.rc +++ b/base/system/winlogon/lang/sk-SK.rc @@ -12,7 +12,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Teraz môžete počítač bezpečne vypnúť.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Reštartovať", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Reštartovať", IDC_BTNSHTDOWNCOMPUTER, 58, 32, 48, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 diff --git a/base/system/winlogon/lang/sq-AL.rc b/base/system/winlogon/lang/sq-AL.rc index e0c19673f6..699ec03d25 100644 --- a/base/system/winlogon/lang/sq-AL.rc +++ b/base/system/winlogon/lang/sq-AL.rc @@ -9,7 +9,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Fik kompjuterin" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Tani është e sigurt për të fikur kompjuterin tuaj.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Tani është e sigurt për të fikur kompjuterin tuaj.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 DEFPUSHBUTTON "&Rifillo", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 END diff --git a/base/system/winlogon/lang/tr-TR.rc b/base/system/winlogon/lang/tr-TR.rc index 9c82dffd4c..2a3119823f 100644 --- a/base/system/winlogon/lang/tr-TR.rc +++ b/base/system/winlogon/lang/tr-TR.rc @@ -9,7 +9,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Şimdi bilgisayarınızı kapatmak güvenlidir.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Yeniden Başlat", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Yeniden Başlat", IDC_BTNSHTDOWNCOMPUTER, 54, 32, 56, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 diff --git a/base/system/winlogon/lang/uk-UA.rc b/base/system/winlogon/lang/uk-UA.rc index dc2c39b084..d88737ca63 100644 --- a/base/system/winlogon/lang/uk-UA.rc +++ b/base/system/winlogon/lang/uk-UA.rc @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Тепер можна вимкнути комп'ютер.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Перезавантаження", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Перезавантаження", IDC_BTNSHTDOWNCOMPUTER, 52, 32, 60, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs