Ros-diffs April 2014

ros-diffs@reactos.org

15 participants
492 discussions

[hbelusca] 62718: [CONSOLE.CPL] Fix various things: - values update when edit controls lose focus, - improve (still WIP) console window preview, - fix screen color preview (now with font!) - use Un...
by hbelusca＠svn.reactos.org 12 Apr '14

12 Apr '14

Author: hbelusca Date: Sat Apr 12 14:23:36 2014 New Revision: 62718 URL: http://svn.reactos.org/svn/reactos?rev=62718&view=rev Log: [CONSOLE.CPL] Fix various things: - values update when edit controls lose focus, - improve (still WIP) console window preview, - fix screen color preview (now with font!) - use Unicode functions. What remains: - really fix the console window preview, - fully implement the console font selector. CORE-6629 #resolve #comment Fixed in revision 62718. Modified: trunk/reactos/dll/cpl/console/CMakeLists.txt trunk/reactos/dll/cpl/console/colors.c trunk/reactos/dll/cpl/console/console.c trunk/reactos/dll/cpl/console/console.h trunk/reactos/dll/cpl/console/layout.c trunk/reactos/dll/cpl/console/options.c Modified: trunk/reactos/dll/cpl/console/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/CMakeLists… ============================================================================== --- trunk/reactos/dll/cpl/console/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/CMakeLists.txt [iso-8859-1] Sat Apr 12 14:23:36 2014 @@ -18,7 +18,8 @@ console.rc ${CMAKE_CURRENT_BINARY_DIR}/console.def) -set_module_type(console win32dll UNICODE) +set_module_type(console cpl UNICODE) +set_target_properties(console PROPERTIES SUFFIX ".dll") add_importlibs(console msvcrt Modified: trunk/reactos/dll/cpl/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/colors.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] Sat Apr 12 14:23:36 2014 @@ -22,10 +22,7 @@ index = min(drawItem->CtlID - IDC_STATIC_COLOR1, sizeof(pConInfo->ci.Colors) / sizeof(pConInfo->ci.Colors[0]) - 1); hBrush = CreateSolidBrush(pConInfo->ci.Colors[index]); - if (!hBrush) - { - return FALSE; - } + if (!hBrush) return FALSE; FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); DeleteObject((HGDIOBJ)hBrush); @@ -44,7 +41,6 @@ LPARAM lParam) { PCONSOLE_PROPS pConInfo; - LPDRAWITEMSTRUCT drawItem; DWORD colorIndex; COLORREF color; @@ -58,9 +54,9 @@ SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pConInfo); /* Set the valid range of the colour indicators */ - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_RED), UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_GREEN), UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_BLUE), UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); + SendDlgItemMessageW(hwndDlg, IDC_UPDOWN_COLOR_RED , UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); + SendDlgItemMessageW(hwndDlg, IDC_UPDOWN_COLOR_GREEN, UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); + SendDlgItemMessageW(hwndDlg, IDC_UPDOWN_COLOR_BLUE , UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); /* Select by default the screen background option */ CheckRadioButton(hwndDlg, IDC_RADIO_SCREEN_TEXT, IDC_RADIO_POPUP_BACKGROUND, IDC_RADIO_SCREEN_BACKGROUND); @@ -71,16 +67,15 @@ case WM_DRAWITEM: { - drawItem = (LPDRAWITEMSTRUCT)lParam; + LPDRAWITEMSTRUCT drawItem = (LPDRAWITEMSTRUCT)lParam; + if (drawItem->CtlID >= IDC_STATIC_COLOR1 && drawItem->CtlID <= IDC_STATIC_COLOR16) - { return PaintStaticControls(hwndDlg, pConInfo, drawItem); - } - else if (drawItem->CtlID == IDC_STATIC_SCREEN_COLOR || drawItem->CtlID == IDC_STATIC_POPUP_COLOR) - { - PaintText(drawItem, pConInfo); - return TRUE; - } + else if (drawItem->CtlID == IDC_STATIC_SCREEN_COLOR) + return PaintText(drawItem, pConInfo, Screen); + else if (drawItem->CtlID == IDC_STATIC_POPUP_COLOR) + return PaintText(drawItem, pConInfo, Popup); + break; } @@ -90,7 +85,6 @@ { case PSN_APPLY: { - // LPPSHNOTIFY lppsn; if (!pConInfo->AppliedConfig) { return ApplyConsoleInfo(hwndDlg, pConInfo); @@ -114,23 +108,17 @@ if (lpnmud->hdr.idFrom == IDC_UPDOWN_COLOR_RED) { - if (lpnmud->iPos < 0) lpnmud->iPos = 0; - else if (lpnmud->iPos > 255) lpnmud->iPos = 255; - + lpnmud->iPos = min(max(lpnmud->iPos + lpnmud->iDelta, 0), 255); color = RGB(lpnmud->iPos, GetGValue(color), GetBValue(color)); } else if (lpnmud->hdr.idFrom == IDC_UPDOWN_COLOR_GREEN) { - if (lpnmud->iPos < 0) lpnmud->iPos = 0; - else if (lpnmud->iPos > 255) lpnmud->iPos = 255; - + lpnmud->iPos = min(max(lpnmud->iPos + lpnmud->iDelta, 0), 255); color = RGB(GetRValue(color), lpnmud->iPos, GetBValue(color)); } else if (lpnmud->hdr.idFrom == IDC_UPDOWN_COLOR_BLUE) { - if (lpnmud->iPos < 0) lpnmud->iPos = 0; - else if (lpnmud->iPos > 255) lpnmud->iPos = 255; - + lpnmud->iPos = min(max(lpnmud->iPos + lpnmud->iDelta, 0), 255); color = RGB(GetRValue(color), GetGValue(color), lpnmud->iPos); } else @@ -141,7 +129,7 @@ pConInfo->ci.Colors[colorIndex] = color; InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + colorIndex), NULL, TRUE); InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); - InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR) , NULL, TRUE); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; @@ -162,15 +150,15 @@ color = pConInfo->ci.Colors[colorIndex]; /* Set the values of the colour indicators */ - SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED, GetRValue(color), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED , GetRValue(color), FALSE); SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_GREEN, GetGValue(color), FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE, GetBValue(color), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE , GetBValue(color), FALSE); InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); pConInfo->ActiveStaticControl = colorIndex; InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); - InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR) , NULL, TRUE); break; } @@ -181,15 +169,15 @@ color = pConInfo->ci.Colors[colorIndex]; /* Set the values of the colour indicators */ - SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED, GetRValue(color), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED , GetRValue(color), FALSE); SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_GREEN, GetGValue(color), FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE, GetBValue(color), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE , GetBValue(color), FALSE); InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); pConInfo->ActiveStaticControl = colorIndex; InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); - InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR) , NULL, TRUE); break; } @@ -200,15 +188,15 @@ color = pConInfo->ci.Colors[colorIndex]; /* Set the values of the colour indicators */ - SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED, GetRValue(color), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED , GetRValue(color), FALSE); SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_GREEN, GetGValue(color), FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE, GetBValue(color), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE , GetBValue(color), FALSE); InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); pConInfo->ActiveStaticControl = colorIndex; InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); - InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR) , NULL, TRUE); break; } @@ -219,17 +207,93 @@ color = pConInfo->ci.Colors[colorIndex]; /* Set the values of the colour indicators */ - SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED, GetRValue(color), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED , GetRValue(color), FALSE); SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_GREEN, GetGValue(color), FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE, GetBValue(color), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE , GetBValue(color), FALSE); InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); pConInfo->ActiveStaticControl = colorIndex; InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); - InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); - break; - } + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR) , NULL, TRUE); + break; + } + + case IDC_EDIT_COLOR_RED: + { + if (HIWORD(wParam) == EN_KILLFOCUS) + { + DWORD red; + + /* Get the current color */ + colorIndex = pConInfo->ActiveStaticControl; + color = pConInfo->ci.Colors[colorIndex]; + + red = GetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED, NULL, FALSE); + red = min(max(red, 0), 255); + + color = RGB(red, GetGValue(color), GetBValue(color)); + + pConInfo->ci.Colors[colorIndex] = color; + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + colorIndex), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR) , NULL, TRUE); + + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + + case IDC_EDIT_COLOR_GREEN: + { + if (HIWORD(wParam) == EN_KILLFOCUS) + { + DWORD green; + + /* Get the current color */ + colorIndex = pConInfo->ActiveStaticControl; + color = pConInfo->ci.Colors[colorIndex]; + + green = GetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_GREEN, NULL, FALSE); + green = min(max(green, 0), 255); + + color = RGB(GetRValue(color), green, GetBValue(color)); + + pConInfo->ci.Colors[colorIndex] = color; + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + colorIndex), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR) , NULL, TRUE); + + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + + case IDC_EDIT_COLOR_BLUE: + { + if (HIWORD(wParam) == EN_KILLFOCUS) + { + DWORD blue; + + /* Get the current color */ + colorIndex = pConInfo->ActiveStaticControl; + color = pConInfo->ci.Colors[colorIndex]; + + blue = GetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE, NULL, FALSE); + blue = min(max(blue, 0), 255); + + color = RGB(GetRValue(color), GetGValue(color), blue); + + pConInfo->ci.Colors[colorIndex] = color; + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + colorIndex), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR) , NULL, TRUE); + + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + } if ( HIWORD(wParam) == STN_CLICKED && @@ -245,9 +309,9 @@ color = pConInfo->ci.Colors[colorIndex]; - SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED, GetRValue(color), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED , GetRValue(color), FALSE); SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_GREEN, GetGValue(color), FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE, GetBValue(color), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE , GetBValue(color), FALSE); /* Update global struct */ if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_SCREEN_TEXT)) @@ -271,7 +335,7 @@ pConInfo->ActiveStaticControl = colorIndex; InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); - InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR) , NULL, TRUE); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; Modified: trunk/reactos/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.c?… ============================================================================== --- trunk/reactos/dll/cpl/console/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/console.c [iso-8859-1] Sat Apr 12 14:23:36 2014 @@ -59,16 +59,16 @@ #define CSR_DEFAULT_CURSOR_SIZE 25 static VOID -InitPropSheetPage(PROPSHEETPAGE *psp, +InitPropSheetPage(PROPSHEETPAGEW *psp, WORD idDlg, DLGPROC DlgProc, LPARAM lParam) { - ZeroMemory(psp, sizeof(PROPSHEETPAGE)); - psp->dwSize = sizeof(PROPSHEETPAGE); + ZeroMemory(psp, sizeof(PROPSHEETPAGEW)); + psp->dwSize = sizeof(PROPSHEETPAGEW); psp->dwFlags = PSP_DEFAULT; psp->hInstance = hApplet; - psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pszTemplate = MAKEINTRESOURCEW(idDlg); psp->pfnDlgProc = DlgProc; psp->lParam = lParam; } @@ -134,24 +134,20 @@ WPARAM wParam, LPARAM lParam) { - HWND hDlgCtrl; - UNREFERENCED_PARAMETER(lParam); switch (uMsg) { case WM_INITDIALOG: { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_APPLY_CURRENT); - SendMessage(hDlgCtrl, BM_SETCHECK, BST_CHECKED, 0); + CheckDlgButton(hwndDlg, IDC_RADIO_APPLY_CURRENT, BST_CHECKED); return TRUE; } case WM_COMMAND: { if (LOWORD(wParam) == IDOK) { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_APPLY_CURRENT); - if (SendMessage(hDlgCtrl, BM_GETCHECK, 0, 0) == BST_CHECKED) + if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_APPLY_CURRENT) == BST_CHECKED) EndDialog(hwndDlg, IDC_RADIO_APPLY_CURRENT); else EndDialog(hwndDlg, IDC_RADIO_APPLY_ALL); @@ -187,7 +183,7 @@ } else { - INT_PTR res = DialogBox(hApplet, MAKEINTRESOURCE(IDD_APPLYOPTIONS), hwndDlg, ApplyProc); + INT_PTR res = DialogBoxW(hApplet, MAKEINTRESOURCEW(IDD_APPLYOPTIONS), hwndDlg, ApplyProc); SetParams = (res != IDCANCEL); SaveParams = (res == IDC_RADIO_APPLY_ALL); @@ -209,12 +205,12 @@ * Create a memory section to share with the server, and map it. */ /* Holds data for console.dll + console info + terminal-specific info */ - hSection = CreateFileMapping(INVALID_HANDLE_VALUE, - NULL, - PAGE_READWRITE, - 0, - sizeof(CONSOLE_PROPS) + sizeof(GUI_CONSOLE_INFO), - NULL); + hSection = CreateFileMappingW(INVALID_HANDLE_VALUE, + NULL, + PAGE_READWRITE, + 0, + sizeof(CONSOLE_PROPS) + sizeof(GUI_CONSOLE_INFO), + NULL); if (!hSection) { DPRINT1("Error when creating file mapping, error = %d\n", GetLastError()); @@ -264,12 +260,11 @@ InitApplet(HWND hWnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { HANDLE hSection = (HANDLE)wParam; - BOOL GuiTermInfo = FALSE; - PCONSOLE_PROPS pSharedInfo; + PCONSOLE_PROPS pSharedInfo = NULL; PCONSOLE_PROPS pConInfo; WCHAR szTitle[MAX_PATH + 1]; - PROPSHEETPAGE psp[4]; - PROPSHEETHEADER psh; + PROPSHEETPAGEW psp[4]; + PROPSHEETHEADERW psh; INT i = 0; UNREFERENCED_PARAMETER(uMsg); @@ -285,28 +280,54 @@ pConInfo = AllocConsoleInfo(); if (!pConInfo) return 0; - /* Map the shared section */ - pSharedInfo = MapViewOfFile(hSection, FILE_MAP_READ, 0, 0, 0); - if (pSharedInfo == NULL) - { - HeapFree(GetProcessHeap(), 0, pConInfo); - return 0; - } - - /* Find the console window and whether we must use default parameters */ - pConInfo->hConsoleWindow = pSharedInfo->hConsoleWindow; - pConInfo->ShowDefaultParams = pSharedInfo->ShowDefaultParams; - - /* Check that we are going to modify GUI terminal information */ - GuiTermInfo = ( pSharedInfo->TerminalInfo.Size == sizeof(GUI_CONSOLE_INFO) && - pSharedInfo->TerminalInfo.TermInfo != 0 ); - - if (pConInfo->ShowDefaultParams || !GuiTermInfo) + /* Check whether we were launched from the terminal... */ + if (hSection != NULL) + { + /* ... yes, map the shared section */ + pSharedInfo = MapViewOfFile(hSection, FILE_MAP_READ, 0, 0, 0); + if (pSharedInfo == NULL) + { + /* Cleanup */ + HeapFree(GetProcessHeap(), 0, pConInfo); + + /* Close the section */ + CloseHandle(hSection); + + return 0; + } + + /* Check that we are really going to modify GUI terminal information... */ + if (pSharedInfo->TerminalInfo.Size != sizeof(GUI_CONSOLE_INFO) || + pSharedInfo->TerminalInfo.TermInfo == 0) + { + /* ... it's not the case, bail out */ + + /* Cleanup */ + HeapFree(GetProcessHeap(), 0, pConInfo); + + /* Close the section */ + UnmapViewOfFile(pSharedInfo); + CloseHandle(hSection); + + return 0; + } + + /* Find the console window and whether we set the default parameters */ + pConInfo->hConsoleWindow = pSharedInfo->hConsoleWindow; + pConInfo->ShowDefaultParams = pSharedInfo->ShowDefaultParams; + } + else + { + /* ... no, we were launched as a CPL. Display the default settings. */ + pConInfo->ShowDefaultParams = TRUE; + } + + if (pConInfo->ShowDefaultParams) { /* Use defaults */ InitConsoleDefaults(pConInfo); } - else + else if (hSection && pSharedInfo) { /* * Copy the shared data into our allocated buffer, and @@ -316,13 +337,16 @@ pConInfo->TerminalInfo.TermInfo = (PVOID)((ULONG_PTR)pConInfo + (ULONG_PTR)pConInfo->TerminalInfo.TermInfo); } - /* Close the section */ - UnmapViewOfFile(pSharedInfo); - CloseHandle(hSection); + if (hSection && pSharedInfo) + { + /* Close the section */ + UnmapViewOfFile(pSharedInfo); + CloseHandle(hSection); + } /* Initialize the property sheet structure */ - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); - psh.dwSize = sizeof(PROPSHEETHEADER); + ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); + psh.dwSize = sizeof(PROPSHEETHEADERW); psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE | /* PSH_USEHICON */ PSH_USEICONID | PSH_NOAPPLYNOW; if (pConInfo->ci.ConsoleTitle[0] != L'\0') @@ -339,18 +363,18 @@ psh.hwndParent = pConInfo->hConsoleWindow; psh.hInstance = hApplet; - // psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); - psh.pszIcon = MAKEINTRESOURCE(IDC_CPLICON); + // psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCEW(IDC_CPLICON)); + psh.pszIcon = MAKEINTRESOURCEW(IDC_CPLICON); psh.nPages = 4; psh.nStartPage = 0; psh.ppsp = psp; InitPropSheetPage(&psp[i++], IDD_PROPPAGEOPTIONS, (DLGPROC) OptionsProc, (LPARAM)pConInfo); - InitPropSheetPage(&psp[i++], IDD_PROPPAGEFONT, (DLGPROC) FontProc, (LPARAM)pConInfo); - InitPropSheetPage(&psp[i++], IDD_PROPPAGELAYOUT, (DLGPROC) LayoutProc, (LPARAM)pConInfo); - InitPropSheetPage(&psp[i++], IDD_PROPPAGECOLORS, (DLGPROC) ColorsProc, (LPARAM)pConInfo); - - return (PropertySheet(&psh) != -1); + InitPropSheetPage(&psp[i++], IDD_PROPPAGEFONT , (DLGPROC) FontProc , (LPARAM)pConInfo); + InitPropSheetPage(&psp[i++], IDD_PROPPAGELAYOUT , (DLGPROC) LayoutProc , (LPARAM)pConInfo); + InitPropSheetPage(&psp[i++], IDD_PROPPAGECOLORS , (DLGPROC) ColorsProc , (LPARAM)pConInfo); + + return (PropertySheetW(&psh) != -1); } /* Control Panel Callback */ @@ -375,9 +399,9 @@ case CPL_INQUIRE: { CPLINFO *CPlInfo = (CPLINFO*)lParam2; - CPlInfo->idIcon = Applets[0].idIcon; - CPlInfo->idName = Applets[0].idName; - CPlInfo->idInfo = Applets[0].idDescription; + CPlInfo->idIcon = Applets[0].idIcon; + CPlInfo->idName = Applets[0].idName; + CPlInfo->idInfo = Applets[0].idDescription; break; } Modified: trunk/reactos/dll/cpl/console/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.h?… ============================================================================== --- trunk/reactos/dll/cpl/console/console.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/console.h [iso-8859-1] Sat Apr 12 14:23:36 2014 @@ -1,8 +1,7 @@ #ifndef CONSOLE_H__ #define CONSOLE_H__ -#include <limits.h> // just for UINT_MAX in layout.c -#include <tchar.h> +#include <stdio.h> #define WIN32_NO_STATUS @@ -16,6 +15,9 @@ #include "resource.h" +#define EnableDlgItem(hDlg, nID, bEnable) \ + EnableWindow(GetDlgItem((hDlg), (nID)), (bEnable)) + /* Shared header with the GUI Terminal Front-End from consrv.dll */ #include "consolecpl.h" @@ -27,9 +29,15 @@ APPLET_PROC AppletProc; } APPLET, *PAPPLET; +typedef enum _TEXT_TYPE +{ + Screen, + Popup +} TEXT_TYPE; + BOOL ApplyConsoleInfo(HWND hwndDlg, PCONSOLE_PROPS pConInfo); VOID PaintConsole(LPDRAWITEMSTRUCT drawItem, PCONSOLE_PROPS pConInfo); -VOID PaintText(LPDRAWITEMSTRUCT drawItem, PCONSOLE_PROPS pConInfo); +BOOL PaintText(LPDRAWITEMSTRUCT drawItem, PCONSOLE_PROPS pConInfo, TEXT_TYPE TextMode); // Globals extern HINSTANCE hApplet; Modified: trunk/reactos/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] Sat Apr 12 14:23:36 2014 @@ -11,15 +11,15 @@ #define NDEBUG #include <debug.h> -const TCHAR szPreviewText[] = - _T("C:\\ReactOS> dir \n") \ - _T("SYSTEM <DIR> 13-04-15 5:00a\n") \ - _T("SYSTEM32 <DIR> 13-04-15 5:00a\n") \ - _T("readme txt 1739 13-04-15 5:00a\n") \ - _T("explorer exe 3329536 13-04-15 5:00a\n") \ - _T("vgafonts cab 18736 13-04-15 5:00a\n") \ - _T("setuplog txt 313 13-04-15 5:00a\n") \ - _T("win ini 7005 13-04-15 5:00a\n"); +const WCHAR szPreviewText[] = + L"C:\\ReactOS> dir \n" \ + L"SYSTEM <DIR> 13-04-15 5:00a\n" \ + L"SYSTEM32 <DIR> 13-04-15 5:00a\n" \ + L"readme txt 1739 13-04-15 5:00a\n" \ + L"explorer exe 3329536 13-04-15 5:00a\n" \ + L"vgafonts cab 18736 13-04-15 5:00a\n" \ + L"setuplog txt 313 13-04-15 5:00a\n" \ + L"win ini 7005 13-04-15 5:00a\n" ; VOID @@ -35,8 +35,10 @@ FillRect(drawItem->hDC, &drawItem->rcItem, GetSysColorBrush(COLOR_BACKGROUND)); - sizex = drawItem->rcItem.right - drawItem->rcItem.left; - sizey = drawItem->rcItem.bottom - drawItem->rcItem.top; + // FIXME: Use: SM_CXSIZE, SM_CYSIZE, SM_CXVSCROLL, SM_CYHSCROLL, SM_CXMIN, SM_CYMIN, SM_CXFRAME, SM_CYFRAME + /* Use it for scaling */ + sizex = drawItem->rcItem.right - drawItem->rcItem.left; + sizey = drawItem->rcItem.bottom - drawItem->rcItem.top ; if ( GuiInfo->WindowOrigin.x == MAXDWORD && GuiInfo->WindowOrigin.y == MAXDWORD ) @@ -48,14 +50,14 @@ { // TODO: // Calculate pos correctly when console centered - startx = sizex / 3; - starty = sizey / 3; + startx = GuiInfo->WindowOrigin.x; + starty = GuiInfo->WindowOrigin.y; } // TODO: - // Strech console when bold fonts are selected - endx = drawItem->rcItem.right - startx + 15; - endy = starty + sizey / 3; + // Stretch console when bold fonts are selected + endx = startx + pConInfo->ci.ConsoleSize.X; // drawItem->rcItem.right - startx + 15; + endy = starty + pConInfo->ci.ConsoleSize.Y; // starty + sizey / 3; /* Draw console size */ SetRect(&cRect, startx, starty, endx, endy); @@ -92,39 +94,71 @@ DeleteObject((HGDIOBJ)hBrush); } -VOID PaintText(LPDRAWITEMSTRUCT drawItem, - PCONSOLE_PROPS pConInfo) +BOOL +PaintText(LPDRAWITEMSTRUCT drawItem, + PCONSOLE_PROPS pConInfo, + TEXT_TYPE TextMode) { + PGUI_CONSOLE_INFO GuiInfo = pConInfo->TerminalInfo.TermInfo; + USHORT CurrentAttrib; COLORREF pbkColor, ptColor; COLORREF nbkColor, ntColor; - HBRUSH hBrush = NULL; - - if (drawItem->CtlID == IDC_STATIC_SCREEN_COLOR) + HBRUSH hBrush; + HFONT Font, OldFont; + + if (TextMode == Screen) + CurrentAttrib = pConInfo->ci.ScreenAttrib; + else if (TextMode == Popup) + CurrentAttrib = pConInfo->ci.PopupAttrib; + else + return FALSE; + + nbkColor = pConInfo->ci.Colors[BkgdAttribFromAttrib(CurrentAttrib)]; + ntColor = pConInfo->ci.Colors[TextAttribFromAttrib(CurrentAttrib)]; + + hBrush = CreateSolidBrush(nbkColor); + if (!hBrush) return FALSE; + + Font = CreateFontW(LOWORD(GuiInfo->FontSize), + 0, // HIWORD(GuiInfo->FontSize), + 0, + TA_BASELINE, + GuiInfo->FontWeight, + FALSE, + FALSE, + FALSE, + OEM_CHARSET, + OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, + NONANTIALIASED_QUALITY, + FIXED_PITCH | GuiInfo->FontFamily /* FF_DONTCARE */, + GuiInfo->FaceName); + if (Font == NULL) { - nbkColor = pConInfo->ci.Colors[BkgdAttribFromAttrib(pConInfo->ci.ScreenAttrib)]; - hBrush = CreateSolidBrush(nbkColor); - ntColor = pConInfo->ci.Colors[TextAttribFromAttrib(pConInfo->ci.ScreenAttrib)]; + DPRINT1("PaintText: CreateFont failed\n"); + return FALSE; } - else if (drawItem->CtlID == IDC_STATIC_POPUP_COLOR) + + OldFont = SelectObject(drawItem->hDC, Font); + if (OldFont == NULL) { - nbkColor = pConInfo->ci.Colors[BkgdAttribFromAttrib(pConInfo->ci.PopupAttrib)]; - hBrush = CreateSolidBrush(nbkColor); - ntColor = pConInfo->ci.Colors[TextAttribFromAttrib(pConInfo->ci.PopupAttrib)]; - } - - if (!hBrush) - { - return; + DeleteObject(Font); + return FALSE; } FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); ptColor = SetTextColor(drawItem->hDC, ntColor); pbkColor = SetBkColor(drawItem->hDC, nbkColor); - DrawText(drawItem->hDC, szPreviewText, _tcslen(szPreviewText), &drawItem->rcItem, 0); + DrawTextW(drawItem->hDC, szPreviewText, wcslen(szPreviewText), &drawItem->rcItem, 0); SetTextColor(drawItem->hDC, ptColor); SetBkColor(drawItem->hDC, pbkColor); DeleteObject((HGDIOBJ)hBrush); + + SelectObject(drawItem->hDC, OldFont); + DeleteObject(Font); + + return TRUE; } INT_PTR @@ -134,8 +168,6 @@ WPARAM wParam, LPARAM lParam) { - LPNMUPDOWN lpnmud; - LPPSHNOTIFY lppsn; PCONSOLE_PROPS pConInfo = (PCONSOLE_PROPS)GetWindowLongPtr(hwndDlg, DWLP_USER); PGUI_CONSOLE_INFO GuiInfo = (pConInfo ? pConInfo->TerminalInfo.TermInfo : NULL); @@ -146,57 +178,64 @@ { case WM_INITDIALOG: { - DWORD xres, yres; - HDC hDC; + /* Multi-monitor support */ + LONG xVirtScr, yVirtScr; // Coordinates of the top-left virtual screen + LONG cxVirtScr, cyVirtScr; // Width and Height of the virtual screen + LONG cxFrame , cyFrame ; // Thickness of the window frame + pConInfo = (PCONSOLE_PROPS)((LPPROPSHEETPAGE)lParam)->lParam; GuiInfo = pConInfo->TerminalInfo.TermInfo; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pConInfo); - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_SCREEN_BUFFER_HEIGHT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_SCREEN_BUFFER_WIDTH), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_SIZE_HEIGHT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_SIZE_WIDTH), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); + /* Multi-monitor support */ + xVirtScr = GetSystemMetrics(SM_XVIRTUALSCREEN); + yVirtScr = GetSystemMetrics(SM_YVIRTUALSCREEN); + cxVirtScr = GetSystemMetrics(SM_CXVIRTUALSCREEN); + cyVirtScr = GetSystemMetrics(SM_CYVIRTUALSCREEN); + cxFrame = GetSystemMetrics(SM_CXFRAME); + cyFrame = GetSystemMetrics(SM_CYFRAME); + + SendDlgItemMessageW(hwndDlg, IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); + SendDlgItemMessageW(hwndDlg, IDC_UPDOWN_SCREEN_BUFFER_WIDTH , UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); + SendDlgItemMessageW(hwndDlg, IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); + SendDlgItemMessageW(hwndDlg, IDC_UPDOWN_WINDOW_SIZE_WIDTH , UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, pConInfo->ci.ScreenBufferSize.Y, FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, pConInfo->ci.ScreenBufferSize.X, FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH , pConInfo->ci.ScreenBufferSize.X, FALSE); SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, pConInfo->ci.ConsoleSize.Y, FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, pConInfo->ci.ConsoleSize.X, FALSE); - - hDC = GetDC(NULL); - xres = GetDeviceCaps(hDC, HORZRES); - yres = GetDeviceCaps(hDC, VERTRES); - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(xres, 0)); - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), UDM_SETRANGE, 0, (LPARAM)MAKELONG(yres, 0)); - - if ( GuiInfo->WindowOrigin.x != MAXDWORD && - GuiInfo->WindowOrigin.y != MAXDWORD ) + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH , pConInfo->ci.ConsoleSize.X, FALSE); + + SendDlgItemMessageW(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT, UDM_SETRANGE, 0, + (LPARAM)MAKELONG(xVirtScr + cxVirtScr - cxFrame, xVirtScr - cxFrame)); + SendDlgItemMessageW(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP , UDM_SETRANGE, 0, + (LPARAM)MAKELONG(yVirtScr + cyVirtScr - cyFrame, yVirtScr - cyFrame)); + + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, GuiInfo->WindowOrigin.x, TRUE); + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP , GuiInfo->WindowOrigin.y, TRUE); + + if (GuiInfo->AutoPosition) { - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, GuiInfo->WindowOrigin.x, FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, GuiInfo->WindowOrigin.y, FALSE); + EnableDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, FALSE); + EnableDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP , FALSE); + EnableDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT, FALSE); + EnableDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP , FALSE); } - else - { - // FIXME: Calculate window pos from xres, yres - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, 88, FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, 88, FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), FALSE); - SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_SYSTEM_POS_WINDOW), BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - } + CheckDlgButton(hwndDlg, IDC_CHECK_SYSTEM_POS_WINDOW, + GuiInfo->AutoPosition ? BST_CHECKED : BST_UNCHECKED); return TRUE; } + case WM_DRAWITEM: { PaintConsole((LPDRAWITEMSTRUCT)lParam, pConInfo); return TRUE; } + case WM_NOTIFY: { - lpnmud = (LPNMUPDOWN) lParam; - lppsn = (LPPSHNOTIFY) lParam; + LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam; + LPPSHNOTIFY lppsn = (LPPSHNOTIFY)lParam; if (lppsn->hdr.code == UDN_DELTAPOS) { @@ -246,7 +285,7 @@ } else { - left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, FALSE); + left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, TRUE); } if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_POS_TOP) @@ -255,7 +294,7 @@ } else { - top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, NULL, FALSE); + top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, NULL, TRUE); } if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_WIDTH || lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_HEIGHT) @@ -266,13 +305,14 @@ SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, wwidth, TRUE); swidth = wwidth; } - if (wheight >= sheight) { SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, wheight, TRUE); sheight = wheight; } } + + /* Be sure that the (new) screen buffer sizes are in the correct range */ swidth = min(max(swidth , 1), 0xFFFF); sheight = min(max(sheight, 1), 0xFFFF); @@ -284,7 +324,6 @@ SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, swidth, TRUE); wwidth = swidth; } - if (wheight > sheight) { SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, sheight, TRUE); @@ -302,50 +341,127 @@ } break; } + case WM_COMMAND: { switch (LOWORD(wParam)) { case IDC_EDIT_SCREEN_BUFFER_WIDTH: - case IDC_EDIT_SCREEN_BUFFER_HEIGHT: - case IDC_EDIT_WINDOW_SIZE_WIDTH: - case IDC_UPDOWN_WINDOW_SIZE_HEIGHT: - case IDC_EDIT_WINDOW_POS_LEFT: - case IDC_EDIT_WINDOW_POS_TOP: { if (HIWORD(wParam) == EN_KILLFOCUS) { - DWORD wheight, wwidth; - DWORD sheight, swidth; - DWORD left, top; - - wwidth = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, NULL, FALSE); - wheight = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, NULL, FALSE); - swidth = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, NULL, FALSE); - sheight = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, NULL, FALSE); - left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, FALSE); - top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, NULL, FALSE); - - swidth = min(max(swidth , 1), 0xFFFF); - sheight = min(max(sheight, 1), 0xFFFF); + DWORD swidth, wwidth; + + swidth = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, NULL, FALSE); + wwidth = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH , NULL, FALSE); + + /* Be sure that the (new) screen buffer width is in the correct range */ + swidth = min(max(swidth, 1), 0xFFFF); /* Automatically adjust window size when screen buffer decreases */ if (wwidth > swidth) { - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, swidth, TRUE); wwidth = swidth; + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, wwidth, TRUE); } + pConInfo->ci.ScreenBufferSize.X = (SHORT)swidth; + pConInfo->ci.ConsoleSize.X = (SHORT)wwidth; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + + case IDC_EDIT_WINDOW_SIZE_WIDTH: + { + if (HIWORD(wParam) == EN_KILLFOCUS) + { + DWORD swidth, wwidth; + + swidth = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, NULL, FALSE); + wwidth = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH , NULL, FALSE); + + /* Automatically adjust screen buffer size when window size enlarges */ + if (wwidth >= swidth) + { + swidth = wwidth; + + /* Be sure that the (new) screen buffer width is in the correct range */ + swidth = min(max(swidth, 1), 0xFFFF); + + SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, swidth, TRUE); + } + + pConInfo->ci.ScreenBufferSize.X = (SHORT)swidth; + pConInfo->ci.ConsoleSize.X = (SHORT)wwidth; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + + case IDC_EDIT_SCREEN_BUFFER_HEIGHT: + { + if (HIWORD(wParam) == EN_KILLFOCUS) + { + DWORD sheight, wheight; + + sheight = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, NULL, FALSE); + wheight = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT , NULL, FALSE); + + /* Be sure that the (new) screen buffer width is in the correct range */ + sheight = min(max(sheight, 1), 0xFFFF); + + /* Automatically adjust window size when screen buffer decreases */ if (wheight > sheight) { - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, sheight, TRUE); wheight = sheight; + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, wheight, TRUE); } - pConInfo->ci.ScreenBufferSize.X = (SHORT)swidth; pConInfo->ci.ScreenBufferSize.Y = (SHORT)sheight; - pConInfo->ci.ConsoleSize.X = (SHORT)wwidth; - pConInfo->ci.ConsoleSize.Y = (SHORT)wheight; + pConInfo->ci.ConsoleSize.Y = (SHORT)wheight; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + + case IDC_EDIT_WINDOW_SIZE_HEIGHT: + { + if (HIWORD(wParam) == EN_KILLFOCUS) + { + DWORD sheight, wheight; + + sheight = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, NULL, FALSE); + wheight = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT , NULL, FALSE); + + /* Automatically adjust screen buffer size when window size enlarges */ + if (wheight >= sheight) + { + sheight = wheight; + + /* Be sure that the (new) screen buffer width is in the correct range */ + sheight = min(max(sheight, 1), 0xFFFF); + + SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, sheight, TRUE); + } + + pConInfo->ci.ScreenBufferSize.Y = (SHORT)sheight; + pConInfo->ci.ConsoleSize.Y = (SHORT)wheight; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + + case IDC_EDIT_WINDOW_POS_LEFT: + case IDC_EDIT_WINDOW_POS_TOP: + { + if (HIWORD(wParam) == EN_KILLFOCUS) + { + DWORD left, top; + + left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, TRUE); + top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP , NULL, TRUE); + GuiInfo->WindowOrigin.x = left; GuiInfo->WindowOrigin.y = top; PropSheet_Changed(GetParent(hwndDlg), hwndDlg); @@ -360,29 +476,36 @@ { ULONG left, top; - left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, FALSE); - top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, NULL, FALSE); + left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, TRUE); + top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP , NULL, TRUE); + + GuiInfo->AutoPosition = FALSE; GuiInfo->WindowOrigin.x = left; GuiInfo->WindowOrigin.y = top; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); - EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), TRUE); + EnableDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, TRUE); + EnableDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP , TRUE); + EnableDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT, TRUE); + EnableDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP , TRUE); } else if (res == BST_UNCHECKED) { - GuiInfo->WindowOrigin.x = UINT_MAX; - GuiInfo->WindowOrigin.y = UINT_MAX; + GuiInfo->AutoPosition = TRUE; + // Do not touch GuiInfo->WindowOrigin !! + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), FALSE); + EnableDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, FALSE); + EnableDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP , FALSE); + EnableDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT, FALSE); + EnableDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP , FALSE); } } } } + default: break; } Modified: trunk/reactos/dll/cpl/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/options.c?… ============================================================================== --- trunk/reactos/dll/cpl/console/options.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/options.c [iso-8859-1] Sat Apr 12 14:23:36 2014 @@ -11,9 +11,85 @@ #define NDEBUG #include <debug.h> -static -void -UpdateDialogElements(HWND hwndDlg, PCONSOLE_PROPS pConInfo); +static void +UpdateDialogElements(HWND hwndDlg, PCONSOLE_PROPS pConInfo) +{ + PGUI_CONSOLE_INFO GuiInfo = pConInfo->TerminalInfo.TermInfo; + HWND hDlgCtrl; + + /* Update cursor size */ + if (pConInfo->ci.CursorSize <= 25) + { + /* Small cursor */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + } + else if (pConInfo->ci.CursorSize <= 50) + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + } + else /* if (pConInfo->ci.CursorSize <= 100) */ + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + } + + /* Update num buffers */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_NUM_BUFFER); + SendMessage(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG(999, 1)); + SetDlgItemInt(hwndDlg, IDC_EDIT_NUM_BUFFER, pConInfo->ci.NumberOfHistoryBuffers, FALSE); + + /* Update buffer size */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_BUFFER_SIZE); + SendMessage(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG(999, 1)); + SetDlgItemInt(hwndDlg, IDC_EDIT_BUFFER_SIZE, pConInfo->ci.HistoryBufferSize, FALSE); + + /* Update discard duplicates */ + CheckDlgButton(hwndDlg, IDC_CHECK_DISCARD_DUPLICATES, + pConInfo->ci.HistoryNoDup ? BST_CHECKED : BST_UNCHECKED); + + /* Update full/window screen */ + if (GuiInfo->FullScreen) + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_FULL); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_WINDOW); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + } + else + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_WINDOW); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_FULL); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + } + + /* Update quick edit */ + CheckDlgButton(hwndDlg, IDC_CHECK_QUICK_EDIT, + pConInfo->ci.QuickEdit ? BST_CHECKED : BST_UNCHECKED); + + /* Update insert mode */ + CheckDlgButton(hwndDlg, IDC_CHECK_INSERT_MODE, + pConInfo->ci.InsertMode ? BST_CHECKED : BST_UNCHECKED); +} INT_PTR CALLBACK @@ -24,9 +100,6 @@ { PCONSOLE_PROPS pConInfo; PGUI_CONSOLE_INFO GuiInfo; - LRESULT lResult; - HWND hDlgCtrl; - LPPSHNOTIFY lppsn; pConInfo = (PCONSOLE_PROPS)GetWindowLongPtr(hwndDlg, DWLP_USER); @@ -39,19 +112,28 @@ UpdateDialogElements(hwndDlg, pConInfo); return TRUE; } + case WM_NOTIFY: { - if (!pConInfo) break; - - lppsn = (LPPSHNOTIFY) lParam; + LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam; + LPPSHNOTIFY lppsn = (LPPSHNOTIFY)lParam; + + // if (!pConInfo) break; + if (lppsn->hdr.code == UDN_DELTAPOS) { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_BUFFER_SIZE); - pConInfo->ci.HistoryBufferSize = LOWORD(SendMessage(hDlgCtrl, UDM_GETPOS, 0, 0)); - - hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_NUM_BUFFER); - pConInfo->ci.NumberOfHistoryBuffers = LOWORD(SendMessage(hDlgCtrl, UDM_GETPOS, 0, 0)); - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + if (lppsn->hdr.idFrom == IDC_UPDOWN_BUFFER_SIZE) + { + lpnmud->iPos = min(max(lpnmud->iPos + lpnmud->iDelta, 1), 999); + pConInfo->ci.HistoryBufferSize = lpnmud->iPos; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + else if (lppsn->hdr.idFrom == IDC_UPDOWN_NUM_BUFFER) + { + lpnmud->iPos = min(max(lpnmud->iPos + lpnmud->iDelta, 1), 999); + pConInfo->ci.NumberOfHistoryBuffers = lpnmud->iPos; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } } else if (lppsn->hdr.code == PSN_APPLY) { @@ -68,8 +150,11 @@ } break; } + case WM_COMMAND: { + LRESULT lResult; + if (!pConInfo) break; GuiInfo = pConInfo->TerminalInfo.TermInfo; @@ -153,109 +238,43 @@ PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } + case IDC_EDIT_BUFFER_SIZE: + { + if (HIWORD(wParam) == EN_KILLFOCUS) + { + DWORD sizeBuff; + + sizeBuff = GetDlgItemInt(hwndDlg, IDC_EDIT_BUFFER_SIZE, NULL, FALSE); + sizeBuff = min(max(sizeBuff, 1), 999); + + pConInfo->ci.HistoryBufferSize = sizeBuff; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + case IDC_EDIT_NUM_BUFFER: + { + if (HIWORD(wParam) == EN_KILLFOCUS) + { + DWORD numBuff; + + numBuff = GetDlgItemInt(hwndDlg, IDC_EDIT_NUM_BUFFER, NULL, FALSE); + numBuff = min(max(numBuff, 1), 999); + + pConInfo->ci.NumberOfHistoryBuffers = numBuff; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } default: break; } break; } + default: break; } return FALSE; } - -static -void -UpdateDialogElements(HWND hwndDlg, PCONSOLE_PROPS pConInfo) -{ - PGUI_CONSOLE_INFO GuiInfo = pConInfo->TerminalInfo.TermInfo; - HWND hDlgCtrl; - TCHAR szBuffer[MAX_PATH]; - - /* Update cursor size */ - if (pConInfo->ci.CursorSize <= 25) - { - /* Small cursor */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); - } - else if (pConInfo->ci.CursorSize <= 50) - { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); - } - else /* if (pConInfo->ci.CursorSize <= 100) */ - { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); - } - - /* Update num buffers */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_NUM_BUFFER); - SendMessage(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG((short)999, (short)1)); - hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_NUM_BUFFER); - _stprintf(szBuffer, _T("%d"), pConInfo->ci.NumberOfHistoryBuffers); - SendMessage(hDlgCtrl, WM_SETTEXT, 0, (LPARAM)szBuffer); - - /* Update buffer size */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_BUFFER_SIZE); - SendMessage(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG((short)999, (short)1)); - hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_BUFFER_SIZE); - _stprintf(szBuffer, _T("%d"), pConInfo->ci.HistoryBufferSize); - SendMessage(hDlgCtrl, WM_SETTEXT, 0, (LPARAM)szBuffer); - - /* Update discard duplicates */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_DISCARD_DUPLICATES); - if (pConInfo->ci.HistoryNoDup) - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - else - SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); - - /* Update full/window screen */ - if (GuiInfo->FullScreen) - { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_FULL); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_WINDOW); - SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); - } - else - { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_WINDOW); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_FULL); - SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); - } - - /* Update quick edit */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_QUICK_EDIT); - if (pConInfo->ci.QuickEdit) - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - else - SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); - - /* Update insert mode */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_INSERT_MODE); - if (pConInfo->ci.InsertMode) - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - else - SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); -}

1 0

[pschweitzer] 62717: [KMTESTS:NPFS] Add tests for volume information query. Could be completed for size, device, full size and attributes query. This is used to validate changes made in r62663. Tes...
by pschweitzer＠svn.reactos.org 12 Apr '14

12 Apr '14

Author: pschweitzer Date: Sat Apr 12 12:06:47 2014 New Revision: 62717 URL: http://svn.reactos.org/svn/reactos?rev=62717&view=rev Log: [KMTESTS:NPFS] Add tests for volume information query. Could be completed for size, device, full size and attributes query. This is used to validate changes made in r62663. Tested by Thomas. CORE-7451 Added: trunk/rostests/kmtests/npfs/NpfsVolumeInfo.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Sat Apr 12 12:06:47 2014 @@ -32,6 +32,7 @@ npfs/NpfsCreate.c npfs/NpfsHelpers.c npfs/NpfsReadWrite.c + npfs/NpfsVolumeInfo.c ntos_ex/ExCallback.c ntos_ex/ExDoubleList.c ntos_ex/ExFastMutex.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Sat Apr 12 12:06:47 2014 @@ -41,6 +41,7 @@ KMT_TESTFUNC Test_NpfsConnect; KMT_TESTFUNC Test_NpfsCreate; KMT_TESTFUNC Test_NpfsReadWrite; +KMT_TESTFUNC Test_NpfsVolumeInfo; KMT_TESTFUNC Test_ObReference; KMT_TESTFUNC Test_ObType; KMT_TESTFUNC Test_ObTypeClean; @@ -95,6 +96,7 @@ { "NpfsConnect", Test_NpfsConnect }, { "NpfsCreate", Test_NpfsCreate }, { "NpfsReadWrite", Test_NpfsReadWrite }, + { "NpfsVolumeInfo", Test_NpfsVolumeInfo }, { "ObReference", Test_ObReference }, { "ObType", Test_ObType }, { "-ObTypeClean", Test_ObTypeClean }, Added: trunk/rostests/kmtests/npfs/NpfsVolumeInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/npfs/NpfsVolumeIn… ============================================================================== --- trunk/rostests/kmtests/npfs/NpfsVolumeInfo.c (added) +++ trunk/rostests/kmtests/npfs/NpfsVolumeInfo.c [iso-8859-1] Sat Apr 12 12:06:47 2014 @@ -0,0 +1,96 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite NPFS volume information test + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <kmt_test.h> +#include "npfs.h" + +#define MAX_INSTANCES 1 +#define IN_QUOTA 4096 +#define OUT_QUOTA 4096 + +static +VOID +TestVolumeInfo( + IN HANDLE ServerHandle) +{ + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + struct { + FILE_FS_VOLUME_INFORMATION; + WCHAR PartialName[2]; + } PartialInfo; + struct { + FILE_FS_VOLUME_INFORMATION; + WCHAR PartialName[10]; + } CompleteInfo; + + Status = ZwQueryVolumeInformationFile(ServerHandle, + &IoStatusBlock, + &CompleteInfo, + sizeof(CompleteInfo), + FileFsVolumeInformation); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_hex(IoStatusBlock.Status, STATUS_SUCCESS); + ok_eq_long(CompleteInfo.VolumeCreationTime.LowPart, 0); + ok_eq_long(CompleteInfo.VolumeCreationTime.HighPart, 0); + ok_eq_ulong(CompleteInfo.VolumeSerialNumber, 0); + ok_bool_false(CompleteInfo.SupportsObjects, "CompleteInfo.SupportsObjects"); + ok_eq_ulong(CompleteInfo.VolumeLabelLength, 18); + ok_eq_ulong(IoStatusBlock.Information, 36); + ok_eq_ulong(RtlCompareMemory(CompleteInfo.VolumeLabel, L"NamedPipe", 18), 18); + + Status = ZwQueryVolumeInformationFile(ServerHandle, + &IoStatusBlock, + &PartialInfo, + sizeof(PartialInfo), + FileFsVolumeInformation); + ok_eq_hex(Status, STATUS_BUFFER_OVERFLOW); + ok_eq_hex(IoStatusBlock.Status, STATUS_BUFFER_OVERFLOW); + ok_eq_long(CompleteInfo.VolumeCreationTime.LowPart, 0); + ok_eq_long(CompleteInfo.VolumeCreationTime.HighPart, 0); + ok_eq_ulong(CompleteInfo.VolumeSerialNumber, 0); + ok_bool_false(CompleteInfo.SupportsObjects, "CompleteInfo.SupportsObjects"); + ok_eq_ulong(CompleteInfo.VolumeLabelLength, 18); + ok_eq_ulong(IoStatusBlock.Information, 32); + ok_eq_ulong(RtlCompareMemory(CompleteInfo.VolumeLabel, L"Na", 4), 4); +} + +static KSTART_ROUTINE RunTest; +static +VOID +NTAPI +RunTest( + IN PVOID Context) +{ + NTSTATUS Status; + HANDLE ServerHandle; + + UNREFERENCED_PARAMETER(Context); + + ServerHandle = INVALID_HANDLE_VALUE; + Status = NpCreatePipe(&ServerHandle, + DEVICE_NAMED_PIPE L"\\KmtestNpfsVolumeInfoTestPipe", + BYTE_STREAM, QUEUE, BYTE_STREAM, DUPLEX, + MAX_INSTANCES, + IN_QUOTA, + OUT_QUOTA); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(ServerHandle != NULL && ServerHandle != INVALID_HANDLE_VALUE, "ServerHandle = %p\n", ServerHandle); + if (!skip(NT_SUCCESS(Status) && ServerHandle != NULL && ServerHandle != INVALID_HANDLE_VALUE, "No pipe\n")) + { + TestVolumeInfo(ServerHandle); + ObCloseHandle(ServerHandle, KernelMode); + } +} + +START_TEST(NpfsVolumeInfo) +{ + PKTHREAD Thread; + + Thread = KmtStartThread(RunTest, NULL); + KmtFinishThread(Thread, NULL); +} Propchange: trunk/rostests/kmtests/npfs/NpfsVolumeInfo.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 62716: [NTOS:CC] - Change ROS_VACB::FileOffset from ULONG to LARGE_INTEGER
by tfaber＠svn.reactos.org 12 Apr '14

12 Apr '14

Author: tfaber Date: Sat Apr 12 11:51:46 2014 New Revision: 62716 URL: http://svn.reactos.org/svn/reactos?rev=62716&view=rev Log: [NTOS:CC] - Change ROS_VACB::FileOffset from ULONG to LARGE_INTEGER Modified: trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/cc.h trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=627… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Sat Apr 12 11:51:46 2014 @@ -66,7 +66,6 @@ PROS_VACB current; PROS_VACB previous; IO_STATUS_BLOCK Iosb; - LARGE_INTEGER VacbOffset; NTSTATUS Status; ULONG TempLength; KEVENT Event; @@ -141,11 +140,10 @@ /* * Read in the information. */ - VacbOffset.QuadPart = current->FileOffset; KeInitializeEvent(&Event, NotificationEvent, FALSE); Status = IoPageRead(SharedCacheMap->FileObject, Mdl, - &VacbOffset, + &current->FileOffset, &Event, &Iosb); if (Status == STATUS_PENDING) @@ -194,12 +192,10 @@ ULONG Size; PMDL Mdl; NTSTATUS Status; - LARGE_INTEGER VacbOffset; IO_STATUS_BLOCK IoStatus; KEVENT Event; - VacbOffset.QuadPart = Vacb->FileOffset; - Size = (ULONG)(Vacb->SharedCacheMap->SectionSize.QuadPart - Vacb->FileOffset); + Size = (ULONG)(Vacb->SharedCacheMap->SectionSize.QuadPart - Vacb->FileOffset.QuadPart); if (Size > VACB_MAPPING_GRANULARITY) { Size = VACB_MAPPING_GRANULARITY; @@ -214,7 +210,7 @@ MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ; KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoPageRead(Vacb->SharedCacheMap->FileObject, Mdl, &VacbOffset, &Event, &IoStatus); + Status = IoPageRead(Vacb->SharedCacheMap->FileObject, Mdl, &Vacb->FileOffset, &Event, &IoStatus); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -247,12 +243,10 @@ PMDL Mdl; NTSTATUS Status; IO_STATUS_BLOCK IoStatus; - LARGE_INTEGER VacbOffset; KEVENT Event; Vacb->Dirty = FALSE; - VacbOffset.QuadPart = Vacb->FileOffset; - Size = (ULONG)(Vacb->SharedCacheMap->SectionSize.QuadPart - Vacb->FileOffset); + Size = (ULONG)(Vacb->SharedCacheMap->SectionSize.QuadPart - Vacb->FileOffset.QuadPart); if (Size > VACB_MAPPING_GRANULARITY) { Size = VACB_MAPPING_GRANULARITY; @@ -277,7 +271,7 @@ MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ; KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoSynchronousPageWrite(Vacb->SharedCacheMap->FileObject, Mdl, &VacbOffset, &Event, &IoStatus); + Status = IoSynchronousPageWrite(Vacb->SharedCacheMap->FileObject, Mdl, &Vacb->FileOffset, &Event, &IoStatus); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -364,7 +358,8 @@ ROS_VACB, CacheMapVacbListEntry); if (!current->Valid && - DoRangesIntersect(current->FileOffset, VACB_MAPPING_GRANULARITY, + DoRangesIntersect(current->FileOffset.QuadPart, + VACB_MAPPING_GRANULARITY, ReadOffset, Length)) { KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql); @@ -372,7 +367,7 @@ IoStatus->Information = 0; return FALSE; } - if (current->FileOffset >= ReadOffset + Length) + if (current->FileOffset.QuadPart >= ReadOffset + Length) break; current_entry = current_entry->Flink; } @@ -482,14 +477,15 @@ ROS_VACB, CacheMapVacbListEntry); if (!Vacb->Valid && - DoRangesIntersect(Vacb->FileOffset, VACB_MAPPING_GRANULARITY, + DoRangesIntersect(Vacb->FileOffset.QuadPart, + VACB_MAPPING_GRANULARITY, WriteOffset, Length)) { KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql); /* datas not available */ return FALSE; } - if (Vacb->FileOffset >= WriteOffset + Length) + if (Vacb->FileOffset.QuadPart >= WriteOffset + Length) break; current_entry = current_entry->Flink; } @@ -704,14 +700,15 @@ ROS_VACB, CacheMapVacbListEntry); if (!Vacb->Valid && - DoRangesIntersect(Vacb->FileOffset, VACB_MAPPING_GRANULARITY, + DoRangesIntersect(Vacb->FileOffset.QuadPart, + VACB_MAPPING_GRANULARITY, WriteOffset.u.LowPart, Length)) { KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql); /* datas not available */ return FALSE; } - if (Vacb->FileOffset >= WriteOffset.u.LowPart + Length) + if (Vacb->FileOffset.QuadPart >= WriteOffset.u.LowPart + Length) break; current_entry = current_entry->Flink; } Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=62716… ============================================================================== --- trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Sat Apr 12 11:51:46 2014 @@ -163,7 +163,7 @@ ROS_VACB, CacheMapVacbListEntry); current_entry = current_entry->Flink; - if (current->FileOffset >= FileSizes->AllocationSize.QuadPart) + if (current->FileOffset.QuadPart >= FileSizes->AllocationSize.QuadPart) { if ((current->ReferenceCount == 0) || ((current->ReferenceCount == 1) && current->Dirty)) { Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=627… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Apr 12 11:51:46 2014 @@ -456,7 +456,8 @@ current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); - if (IsPointInRange(current->FileOffset, VACB_MAPPING_GRANULARITY, + if (IsPointInRange(current->FileOffset.QuadPart, + VACB_MAPPING_GRANULARITY, FileOffset)) { CcRosVacbIncRefCount(current); @@ -469,7 +470,7 @@ NULL); return current; } - if (current->FileOffset > FileOffset) + if (current->FileOffset.QuadPart > FileOffset) break; current_entry = current_entry->Flink; } @@ -606,7 +607,7 @@ current->Valid = FALSE; current->Dirty = FALSE; current->PageOut = FALSE; - current->FileOffset = ROUND_DOWN(FileOffset, VACB_MAPPING_GRANULARITY); + current->FileOffset.QuadPart = ROUND_DOWN(FileOffset, VACB_MAPPING_GRANULARITY); current->SharedCacheMap = SharedCacheMap; #if DBG if (SharedCacheMap->Trace) @@ -640,7 +641,8 @@ current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); - if (IsPointInRange(current->FileOffset, VACB_MAPPING_GRANULARITY, + if (IsPointInRange(current->FileOffset.QuadPart, + VACB_MAPPING_GRANULARITY, FileOffset)) { CcRosVacbIncRefCount(current); @@ -665,13 +667,13 @@ NULL); return STATUS_SUCCESS; } - if (current->FileOffset < FileOffset) + if (current->FileOffset.QuadPart < FileOffset) { ASSERT(previous == NULL || - previous->FileOffset < current->FileOffset); + previous->FileOffset.QuadPart < current->FileOffset.QuadPart); previous = current; } - if (current->FileOffset > FileOffset) + if (current->FileOffset.QuadPart > FileOffset) break; current_entry = current_entry->Flink; } @@ -798,7 +800,7 @@ CcRosGetVacb ( PROS_SHARED_CACHE_MAP SharedCacheMap, ULONG FileOffset, - PULONG BaseOffset, + PULONGLONG BaseOffset, PVOID* BaseAddress, PBOOLEAN UptoDate, PROS_VACB *Vacb) @@ -841,7 +843,7 @@ *BaseAddress = current->BaseAddress; DPRINT("*BaseAddress %p\n", *BaseAddress); *Vacb = current; - *BaseOffset = current->FileOffset; + *BaseOffset = current->FileOffset.QuadPart; return STATUS_SUCCESS; } @@ -857,7 +859,7 @@ * FUNCTION: Request a page mapping for a shared cache map */ { - ULONG BaseOffset; + ULONGLONG BaseOffset; ASSERT(SharedCacheMap); Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Sat Apr 12 11:51:46 2014 @@ -138,7 +138,7 @@ LIST_ENTRY VacbListEntry; LIST_ENTRY VacbLruListEntry; /* Offset in the file which this view maps. */ - ULONG FileOffset; + LARGE_INTEGER FileOffset; /* Mutex */ KMUTEX Mutex; /* Number of references. */ @@ -187,7 +187,7 @@ CcRosGetVacb( PROS_SHARED_CACHE_MAP SharedCacheMap, ULONG FileOffset, - PULONG BaseOffset, + PULONGLONG BaseOffset, PVOID *BaseAddress, PBOOLEAN UptoDate, PROS_VACB *Vacb @@ -305,9 +305,9 @@ FORCEINLINE BOOLEAN DoRangesIntersect( - _In_ ULONG Offset1, + _In_ ULONGLONG Offset1, _In_ ULONG Length1, - _In_ ULONG Offset2, + _In_ ULONGLONG Offset2, _In_ ULONG Length2) { if (Offset1 + Length1 <= Offset2) @@ -320,9 +320,9 @@ FORCEINLINE BOOLEAN IsPointInRange( - _In_ ULONG Offset1, + _In_ ULONGLONG Offset1, _In_ ULONG Length1, - _In_ ULONG Point) + _In_ ULONGLONG Point) { return DoRangesIntersect(Offset1, Length1, Point, 1); } Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Apr 12 11:51:46 2014 @@ -1066,7 +1066,7 @@ * Page - Variable that receives a page contains the read data. */ { - ULONG BaseOffset; + ULONGLONG BaseOffset; ULONGLONG FileOffset; PVOID BaseAddress; BOOLEAN UptoDate;

1 0

[tfaber] 62715: [NTOS:CC] - Rename ROS_SHARED_CACHE_MAP::AllocationSize to SectionSize CORE-8065
by tfaber＠svn.reactos.org 12 Apr '14

12 Apr '14

Author: tfaber Date: Sat Apr 12 11:19:38 2014 New Revision: 62715 URL: http://svn.reactos.org/svn/reactos?rev=62715&view=rev Log: [NTOS:CC] - Rename ROS_SHARED_CACHE_MAP::AllocationSize to SectionSize CORE-8065 Modified: trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=627… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Sat Apr 12 11:19:38 2014 @@ -199,7 +199,7 @@ KEVENT Event; VacbOffset.QuadPart = Vacb->FileOffset; - Size = (ULONG)(Vacb->SharedCacheMap->AllocationSize.QuadPart - Vacb->FileOffset); + Size = (ULONG)(Vacb->SharedCacheMap->SectionSize.QuadPart - Vacb->FileOffset); if (Size > VACB_MAPPING_GRANULARITY) { Size = VACB_MAPPING_GRANULARITY; @@ -252,7 +252,7 @@ Vacb->Dirty = FALSE; VacbOffset.QuadPart = Vacb->FileOffset; - Size = (ULONG)(Vacb->SharedCacheMap->AllocationSize.QuadPart - Vacb->FileOffset); + Size = (ULONG)(Vacb->SharedCacheMap->SectionSize.QuadPart - Vacb->FileOffset); if (Size > VACB_MAPPING_GRANULARITY) { Size = VACB_MAPPING_GRANULARITY; @@ -344,8 +344,8 @@ SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; ReadOffset = (ULONG)FileOffset->QuadPart; - DPRINT("AllocationSize %I64d, FileSize %I64d\n", - SharedCacheMap->AllocationSize.QuadPart, + DPRINT("SectionSize %I64d, FileSize %I64d\n", + SharedCacheMap->SectionSize.QuadPart, SharedCacheMap->FileSize.QuadPart); /* Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=62715… ============================================================================== --- trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Sat Apr 12 11:19:38 2014 @@ -150,7 +150,7 @@ if (SharedCacheMap == NULL) return; - if (FileSizes->AllocationSize.QuadPart < SharedCacheMap->AllocationSize.QuadPart) + if (FileSizes->AllocationSize.QuadPart < SharedCacheMap->SectionSize.QuadPart) { InitializeListHead(&FreeListHead); KeAcquireGuardedMutex(&ViewLock); @@ -185,7 +185,7 @@ } } - SharedCacheMap->AllocationSize = FileSizes->AllocationSize; + SharedCacheMap->SectionSize = FileSizes->AllocationSize; SharedCacheMap->FileSize = FileSizes->FileSize; KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql); KeReleaseGuardedMutex(&ViewLock); @@ -206,7 +206,7 @@ else { KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldirql); - SharedCacheMap->AllocationSize = FileSizes->AllocationSize; + SharedCacheMap->SectionSize = FileSizes->AllocationSize; SharedCacheMap->FileSize = FileSizes->FileSize; KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql); } @@ -256,7 +256,7 @@ if (!SharedCacheMap) return FALSE; - FileSizes->AllocationSize = SharedCacheMap->AllocationSize; + FileSizes->AllocationSize = SharedCacheMap->SectionSize; FileSizes->FileSize = FileSizes->ValidDataLength = SharedCacheMap->FileSize; return TRUE; } Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=6271… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Sat Apr 12 11:19:38 2014 @@ -53,8 +53,8 @@ SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; ASSERT(SharedCacheMap); - DPRINT("AllocationSize %I64x, FileSize %I64x\n", - SharedCacheMap->AllocationSize.QuadPart, + DPRINT("SectionSize %I64x, FileSize %I64x\n", + SharedCacheMap->SectionSize.QuadPart, SharedCacheMap->FileSize.QuadPart); if (ReadOffset % VACB_MAPPING_GRANULARITY + Length > VACB_MAPPING_GRANULARITY) Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=627… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Apr 12 11:19:38 2014 @@ -1220,7 +1220,7 @@ SharedCacheMap->LazyWriteContext = LazyWriterContext; if (FileObject->FsContext) { - SharedCacheMap->AllocationSize = + SharedCacheMap->SectionSize = ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->AllocationSize; SharedCacheMap->FileSize = ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->FileSize; Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Sat Apr 12 11:19:38 2014 @@ -106,7 +106,7 @@ LIST_ENTRY CacheMapVacbListHead; ULONG TimeStamp; PFILE_OBJECT FileObject; - LARGE_INTEGER AllocationSize; + LARGE_INTEGER SectionSize; LARGE_INTEGER FileSize; PCACHE_MANAGER_CALLBACKS Callbacks; PVOID LazyWriteContext;

1 0

[tfaber] 62714: [NTOS:CC] - Organize pool tags and make them somewhat Windows-compatible CORE-8065
by tfaber＠svn.reactos.org 12 Apr '14

12 Apr '14

Author: tfaber Date: Sat Apr 12 11:12:14 2014 New Revision: 62714 URL: http://svn.reactos.org/svn/reactos?rev=62714&view=rev Log: [NTOS:CC] - Organize pool tags and make them somewhat Windows-compatible CORE-8065 Modified: trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/tag.h Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=627… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Apr 12 11:12:14 2014 @@ -1269,32 +1269,31 @@ InitializeListHead(&DirtyVacbListHead); InitializeListHead(&VacbLruListHead); KeInitializeGuardedMutex(&ViewLock); - ExInitializeNPagedLookasideList (&iBcbLookasideList, - NULL, - NULL, - 0, - sizeof(INTERNAL_BCB), - TAG_IBCB, - 20); - ExInitializeNPagedLookasideList (&SharedCacheMapLookasideList, - NULL, - NULL, - 0, - sizeof(ROS_SHARED_CACHE_MAP), - TAG_BCB, - 20); - ExInitializeNPagedLookasideList (&VacbLookasideList, - NULL, - NULL, - 0, - sizeof(ROS_VACB), - TAG_CSEG, - 20); + ExInitializeNPagedLookasideList(&iBcbLookasideList, + NULL, + NULL, + 0, + sizeof(INTERNAL_BCB), + TAG_BCB, + 20); + ExInitializeNPagedLookasideList(&SharedCacheMapLookasideList, + NULL, + NULL, + 0, + sizeof(ROS_SHARED_CACHE_MAP), + TAG_SHARED_CACHE_MAP, + 20); + ExInitializeNPagedLookasideList(&VacbLookasideList, + NULL, + NULL, + 0, + sizeof(ROS_VACB), + TAG_VACB, + 20); MmInitializeMemoryConsumer(MC_CACHE, CcRosTrimCache); CcInitCacheZeroPage(); - } /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] Sat Apr 12 11:12:14 2014 @@ -1,10 +1,11 @@ #pragma once -/* formerly located in cc/view.c */ -#define TAG_CC ' cC' -#define TAG_CSEG 'GESC' -#define TAG_BCB ' BCB' -#define TAG_IBCB 'BCBi' +/* Cache Manager Tags */ +#define TAG_CC ' cC' +#define TAG_VACB 'aVcC' +#define TAG_SHARED_CACHE_MAP 'cScC' +#define TAG_PRIVATE_CACHE_MAP 'cPcC' +#define TAG_BCB 'cBcC' /* Executive Callbacks */ #define TAG_CALLBACK_ROUTINE_BLOCK 'brbC'

1 0

[tfaber] 62713: [NTOS:CC] - Rename the BCB structure to ROS_SHARED_CACHE_MAP. This should eventually become NDK's SHARED_CACHE_MAP. CORE-8065
by tfaber＠svn.reactos.org 12 Apr '14

12 Apr '14

Author: tfaber Date: Sat Apr 12 10:59:48 2014 New Revision: 62713 URL: http://svn.reactos.org/svn/reactos?rev=62713&view=rev Log: [NTOS:CC] - Rename the BCB structure to ROS_SHARED_CACHE_MAP. This should eventually become NDK's SHARED_CACHE_MAP. CORE-8065 Modified: trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/cc.h trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=627… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Sat Apr 12 10:59:48 2014 @@ -57,7 +57,7 @@ NTSTATUS NTAPI ReadVacbChain ( - PBCB Bcb, + PROS_SHARED_CACHE_MAP SharedCacheMap, ULONG ReadOffset, ULONG Length, PVOID Buffer) @@ -74,7 +74,7 @@ Mdl = _alloca(MmSizeOfMdl(NULL, MAX_RW_LENGTH)); - Status = CcRosGetVacbChain(Bcb, ReadOffset, Length, &head); + Status = CcRosGetVacbChain(SharedCacheMap, ReadOffset, Length, &head); if (!NT_SUCCESS(Status)) { return Status; @@ -95,7 +95,7 @@ Length = Length - TempLength; previous = current; current = current->NextInChain; - CcRosReleaseVacb(Bcb, previous, TRUE, FALSE, FALSE); + CcRosReleaseVacb(SharedCacheMap, previous, TRUE, FALSE, FALSE); } /* * Otherwise read in as much as we can. @@ -143,7 +143,7 @@ */ VacbOffset.QuadPart = current->FileOffset; KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoPageRead(Bcb->FileObject, + Status = IoPageRead(SharedCacheMap->FileObject, Mdl, &VacbOffset, &Event, @@ -163,7 +163,7 @@ { previous = current; current = current->NextInChain; - CcRosReleaseVacb(Bcb, previous, FALSE, FALSE, FALSE); + CcRosReleaseVacb(SharedCacheMap, previous, FALSE, FALSE, FALSE); } return Status; } @@ -178,7 +178,7 @@ Buffer = (PVOID)((ULONG_PTR)Buffer + TempLength); Length = Length - TempLength; - CcRosReleaseVacb(Bcb, previous, TRUE, FALSE, FALSE); + CcRosReleaseVacb(SharedCacheMap, previous, TRUE, FALSE, FALSE); current_size += VACB_MAPPING_GRANULARITY; } } @@ -199,7 +199,7 @@ KEVENT Event; VacbOffset.QuadPart = Vacb->FileOffset; - Size = (ULONG)(Vacb->Bcb->AllocationSize.QuadPart - Vacb->FileOffset); + Size = (ULONG)(Vacb->SharedCacheMap->AllocationSize.QuadPart - Vacb->FileOffset); if (Size > VACB_MAPPING_GRANULARITY) { Size = VACB_MAPPING_GRANULARITY; @@ -214,7 +214,7 @@ MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ; KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoPageRead(Vacb->Bcb->FileObject, Mdl, &VacbOffset, &Event, &IoStatus); + Status = IoPageRead(Vacb->SharedCacheMap->FileObject, Mdl, &VacbOffset, &Event, &IoStatus); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -252,7 +252,7 @@ Vacb->Dirty = FALSE; VacbOffset.QuadPart = Vacb->FileOffset; - Size = (ULONG)(Vacb->Bcb->AllocationSize.QuadPart - Vacb->FileOffset); + Size = (ULONG)(Vacb->SharedCacheMap->AllocationSize.QuadPart - Vacb->FileOffset); if (Size > VACB_MAPPING_GRANULARITY) { Size = VACB_MAPPING_GRANULARITY; @@ -277,7 +277,7 @@ MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ; KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoSynchronousPageWrite(Vacb->Bcb->FileObject, Mdl, &VacbOffset, &Event, &IoStatus); + Status = IoSynchronousPageWrite(Vacb->SharedCacheMap->FileObject, Mdl, &VacbOffset, &Event, &IoStatus); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -331,7 +331,7 @@ PROS_VACB Vacb; BOOLEAN Valid; ULONG ReadLength = 0; - PBCB Bcb; + PROS_SHARED_CACHE_MAP SharedCacheMap; KIRQL oldirql; PLIST_ENTRY current_entry; PROS_VACB current; @@ -341,12 +341,12 @@ FileObject, FileOffset->QuadPart, Length, Wait, Buffer, IoStatus); - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; ReadOffset = (ULONG)FileOffset->QuadPart; DPRINT("AllocationSize %I64d, FileSize %I64d\n", - Bcb->AllocationSize.QuadPart, - Bcb->FileSize.QuadPart); + SharedCacheMap->AllocationSize.QuadPart, + SharedCacheMap->FileSize.QuadPart); /* * Check for the nowait case that all the cache VACBs that would @@ -354,19 +354,20 @@ */ if (!Wait) { - KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldirql); /* FIXME: this loop doesn't take into account areas that don't have * a VACB in the list yet */ - current_entry = Bcb->BcbVacbListHead.Flink; - while (current_entry != &Bcb->BcbVacbListHead) - { - current = CONTAINING_RECORD(current_entry, ROS_VACB, - BcbVacbListEntry); + current_entry = SharedCacheMap->CacheMapVacbListHead.Flink; + while (current_entry != &SharedCacheMap->CacheMapVacbListHead) + { + current = CONTAINING_RECORD(current_entry, + ROS_VACB, + CacheMapVacbListEntry); if (!current->Valid && DoRangesIntersect(current->FileOffset, VACB_MAPPING_GRANULARITY, ReadOffset, Length)) { - KeReleaseSpinLock(&Bcb->BcbLock, oldirql); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql); IoStatus->Status = STATUS_UNSUCCESSFUL; IoStatus->Information = 0; return FALSE; @@ -375,14 +376,14 @@ break; current_entry = current_entry->Flink; } - KeReleaseSpinLock(&Bcb->BcbLock, oldirql); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql); } TempLength = ReadOffset % VACB_MAPPING_GRANULARITY; if (TempLength != 0) { TempLength = min(Length, VACB_MAPPING_GRANULARITY - TempLength); - Status = CcRosRequestVacb(Bcb, + Status = CcRosRequestVacb(SharedCacheMap, ROUND_DOWN(ReadOffset, VACB_MAPPING_GRANULARITY), &BaseAddress, &Valid, &Vacb); @@ -400,14 +401,14 @@ { IoStatus->Information = 0; IoStatus->Status = Status; - CcRosReleaseVacb(Bcb, Vacb, FALSE, FALSE, FALSE); + CcRosReleaseVacb(SharedCacheMap, Vacb, FALSE, FALSE, FALSE); return FALSE; } } RtlCopyMemory(Buffer, (char*)BaseAddress + ReadOffset % VACB_MAPPING_GRANULARITY, TempLength); - CcRosReleaseVacb(Bcb, Vacb, TRUE, FALSE, FALSE); + CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, FALSE, FALSE); ReadLength += TempLength; Length -= TempLength; ReadOffset += TempLength; @@ -417,7 +418,7 @@ while (Length > 0) { TempLength = min(VACB_MAPPING_GRANULARITY, Length); - Status = ReadVacbChain(Bcb, ReadOffset, TempLength, Buffer); + Status = ReadVacbChain(SharedCacheMap, ReadOffset, TempLength, Buffer); if (!NT_SUCCESS(Status)) { IoStatus->Information = 0; @@ -454,7 +455,7 @@ NTSTATUS Status; ULONG WriteOffset; KIRQL oldirql; - PBCB Bcb; + PROS_SHARED_CACHE_MAP SharedCacheMap; PLIST_ENTRY current_entry; PROS_VACB Vacb; ULONG TempLength; @@ -465,26 +466,26 @@ "Length %lu, Wait %u, Buffer 0x%p)\n", FileObject, FileOffset->QuadPart, Length, Wait, Buffer); - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; WriteOffset = (ULONG)FileOffset->QuadPart; if (!Wait) { /* testing, if the requested datas are available */ - KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldirql); /* FIXME: this loop doesn't take into account areas that don't have * a VACB in the list yet */ - current_entry = Bcb->BcbVacbListHead.Flink; - while (current_entry != &Bcb->BcbVacbListHead) + current_entry = SharedCacheMap->CacheMapVacbListHead.Flink; + while (current_entry != &SharedCacheMap->CacheMapVacbListHead) { Vacb = CONTAINING_RECORD(current_entry, ROS_VACB, - BcbVacbListEntry); + CacheMapVacbListEntry); if (!Vacb->Valid && DoRangesIntersect(Vacb->FileOffset, VACB_MAPPING_GRANULARITY, WriteOffset, Length)) { - KeReleaseSpinLock(&Bcb->BcbLock, oldirql); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql); /* datas not available */ return FALSE; } @@ -492,7 +493,7 @@ break; current_entry = current_entry->Flink; } - KeReleaseSpinLock(&Bcb->BcbLock, oldirql); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql); } TempLength = WriteOffset % VACB_MAPPING_GRANULARITY; @@ -501,7 +502,7 @@ ULONG ROffset; ROffset = ROUND_DOWN(WriteOffset, VACB_MAPPING_GRANULARITY); TempLength = min(Length, VACB_MAPPING_GRANULARITY - TempLength); - Status = CcRosRequestVacb(Bcb, ROffset, + Status = CcRosRequestVacb(SharedCacheMap, ROffset, &BaseAddress, &Valid, &Vacb); if (!NT_SUCCESS(Status)) { @@ -517,7 +518,7 @@ RtlCopyMemory((char*)BaseAddress + WriteOffset % VACB_MAPPING_GRANULARITY, Buffer, TempLength); - CcRosReleaseVacb(Bcb, Vacb, TRUE, TRUE, FALSE); + CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, TRUE, FALSE); Length -= TempLength; WriteOffset += TempLength; @@ -528,7 +529,7 @@ while (Length > 0) { TempLength = min(VACB_MAPPING_GRANULARITY, Length); - Status = CcRosRequestVacb(Bcb, + Status = CcRosRequestVacb(SharedCacheMap, WriteOffset, &BaseAddress, &Valid, @@ -541,12 +542,12 @@ { if (!NT_SUCCESS(CcReadVirtualAddress(Vacb))) { - CcRosReleaseVacb(Bcb, Vacb, FALSE, FALSE, FALSE); + CcRosReleaseVacb(SharedCacheMap, Vacb, FALSE, FALSE, FALSE); return FALSE; } } RtlCopyMemory(BaseAddress, Buffer, TempLength); - CcRosReleaseVacb(Bcb, Vacb, TRUE, TRUE, FALSE); + CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, TRUE, FALSE); Length -= TempLength; WriteOffset += TempLength; @@ -684,29 +685,29 @@ { /* File is cached */ KIRQL oldirql; - PBCB Bcb; + PROS_SHARED_CACHE_MAP SharedCacheMap; PLIST_ENTRY current_entry; PROS_VACB Vacb, current, previous; ULONG TempLength; - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; if (!Wait) { /* testing, if the requested datas are available */ - KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldirql); /* FIXME: this loop doesn't take into account areas that don't have * a VACB in the list yet */ - current_entry = Bcb->BcbVacbListHead.Flink; - while (current_entry != &Bcb->BcbVacbListHead) + current_entry = SharedCacheMap->CacheMapVacbListHead.Flink; + while (current_entry != &SharedCacheMap->CacheMapVacbListHead) { Vacb = CONTAINING_RECORD(current_entry, ROS_VACB, - BcbVacbListEntry); + CacheMapVacbListEntry); if (!Vacb->Valid && DoRangesIntersect(Vacb->FileOffset, VACB_MAPPING_GRANULARITY, WriteOffset.u.LowPart, Length)) { - KeReleaseSpinLock(&Bcb->BcbLock, oldirql); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql); /* datas not available */ return FALSE; } @@ -714,7 +715,7 @@ break; current_entry = current_entry->Flink; } - KeReleaseSpinLock(&Bcb->BcbLock, oldirql); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql); } while (Length > 0) @@ -729,7 +730,7 @@ { CurrentLength = Length; } - Status = CcRosGetVacbChain(Bcb, WriteOffset.u.LowPart - Offset, + Status = CcRosGetVacbChain(SharedCacheMap, WriteOffset.u.LowPart - Offset, Offset + CurrentLength, &Vacb); if (!NT_SUCCESS(Status)) { @@ -774,7 +775,7 @@ { previous = current; current = current->NextInChain; - CcRosReleaseVacb(Bcb, previous, TRUE, TRUE, FALSE); + CcRosReleaseVacb(SharedCacheMap, previous, TRUE, TRUE, FALSE); } } } Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=62713… ============================================================================== --- trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Sat Apr 12 10:59:48 2014 @@ -52,7 +52,7 @@ IN PVOID Bcb) { PINTERNAL_BCB iBcb = (PINTERNAL_BCB)Bcb; - return iBcb->Vacb->Bcb->FileObject; + return iBcb->Vacb->SharedCacheMap->FileObject; } /* @@ -128,7 +128,7 @@ IN PCC_FILE_SIZES FileSizes) { KIRQL oldirql; - PBCB Bcb; + PROS_SHARED_CACHE_MAP SharedCacheMap; PLIST_ENTRY current_entry; PROS_VACB current; LIST_ENTRY FreeListHead; @@ -141,33 +141,33 @@ FileSizes->FileSize.QuadPart, FileSizes->ValidDataLength.QuadPart); - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; /* * It is valid to call this function on file objects that weren't * initialized for caching. In this case it's simple no-op. */ - if (Bcb == NULL) + if (SharedCacheMap == NULL) return; - if (FileSizes->AllocationSize.QuadPart < Bcb->AllocationSize.QuadPart) + if (FileSizes->AllocationSize.QuadPart < SharedCacheMap->AllocationSize.QuadPart) { InitializeListHead(&FreeListHead); KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); - - current_entry = Bcb->BcbVacbListHead.Flink; - while (current_entry != &Bcb->BcbVacbListHead) + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldirql); + + current_entry = SharedCacheMap->CacheMapVacbListHead.Flink; + while (current_entry != &SharedCacheMap->CacheMapVacbListHead) { current = CONTAINING_RECORD(current_entry, ROS_VACB, - BcbVacbListEntry); + CacheMapVacbListEntry); current_entry = current_entry->Flink; if (current->FileOffset >= FileSizes->AllocationSize.QuadPart) { if ((current->ReferenceCount == 0) || ((current->ReferenceCount == 1) && current->Dirty)) { - RemoveEntryList(&current->BcbVacbListEntry); + RemoveEntryList(&current->CacheMapVacbListEntry); RemoveEntryList(&current->VacbListEntry); RemoveEntryList(&current->VacbLruListEntry); if (current->Dirty) @@ -175,7 +175,7 @@ RemoveEntryList(&current->DirtyVacbListEntry); DirtyPageCount -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; } - InsertHeadList(&FreeListHead, &current->BcbVacbListEntry); + InsertHeadList(&FreeListHead, &current->CacheMapVacbListEntry); } else { @@ -185,15 +185,15 @@ } } - Bcb->AllocationSize = FileSizes->AllocationSize; - Bcb->FileSize = FileSizes->FileSize; - KeReleaseSpinLock(&Bcb->BcbLock, oldirql); + SharedCacheMap->AllocationSize = FileSizes->AllocationSize; + SharedCacheMap->FileSize = FileSizes->FileSize; + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql); KeReleaseGuardedMutex(&ViewLock); current_entry = FreeListHead.Flink; while(current_entry != &FreeListHead) { - current = CONTAINING_RECORD(current_entry, ROS_VACB, BcbVacbListEntry); + current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); current_entry = current_entry->Flink; Status = CcRosInternalFreeVacb(current); if (!NT_SUCCESS(Status)) @@ -205,10 +205,10 @@ } else { - KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); - Bcb->AllocationSize = FileSizes->AllocationSize; - Bcb->FileSize = FileSizes->FileSize; - KeReleaseSpinLock(&Bcb->BcbLock, oldirql); + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldirql); + SharedCacheMap->AllocationSize = FileSizes->AllocationSize; + SharedCacheMap->FileSize = FileSizes->FileSize; + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql); } } @@ -249,14 +249,14 @@ IN PFILE_OBJECT FileObject, IN PCC_FILE_SIZES FileSizes) { - PBCB Bcb; - - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - - if (!Bcb) + PROS_SHARED_CACHE_MAP SharedCacheMap; + + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; + + if (!SharedCacheMap) return FALSE; - FileSizes->AllocationSize = Bcb->AllocationSize; - FileSizes->FileSize = FileSizes->ValidDataLength = Bcb->FileSize; + FileSizes->AllocationSize = SharedCacheMap->AllocationSize; + FileSizes->FileSize = FileSizes->ValidDataLength = SharedCacheMap->FileSize; return TRUE; } Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=6271… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Sat Apr 12 10:59:48 2014 @@ -34,7 +34,7 @@ { ULONG ReadOffset; BOOLEAN Valid; - PBCB Bcb; + PROS_SHARED_CACHE_MAP SharedCacheMap; PROS_VACB Vacb; NTSTATUS Status; PINTERNAL_BCB iBcb; @@ -50,12 +50,12 @@ ASSERT(FileObject->SectionObjectPointer); ASSERT(FileObject->SectionObjectPointer->SharedCacheMap); - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - ASSERT(Bcb); + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; + ASSERT(SharedCacheMap); DPRINT("AllocationSize %I64x, FileSize %I64x\n", - Bcb->AllocationSize.QuadPart, - Bcb->FileSize.QuadPart); + SharedCacheMap->AllocationSize.QuadPart, + SharedCacheMap->FileSize.QuadPart); if (ReadOffset % VACB_MAPPING_GRANULARITY + Length > VACB_MAPPING_GRANULARITY) { @@ -63,7 +63,7 @@ } ROffset = ROUND_DOWN(ReadOffset, VACB_MAPPING_GRANULARITY); - Status = CcRosRequestVacb(Bcb, + Status = CcRosRequestVacb(SharedCacheMap, ROffset, pBuffer, &Valid, @@ -77,13 +77,13 @@ { if (!(Flags & MAP_WAIT)) { - CcRosReleaseVacb(Bcb, Vacb, FALSE, FALSE, FALSE); + CcRosReleaseVacb(SharedCacheMap, Vacb, FALSE, FALSE, FALSE); return FALSE; } if (!NT_SUCCESS(CcReadVirtualAddress(Vacb))) { - CcRosReleaseVacb(Bcb, Vacb, FALSE, FALSE, FALSE); + CcRosReleaseVacb(SharedCacheMap, Vacb, FALSE, FALSE, FALSE); return FALSE; } } @@ -92,7 +92,7 @@ iBcb = ExAllocateFromNPagedLookasideList(&iBcbLookasideList); if (iBcb == NULL) { - CcRosReleaseVacb(Bcb, Vacb, TRUE, FALSE, FALSE); + CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, FALSE, FALSE); return FALSE; } @@ -195,7 +195,7 @@ { PINTERNAL_BCB iBcb = Bcb; - CcRosReleaseVacb(iBcb->Vacb->Bcb, + CcRosReleaseVacb(iBcb->Vacb->SharedCacheMap, iBcb->Vacb, TRUE, iBcb->Dirty, Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=627… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Apr 12 10:59:48 2014 @@ -49,14 +49,14 @@ KGUARDED_MUTEX ViewLock; NPAGED_LOOKASIDE_LIST iBcbLookasideList; -static NPAGED_LOOKASIDE_LIST BcbLookasideList; +static NPAGED_LOOKASIDE_LIST SharedCacheMapLookasideList; static NPAGED_LOOKASIDE_LIST VacbLookasideList; #if DBG static void CcRosVacbIncRefCount_(PROS_VACB vacb, const char* file, int line) { ++vacb->ReferenceCount; - if (vacb->Bcb->Trace) + if (vacb->SharedCacheMap->Trace) { DbgPrint("(%s:%i) VACB %p ++RefCount=%lu, Dirty %u, PageOut %lu\n", file, line, vacb, vacb->ReferenceCount, vacb->Dirty, vacb->PageOut); @@ -65,7 +65,7 @@ static void CcRosVacbDecRefCount_(PROS_VACB vacb, const char* file, int line) { --vacb->ReferenceCount; - if (vacb->Bcb->Trace) + if (vacb->SharedCacheMap->Trace) { DbgPrint("(%s:%i) VACB %p --RefCount=%lu, Dirty %u, PageOut %lu\n", file, line, vacb, vacb->ReferenceCount, vacb->Dirty, vacb->PageOut); @@ -87,7 +87,7 @@ VOID NTAPI CcRosTraceCacheMap ( - PBCB Bcb, + PROS_SHARED_CACHE_MAP SharedCacheMap, BOOLEAN Trace ) { #if DBG @@ -95,38 +95,38 @@ PLIST_ENTRY current_entry; PROS_VACB current; - if ( !Bcb ) + if (!SharedCacheMap) return; - Bcb->Trace = Trace; - - if ( Trace ) - { - DPRINT1("Enabling Tracing for CacheMap 0x%p:\n", Bcb ); + SharedCacheMap->Trace = Trace; + + if (Trace) + { + DPRINT1("Enabling Tracing for CacheMap 0x%p:\n", SharedCacheMap); KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); - - current_entry = Bcb->BcbVacbListHead.Flink; - while (current_entry != &Bcb->BcbVacbListHead) - { - current = CONTAINING_RECORD(current_entry, ROS_VACB, BcbVacbListEntry); + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldirql); + + current_entry = SharedCacheMap->CacheMapVacbListHead.Flink; + while (current_entry != &SharedCacheMap->CacheMapVacbListHead) + { + current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); current_entry = current_entry->Flink; DPRINT1(" VACB 0x%p enabled, RefCount %lu, Dirty %u, PageOut %lu\n", current, current->ReferenceCount, current->Dirty, current->PageOut ); } - KeReleaseSpinLock(&Bcb->BcbLock, oldirql); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql); KeReleaseGuardedMutex(&ViewLock); } else { - DPRINT1("Disabling Tracing for CacheMap 0x%p:\n", Bcb ); + DPRINT1("Disabling Tracing for CacheMap 0x%p:\n", SharedCacheMap); } #else - Bcb = Bcb; - Trace = Trace; + UNREFERENCED_PARAMETER(SharedCacheMap); + UNREFERENCED_PARAMETER(Trace); #endif } @@ -142,14 +142,14 @@ if (NT_SUCCESS(Status)) { KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&Vacb->Bcb->BcbLock, &oldIrql); + KeAcquireSpinLock(&Vacb->SharedCacheMap->CacheMapLock, &oldIrql); Vacb->Dirty = FALSE; RemoveEntryList(&Vacb->DirtyVacbListEntry); DirtyPageCount -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; CcRosVacbDecRefCount(Vacb); - KeReleaseSpinLock(&Vacb->Bcb->BcbLock, oldIrql); + KeReleaseSpinLock(&Vacb->SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); } @@ -192,8 +192,8 @@ CcRosVacbIncRefCount(current); - Locked = current->Bcb->Callbacks->AcquireForLazyWrite( - current->Bcb->LazyWriteContext, Wait); + Locked = current->SharedCacheMap->Callbacks->AcquireForLazyWrite( + current->SharedCacheMap->LazyWriteContext, Wait); if (!Locked) { CcRosVacbDecRefCount(current); @@ -207,8 +207,8 @@ Wait ? NULL : &ZeroTimeout); if (Status != STATUS_SUCCESS) { - current->Bcb->Callbacks->ReleaseFromLazyWrite( - current->Bcb->LazyWriteContext); + current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( + current->SharedCacheMap->LazyWriteContext); CcRosVacbDecRefCount(current); continue; } @@ -219,8 +219,8 @@ if (current->ReferenceCount > 2) { KeReleaseMutex(&current->Mutex, FALSE); - current->Bcb->Callbacks->ReleaseFromLazyWrite( - current->Bcb->LazyWriteContext); + current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( + current->SharedCacheMap->LazyWriteContext); CcRosVacbDecRefCount(current); continue; } @@ -230,8 +230,8 @@ Status = CcRosFlushVacb(current); KeReleaseMutex(&current->Mutex, FALSE); - current->Bcb->Callbacks->ReleaseFromLazyWrite( - current->Bcb->LazyWriteContext); + current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( + current->SharedCacheMap->LazyWriteContext); KeAcquireGuardedMutex(&ViewLock); CcRosVacbDecRefCount(current); @@ -296,7 +296,7 @@ VacbLruListEntry); current_entry = current_entry->Flink; - KeAcquireSpinLock(&current->Bcb->BcbLock, &oldIrql); + KeAcquireSpinLock(&current->SharedCacheMap->CacheMapLock, &oldIrql); /* Reference the VACB */ CcRosVacbIncRefCount(current); @@ -305,7 +305,7 @@ if (current->MappedCount > 0 && !current->Dirty) { /* We have to break these locks because Cc sucks */ - KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); + KeReleaseSpinLock(&current->SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); /* Page out the VACB */ @@ -318,7 +318,7 @@ /* Reacquire the locks */ KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&current->Bcb->BcbLock, &oldIrql); + KeAcquireSpinLock(&current->SharedCacheMap->CacheMapLock, &oldIrql); } /* Dereference the VACB */ @@ -330,10 +330,10 @@ ASSERT(!current->Dirty); ASSERT(!current->MappedCount); - RemoveEntryList(&current->BcbVacbListEntry); + RemoveEntryList(&current->CacheMapVacbListEntry); RemoveEntryList(&current->VacbListEntry); RemoveEntryList(&current->VacbLruListEntry); - InsertHeadList(&FreeList, &current->BcbVacbListEntry); + InsertHeadList(&FreeList, &current->CacheMapVacbListEntry); /* Calculate how many pages we freed for Mm */ PagesFreed = min(VACB_MAPPING_GRANULARITY / PAGE_SIZE, Target); @@ -341,7 +341,7 @@ (*NrFreed) += PagesFreed; } - KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); + KeReleaseSpinLock(&current->SharedCacheMap->CacheMapLock, oldIrql); } KeReleaseGuardedMutex(&ViewLock); @@ -370,7 +370,7 @@ current_entry = RemoveHeadList(&FreeList); current = CONTAINING_RECORD(current_entry, ROS_VACB, - BcbVacbListEntry); + CacheMapVacbListEntry); CcRosInternalFreeVacb(current); } @@ -382,7 +382,7 @@ NTSTATUS NTAPI CcRosReleaseVacb ( - PBCB Bcb, + PROS_SHARED_CACHE_MAP SharedCacheMap, PROS_VACB Vacb, BOOLEAN Valid, BOOLEAN Dirty, @@ -391,13 +391,13 @@ BOOLEAN WasDirty; KIRQL oldIrql; - ASSERT(Bcb); - - DPRINT("CcRosReleaseVacb(Bcb 0x%p, Vacb 0x%p, Valid %u)\n", - Bcb, Vacb, Valid); - - KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); + ASSERT(SharedCacheMap); + + DPRINT("CcRosReleaseVacb(SharedCacheMap 0x%p, Vacb 0x%p, Valid %u)\n", + SharedCacheMap, Vacb, Valid); + + KeAcquireGuardedMutex(&ViewLock); + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); Vacb->Valid = Valid; @@ -424,7 +424,7 @@ CcRosVacbIncRefCount(Vacb); } - KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); KeReleaseMutex(&Vacb->Mutex, FALSE); @@ -435,31 +435,32 @@ PROS_VACB NTAPI CcRosLookupVacb ( - PBCB Bcb, + PROS_SHARED_CACHE_MAP SharedCacheMap, ULONG FileOffset) { PLIST_ENTRY current_entry; PROS_VACB current; KIRQL oldIrql; - ASSERT(Bcb); - - DPRINT("CcRosLookupVacb(Bcb -x%p, FileOffset %lu)\n", Bcb, FileOffset); - - KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - - current_entry = Bcb->BcbVacbListHead.Flink; - while (current_entry != &Bcb->BcbVacbListHead) + ASSERT(SharedCacheMap); + + DPRINT("CcRosLookupVacb(SharedCacheMap 0x%p, FileOffset %lu)\n", + SharedCacheMap, FileOffset); + + KeAcquireGuardedMutex(&ViewLock); + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); + + current_entry = SharedCacheMap->CacheMapVacbListHead.Flink; + while (current_entry != &SharedCacheMap->CacheMapVacbListHead) { current = CONTAINING_RECORD(current_entry, ROS_VACB, - BcbVacbListEntry); + CacheMapVacbListEntry); if (IsPointInRange(current->FileOffset, VACB_MAPPING_GRANULARITY, FileOffset)) { CcRosVacbIncRefCount(current); - KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); KeWaitForSingleObject(&current->Mutex, Executive, @@ -473,7 +474,7 @@ current_entry = current_entry->Flink; } - KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); return NULL; @@ -482,24 +483,25 @@ NTSTATUS NTAPI CcRosMarkDirtyVacb ( - PBCB Bcb, + PROS_SHARED_CACHE_MAP SharedCacheMap, ULONG FileOffset) { PROS_VACB Vacb; KIRQL oldIrql; - ASSERT(Bcb); - - DPRINT("CcRosMarkDirtyVacb(Bcb 0x%p, FileOffset %lu)\n", Bcb, FileOffset); - - Vacb = CcRosLookupVacb(Bcb, FileOffset); + ASSERT(SharedCacheMap); + + DPRINT("CcRosMarkDirtyVacb(SharedCacheMap 0x%p, FileOffset %lu)\n", + SharedCacheMap, FileOffset); + + Vacb = CcRosLookupVacb(SharedCacheMap, FileOffset); if (Vacb == NULL) { KeBugCheck(CACHE_MANAGER); } KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); if (!Vacb->Dirty) { @@ -517,7 +519,7 @@ Vacb->Dirty = TRUE; - KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); KeReleaseMutex(&Vacb->Mutex, FALSE); @@ -527,7 +529,7 @@ NTSTATUS NTAPI CcRosUnmapVacb ( - PBCB Bcb, + PROS_SHARED_CACHE_MAP SharedCacheMap, ULONG FileOffset, BOOLEAN NowDirty) { @@ -535,19 +537,19 @@ BOOLEAN WasDirty; KIRQL oldIrql; - ASSERT(Bcb); - - DPRINT("CcRosUnmapVacb(Bcb 0x%p, FileOffset %lu, NowDirty %u)\n", - Bcb, FileOffset, NowDirty); - - Vacb = CcRosLookupVacb(Bcb, FileOffset); + ASSERT(SharedCacheMap); + + DPRINT("CcRosUnmapVacb(SharedCacheMap 0x%p, FileOffset %lu, NowDirty %u)\n", + SharedCacheMap, FileOffset, NowDirty); + + Vacb = CcRosLookupVacb(SharedCacheMap, FileOffset); if (Vacb == NULL) { return STATUS_UNSUCCESSFUL; } KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); WasDirty = Vacb->Dirty; Vacb->Dirty = Vacb->Dirty || NowDirty; @@ -570,7 +572,7 @@ CcRosVacbDecRefCount(Vacb); } - KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); KeReleaseMutex(&Vacb->Mutex, FALSE); @@ -580,7 +582,7 @@ static NTSTATUS CcRosCreateVacb ( - PBCB Bcb, + PROS_SHARED_CACHE_MAP SharedCacheMap, ULONG FileOffset, PROS_VACB *Vacb) { @@ -590,11 +592,11 @@ NTSTATUS Status; KIRQL oldIrql; - ASSERT(Bcb); + ASSERT(SharedCacheMap); DPRINT("CcRosCreateVacb()\n"); - if (FileOffset >= Bcb->FileSize.u.LowPart) + if (FileOffset >= SharedCacheMap->FileSize.u.LowPart) { *Vacb = NULL; return STATUS_INVALID_PARAMETER; @@ -605,11 +607,11 @@ current->Dirty = FALSE; current->PageOut = FALSE; current->FileOffset = ROUND_DOWN(FileOffset, VACB_MAPPING_GRANULARITY); - current->Bcb = Bcb; + current->SharedCacheMap = SharedCacheMap; #if DBG - if ( Bcb->Trace ) - { - DPRINT1("CacheMap 0x%p: new VACB: 0x%p\n", Bcb, current ); + if (SharedCacheMap->Trace) + { + DPRINT1("CacheMap 0x%p: new VACB: 0x%p\n", SharedCacheMap, current); } #endif current->MappedCount = 0; @@ -630,26 +632,26 @@ * file offset exist. If there is a VACB, we release * our newly created VACB and return the existing one. */ - KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - current_entry = Bcb->BcbVacbListHead.Flink; + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); + current_entry = SharedCacheMap->CacheMapVacbListHead.Flink; previous = NULL; - while (current_entry != &Bcb->BcbVacbListHead) + while (current_entry != &SharedCacheMap->CacheMapVacbListHead) { current = CONTAINING_RECORD(current_entry, ROS_VACB, - BcbVacbListEntry); + CacheMapVacbListEntry); if (IsPointInRange(current->FileOffset, VACB_MAPPING_GRANULARITY, FileOffset)) { CcRosVacbIncRefCount(current); - KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); #if DBG - if ( Bcb->Trace ) + if (SharedCacheMap->Trace) { DPRINT1("CacheMap 0x%p: deleting newly created VACB 0x%p ( found existing one 0x%p )\n", - Bcb, + SharedCacheMap, (*Vacb), - current ); + current); } #endif KeReleaseMutex(&(*Vacb)->Mutex, FALSE); @@ -677,13 +679,13 @@ current = *Vacb; if (previous) { - InsertHeadList(&previous->BcbVacbListEntry, &current->BcbVacbListEntry); + InsertHeadList(&previous->CacheMapVacbListEntry, &current->CacheMapVacbListEntry); } else { - InsertHeadList(&Bcb->BcbVacbListHead, &current->BcbVacbListEntry); - } - KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + InsertHeadList(&SharedCacheMap->CacheMapVacbListHead, &current->CacheMapVacbListEntry); + } + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); InsertTailList(&VacbListHead, &current->VacbListEntry); InsertTailList(&VacbLruListHead, &current->VacbLruListEntry); KeReleaseGuardedMutex(&ViewLock); @@ -710,9 +712,9 @@ #if MI_TRACE_PFNS PWCHAR pos = NULL; ULONG len = 0; - if ((Bcb->FileObject) && (Bcb->FileObject->FileName.Buffer)) - { - pos = wcsrchr(Bcb->FileObject->FileName.Buffer, '\\'); + if ((SharedCacheMap->FileObject) && (SharedCacheMap->FileObject->FileName.Buffer)) + { + pos = wcsrchr(SharedCacheMap->FileObject->FileName.Buffer, '\\'); len = wcslen(pos) * sizeof(WCHAR); if (pos) snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%S", pos); } @@ -727,7 +729,7 @@ NTSTATUS NTAPI CcRosGetVacbChain ( - PBCB Bcb, + PROS_SHARED_CACHE_MAP SharedCacheMap, ULONG FileOffset, ULONG Length, PROS_VACB *Vacb) @@ -737,7 +739,7 @@ PROS_VACB *VacbList; PROS_VACB Previous = NULL; - ASSERT(Bcb); + ASSERT(SharedCacheMap); DPRINT("CcRosGetVacbChain()\n"); @@ -752,7 +754,7 @@ for (i = 0; i < (Length / VACB_MAPPING_GRANULARITY); i++) { ULONG CurrentOffset = FileOffset + (i * VACB_MAPPING_GRANULARITY); - current = CcRosLookupVacb(Bcb, CurrentOffset); + current = CcRosLookupVacb(SharedCacheMap, CurrentOffset); if (current != NULL) { KeAcquireGuardedMutex(&ViewLock); @@ -767,7 +769,7 @@ } else { - CcRosCreateVacb(Bcb, CurrentOffset, &current); + CcRosCreateVacb(SharedCacheMap, CurrentOffset, &current); VacbList[i] = current; } } @@ -794,7 +796,7 @@ NTSTATUS NTAPI CcRosGetVacb ( - PBCB Bcb, + PROS_SHARED_CACHE_MAP SharedCacheMap, ULONG FileOffset, PULONG BaseOffset, PVOID* BaseAddress, @@ -804,20 +806,20 @@ PROS_VACB current; NTSTATUS Status; - ASSERT(Bcb); + ASSERT(SharedCacheMap); DPRINT("CcRosGetVacb()\n"); /* * Look for a VACB already mapping the same data. */ - current = CcRosLookupVacb(Bcb, FileOffset); + current = CcRosLookupVacb(SharedCacheMap, FileOffset); if (current == NULL) { /* * Otherwise create a new VACB. */ - Status = CcRosCreateVacb(Bcb, FileOffset, &current); + Status = CcRosCreateVacb(SharedCacheMap, FileOffset, &current); if (!NT_SUCCESS(Status)) { return Status; @@ -846,18 +848,18 @@ NTSTATUS NTAPI CcRosRequestVacb ( - PBCB Bcb, + PROS_SHARED_CACHE_MAP SharedCacheMap, ULONG FileOffset, PVOID* BaseAddress, PBOOLEAN UptoDate, PROS_VACB *Vacb) /* - * FUNCTION: Request a page mapping for a BCB + * FUNCTION: Request a page mapping for a shared cache map */ { ULONG BaseOffset; - ASSERT(Bcb); + ASSERT(SharedCacheMap); if (FileOffset % VACB_MAPPING_GRANULARITY != 0) { @@ -866,7 +868,7 @@ KeBugCheck(CACHE_MANAGER); } - return CcRosGetVacb(Bcb, + return CcRosGetVacb(SharedCacheMap, FileOffset, &BaseOffset, BaseAddress, @@ -896,14 +898,14 @@ CcRosInternalFreeVacb ( PROS_VACB Vacb) /* - * FUNCTION: Releases a VACB associated with a BCB + * FUNCTION: Releases a VACB associated with a shared cache map */ { DPRINT("Freeing VACB 0x%p\n", Vacb); #if DBG - if (Vacb->Bcb->Trace) - { - DPRINT1("CacheMap 0x%p: deleting VACB: 0x%p\n", Vacb->Bcb, Vacb); + if (Vacb->SharedCacheMap->Trace) + { + DPRINT1("CacheMap 0x%p: deleting VACB: 0x%p\n", Vacb->SharedCacheMap, Vacb); } #endif @@ -929,7 +931,7 @@ IN ULONG Length, OUT PIO_STATUS_BLOCK IoStatus) { - PBCB Bcb; + PROS_SHARED_CACHE_MAP SharedCacheMap; LARGE_INTEGER Offset; PROS_VACB current; NTSTATUS Status; @@ -940,8 +942,8 @@ if (SectionObjectPointers && SectionObjectPointers->SharedCacheMap) { - Bcb = (PBCB)SectionObjectPointers->SharedCacheMap; - ASSERT(Bcb); + SharedCacheMap = SectionObjectPointers->SharedCacheMap; + ASSERT(SharedCacheMap); if (FileOffset) { Offset = *FileOffset; @@ -949,7 +951,7 @@ else { Offset.QuadPart = (LONGLONG)0; - Length = Bcb->FileSize.u.LowPart; + Length = SharedCacheMap->FileSize.u.LowPart; } if (IoStatus) @@ -960,7 +962,7 @@ while (Length > 0) { - current = CcRosLookupVacb(Bcb, Offset.u.LowPart); + current = CcRosLookupVacb(SharedCacheMap, Offset.u.LowPart); if (current != NULL) { if (current->Dirty) @@ -974,9 +976,9 @@ KeReleaseMutex(&current->Mutex, FALSE); KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); CcRosVacbDecRefCount(current); - KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); } @@ -1004,9 +1006,9 @@ NTAPI CcRosDeleteFileCache ( PFILE_OBJECT FileObject, - PBCB Bcb) + PROS_SHARED_CACHE_MAP SharedCacheMap) /* - * FUNCTION: Releases the BCB associated with a file object + * FUNCTION: Releases the shared cache map associated with a file object */ { PLIST_ENTRY current_entry; @@ -1014,16 +1016,16 @@ LIST_ENTRY FreeList; KIRQL oldIrql; - ASSERT(Bcb); - - Bcb->RefCount++; + ASSERT(SharedCacheMap); + + SharedCacheMap->RefCount++; KeReleaseGuardedMutex(&ViewLock); CcFlushCache(FileObject->SectionObjectPointer, NULL, 0, NULL); KeAcquireGuardedMutex(&ViewLock); - Bcb->RefCount--; - if (Bcb->RefCount == 0) + SharedCacheMap->RefCount--; + if (SharedCacheMap->RefCount == 0) { FileObject->SectionObjectPointer->SharedCacheMap = NULL; @@ -1031,11 +1033,11 @@ * Release all VACBs */ InitializeListHead(&FreeList); - KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - while (!IsListEmpty(&Bcb->BcbVacbListHead)) - { - current_entry = RemoveTailList(&Bcb->BcbVacbListHead); - current = CONTAINING_RECORD(current_entry, ROS_VACB, BcbVacbListEntry); + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); + while (!IsListEmpty(&SharedCacheMap->CacheMapVacbListHead)) + { + current_entry = RemoveTailList(&SharedCacheMap->CacheMapVacbListHead); + current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); RemoveEntryList(&current->VacbListEntry); RemoveEntryList(&current->VacbLruListEntry); if (current->Dirty) @@ -1044,23 +1046,23 @@ DirtyPageCount -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; DPRINT1("Freeing dirty VACB\n"); } - InsertHeadList(&FreeList, &current->BcbVacbListEntry); + InsertHeadList(&FreeList, &current->CacheMapVacbListEntry); } #if DBG - Bcb->Trace = FALSE; + SharedCacheMap->Trace = FALSE; #endif - KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - ObDereferenceObject (Bcb->FileObject); + ObDereferenceObject(SharedCacheMap->FileObject); while (!IsListEmpty(&FreeList)) { current_entry = RemoveTailList(&FreeList); - current = CONTAINING_RECORD(current_entry, ROS_VACB, BcbVacbListEntry); + current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); CcRosInternalFreeVacb(current); } - ExFreeToNPagedLookasideList(&BcbLookasideList, Bcb); + ExFreeToNPagedLookasideList(&SharedCacheMapLookasideList, SharedCacheMap); KeAcquireGuardedMutex(&ViewLock); } return STATUS_SUCCESS; @@ -1071,12 +1073,12 @@ CcRosReferenceCache ( PFILE_OBJECT FileObject) { - PBCB Bcb; - KeAcquireGuardedMutex(&ViewLock); - Bcb = (PBCB)FileObject->SectionObjectPointer->SharedCacheMap; - ASSERT(Bcb); - ASSERT(Bcb->RefCount != 0); - Bcb->RefCount++; + PROS_SHARED_CACHE_MAP SharedCacheMap; + KeAcquireGuardedMutex(&ViewLock); + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; + ASSERT(SharedCacheMap); + ASSERT(SharedCacheMap->RefCount != 0); + SharedCacheMap->RefCount++; KeReleaseGuardedMutex(&ViewLock); } @@ -1085,13 +1087,13 @@ CcRosRemoveIfClosed ( PSECTION_OBJECT_POINTERS SectionObjectPointer) { - PBCB Bcb; + PROS_SHARED_CACHE_MAP SharedCacheMap; DPRINT("CcRosRemoveIfClosed()\n"); KeAcquireGuardedMutex(&ViewLock); - Bcb = (PBCB)SectionObjectPointer->SharedCacheMap; - if (Bcb && Bcb->RefCount == 0) - { - CcRosDeleteFileCache(Bcb->FileObject, Bcb); + SharedCacheMap = SectionObjectPointer->SharedCacheMap; + if (SharedCacheMap && SharedCacheMap->RefCount == 0) + { + CcRosDeleteFileCache(SharedCacheMap->FileObject, SharedCacheMap); } KeReleaseGuardedMutex(&ViewLock); } @@ -1102,17 +1104,17 @@ CcRosDereferenceCache ( PFILE_OBJECT FileObject) { - PBCB Bcb; - KeAcquireGuardedMutex(&ViewLock); - Bcb = (PBCB)FileObject->SectionObjectPointer->SharedCacheMap; - ASSERT(Bcb); - if (Bcb->RefCount > 0) - { - Bcb->RefCount--; - if (Bcb->RefCount == 0) - { - MmFreeSectionSegments(Bcb->FileObject); - CcRosDeleteFileCache(FileObject, Bcb); + PROS_SHARED_CACHE_MAP SharedCacheMap; + KeAcquireGuardedMutex(&ViewLock); + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; + ASSERT(SharedCacheMap); + if (SharedCacheMap->RefCount > 0) + { + SharedCacheMap->RefCount--; + if (SharedCacheMap->RefCount == 0) + { + MmFreeSectionSegments(SharedCacheMap->FileObject); + CcRosDeleteFileCache(FileObject, SharedCacheMap); } } KeReleaseGuardedMutex(&ViewLock); @@ -1127,23 +1129,23 @@ * has been closed. */ { - PBCB Bcb; + PROS_SHARED_CACHE_MAP SharedCacheMap; KeAcquireGuardedMutex(&ViewLock); if (FileObject->SectionObjectPointer->SharedCacheMap != NULL) { - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; if (FileObject->PrivateCacheMap != NULL) { FileObject->PrivateCacheMap = NULL; - if (Bcb->RefCount > 0) + if (SharedCacheMap->RefCount > 0) { - Bcb->RefCount--; - if (Bcb->RefCount == 0) + SharedCacheMap->RefCount--; + if (SharedCacheMap->RefCount == 0) { - MmFreeSectionSegments(Bcb->FileObject); - CcRosDeleteFileCache(FileObject, Bcb); + MmFreeSectionSegments(SharedCacheMap->FileObject); + CcRosDeleteFileCache(FileObject, SharedCacheMap); } } } @@ -1157,14 +1159,14 @@ CcTryToInitializeFileCache ( PFILE_OBJECT FileObject) { - PBCB Bcb; + PROS_SHARED_CACHE_MAP SharedCacheMap; NTSTATUS Status; KeAcquireGuardedMutex(&ViewLock); ASSERT(FileObject->SectionObjectPointer); - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - if (Bcb == NULL) + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; + if (SharedCacheMap == NULL) { Status = STATUS_UNSUCCESSFUL; } @@ -1172,8 +1174,8 @@ { if (FileObject->PrivateCacheMap == NULL) { - FileObject->PrivateCacheMap = Bcb; - Bcb->RefCount++; + FileObject->PrivateCacheMap = SharedCacheMap; + SharedCacheMap->RefCount++; } Status = STATUS_SUCCESS; } @@ -1190,47 +1192,47 @@ PCACHE_MANAGER_CALLBACKS CallBacks, PVOID LazyWriterContext) /* - * FUNCTION: Initializes a BCB for a file object + * FUNCTION: Initializes a shared cache map for a file object */ { - PBCB Bcb; - - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - DPRINT("CcRosInitializeFileCache(FileObject 0x%p, Bcb 0x%p)\n", - FileObject, Bcb); - - KeAcquireGuardedMutex(&ViewLock); - if (Bcb == NULL) - { - Bcb = ExAllocateFromNPagedLookasideList(&BcbLookasideList); - if (Bcb == NULL) + PROS_SHARED_CACHE_MAP SharedCacheMap; + + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; + DPRINT("CcRosInitializeFileCache(FileObject 0x%p, SharedCacheMap 0x%p)\n", + FileObject, SharedCacheMap); + + KeAcquireGuardedMutex(&ViewLock); + if (SharedCacheMap == NULL) + { + SharedCacheMap = ExAllocateFromNPagedLookasideList(&SharedCacheMapLookasideList); + if (SharedCacheMap == NULL) { KeReleaseGuardedMutex(&ViewLock); return STATUS_UNSUCCESSFUL; } - RtlZeroMemory(Bcb, sizeof(*Bcb)); + RtlZeroMemory(SharedCacheMap, sizeof(*SharedCacheMap)); ObReferenceObjectByPointer(FileObject, FILE_ALL_ACCESS, NULL, KernelMode); - Bcb->FileObject = FileObject; - Bcb->Callbacks = CallBacks; - Bcb->LazyWriteContext = LazyWriterContext; + SharedCacheMap->FileObject = FileObject; + SharedCacheMap->Callbacks = CallBacks; + SharedCacheMap->LazyWriteContext = LazyWriterContext; if (FileObject->FsContext) { - Bcb->AllocationSize = + SharedCacheMap->AllocationSize = ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->AllocationSize; - Bcb->FileSize = + SharedCacheMap->FileSize = ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->FileSize; } - KeInitializeSpinLock(&Bcb->BcbLock); - InitializeListHead(&Bcb->BcbVacbListHead); - FileObject->SectionObjectPointer->SharedCacheMap = Bcb; + KeInitializeSpinLock(&SharedCacheMap->CacheMapLock); + InitializeListHead(&SharedCacheMap->CacheMapVacbListHead); + FileObject->SectionObjectPointer->SharedCacheMap = SharedCacheMap; } if (FileObject->PrivateCacheMap == NULL) { - FileObject->PrivateCacheMap = Bcb; - Bcb->RefCount++; + FileObject->PrivateCacheMap = SharedCacheMap; + SharedCacheMap->RefCount++; } KeReleaseGuardedMutex(&ViewLock); @@ -1245,12 +1247,12 @@ CcGetFileObjectFromSectionPtrs ( IN PSECTION_OBJECT_POINTERS SectionObjectPointers) { - PBCB Bcb; + PROS_SHARED_CACHE_MAP SharedCacheMap; if (SectionObjectPointers && SectionObjectPointers->SharedCacheMap) { - Bcb = (PBCB)SectionObjectPointers->SharedCacheMap; - ASSERT(Bcb); - return Bcb->FileObject; + SharedCacheMap = SectionObjectPointers->SharedCacheMap; + ASSERT(SharedCacheMap); + return SharedCacheMap->FileObject; } return NULL; } @@ -1274,11 +1276,11 @@ sizeof(INTERNAL_BCB), TAG_IBCB, 20); - ExInitializeNPagedLookasideList (&BcbLookasideList, + ExInitializeNPagedLookasideList (&SharedCacheMapLookasideList, NULL, NULL, 0, - sizeof(BCB), + sizeof(ROS_SHARED_CACHE_MAP), TAG_BCB, 20); ExInitializeNPagedLookasideList (&VacbLookasideList, Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Sat Apr 12 10:59:48 2014 @@ -101,21 +101,21 @@ LONG ActivePrefetches; } PFSN_PREFETCHER_GLOBALS, *PPFSN_PREFETCHER_GLOBALS; -typedef struct _BCB -{ - LIST_ENTRY BcbVacbListHead; +typedef struct _ROS_SHARED_CACHE_MAP +{ + LIST_ENTRY CacheMapVacbListHead; ULONG TimeStamp; PFILE_OBJECT FileObject; LARGE_INTEGER AllocationSize; LARGE_INTEGER FileSize; PCACHE_MANAGER_CALLBACKS Callbacks; PVOID LazyWriteContext; - KSPIN_LOCK BcbLock; + KSPIN_LOCK CacheMapLock; ULONG RefCount; #if DBG - BOOLEAN Trace; /* enable extra trace output for this BCB and it's VACBs */ + BOOLEAN Trace; /* enable extra trace output for this cache map and it's VACBs */ #endif -} BCB, *PBCB; +} ROS_SHARED_CACHE_MAP, *PROS_SHARED_CACHE_MAP; typedef struct _ROS_VACB { @@ -130,8 +130,8 @@ /* Page out in progress */ BOOLEAN PageOut; ULONG MappedCount; - /* Entry in the list of VACBs for this BCB. */ - LIST_ENTRY BcbVacbListEntry; + /* Entry in the list of VACBs for this shared cache map. */ + LIST_ENTRY CacheMapVacbListEntry; /* Entry in the list of VACBs which are dirty. */ LIST_ENTRY DirtyVacbListEntry; /* Entry in the list of VACBs. */ @@ -143,8 +143,8 @@ KMUTEX Mutex; /* Number of references. */ ULONG ReferenceCount; - /* Pointer to the BCB for the file which this view maps data for. */ - PBCB Bcb; + /* Pointer to the shared cache map for the file which this view maps data for. */ + PROS_SHARED_CACHE_MAP SharedCacheMap; /* Pointer to the next VACB in a chain. */ struct _ROS_VACB *NextInChain; } ROS_VACB, *PROS_VACB; @@ -185,7 +185,7 @@ NTSTATUS NTAPI CcRosGetVacb( - PBCB Bcb, + PROS_SHARED_CACHE_MAP SharedCacheMap, ULONG FileOffset, PULONG BaseOffset, PVOID *BaseAddress, @@ -212,7 +212,7 @@ NTSTATUS NTAPI CcRosUnmapVacb( - PBCB Bcb, + PROS_SHARED_CACHE_MAP SharedCacheMap, ULONG FileOffset, BOOLEAN NowDirty ); @@ -220,14 +220,14 @@ PROS_VACB NTAPI CcRosLookupVacb( - PBCB Bcb, + PROS_SHARED_CACHE_MAP SharedCacheMap, ULONG FileOffset ); NTSTATUS NTAPI CcRosGetVacbChain( - PBCB Bcb, + PROS_SHARED_CACHE_MAP SharedCacheMap, ULONG FileOffset, ULONG Length, PROS_VACB *Vacb @@ -240,7 +240,7 @@ NTSTATUS NTAPI CcRosMarkDirtyVacb( - PBCB Bcb, + PROS_SHARED_CACHE_MAP SharedCacheMap, ULONG FileOffset ); @@ -267,7 +267,7 @@ NTSTATUS NTAPI CcRosReleaseVacb( - BCB* Bcb, + PROS_SHARED_CACHE_MAP SharedCacheMap, PROS_VACB Vacb, BOOLEAN Valid, BOOLEAN Dirty, @@ -277,7 +277,7 @@ NTSTATUS NTAPI CcRosRequestVacb( - BCB *Bcb, + PROS_SHARED_CACHE_MAP SharedCacheMap, ULONG FileOffset, PVOID* BaseAddress, PBOOLEAN UptoDate, Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Apr 12 10:59:48 2014 @@ -896,7 +896,7 @@ { PFILE_OBJECT FileObject; #ifndef NEWCC - PBCB Bcb; + PROS_SHARED_CACHE_MAP SharedCacheMap; #endif SWAPENTRY SavedSwapEntry; PFN_NUMBER Page; @@ -918,10 +918,10 @@ (Offset->QuadPart + PAGE_SIZE <= Segment->RawLength.QuadPart || !IsImageSection)) { NTSTATUS Status; - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; IsDirectMapped = TRUE; #ifndef NEWCC - Status = CcRosUnmapVacb(Bcb, FileOffset.LowPart, Dirty); + Status = CcRosUnmapVacb(SharedCacheMap, FileOffset.LowPart, Dirty); #else Status = STATUS_SUCCESS; #endif @@ -1015,13 +1015,13 @@ #ifndef NEWCC if (!(MemoryArea->Data.SectionData.Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED)) { - PBCB Bcb; + PROS_SHARED_CACHE_MAP SharedCacheMap; PROS_VACB Vacb; - Bcb = MemoryArea->Data.SectionData.Section->FileObject->SectionObjectPointer->SharedCacheMap; - Vacb = CcRosLookupVacb(Bcb, (ULONG)(SegOffset + MemoryArea->Data.SectionData.Segment->Image.FileOffset)); + SharedCacheMap = MemoryArea->Data.SectionData.Section->FileObject->SectionObjectPointer->SharedCacheMap; + Vacb = CcRosLookupVacb(SharedCacheMap, (ULONG)(SegOffset + MemoryArea->Data.SectionData.Segment->Image.FileOffset)); if (Vacb) { - CcRosReleaseVacb(Bcb, Vacb, Vacb->Valid, FALSE, TRUE); + CcRosReleaseVacb(SharedCacheMap, Vacb, Vacb->Valid, FALSE, TRUE); return TRUE; } } @@ -1074,17 +1074,17 @@ PFILE_OBJECT FileObject; NTSTATUS Status; ULONG_PTR RawLength; - PBCB Bcb; + PROS_SHARED_CACHE_MAP SharedCacheMap; BOOLEAN IsImageSection; ULONG_PTR Length; FileObject = MemoryArea->Data.SectionData.Section->FileObject; - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; RawLength = (ULONG_PTR)(MemoryArea->Data.SectionData.Segment->RawLength.QuadPart); FileOffset = SegOffset + MemoryArea->Data.SectionData.Segment->Image.FileOffset; IsImageSection = MemoryArea->Data.SectionData.Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE; - ASSERT(Bcb); + ASSERT(SharedCacheMap); DPRINT("%S %I64x\n", FileObject->FileName.Buffer, FileOffset); @@ -1103,7 +1103,7 @@ * filesystems do because it is safe for us to use an offset with an * alignment less than the file system block size. */ - Status = CcRosGetVacb(Bcb, + Status = CcRosGetVacb(SharedCacheMap, (ULONG)FileOffset, &BaseOffset, &BaseAddress, @@ -1122,7 +1122,7 @@ Status = CcReadVirtualAddress(Vacb); if (!NT_SUCCESS(Status)) { - CcRosReleaseVacb(Bcb, Vacb, FALSE, FALSE, FALSE); + CcRosReleaseVacb(SharedCacheMap, Vacb, FALSE, FALSE, FALSE); return Status; } } @@ -1136,7 +1136,7 @@ (*Page) = MmGetPhysicalAddress((char*)BaseAddress + FileOffset - BaseOffset).LowPart >> PAGE_SHIFT; - CcRosReleaseVacb(Bcb, Vacb, TRUE, FALSE, TRUE); + CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, FALSE, TRUE); } else { @@ -1156,7 +1156,7 @@ { return(Status); } - Status = CcRosGetVacb(Bcb, + Status = CcRosGetVacb(SharedCacheMap, (ULONG)FileOffset, &BaseOffset, &BaseAddress, @@ -1175,7 +1175,7 @@ Status = CcReadVirtualAddress(Vacb); if (!NT_SUCCESS(Status)) { - CcRosReleaseVacb(Bcb, Vacb, FALSE, FALSE, FALSE); + CcRosReleaseVacb(SharedCacheMap, Vacb, FALSE, FALSE, FALSE); return Status; } } @@ -1196,8 +1196,8 @@ { memcpy(PageAddr, (char*)BaseAddress + FileOffset - BaseOffset, VacbOffset); MiUnmapPageInHyperSpace(Process, PageAddr, Irql); - CcRosReleaseVacb(Bcb, Vacb, TRUE, FALSE, FALSE); - Status = CcRosGetVacb(Bcb, + CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, FALSE, FALSE); + Status = CcRosGetVacb(SharedCacheMap, (ULONG)(FileOffset + VacbOffset), &BaseOffset, &BaseAddress, @@ -1216,7 +1216,7 @@ Status = CcReadVirtualAddress(Vacb); if (!NT_SUCCESS(Status)) { - CcRosReleaseVacb(Bcb, Vacb, FALSE, FALSE, FALSE); + CcRosReleaseVacb(SharedCacheMap, Vacb, FALSE, FALSE, FALSE); return Status; } } @@ -1231,7 +1231,7 @@ } } MiUnmapPageInHyperSpace(Process, PageAddr, Irql); - CcRosReleaseVacb(Bcb, Vacb, TRUE, FALSE, FALSE); + CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, FALSE, FALSE); } return(STATUS_SUCCESS); } @@ -1869,7 +1869,7 @@ NTSTATUS Status; PFILE_OBJECT FileObject; #ifndef NEWCC - PBCB Bcb = NULL; + PROS_SHARED_CACHE_MAP SharedCacheMap = NULL; #endif BOOLEAN DirectMapped; BOOLEAN IsImageSection; @@ -1901,7 +1901,7 @@ if (FileObject != NULL && !(Context.Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED)) { - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; /* * If the file system is letting us go directly to the cache and the @@ -2066,7 +2066,7 @@ KeBugCheckEx(MEMORY_MANAGEMENT, STATUS_UNSUCCESSFUL, SwapEntry, (ULONG_PTR)Process, (ULONG_PTR)Address); } #ifndef NEWCC - Status = CcRosUnmapVacb(Bcb, (ULONG)FileOffset, FALSE); + Status = CcRosUnmapVacb(SharedCacheMap, (ULONG)FileOffset, FALSE); #else Status = STATUS_SUCCESS; #endif @@ -2074,7 +2074,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("CcRosUnmapVacb failed, status = %x\n", Status); - KeBugCheckEx(MEMORY_MANAGEMENT, Status, (ULONG_PTR)Bcb, (ULONG_PTR)FileOffset, (ULONG_PTR)Address); + KeBugCheckEx(MEMORY_MANAGEMENT, Status, (ULONG_PTR)SharedCacheMap, (ULONG_PTR)FileOffset, (ULONG_PTR)Address); } #endif MiSetPageEvent(NULL, NULL); @@ -2276,7 +2276,7 @@ BOOLEAN Private; NTSTATUS Status; PFILE_OBJECT FileObject; - PBCB Bcb = NULL; + PROS_SHARED_CACHE_MAP SharedCacheMap = NULL; BOOLEAN DirectMapped; BOOLEAN IsImageSection; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); @@ -2298,7 +2298,7 @@ if (FileObject != NULL && !(Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED)) { - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; /* * If the file system is letting us go directly to the cache and the @@ -2366,7 +2366,7 @@ ASSERT(SwapEntry == 0); //SOffset.QuadPart = Offset.QuadPart + Segment->Image.FileOffset; #ifndef NEWCC - CcRosMarkDirtyVacb(Bcb, Offset.LowPart); + CcRosMarkDirtyVacb(SharedCacheMap, Offset.LowPart); #endif MmLockSectionSegment(Segment); MmSetPageEntrySectionSegment(Segment, &Offset, PageEntry); @@ -3970,7 +3970,7 @@ { ULONG_PTR Entry; PFILE_OBJECT FileObject; - PBCB Bcb; + PROS_SHARED_CACHE_MAP SharedCacheMap; LARGE_INTEGER Offset; SWAPENTRY SavedSwapEntry; PROS_SECTION_OBJECT Section; @@ -4011,9 +4011,9 @@ if (Page == PFN_FROM_SSE(Entry) && Dirty) { FileObject = MemoryArea->Data.SectionData.Section->FileObject; - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; #ifndef NEWCC - CcRosMarkDirtyVacb(Bcb, (ULONG)(Offset.QuadPart + Segment->Image.FileOffset)); + CcRosMarkDirtyVacb(SharedCacheMap, (ULONG)(Offset.QuadPart + Segment->Image.FileOffset)); #endif ASSERT(SwapEntry == 0); } @@ -4674,8 +4674,8 @@ /* Check size of file */ if (SectionObjectPointer->SharedCacheMap) { - PBCB Bcb = SectionObjectPointer->SharedCacheMap; - if (NewFileSize->QuadPart <= Bcb->FileSize.QuadPart) + PROS_SHARED_CACHE_MAP SharedCacheMap = SectionObjectPointer->SharedCacheMap; + if (NewFileSize->QuadPart <= SharedCacheMap->FileSize.QuadPart) { return FALSE; }

1 0

[akhaldi] 62712: [WINMM][WLDAP32] * Add Albanian translation. By Ardit Dani. CORE-7930 #resolve #comment Committed in r62712. Thanks!
by akhaldi＠svn.reactos.org 12 Apr '14

12 Apr '14

Author: akhaldi Date: Sat Apr 12 10:49:06 2014 New Revision: 62712 URL: http://svn.reactos.org/svn/reactos?rev=62712&view=rev Log: [WINMM][WLDAP32] * Add Albanian translation. By Ardit Dani. CORE-7930 #resolve #comment Committed in r62712. Thanks! Added: trunk/reactos/dll/win32/winmm/lang/winmm_Sq.rc (with props) trunk/reactos/dll/win32/wldap32/lang/wldap32_Sq.rc (with props) Modified: trunk/reactos/dll/win32/winmm/winmm_res.rc trunk/reactos/dll/win32/wldap32/wldap32.rc Added: trunk/reactos/dll/win32/winmm/lang/winmm_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/lang/winmm… ============================================================================== --- trunk/reactos/dll/win32/winmm/lang/winmm_Sq.rc (added) +++ trunk/reactos/dll/win32/winmm/lang/winmm_Sq.rc [iso-8859-1] Sat Apr 12 10:49:06 2014 @@ -0,0 +1,126 @@ +/* + * Copyright 1999 Eric Pouech + * + * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +STRINGTABLE LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL +BEGIN + +/* MMSYS errors */ +MMSYSERR_NOERROR, "Komanda e pÃ«rcaktuar Ã«shtÃ« kryer." +MMSYSERR_ERROR, "Gabim i jashtÃ«m i papÃ«rcaktuar." +MMSYSERR_BADDEVICEID, "NjÃ« ID pajisje Ã«shtÃ« pÃ«rdorur qÃ« Ã«shtÃ« jashtÃ« diapazonit pÃ«r sistemin tuaj." +MMSYSERR_NOTENABLED, "Drejtuesi nuk Ã«shtÃ« i aktivizuar." +MMSYSERR_ALLOCATED, "Pajisja specifikuar Ã«shtÃ« tashmÃ« nÃ« pÃ«rdorim. Prisni deri sa ajo Ã«shtÃ« e lirÃ«, dhe pastaj provoni pÃ«rsÃ«ri." +MMSYSERR_INVALHANDLE, "Trajtimi i pajisjes sÃ« specifikuar Ã«shtÃ« e pavlefshme." +MMSYSERR_NODRIVER, "Nuk ka drejtues tÃ« instaluar nÃ« sistemin tuaj !\n" +MMSYSERR_NOMEM, "Memoria e pamjaftueshme nÃ« dispozicion pÃ«r kÃ«tÃ« detyrÃ«. Nxjerr njÃ« ose mÃ« shumÃ« aplikime pÃ«r tÃ« rritur memorien nÃ« dispozicion, dhe pastaj provoni pÃ«rsÃ«ri." +MMSYSERR_NOTSUPPORTED, "Ky funksion nuk Ã«shtÃ« i mbÃ«shtetur. PÃ«rdorni funksionin pÃ«r AftÃ«sitÃ« pÃ«r tÃ« pÃ«rcaktuar se cilat funksione dhe mesazhe tÃ« mbÃ«shtet drejtuesin." +MMSYSERR_BADERRNUM, "NjÃ« numÃ«r gabime Ã«shtÃ« pÃ«rcaktuar qÃ« nuk Ã«shtÃ« pÃ«rcaktuar nÃ« sistemin." +MMSYSERR_INVALFLAG, "NjÃ« flamur i pavlefshÃ«m u miratua nÃ« njÃ« funksion tÃ« sistemit." +MMSYSERR_INVALPARAM, "NjÃ« parametÃ«r i pavlefshÃ«m u miratua nÃ« njÃ« funksion tÃ« sistemit." + +/* WAVE errors */ +WAVERR_BADFORMAT, "Formati i specifikuar nuk Ã«shtÃ« i mbÃ«shtetur ose nuk mund tÃ« pÃ«rkthehet. PÃ«rdorni funksionin pÃ«r AftÃ«sitÃ« pÃ«r tÃ« pÃ«rcaktuar formate tÃ« mbÃ«shtetur" +WAVERR_STILLPLAYING, "Nuk mund tÃ« kryesh kÃ«tÃ« operacion, ndÃ«rsa tÃ« dhÃ«nat e media's Ã«shtÃ« ende duke luajtur. RivÃ« pajisjen, ose prisni deri tÃ« dhÃ«nave Ã«shtÃ« pÃ«rfunduar duke luajtur." +WAVERR_UNPREPARED, "Vala kokÃ«s nuk Ã«shtÃ« pÃ«rgatitur. PÃ«rdorni funksionin PÃ«rgatitja pÃ«r tÃ« pÃ«rgatitur kokÃ«n, dhe pastaj provoni pÃ«rsÃ«ri." +WAVERR_SYNC, "Nuk mund tÃ« hapni pajisjen pa pÃ«rdorur WAVE_ALLOWSYNC flamuri. PÃ«rdorimi flamurin, dhe pastaj provoni pÃ«rsÃ«ri." + +/* MIDI errors */ +MIDIERR_UNPREPARED, "Koka MIDI nuk ishte i pÃ«rgatitur. PÃ«rdorni funksionin PÃ«rgatitja pÃ«r tÃ« pÃ«rgatitur koka, dhe pastaj provoni pÃ«rsÃ«ri." +MIDIERR_STILLPLAYING, "Nuk mund tÃ« ktheni kÃ«tÃ« operacion, ndÃ«rsa tÃ« dhÃ«nat e media's Ã«shtÃ« ende duke luajtur. RivÃ« pajisjen, ose prisni deri tÃ« dhÃ«nave Ã«shtÃ« pÃ«rfunduar duke luajtur." +MIDIERR_NOMAP, "NjÃ« hartÃ« MIDI nuk u gjet. Nuk mund tÃ« jetÃ« njÃ« problem me tÃ« shoferit, ose fotografi MIDIMAP.CFG mund tÃ« jenÃ« tÃ« korruptuar ose tÃ« humbur." +MIDIERR_NOTREADY, "Porti Ã«shtÃ« duke transmetuar tÃ« dhÃ«nat pÃ«r pajisjen. Prisni derisa tÃ« dhÃ«nat janÃ« transmetuar, dhe pastaj provoni pÃ«rsÃ«ri." +MIDIERR_NODEVICE, "NdÃ«rtuesi aktual MIDI Mapper i referohet njÃ« pajisje MIDI qÃ« nuk Ã«shtÃ« i instaluar nÃ« sistemin. PÃ«rdorimi MIDI Mapper pÃ«r tÃ« redaktuar ndÃ«rtuesin." +MIDIERR_INVALIDSETUP, "Skema aktuale MIDI Ã«shtÃ« i dÃ«mtuar. Kopjoni origjinal MIDIMAP.CFG dokument e skedarÃ«ve tÃ« SISTEMIT ReactOS, dhe pastaj provoni pÃ«rsÃ«ri." + +/* MCI errors */ +MCIERR_INVALID_DEVICE_ID, "ID MCI pajisje pavlefshme. PÃ«rdorimi ID kthyer kur hapni pajisjen MCI." +MCIERR_UNRECOGNIZED_KEYWORD, "Drejtuesi nuk mund tÃ« njohin parametÃ«r specifikuar komanduese." +MCIERR_UNRECOGNIZED_COMMAND, "Drejtuesi nuk mund tÃ« njohin komandÃ«n e specifikuar." +MCIERR_HARDWARE, "Ka njÃ« problem me pajisjen tuaj tÃ« media's. Sigurohuni qÃ« ajo Ã«shtÃ« duke punuar si duhet ose kontaktoni prodhuesin e pajisjes." +MCIERR_INVALID_DEVICE_NAME, "Pajisja specifikuar nuk Ã«shtÃ« e hapur ose nuk njihet nga MCI." +MCIERR_OUT_OF_MEMORY, "Memoria e pamjaftueshme nÃ« dispozicion pÃ«r kÃ«tÃ« detyrÃ«. \nNxjirr njÃ« ose mÃ« shumÃ« aplikime pÃ«r tÃ« rritur memorien nÃ« dispozicion, dhe pastaj provoni pÃ«rsÃ«ri." +MCIERR_DEVICE_OPEN, "Emri Pajisjes tashmÃ« Ã«shtÃ« duke u pÃ«rdorur si njÃ« pseudonim me kÃ«tÃ« kÃ«rkesÃ«. PÃ«rdorni njÃ« pseudonim tÃ« veÃ§antÃ«." +MCIERR_CANNOT_LOAD_DRIVER, "Nuk Ã«shtÃ« njÃ« problem i pa-dallueshÃ«m nÃ« ngarkimin e aparatit drejtues tÃ« specifikuar." +MCIERR_MISSING_COMMAND_STRING, "KomandÃ« jo e specifikuar." +MCIERR_PARAM_OVERFLOW, "Varg nxjerrje ishte shumÃ« e madhe pÃ«r tÃ« pÃ«rshtatur njÃ« zbutÃ«s nÃ« kthimi. Rrit madhÃ«sinÃ« e zbutÃ«sit." +MCIERR_MISSING_STRING_ARGUMENT, "Komanda e pÃ«rcaktuar kÃ«rkon njÃ« parametÃ«r karakter-string. Ju lutemi tÃ« sigurojÃ« njÃ«." +MCIERR_BAD_INTEGER, "NumÃ«r i plotÃ« specifikuar Ã«shtÃ« i pavlefshÃ«m pÃ«r kÃ«tÃ« komandÃ«." +MCIERR_PARSER_INTERNAL, "Aparati drejtues ka kthyer njÃ« lloj tÃ« vlefshÃ«m e kthimit. Kontrolloni me prodhuesit tÃ« pajisjes pÃ«r marrjen e njÃ« drejtuesi tÃ« ri." +MCIERR_DRIVER_INTERNAL, "Ka njÃ« problem me drejtuesin e pajisjes. Kontrolloni me prodhuesit tÃ« pajisjes pÃ«r marrjen e njÃ« drejtues tÃ« ri." +MCIERR_MISSING_PARAMETER, "Komanda e pÃ«rcaktuar kÃ«rkon njÃ« parametÃ«r. Ju lutemi ofroni njÃ«." +MCIERR_UNSUPPORTED_FUNCTION, "Pajisja MCI qÃ« ju jeni duke pÃ«rdorur nuk ka mbÃ«shtetjen e komandÃ«s sÃ« specifikuar." +MCIERR_FILE_NOT_FOUND, "Nuk mund tÃ« gjeni skedarin e specifikuar. Sigurohuni qÃ« rruga dhe emri dokumentit janÃ« tÃ« sakta." +MCIERR_DEVICE_NOT_READY, "Drejtuesi i pjesÃ«s nuk Ã«shtÃ« i gatshÃ«m." +MCIERR_INTERNAL, "NjÃ« problem i ndodhur nÃ« inicializimin e MCI. Provoni tÃ« rifilloni ReactOS." +MCIERR_DRIVER, "Ka njÃ« problem me drejtuesin e pajisjes. Drejtuesi ka mbyllur. Gabim, nuk mund tÃ« hyni." +MCIERR_CANNOT_USE_ALL, "Nuk mund tÃ« pÃ«rdorni 'tÃ« gjithÃ«' si emer tÃ« pajisjes me komandÃ«n e specifikuar." +MCIERR_MULTIPLE, "Gabimet ndodhen nÃ« mÃ« shumÃ« se njÃ« pajisje. Specifikoni Ã§do komandÃ«n dhe pajisje veÃ§mas pÃ«r tÃ« pÃ«rcaktuar se cilat pajisje shkaktuan gabim" +MCIERR_EXTENSION_NOT_FOUND, "Nuk mund tÃ« pÃ«rcaktuar llojin e pajisjes e dhÃ«nÃ« nÃ« prapashtesÃ«n e emrit tÃ« dokumentit." +MCIERR_OUTOFRANGE, "Parametri i specifikuar Ã«shtÃ« jashtÃ« vargut pÃ«r komandÃ«n e specifikuar." +MCIERR_FLAGS_NOT_COMPATIBLE, "Parametrat e specifikuara nuk mund tÃ« pÃ«rdoret sÃ« bashku." +MCIERR_FILE_NOT_SAVED, "Nuk mund tÃ« ruajtur dokumentin specifikuar. Sigurohuni qÃ« ju keni hapÃ«sirÃ« ââtÃ« mjaftueshme nÃ« disk, ose janÃ« ende tÃ« lidhura me rrjetin." +MCIERR_DEVICE_TYPE_REQUIRED, "Nuk mund tÃ« gjeni pajisjen specifikuar. Sigurohuni qÃ« ajo Ã«shtÃ« instaluar ose qÃ« emri pajisja Ã«shtÃ« shkruar drejt." +MCIERR_DEVICE_LOCKED, "Pajisja specifikuar tani Ã«shtÃ« duke u mbyllur. Prisni disa sekonda, dhe pastaj provoni pÃ«rsÃ«ri." +MCIERR_DUPLICATE_ALIAS, "Pseudonimi i ââspecifikuar tashmÃ« Ã«shtÃ« duke u pÃ«rdorur nÃ« kÃ«tÃ« aplikim. PÃ«rdorni njÃ« pseudonim tÃ« veÃ§antÃ«." +MCIERR_BAD_CONSTANT, "Parametri i specifikuar Ã«shtÃ« i pavlefshÃ«m pÃ«r kÃ«tÃ« komandÃ«." +MCIERR_MUST_USE_SHAREABLE, "Drejtuesi pajisjes Ã«shtÃ« tashmÃ« nÃ« pÃ«rdorim. PÃ«r tÃ« ndarÃ« atÃ«, pÃ«rdorin 'shpÃ«rndarje' parametÃ«r me secilin 'hap' komandÃ«." +MCIERR_MISSING_DEVICE_NAME, "Komanda e pÃ«rcaktuar kÃ«rkon njÃ« pseudonim, dokument, drejtues, ose emri pajisje. Ju lutemi tÃ« ofrojÃ« njÃ«." +MCIERR_BAD_TIME_FORMAT, "Vlera e caktuar pÃ«r kohÃ« tÃ« formatit Ã«shtÃ« e pavlefshme. Referojuni dokumentacionit MCI pÃ«r formate tÃ« vlefshme." +MCIERR_NO_CLOSING_QUOTE, "NjÃ« shenjÃ«-mbyllje me dy citate mungon nga vlera e parametrit. Ju lutemi tÃ« ofrojÃ« njÃ«." +MCIERR_DUPLICATE_FLAGS, "NjÃ« parametÃ«r ose vlerÃ« Ã«shtÃ« specifikuar dy herÃ«. VetÃ«m specifikoni njÃ« herÃ«." +MCIERR_INVALID_FILE, "Skedari i caktuar nuk mund tÃ« luhet nÃ« pajisje tÃ« specifikuar MCI. Skedari mund tÃ« jetÃ« i korruptuar, ose jo nÃ« formatin e duhur." +MCIERR_NULL_PARAMETER_BLOCK, "NjÃ« bllok null parametÃ«r u miratua me MCI." +MCIERR_UNNAMED_RESOURCE, "Nuk mund tÃ« ruash njÃ« skedar pa emÃ«r. Furnizo me njÃ« emÃ«r kartelÃ«n." +MCIERR_NEW_REQUIRES_ALIAS, "Ju duhet tÃ« specifikoni njÃ« pseudonim kur duke pÃ«rdorur parametrin 'ri'." +MCIERR_NOTIFY_ON_AUTO_OPEN, "Nuk mund tÃ« pÃ«rdorÃ« flamurin 'njofto' me pajisje auto-hapur." +MCIERR_NO_ELEMENT_ALLOWED, "Nuk mund tÃ« pÃ«rdorni njÃ« emÃ«r kartele me pajisjen e specifikuar." +MCIERR_NONAPPLICABLE_FUNCTION, "Nuk mund tÃ« kryejnÃ« komandat sipas radhÃ«s sÃ« detajuar. Korrigjoni rendin e komandÃ«s, dhe pastaj provoni pÃ«rsÃ«ri." +MCIERR_ILLEGAL_FOR_AUTO_OPEN, "Nuk mund tÃ« kryejnÃ« njÃ« komandÃ« tÃ« specifikuar nÃ« njÃ« pajisje auto-hapur. Prisni derisa pajisja Ã«shtÃ« e mbyllur, dhe pastaj provoni pÃ«rsÃ«ri." +MCIERR_FILENAME_REQUIRED, "Emri i skedarit Ã«shtÃ« i pavlefshÃ«m. Sigurohuni qÃ« emri i skedarit nuk Ã«shtÃ« mÃ« e gjatÃ« se 8 karaktere, e ndjekur nga njÃ« periudhÃ« dhe njÃ« zgjatje." +MCIERR_EXTRA_CHARACTERS, "Nuk mund tÃ« specifikojÃ« karaktere shtesÃ« pas njÃ« varg tÃ« mbyllur nÃ« thonjÃ«za." +MCIERR_DEVICE_NOT_INSTALLED, "Pajisja specifikuar nuk Ã«shtÃ« i instaluar nÃ« sistem. PÃ«rdorni opsionin e drejtuesin nÃ« Panelin e Kontrollit pÃ«r tÃ« instaluar pajisjen." +MCIERR_GET_CD, "Nuk mund tÃ« hyni nÃ« dokumentin e caktuar apo pajisjet MCI. Provoni ndryshimin skedarit ose rifilloni kompjuterin tuaj." +MCIERR_SET_CD, "Nuk mund tÃ« hyni nÃ« dokumentin e caktuar apo pajisje MCI pÃ«r shkak se kÃ«rkesa nuk mund tÃ« ndryshojÃ« skedarÃ«." +MCIERR_SET_DRIVE, "Nuk mund tÃ« keni hyrje nÃ« dokumentet ose pajisjet e specifikuara tÃ« MCI pÃ«r shkak se kÃ«rkesa nuk mund tÃ« ndryshojÃ« drejtuesin." +MCIERR_DEVICE_LENGTH, "Specifikoni njÃ« pajisje ose emrin drejtues qÃ« Ã«shtÃ« mÃ« pak se 79 karaktere." +MCIERR_DEVICE_ORD_LENGTH, "Specifikoni njÃ« pajisje ose emrin e drejtuesit qÃ« Ã«shtÃ« mÃ« pak se 69 karaktere." +MCIERR_NO_INTEGER, "Komanda e pÃ«rcaktuar kÃ«rkon njÃ« parametÃ«r numÃ«r i plotÃ«. Ju lutemi tÃ« sigurojÃ« njÃ«." +MCIERR_WAVE_OUTPUTSINUSE, "TÃ« gjitha pajisjet valÃ« qÃ« mund tÃ« luajÃ« dokumentet nÃ« formatin e tanishÃ«m janÃ« nÃ« pÃ«rdorim. Prisni derisa njÃ« pajisje valÃ« Ã«shtÃ« i lirÃ«, dhe pastaj provoni pÃ«rsÃ«ri." +MCIERR_WAVE_SETOUTPUTINUSE, "Nuk mund tÃ« vendos pajisjen aktuale valÃ« pÃ«r tÃ« luajtur pÃ«rsÃ«ri pÃ«r shkak se ajo Ã«shtÃ« nÃ« pÃ«rdorim. Prisni derisa pajisja Ã«shtÃ« i lirÃ«, dhe pastaj provoni pÃ«rsÃ«ri." +MCIERR_WAVE_INPUTSINUSE, "TÃ« gjitha pajisjet valÃ« qÃ« mund tÃ« regjistroni dokumentet nÃ« formatin e tanishÃ«m janÃ« nÃ« pÃ«rdorim. Prisni derisa njÃ« pajisje valÃ« Ã«shtÃ« i lirÃ«, dhe pastaj provoni pÃ«rsÃ«ri." +MCIERR_WAVE_SETINPUTINUSE, "Nuk mund tÃ« vendos pajisjen aktuale valÃ« pÃ«r regjistrim pÃ«r shkak se ajo Ã«shtÃ« nÃ« pÃ«rdorim. Prisni derisa pajisja Ã«shtÃ« i lirÃ«, dhe pastaj provoni pÃ«rsÃ«ri." +MCIERR_WAVE_OUTPUTUNSPECIFIED, "Ãdo pajisja pajtueshme luaj-mbrapa valÃ«-formÃ« mund tÃ« pÃ«rdoret." +MCIERR_WAVE_INPUTUNSPECIFIED, "Ãdo pajisje pajtueshme regjistrimi valÃ«-formÃ« mund tÃ« pÃ«rdoren." +MCIERR_WAVE_OUTPUTSUNSUITABLE, "Nuk ka pajisje valÃ« qÃ« mund tÃ« luajÃ« dokumentet nÃ« formatin aktual tÃ« instaluar. PÃ«rdorni opsionin e drejtuesit tÃ« instaluar tÃ« pajisjes valÃ«." +MCIERR_WAVE_SETOUTPUTUNSUITABLE,"Pajisja qÃ« ju jeni duke u pÃ«rpjekur pÃ«r tÃ« luajtur pÃ«r tÃ« nuk mund tÃ« njohin formatin aktual skedarÃ«ve." +MCIERR_WAVE_INPUTSUNSUITABLE, "Nuk ka pajisje valÃ« qÃ« mund tÃ« regjistrojÃ« dokumente nÃ« formatin aktual tÃ« instaluar. PÃ«rdorni opsionin drejtues pÃ«r tÃ« instaluar pajisjen valÃ«." +MCIERR_WAVE_SETINPUTUNSUITABLE, "Pajisja qÃ« ju jeni duke u pÃ«rpjekur pÃ«r tÃ« regjistruar nga nuk mund tÃ« njohin formatin aktual tÃ« skedarÃ«ve." +MCIERR_NO_WINDOW, "Nuk ka asnjÃ« dritare ekrani." +MCIERR_CREATEWINDOW, "Nuk mund tÃ« krijohet ose tÃ« pÃ«rdoret dritarja." +MCIERR_FILE_READ, "Nuk mund tÃ« lexoni dosjen e specifikuar. Sigurohuni qÃ« skedari Ã«shtÃ« ende e pranishme, ose kontrolloni diskun ose rrjetit tuaj lidhje." +MCIERR_FILE_WRITE, "Nuk mund tÃ« shkruaj nÃ« kartelÃ«n specifikuar. Sigurohuni qÃ« ju keni hapÃ«sirÃ« ââtÃ« mjaftueshme nÃ« disk, ose janÃ« ende tÃ« lidhura me rrjetin." +MCIERR_SEQ_DIV_INCOMPATIBLE, "Koha e Formateve e ""treguesin e kÃ«ngÃ«s"" dhe SMPTE janÃ« reciprokisht ekskluzive. Ju nuk mund tÃ« pÃ«rdorni ato sÃ« bashku." +MCIERR_SEQ_NOMIDIPRESENT, "Sistemi nuk ka instaluar pajisje MIDI. PÃ«rdorni opsionin drejtues nga Paneli Kontrollit pÃ«r tÃ« instaluar njÃ« drejtues MIDI." +MCIERR_SEQ_PORT_INUSE, "Port specifikuar MIDI Ã«shtÃ« tashmÃ« nÃ« pÃ«rdorim. Prisni deri sa ajo Ã«shtÃ« e lirÃ«; provoni pÃ«rsÃ«ri." +MCIERR_SEQ_PORT_MAPNODEVICE, "NdÃ«rtuesi Aktual MIDI Mapper i referohet njÃ« pajisje MIDI qÃ« nuk Ã«shtÃ« i instaluar nÃ« sistemin. PÃ«rdorni opsionin MIDI Mapper nga Paneli Kontrollit pÃ«r tÃ« redaktuar ndÃ«rtuesin." +MCIERR_SEQ_PORT_MISCERROR, "NjÃ« gabim ka ndodhur me portin e specifikuar." +MCIERR_SEQ_PORT_NONEXISTENT, "Pajisja specifikuar MIDI nuk Ã«shtÃ« i instaluar nÃ« sistemin. PÃ«rdorni opsionin Drestues nga Paneli Kontrollit pÃ«r tÃ« instaluar njÃ« pajisje MIDI." +MCIERR_SEQ_PORTUNSPECIFIED, "Sistemi nuk ka njÃ« port aktuale MIDI tÃ« specifikuar." +MCIERR_SEQ_TIMER, "TÃ« gjitha kohÃ«t multimediale janÃ« duke u pÃ«rdorur nga aplikacionet e tjera. Dil nga njÃ« nga kÃ«to aplikime; pastaj, provoni pÃ«rsÃ«ri." + +END Propchange: trunk/reactos/dll/win32/winmm/lang/winmm_Sq.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/winmm/winmm_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm_res.… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm_res.rc [iso-8859-1] Sat Apr 12 10:49:06 2014 @@ -75,6 +75,9 @@ #ifdef LANGUAGE_SK_SK #include "lang/winmm_Sk.rc" #endif +#ifdef LANGUAGE_SQ_AL + #include "lang/winmm_Sq.rc" +#endif //#include "winmm_Hu.rc" #ifdef LANGUAGE_UK_UA #include "lang/winmm_Uk.rc" Added: trunk/reactos/dll/win32/wldap32/lang/wldap32_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Sq.rc (added) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Sq.rc [iso-8859-1] Sat Apr 12 10:49:06 2014 @@ -0,0 +1,122 @@ +/* + * Albanian resources for WLDAP32 + * + * + * 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_ALBANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + 0 "Sukses" + 1 "Gabim operacioni" + 2 "Gabim protokolli" + 3 "Limiti Kohor Tejkaluar" + 4 "Limiti MasÃ«s Tejkaluar" + 5 "Krahasim i RremÃ«" + 6 "Krahasim i VÃ«rtetÃ«" + 7 "Metoda VÃ«rtetuese jo e MbÃ«shtetur" + 8 "VÃ«rtetim i FortÃ« Nevojitet" + 9 "Referim (v2)" + 10 "Referim" + 11 "Limiti Administrimit Tejkaluar" + 12 "Zgjerim i PadiskutueshÃ«m Kritik" + 13 "Konfidencialiteti i kÃ«rkuar" + 14 "" + 15 "" + 16 "Nuk ka atribut tÃ« tillÃ«" + 17 "Lloji i papÃ«rcaktuar" + 18 "PÃ«rshtatshmÃ«risÃ« pa kriter" + 19 "Shkelje Detyrimi" + 20 "Atribut Ose Vlera Ekziston" + 21 "Sintaks PavlefshÃ«m" + 22 "" + 23 "" + 24 "" + 25 "" + 26 "" + 27 "" + 28 "" + 29 "" + 30 "" + 31 "" + 32 "Nuk ka Objekt tillÃ«" + 33 "ââProblem Pseudonimi" + 34 "Sintaksa DN PavlefshÃ«mSyntax" + 35 "A Ã«shtÃ« FletÃ«" + 36 "Problem Diference Pseudonimi" + 37 "" + 38 "" + 39 "" + 40 "" + 41 "" + 42 "" + 43 "" + 44 "" + 45 "" + 46 "" + 47 "" + 48 "VÃ«rtetim pa kriter" + 49 "Kredenciale tÃ« pavlefshme" + 50 "Drejtat e pamjaftueshme" + 51 "ZÃ«nÃ«" + 52 "Pa-disponueshÃ«m" + 53 "Duke mos dashur qÃ« tÃ« kryejnÃ«" + 54 "Loop zbuluar" + 55 "" + 56 "" + 57 "" + 58 "" + 59 "" + 60 "Rendit Kontrollit Zhdukur" + 61 "Gabim nÃ« vargun e indeksit" + 62 "" + 63 "" + 64 "EmÃ«rtimi Shkeljeve" + 65 "Klasa Objektiv Shkelje" + 66 "Nuk lejohet nÃ« jo-fletÃ«" + 67 "Nuk lejohet nÃ« RDN" + 68 "TashmÃ« Ekziston" + 69 "Nuk ka Objekt Klasa Mods" + 70 "Rezultatet TÃ« mÃ«dha" + 71 "Ndikon Disa DSAs" + 72 "" + 73 "" + 74 "" + 75 "" + 76 "" + 77 "" + 78 "" + 79 "" + 80 "TjetÃ«r" + 81 "Serveri Ra" + 82 "Gabim VendorÃ«" + 83 "Gabim Kodim" + 84 "Gabim Ã'kodim" + 85 "Mbaroj" + 86 "Verf Panjohur" + 87 "Gabim Filtri" + 88 "Ndaluar nga PÃ«rdoruesi" + 89 "Gabim Parametri" + 90 "Ska Memie" + 91 "Nuk mund tÃ« lidheni me serverin LDAP" + 92 "Operacioni nuk pÃ«rkrahet nga ky version i protokollit LDAP" + 93 "Kontrolli i specifikuar nuk u gjet nÃ« mesazh" + 94 "AsnjÃ« rezultat i pranishÃ«m nÃ« mesazh" + 95 "MÃ« shumÃ« rezultate kthyen" + 96 "Pusho ndÃ«rsa trajton referimet" + 97 "Kufiri i Referimit hop tejkaluar" +} Propchange: trunk/reactos/dll/win32/wldap32/lang/wldap32_Sq.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wldap32/wldap32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32.rc [iso-8859-1] Sat Apr 12 10:49:06 2014 @@ -76,6 +76,9 @@ #ifdef LANGUAGE_RU_RU #include "lang/wldap32_Ru.rc" #endif +#ifdef LANGUAGE_SQ_AL + #include "lang/wldap32_Sq.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/wldap32_Uk.rc" #endif

1 0

[tfaber] 62711: [NTOS:CC] - Remove remnants of long-unused delayed remove/close feature (added in r3970, removed in r39663)
by tfaber＠svn.reactos.org 12 Apr '14

12 Apr '14

Author: tfaber Date: Sat Apr 12 10:37:08 2014 New Revision: 62711 URL: http://svn.reactos.org/svn/reactos?rev=62711&view=rev Log: [NTOS:CC] - Remove remnants of long-unused delayed remove/close feature (added in r3970, removed in r39663) Modified: trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/cc.h trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=627… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Apr 12 10:37:08 2014 @@ -44,7 +44,6 @@ static LIST_ENTRY DirtyVacbListHead; static LIST_ENTRY VacbListHead; static LIST_ENTRY VacbLruListHead; -static LIST_ENTRY ClosedListHead; ULONG DirtyPageCount = 0; KGUARDED_MUTEX ViewLock; @@ -1026,12 +1025,6 @@ Bcb->RefCount--; if (Bcb->RefCount == 0) { - if (Bcb->BcbRemoveListEntry.Flink != NULL) - { - RemoveEntryList(&Bcb->BcbRemoveListEntry); - Bcb->BcbRemoveListEntry.Flink = NULL; - } - FileObject->SectionObjectPointer->SharedCacheMap = NULL; /* @@ -1082,37 +1075,23 @@ KeAcquireGuardedMutex(&ViewLock); Bcb = (PBCB)FileObject->SectionObjectPointer->SharedCacheMap; ASSERT(Bcb); - if (Bcb->RefCount == 0) - { - ASSERT(Bcb->BcbRemoveListEntry.Flink != NULL); - RemoveEntryList(&Bcb->BcbRemoveListEntry); - Bcb->BcbRemoveListEntry.Flink = NULL; - - } - else - { - ASSERT(Bcb->BcbRemoveListEntry.Flink == NULL); - } + ASSERT(Bcb->RefCount != 0); Bcb->RefCount++; KeReleaseGuardedMutex(&ViewLock); } VOID NTAPI -CcRosSetRemoveOnClose ( +CcRosRemoveIfClosed ( PSECTION_OBJECT_POINTERS SectionObjectPointer) { PBCB Bcb; - DPRINT("CcRosSetRemoveOnClose()\n"); + DPRINT("CcRosRemoveIfClosed()\n"); KeAcquireGuardedMutex(&ViewLock); Bcb = (PBCB)SectionObjectPointer->SharedCacheMap; - if (Bcb) - { - Bcb->RemoveOnClose = TRUE; - if (Bcb->RefCount == 0) - { - CcRosDeleteFileCache(Bcb->FileObject, Bcb); - } + if (Bcb && Bcb->RefCount == 0) + { + CcRosDeleteFileCache(Bcb->FileObject, Bcb); } KeReleaseGuardedMutex(&ViewLock); } @@ -1196,11 +1175,6 @@ FileObject->PrivateCacheMap = Bcb; Bcb->RefCount++; } - if (Bcb->BcbRemoveListEntry.Flink != NULL) - { - RemoveEntryList(&Bcb->BcbRemoveListEntry); - Bcb->BcbRemoveListEntry.Flink = NULL; - } Status = STATUS_SUCCESS; } KeReleaseGuardedMutex(&ViewLock); @@ -1258,11 +1232,6 @@ FileObject->PrivateCacheMap = Bcb; Bcb->RefCount++; } - if (Bcb->BcbRemoveListEntry.Flink != NULL) - { - RemoveEntryList(&Bcb->BcbRemoveListEntry); - Bcb->BcbRemoveListEntry.Flink = NULL; - } KeReleaseGuardedMutex(&ViewLock); return STATUS_SUCCESS; @@ -1297,7 +1266,6 @@ InitializeListHead(&VacbListHead); InitializeListHead(&DirtyVacbListHead); InitializeListHead(&VacbLruListHead); - InitializeListHead(&ClosedListHead); KeInitializeGuardedMutex(&ViewLock); ExInitializeNPagedLookasideList (&iBcbLookasideList, NULL, Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Sat Apr 12 10:37:08 2014 @@ -104,8 +104,6 @@ typedef struct _BCB { LIST_ENTRY BcbVacbListHead; - LIST_ENTRY BcbRemoveListEntry; - BOOLEAN RemoveOnClose; ULONG TimeStamp; PFILE_OBJECT FileObject; LARGE_INTEGER AllocationSize; @@ -264,7 +262,7 @@ VOID NTAPI -CcRosSetRemoveOnClose(PSECTION_OBJECT_POINTERS SectionObjectPointer); +CcRosRemoveIfClosed(PSECTION_OBJECT_POINTERS SectionObjectPointer); NTSTATUS NTAPI Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Apr 12 10:37:08 2014 @@ -4720,7 +4720,7 @@ return FALSE; } #ifndef NEWCC - CcRosSetRemoveOnClose(SectionObjectPointer); + CcRosRemoveIfClosed(SectionObjectPointer); #endif return TRUE; case MmFlushForWrite:

1 0

[akhaldi] 62710: [BROWSEUI] * German translation by Robert Naumann. CORE-7555 #resolve #comment Committed in r62710. Thanks!
by akhaldi＠svn.reactos.org 12 Apr '14

12 Apr '14

Author: akhaldi Date: Sat Apr 12 10:33:35 2014 New Revision: 62710 URL: http://svn.reactos.org/svn/reactos?rev=62710&view=rev Log: [BROWSEUI] * German translation by Robert Naumann. CORE-7555 #resolve #comment Committed in r62710. Thanks! Modified: trunk/reactos/dll/win32/browseui/lang/de-DE.rc Modified: trunk/reactos/dll/win32/browseui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/de… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] Sat Apr 12 10:33:35 2014 @@ -30,8 +30,8 @@ MENUITEM "", -1, MFT_SEPARATOR MENUITEM "S&ymbolleisten fixieren", IDM_TOOLBARS_LOCKTOOLBARS, MFT_STRING, MFS_ENABLED MENUITEM "&Anpassen...", IDM_TOOLBARS_CUSTOMIZE, MFT_STRING, MFS_ENABLED - MENUITEM "&Text Labels", IDM_TOOLBARS_TEXTLABELS, MFT_STRING, MFS_ENABLED - MENUITEM "&Go Button", IDM_TOOLBARS_GOBUTTON, MFT_STRING, MFS_ENABLED + MENUITEM "Symboltitel", IDM_TOOLBARS_TEXTLABELS, MFT_STRING, MFS_ENABLED + MENUITEM "SchaltflÃ¤che Wechseln zu", IDM_TOOLBARS_GOBUTTON, MFT_STRING, MFS_ENABLED END END @@ -57,9 +57,9 @@ BEGIN MENUITEM "Su&chen\tCtrl+E", IDM_EXPLORERBAR_SEARCH MENUITEM "&Favoriten\tCtrl+I", IDM_EXPLORERBAR_FAVORITES - MENUITEM "&Media", IDM_EXPLORERBAR_MEDIA + MENUITEM "Medien", IDM_EXPLORERBAR_MEDIA MENUITEM "&Verlauf\tCtrl+H", IDM_EXPLORERBAR_HISTORY - MENUITEM "F&olders", IDM_EXPLORERBAR_FOLDERS + MENUITEM "&Ordner", IDM_EXPLORERBAR_FOLDERS MENUITEM "", IDM_EXPLORERBAR_SEPARATOR END MENUITEM "", FCIDM_MENU_VIEW_SEP_OPTIONS, MFT_SEPARATOR @@ -90,8 +90,8 @@ END POPUP "&?", FCIDM_MENU_HELP BEGIN - MENUITEM "Ist diese Kopie von ReactOS &legal?", IDM_HELP_ISTHISCOPYLEGAL - MENUITEM "Ã&ber ReactOS", IDM_HELP_ABOUT + MENUITEM "Ist dies eine &legale ReactOS-Kopie?", IDM_HELP_ISTHISCOPYLEGAL + MENUITEM "Inf&o", IDM_HELP_ABOUT END END @@ -103,7 +103,7 @@ BEGIN LTEXT "Te&xt Optionen:", -1, 4, 2, 48, 15 COMBOBOX IDC_TEXTOPTIONS, 52, 0, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Ico&n Optionen:", -1, 4, 20, 48, 15 + LTEXT "Symboloptio&nen:", -1, 4, 20, 48, 15 COMBOBOX IDC_ICONOPTIONS, 52, 18, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -129,97 +129,97 @@ STRINGTABLE BEGIN - 800 "Contains commands for manipulating the selected items." -END - -STRINGTABLE -BEGIN - 864 "Contains edit commands." -END - -STRINGTABLE -BEGIN - 928 "Contains commands for manipulating the view." -END - -STRINGTABLE -BEGIN - 992 "Contains tools commands." -END - -STRINGTABLE -BEGIN - 1056 "Contains commands for displaying Help." -END - -STRINGTABLE -BEGIN - 9025 "Closes the window." - 9026 "Goes up one level." -END - -STRINGTABLE -BEGIN - 9121 "Connects to a network drive." - 9122 "Disconnects from a network drive." -END - -STRINGTABLE -BEGIN - 9250 "Displays program information, version number, and copyright." - 9252 "Displays information for debugging." -END - -STRINGTABLE -BEGIN - 9281 "Goes to the previous page." - 9282 "Goes to the next page." - 9283 "Enables you to change settings." - 9285 "Goes to your home page." -END - -STRINGTABLE -BEGIN - 9362 "Opens the Favorites folder." - 9363 "Adds the current page to your Favorites list." -END - -STRINGTABLE -BEGIN - 9505 "Shows or hides toolbars." - 9506 "Shows or hides the status bar." - 9508 "Displays the Standard Buttons toolbar." - 9509 "Displays the Address bar." - 9510 "Displays the Quick Links bar." - 9516 "Locks the sizes and positions of the toolbars." -END - -STRINGTABLE -BEGIN - 9533 "Customizes the toolbar." -END - -STRINGTABLE -BEGIN - 9552 "Shows or hides an Explorer bar." - 9553 "Shows the Search bar." - 9554 "Shows the Favorites bar." - 9555 "Shows the History bar." - 9557 "Shows the Folders bar." - 9559 "Shows the Media Bar." + 800 "EnthÃ¤lt Befehle, um das ausgewÃ¤hlte Objekt zu bearbeiten." +END + +STRINGTABLE +BEGIN + 864 "EnthÃ¤lt Befehle zum Bearbeiten." +END + +STRINGTABLE +BEGIN + 928 "EnthÃ¤lt Befehle, um die Ansicht zu bearbeiten." +END + +STRINGTABLE +BEGIN + 992 "EnthÃ¤lt Werkzeugbefehle." +END + +STRINGTABLE +BEGIN + 1056 "EnthÃ¤lt Befehle, um die Hilfe anzuzeigen." +END + +STRINGTABLE +BEGIN + 9025 "SchlieÃt das Fenster." + 9026 "Wechselt zur Ã¼bergeordneten Ebene." +END + +STRINGTABLE +BEGIN + 9121 "Verbindet ein Netzlaufwerk." + 9122 "Trennt ein Netzlaufwerk." +END + +STRINGTABLE +BEGIN + 9250 "Zeigt Programminformationen, Versionsnummer, und Copyright-Informationen." + 9252 "Zeigt Informationen zum Debuggen." +END + +STRINGTABLE +BEGIN + 9281 "Wechselt zur vorherigen Seite." + 9282 "Wechselt zur nÃ¤chsten Seite." + 9283 "Erlaubt es Ihnen Einstellungen zu Ã¤ndern." + 9285 "Wechselt zur Startseite." +END + +STRINGTABLE +BEGIN + 9362 "Ãffnet den Ordner Favoriten." + 9363 "FÃ¼gt die aktuelle Seite der Favoritenliste hinzu." +END + +STRINGTABLE +BEGIN + 9505 "Zeigt oder versteckt Symbolleisten." + 9506 "Zeigt oder versteckt die Statusleiste." + 9508 "Zeigt oder versteckt die StandardschaltfÃ¤chensymbole." + 9509 "Zeigt die Adressleiste." + 9510 "Zeigt die Quick Links Leiste." + 9516 "Fixiert GrÃ¶Ãe und Position der Symbolleisten." +END + +STRINGTABLE +BEGIN + 9533 "Passt die Symbolleiste an." +END + +STRINGTABLE +BEGIN + 9552 "Zeigt oder versteckt die Explorer-Leiste." + 9553 "Zeigt die Suchleiste." + 9554 "Zeigt die Favoritenleiste." + 9555 "Zeigt die Verlaufsleiste." + 9557 "Zeigt die Ordnerleiste." + 9559 "Zeigt die Medienleiste." END STRINGTABLE BEGIN IDS_SMALLICONS "Kleine Symbole" IDS_LARGEICONS "GroÃe Symbole" - IDS_SHOWTEXTLABELS "Show text labels" -END - -STRINGTABLE -BEGIN - IDS_NOTEXTLABELS "No text labels" - IDS_SELECTIVETEXTONRIGHT "Selective text on right" + IDS_SHOWTEXTLABELS "Symboltitel anzeigen" +END + +STRINGTABLE +BEGIN + IDS_NOTEXTLABELS "Keine Symboltitel" + IDS_SELECTIVETEXTONRIGHT "Symboltitel rechts" END STRINGTABLE

1 0

[akhaldi] 62709: [RAPPS] * Some improvements and fixes by Erdem Ersoy. CORE-7710
by akhaldi＠svn.reactos.org 12 Apr '14

12 Apr '14

Author: akhaldi Date: Sat Apr 12 10:25:03 2014 New Revision: 62709 URL: http://svn.reactos.org/svn/reactos?rev=62709&view=rev Log: [RAPPS] * Some improvements and fixes by Erdem Ersoy. CORE-7710 Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt trunk/reactos/base/applications/rapps/rapps/abiword.txt trunk/reactos/base/applications/rapps/rapps/abiword26.txt trunk/reactos/base/applications/rapps/rapps/abyss.txt trunk/reactos/base/applications/rapps/rapps/ants.txt trunk/reactos/base/applications/rapps/rapps/audiograbber.txt trunk/reactos/base/applications/rapps/rapps/boswars.txt trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt trunk/reactos/base/applications/rapps/rapps/diablo2.txt trunk/reactos/base/applications/rapps/rapps/doublecommander.txt trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt trunk/reactos/base/applications/rapps/rapps/excelview.txt trunk/reactos/base/applications/rapps/rapps/fap.txt trunk/reactos/base/applications/rapps/rapps/fira.txt trunk/reactos/base/applications/rapps/rapps/firefox.txt trunk/reactos/base/applications/rapps/rapps/firefox2.txt trunk/reactos/base/applications/rapps/rapps/firefox3.txt trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt trunk/reactos/base/applications/rapps/rapps/hover.txt trunk/reactos/base/applications/rapps/rapps/kdewin.txt trunk/reactos/base/applications/rapps/rapps/lazaruside.txt trunk/reactos/base/applications/rapps/rapps/mfc40.txt trunk/reactos/base/applications/rapps/rapps/mirc.txt trunk/reactos/base/applications/rapps/rapps/mirc6.txt trunk/reactos/base/applications/rapps/rapps/mpxplay.txt trunk/reactos/base/applications/rapps/rapps/msxml3.txt trunk/reactos/base/applications/rapps/rapps/net11.txt trunk/reactos/base/applications/rapps/rapps/net20.txt trunk/reactos/base/applications/rapps/rapps/net20sp2.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt trunk/reactos/base/applications/rapps/rapps/photofiltre.txt trunk/reactos/base/applications/rapps/rapps/pingus.txt trunk/reactos/base/applications/rapps/rapps/pptview.txt trunk/reactos/base/applications/rapps/rapps/ptanks.txt trunk/reactos/base/applications/rapps/rapps/python.txt trunk/reactos/base/applications/rapps/rapps/python2.txt trunk/reactos/base/applications/rapps/rapps/qb64sdl.txt trunk/reactos/base/applications/rapps/rapps/qmmp.txt trunk/reactos/base/applications/rapps/rapps/remood.txt trunk/reactos/base/applications/rapps/rapps/reshack.txt trunk/reactos/base/applications/rapps/rapps/rocks.txt trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt trunk/reactos/base/applications/rapps/rapps/rosbearm.txt trunk/reactos/base/applications/rapps/rapps/sambatng.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/scummvm.txt trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt trunk/reactos/base/applications/rapps/rapps/stamina.txt trunk/reactos/base/applications/rapps/rapps/superdxb.txt trunk/reactos/base/applications/rapps/rapps/superfinder.txt trunk/reactos/base/applications/rapps/rapps/tahoma.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/thunderbird3.txt trunk/reactos/base/applications/rapps/rapps/tileworld.txt trunk/reactos/base/applications/rapps/rapps/totalcommander.txt trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt trunk/reactos/base/applications/rapps/rapps/vb5run.txt trunk/reactos/base/applications/rapps/rapps/vb6run.txt trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc2010run.txt trunk/reactos/base/applications/rapps/rapps/vc6run.txt trunk/reactos/base/applications/rapps/rapps/winboard.txt trunk/reactos/base/applications/rapps/rapps/wme9.txt trunk/reactos/base/applications/rapps/rapps/wordview.txt Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -35,7 +35,7 @@ Size = 1,1 Mo [Section.041f] -Description = 7zip, zip, tar, rar ve diÄer birÃ§ok tÃ¼rdeki belgelikleri destekleyen bir belgelikleme aracÄ±dÄ±r. +Description = 7zip, zip, tar, rar ve diÄer birÃ§ok belgelik biÃ§imini destekleyen bir belgelikleme aracÄ±dÄ±r. Size = 1,1 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -35,7 +35,7 @@ Size = 9,4 Mo [Section.041f] -Description = Bir kelime iÅlemci. +Description = Bir zengin metin dÃ¼zenleyicisi. Size = 9,4 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/abiword26.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abiword26.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abiword26.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -35,7 +35,7 @@ Size = 5,64 Mo [Section.041f] -Description = Bir kelime iÅlemci. +Description = Bir zengin metin dÃ¼zenleyicisi. Size = 5,64 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -38,9 +38,9 @@ Size = 2,1 Mo [Section.041f] -Name = Abyss ÃrÃ¼tbaÄ Sunucusu X1 +Name = Abyss UmÃ»mÃ® AÄ Sunucusu X1 Licence = Ãcretsiz -Description = Abyss ÃrÃ¼tbaÄ Sunucusu, bilgisayarda Ã¶rÃ¼tbaÄ sitelerinin yayÄ±nlanmasÄ±nÄ± saÄlar. Abyss ÃrÃ¼tbaÄ Sunucusu, gÃ¼venli SSL/TLS baÄlantÄ±larÄ±nÄ± (HTTPS), Ã¶rÃ¼tbaÄ teknikbiliminin geniÅ yelpÃ¢zesiyle destekler. Abyss ÃrÃ¼tbaÄ Sunucusu; MySQL, SQLite, MS SQL Server, MS Access, ve Oracle gibi veritabanlarÄ±nÄ± destekleyen geliÅmiÅ PHP, Perl, Python, ASP, ASP.NET ve Rails Ã¼zerinde Ruby Ã¶rÃ¼tbaÄ uygulamalarÄ±nÄ± Ã§alÄ±ÅtÄ±rabilir. +Description = Abyss UmÃ»mÃ® AÄ Sunucusu, bilgisayarda UmÃ»mÃ® AÄ sitelerinin yayÄ±nlanmasÄ±nÄ± saÄlar. Abyss UmÃ»mÃ® AÄ Sunucusu, gÃ¼venli SSL/TLS baÄlantÄ±larÄ±nÄ± (HTTPS), UmÃ»mÃ® AÄ uygulayÄ±m biliminin geniÅ yelpÃ¢zesiyle destekler. Abyss UmÃ»mÃ® AÄ Sunucusu; MySQL, SQLite, MS SQL Server, MS Access, ve Oracle gibi veri tabanlarÄ±nÄ± destekleyen geliÅmiÅ PHP, Perl, Python, ASP, ASP.NET ve Rails Ã¼zerinde Ruby UmÃ»mÃ® AÄ uygulamalarÄ±nÄ± Ã§alÄ±ÅtÄ±rabilir. Size = 2,1 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/ants.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ants.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ants.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -20,7 +20,6 @@ Size = 632 ko [Section.041f] -Name = KarÄ±ncalar Licence = Ãcretsiz Description = Bir kartlarla izlem oyunu. Kalenizi bitirmeye veyÃ¢ rakip kaleyi yÄ±kmaya Ã§alÄ±ÅÄ±n. YazÄ±lÄ±mÄ± kurmak iÃ§in ZIP biÃ§iminde Ã§Ä±kartma yeteneÄi olan bir yazÄ±lÄ±m gerekir. Size = 632 KB Modified: trunk/reactos/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/audiograbber.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/audiograbber.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -36,7 +36,6 @@ Size = 4,35 Mo [Section.041f] -Name = Ses YakalayÄ±cÄ±sÄ± Licence = Ãcretsiz Description = Ãok iyi bir CD ripleyicisi ve ses biÃ§imi dÃ¶nÃ¼ÅtÃ¼rÃ¼cÃ¼sÃ¼. Size = 4,35 MB Modified: trunk/reactos/base/applications/rapps/rapps/boswars.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/boswars.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/boswars.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -22,6 +22,5 @@ Size = 62,3 Mo [Section.041f] -Name = Bos SavaÅlarÄ± -Description = Bos SavaÅlarÄ±, gelecekÃ§i ve gerÃ§ek zamanlÄ± bir izlem oyunudur. Oyunu baÅlatmak iÃ§in MikroyazÄ±lÄ±m BasarÃ® C++ 2008 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼'nÃ¼ kurunuz. +Description = Bos Wars, gelecekÃ§i ve gerÃ§ek zamanlÄ± bir izlem oyunudur. Oyunu baÅlatmak iÃ§in Microsoft Visual C++ 2008 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼'nÃ¼ kurunuz. Size = 62,3 MB Modified: trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -42,7 +42,7 @@ Size = 913,73 ko [Section.041f] -Name = MikroyazÄ±lÄ±m BasarÃ® Basic 6.0 Ortak Denetimler +Name = Microsoft Visual Basic 6.0 Ortak Denetimler Licence = Bilinmiyor Description = BirtakÄ±m uygulamalar iÃ§in gereklidir. ÅunlarÄ± iÃ§erir: comctl32.ocx, mscomctl.ocx, advpack.dll. Size = 913,73 KB Modified: trunk/reactos/base/applications/rapps/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/diablo2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/diablo2.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -36,9 +36,8 @@ Size = 131,9 Mo [Section.041f] -Name = Åeytan II Licence = KÄ±sÄ±tlÄ± -Description = Åeytan 2'nin kÄ±sÄ±tlÄ±sÄ±. ÃalÄ±ÅtÄ±rmak iÃ§in zeckensack'Ä±n glide Ã§eviricisi gereklidir. +Description = Diablo 2'nin kÄ±sÄ±tlÄ±sÄ±. ÃalÄ±ÅtÄ±rmak iÃ§in zeckensack'Ä±n glide Ã§eviricisi gereklidir. Size = 131,9 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/doublecommander.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/doublecommander.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -31,9 +31,8 @@ Description = Double Commander - ÑÑÐ¾ Ð¾ÑÐºÑÑÑÑÐ¹ Ð´Ð²ÑÑÐ¿Ð°Ð½ÐµÐ»ÑÐ½ÑÐ¹ ÑÐ°Ð¹Ð»Ð¾Ð²ÑÐ¹ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ. ÐÐ°Ð¼ Ð½ÑÐ¶ÐµÐ½ 7-Zip Ð¸Ð»Ð¸ Ð¿Ð¾Ð´Ð¾Ð±Ð½Ð°Ñ ÑÑÐ¸Ð»Ð¸ÑÐ° Ð´Ð»Ñ ÐµÐ³Ð¾ ÑÐ°ÑÐ¿Ð°ÐºÐ¾Ð²ÐºÐ¸. [Section.041f] -Name = Ä°kili Komutan Version = 0.5.8 GeliÅme -Description = Ä°kili Komutan, yan yana duran iki bÃ¶lmenin bulunduÄu bir aÃ§Ä±k kaynak kÃ¼tÃ¼k yÃ¶neticisidir. Bunu Ã§Ä±kartmak iÃ§in 7-Zip ya da 7-Zip benzeri bir yazÄ±lÄ±m kullanmanÄ±z gerekir. +Description = Double Commander, yan yana duran iki bÃ¶lmenin bulunduÄu bir aÃ§Ä±k kaynak kÃ¼tÃ¼k yÃ¶neticisidir. Bunu Ã§Ä±kartmak iÃ§in 7-Zip ya da 7-Zip benzeri bir yazÄ±lÄ±m kullanmanÄ±z gerekir. Size = 7,5 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -27,7 +27,6 @@ URLSite = http://dwn.alter.org.ua/ru/ [Section.041f] -Name = DVD Åimdi Yaz Licence = Ãcretsiz -Description = Ãcretsiz bir doÄrudan CD/DVD kaydedicisi. Kurulur kurulmaz CD/DVD RW'leri Ã§Ä±kartÄ±labilir disk olarak kullanabilirsiniz. Bununla birlikte CD/DVD RW'leri UDF kÃ¼tÃ¼k dizgesiyle kaydedebilirsiniz. AyrÄ±ca, MikroyazÄ±lÄ±m DVDâROM'larÄ±, Ahead InCD ile kaydedilen RW diskleri gibi diÄer yazÄ±lÄ±mlarla oluÅturulan UDF diskleri okutabilirsiniz. YazÄ±lÄ±mÄ± kurmak iÃ§in ZIP biÃ§iminde Ã§Ä±kartma yeteneÄi olan bir yazÄ±lÄ±m gerekir. +Description = Ãcretsiz bir doÄrudan CD/DVD kaydedicisi. Kurulur kurulmaz CD/DVD RW'leri Ã§Ä±kartÄ±labilir disk olarak kullanabilirsiniz. Bununla birlikte CD/DVD RW'leri UDF kÃ¼tÃ¼k dizgesiyle kaydedebilirsiniz. AyrÄ±ca, Microsoft DVDâROM'larÄ±, Ahead InCD ile kaydedilen RW diskleri gibi diÄer yazÄ±lÄ±mlarla oluÅturulan UDF diskleri okutabilirsiniz. YazÄ±lÄ±mÄ± kurmak iÃ§in ZIP biÃ§iminde Ã§Ä±kartma yeteneÄi olan bir yazÄ±lÄ±m gerekir. Size = 1,2 MB Modified: trunk/reactos/base/applications/rapps/rapps/excelview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/excelview.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/excelview.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -1,7 +1,7 @@ ï»¿; UTF-8 [Section] -Name = Excel Viewer +Name = Microsoft Excel Viewer Version = 2010 Licence = Unknown Description = Microsoft Excel Viewer @@ -47,7 +47,9 @@ URLDownload = http://download.microsoft.com/download/D/D/2/DD28D077-97F3-47C0-9389-0B9879… [Section.041f] +Name = Microsoft Excel GÃ¶rÃ¼ntÃ¼leyici Licence = Bilinmiyor +Description = Microsoft Excel GÃ¶rÃ¼ntÃ¼leyici Size = 51.1 MB URLDownload = http://download.microsoft.com/download/8/5/D/85DCDD24-8237-4334-866D-417F74… Modified: trunk/reactos/base/applications/rapps/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/fap.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/fap.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -35,7 +35,7 @@ Size = 1,89 Mo [Section.041f] -Name = Tilki Ses OynatÄ±cÄ±sÄ± +Name = Fox Ses OynatÄ±cÄ±sÄ± Description = BayaÄÄ± ve yeÄni bir ses oynatÄ±cÄ±sÄ±. Size = 1,89 MB Modified: trunk/reactos/base/applications/rapps/rapps/fira.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/fira.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/fira.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -21,7 +21,7 @@ Size = 543 ko [Section.041f] -Name = Mozilla Fira YazÄ± TÃ¼rÃ¼ +Name = Mozilla Fira YazÄ± Tipi Licence = Bilinmiyor -Description = Mozilla Fira YazÄ± TÃ¼rÃ¼ Paketi, Mono ve Sans yazÄ± tÃ¼rlerini kapsar. ReactOS dizinine Ã§Ä±kartÄ±nÄ±z. +Description = Mozilla Fira YazÄ± Tipi Paketi, Mono ve Sans yazÄ± tiplerini kapsar. ReactOS dizinine Ã§Ä±kartÄ±nÄ±z. Size = 543 KB Modified: trunk/reactos/base/applications/rapps/rapps/firefox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -71,8 +71,7 @@ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/sk/Firef… [Section.041f] -Name = Mozilla AteÅtilkisi 26 -Description = ÃzgÃ¼r Ã¶rÃ¼tbaÄ tarayÄ±cÄ±larÄ± arasÄ±nda en tutulanÄ± ve en iyisi. +Description = ÃzgÃ¼r UmÃ»mÃ® AÄ tarayÄ±cÄ±larÄ± arasÄ±nda en tutulanÄ± ve en iyisi. Size = 22,8 MB URLSite = http://www.mozilla.org/tr/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/tr/Firef… Modified: trunk/reactos/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -77,8 +77,7 @@ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/sk/F… [Section.041f] -Name = Mozilla AteÅtilkisi 2.0 -Description = ÃzgÃ¼r Ã¶rÃ¼tbaÄ tarayÄ±cÄ±larÄ± arasÄ±nda en tutulanÄ± ve en iyisi. +Description = ÃzgÃ¼r UmÃ»mÃ® AÄ tarayÄ±cÄ±larÄ± arasÄ±nda en tutulanÄ± ve en iyisi. Size = 5,58 MB URLSite = http://www.mozilla.org/tr/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/tr/F… Modified: trunk/reactos/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -77,8 +77,7 @@ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/wi… [Section.041f] -Name = Mozilla AteÅtilkisi 3.0 -Description = ÃzgÃ¼r Ã¶rÃ¼tbaÄ tarayÄ±cÄ±larÄ± arasÄ±nda en tutulanÄ± ve en iyisi. +Description = ÃzgÃ¼r UmÃ»mÃ® AÄ tarayÄ±cÄ±larÄ± arasÄ±nda en tutulanÄ± ve en iyisi. Size = 7,00 MB URLSite = http://www.mozilla.org/tr/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/wi… Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -71,8 +71,7 @@ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/sk/Fir… [Section.041f] -Name = Mozilla AteÅtilkisi 3.6 -Description = ÃzgÃ¼r Ã¶rÃ¼tbaÄ tarayÄ±cÄ±larÄ± arasÄ±nda en tutulanÄ± ve en iyisi. +Description = ÃzgÃ¼r UmÃ»mÃ® AÄ tarayÄ±cÄ±larÄ± arasÄ±nda en tutulanÄ± ve en iyisi. Size = 8,07 MB URLSite = http://www.mozilla.org/tr/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/tr/Fir… Modified: trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -37,7 +37,7 @@ [Section.041f] Licence = Ãcretsiz -Description = glidewrapper, ReactOS'ta Åeytan 2'yi Ã§alÄ±ÅtÄ±rmak iÃ§in gereklidir. +Description = glidewrapper, ReactOS'ta Diablo 2'yi Ã§alÄ±ÅtÄ±rmak iÃ§in gereklidir. Size = 249,02 KB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/hover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/hover.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/hover.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -21,5 +21,5 @@ Size = 6,2 Mo [Section.041f] -Description = Pencereler 95 CD'sinde bulunan bir bayrak kapmaca oyunu. +Description = Windows 95 CD'sinde bulunan bir bayrak kapmaca oyunu. Size = 6,2 MB Modified: trunk/reactos/base/applications/rapps/rapps/kdewin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/kdewin.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/kdewin.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -36,7 +36,7 @@ [Section.041f] Name = K MasaÃ¼stÃ¼ OrtamÄ± -Description = Pencereler iÃ§in KDE. +Description = Windows iÃ§in KDE. Size = 2,16 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/lazaruside.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lazaruside.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lazaruside.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -24,4 +24,4 @@ [Section.041f] Licence = DeÄiÅtirilmiÅ LGPL, GPL -Description = BasarÃ® ve basarÃ® olmayan Nesne Paskal Ã§izeylemleri oluÅturmayÄ± saÄlayan, ÃzgÃ¼r Paskal derleyicisini kullanarak Ã§alÄ±ÅtÄ±rabilir kÃ¼tÃ¼k oluÅturan bir Ã§apraz platform tÃ¼mleÅik geliÅtirme ortamÄ±. +Description = BasarÃ® ve basarÃ® olmayan Nesne Paskal izlenceleri oluÅturmayÄ± saÄlayan, ÃzgÃ¼r Paskal derleyicisini kullanarak Ã§alÄ±ÅtÄ±rabilir kÃ¼tÃ¼k oluÅturan bir Ã§apraz platform tÃ¼mleÅik geliÅtirme ortamÄ±. Modified: trunk/reactos/base/applications/rapps/rapps/mfc40.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mfc40.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mfc40.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -46,7 +46,7 @@ Size = 865,04 ko [Section.041f] -Name = OLE GÃ¶rÃ¼ntÃ¼leyicisi ve MikroyazÄ±lÄ±m Ana SÄ±nÄ±flarÄ± (MFC) SÃ¼rÃ¼m 4 +Name = OLE GÃ¶rÃ¼ntÃ¼leyicisi ve Microsoft Ana SÄ±nÄ±flarÄ± (MFC) SÃ¼rÃ¼m 4 Licence = Bilinmiyor Description = BirtakÄ±m uygulamalar iÃ§in gereklidir. ÅunlarÄ± iÃ§erir: mfc40.dll, msvcrt40.dll. Size = 865,04 KB Modified: trunk/reactos/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirc.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -37,7 +37,7 @@ [Section.041f] Licence = KÄ±sÄ±tlÄ± -Description = ÃrÃ¼tbaÄ EÅzamanlÄ± SÃ¶yleÅi (IRC) istemcileri arasÄ±nda en tutulanÄ±. +Description = UmÃ»mÃ® AÄ EÅzamanlÄ± SÃ¶yleÅi (IRC) istemcileri arasÄ±nda en tutulanÄ±. Size = 1,85 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/mirc6.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirc6.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirc6.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -37,7 +37,7 @@ [Section.041f] Licence = KÄ±sÄ±tlÄ± -Description = ÃrÃ¼tbaÄ EÅzamanlÄ± SÃ¶yleÅi (IRC) istemcileri arasÄ±nda en tutulanÄ±. +Description = UmÃ»mÃ® AÄ EÅzamanlÄ± SÃ¶yleÅi (IRC) istemcileri arasÄ±nda en tutulanÄ±. Size = 1,67 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/mpxplay.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mpxplay.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mpxplay.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -22,5 +22,5 @@ Description = Mpxplay - 32-ÑÐ°Ð·ÑÑÐ´Ð½ÑÐ¹ ÐºÐ¾Ð½ÑÐ¾Ð»ÑÐ½ÑÐ¹ Ð°ÑÐ´Ð¸Ð¾Ð¿Ð»ÐµÐµÑ Ð´Ð»Ñ Windows. ÐÐ°Ð¼ Ð½ÑÐ¶ÐµÐ½ 7-Zip Ð¸Ð»Ð¸ Ð¿Ð¾Ð´Ð¾Ð±Ð½Ð°Ñ ÑÑÐ¸Ð»Ð¸ÑÐ° Ð´Ð»Ñ ÐµÐ³Ð¾ ÑÐ°ÑÐ¿Ð°ÐºÐ¾Ð²ÐºÐ¸. [Section.041f] -Description = Mpxplay, Pencereler iÃ§in 32 ikillik, konsolluk bir ses oynatÄ±cÄ±sÄ±dÄ±r. Bunu Ã§Ä±kartmak iÃ§in 7-Zip ya da 7-Zip benzeri bir yazÄ±lÄ±m kullanmanÄ±z gerekir. +Description = Mpxplay, Windows iÃ§in 32 bitlik, konsolluk bir ses oynatÄ±cÄ±sÄ±dÄ±r. Bunu Ã§Ä±kartmak iÃ§in 7-Zip ya da 7-Zip benzeri bir yazÄ±lÄ±m kullanmanÄ±z gerekir. Size = 520 KB Modified: trunk/reactos/base/applications/rapps/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/msxml3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/msxml3.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -43,7 +43,7 @@ [Section.041f] Licence = Bilinmiyor -Description = BirtakÄ±m MikroyazÄ±lÄ±m YÃ¼kleyicileri iÃ§in gereklidir. ÅunlarÄ± iÃ§erir: msxml3.dll, msxml3a.dll, msxml3r.dll. +Description = BirtakÄ±m Microsoft YÃ¼kleyicileri iÃ§in gereklidir. ÅunlarÄ± iÃ§erir: msxml3.dll, msxml3a.dll, msxml3r.dll. Size = 1,85 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/net11.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/net11.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/net11.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -33,7 +33,7 @@ Size = 23,14 Mo [Section.041f] -Name = MikroyazÄ±lÄ±m .NET ÃatÄ±sÄ± SÃ¼rÃ¼m 1.1 Yeniden DaÄÄ±tÄ±labilir Paket +Name = Microsoft .NET ÃatÄ±sÄ± SÃ¼rÃ¼m 1.1 Yeniden DaÄÄ±tÄ±labilir Paket Licence = Bilinmiyor -Description = MikroyazÄ±lÄ±m .NET ÃatÄ±sÄ± SÃ¼rÃ¼m 1.1 - Yeniden DaÄÄ±tÄ±labilir Paket +Description = Microsoft .NET ÃatÄ±sÄ± SÃ¼rÃ¼m 1.1 - Yeniden DaÄÄ±tÄ±labilir Paket Size = 23,14 MB Modified: trunk/reactos/base/applications/rapps/rapps/net20.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/net20.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/net20.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -30,7 +30,7 @@ Size = 22,42 Mo [Section.041f] -Name = MikroyazÄ±lÄ±m .NET ÃatÄ±sÄ± SÃ¼rÃ¼m 2.0 Yeniden DaÄÄ±tÄ±labilir Paket +Name = Microsoft .NET ÃatÄ±sÄ± SÃ¼rÃ¼m 2.0 Yeniden DaÄÄ±tÄ±labilir Paket Licence = Bilinmiyor -Description = MikroyazÄ±lÄ±m .NET ÃatÄ±sÄ± SÃ¼rÃ¼m 2.0 - Yeniden DaÄÄ±tÄ±labilir Paket +Description = Microsoft .NET ÃatÄ±sÄ± SÃ¼rÃ¼m 2.0 - Yeniden DaÄÄ±tÄ±labilir Paket Size = 22,42 MB Modified: trunk/reactos/base/applications/rapps/rapps/net20sp2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/net20sp2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/net20sp2.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -30,7 +30,7 @@ Size = 23,84 Mo [Section.041f] -Name = MikroyazÄ±lÄ±m .NET ÃatÄ±sÄ± SÃ¼rÃ¼m 2.0 Hizmet Paketi 2 +Name = Microsoft .NET ÃatÄ±sÄ± SÃ¼rÃ¼m 2.0 Hizmet Paketi 2 Licence = Bilinmiyor -Description = MikroyazÄ±lÄ±m .NET ÃatÄ±sÄ± SÃ¼rÃ¼m 2.0 - Hizmet Paketi 2 +Description = Microsoft .NET ÃatÄ±sÄ± SÃ¼rÃ¼m 2.0 - Hizmet Paketi 2 Size = 23,84 MB Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -35,7 +35,7 @@ Size = 6,75 Mo [Section.041f] -Description = Transport Tycoon Deluxe oyun motorunun bir aÃ§Ä±k kaynak taklidi. Transport Tycoon'un bir sÃ»reti gerekir. +Description = Transport Tycoon Deluxe oyun motorunun bir aÃ§Ä±k kaynak taklidi. Transport Tycoon'un bir kopyasÄ± gerekir. Size = 6,75 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/photofiltre.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/photofiltre.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/photofiltre.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -21,5 +21,5 @@ [Section.041f] Licence = Ãcretsiz -Description = Bu sÃ¼rÃ¼m, katmanlarla gelmektedir ancak StÃ¼dyo X sÃ¼rÃ¼mÃ¼nden daha kÄ±sÄ±tlÄ±dÄ±r. PhotoFiltre StÃ¼dyo, eksiksiz bir resim dÃ¼zeltme yazÄ±lÄ±mÄ±dÄ±r. +Description = Bu sÃ¼rÃ¼m, katmanlarla gelmektedir ancak Studio X sÃ¼rÃ¼mÃ¼nden daha kÄ±sÄ±tlÄ±dÄ±r. PhotoFiltre Studio, eksiksiz bir resim dÃ¼zeltme yazÄ±lÄ±mÄ±dÄ±r. Size = 4,99 MB Modified: trunk/reactos/base/applications/rapps/rapps/pingus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/pingus.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/pingus.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -22,5 +22,5 @@ Size = 16,0 Mo [Section.041f] -Description = Pingus, Ã¼cretsiz, Yaban SÄ±Ã§anlarÄ± gibi bir bulmaca oyunudur. +Description = Pingus, Ã¼cretsiz, Lemmings gibi bir bulmaca oyunudur. Size = 16,0 MB Modified: trunk/reactos/base/applications/rapps/rapps/pptview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/pptview.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/pptview.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -1,7 +1,7 @@ ï»¿; UTF-8 [Section] -Name = Powerpoint Viewer +Name = Microsoft Powerpoint Viewer Version = 2010 Licence = Unknown Description = Microsoft Powerpoint Viewer @@ -47,7 +47,9 @@ URLDownload = http://download.microsoft.com/download/5/6/E/56E4DBA3-D725-43EA-B1E5-DC1480… [Section.041f] +Name = Microsoft Powerpoint GÃ¶rÃ¼ntÃ¼leyici Licence = Bilinmiyor +Description = Microsoft Powerpoint GÃ¶rÃ¼ntÃ¼leyici Size = 60.4 MB URLDownload = http://download.microsoft.com/download/4/6/4/4641DACB-5DE8-4E3A-B8F4-39A1C7… Modified: trunk/reactos/base/applications/rapps/rapps/ptanks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ptanks.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ptanks.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -20,7 +20,6 @@ Size = 2,86 Mo [Section.041f] -Name = KÃ¼Ã§Ã¼k Tanklar Licence = KÄ±sÄ±tlÄ± -Description = Bu gÃ¼ne kadar oynadÄ±ÄÄ±nÄ±z en hÄ±zlÄ± topÃ§u oyunu. +Description = Bu gÃ¼ne dek oynadÄ±ÄÄ±nÄ±z en hÄ±zlÄ± topÃ§u oyunu. Size = 2,86 MB Modified: trunk/reactos/base/applications/rapps/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -35,8 +35,7 @@ Size = 19,6 Mo [Section.041f] -Name = Piton 3 -Description = Ä°lgi Ã§ekici, gÃ¼Ã§lÃ¼ ve devingen bir Ã§izeylemleme dili. +Description = Ä°lgi Ã§ekici, gÃ¼Ã§lÃ¼ ve devingen bir izlenceleme dili. Size = 19,6 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/python2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/python2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/python2.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -35,8 +35,7 @@ Size = 15,48 Mo [Section.041f] -Name = Piton 2 -Description = Ä°lgi Ã§ekici, gÃ¼Ã§lÃ¼ ve devingen bir Ã§izeylemleme dili. +Description = Ä°lgi Ã§ekici, gÃ¼Ã§lÃ¼ ve devingen bir izlenceleme dili. Size = 15,48 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/qb64sdl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/qb64sdl.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/qb64sdl.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -22,5 +22,5 @@ [Section.041f] Name = QB64 (SDL SÃ¼rÃ¼mÃ¼) Licence = Ãcretsiz -Description = QB64; MikroyazÄ±lÄ±m Pencereler, Linux ve Mac OS X iÃ§in yapÄ±lmÄ±Å, MikroyazÄ±lÄ±m QBasic ve MikroyazÄ±lÄ±m QuickBASIC ile uyumlu olarak tasarlanan, kendi kendini derleyen bir BASIC derleyicisidir. Bunu Ã§Ä±kartmak iÃ§in 7-Zip ya da 7-Zip benzeri bir yazÄ±lÄ±m kullanmanÄ±z gerekir. +Description = QB64; Microsoft Windows, Linux ve Mac OS X iÃ§in yapÄ±lmÄ±Å, Microsoft QBasic ve Microsoft QuickBASIC ile uyumlu olarak tasarlanan, kendi kendini derleyen bir BASIC derleyicisidir. Bunu Ã§Ä±kartmak iÃ§in 7-Zip ya da 7-Zip benzeri bir yazÄ±lÄ±m kullanmanÄ±z gerekir. Size = 33,1 MB Modified: trunk/reactos/base/applications/rapps/rapps/qmmp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/qmmp.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/qmmp.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -1,7 +1,7 @@ ï»¿; UTF-8 [Section] -Name = Qt-based Multimedia Player +Name = Qmmp (Qt-based Multimedia Player) Version = 0.7.3 Licence = GPL Description = Qmmp is an audio-player, written with the help of the Qt library. The user interface is similar to WinAMP or XMMS. Alternative user interfaces also are available. @@ -22,6 +22,6 @@ Description = ÐÑÐ´Ð¸Ð¾Ð¿Ð»ÐµÐµÑ Qmmp (Qt-based Multimedia Player). [Section.041f] -Name = Qt TabanlÄ± Ãokluortam OynatÄ±cÄ±sÄ± +Name = Qmmp (Qt TabanlÄ± Ãokluortam OynatÄ±cÄ±sÄ±) Description = Qmmp, Qt kitaplÄ±ÄÄ±nÄ±n yardÄ±mÄ±yla yazÄ±lan bir ses oynatÄ±cÄ±sÄ±dÄ±r. KullanÄ±cÄ± arayÃ¼zÃ¼sÃ¼ WinAMP'Ä±nkine ve XMMS'ninkine benzer. AyrÄ±ca deÄiÅik kullanÄ±cÄ± arayÃ¼zleri de vardÄ±r. Size = 16,0 MB Modified: trunk/reactos/base/applications/rapps/rapps/remood.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/remood.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/remood.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -35,7 +35,7 @@ Size = 1,15 Mo [Section.041f] -Description = ReMooD, Doom Legacy'in kaynak dÃ¼zgÃ¼lerinin bir uyarlamasÄ±dÄ±r. Bilindik Legacy deneyimiyle yeni husÃ»siyetler ve daha fazla kararlÄ±lÄ±k saÄlamayÄ± amaÃ§lar. +Description = ReMooD, Doom Legacy'in kaynak kodlarÄ±nÄ±n bir uyarlamasÄ±dÄ±r. Bilindik Legacy deneyimiyle yeni husÃ»siyetler ve daha fazla kararlÄ±lÄ±k saÄlamayÄ± amaÃ§lar. Size = 1,15 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/reshack.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/reshack.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/reshack.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -20,7 +20,6 @@ Size = 730 ko [Section.041f] -Name = Kaynak KorsancÄ±sÄ± Licence = Ãcretsiz -Description = Kaynak KorsancÄ±sÄ±, 32 ya da 64 ikillik Pencereler Ã§aÄ±lÅtÄ±rabilirlerini ve .res uzantÄ±lÄ± kaynak kÃ¼tÃ¼klerindeki kaynaklarÄ± gÃ¶rÃ¼ntÃ¼leyen, deÄiÅtiren, yeniden adlandÄ±ran, ekleyen, silen ve Ã§Ä±kartan Ã¼cretsiz bir araÃ§tÄ±r. +Description = Resource Hacker, 32 ya da 64 bitlik Windows Ã§aÄ±lÅtÄ±rabilirlerini ve .res uzantÄ±lÄ± kaynak kÃ¼tÃ¼klerindeki kaynaklarÄ± gÃ¶rÃ¼ntÃ¼leyen, deÄiÅtiren, yeniden adlandÄ±ran, ekleyen, silen ve Ã§Ä±kartan Ã¼cretsiz bir araÃ§tÄ±r. Size = 730 KB Modified: trunk/reactos/base/applications/rapps/rapps/rocks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rocks.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rocks.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -19,5 +19,5 @@ Size = 2,42 Mo [Section.041f] -Description = UNIX, Mac OS X, Pencereler ve DOS iÃ§in yapÄ±lmÄ±Å, atari oyun salonu tÃ¼rÃ¼nde bir oyun. Åu gelenekleri iÃ§erir: "Boulder Dash" (C64), "ZÃ¼mrÃ¼t MÃ¢deni" (Amiga), "Supaplex" (Amiga ve PC), "Sokoban" (PC). YazÄ±lÄ±mÄ± kurmak iÃ§in ZIP biÃ§iminde Ã§Ä±kartma yeteneÄi olan bir yazÄ±lÄ±m gerekir. +Description = UNIX, Mac OS X, Windows ve DOS iÃ§in yapÄ±lmÄ±Å, atari oyun salonu tÃ¼rÃ¼nde bir oyun. Åu gelenekleri iÃ§erir: "Boulder Dash" (C64), "Emerald Mine" (Amiga), "Supaplex" (Amiga ve PC), "Sokoban" (PC). YazÄ±lÄ±mÄ± kurmak iÃ§in ZIP biÃ§iminde Ã§Ä±kartma yeteneÄi olan bir yazÄ±lÄ±m gerekir. Size = 2,42 MB Modified: trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -38,7 +38,7 @@ Size = 15,83 Mo [Section.041f] -Name = ReactOS Derleme OrtamÄ± +Name = ReactOS Derleme OrtamÄ± AMD64 Eklentisi Description = ReactOS AMD64 Kaynak KodlarÄ±'nÄ± derlettirir. Daha Ã§ok aÃ§Ä±klama iÃ§in ReactOS Wiki'ye bakÄ±nÄ±z. Size = 15,83 MB Modified: trunk/reactos/base/applications/rapps/rapps/rosbearm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbearm.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbearm.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -35,7 +35,7 @@ Size = 11,15 Mo [Section.041f] -Name = ReactOS Derleme OrtamÄ± +Name = ReactOS Derleme OrtamÄ± ARM Eklentisi Description = ReactOS ARM Kaynak KodlarÄ±'nÄ± derlettirir. Daha Ã§ok aÃ§Ä±klama iÃ§in ReactOS Wiki'ye bakÄ±nÄ±z. Size = 11,15 MB Modified: trunk/reactos/base/applications/rapps/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sambatng.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sambatng.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -35,7 +35,7 @@ Size = 2,13 Mo [Section.041f] -Description = Bu araÃ§, ReactOS'ta Pencereler'in paylaÅÄ±lan yazÄ±cÄ±larÄ±yla paylaÅÄ±lan dizinlerine eriÅimi saÄlar. +Description = Bu araÃ§, ReactOS'ta Windows'un paylaÅÄ±lan yazÄ±cÄ±larÄ±yla paylaÅÄ±lan dizinlerine eriÅimi saÄlar. Size = 2,13 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -37,7 +37,7 @@ [Section.041f] Licence = Ãcretsiz -Description = SciTE, Scintilla tabanlÄ± bir metin dÃ¼zenleyicisidir. BaÅlangÄ±Ã§ta, Scintilla'yÄ± gÃ¶stermek iÃ§in yapÄ±lmÄ±ÅtÄ±r ancak umÃ»miyetle Ã§izeylemleri yapmak ve Ã§alÄ±ÅtÄ±rmak yetenekleriyle birlikte kullanÄ±ÅlÄ± bir dÃ¼zenleyici olarak geliÅtirilmiÅtir. +Description = SciTE, Scintilla tabanlÄ± bir metin dÃ¼zenleyicisidir. BaÅlangÄ±Ã§ta, Scintilla'yÄ± gÃ¶stermek iÃ§in yapÄ±lmÄ±ÅtÄ±r ancak umÃ»miyetle izlenceleri yapmak ve Ã§alÄ±ÅtÄ±rmak yetenekleriyle birlikte kullanÄ±ÅlÄ± bir dÃ¼zenleyici olarak geliÅtirilmiÅtir. Size = 722 KB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -35,7 +35,7 @@ Size = 6,28 Mo [Section.041f] -Description = ReactOS Ã¼zerinde Sam ve Max, DokunaÃ§ GÃ¼nÃ¼ vb. +Description = ReactOS Ã¼zerinde Sam ve Max, Day of the Tentacle vb. Size = 6,28 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -38,7 +38,7 @@ Size = 548,02 ko [Section.041f] -Name = BayaÄÄ± DoÄrudan Ortam KatmanÄ± (SDL) KarÄ±ÅtÄ±rÄ±cÄ±sÄ± +Name = SDL (BayaÄÄ± DoÄrudan Ortam KatmanÄ±) KarÄ±ÅtÄ±rÄ±cÄ±sÄ± Description = BirtakÄ±m aÃ§Ä±k kaynak uygulamalar iÃ§in gereklidir. Bunu Ã§Ä±kartmak iÃ§in 7-Zip ya da 7-Zip benzeri bir yazÄ±lÄ±m kullanmanÄ±z gerekir. Size = 548,02 KB Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -39,7 +39,7 @@ Size = 136,67 ko [Section.041f] -Name = BayaÄÄ± DoÄrudan Ortam KatmanÄ± (SDL) YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼ +Name = SDL (BayaÄÄ± DoÄrudan Ortam KatmanÄ±) YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼ Description = BirtakÄ±m aÃ§Ä±k kaynak uygulamalar iÃ§in gereklidir. Bunu Ã§Ä±kartmak iÃ§in 7-Zip ya da 7-Zip benzeri bir yazÄ±lÄ±m kullanmanÄ±z gerekir. Size = 136,67 KB Modified: trunk/reactos/base/applications/rapps/rapps/stamina.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/stamina.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/stamina.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -17,5 +17,5 @@ Size = 4,7 Mo [Section.041f] -Description = Ãcretsiz bir dÃ¼Äme takÄ±mÄ±nda yazma Ã¶Äreticisi. YazÄ±lÄ±mÄ± Ã§alÄ±ÅtÄ±rmk iÃ§in MikroyazÄ±lÄ±m BasarÃ® C++ 6 Yeniden DaÄÄ±tÄ±labilir Paket'i kurunuz. +Description = Ãcretsiz bir dÃ¼Äme takÄ±mÄ±nda yazma Ã¶Äreticisi. YazÄ±lÄ±mÄ± Ã§alÄ±ÅtÄ±rmk iÃ§in Microsoft Visual C++ 6 Yeniden DaÄÄ±tÄ±labilir Paket'i kurunuz. Size = 4,7 MB Modified: trunk/reactos/base/applications/rapps/rapps/superdxb.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/superdxb.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/superdxb.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -20,7 +20,6 @@ Size = 3,8 Mo [Section.041f] -Name = SÃ¼per DX-Ball Licence = KÄ±sÄ±tlÄ± -Description = SÃ¼per DX-Ball, canlÄ± ve renkli bir tuÄla kÄ±rma oyunudur. +Description = Super DX-Ball, canlÄ± ve renkli bir tuÄla kÄ±rma oyunudur. Size = 3,8 MB Modified: trunk/reactos/base/applications/rapps/rapps/superfinder.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/superfinder.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/superfinder.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -36,7 +36,6 @@ Size = 4,94 Mo [Section.041f] -Name = SÃ¼per Bulucu XT Licence = Ãcretsiz Description = HÄ±zlÄ± ve husÃ»siyet zengini bir arama uygulamasÄ±. Size = 4,94 MB Modified: trunk/reactos/base/applications/rapps/rapps/tahoma.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tahoma.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tahoma.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -40,9 +40,9 @@ Size = 305,12 ko [Section.041f] -Name = MikroyazÄ±lÄ±m Tahoma YazÄ± TÃ¼rÃ¼ +Name = Microsoft Tahoma YazÄ± Tipi Licence = Bilinmiyor -Description = Tahoma YazÄ± TÃ¼rleri. Steam gibi birtakÄ±m yazÄ±lÄ±mlar iÃ§in gereklidir. ÅunlarÄ± iÃ§erir: Tahoma.ttf, Tahomabd.ttf. +Description = Tahoma YazÄ± Tipleri. Steam gibi birtakÄ±m yazÄ±lÄ±mlar iÃ§in gereklidir. ÅunlarÄ± iÃ§erir: Tahoma.ttf, Tahomabd.ttf. Size = 305,12 KB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -60,7 +60,6 @@ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/ru… [Section.041f] -Name = Mozilla YÄ±ldÄ±rÄ±mkuÅu Description = ÃzgÃ¼r mail istemcileri arasÄ±nda en tutulanÄ± ve en iyisi. Size = 20,99 MB URLSite = https://www.mozilla.org/tr/thunderbird/ Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird3.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -60,7 +60,6 @@ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win32/ru… [Section.041f] -Name = Mozilla YÄ±ldÄ±rÄ±mkuÅu Description = ÃzgÃ¼r mail istemcileri arasÄ±nda en tutulanÄ± ve en iyisi. Size = 8,91 MB URLSite = https://www.mozilla.org/tr/thunderbird/ Modified: trunk/reactos/base/applications/rapps/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tileworld.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tileworld.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -35,8 +35,7 @@ Size = 1,16 Mo [Section.041f] -Name = Karolu DÃ¼nyÃ¢ -Description = BaÅlangÄ±Ã§ta Atari Lynx iÃ§in yapÄ±lan Ãip'in DÃ¼ellosu adlÄ± oyunun iyi bir taklidi. Ãcretsiz CCLP2 Ãizge Paketi'ni de kapsadÄ±ÄÄ±ndan bunun ruhsatlÄ± Ã¶zgÃ¼nÃ¼ne gerek yoktur. +Description = BaÅlangÄ±Ã§ta Atari Lynx iÃ§in yapÄ±lan Chip's Challenge adlÄ± oyunun iyi bir taklidi. Ãcretsiz CCLP2 Ãizge Paketi'ni de kapsadÄ±ÄÄ±ndan bunun telifli Ã¶zgÃ¼nÃ¼ne gerek yoktur. Size = 1,16 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/totalcommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/totalcommander.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/totalcommander.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -29,9 +29,8 @@ Size = 3,3 Mo [Section.041f] -Name = Eksiksiz Komutan Licence = KÄ±sÄ±tlÄ± -Description = Eksiksiz Komutan, yan yana iki bÃ¶lmenin bulunduÄu bir kÃ¼tÃ¼k yÃ¶neticisidir. +Description = Total Commander, yan yana iki bÃ¶lmenin bulunduÄu bir kÃ¼tÃ¼k yÃ¶neticisidir. Size = 3,3 MB [Section.0813] Modified: trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -38,7 +38,7 @@ Size = 10,42 Mo [Section.041f] -Description = Ãocuklar iÃ§in aÃ§Ä±k kaynak ikil eÅlem Ã§izge dÃ¼zenleyicisi. +Description = Ãocuklar iÃ§in aÃ§Ä±k kaynak bit eÅlem Ã§izge dÃ¼zenleyicisi. Size = 10,42 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vb5run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vb5run.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -1,10 +1,10 @@ ï»¿; UTF-8 [Section] -Name = Visual Basic 5 Runtime +Name = Microsoft Visual Basic 5 Runtime Version = 5.0 Licence = Unknown -Description = Visual Basic 5 Runtime. Contains: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Basic 5 Runtime. Contains: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. Size = 969.59 kB Category = 14 URLSite = http://support.microsoft.com/kb/180071/ @@ -13,44 +13,44 @@ [Section.0407] Licence = Unbekannt -Description = Visual Basic 5 Laufzeitsystem. Beinhaltet: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Basic 5 Laufzeitsystem. Beinhaltet: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. [Section.040a] Licence = Desconocida -Description = Librerias Visual Basic 5. Incluye: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. +Description = Librerias Microsoft Visual Basic 5. Incluye: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. [Section.040c] Licence = Inconnue -Description = BibliothÃ¨que Visual Basic 5. Contient: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. +Description = BibliothÃ¨que Microsoft Visual Basic 5. Contient: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. Size = 969,59 ko [Section.0410] Licence = Sconosciuta -Description = Libreria Visual Basic 5. Contiene: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. +Description = Libreria Microsoft Visual Basic 5. Contiene: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. [Section.0413] Licence = Ongekend -Description = Visual Basic 5 Runtime. Bevat: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Basic 5 Runtime. Bevat: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. [Section.0415] Licence = Nieznana -Description = Biblioteki uruchomieniowe Visual Basic 5. Zawiera: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. +Description = Biblioteki uruchomieniowe Microsoft Visual Basic 5. Zawiera: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. [Section.0418] Licence = NecunoscutÄ -Description = Visual Basic 5 Runtime. ConÈine: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Basic 5 Runtime. ConÈine: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. Size = 969,59 ko [Section.041f] -Name = BasarÃ® Basic 5 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼ +Name = Microsoft Visual Basic 5 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼ Licence = Bilinmiyor -Description = BasarÃ® Basic 5 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼. ÅunlarÄ± iÃ§erir: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Basic 5 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼. ÅunlarÄ± iÃ§erir: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. Size = 969,59 KB [Section.0422] Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° -Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Visual Basic 5. Ð²ÐºÐ»ÑÑÐ°Ñ: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. +Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Microsoft Visual Basic 5. Ð²ÐºÐ»ÑÑÐ°Ñ: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. [Section.0813] Licence = Ongekend -Description = Visual Basic 5 Runtime. Bevat: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Basic 5 Runtime. Bevat: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. Modified: trunk/reactos/base/applications/rapps/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vb6run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vb6run.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -1,10 +1,10 @@ ï»¿; UTF-8 [Section] -Name = Visual Basic 6 Runtime +Name = Microsoft Visual Basic 6 Runtime Version = 6.0 Licence = Unknown -Description = Visual Basic 6 Runtime. Contains: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Basic 6 Runtime. Contains: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. Size = 1.02 MB Category = 14 URLSite = http://support.microsoft.com/kb/192461/ @@ -13,44 +13,44 @@ [Section.0407] Licence = Unbekannt -Description = Visual Basic 6 Laufzeitsystem. Beinhaltet: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Basic 6 Laufzeitsystem. Beinhaltet: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. [Section.040a] Licence = Desconocida -Description = Librerias Visual Basic 6. Incluye: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. +Description = Librerias Microsoft Visual Basic 6. Incluye: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. [Section.040c] Licence = Inconnue -Description = BibliothÃ¨que Visual Basic 6. Contient: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. +Description = BibliothÃ¨que Microsoft Visual Basic 6. Contient: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. Size = 1,02 Mo [Section.0410] Licence = Sconosciuta -Description = Libreria Visual Basic 6.Contiene: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. +Description = Libreria Microsoft Visual Basic 6.Contiene: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. [Section.0413] Licence = Ongekend -Description = Visual Basic 6 Runtime. Bevat: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Basic 6 Runtime. Bevat: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. [Section.0415] Licence = Nieznana -Description = Biblioteki uruchomieniowe Visual Basic 6. Zawiera: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. +Description = Biblioteki uruchomieniowe Microsoft Visual Basic 6. Zawiera: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. [Section.0418] Licence = NecunoscutÄ -Description = Visual Basic 6 Runtime. ConÈine: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Basic 6 Runtime. ConÈine: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. Size = 1,02 Mo [Section.041f] -Name = BasarÃ® Basic 6 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼ +Name = Microsoft Visual Basic 6 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼ Licence = Bilinmiyor -Description = BasarÃ® Basic 6 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼. ÅunlarÄ± iÃ§erir: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Basic 6 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼. ÅunlarÄ± iÃ§erir: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. Size = 1,02 MB [Section.0422] Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° -Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Visual Basic 6. Ð²ÐºÐ»ÑÑÐ°Ñ: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. +Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Microsoft Visual Basic 6. Ð²ÐºÐ»ÑÑÐ°Ñ: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. [Section.0813] Licence = Ongekend -Description = Visual Basic 6 Runtime. Bevat: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Basic 6 Runtime. Bevat: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. Modified: trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -4,7 +4,7 @@ Name = Microsoft Visual C++ 2005 SP1 Redistributable Package Version = 7.1 Licence = Unknown -Description = Visual Studio 2005 Runtime SP1. Contains: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. +Description = Microsoft Visual Studio 2005 Runtime SP1. Contains: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. Size = 2.6 MB Category = 14 URLSite = http://www.microsoft.com/en-us/download/details.aspx?id=5638 @@ -13,44 +13,44 @@ [Section.0407] Licence = Unbekannt -Description = Visual Studio 2005 Laufzeitsystem SP1. Beinhaltet: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. +Description = Microsoft Visual Studio 2005 Laufzeitsystem SP1. Beinhaltet: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. [Section.040a] Licence = Desconocida -Description = Librerias Visual Studio 2005 SP1. Incluye: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. +Description = Librerias Microsoft Visual Studio 2005 SP1. Incluye: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. [Section.040c] Licence = Inconnue -Description = BibliothÃ¨que Visual Studio 2005 SP1. Contient: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. +Description = BibliothÃ¨que Microsoft Visual Studio 2005 SP1. Contient: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. Size = 2,6 Mo [Section.0410] Licence = Sconosciuta -Description = Visual Studio 2005 Runtime SP1. Contiene: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. +Description = Microsoft Visual Studio 2005 Runtime SP1. Contiene: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. [Section.0413] Licence = Ongekend -Description = Visual Studio 2005 Runtime SP1. Bevat: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. +Description = Microsoft Visual Studio 2005 Runtime SP1. Bevat: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. [Section.0415] Licence = Nieznana -Description = Biblioteki uruchomieniowe Visual Studio 2005 SP1. Zawiera: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. +Description = Biblioteki uruchomieniowe Microsoft Visual Studio 2005 SP1. Zawiera: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. [Section.0418] Licence = NecunoscutÄ -Description = Visual Studio 2005 Runtime SP1. ConÈine: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. +Description = Microsoft Visual Studio 2005 Runtime SP1. ConÈine: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. Size = 2,6 Mo [Section.041f] -Name = MikroyazÄ±lÄ±m BasarÃ® C++ 2005 SP1 Yeniden DaÄÄ±tÄ±labilir Paket +Name = Microsoft Visual C++ 2005 SP1 Yeniden DaÄÄ±tÄ±labilir Paket Licence = Bilinmiyor -Description = BasarÃ® StÃ¼dyo 2005 SP1 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼. ÅunlarÄ± iÃ§erir: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. +Description = Microsoft Visual Studio 2005 SP1 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼. ÅunlarÄ± iÃ§erir: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. Size = 2,6 MB [Section.0422] Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° -Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Visual Studio 2005 SP1. Ð²ÐºÐ»ÑÑÐ°Ñ: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. +Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Microsoft Visual Studio 2005 SP1. Ð²ÐºÐ»ÑÑÐ°Ñ: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. [Section.0813] Licence = Ongekend -Description = Visual Studio 2005 Runtime SP1. Bevat: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. +Description = Microsoft Visual Studio 2005 Runtime SP1. Bevat: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. Modified: trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -4,7 +4,7 @@ Name = Microsoft Visual C++ 2008 SP1 Redistributable Package Version = 8.0 Licence = Unknown -Description = Visual Studio 2008 SP1 Runtime. Contains: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. +Description = Microsoft Visual Studio 2008 SP1 Runtime. Contains: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. Size = 4.02 MB Category = 14 URLSite = http://www.microsoft.com/en-us/download/details.aspx?id=5582 @@ -13,44 +13,44 @@ [Section.0407] Licence = Unbekannt -Description = Visual Studio 2008 SP1 Laufzeitsystem. EnthÃ¤lt: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. +Description = Microsoft Visual Studio 2008 SP1 Laufzeitsystem. EnthÃ¤lt: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. [Section.040a] Licence = Desconocida -Description = Librerias Visual Studio 2008 SP1. Incluye: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. +Description = Librerias Microsoft Visual Studio 2008 SP1. Incluye: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. [Section.040c] Licence = Inconnue -Description = BibliothÃ¨que Visual Studio 2008 SP1. Contient: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. +Description = BibliothÃ¨que Microsoft Visual Studio 2008 SP1. Contient: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. Size = 4,02 Mo [Section.0410] Licence = Sconosciuta -Description = Visual Studio 2008 Runtime SP1. Contiene: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. +Description = Microsoft Visual Studio 2008 Runtime SP1. Contiene: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. [Section.0413] Licence = Ongekend -Description = Visual Studio 2008 SP1 Runtime. Bevat: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. +Description = Microsoft Visual Studio 2008 SP1 Runtime. Bevat: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. [Section.0415] Licence = Nieznana -Description = Biblioteki uruchomieniowe Visual Studio 2008 SP1. Zawiera: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. +Description = Biblioteki uruchomieniowe Microsoft Visual Studio 2008 SP1. Zawiera: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. [Section.0418] Licence = NecunoscutÄ -Description = Visual Studio 2008 SP1 Runtime. ConÈine: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. +Description = Microsoft Visual Studio 2008 SP1 Runtime. ConÈine: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. Size = 4,02 Mo [Section.041f] -Name = MikroyazÄ±lÄ±m BasarÃ® C++ 2008 SP1 Yeniden DaÄÄ±tÄ±labilir Paket +Name = Microsoft Visual C++ 2008 SP1 Yeniden DaÄÄ±tÄ±labilir Paket Licence = Bilinmiyor -Description = BasarÃ® StÃ¼dyo 2008 SP1 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼. ÅunlarÄ± iÃ§erir: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. +Description = Microsoft Visual Studio 2008 SP1 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼. ÅunlarÄ± iÃ§erir: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. Size = 4,02 MB [Section.0422] Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° -Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Visual Studio 2008 SP1. Ð²ÐºÐ»ÑÑÐ°Ñ: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. +Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Microsoft Visual Studio 2008 SP1. Ð²ÐºÐ»ÑÑÐ°Ñ: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. [Section.0813] Licence = Ongekend -Description = Visual Studio 2008 SP1 Runtime. Bevat: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. +Description = Microsoft Visual Studio 2008 SP1 Runtime. Bevat: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. Modified: trunk/reactos/base/applications/rapps/rapps/vc2010run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2010run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2010run.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -4,7 +4,7 @@ Name = Microsoft Visual C++ 2010 Redistributable Package Version = 8.0 Licence = Unknown -Description = Visual Studio 2010 Runtime. Contains: atl100.dll, mfc100.dll, mfc100u.dll, mfcm100.dll, mfcm100u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. +Description = Microsoft Visual Studio 2010 Runtime. Contains: atl100.dll, mfc100.dll, mfc100u.dll, mfcm100.dll, mfcm100u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. Size = 4.8 MB Category = 14 URLSite = http://www.microsoft.com/en-us/download/details.aspx?id=5555 @@ -13,44 +13,44 @@ [Section.0407] Licence = Unbekannt -Description = Visual Studio 2010 Laufzeitsystem. Beinhaltet: atl100.dll, mfc100.dll, mfc100u.dll, mfcm100.dll, mfcm100u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. +Description = Microsoft Visual Studio 2010 Laufzeitsystem. Beinhaltet: atl100.dll, mfc100.dll, mfc100u.dll, mfcm100.dll, mfcm100u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. [Section.040a] Licence = Desconocida -Description = Librerias Visual Studio 2010. Incluye: atl100.dll, mfc100.dll, mfc100u.dll, mfcm100.dll, mfcm100u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. +Description = Librerias Microsoft Visual Studio 2010. Incluye: atl100.dll, mfc100.dll, mfc100u.dll, mfcm100.dll, mfcm100u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. [Section.040c] Licence = Inconnue -Description = BibliothÃ¨que Visual Studio 2010. Contient: atl100.dll, mfc100.dll, mfc100u.dll, mfcm100.dll, mfcm100u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. +Description = BibliothÃ¨que Microsoft Visual Studio 2010. Contient: atl100.dll, mfc100.dll, mfc100u.dll, mfcm100.dll, mfcm100u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. Size = 4.8 Mo [Section.0410] Licence = Sconosciuta -Description = Libreria Visual Studio 2010. Include: atl100.dll, mfc100.dll, mfc100u.dll, mfcm100.dll, mfcm100u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. +Description = Libreria Microsoft Visual Studio 2010. Include: atl100.dll, mfc100.dll, mfc100u.dll, mfcm100.dll, mfcm100u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. [Section.0413] Licence = Ongekend -Description = Visual Studio 2010 Runtime. Bevat: atl100.dll, mfc100.dll, mfc90u.dll, mfcm100.dll, mfcm90u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. +Description = Microsoft Visual Studio 2010 Runtime. Bevat: atl100.dll, mfc100.dll, mfc90u.dll, mfcm100.dll, mfcm90u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. [Section.0415] Licence = Nieznana -Description = Biblioteki uruchomieniowe Visual Studio 2010. Zawiera: atl100.dll, mfc100.dll, mfc90u.dll, mfcm100.dll, mfcm90u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. +Description = Biblioteki uruchomieniowe Microsoft Visual Studio 2010. Zawiera: atl100.dll, mfc100.dll, mfc90u.dll, mfcm100.dll, mfcm90u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. [Section.0418] Licence = NecunoscutÄ -Description = Visual Studio 2010 Runtime. ConÈine: atl100.dll, mfc100.dll, mfc90u.dll, mfcm100.dll, mfcm90u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. +Description = Microsoft Visual Studio 2010 Runtime. ConÈine: atl100.dll, mfc100.dll, mfc90u.dll, mfcm100.dll, mfcm90u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. Size = 4,8 Mo [Section.041f] -Name = MikroyazÄ±lÄ±m BasarÃ® C++ 2010 Yeniden DaÄÄ±tÄ±labilir Paket +Name = Microsoft Visual C++ 2010 Yeniden DaÄÄ±tÄ±labilir Paket Licence = Bilinmiyor -Description = BasarÃ® StÃ¼dyo 2010 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼. ÅunlarÄ± iÃ§erir: atl100.dll, mfc100.dll, mfc100u.dll, mfcm100.dll, mfcm100u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. +Description = Microsoft Visual Studio 2010 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼. ÅunlarÄ± iÃ§erir: atl100.dll, mfc100.dll, mfc100u.dll, mfcm100.dll, mfcm100u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. Size = 4,8 MB [Section.0422] Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° -Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Visual Studio 2010. Ð²ÐºÐ»ÑÑÐ°Ñ: atl100.dll, mfc100.dll, mfc90u.dll, mfcm100.dll, mfcm90u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. +Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Microsoft Visual Studio 2010. Ð²ÐºÐ»ÑÑÐ°Ñ: atl100.dll, mfc100.dll, mfc90u.dll, mfcm100.dll, mfcm90u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. [Section.0813] Licence = Ongekend -Description = Visual Studio 2010 Runtime. Bevat: atl100.dll, mfc100.dll, mfc90u.dll, mfcm100.dll, mfcm90u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. +Description = Microsoft Visual Studio 2010 Runtime. Bevat: atl100.dll, mfc100.dll, mfc90u.dll, mfcm100.dll, mfcm90u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. Modified: trunk/reactos/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -4,7 +4,7 @@ Name = Microsoft Visual C++ 6 Redistributable Package Version = 6.0 Licence = Unknown -Description = Visual Studio 6 Runtime. Contains: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Studio 6 Runtime. Contains: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. Size = 1.75 MB Category = 14 URLSite = http://support.microsoft.com/kb/259403/ @@ -13,44 +13,44 @@ [Section.0407] Licence = Unbekannt -Description = Visual Studio 6 Laufzeitsystem. Beinhaltet: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Studio 6 Laufzeitsystem. Beinhaltet: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. [Section.040a] Licence = Desconocida -Description = Librerias Visual Studio 2006. Incluye: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. +Description = Librerias Microsoft Visual Studio 6. Incluye: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. [Section.040c] Licence = Inconnue -Description = BibliothÃ¨que Visual Studio 6. Contient: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. +Description = BibliothÃ¨que Microsoft Visual Studio 6. Contient: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. Size = 1,75 Mo [Section.0410] Licence = Sconosciuta -Description = Visual Studio 6 Runtime. Contiene: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Studio 6 Runtime. Contiene: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. [Section.0413] Licence = Ongekend -Description = Visual Studio 6 Runtime. Bevat: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Studio 6 Runtime. Bevat: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. [Section.0415] Licence = Nieznana -Description = Biblioteki uruchomieniowe Visual Studio 6. Zawiera: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. +Description = Biblioteki uruchomieniowe Microsoft Visual Studio 6. Zawiera: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. [Section.0418] Licence = NecunoscutÄ -Description = Visual Studio 6 Runtime. ConÈine: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Studio 6 Runtime. ConÈine: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. Size = 1,75 Mo [Section.041f] -Name = MikroyazÄ±lÄ±m BasarÃ® C++ 6 Yeniden DaÄÄ±tÄ±labilir Paket +Name = Microsoft Visual C++ 6 Yeniden DaÄÄ±tÄ±labilir Paket Licence = Bilinmiyor -Description = BasarÃ® StÃ¼dyo 6 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼. ÅunlarÄ± iÃ§erir: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Studio 6 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼. ÅunlarÄ± iÃ§erir: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. Size = 1,75 MB [Section.0422] Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° -Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Visual Studio 6. Ð²ÐºÐ»ÑÑÐ°Ñ: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. +Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Microsoft Visual Studio 6. Ð²ÐºÐ»ÑÑÐ°Ñ: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. [Section.0813] Licence = Ongekend -Description = Visual Studio 6 Runtime. Bevat: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Studio 6 Runtime. Bevat: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. Modified: trunk/reactos/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -35,7 +35,7 @@ Size = 5,93 Mo [Section.041f] -Description = WinBoard; GNU SatranÃ§, Crafty ve diÄer satranÃ§ motorlarÄ±nÄ± Ã¶rÃ¼tbaÄ satranÃ§ sunucularÄ± ve maille yazÄ±ÅmalÄ± satranÃ§ iÃ§in bir arayÃ¼z olarak sunan, Pencereler/ReactOS iÃ§in bir Ã§izgelik satranÃ§ tahtasÄ±dÄ±r. +Description = WinBoard; GNU Chess, Crafty ve diÄer satranÃ§ motorlarÄ±nÄ± UmÃ»mÃ® AÄ satranÃ§ sunucularÄ± ve maille yazÄ±ÅmalÄ± satranÃ§ iÃ§in bir arayÃ¼z olarak sunan, Windows/ReactOS iÃ§in bir Ã§izgelik satranÃ§ tahtasÄ±dÄ±r. Size = 5,93 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/wme9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/wme9.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/wme9.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -38,9 +38,9 @@ Description = NeznÃ¡ma [Section.041f] -Name = Pencereler Ortam DÃ¼zgÃ¼leyicisi 9 +Name = Windows Ortam KodlayÄ±cÄ±sÄ± 9 Licence = Bilinmiyor -Description = Pencereler Ortam DÃ¼zgÃ¼leyicisi 9 +Description = Windows Ortam KodlayÄ±cÄ±sÄ± 9 Size = 9,46 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/wordview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/wordview.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/wordview.txt [iso-8859-1] Sat Apr 12 10:25:03 2014 @@ -1,7 +1,7 @@ ï»¿; UTF-8 [Section] -Name = Word Viewer +Name = Microsoft Word Viewer Version = 2010 Licence = Unknown Description = Microsoft Word Viewer @@ -47,7 +47,9 @@ URLDownload = http://download.microsoft.com/download/1/2/3/123d3dc8-6f3f-473f-ac1d-3e3896… [Section.041f] +Name = Microsoft Word GÃ¶rÃ¼ntÃ¼leyici Licence = Bilinmiyor +Description = Microsoft Word GÃ¶rÃ¼ntÃ¼leyici Size = 24.55 MB URLDownload = http://download.microsoft.com/download/7/6/e/76efefb4-9575-4903-ac2a-180c28…

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
50
Older →

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 April 2014