[ros-diffs] [khornicek] 62682: [SHUTDOWN] - fix a typo in the czech translation [CONSOLE] - fix a buffer overrun CID #1102302 - update and fix the czech translation [MAIN] - fix the fix by taking the null term...

Mon, 07 Apr 2014 15:04:19 -0700 

Author: khornicek
Date: Mon Apr  7 22:02:26 2014
New Revision: 62682

URL: http://svn.reactos.org/svn/reactos?rev=62682&view=rev
Log:
[SHUTDOWN]
- fix a typo in the czech translation

[CONSOLE]
- fix a buffer overrun
CID #1102302
- update and fix the czech translation

[MAIN]
- fix the fix by taking the null terminator into account

Modified:
    trunk/reactos/base/applications/shutdown/lang/cs-CZ.rc
    trunk/reactos/dll/cpl/console/console.c
    trunk/reactos/dll/cpl/console/lang/cs-CZ.rc
    trunk/reactos/dll/cpl/main/mouse.c

Modified: trunk/reactos/base/applications/shutdown/lang/cs-CZ.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown/lang/cs-CZ.rc?rev=62682&r1=62681&r2=62682&view=diff
==============================================================================
--- trunk/reactos/base/applications/shutdown/lang/cs-CZ.rc      [iso-8859-1] 
(original)
+++ trunk/reactos/base/applications/shutdown/lang/cs-CZ.rc      [iso-8859-1] 
Mon Apr  7 22:02:26 2014
@@ -8,7 +8,7 @@
 /* Dialog */
 IDD_GUI DIALOGEX 0, 0, 240, 255
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Vzrálené vypnutí"
+CAPTION "Vzdálené vypnutí"
 FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON "&OK", IDC_OK, 125, 232, 50, 14

Modified: trunk/reactos/dll/cpl/console/console.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.c?rev=62682&r1=62681&r2=62682&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/console/console.c     [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/console.c     [iso-8859-1] Mon Apr  7 
22:02:26 2014
@@ -327,9 +327,9 @@
 
     if (pConInfo->ci.ConsoleTitle[0] != L'\0')
     {
-        wcsncpy(szTitle, L"\"", sizeof(szTitle) / sizeof(szTitle[0]));
-        wcsncat(szTitle, pConInfo->ci.ConsoleTitle, sizeof(szTitle) / 
sizeof(szTitle[0]));
-        wcsncat(szTitle, L"\"", sizeof(szTitle) / sizeof(szTitle[0]));
+        wcsncpy(szTitle, L"\"", MAX_PATH);
+        wcsncat(szTitle, pConInfo->ci.ConsoleTitle, MAX_PATH - 
wcslen(szTitle));
+        wcsncat(szTitle, L"\"", MAX_PATH - wcslen(szTitle));
     }
     else
     {

Modified: trunk/reactos/dll/cpl/console/lang/cs-CZ.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/cs-CZ.rc?rev=62682&r1=62681&r2=62682&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/cs-CZ.rc [iso-8859-1] Mon Apr  7 
22:02:26 2014
@@ -1,4 +1,4 @@
-/*
+/*
  * FILE:       dll/cpl/console/lang/cs-CZ.rc
  * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com)
  * UPDATED:    2011-03-31
@@ -19,11 +19,11 @@
     CONTROL "&Okno", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | 
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10
     CONTROL "&Celá obrazovka", IDC_RADIO_DISPLAY_FULL, "Button", 
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10
     GROUPBOX "Historie příkazů", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE 
| WS_GROUP
-    LTEXT "Velikost v&yrovnávací paměti:", -1, 14, 101, 70, 12
+    LTEXT "&Velikost paměti:", -1, 14, 101, 70, 12
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | 
WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | 
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15
-    LTEXT "&Počet vyrovnávacích pamětí:", -1, 14, 124, 70, 12
+    LTEXT "&Počet pamětí:", -1, 14, 124, 70, 12
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | 
WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | 
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15
@@ -60,7 +60,7 @@
 BEGIN
     LTEXT "Náhled okna:", -1, 8, 6, 95, 10
     CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | 
SS_OWNERDRAW, 8, 16, 115, 70
-    GROUPBOX "Velikost bufferu zobrazení", -1, 130, 12, 115, 50
+    GROUPBOX "Velikost paměti zobrazení", -1, 130, 12, 115, 50
     LTEXT "&Šířka:", -1, 140, 28, 40, 10
     LTEXT "&Výška:", -1, 140, 46, 39, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | 
ES_NUMBER | WS_GROUP
@@ -103,7 +103,7 @@
             WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10
     CONTROL "Pozadí vý&běru", IDC_RADIO_POPUP_BACKGROUND, "Button", 
BS_AUTORADIOBUTTON |
             WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10
-    GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73
+    GROUPBOX "Zvolené barevné složky", -1, 129, 7, 118, 73
     LTEXT "Če&rvená:", -1, 140, 25, 48, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | 
WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | 
UDS_ALIGNRIGHT |
@@ -132,9 +132,9 @@
     CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | 
SS_OWNERDRAW, 199, 90, 12, 12
     CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | 
SS_OWNERDRAW, 213, 90, 12, 12
     CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | 
SS_OWNERDRAW, 227, 90, 12, 12
-    GROUPBOX "Preview (Screen)", -1, 7, 111, 240, 40
+    GROUPBOX "Náhled (obrazovka)", -1, 7, 111, 240, 40
     CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 
15, 124, 224, 20
-    GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40
+    GROUPBOX "Náhled (místní nabídka)", -1, 7, 162, 240, 40
     CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 
15, 176, 224, 20
 END
 

Modified: trunk/reactos/dll/cpl/main/mouse.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=62682&r1=62681&r2=62682&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/main/mouse.c  [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/mouse.c  [iso-8859-1] Mon Apr  7 22:02:26 2014
@@ -1109,8 +1109,8 @@
     else if (dwSchemeSource == 2)
     {
         LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH);
-        _tcsncat(szSchemeName, _T(" "), MAX_PATH - _tcslen(szSchemeName));
-        _tcsncat(szSchemeName, szSystemScheme, MAX_PATH - 
_tcslen(szSchemeName));
+        _tcsncat(szSchemeName, _T(" "), MAX_PATH - _tcslen(szSchemeName) - 1);
+        _tcsncat(szSchemeName, szSystemScheme, MAX_PATH - 
_tcslen(szSchemeName) - 1);
     }
 
     /* Search and select the curent scheme name from the scheme list */

Reply via email to