Merge branch 'windivs7-pulls' of https://github.com/jpbandroid/windivs …

…into windivs7-dev

base/applications/dxdiag/display.c

@@ -18,7 +18,6 @@ GetFileModifyTime(LPCWSTR pFullPath, WCHAR * szTime, int szTimeSize)
     FILETIME AccessTime;
     SYSTEMTIME SysTime, LocalTime;
     UINT Length;
-    TIME_ZONE_INFORMATION TimeInfo;
 
     hFile = CreateFileW(pFullPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
     if (!hFile)
@@ -31,13 +30,10 @@ GetFileModifyTime(LPCWSTR pFullPath, WCHAR * szTime, int szTimeSize)
     }
     CloseHandle(hFile);
 
-    if(!GetTimeZoneInformation(&TimeInfo))
-        return FALSE;
-
     if (!FileTimeToSystemTime(&AccessTime, &SysTime))
         return FALSE;
 
-    if (!SystemTimeToTzSpecificLocalTime(&TimeInfo, &SysTime, &LocalTime))
+    if (!SystemTimeToTzSpecificLocalTime(NULL, &SysTime, &LocalTime))
         return FALSE;
 
     Length = GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &LocalTime, NULL, szTime, szTimeSize);

base/applications/mspaint/lang/hu-HU.rc

@@ -213,7 +213,7 @@ BEGIN
 END
 
 IDD_FONTS DIALOG 0, 0, 225, 25
-CAPTION "Fonts"
+CAPTION "Betűtípusok"
 STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
 EXSTYLE WS_EX_TOOLWINDOW
 FONT 8, "MS Shell Dlg"
@@ -256,13 +256,13 @@ BEGIN
     IDS_ANGLE "A szögnek -89 és 89 között kell lennie."
     IDS_LOADERRORTEXT "A(z) %s fájlt nem sikerült betölteni."
     IDS_ENLARGEPROMPTTEXT "A vágólapon lévő kép nagyobb mint a bitkép.\nSzeretné a bitkép méretét megnövelni?"
-    IDS_BOLD "Bold"
-    IDS_ITALIC "Italic"
-    IDS_UNDERLINE "Underline"
-    IDS_VERTICAL "Vertical"
+    IDS_BOLD "Félkövér"
+    IDS_ITALIC "Dőlt"
+    IDS_UNDERLINE "Aláhúzott"
+    IDS_VERTICAL "Függőleges"
     IDS_PRINTRES "%d x %d pixel/cm"
-    IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
-    IDS_CANTSENDMAIL "Failed to send a mail."
-    IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
+    IDS_CANTPASTE "Nem sikerült a beillesztés a vágólapról. Hibás, vagy nem támogatott adatformátum."
+    IDS_SAVEERROR "Nem sikerült a bitkép mentése az alábbi fájlba:\n\n%s"
+    IDS_CANTSENDMAIL "Nem sikerült az email küldése."
+    IDS_LOSECOLOR "A színinformációk el fognak veszni a művelet során. Biztosan folytatja?"
 END

base/applications/notepad/dialog.c

@@ -164,7 +164,7 @@ int DIALOG_StringMsgBox(HWND hParent, int formatId, LPCTSTR szString, DWORD dwFl
 
     /* Load and format szMessage */
     LoadString(Globals.hInstance, formatId, szResource, _countof(szResource));
-    _sntprintf(szMessage, _countof(szMessage), szResource, szString);
+    StringCchPrintf(szMessage, _countof(szMessage), szResource, szString);
 
     /* Load szCaption */
     if ((dwFlags & MB_ICONMASK) == MB_ICONEXCLAMATION)
@@ -865,22 +865,29 @@ VOID DIALOG_GoTo(VOID)
     else
         ich = (INT)SendMessage(Globals.hEdit, EM_LINEINDEX, GotoData.iLine, 0);
 
+    /* EM_LINEINDEX can return -1 on failure */
+    if (ich < 0)
+        ich = 0;
+
     /* Move the caret */
     SendMessage(Globals.hEdit, EM_SETSEL, ich, ich);
     SendMessage(Globals.hEdit, EM_SCROLLCARET, 0, 0);
 }
 
 VOID DIALOG_StatusBarUpdateCaretPos(VOID)
 {
-    int line, col;
+    int line, ich, col;
     TCHAR buff[MAX_PATH];
     DWORD dwStart, dwSize;
 
     SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwSize);
     line = SendMessage(Globals.hEdit, EM_LINEFROMCHAR, (WPARAM)dwStart, 0);
-    col = dwStart - SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, 0);
+    ich = (int)SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, 0);
+
+    /* EM_LINEINDEX can return -1 on failure */
+    col = ((ich < 0) ? 0 : (dwStart - ich));
 
-    _stprintf(buff, Globals.szStatusBarLineCol, line + 1, col + 1);
+    StringCchPrintf(buff, _countof(buff), Globals.szStatusBarLineCol, line + 1, col + 1);
     SendMessage(Globals.hStatusBar, SB_SETTEXT, SBPART_CURPOS, (LPARAM)buff);
 }
 

base/applications/notepad/lang/hi-IN.rc

@@ -1,8 +1,8 @@
 /*
- * PROJECT:     Notepad Hindi Translation
- * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
- * PURPOSE:     Hindi Translation Of Notepad
- * COPYRIGHT:   Copyright 2018 Arnav Bhatt ([email protected])
+ * PROJECT:     ReactOS Notepad
+ * LICENSE:     LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
+ * PURPOSE:     Hindi (India) resource file
+ * TRANSLATOR:  Copyright 2018 Arnav Bhatt <[email protected]>
  */
 
 LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA
@@ -159,7 +159,7 @@ BEGIN
     STRING_UNTITLED "शीर्षकहीन"
     STRING_ALL_FILES "सभी फाइलें (*.*)"
     STRING_TEXT_FILES_TXT "पाठ फाइलें (*.txt)"
-    STRING_TOOLARGE "नोटपैड के लिए फ़ाइल '% s' बहुत बड़ी है।\n\
+    STRING_TOOLARGE "नोटपैड के लिए फ़ाइल '%s' बहुत बड़ी है।\n\
 कृपया एक अलग इडिटर का प्रयोग करें।"
     STRING_NOTEXT "आपने कोई टेक्स्ट दर्ज नहीं किया है।\
 \nकृपया कुछ टाइप करें और पुनः प्रयास करें"

base/applications/notepad/lang/hu-HU.rc

@@ -131,12 +131,12 @@ BEGIN
 END
 
 DIALOG_PRINTING DIALOG 0, 0, 160, 100
-CAPTION "Now printing"
+CAPTION "Nyomtatás folyamatban"
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15
-    CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15
+    CTEXT "A nyomtatási feladat indul...", IDC_PRINTING_STATUS, 5, 10, 150, 15
+    CTEXT "(Fájlnév)", IDC_PRINTING_FILENAME, 5, 35, 150, 15
     CTEXT "Oldalszám: %u", IDC_PRINTING_PAGE, 5, 55, 150, 15
     PUSHBUTTON "Mégse", IDCANCEL, 50, 75, 60, 20
 END
@@ -176,12 +176,12 @@ Szeretné menteni a változásokat?"
     STRING_LINE_COLUMN "Sor: %d, oszlop: %d"
     STRING_PRINTERROR "Nem sikerült kinyomtatni a következő fájlt: '%s'.\n\nEllenőrizze hogy a nyomtató be van-e kapcsolva és megfelelően van-e konfigurálva."
     STRING_DEFAULTFONT "Lucida Console"
-    STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range."
-    STRING_NOWPRINTING "Now printing page..."
-    STRING_PRINTCANCELING "The print job is being canceled..."
-    STRING_PRINTCOMPLETE "Printing is successfully done."
-    STRING_PRINTCANCELED "Printing has been canceled."
-    STRING_PRINTFAILED "Printing is failed."
+    STRING_LINE_NUMBER_OUT_OF_RANGE "A megadott sorszám kívül esik az elérhető tartományon."
+    STRING_NOWPRINTING "Oldal nyomtatása folyamatban..."
+    STRING_PRINTCANCELING "A nyomtatási feladat megszakítása folyamatban..."
+    STRING_PRINTCOMPLETE "A nyomtatás sikeresen befejeződött."
+    STRING_PRINTCANCELED "A nyomtatást megszakították."
+    STRING_PRINTFAILED "A nyomtatás nem sikerült."
 
     STRING_TEXT_DOCUMENT "Szöveges dokumentum"
     STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n"

base/applications/notepad/main.c

@@ -202,7 +202,7 @@ BOOL NOTEPAD_FindNext(FINDREPLACE *pFindReplace, BOOL bReplace, BOOL bShowAlert)
         if (bShowAlert)
         {
             LoadString(Globals.hInstance, STRING_CANNOTFIND, szResource, _countof(szResource));
-            _sntprintf(szText, _countof(szText), szResource, pFindReplace->lpstrFindWhat);
+            StringCchPrintf(szText, _countof(szText), szResource, pFindReplace->lpstrFindWhat);
             LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, _countof(szResource));
             MessageBox(Globals.hFindReplaceDlg, szText, szResource, MB_OK);
         }
@@ -270,6 +270,7 @@ static VOID NOTEPAD_InitData(HINSTANCE hInstance)
  */
 static VOID NOTEPAD_InitMenuPopup(HMENU menu, LPARAM index)
 {
+    DWORD dwStart, dwEnd;
     int enable;
 
     UNREFERENCED_PARAMETER(index);
@@ -280,8 +281,8 @@ static VOID NOTEPAD_InitMenuPopup(HMENU menu, LPARAM index)
         SendMessage(Globals.hEdit, EM_CANUNDO, 0, 0) ? MF_ENABLED : MF_GRAYED);
     EnableMenuItem(menu, CMD_PASTE,
         IsClipboardFormatAvailable(CF_TEXT) ? MF_ENABLED : MF_GRAYED);
-    enable = (int) SendMessage(Globals.hEdit, EM_GETSEL, 0, 0);
-    enable = (HIWORD(enable) == LOWORD(enable)) ? MF_GRAYED : MF_ENABLED;
+    SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd);
+    enable = ((dwStart == dwEnd) ? MF_GRAYED : MF_ENABLED);
     EnableMenuItem(menu, CMD_CUT, enable);
     EnableMenuItem(menu, CMD_COPY, enable);
     EnableMenuItem(menu, CMD_DELETE, enable);

base/applications/regedit/lang/it-IT.rc

@@ -1,3 +1,11 @@
+/*
+ * PROJECT:     ReactOS Registry Editor
+ * LICENSE:     LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
+ * PURPOSE:     Italian resource file
+ * TRANSLATORS: Copyright 2007-2013 Paolo Devoti <[email protected]>
+ *              Copyright 2013 Ivan Di Francesco (oswetto) <[email protected]>
+ */
+
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 ID_ACCEL ACCELERATORS
@@ -458,10 +466,10 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_IMPORT_PROMPT "Aggiungendo informazioni si possono involontariamente modificare o eliminare i valori e causare il giusto funzionamente dei componenti.\n Se non si considera attendibile la fonte di queste informazioni in '% s', non aggiungere al Registro di sistema.\n\n Si desidera continuare? "
-    IDS_IMPORT_OK "Le chiavi e i valori contenuti in '% s' sono stati correttamente aggiunti al Registro di sistema."
-    IDS_IMPORT_ERROR "Impossibile importare '% s': Errore durante l'apertura del file. Ci può essere un disco, file cdanneggiati o il file non esiste."
-    IDS_EXPORT_ERROR "Impossibile esportare '% s': Errore durante la creazione o la scrittura del file. Ci può essere un disco o un file di sistema danneggiato."
+    IDS_IMPORT_PROMPT "Aggiungendo informazioni si possono involontariamente modificare o eliminare i valori e causare il giusto funzionamente dei componenti.\n Se non si considera attendibile la fonte di queste informazioni in '%s', non aggiungere al Registro di sistema.\n\n Si desidera continuare? "
+    IDS_IMPORT_OK "Le chiavi e i valori contenuti in '%s' sono stati correttamente aggiunti al Registro di sistema."
+    IDS_IMPORT_ERROR "Impossibile importare '%s': Errore durante l'apertura del file. Ci può essere un disco, file cdanneggiati o il file non esiste."
+    IDS_EXPORT_ERROR "Impossibile esportare '%s': Errore durante la creazione o la scrittura del file. Ci può essere un disco o un file di sistema danneggiato."
 END
 
 STRINGTABLE

base/applications/regedit/lang/ro-RO.rc

@@ -431,7 +431,7 @@ BEGIN
     IDS_FLT_REGEDIT4_FLT "*.reg"
     IDS_FLT_ALLFILES "Orice fișier (*.*)"
     IDS_FLT_ALLFILES_FLT "*.*"
-    IDS_FLT_TXTFILES "Text Files (*.txt)"
+    IDS_FLT_TXTFILES "Fișiere text (*.txt)"
     IDS_FLT_TXTFILES_FLT "*.txt"
 END
 
@@ -530,16 +530,16 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_FIELD_KEY_NAME "Key Name:"
-    IDS_FIELD_CLASS_NAME "Class Name:"
-    IDS_NO_CLASS_NAME "<NO CLASS>"
-    IDS_NULL_TIMESTAMP "<NULL>"
-    IDS_FIELD_NAME "  Name:"
-    IDS_FIELD_TYPE "  Type:"
-    IDS_FIELD_DATA "  Data:"
-    IDS_FIELD_LASTWRITE "Last Write Time:"
-    IDS_UNKNOWN "<UNKNOWN>"
-    IDS_VALUE_INDEX "Value %d"
+    IDS_FIELD_KEY_NAME "Numele cheii:"
+    IDS_FIELD_CLASS_NAME "Numele clasei:"
+    IDS_NO_CLASS_NAME "<NO CLASS (nicio clasă)>"
+    IDS_NULL_TIMESTAMP "<NULL (nul)>"
+    IDS_FIELD_NAME "  Nume:"
+    IDS_FIELD_TYPE "  Tip:"
+    IDS_FIELD_DATA "  Dată:"
+    IDS_FIELD_LASTWRITE "Ultima dată a scrierii:"
+    IDS_UNKNOWN "<UNKNOWN (necunoscut)>"
+    IDS_VALUE_INDEX "Valoare %d"
 END
 
 /*****************************************************************/