Ros-diffs September 2014

ros-diffs@reactos.org

16 participants
413 discussions

[janderwald] 64050: [SHELL32] - rewrite _ILCreateFontItem - fix a buffer overflow

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Sep 6 12:33:17 2014 New Revision: 64050 URL: http://svn.reactos.org/svn/reactos?rev=64050&view=rev Log: [SHELL32] - rewrite _ILCreateFontItem - fix a buffer overflow Modified: trunk/reactos/dll/win32/shell32/folders/fonts.cpp Modified: trunk/reactos/dll/win32/shell32/folders/fonts.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fonts.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fonts.cpp [iso-8859-1] Sat Sep 6 12:33:17 2014 @@ -78,30 +78,28 @@ static LPITEMIDLIST _ILCreateFontItem(LPWSTR pszFont, LPWSTR pszFile) { - PIDLDATA tmp; LPITEMIDLIST pidl; - PIDLFontStruct * p; - int size0 = (char*)&tmp.u.cfont.szName - (char*)&tmp.u.cfont; - int size = size0; - - tmp.type = 0x00; - tmp.u.cfont.dummy = 0xFF; - tmp.u.cfont.offsFile = wcslen(pszFont) + 1; - - size += (tmp.u.cfont.offsFile + wcslen(pszFile) + 1) * sizeof(WCHAR); - - pidl = (LPITEMIDLIST)SHAlloc(size + 4); + LPPIDLDATA data; + int length = wcslen(pszFont) + 1; + int size = sizeof(PIDLDATA) + sizeof(ITEMIDLIST); + + size += length * sizeof(WCHAR); + size += (wcslen(pszFile) + 1) * sizeof(WCHAR); + + pidl = (LPITEMIDLIST)SHAlloc(size + 5); if (!pidl) return pidl; - pidl->mkid.cb = size + 2; - memcpy(pidl->mkid.abID, &tmp, 2 + size0); - - p = &((PIDLDATA*)pidl->mkid.abID)->u.cfont; - wcscpy(p->szName, pszFont); - wcscpy(p->szName + tmp.u.cfont.offsFile, pszFile); - - *(WORD*)((char*)pidl + (size + 2)) = 0; + ZeroMemory(pidl, size + 5); + pidl->mkid.cb = size + 3; + + data = _ILGetDataPointer(pidl); + data->type = 0x00; + data->u.cfont.dummy = 0xFF; + data->u.cfont.offsFile = length; + wcscpy(data->u.cfont.szName, pszFont); + wcscpy(&data->u.cfont.szName[length], pszFile); + return pidl; } @@ -607,7 +605,7 @@ { if (StrFormatByteSizeW(FileSize.QuadPart, buffer, sizeof(buffer) / sizeof(WCHAR))) { - psd->str.pOleStr = (LPWSTR)CoTaskMemAlloc(wcslen(buffer) + 1); + psd->str.pOleStr = (LPWSTR)CoTaskMemAlloc((wcslen(buffer) + 1) * sizeof(WCHAR)); if (!psd->str.pOleStr) { CloseHandle(hFile);

10 years, 3 months

[dreimer] 64049: [DLL] Shell32 and browseui: update Russian Translation by Akhlamov Petr CORE-7981 #resolve #comment Committed except the IDS_STANDARD_TOOLBAR part in browseui which is not defined ...

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Sep 6 12:24:49 2014 New Revision: 64049 URL: http://svn.reactos.org/svn/reactos?rev=64049&view=rev Log: [DLL] Shell32 and browseui: update Russian Translation by Akhlamov Petr CORE-7981 #resolve #comment Committed except the IDS_STANDARD_TOOLBAR part in browseui which is not defined ANYWHERE, thx. Modified: trunk/reactos/dll/win32/browseui/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/browseui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] Sat Sep 6 12:24:49 2014 @@ -1,21 +1,3 @@ -/* -* Copyright 2009 Andrew Hill -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; either -* version 2.1 of the License, or (at your option) any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this library; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -*/ - LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT /* Menus */ @@ -67,7 +49,7 @@ BEGIN MENUITEM "&ÐÐ°Ð·Ð°Ð´\tAlt+Ð¡ÑÑÐµÐ»ÐºÐ° Ð²Ð»ÐµÐ²Ð¾", IDM_GOTO_BACK MENUITEM "&ÐÐ¿ÐµÑÐµÐ´\tAlt+Ð¡ÑÑÐµÐ»ÐºÐ° Ð²Ð¿ÑÐ°Ð²Ð¾", IDM_GOTO_FORWARD - MENUITEM "&ÐÐ° Ð¾Ð´Ð¸Ð½ ÑÑÐ¾Ð²ÐµÐ½Ñ Ð²Ð²ÐµÑÑ", IDM_GOTO_UPONELEVEL + MENUITEM "&ÐÐ²ÐµÑÑ", IDM_GOTO_UPONELEVEL MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&ÐÐ¾Ð¼Ð¾Ð¹\tAlt+Home", IDM_GOTO_HOMEPAGE END @@ -119,6 +101,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT @@ -155,7 +138,7 @@ STRINGTABLE BEGIN 9025 "ÐÐ°ÐºÑÑÑÑ Ð¾ÐºÐ½Ð¾." - 9026 "Goes up one level." + 9026 "ÐÐ²ÐµÑÑ." END STRINGTABLE Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Sat Sep 6 12:24:49 2014 @@ -169,7 +169,7 @@ CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 LTEXT "ÐÐº&Ð½Ð¾:", 14016, 8, 136, 68, 10 COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "&ÐÐ¾Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹:", 14018, 8, 154, 68, 10 + LTEXT "&ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹:", 14018, 8, 154, 68, 10 EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL PUSHBUTTON "&ÐÐ°Ð¹ÑÐ¸ Ð¾Ð±ÑÐµÐºÑ...", 14020, 9, 172, 70, 14, ES_LEFT PUSHBUTTON "Ð¡Ð¼&ÐµÐ½Ð¸ÑÑ Ð·Ð½Ð°ÑÐ¾Ðº...", 14021, 84, 172, 70, 14, ES_LEFT @@ -203,7 +203,7 @@ EDITTEXT 14009, 68, 56, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "Ð Ð°Ð·Ð¼ÐµÑ:", 14010, 8, 72, 55, 10 EDITTEXT 14011, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Size on disk:", 140101, 8, 88, 55, 10 + LTEXT "ÐÐ° Ð´Ð¸ÑÐºÐµ:", 140101, 8, 88, 55, 10 EDITTEXT 14012, 68, 88, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "Ð¡Ð¾Ð´ÐµÑÐ¶Ð¸Ñ:", 14026, 8, 104, 55, 10 EDITTEXT 14027, 68, 104, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -213,9 +213,9 @@ LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "ÐÑÑÐ¸Ð±ÑÑÑ:", 14020, 8, 152, 46, 10 AUTOCHECKBOX "&Ð¢Ð¾Ð»ÑÐºÐ¾ ÑÑÐµÐ½Ð¸Ðµ", 14021, 56, 152, 70, 10 - AUTOCHECKBOX "&Ð¡ÐºÑÑÑÐ¾", 14022, 56, 166, 70, 10 + AUTOCHECKBOX "&Ð¡ÐºÑÑÑÑÐ¹", 14022, 56, 166, 70, 10 AUTOCHECKBOX "&ÐÑÑÐ¸Ð²Ð½ÑÐ¹", 14023, 56, 180, 70, 10 - PUSHBUTTON "A&dvanced...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Ð&Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_FILE_PROPERTIES DIALOGEX 0, 0, 240, 205 @@ -230,14 +230,14 @@ CONTROL "ÑÐ°Ð¹Ð»", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 68, 35, 160, 10 LTEXT "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ:", 14006, 8, 53, 50, 10 ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE - PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Ð Ð°Ð·Ð¼ÐµÑÐµÐ½Ð¸Ðµ:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 68, 75, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "Ð Ð°Ð·Ð¼ÐµÑ:", 14010, 8, 91, 45, 10 EDITTEXT 14011, 68, 91, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Size on disk:", 140112, 8, 107, 55, 10 + LTEXT "ÐÐ° Ð´Ð¸ÑÐºÐµ:", 140112, 8, 107, 55, 10 EDITTEXT 14012, 68, 107, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Ð¡Ð¾Ð·Ð´Ð°Ð½:", 14014, 8, 131, 45, 10 @@ -251,7 +251,7 @@ AUTOCHECKBOX "Ð¢Ð¾Ð»ÑÐºÐ¾ &ÑÑÐµÐ½Ð¸Ðµ", 14021, 58, 189, 67, 10 AUTOCHECKBOX "Ð¡ÐºÑ&ÑÑÑÐ¹", 14022, 126, 189, 50, 10 AUTOCHECKBOX "&ÐÑÑÐ¸Ð²Ð½ÑÐ¹", 14023, 181, 189, 49, 10 - PUSHBUTTON "A&dvanced...", 14028, 180, 185, 50, 15, WS_TABSTOP + PUSHBUTTON "Ð&Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾...", 14028, 180, 185, 50, 15, WS_TABSTOP END IDD_FILE_VERSION DIALOGEX 0, 0, 235, 215 @@ -380,12 +380,12 @@ IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 +CAPTION "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ..." +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", 14002, 195, 14, 60, 16 CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 + LTEXT "Ð¤Ð°Ð¹Ð»", 14001, 8, 6, 169, 10 END IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 238 @@ -477,7 +477,7 @@ IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "ÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ ReactOS" +CAPTION "ÐÑÐºÐ»ÑÑÐ¸ÑÑ ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON 49, 14346, 10, 10, 21, 20, SS_REALSIZECONTROL @@ -587,7 +587,7 @@ GROUPBOX "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ Ð´Ð¸ÑÐºÐ°", -1, 7, 5, 218, 50 PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 165, 91, 60, 14 AUTOCHECKBOX "&ÐÐ²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸ Ð¸ÑÐ¿ÑÐ°Ð²Ð»ÑÑÑ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐµ Ð¾ÑÐ¸Ð±ÐºÐ¸", 14000, 16, 19, 178, 10 - AUTOCHECKBOX "&ÐÑÐ¾Ð²ÐµÑÑÑÑ Ð¸ Ð²Ð¾ÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÑÑ Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½Ð½ÑÐµ ÑÐµÐºÑÐ¾ÑÐ°", 14001, 16, 35, 200, 10 + AUTOCHECKBOX "&ÐÑÐ¾Ð²ÐµÑÑÑÑ Ð¸ Ð²Ð¾ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÑÑ Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½Ð½ÑÐµ ÑÐµÐºÑÐ¾ÑÐ°", 14001, 16, 35, 200, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 218, 8 LTEXT "", 14003, 7, 75, 218, 10 END @@ -612,9 +612,9 @@ IDS_SHV_COLUMN1 "ÐÐ¼Ñ" IDS_SHV_COLUMN2 "Ð Ð°Ð·Ð¼ÐµÑ" IDS_SHV_COLUMN3 "Ð¢Ð¸Ð¿" - IDS_SHV_COLUMN4 "ÐÐ·Ð¼ÐµÐ½ÑÐ½" + IDS_SHV_COLUMN4 "ÐÐ·Ð¼ÐµÐ½ÐµÐ½" IDS_SHV_COLUMN5 "ÐÑÑÐ¸Ð±ÑÑÑ" - IDS_SHV_COLUMN6 "ÐÐ¾Ð»Ð½ÑÐ¹ Ð¾Ð±ÑÑÐ¼" + IDS_SHV_COLUMN6 "ÐÐ¾Ð»Ð½ÑÐ¹ Ð¾Ð±ÑÐµÐ¼" IDS_SHV_COLUMN7 "Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð¾" IDS_SHV_COLUMN8 "ÐÐ¼Ñ" IDS_SHV_COLUMN9 "ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹" @@ -629,7 +629,7 @@ IDS_SHV_NETWORKLOCATION "Ð¡ÐµÑÐµÐ²Ð¾Ðµ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ" IDS_SHV_COLUMN_DOCUMENTS "ÐÐ¾ÐºÑÐ¼ÐµÐ½ÑÑ" IDS_SHV_COLUMN_STATUS "Ð¡Ð¾ÑÑÐ¾ÑÐ½Ð¸Ðµ" - IDS_SHV_COLUMN_COMMENTS "ÐÐ¾Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸" + IDS_SHV_COLUMN_COMMENTS "ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸" IDS_SHV_COLUMN_LOCATION "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ" IDS_SHV_COLUMN_MODEL "ÐÐ¾Ð´ÐµÐ»Ñ" @@ -652,37 +652,37 @@ IDS_DELETE "Ð£Ð´Ð°Ð»Ð¸ÑÑ" IDS_PROPERTIES "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°" IDS_CUT "ÐÑÑÐµÐ·Ð°ÑÑ" - IDS_RESTORE "ÐÐ¾ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ" + IDS_RESTORE "ÐÐ¾ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ" IDS_FORMATDRIVE "Ð¤Ð¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°ÑÑ..." IDS_RENAME "ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑ" IDS_INSERT "ÐÑÑÐ°Ð²Ð¸ÑÑ" - IDS_CREATEFOLDER_DENIED "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¾Ð·Ð´Ð°ÑÑ Ð¿Ð°Ð¿ÐºÑ - Ð½ÐµÑ Ð¿Ð¾Ð»Ð½Ð¾Ð¼Ð¾ÑÐ¸Ð¹." + IDS_CREATEFOLDER_DENIED "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿ÑÐ°Ð² Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð°Ð¿ÐºÐ¸" IDS_CREATEFOLDER_CAPTION "ÐÑÐ¸Ð±ÐºÐ° Ð²Ð¾ Ð²ÑÐµÐ¼Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð°Ð¿ÐºÐ¸" IDS_DELETEITEM_CAPTION "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ ÑÐ°Ð¹Ð»Ð°" IDS_DELETEFOLDER_CAPTION "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¿ÐºÐ¸" IDS_DELETEITEM_TEXT "Ð£Ð´Ð°Ð»Ð¸ÑÑ '%1'?" - IDS_DELETEMULTIPLE_TEXT "Ð£Ð´Ð°Ð»Ð¸ÑÑ ÑÑÐ¸ Ð¾Ð±ÑÐµÐºÑÑ (%1?" + IDS_DELETEMULTIPLE_TEXT "Ð£Ð´Ð°Ð»Ð¸ÑÑ ÑÑÐ¸ Ð¾Ð±ÑÐµÐºÑÑ (%1?" IDS_DELETESELECTED_TEXT "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹ ÑÐ»ÐµÐ¼ÐµÐ½ÑÑ(Ñ)?" - IDS_TRASHITEM_TEXT "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ð»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð¿Ð¾Ð¼ÐµÑÑÐ¸ÑÑ '%1' Ð² ÐÐ¾ÑÐ·Ð¸Ð½Ñ?" + IDS_TRASHITEM_TEXT "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð¿Ð¾Ð¼ÐµÑÑÐ¸ÑÑ '%1' Ð² ÐÐ¾ÑÐ·Ð¸Ð½Ñ?" IDS_TRASHFOLDER_TEXT "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð¿Ð¾Ð¼ÐµÑÑÐ¸ÑÑ '%1' Ð¸ Ð²ÑÐµ ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÐ¸ÐµÑÑ ÑÐ°Ð¹Ð»Ñ Ð² ÐÐ¾ÑÐ·Ð¸Ð½Ñ?" IDS_TRASHMULTIPLE_TEXT "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð¿ÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ ÑÐ»ÐµÐ¼ÐµÐ½ÑÑ %1 Ð² ÐÐ¾ÑÐ·Ð¸Ð½Ñ?" IDS_CANTTRASH_TEXT "Ð¤Ð°Ð¹Ð» '%1' Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿Ð¾Ð¼ÐµÑÐµÐ½ Ð² ÐÐ¾ÑÐ·Ð¸Ð½Ñ. Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð±ÐµÐ·Ð²Ð¾Ð·Ð²ÑÐ°ÑÐ½Ð¾?" IDS_OVERWRITEFILE_TEXT "Ð ÑÑÐ¾Ð¹ Ð¿Ð°Ð¿ÐºÐµ ÑÐ¶Ðµ Ð¸Ð¼ÐµÐµÑÑÑ ÑÐ»ÐµÐ¼ÐµÐ½Ñ '%1'.\n\nÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ ÐµÐ³Ð¾?" IDS_OVERWRITEFILE_CAPTION "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð·Ð°Ð¼ÐµÐ½Ñ ÑÐ°Ð¹Ð»Ð°" - IDS_OVERWRITEFOLDER_TEXT "ÐÑÐ° Ð¿Ð°Ð¿ÐºÐ° ÑÐ¶Ðµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ñ Ð¿Ð°Ð¿ÐºÑ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ '%1'.\n\nÐÑÐ»Ð¸ Ð² Ð¿Ð°Ð¿ÐºÐµ ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÑÑ ÑÐ°Ð¹Ð»Ñ Ñ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²ÑÐ¼Ð¸ Ð¸Ð¼ÐµÐ½Ð°Ð¼Ð¸, ÑÐ¾ Ð¾Ð½Ð¸ ÑÐ°Ðº Ð¶Ðµ Ð±ÑÐ´ÑÑ\nÐ·ÐµÐ¼ÐµÐ½ÐµÐ½Ñ. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" + IDS_OVERWRITEFOLDER_TEXT "ÐÑÐ° Ð¿Ð°Ð¿ÐºÐ° ÑÐ¶Ðµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ñ Ð¿Ð°Ð¿ÐºÑ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ '%1'.\n\nÐÑÐ»Ð¸ Ð² Ð¿Ð°Ð¿ÐºÐµ ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÑÑ ÑÐ°Ð¹Ð»Ñ Ñ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²ÑÐ¼Ð¸ Ð¸Ð¼ÐµÐ½Ð°Ð¼Ð¸, ÑÐ¾ Ð¾Ð½Ð¸ ÑÐ°Ðº Ð¶Ðµ Ð±ÑÐ´ÑÑ\nÐ·Ð°Ð¼ÐµÐ½ÐµÐ½Ñ. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" /* message box strings */ - IDS_RESTART_TITLE "ÐÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ" + IDS_RESTART_TITLE "ÐÐµÑÐµÐ·Ð°Ð³ÑÑÐ·ÐºÐ°" IDS_RESTART_PROMPT "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ReactOS?" - IDS_SHUTDOWN_TITLE "ÐÑÐºÐ»ÑÑÐ¸ÑÑ Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ" + IDS_SHUTDOWN_TITLE "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐ°Ð±Ð¾ÑÑ" IDS_SHUTDOWN_PROMPT "ÐÐ°ÐºÐ¾Ð½ÑÐ¸ÑÑ ÑÐ°Ð±Ð¾ÑÑ Ñ ReactOS?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" + IDS_LOGOFF_TITLE "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐµÐ°Ð½ÑÐ°" + IDS_LOGOFF_PROMPT "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð²ÑÐ¹ÑÐ¸ Ð¸Ð· ÑÐ¸ÑÑÐµÐ¼Ñ?" /* Run File dialog */ - IDS_RUNDLG_ERROR "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾ÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ ÐÐ¸Ð°Ð»Ð¾Ð³ ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ Ð¤Ð°Ð¹Ð» (Ð²Ð½ÑÑÑÐµÐ½Ð½ÑÑ Ð¾ÑÐ¸Ð±ÐºÐ°)" - IDS_RUNDLG_BROWSE_ERROR "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾ÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ ÐÐ¸Ð°Ð»Ð¾Ð³ ÐÐ±Ð·Ð¾Ñ (Ð²Ð½ÑÑÑÐµÐ½Ð½ÑÑ Ð¾ÑÐ¸Ð±ÐºÐ°)" + IDS_RUNDLG_ERROR "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾ÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³Ð¾Ð²Ð¾Ðµ Ð¾ÐºÐ½Ð¾ ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ (Ð²Ð½ÑÑÑÐµÐ½Ð½ÑÑ Ð¾ÑÐ¸Ð±ÐºÐ°)" + IDS_RUNDLG_BROWSE_ERROR "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾ÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³Ð¾Ð²Ð¾Ðµ Ð¾ÐºÐ½Ð¾ ÐÐ±Ð·Ð¾Ñ (Ð²Ð½ÑÑÑÐµÐ½Ð½ÑÑ Ð¾ÑÐ¸Ð±ÐºÐ°)" IDS_RUNDLG_BROWSE_CAPTION "ÐÐ±Ð·Ð¾Ñ" IDS_RUNDLG_BROWSE_FILTER "ÐÑÐ¿Ð¾Ð»Ð½ÑÐµÐ¼ÑÐµ ÑÐ°Ð¹Ð»Ñ (*.exe)\0*.exe\0ÐÑÐµ ÑÐ°Ð¹Ð»Ñ (*.*)\0*.*\0" @@ -695,7 +695,7 @@ IDS_SENDTO "ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ" IDS_STARTMENU "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ" IDS_MYMUSIC "ÐÐ¾Ñ Ð¼ÑÐ·ÑÐºÐ°" - IDS_MYVIDEO "ÐÐ¾Ð¸ ÑÐ¸Ð»ÑÐ¼Ñ" + IDS_MYVIDEO "ÐÐ¾Ð¸ Ð²Ð¸Ð´ÐµÐ¾Ð·Ð°Ð¿Ð¸ÑÐ¸" IDS_DESKTOPDIRECTORY "Ð Ð°Ð±Ð¾ÑÐ¸Ð¹ ÑÑÐ¾Ð»" IDS_NETHOOD "Ð¡ÐµÑÐµÐ²Ð¾Ðµ Ð¾ÐºÑÑÐ¶ÐµÐ½Ð¸Ðµ" IDS_TEMPLATES "Ð¨Ð°Ð±Ð»Ð¾Ð½Ñ" @@ -712,7 +712,7 @@ IDS_ADMINTOOLS "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ\\ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ\\ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ" IDS_COMMON_MUSIC "ÐÐ±ÑÐ¸Ðµ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ\\ÐÐ¾Ñ Ð¼ÑÐ·ÑÐºÐ°" IDS_COMMON_PICTURES "ÐÐ±ÑÐ¸Ðµ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ\\ÐÐ¾Ð¸ ÑÐ¸ÑÑÐ½ÐºÐ¸" - IDS_COMMON_VIDEO "ÐÐ±ÑÐ¸Ðµ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ\\ÐÐ¾Ð¸ ÑÐ¸Ð»ÑÐ¼Ñ" + IDS_COMMON_VIDEO "ÐÐ±ÑÐ¸Ðµ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ\\ÐÐ¾Ð¸ Ð²Ð¸Ð´ÐµÐ¾Ð·Ð°Ð¿Ð¸ÑÐ¸" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" IDS_NETWORKPLACE "Ð¡ÐµÑÐµÐ²Ð¾Ðµ Ð¾ÐºÑÑÐ¶ÐµÐ½Ð¸Ðµ" @@ -725,8 +725,8 @@ /* Open With */ IDS_OPEN_WITH "ÐÑÐºÑÑÑÑ Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ" IDS_OPEN_WITH_CHOOSE "ÐÑÐ±ÑÐ°ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ..." - IDS_OPEN_WITH_RECOMMENDED "Recommended Programs:" - IDS_OPEN_WITH_OTHER "Other Programs:" + IDS_OPEN_WITH_RECOMMENDED "Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÐ¼ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ:" + IDS_OPEN_WITH_OTHER "ÐÑÑÐ³Ð¸Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ:" IDS_SHELL_ABOUT_AUTHORS "&ÐÐ²ÑÐ¾ÑÑ" IDS_SHELL_ABOUT_BACK "< &ÐÐ°Ð·Ð°Ð´" @@ -745,7 +745,7 @@ IDS_BAT_FILE "ÐÐ°ÐºÐµÑÐ½ÑÐ¹ ÑÐ°Ð¹Ð» ReactOS" IDS_CMD_FILE "ÐÐ¾Ð¼Ð°Ð½Ð´Ð½ÑÐ¹ ÑÐºÑÐ¸Ð¿Ñ ReactOS" IDS_COM_FILE "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Dos" - IDS_CPL_FILE "ÐÐ¿Ð»ÐµÑ Ð¿Ð°Ð½ÐµÐ»Ð¸ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ" + IDS_CPL_FILE "ÐÐ¿Ð¿Ð»ÐµÑ Ð¿Ð°Ð½ÐµÐ»Ð¸ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ" IDS_CUR_FILE "ÐÑÑÑÐ¾Ñ" IDS_DLL_FILE "Ð Ð°ÑÑÐ¸ÑÐµÐ½Ð¸Ðµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ" IDS_DRV_FILE "ÐÑÐ°Ð¹Ð²ÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°" @@ -778,7 +778,7 @@ IDS_FILE_DETAILSADV "Ð¤Ð°Ð¹Ð»Ñ Ñ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸ÐµÐ¼ '%s' Ð¸Ð¼ÐµÑÑ ÑÐ¸Ð¿ '%s'. ÐÐ»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð²ÑÐµÑ ÑÐ°Ð¹Ð»Ð¾Ð² '%s', Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ 'ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾'." IDS_FILE_TYPES "Ð¢Ð¸Ð¿Ñ ÑÐ°Ð¹Ð»Ð¾Ð²" IDS_COLUMN_EXTENSION "Ð Ð°ÑÑÐ¸ÑÐµÐ½Ð¸Ñ" - IDS_BYTES_FORMAT "bytes" - IDS_UNKNOWN_APP "Unknown application" - IDS_EXE_DESCRIPTION "Description:" -END + IDS_BYTES_FORMAT "Ð±Ð°Ð¹Ñ" + IDS_UNKNOWN_APP "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾Ðµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ" + IDS_EXE_DESCRIPTION "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:" +END

10 years, 3 months

[dreimer] 64048: [MEDIA] Turkish Translation Update by Erdem Ersoy CORE-7861 #comment Committed your translation notes.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Sep 6 11:13:45 2014 New Revision: 64048 URL: http://svn.reactos.org/svn/reactos?rev=64048&view=rev Log: [MEDIA] Turkish Translation Update by Erdem Ersoy CORE-7861 #comment Committed your translation notes. Added: trunk/reactos/media/doc/For_Turkish_Translators.txt (with props) Added: trunk/reactos/media/doc/For_Turkish_Translators.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/For_Turkish_Tran… ============================================================================== --- trunk/reactos/media/doc/For_Turkish_Translators.txt (added) +++ trunk/reactos/media/doc/For_Turkish_Translators.txt [iso-8859-1] Sat Sep 6 11:13:45 2014 @@ -0,0 +1,5 @@ +The ReactOS is translating to pure Turkish with new terminology. For new terminology, see: http://eersoy93.blogspot.com.tr/p/sozluk.html + +For more information of translating to Turkish, see this forum topic: http://www.reactos.org/forum/viewtopic.php?f=45&t=13528 + +Erdem ERSOY (eersoy93) (erdemersoy(a)live.com) Propchange: trunk/reactos/media/doc/For_Turkish_Translators.txt ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 3 months

[dreimer] 64047: [MEDIA] Translation Notes by Ștefan Fulea CORE-8468 #resolve #comment Committed.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Sep 6 11:09:16 2014 New Revision: 64047 URL: http://svn.reactos.org/svn/reactos?rev=64047&view=rev Log: [MEDIA] Translation Notes by Ștefan Fulea CORE-8468 #resolve #comment Committed. Added: trunk/reactos/media/doc/Romanian translation notes.txt (with props) Added: trunk/reactos/media/doc/Romanian translation notes.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/Romanian%20trans… ============================================================================== --- trunk/reactos/media/doc/Romanian translation notes.txt (added) +++ trunk/reactos/media/doc/Romanian translation notes.txt [iso-8859-1] Sat Sep 6 11:09:16 2014 @@ -0,0 +1,46 @@ +The following material is addressed (in Romanian) to Romanian translators. + +------------------------------------------------------------------------------ + +* NotÄ introductivÄ + +Resursele Ã®n romÃ¢nÄ din ReactOS au suferit Ã®n timp o serie de modificÄri - de la âplombareaâ (iniÈial rudimentarÄ) cu resurse romÃ¢neÈti a primelor aplicaÈii care au apÄrut Ã®ntre resursele (deja traduse) moÈtenite din Wine pÃ¢nÄ la sistematizarea Èi consecventizarea traducerilor acestor resurse Ã®n Ã®ntreg volumul de surse al sistemului de operare. Prezenta notÄ expliciteazÄ normele adoptate pentru aceastÄ sistematizare/consecventizare. + +* ConvenÈii adoptate + +Normele de traducere curente conÈin Ã®n mare parte normele de traducere adoptate Èi Ã®n alte traduceri Èi localizÄri de logicÄ computaÈionalÄ. Cele mai importante Ã®n aceastÄ privinÈÄ se regÄsesc la i18n.ro Èi anume Ã®n âghidul traducÄtoruluiâ: +http://i18n.ro/Ghidul_traducÄtorului_de_software +Astfel: + 1. Se folosesc diacriticele corecte ale limbii romÃ¢ne. + 2. Ãn relaÈia utilizator - calculator se adoptÄ o atitudine informal-autoritarÄ (cu verbe la modul imperativ singular). + 3. Ãn relaÈia utilizator - calculator, Ã®n cazul etapelor intermediare (avÃ¢nd texte delimitate de puncte de suspensie), (Ã®n cazul verbelor) se foloseÈte modul infinitiv lung. + 4. Ãn relaÈia calculator - utilizator se adoptÄ o atitudine formal-politicoasÄ (cu verbe la modul indicativ/conjunctiv, persoana a 2-a, plural). + 5. Ãn relaÈia calculator - utilizator, la raportarea de informaÈii se folosesc verbe la diateza pasivÄ sau reflexivÄ/impersonalÄ. + 6. Se evitÄ politeÈea excesivÄ prin omiterea expresiilor de politeÈe explicite. + 7. Este recomandatÄ o formulare independentÄ de gen (gramatical). + 8. Nu se capitalizeazÄ decÃ¢t prima literÄ dintr-un text. + 9. Traducerile trebuiesc adaptate respectÃ¢nd topica limbii romÃ¢ne. + 10. Se evitÄ utilizarea diacriticelor ca taste active (acceleratori sau taste de acces). + 11. Se evitÄ utilizarea pe post de taste de acces (evidenÈiate prin subliniere), a literelor âiâ, âlâ Èi âIâ, din cauza lÄÈimii lor reduse care le face dificilÄ reperarea, Èi a literelor âgâ, âjâ, âpâ, âqâ Èi âyâ care ar intersecta marcajul de evidenÈiere. + 12. Ghilimelele folosite Ã®n limba romÃ¢nÄ sunt perechea ghilimelele-deschise (99 jos) cu ghilimele-Ã®nchise (99 sus), Èi ghilimelele unghiulare. +La acestea se adaugÄ Èi cÃ¢teva norme (deduse) din âgreÈeli frecventeâ raportate tot la i18n.ro: http://i18n.ro/GreÈeli_frecvente + 13. Se evitÄ articularea inutilÄ, Ã®nsÄ adaptarea mesajelor traduse trebuie totuÈi sÄ primeaze. + 14. Nu se traduc numele proprii, Ã®nsÄ numele traductibile ale componentelor/subcomponentelor unui program sau pachet de programe pot fi traduse. + +* ParticularizÄri locale + +Ãn resursele romÃ¢neÈti din ReactOS existÄ Èi o serie de particularizÄri care fie nu se regÄsesc Ã®n alte traduceri fie din cauza diferenÈelor de naturÄ ale proiectelor, fie e vorba de termeni Ã®ncÄ disputaÈi sau neadoptaÈi Ã®n localizÄrile altor proiecte din diverse motive. Multe dintre acestea au fost menÈionate/discutate Ã®n grupul âDiacriticeâ (http://groups.google.com/group/diacritice). CÃ¢teva dintre cele mai relevante: + 1. Ãn glosar sunt preferate: + - âlogicÄ computaÈionalÄâ vs. âsoftwareâ + - âconfigurareâ/âparticularizareâ vs. âSetareâ + - âmodul pilotâ (sau doar âpilotâ) vs. âdriverâ + - âpÄstreazÄâ vs. âsalveazÄâ + - âConfirmÄâ/âAnuleazÄâ vs. âOKâ/âRenunÈÄâ + 2. Acceleratorii (combinaÈiile de taste de gen âCtrl + Â«tastÄÂ»â) rÄmÃ¢n aceiaÈi ca Ã®n limba englezÄ. + 3. Tastele de acces (combinaÈiile de taste de gen âAlt + Â«tastÄÂ»â) nu rÄmÃ¢n neapÄrat la fel ca Ã®n limba englezÄ. Ãn mulÈimea de taste cu aceastÄ utilizare: + - Se recomandÄ a evita utilizarea literelor âsâ Èi âtâ pe post de taste de acces pentru a preveni confuzia Ã®ntre acestea Èi diacriticele âÈâ Èi âÈâ. + - âfâ Èi ânâ sunt rezervate pentru âConfirmÄâ Èi âAnuleazÄâ (sau âSfÃ¢rÈitâ Èi âTerminÄâ Ã®n cazul ferestrelor-asistent). + - Ãn cazul ferestrelor-asistent, âaâ Èi âoâ sunt rezervate pentru âÃnainteâ Èi âÃnapoiâ. + - Ãn cazul interfeÈelor grafice opÈiunilor âDaâ Èi âNuâ le corespund tastele de acces âaâ Èi âuâ. (Ãn cazul interfeÈelor linie-de-comandÄ, corespunzÄtoare opÈiunilor âDa|Nuâ, care NU sunt taste de acces, rÄmÃ¢n âdâ Èi ânâ.) + 4. Din considerente de lizibilitate, Ã®n cazul programelor executate Ã®n linie-de-comandÄ se folosesc doar ghilimele unghiulare. + 5. Ãn cazul unor subiecte unice (dintr-un context local sau global), se foloseÈte forma articulatÄ. Exemple: âCalculatorul meuâ (numai unul, conÈinut concret), âSistemul de operareâ (unic Ã®n cadrul sÄu), âDocumentele meleâ (conÈinut concret) vs. âLocaÈii Ã®n reÈeaâ (nedefinit), âLinie de comandÄâ (cu multiple posibile instanÈe distincte/independente), etc. Propchange: trunk/reactos/media/doc/Romanian translation notes.txt ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 3 months

[tkreuzer] 64046: [XDK/DDK] - Remove useless inline definition of InterlockedBitTestAnd(Re)Set, which was not used anyway. - Update template for ntdef.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Sep 5 21:54:49 2014 New Revision: 64046 URL: http://svn.reactos.org/svn/reactos?rev=64046&view=rev Log: [XDK/DDK] - Remove useless inline definition of InterlockedBitTestAnd(Re)Set, which was not used anyway. - Update template for ntdef.h Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/generate.bat trunk/reactos/include/xdk/interlocked.h trunk/reactos/include/xdk/ntdef.template.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6404… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Fri Sep 5 21:54:49 2014 @@ -235,51 +235,6 @@ /****************************************************************************** * INTERLOCKED Functions * ******************************************************************************/ -// -// Intrinsics (note: taken from our winnt.h) -// FIXME: 64-bit -// -#if defined(__GNUC__) - -static __inline__ BOOLEAN -InterlockedBitTestAndSet( - _Inout_updates_bytes_((Bit+7)/8) _Interlocked_operand_ LONG volatile *Base, - _In_ LONG Bit) -{ -#if defined(_M_IX86) - LONG OldBit; - __asm__ __volatile__("lock " - "btsl %2,%1\n\t" - "sbbl %0,%0\n\t" - :"=r" (OldBit),"+m" (*Base) - :"Ir" (Bit) - : "memory"); - return OldBit; -#else - return (_InterlockedOr(Base, 1 << Bit) >> Bit) & 1; -#endif -} - -static __inline__ BOOLEAN -InterlockedBitTestAndReset( - _Inout_updates_bytes_((Bit+7)/8) _Interlocked_operand_ LONG volatile *Base, - _In_ LONG Bit) -{ -#if defined(_M_IX86) - LONG OldBit; - __asm__ __volatile__("lock " - "btrl %2,%1\n\t" - "sbbl %0,%0\n\t" - :"=r" (OldBit),"+m" (*Base) - :"Ir" (Bit) - : "memory"); - return OldBit; -#else - return (_InterlockedAnd(Base, ~(1 << Bit)) >> Bit) & 1; -#endif -} - -#endif /* defined(__GNUC__) */ #define BitScanForward _BitScanForward #define BitScanReverse _BitScanReverse @@ -16136,6 +16091,7 @@ ULONGLONG LastRecoveredLsn; } TRANSACTIONMANAGER_RECOVERY_INFORMATION, *PTRANSACTIONMANAGER_RECOVERY_INFORMATION; + typedef struct _TRANSACTION_PROPERTIES_INFORMATION { ULONG IsolationLevel; ULONG IsolationFlags; @@ -16184,7 +16140,7 @@ typedef struct _KTMOBJECT_CURSOR { GUID LastQuery; - ULONG ObjectIdCount; + unsigned long ObjectIdCount; GUID ObjectIds[1]; } KTMOBJECT_CURSOR, *PKTMOBJECT_CURSOR; @@ -16192,14 +16148,14 @@ TransactionBasicInformation, TransactionPropertiesInformation, TransactionEnlistmentInformation, - TransactionSuperiorEnlistmentInformation + TransactionSuperiorEnlistmentInformation, } TRANSACTION_INFORMATION_CLASS; typedef enum _TRANSACTIONMANAGER_INFORMATION_CLASS { TransactionManagerBasicInformation, TransactionManagerLogInformation, TransactionManagerLogPathInformation, - TransactionManagerRecoveryInformation = 4 + TransactionManagerRecoveryInformation = 4, } TRANSACTIONMANAGER_INFORMATION_CLASS; typedef enum _RESOURCEMANAGER_INFORMATION_CLASS { Modified: trunk/reactos/include/xdk/generate.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/generate.bat?r… ============================================================================== --- trunk/reactos/include/xdk/generate.bat [iso-8859-1] (original) +++ trunk/reactos/include/xdk/generate.bat [iso-8859-1] Fri Sep 5 21:54:49 2014 @@ -4,3 +4,5 @@ hpp.exe ntddk.template.h ntddk.h hpp.exe ntifs.template.h ntifs.h hpp.exe devioctl.template.h devioctl.h +hpp.exe ntdef.template.h ..\psdk\ntdef.h +hpp.exe winnt.template.h ..\psdk\winnt.h Modified: trunk/reactos/include/xdk/interlocked.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/interlocked.h?… ============================================================================== --- trunk/reactos/include/xdk/interlocked.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/interlocked.h [iso-8859-1] Fri Sep 5 21:54:49 2014 @@ -1,51 +1,6 @@ /****************************************************************************** * INTERLOCKED Functions * ******************************************************************************/ -// -// Intrinsics (note: taken from our winnt.h) -// FIXME: 64-bit -// -#if defined(__GNUC__) - -static __inline__ BOOLEAN -InterlockedBitTestAndSet( - _Inout_updates_bytes_((Bit+7)/8) _Interlocked_operand_ LONG volatile *Base, - _In_ LONG Bit) -{ -#if defined(_M_IX86) - LONG OldBit; - __asm__ __volatile__("lock " - "btsl %2,%1\n\t" - "sbbl %0,%0\n\t" - :"=r" (OldBit),"+m" (*Base) - :"Ir" (Bit) - : "memory"); - return OldBit; -#else - return (_InterlockedOr(Base, 1 << Bit) >> Bit) & 1; -#endif -} - -static __inline__ BOOLEAN -InterlockedBitTestAndReset( - _Inout_updates_bytes_((Bit+7)/8) _Interlocked_operand_ LONG volatile *Base, - _In_ LONG Bit) -{ -#if defined(_M_IX86) - LONG OldBit; - __asm__ __volatile__("lock " - "btrl %2,%1\n\t" - "sbbl %0,%0\n\t" - :"=r" (OldBit),"+m" (*Base) - :"Ir" (Bit) - : "memory"); - return OldBit; -#else - return (_InterlockedAnd(Base, ~(1 << Bit)) >> Bit) & 1; -#endif -} - -#endif /* defined(__GNUC__) */ #define BitScanForward _BitScanForward #define BitScanReverse _BitScanReverse Modified: trunk/reactos/include/xdk/ntdef.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntdef.template… ============================================================================== --- trunk/reactos/include/xdk/ntdef.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ntdef.template.h [iso-8859-1] Fri Sep 5 21:54:49 2014 @@ -24,7 +24,9 @@ /* Dependencies */ #include <ctype.h> +$if(0) //#include <winapifamily.h> +$endif() #include <basetsd.h> #include <guiddef.h> #include <excpt.h>

10 years, 3 months

[tkreuzer] 64045: [PSDK] - Shuffle some definitions in ntdef.h - Fix definition of UInt32x32To64 in intsafe.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Sep 5 21:47:09 2014 New Revision: 64045 URL: http://svn.reactos.org/svn/reactos?rev=64045&view=rev Log: [PSDK] - Shuffle some definitions in ntdef.h - Fix definition of UInt32x32To64 in intsafe.h Modified: trunk/reactos/include/psdk/intsafe.h trunk/reactos/include/psdk/ntdef.h Modified: trunk/reactos/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/intsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intsafe.h [iso-8859-1] Fri Sep 5 21:47:09 2014 @@ -264,12 +264,10 @@ #define UCHAR_ERROR '\0' #define CHAR_ERROR '\0' - /* 32 bit x 32 bit to 64 bit unsigned multiplication */ #ifndef UInt32x32To64 -#define UInt32x32To64(a,b) ((DWORDLONG)(a)*(DWORDLONG)(b)) -#endif - +#define UInt32x32To64(a,b) ((unsigned __int64)(unsigned int)(a)*(unsigned __int64)(unsigned int)(b)) +#endif /* Convert unsigned to signed or unsigned */ #define DEFINE_SAFE_CONVERT_UTOX(_Name, _TypeFrom, _TypeTo) \ Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Fri Sep 5 21:47:09 2014 @@ -84,6 +84,30 @@ #endif #endif /* NULL */ +#define ARGUMENT_PRESENT(ArgumentPointer) \ + ((CHAR*)((ULONG_PTR)(ArgumentPointer)) != (CHAR*)NULL) + +#if defined(_MANAGED) + #define FASTCALL __stdcall +#elif defined(_M_IX86) + #define FASTCALL __fastcall +#else + #define FASTCALL +#endif /* _MANAGED */ + +/* min/max helper macros */ +#ifndef NOMINMAX +# ifndef min +# define min(a,b) (((a) < (b)) ? (a) : (b)) +# endif +# ifndef max +# define max(a,b) (((a) > (b)) ? (a) : (b)) +# endif +#endif /* NOMINMAX */ + +/* Tell windef.h that we have defined some basic types */ +#define BASETYPES + /* Defines the "size" of an any-size array */ #ifndef ANYSIZE_ARRAY #define ANYSIZE_ARRAY 1 @@ -96,7 +120,7 @@ #else #define __GNU_EXTENSION #endif -#endif +#endif /* __GNU_EXTENSION */ #ifndef DUMMYUNIONNAME #if defined(NONAMELESSUNION)// || !defined(_MSC_EXTENSIONS) @@ -183,9 +207,6 @@ #define RESTRICTED_POINTER #endif -#define ARGUMENT_PRESENT(ArgumentPointer) \ - ((CHAR*)((ULONG_PTR)(ArgumentPointer)) != (CHAR*)NULL) - /* Returns the base address of a structure from a structure member */ #ifndef CONTAINING_RECORD #define CONTAINING_RECORD(address, type, field) \ @@ -197,14 +218,14 @@ #define FIELD_OFFSET(Type, Field) ((LONG)(LONG_PTR)&(((Type*) 0)->Field)) #else #define FIELD_OFFSET(Type, Field) ((LONG)__builtin_offsetof(Type, Field)) -#endif +#endif /* __GNUC__ */ /* Returns the type's alignment */ #if defined(_MSC_VER) #define TYPE_ALIGNMENT(t) __alignof(t) #else #define TYPE_ALIGNMENT(t) FIELD_OFFSET(struct { char x; t test; }, test) -#endif +#endif /* _MSC_VER */ #if defined(_AMD64_) || defined(_X86_) #define PROBE_ALIGNMENT(_s) TYPE_ALIGNMENT(ULONG) @@ -216,22 +237,13 @@ #if defined(_WIN64) #define PROBE_ALIGNMENT32(_s) TYPE_ALIGNMENT(ULONG) -#endif +#endif /* _WIN64 */ #ifdef __cplusplus #define EXTERN_C extern "C" #else #define EXTERN_C extern -#endif - -/* Calling Conventions */ -#if defined(_MANAGED) - #define FASTCALL __stdcall -#elif defined(_M_IX86) - #define FASTCALL __fastcall -#else - #define FASTCALL -#endif +#endif /* __cplusplus */ #define NTAPI __stdcall @@ -262,7 +274,7 @@ /* Import and Export Specifiers */ /* Done the same way as in windef.h for now */ -#define DECLSPEC_IMPORT __declspec(dllimport) +#define DECLSPEC_IMPORT __declspec(dllimport) // MIDL? #define DECLSPEC_NORETURN __declspec(noreturn) #ifndef DECLSPEC_ADDRSAFE @@ -279,7 +291,7 @@ #else #define DECLSPEC_NOTHROW #endif -#endif +#endif /* DECLSPEC_NOTHROW */ #ifndef NOP_FUNCTION #if defined(_MSC_VER) @@ -287,7 +299,7 @@ #else #define NOP_FUNCTION (void)0 #endif -#endif +#endif /* NOP_FUNCTION */ #if !defined(_NTSYSTEM_) #define NTSYSAPI DECLSPEC_IMPORT @@ -299,7 +311,7 @@ #else #define NTSYSCALLAPI DECLSPEC_ADDRSAFE #endif -#endif +#endif /* _NTSYSTEM_ */ /* Inlines */ #ifndef FORCEINLINE @@ -342,7 +354,7 @@ #if defined(_MSC_VER) && !defined(MIDL_PASS) #define DECLSPEC_ALIGN(x) __declspec(align(x)) #elif defined(__GNUC__) - #define DECLSPEC_ALIGN(x) __attribute__ ((__aligned__(x))) + #define DECLSPEC_ALIGN(x) __attribute__((aligned(x))) #else #define DECLSPEC_ALIGN(x) #endif @@ -415,19 +427,6 @@ #define DBG_UNREFERENCED_PARAMETER(P) {(P)=(P);} #define DBG_UNREFERENCED_LOCAL_VARIABLE(L) ((void)(L)) -/* min/max helper macros */ -#ifndef NOMINMAX -# ifndef min -# define min(a,b) (((a) < (b)) ? (a) : (b)) -# endif -# ifndef max -# define max(a,b) (((a) > (b)) ? (a) : (b)) -# endif -#endif /* NOMINMAX */ - -/* Tell windef.h that we have defined some basic types */ -#define BASETYPES - /* Void Pointers */ typedef void *PVOID; typedef void * POINTER_64 PVOID64; @@ -457,9 +456,6 @@ #endif /* !MIDL_PASS */ #endif /* VOID */ -/* Avoid redefinition in windef.h */ -#define BASETYPES - /* Unsigned Types */ typedef unsigned char UCHAR, *PUCHAR; typedef unsigned short USHORT, *PUSHORT; @@ -488,7 +484,7 @@ #ifndef _HRESULT_DEFINED #define _HRESULT_DEFINED typedef _Return_type_success_(return >= 0) LONG HRESULT; -#endif +#endif /* _HRESULT_DEFINED */ /* 64-bit types */ #define _ULONGLONG_ @@ -623,22 +619,12 @@ GUID Lineage; ULONG Uniquifier; } OBJECTID; -#endif +#endif /* __OBJECTID_DEFINED */ #ifdef _MSC_VER #pragma warning(push) -#pragma warning(disable:4201) -#endif - -/* Used to store a non-float 8 byte aligned structure */ -typedef struct _QUAD -{ - _ANONYMOUS_UNION union - { - __GNU_EXTENSION __int64 UseThisFieldToCopy; - double DoNotUseThisField; - } DUMMYUNIONNAME; -} QUAD, *PQUAD, UQUAD, *PUQUAD; + #pragma warning(disable:4201) // nameless struct / union +#endif typedef struct #if defined(_M_IA64) @@ -691,9 +677,6 @@ #pragma warning(pop) /* disable:4201 */ #endif -/* Physical Addresses are always treated as 64-bit wide */ -typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS; - /* Locally Unique Identifier */ typedef struct _LUID { @@ -713,179 +696,10 @@ #define NT_WARNING(Status) ((((ULONG)(Status)) >> 30) == 2) #define NT_ERROR(Status) ((((ULONG)(Status)) >> 30) == 3) -/* String Types */ -typedef struct _STRING { - USHORT Length; - USHORT MaximumLength; -#ifdef MIDL_PASS - [size_is(MaximumLength), length_is(Length) ] -#endif - _Field_size_bytes_part_opt_(MaximumLength, Length) PCHAR Buffer; -} STRING, *PSTRING, - ANSI_STRING, *PANSI_STRING, - OEM_STRING, *POEM_STRING; - -typedef CONST STRING* PCOEM_STRING; -typedef STRING CANSI_STRING; -typedef PSTRING PCANSI_STRING; - -typedef struct _STRING32 { - USHORT Length; - USHORT MaximumLength; - ULONG Buffer; -} STRING32, *PSTRING32, - UNICODE_STRING32, *PUNICODE_STRING32, - ANSI_STRING32, *PANSI_STRING32; - -typedef struct _STRING64 { - USHORT Length; - USHORT MaximumLength; - ULONGLONG Buffer; -} STRING64, *PSTRING64, - UNICODE_STRING64, *PUNICODE_STRING64, - ANSI_STRING64, *PANSI_STRING64; - -typedef struct _CSTRING { - USHORT Length; - USHORT MaximumLength; - CONST CHAR *Buffer; -} CSTRING, *PCSTRING; - -typedef struct _UNICODE_STRING { - USHORT Length; - USHORT MaximumLength; -#ifdef MIDL_PASS - [size_is(MaximumLength / 2), length_is((Length) / 2)] PUSHORT Buffer; -#else - _Field_size_bytes_part_(MaximumLength, Length) PWCH Buffer; -#endif -} UNICODE_STRING, *PUNICODE_STRING; -typedef const UNICODE_STRING* PCUNICODE_STRING; - -typedef USHORT RTL_STRING_LENGTH_TYPE; - -#ifdef __cplusplus -extern "C++" template<typename _Type> struct _RTL_remove_const_template; -extern "C++" template<typename _Type> struct _RTL_remove_const_template<const _Type&> { typedef _Type type; }; -#define _RTL_CONSTANT_STRING_remove_const_macro(s) \ - (const_cast<_RTL_remove_const_template<decltype((s)[0])>::type*>(s)) -extern "C++" template<class _Ty> struct _RTL_CONSTANT_STRING_type_check_template; -extern "C++" template<class _Ty, int _Count> struct _RTL_CONSTANT_STRING_type_check_template<const _Ty (&)[_Count]> { typedef char type; }; -#define _RTL_CONSTANT_STRING_type_check(s) _RTL_CONSTANT_STRING_type_check_template<decltype(s)>::type -#else -# define _RTL_CONSTANT_STRING_remove_const_macro(s) (s) -char _RTL_CONSTANT_STRING_type_check(const void *s); -#endif -#define RTL_CONSTANT_STRING(s) { \ - sizeof(s)-sizeof((s)[0]), \ - sizeof(s) / sizeof(_RTL_CONSTANT_STRING_type_check(s)), \ - _RTL_CONSTANT_STRING_remove_const_macro(s) } - -#define DECLARE_UNICODE_STRING_SIZE(_var, _size) \ - WCHAR _var ## _buffer[_size]; \ - __pragma(warning(push)) __pragma(warning(disable:4221)) __pragma(warning(disable:4204)) \ - UNICODE_STRING _var = { 0, (_size) * sizeof(WCHAR) , _var ## _buffer } \ - __pragma(warning(pop)) - -#define DECLARE_CONST_UNICODE_STRING(_var, _string) \ - const WCHAR _var##_buffer[] = _string; \ - __pragma(warning(push)) __pragma(warning(disable:4221)) __pragma(warning(disable:4204)) \ - const UNICODE_STRING _var = { sizeof(_string) - sizeof(WCHAR), sizeof(_string), (PWCH)_var##_buffer } \ - __pragma(warning(pop)) - -#define DECLARE_GLOBAL_CONST_UNICODE_STRING(_var, _str) \ - extern const __declspec(selectany) UNICODE_STRING _var = RTL_CONSTANT_STRING(_str) - #define ANSI_NULL ((CHAR)0) #define UNICODE_NULL ((WCHAR)0) #define UNICODE_STRING_MAX_BYTES ((USHORT) 65534) #define UNICODE_STRING_MAX_CHARS (32767) - -/* Object Attributes */ -typedef struct _OBJECT_ATTRIBUTES { - ULONG Length; - HANDLE RootDirectory; - PUNICODE_STRING ObjectName; - ULONG Attributes; - PVOID SecurityDescriptor; - PVOID SecurityQualityOfService; -} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; -typedef CONST OBJECT_ATTRIBUTES *PCOBJECT_ATTRIBUTES; - -typedef struct _OBJECT_ATTRIBUTES32 { - ULONG Length; - ULONG RootDirectory; - ULONG ObjectName; - ULONG Attributes; - ULONG SecurityDescriptor; - ULONG SecurityQualityOfService; -} OBJECT_ATTRIBUTES32, *POBJECT_ATTRIBUTES32; -typedef CONST OBJECT_ATTRIBUTES32 *PCOBJECT_ATTRIBUTES32; - -typedef struct _OBJECT_ATTRIBUTES64 { - ULONG Length; - ULONG64 RootDirectory; - ULONG64 ObjectName; - ULONG Attributes; - ULONG64 SecurityDescriptor; - ULONG64 SecurityQualityOfService; -} OBJECT_ATTRIBUTES64, *POBJECT_ATTRIBUTES64; -typedef CONST OBJECT_ATTRIBUTES64 *PCOBJECT_ATTRIBUTES64; - -/* Values for the Attributes member */ -#define OBJ_INHERIT 0x00000002L -#define OBJ_PERMANENT 0x00000010L -#define OBJ_EXCLUSIVE 0x00000020L -#define OBJ_CASE_INSENSITIVE 0x00000040L -#define OBJ_OPENIF 0x00000080L -#define OBJ_OPENLINK 0x00000100L -#define OBJ_KERNEL_HANDLE 0x00000200L -#define OBJ_FORCE_ACCESS_CHECK 0x00000400L -#define OBJ_VALID_ATTRIBUTES 0x000007F2L - -/* Helper Macro */ -#define InitializeObjectAttributes(p,n,a,r,s) { \ - (p)->Length = sizeof(OBJECT_ATTRIBUTES); \ - (p)->RootDirectory = (r); \ - (p)->ObjectName = (n); \ - (p)->Attributes = (a); \ - (p)->SecurityDescriptor = (s); \ - (p)->SecurityQualityOfService = NULL; \ -} - -#define RTL_CONSTANT_OBJECT_ATTRIBUTES(n,a) { \ - sizeof(OBJECT_ATTRIBUTES), \ - NULL, \ - RTL_CONST_CAST(PUNICODE_STRING)(n), \ - a, \ - NULL, \ - NULL \ -} - -#define RTL_INIT_OBJECT_ATTRIBUTES(n, a) \ - RTL_CONSTANT_OBJECT_ATTRIBUTES(n, a) - -/* Product Types */ -typedef enum _NT_PRODUCT_TYPE { - NtProductWinNt = 1, - NtProductLanManNt, - NtProductServer -} NT_PRODUCT_TYPE, *PNT_PRODUCT_TYPE; - -typedef enum _EVENT_TYPE { - NotificationEvent, - SynchronizationEvent -} EVENT_TYPE; - -typedef enum _TIMER_TYPE { - NotificationTimer, - SynchronizationTimer -} TIMER_TYPE; - -typedef enum _WAIT_TYPE { - WaitAll, - WaitAny -} WAIT_TYPE; /* Doubly Linked Lists */ typedef struct _LIST_ENTRY { @@ -920,9 +734,9 @@ #define ALL_PROCESSOR_GROUPS 0xffff +typedef _IRQL_requires_same_ _Function_class_(EXCEPTION_ROUTINE) -typedef EXCEPTION_DISPOSITION NTAPI EXCEPTION_ROUTINE( @@ -1058,6 +872,7 @@ #define VER_SUITE_COMPUTE_SERVER 0x00004000 #define VER_SUITE_WH_SERVER 0x00008000 +/* Product types */ #define PRODUCT_UNDEFINED 0x00000000 #define PRODUCT_ULTIMATE 0x00000001 #define PRODUCT_HOME_BASIC 0x00000002 @@ -1586,6 +1401,188 @@ #define LOCALE_NEUTRAL MAKELCID(MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), SORT_DEFAULT) #define LOCALE_INVARIANT MAKELCID(MAKELANGID(LANG_INVARIANT, SUBLANG_NEUTRAL), SORT_DEFAULT) +/* Physical Addresses are always treated as 64-bit wide */ +typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS; + +/* Used to store a non-float 8 byte aligned structure */ +typedef struct _QUAD +{ + _ANONYMOUS_UNION union + { + __GNU_EXTENSION __int64 UseThisFieldToCopy; + double DoNotUseThisField; + } DUMMYUNIONNAME; +} QUAD, *PQUAD, UQUAD, *PUQUAD; + +/* String Types */ +typedef struct _STRING { + USHORT Length; + USHORT MaximumLength; +#ifdef MIDL_PASS + [size_is(MaximumLength), length_is(Length) ] +#endif + _Field_size_bytes_part_opt_(MaximumLength, Length) PCHAR Buffer; +} STRING, *PSTRING, + ANSI_STRING, *PANSI_STRING, + OEM_STRING, *POEM_STRING; + +typedef CONST STRING* PCOEM_STRING; +typedef STRING CANSI_STRING; +typedef PSTRING PCANSI_STRING; + +typedef struct _STRING32 { + USHORT Length; + USHORT MaximumLength; + ULONG Buffer; +} STRING32, *PSTRING32, + UNICODE_STRING32, *PUNICODE_STRING32, + ANSI_STRING32, *PANSI_STRING32; + +typedef struct _STRING64 { + USHORT Length; + USHORT MaximumLength; + ULONGLONG Buffer; +} STRING64, *PSTRING64, + UNICODE_STRING64, *PUNICODE_STRING64, + ANSI_STRING64, *PANSI_STRING64; + +typedef struct _CSTRING { + USHORT Length; + USHORT MaximumLength; + CONST CHAR *Buffer; +} CSTRING, *PCSTRING; + +typedef struct _UNICODE_STRING { + USHORT Length; + USHORT MaximumLength; +#ifdef MIDL_PASS + [size_is(MaximumLength / 2), length_is((Length) / 2)] PUSHORT Buffer; +#else + _Field_size_bytes_part_(MaximumLength, Length) PWCH Buffer; +#endif +} UNICODE_STRING, *PUNICODE_STRING; +typedef const UNICODE_STRING* PCUNICODE_STRING; + +typedef USHORT RTL_STRING_LENGTH_TYPE; + +#ifdef __cplusplus +extern "C++" template<typename _Type> struct _RTL_remove_const_template; +extern "C++" template<typename _Type> struct _RTL_remove_const_template<const _Type&> { typedef _Type type; }; +#define _RTL_CONSTANT_STRING_remove_const_macro(s) \ + (const_cast<_RTL_remove_const_template<decltype((s)[0])>::type*>(s)) +extern "C++" template<class _Ty> struct _RTL_CONSTANT_STRING_type_check_template; +extern "C++" template<class _Ty, int _Count> struct _RTL_CONSTANT_STRING_type_check_template<const _Ty (&)[_Count]> { typedef char type; }; +#define _RTL_CONSTANT_STRING_type_check(s) _RTL_CONSTANT_STRING_type_check_template<decltype(s)>::type +#else +# define _RTL_CONSTANT_STRING_remove_const_macro(s) (s) +char _RTL_CONSTANT_STRING_type_check(const void *s); +#endif +#define RTL_CONSTANT_STRING(s) { \ + sizeof(s)-sizeof((s)[0]), \ + sizeof(s) / sizeof(_RTL_CONSTANT_STRING_type_check(s)), \ + _RTL_CONSTANT_STRING_remove_const_macro(s) } + +#define DECLARE_UNICODE_STRING_SIZE(_var, _size) \ + WCHAR _var ## _buffer[_size]; \ + __pragma(warning(push)) __pragma(warning(disable:4221)) __pragma(warning(disable:4204)) \ + UNICODE_STRING _var = { 0, (_size) * sizeof(WCHAR) , _var ## _buffer } \ + __pragma(warning(pop)) + +#define DECLARE_CONST_UNICODE_STRING(_var, _string) \ + const WCHAR _var##_buffer[] = _string; \ + __pragma(warning(push)) __pragma(warning(disable:4221)) __pragma(warning(disable:4204)) \ + const UNICODE_STRING _var = { sizeof(_string) - sizeof(WCHAR), sizeof(_string), (PWCH)_var##_buffer } \ + __pragma(warning(pop)) + +#define DECLARE_GLOBAL_CONST_UNICODE_STRING(_var, _str) \ + extern const __declspec(selectany) UNICODE_STRING _var = RTL_CONSTANT_STRING(_str) + +/* Object Attributes */ +typedef struct _OBJECT_ATTRIBUTES { + ULONG Length; + HANDLE RootDirectory; + PUNICODE_STRING ObjectName; + ULONG Attributes; + PVOID SecurityDescriptor; + PVOID SecurityQualityOfService; +} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; +typedef CONST OBJECT_ATTRIBUTES *PCOBJECT_ATTRIBUTES; + +typedef struct _OBJECT_ATTRIBUTES32 { + ULONG Length; + ULONG RootDirectory; + ULONG ObjectName; + ULONG Attributes; + ULONG SecurityDescriptor; + ULONG SecurityQualityOfService; +} OBJECT_ATTRIBUTES32, *POBJECT_ATTRIBUTES32; +typedef CONST OBJECT_ATTRIBUTES32 *PCOBJECT_ATTRIBUTES32; + +typedef struct _OBJECT_ATTRIBUTES64 { + ULONG Length; + ULONG64 RootDirectory; + ULONG64 ObjectName; + ULONG Attributes; + ULONG64 SecurityDescriptor; + ULONG64 SecurityQualityOfService; +} OBJECT_ATTRIBUTES64, *POBJECT_ATTRIBUTES64; +typedef CONST OBJECT_ATTRIBUTES64 *PCOBJECT_ATTRIBUTES64; + +/* Values for the Attributes member */ +#define OBJ_INHERIT 0x00000002L +#define OBJ_PERMANENT 0x00000010L +#define OBJ_EXCLUSIVE 0x00000020L +#define OBJ_CASE_INSENSITIVE 0x00000040L +#define OBJ_OPENIF 0x00000080L +#define OBJ_OPENLINK 0x00000100L +#define OBJ_KERNEL_HANDLE 0x00000200L +#define OBJ_FORCE_ACCESS_CHECK 0x00000400L +#define OBJ_VALID_ATTRIBUTES 0x000007F2L + +/* Helper Macro */ +#define InitializeObjectAttributes(p,n,a,r,s) { \ + (p)->Length = sizeof(OBJECT_ATTRIBUTES); \ + (p)->RootDirectory = (r); \ + (p)->ObjectName = (n); \ + (p)->Attributes = (a); \ + (p)->SecurityDescriptor = (s); \ + (p)->SecurityQualityOfService = NULL; \ +} + +#define RTL_CONSTANT_OBJECT_ATTRIBUTES(n,a) { \ + sizeof(OBJECT_ATTRIBUTES), \ + NULL, \ + RTL_CONST_CAST(PUNICODE_STRING)(n), \ + a, \ + NULL, \ + NULL \ +} + +#define RTL_INIT_OBJECT_ATTRIBUTES(n, a) \ + RTL_CONSTANT_OBJECT_ATTRIBUTES(n, a) + +/* Product Types */ +typedef enum _NT_PRODUCT_TYPE { + NtProductWinNt = 1, + NtProductLanManNt, + NtProductServer +} NT_PRODUCT_TYPE, *PNT_PRODUCT_TYPE; + +typedef enum _EVENT_TYPE { + NotificationEvent, + SynchronizationEvent +} EVENT_TYPE; + +typedef enum _TIMER_TYPE { + NotificationTimer, + SynchronizationTimer +} TIMER_TYPE; + +typedef enum _WAIT_TYPE { + WaitAll, + WaitAny +} WAIT_TYPE; + #ifdef __cplusplus } // extern "C" #endif

10 years, 3 months

[hbelusca] 64044: Code formatting mainly (and comments fixes for future usage).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Sep 5 21:12:42 2014 New Revision: 64044 URL: http://svn.reactos.org/svn/reactos?rev=64044&view=rev Log: Code formatting mainly (and comments fixes for future usage). Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Fri Sep 5 21:12:42 2014 @@ -26,8 +26,9 @@ /* GLOBALS ********************************************************************/ +/* The list of the ConSrv consoles */ static ULONG ConsoleListSize; -static PCONSRV_CONSOLE* ConsoleList; /* The list of the ConSrv consoles */ +static PCONSRV_CONSOLE* ConsoleList; static RTL_RESOURCE ListLock; #define ConSrvLockConsoleListExclusive() \ @@ -156,9 +157,8 @@ } } - /* Unlock the console list */ + /* Unlock the console list and return */ ConSrvUnlockConsoleList(); - return STATUS_SUCCESS; } @@ -188,9 +188,8 @@ if (Index >= ConsoleListSize || (ValidatedConsole = ConsoleList[Index]) == NULL) { - /* Unlock the console list */ + /* Unlock the console list and return */ ConSrvUnlockConsoleList(); - return FALSE; } @@ -199,7 +198,7 @@ /* Unlock the console list and return */ ConSrvUnlockConsoleList(); - RetVal = ConDrvValidateConsoleUnsafe(ValidatedConsole, + RetVal = ConDrvValidateConsoleUnsafe((PCONSOLE)ValidatedConsole, ExpectedState, LockConsole); if (RetVal) *Console = ValidatedConsole; @@ -214,7 +213,7 @@ ConioPause(PCONSRV_CONSOLE Console, UINT Flags) { Console->PauseFlags |= Flags; - ConDrvPause(Console); + ConDrvPause((PCONSOLE)Console); } VOID @@ -225,7 +224,7 @@ // if ((Console->PauseFlags & (PAUSED_FROM_KEYBOARD | PAUSED_FROM_SCROLLBAR | PAUSED_FROM_SELECTION)) == 0) if (Console->PauseFlags == 0) { - ConDrvUnpause(Console); + ConDrvUnpause((PCONSOLE)Console); CsrNotifyWait(&Console->WriteWaitQueue, TRUE, @@ -443,7 +442,10 @@ /* Colour table */ memcpy(Console->Colors, ConsoleInfo.Colors, sizeof(ConsoleInfo.Colors)); - /* Attach the ConSrv terminal to the console */ + /* + * Attach the ConSrv terminal to the console. + * This call makes a copy of our local Terminal variable. + */ Status = ConDrvRegisterTerminal(Console, &Terminal); if (!NT_SUCCESS(Status)) { @@ -481,7 +483,11 @@ HistoryDeleteBuffers(Console); /* Now, call the driver. ConDrvDeregisterTerminal is called on-demand. */ - ConDrvDeleteConsole(Console); + ConDrvDeleteConsole((PCONSOLE)Console); + + /* Deinit the ConSrv terminal */ + // FIXME!! + // ConSrvDeinitTerminal(&Terminal); // &ConSrvConsole->Console->TermIFace } @@ -593,7 +599,7 @@ PCONSOLE_PROCESS_DATA current; /* If the console is already being destroyed, just return */ - if (!ConDrvValidateConsoleState(Console, CONSOLE_RUNNING)) + if (!ConDrvValidateConsoleState((PCONSOLE)Console, CONSOLE_RUNNING)) return STATUS_UNSUCCESSFUL; /* @@ -789,7 +795,7 @@ { if (Object->Console->InsertMode || Object->Console->QuickEdit) { - /* Windows does this, even if it is not documented on MSDN */ + /* Windows also adds ENABLE_EXTENDED_FLAGS, even if it's not documented on MSDN */ *ConsoleMode |= ENABLE_EXTENDED_FLAGS; if (Object->Console->InsertMode) *ConsoleMode |= ENABLE_INSERT_MODE; @@ -924,6 +930,7 @@ TitleRequest->Unicode, TitleRequest->Title, TitleRequest->Length); + // FIXME: Keep this call here, or put it in ConDrvSetConsoleTitle ?? if (NT_SUCCESS(Status)) TermChangeTitle(Console); ConSrvReleaseConsole(Console, TRUE); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] Fri Sep 5 21:12:42 2014 @@ -296,7 +296,7 @@ pSharedInfo->ci.HistoryNoDup = Console->HistoryNoDup; pSharedInfo->ci.QuickEdit = Console->QuickEdit; pSharedInfo->ci.InsertMode = Console->InsertMode; - pSharedInfo->ci.InputBufferSize = 0; + /////////////pSharedInfo->ci.InputBufferSize = 0; pSharedInfo->ci.ScreenBufferSize = ActiveBuffer->ScreenBufferSize; pSharedInfo->ci.ConsoleSize = ActiveBuffer->ViewSize; pSharedInfo->ci.CursorBlinkOn; @@ -643,7 +643,6 @@ Console->OriginalTitle.Length / sizeof(WCHAR)); wcsncpy(pSharedInfo->ci.ConsoleTitle, Console->OriginalTitle.Buffer, Length); #endif - // ULONG ConInfo.InputBufferSize = pConInfo-> // BOOLEAN ConInfo.CursorBlinkOn = pConInfo-> // BOOLEAN ConInfo.ForceCursorOff = pConInfo-> Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Fri Sep 5 21:12:42 2014 @@ -1192,7 +1192,6 @@ // if (SUCCEEDED(hRes)) ConsoleStartInfo->HotKey = HotKey; /* Get the icon location, if any */ - hRes = IShellLinkW_GetIconLocation(pshl, ConsoleStartInfo->IconPath, sizeof(ConsoleStartInfo->IconPath)/sizeof(ConsoleStartInfo->IconPath[0]) - 1, // == MAX_PATH

10 years, 3 months

[hbelusca] 64043: [CONSRV]: Code reorganization part 2 (add some comments for future fixes).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Sep 5 21:08:15 2014 New Revision: 64043 URL: http://svn.reactos.org/svn/reactos?rev=64043&view=rev Log: [CONSRV]: Code reorganization part 2 (add some comments for future fixes). Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h branches/condrv_restructure/win32ss/user/winsrv/consrv/settings.c Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] Fri Sep 5 21:08:15 2014 @@ -96,7 +96,7 @@ * even of the last buffer, but having to deal with a lack of * any active buffer might be error-prone. */ if (Buffer->ListEntry.Flink != Buffer->ListEntry.Blink) - ConioDeleteScreenBuffer(Buffer); + ConDrvDeleteScreenBuffer(Buffer); } else if (Object->Type == INPUT_BUFFER) { Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Fri Sep 5 21:08:15 2014 @@ -191,7 +191,7 @@ { CONSOLE_IO_OBJECT Header; /* Object header - MUST BE IN FIRST PLACE */ - ULONG InputBufferSize; /* Size of this input buffer */ + ULONG InputBufferSize; /* Size of this input buffer -- UNUSED!! */ LIST_ENTRY InputEvents; /* List head for input event queue */ HANDLE ActiveEvent; /* Event set when an input event is added in its queue */ @@ -344,6 +344,11 @@ ConSrvConsoleCtrlEvent(IN ULONG CtrlEvent, IN PCONSOLE_PROCESS_DATA ProcessData); + +#define GetConsoleInputBufferMode(Console) \ + (Console)->InputBuffer.Mode + + /* conoutput.c */ PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y); VOID ConioDrawConsole(PCONSOLE /*PCONSRV_CONSOLE*/ Console); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h [iso-8859-1] Fri Sep 5 21:08:15 2014 @@ -62,6 +62,9 @@ /* * Structure used to communicate with console.dll + * + * FIXME: It should overlap with the Windows' CONSOLE_STATE_INFO structure + * for GUI terminals!! */ typedef struct _CONSOLE_PROPS { Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] Fri Sep 5 21:08:15 2014 @@ -404,7 +404,7 @@ ConsoleInfo->QuickEdit = FALSE; ConsoleInfo->InsertMode = TRUE; - // ConsoleInfo->InputBufferSize; + // ConsoleInfo->InputBufferSize = 0; // Rule: ScreenBufferSize >= ConsoleSize ConsoleInfo->ScreenBufferSize.X = 80;

10 years, 3 months

[hbelusca] 64042: [CONSRV]: Code reorganization part 1.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Sep 5 21:06:36 2014 New Revision: 64042 URL: http://svn.reactos.org/svn/reactos?rev=64042&view=rev Log: [CONSRV]: Code reorganization part 1. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.h branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.h Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Fri Sep 5 21:06:36 2014 @@ -178,7 +178,7 @@ return Status; } -VOID +static VOID PurgeInputBuffer(PCONSOLE Console) { PLIST_ENTRY CurrentEntry; @@ -191,6 +191,36 @@ ConsoleFreeHeap(Event); } + // CloseHandle(Console->InputBuffer.ActiveEvent); +} + +NTSTATUS NTAPI +ConDrvInitInputBuffer(IN PCONSOLE Console, + IN ULONG InputBufferSize) +{ + SECURITY_ATTRIBUTES SecurityAttributes; + + ConSrvInitObject(&Console->InputBuffer.Header, INPUT_BUFFER, Console); + + SecurityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES); + SecurityAttributes.lpSecurityDescriptor = NULL; + SecurityAttributes.bInheritHandle = TRUE; + + Console->InputBuffer.ActiveEvent = CreateEventW(&SecurityAttributes, TRUE, FALSE, NULL); + if (Console->InputBuffer.ActiveEvent == NULL) return STATUS_UNSUCCESSFUL; + + Console->InputBuffer.InputBufferSize = InputBufferSize; + InitializeListHead(&Console->InputBuffer.InputEvents); + Console->InputBuffer.Mode = ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | + ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT; + + return STATUS_SUCCESS; +} + +VOID NTAPI +ConDrvDeinitInputBuffer(IN PCONSOLE Console) +{ + PurgeInputBuffer(Console); CloseHandle(Console->InputBuffer.ActiveEvent); } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] Fri Sep 5 21:06:36 2014 @@ -115,7 +115,7 @@ ConioSetActiveScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer); VOID NTAPI -ConioDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer) +ConDrvDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer) { PCONSOLE Console = Buffer->Header.Console; PCONSOLE_SCREEN_BUFFER NewBuffer; @@ -190,7 +190,7 @@ /* If old buffer has no handles, it's now unreferenced */ if (Console->ActiveBuffer->Header.ReferenceCount == 0) { - ConioDeleteScreenBuffer(Console->ActiveBuffer); + ConDrvDeleteScreenBuffer(Console->ActiveBuffer); } /* Tie console to new buffer and signal the change to the frontend */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Fri Sep 5 21:06:36 2014 @@ -190,7 +190,6 @@ IN PCONSOLE_INFO ConsoleInfo) { NTSTATUS Status; - SECURITY_ATTRIBUTES SecurityAttributes; // CONSOLE_INFO CapturedConsoleInfo; TEXTMODE_BUFFER_INFO ScreenBufferInfo; PCONSOLE Console; @@ -236,26 +235,15 @@ Console->ConsoleSize = ConsoleInfo->ConsoleSize; Console->FixedSize = FALSE; // Value by default; is reseted by the terminals if needed. - /* - * Initialize the input buffer - */ - ConSrvInitObject(&Console->InputBuffer.Header, INPUT_BUFFER, Console); - - SecurityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES); - SecurityAttributes.lpSecurityDescriptor = NULL; - SecurityAttributes.bInheritHandle = TRUE; - Console->InputBuffer.ActiveEvent = CreateEventW(&SecurityAttributes, TRUE, FALSE, NULL); - if (NULL == Console->InputBuffer.ActiveEvent) - { + /* Initialize the input buffer */ + Status = ConDrvInitInputBuffer(Console, 0 /* ConsoleInfo->InputBufferSize */); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ConDrvInitInputBuffer: failed, Status = 0x%08lx\n", Status); DeleteCriticalSection(&Console->Lock); ConsoleFreeHeap(Console); - return STATUS_UNSUCCESSFUL; - } - - Console->InputBuffer.InputBufferSize = 0; // FIXME! - InitializeListHead(&Console->InputBuffer.InputEvents); - Console->InputBuffer.Mode = ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | - ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT; + return Status; + } /* Set-up the code page */ Console->InputCodePage = Console->OutputCodePage = ConsoleInfo->CodePage; @@ -275,7 +263,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("ConDrvCreateScreenBuffer: failed, Status = 0x%08lx\n", Status); - CloseHandle(Console->InputBuffer.ActiveEvent); + ConDrvDeinitInputBuffer(Console); DeleteCriticalSection(&Console->Lock); ConsoleFreeHeap(Console); return Status; @@ -430,10 +418,10 @@ /* FIXME: Send a terminate message to all the processes owning this console */ - /* Cleanup the UI-oriented part */ - DPRINT("Deregister console\n"); + /* Deregister the terminal */ + DPRINT("Deregister terminal\n"); ConDrvDeregisterTerminal(Console); - DPRINT("Console deregistered\n"); + DPRINT("Terminal deregistered\n"); /*** * Check that the console is in terminating state before continuing @@ -458,19 +446,18 @@ /* Remove the console from the list */ RemoveConsole(Console); - /* Discard all entries in the input event queue */ - PurgeInputBuffer(Console); - /* Delete the last screen buffer */ - ConioDeleteScreenBuffer(Console->ActiveBuffer); + ConDrvDeleteScreenBuffer(Console->ActiveBuffer); Console->ActiveBuffer = NULL; if (!IsListEmpty(&Console->BufferList)) { - DPRINT1("BUG: screen buffer list not empty\n"); - ASSERT(FALSE); - } - - /**/ CloseHandle(Console->InputBuffer.ActiveEvent); /**/ + /***ConDrvUnlockConsoleList();***/ + ASSERTMSG("BUGBUGBUG!! screen buffer list not empty\n", FALSE); + } + + /* Deinitialize the input buffer */ + ConDrvDeinitInputBuffer(Console); + if (Console->UnpauseEvent) CloseHandle(Console->UnpauseEvent); ConsoleFreeUnicodeString(&Console->OriginalTitle); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.h [iso-8859-1] Fri Sep 5 21:06:36 2014 @@ -9,4 +9,8 @@ #pragma once -VOID PurgeInputBuffer(PCONSOLE Console); +NTSTATUS NTAPI +ConDrvInitInputBuffer(IN PCONSOLE Console, + IN ULONG InputBufferSize); +VOID NTAPI +ConDrvDeinitInputBuffer(IN PCONSOLE Console); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.h [iso-8859-1] Fri Sep 5 21:06:36 2014 @@ -37,7 +37,7 @@ IN OUT PCONSOLE Console, IN ULONG BufferType, IN PVOID ScreenBufferInfo); -VOID NTAPI ConioDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer); +VOID NTAPI ConDrvDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer); // VOID ConioSetActiveScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer); PCONSOLE_SCREEN_BUFFER

10 years, 3 months

[tkreuzer] 64041: [GDI32] Add comment about broken #if 0'ed code, noticed by Hermes.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Sep 5 20:55:01 2014 New Revision: 64041 URL: http://svn.reactos.org/svn/reactos?rev=64041&view=rev Log: [GDI32] Add comment about broken #if 0'ed code, noticed by Hermes. Modified: trunk/reactos/win32ss/gdi/gdi32/objects/region.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/region.c [iso-8859-1] Fri Sep 5 20:55:01 2014 @@ -646,6 +646,7 @@ { if ((pTeb->GdiTebBatch.Offset + sizeof(GDIBSEXTSELCLPRGN)) <= GDIBATCHBUFSIZE) { + // FIXME: This is broken, use GdiAllocBatchCommand! PGDIBSEXTSELCLPRGN pgO = (PGDIBSEXTSELCLPRGN)(&pTeb->GdiTebBatch.Buffer[0] + pTeb->GdiTebBatch.Offset); pgO->gbHdr.Cmd = GdiBCExtSelClipRgn;

10 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2014