Ros-diffs July 2017

ros-diffs@reactos.org

19 participants
213 discussions

[hpoussin] 75374: [SETUPAPI] Do not crash when encountering a device with HardwareIDs

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Jul 19 09:19:11 2017 New Revision: 75374 URL: http://svn.reactos.org/svn/reactos?rev=75374&view=rev Log: [SETUPAPI] Do not crash when encountering a device with HardwareIDs Modified: trunk/reactos/dll/win32/setupapi/driver.c Modified: trunk/reactos/dll/win32/setupapi/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/driver.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/driver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/driver.c [iso-8859-1] Wed Jul 19 09:19:11 2017 @@ -1109,23 +1109,26 @@ } /* FIXME: Check ExcludeFromSelect list */ DriverAlreadyAdded = FALSE; - for (DriverRank = 0, currentId = (LPCWSTR)HardwareIDs; !DriverAlreadyAdded && *currentId; currentId += strlenW(currentId) + 1, DriverRank++) + if (HardwareIDs) { - if (strcmpiW(DeviceId, currentId) == 0) + for (DriverRank = 0, currentId = (LPCWSTR)HardwareIDs; !DriverAlreadyAdded && *currentId; currentId += strlenW(currentId) + 1, DriverRank++) { - AddDriverToList( - pDriverListHead, - DriverType, - &ClassGuid, - ContextDevice, - currentInfFileDetails, - FullInfFileName, - ProviderName, - ManufacturerName, - currentId, - DriverDate, DriverVersion, - DriverRank + (i == 2 ? 0 : 0x1000 + i - 3)); - DriverAlreadyAdded = TRUE; + if (strcmpiW(DeviceId, currentId) == 0) + { + AddDriverToList( + pDriverListHead, + DriverType, + &ClassGuid, + ContextDevice, + currentInfFileDetails, + FullInfFileName, + ProviderName, + ManufacturerName, + currentId, + DriverDate, DriverVersion, + DriverRank + (i == 2 ? 0 : 0x1000 + i - 3)); + DriverAlreadyAdded = TRUE; + } } } if (CompatibleIDs)

7 years, 5 months

[ashaposhnikov] 75373: [RAPPS] Refactoring & bugfixes - Made a bunch of classes for Available apps; - Removed unnessesary GetBuffer calls; - Set a bit higher minimum height for RichEdit; - Added "S...

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Tue Jul 18 22:52:51 2017 New Revision: 75373 URL: http://svn.reactos.org/svn/reactos?rev=75373&view=rev Log: [RAPPS] Refactoring & bugfixes - Made a bunch of classes for Available apps; - Removed unnessesary GetBuffer calls; - Set a bit higher minimum height for RichEdit; - Added "Single" indicator for the Languages to show that the translation available is the only one; - Small style changes. Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] Tue Jul 18 22:52:51 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Applications Manager * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/rapps/available.cpp - * PURPOSE: Functions for working with available applications + * PURPOSE: Classes for working with available applications * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) * Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) * Alexander Shaposhnikov (chaez.san(a)gmail.com) @@ -10,265 +10,212 @@ #include "rapps.h" -ATL::CAtlList<PAPPLICATION_INFO> InfoList; - -inline VOID -InsertTextAfterLoaded_RichEdit(UINT uStringID, const ATL::CStringW& szText, DWORD StringFlags, DWORD TextFlags) -{ - ATL::CStringW szLoadedText; - if (!szText.IsEmpty() && szLoadedText.LoadStringW(hInst, uStringID)) - { - InsertRichEditText(szLoadedText, StringFlags); - InsertRichEditText(szText, TextFlags); - } -} - -inline VOID -InsertLoadedTextNewl_RichEdit(UINT uStringID, DWORD StringFlags) -{ - ATL::CStringW szLoadedText; - if (szLoadedText.LoadStringW(hInst, uStringID)) - { - InsertRichEditText(L"\n", 0); - InsertRichEditText(szLoadedText, StringFlags); - InsertRichEditText(L"\n", 0); - } -} - -inline BOOL -GetString(LPCWSTR lpKeyName, ATL::CStringW& ReturnedString, const ATL::CStringW& cFileName) -{ - if (!ParserGetString(lpKeyName, cFileName, ReturnedString)) - { - ReturnedString.Empty(); - return FALSE; - } - return TRUE; -} - -//Check both registry keys in 64bit system -//TODO: check system type beforehand to avoid double checks? -inline BOOL -GetInstalledVersionEx(PAPPLICATION_INFO Info, ATL::CStringW* szVersion, REGSAM key) -{ - return (!Info->szRegName.IsEmpty() - && (GetInstalledVersion_WowUser(szVersion, Info->szRegName, TRUE, key) - || GetInstalledVersion_WowUser(szVersion, Info->szRegName, FALSE, key))) - || (!Info->szName.IsEmpty() - && (GetInstalledVersion_WowUser(szVersion, Info->szName, TRUE, key) - || GetInstalledVersion_WowUser(szVersion, Info->szName, FALSE, key))); -} - -inline BOOL -GetInstalledVersion(PAPPLICATION_INFO Info, ATL::CStringW* szVersion) -{ - return GetInstalledVersionEx(Info, szVersion, KEY_WOW64_32KEY) - || GetInstalledVersionEx(Info, szVersion, KEY_WOW64_64KEY); -} - -inline BOOL -IsAppInstalled(PAPPLICATION_INFO Info) -{ - return GetInstalledVersion(Info, NULL); -} - -ATL::CSimpleArray<ATL::CStringW> -ParserGetAppLanguages(const ATL::CStringW& szFileName) + // CAvailableApplicationInfo + +CAvailableApplicationInfo::CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam) +{ + LicenseType = LICENSE_TYPE::None; + sFileName = sFileNameParam; + RetrieveCategory(); +} + +VOID CAvailableApplicationInfo::RefreshAppInfo() +{ + if (RetrieveGeneralInfo()) + { + RetrieveLicenseType(); + RetrieveLanguages(); + RetrieveInstalledStatus(); + if (m_IsInstalled) + { + RetrieveInstalledVersion(); + } + } +} + +BOOL CAvailableApplicationInfo::RetrieveGeneralInfo() +{ + if (szUrlDownload.IsEmpty()) + { + if (!GetString(L"Name", szName) + || !GetString(L"URLDownload", szUrlDownload)) + { + return FALSE; + } + + GetString(L"RegName", szRegName); + GetString(L"Version", szVersion); + GetString(L"License", szLicense); + GetString(L"Description", szDesc); + GetString(L"Size", szSize); + GetString(L"URLSite", szUrlSite); + GetString(L"CDPath", szCDPath); + GetString(L"Language", szRegName); + GetString(L"SHA1", szSHA1); + return TRUE; + } + return FALSE; +} + +VOID CAvailableApplicationInfo::RetrieveInstalledStatus() +{ + m_IsInstalled = ::GetInstalledVersion(NULL, szRegName) + || ::GetInstalledVersion(NULL, szName); +} + +VOID CAvailableApplicationInfo::RetrieveInstalledVersion() +{ + m_HasInstalledVersion = ::GetInstalledVersion(&szInstalledVersion, szRegName) + || ::GetInstalledVersion(&szInstalledVersion, szName); +} + +BOOL CAvailableApplicationInfo::RetrieveLanguages() { const WCHAR cDelimiter = L'|'; ATL::CStringW szBuffer; - if (!ParserGetString(L"Languages", szFileName, szBuffer)) - return CSimpleArray<ATL::CStringW>(); - + // TODO: Get multiline parameter + if (!ParserGetString(L"Languages", sFileName, szBuffer)) + return FALSE; + + // Parse parameter string ATL::CStringW szLocale; - ATL::CSimpleArray<ATL::CStringW> arrLocalesResult; for (INT i = 0; szBuffer[i] != UNICODE_NULL; ++i) { if (szBuffer[i] != cDelimiter) { szLocale += szBuffer[i]; - } else { - arrLocalesResult.Add(szLocale); + } + else + { + Languages.Add(szLocale); szLocale.Empty(); } } + // For the text after delimiter if (!szLocale.IsEmpty()) { - arrLocalesResult.Add(szLocale); - } - return arrLocalesResult; -} - -BOOL -HasNativeLanguage(PAPPLICATION_INFO Info) -{ - if (!Info) - { - return FALSE; - } + Languages.Add(szLocale); + } + + return TRUE; +} + +VOID CAvailableApplicationInfo::RetrieveLicenseType() +{ + INT IntBuffer = ParserGetInt(L"LicenseType", sFileName); + + if (IntBuffer < 0 || IntBuffer > LICENSE_TYPE::Max) + { + LicenseType = LICENSE_TYPE::None; + } + else + { + LicenseType = (LICENSE_TYPE) IntBuffer; + } +} + +VOID CAvailableApplicationInfo::RetrieveCategory() +{ + Category = ParserGetInt(L"Category", sFileName); +} + +BOOL CAvailableApplicationInfo::HasLanguageInfo() const +{ + return m_HasLanguageInfo; +} + +BOOL CAvailableApplicationInfo::HasNativeLanguage() const +{ + if (!m_HasLanguageInfo) + { + return FALSE; + } + //TODO: make the actual check return TRUE; } -BOOL -HasEnglishLanguage(PAPPLICATION_INFO Info) -{ - if (!Info) - { - return FALSE; - } + +BOOL CAvailableApplicationInfo::HasEnglishLanguage() const +{ + if (!m_HasLanguageInfo) + { + return FALSE; + } + //TODO: make the actual check return TRUE; } -LICENSE_TYPE -ParserGetLicenseType(const ATL::CStringW& szFileName) -{ - INT IntBuffer = ParserGetInt(L"LicenseType", szFileName); - if (IntBuffer < 0 || IntBuffer > LICENSE_TYPE::Max) - { - return LICENSE_TYPE::None; - } - return (LICENSE_TYPE) IntBuffer; -} - -LIST_ENTRY CachedEntriesHead = {&CachedEntriesHead, &CachedEntriesHead}; -PLIST_ENTRY pCachedEntry = &CachedEntriesHead; - -VOID -InsertVersionInfo_RichEdit(PAPPLICATION_INFO Info) -{ - ATL::CStringW szVersion; - BOOL bIsInstalled = IsAppInstalled(Info), - bHasVersion = GetInstalledVersion(Info, &szVersion); - - if (bIsInstalled) - { - if (bHasVersion) - { - if (Info->szVersion.Compare(szVersion) > 0) - InsertLoadedTextNewl_RichEdit(IDS_STATUS_UPDATE_AVAILABLE, CFE_ITALIC); - else - InsertLoadedTextNewl_RichEdit(IDS_STATUS_INSTALLED, CFE_ITALIC); - - InsertTextAfterLoaded_RichEdit(IDS_AINFO_VERSION, szVersion, CFE_BOLD, 0); - } - else - { - InsertLoadedTextNewl_RichEdit(IDS_STATUS_INSTALLED, CFE_ITALIC); - } - } - else - { - InsertLoadedTextNewl_RichEdit(IDS_STATUS_NOTINSTALLED, CFE_ITALIC); - } - - InsertTextAfterLoaded_RichEdit(IDS_AINFO_AVAILABLEVERSION, Info->szVersion, CFE_BOLD, 0); -} - -VOID -InsertLicenseInfo_RichEdit(PAPPLICATION_INFO Info) -{ - ATL::CStringW szLicense; - switch (Info->LicenseType) - { - case LICENSE_TYPE::OpenSource: - szLicense.LoadStringW(hInst, IDS_LICENSE_OPENSOURCE); - break; - case LICENSE_TYPE::Freeware: - szLicense.LoadStringW(hInst, IDS_LICENSE_FREEWARE); - break; - case LICENSE_TYPE::Trial: - szLicense.LoadStringW(hInst, IDS_LICENSE_TRIAL); - break; - default: - break; - } - - if (szLicense.IsEmpty()) - { - InsertTextAfterLoaded_RichEdit(IDS_AINFO_LICENSE, Info->szLicense, CFE_BOLD, 0); - } - else - { - szLicense.Format(L"(%ls)", Info->szLicense); - InsertTextAfterLoaded_RichEdit(IDS_AINFO_LICENSE, szLicense, CFE_BOLD, 0); - } - -} - -VOID -InsertLanguageInfo_RichEdit(PAPPLICATION_INFO Info) -{ - const INT nTranslations = Info->Languages.GetSize(); - ATL::CStringW szLangInfo; - ATL::CStringW szLoadedTextAvailability; - ATL::CStringW szLoadedAInfoText; - szLoadedAInfoText.LoadStringW(IDS_AINFO_LANGUAGES); - - if(HasNativeLanguage(Info)) - { - szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_AVAILABLE_TRANSLATION); - } - else if (HasEnglishLanguage(Info)) - { - szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_ENGLISH_TRANSLATION); - } - else - { - szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_NO_TRANSLATION); - } - - if (nTranslations > 1) - { - szLangInfo.Format(L" (+%d more)", nTranslations - 1); - } - - InsertRichEditText(szLoadedAInfoText, CFE_BOLD); - InsertRichEditText(szLoadedTextAvailability, NULL); - InsertRichEditText(szLangInfo, CFE_ITALIC); -} - -BOOL -ShowAvailableAppInfo(INT Index) -{ - PAPPLICATION_INFO Info = (PAPPLICATION_INFO) ListViewGetlParam(Index); - if (!Info) return FALSE; - - NewRichEditText(Info->szName, CFE_BOLD); - InsertVersionInfo_RichEdit(Info); - InsertLicenseInfo_RichEdit(Info); - InsertLanguageInfo_RichEdit(Info); - - InsertTextAfterLoaded_RichEdit(IDS_AINFO_SIZE, Info->szSize, CFE_BOLD, 0); - InsertTextAfterLoaded_RichEdit(IDS_AINFO_URLSITE, Info->szUrlSite, CFE_BOLD, CFE_LINK); - InsertTextAfterLoaded_RichEdit(IDS_AINFO_DESCRIPTION, Info->szDesc, CFE_BOLD, 0); - InsertTextAfterLoaded_RichEdit(IDS_AINFO_URLDOWNLOAD, Info->szUrlDownload, CFE_BOLD, CFE_LINK); - - return TRUE; -} - -static BOOL -DeleteCurrentAppsDB(VOID) +BOOL CAvailableApplicationInfo::IsInstalled() const +{ + return m_IsInstalled; +} + +BOOL CAvailableApplicationInfo::HasInstalledVersion() const +{ + return m_HasInstalledVersion; +} + +BOOL CAvailableApplicationInfo::HasUpdate() const +{ + return (szInstalledVersion.Compare(szVersion) < 0) ? TRUE : FALSE; +} + +VOID CAvailableApplicationInfo::SetLastWriteTime(FILETIME* ftTime) +{ + RtlCopyMemory(&ftCacheStamp, ftTime, sizeof(FILETIME)); +} + +inline BOOL CAvailableApplicationInfo::GetString(LPCWSTR lpKeyName, ATL::CStringW& ReturnedString) +{ + if (!ParserGetString(lpKeyName, sFileName, ReturnedString)) + { + ReturnedString.Empty(); + return FALSE; + } + return TRUE; +} + +// CAvailableApps +CAvailableApps::CAvailableApps() +{ + //set all paths + if (GetStorageDirectory(m_szPath)) + { + m_szAppsPath = m_szPath + L"\\rapps\\"; + m_szCabPath = m_szPath + L"\\rappmgr.cab"; + m_szSearchPath = m_szAppsPath + L"*.txt"; + } +} + +VOID CAvailableApps::FreeCachedEntries() +{ + POSITION InfoListPosition = m_InfoList.GetHeadPosition(); + + /* loop and deallocate all the cached app infos in the list */ + while (InfoListPosition) + { + CAvailableApplicationInfo* Info = m_InfoList.GetAt(InfoListPosition); + m_InfoList.RemoveHead(); + delete Info; + + InfoListPosition = m_InfoList.GetHeadPosition(); + } +} + +BOOL CAvailableApps::DeleteCurrentAppsDB() { HANDLE hFind = INVALID_HANDLE_VALUE; WIN32_FIND_DATAW FindFileData; - ATL::CStringW szCabPath; - ATL::CStringW szSearchPath; - ATL::CStringW szPath; BOOL result = TRUE; - if (!GetStorageDirectory(szPath)) - return FALSE; - - szCabPath = szPath + L"\\rappmgr.cab"; - result = result && DeleteFileW(szCabPath.GetString()); - - szPath += L"\\rapps\\"; - szSearchPath = szPath + L"*.txt"; - - hFind = FindFirstFileW(szSearchPath.GetString(), &FindFileData); + if (m_szPath.IsEmpty()) + return FALSE; + + result = result && DeleteFileW(m_szCabPath.GetString()); + hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData); if (hFind == INVALID_HANDLE_VALUE) return result; @@ -276,7 +223,7 @@ ATL::CStringW szTmp; do { - szTmp = szPath + FindFileData.cFileName; + szTmp = m_szPath + FindFileData.cFileName; result = result && DeleteFileW(szTmp.GetString()); } while (FindNextFileW(hFind, &FindFileData) != 0); @@ -285,66 +232,44 @@ return result; } -BOOL -UpdateAppsDB(VOID) -{ - ATL::CStringW szPath; - ATL::CStringW szAppsPath; - ATL::CStringW szCabPath; - +BOOL CAvailableApps::UpdateAppsDB() +{ if (!DeleteCurrentAppsDB()) return FALSE; DownloadApplicationsDB(APPLICATION_DATABASE_URL); - if (!GetStorageDirectory(szPath)) - return FALSE; - - szCabPath = szPath + L"\\rappmgr.cab"; - szAppsPath = szPath + L"\\rapps\\"; - - if (!ExtractFilesFromCab(szCabPath, szAppsPath)) - { - return FALSE; - } - - return TRUE; -} - - -BOOL -EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc) + if (m_szPath.IsEmpty()) + return FALSE; + + if (!ExtractFilesFromCab(m_szCabPath, m_szAppsPath)) + { + return FALSE; + } + + return TRUE; +} + +BOOL CAvailableApps::EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc) { HANDLE hFind = INVALID_HANDLE_VALUE; WIN32_FIND_DATAW FindFileData; - ATL::CStringW szPath; - ATL::CStringW szAppsPath; - ATL::CStringW szCabPath; - PAPPLICATION_INFO Info; - - if (!GetStorageDirectory(szPath)) - return FALSE; - - szCabPath = szPath + L"\\rappmgr.cab"; - szPath += L"\\rapps\\"; - szAppsPath = szPath; - - if (!CreateDirectoryW(szPath.GetString(), NULL) && + + if (!CreateDirectoryW(m_szPath.GetString(), NULL) && GetLastError() != ERROR_ALREADY_EXISTS) { return FALSE; } - szPath += L"*.txt"; - hFind = FindFirstFileW(szPath.GetString(), &FindFileData); + hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData); if (hFind == INVALID_HANDLE_VALUE) { - if (GetFileAttributesW(szCabPath) == INVALID_FILE_ATTRIBUTES) + if (GetFileAttributesW(m_szCabPath) == INVALID_FILE_ATTRIBUTES) DownloadApplicationsDB(APPLICATION_DATABASE_URL); - ExtractFilesFromCab(szCabPath, szAppsPath); - hFind = FindFirstFileW(szPath, &FindFileData); + ExtractFilesFromCab(m_szCabPath, m_szAppsPath); + hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData); if (hFind == INVALID_HANDLE_VALUE) return FALSE; @@ -353,22 +278,25 @@ do { /* loop for all the cached entries */ - POSITION CurrentListPosition = InfoList.GetHeadPosition(); + POSITION CurrentListPosition = m_InfoList.GetHeadPosition(); + CAvailableApplicationInfo* Info = NULL; while (CurrentListPosition != NULL) { POSITION LastListPosition = CurrentListPosition; - Info = InfoList.GetNext(CurrentListPosition); + Info = m_InfoList.GetNext(CurrentListPosition); /* do we already have this entry in cache? */ - if (!Info->cFileName.Compare(FindFileData.cFileName)) + if (Info->sFileName == FindFileData.cFileName) { /* is it current enough, or the file has been modified since our last time here? */ if (CompareFileTime(&FindFileData.ftLastWriteTime, &Info->ftCacheStamp) == 1) { /* recreate our cache, this is the slow path */ - InfoList.RemoveAt(LastListPosition); + m_InfoList.RemoveAt(LastListPosition); + delete Info; + Info = nullptr; break; } else @@ -380,21 +308,11 @@ } /* create a new entry */ - Info = new APPLICATION_INFO(); - - if (!Info) - break; - - Info->Category = ParserGetInt(L"Category", FindFileData.cFileName); - Info->LicenseType = ParserGetLicenseType(FindFileData.cFileName); - Info->Languages = ParserGetAppLanguages(FindFileData.cFileName); - - /* copy the cache-related fields for the next time */ - Info->cFileName = FindFileData.cFileName; - RtlCopyMemory(&Info->ftCacheStamp, &FindFileData.ftLastWriteTime, sizeof(FILETIME)); - - /* add our cached entry to the cached list */ - InfoList.AddTail(Info); + Info = new CAvailableApplicationInfo(FindFileData.cFileName); + + /* set a timestamp for the next time */ + Info->SetLastWriteTime(&FindFileData.ftLastWriteTime); + m_InfoList.AddTail(Info); skip_if_cached: if (Info->Category == FALSE) @@ -403,50 +321,43 @@ if (EnumType != Info->Category && EnumType != ENUM_ALL_AVAILABLE) continue; - /* if our cache hit was only partial, we need to parse - and lazily fill the rest of fields only when needed */ - - if (Info->szUrlDownload.IsEmpty()) - { - if (!GetString(L"Name", Info->szName, FindFileData.cFileName) - || !GetString(L"URLDownload", Info->szUrlDownload, FindFileData.cFileName)) - { - continue; - } - - GetString(L"RegName", Info->szRegName, FindFileData.cFileName); - GetString(L"Version", Info->szVersion, FindFileData.cFileName); - GetString(L"License", Info->szLicense, FindFileData.cFileName); - GetString(L"Description", Info->szDesc, FindFileData.cFileName); - GetString(L"Size", Info->szSize, FindFileData.cFileName); - GetString(L"URLSite", Info->szUrlSite, FindFileData.cFileName); - GetString(L"CDPath", Info->szCDPath, FindFileData.cFileName); - GetString(L"Language", Info->szRegName, FindFileData.cFileName); - GetString(L"SHA1", Info->szSHA1, FindFileData.cFileName); - } - - if (!lpEnumProc(Info)) + Info->RefreshAppInfo(); + + if (!lpEnumProc(static_cast<PAPPLICATION_INFO>(Info), m_szAppsPath.GetString())) break; } while (FindNextFileW(hFind, &FindFileData) != 0); FindClose(hFind); - - return TRUE; -} - -VOID FreeCachedAvailableEntries(VOID) -{ - PAPPLICATION_INFO Info; - POSITION InfoListPosition = InfoList.GetHeadPosition(); - - /* loop and deallocate all the cached app infos in the list */ - while (InfoListPosition) - { - Info = InfoList.GetAt(InfoListPosition); - InfoList.RemoveHead(); - InfoListPosition = InfoList.GetHeadPosition(); - - delete Info; - } -} + return TRUE; +} + +const ATL::CStringW & CAvailableApps::GetFolderPath() +{ + return m_szPath; +} + +const ATL::CStringW & CAvailableApps::GetAppPath() +{ + return m_szAppsPath; +} + +const ATL::CStringW & CAvailableApps::GetCabPath() +{ + return m_szCabPath; +} + +const LPCWSTR CAvailableApps::GetFolderPathString() +{ + return m_szPath.GetString(); +} + +const LPCWSTR CAvailableApps::GetAppPathString() +{ + return m_szPath.GetString(); +} + +const LPCWSTR CAvailableApps::GetCabPathString() +{ + return m_szPath.GetString(); +} Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h [iso-8859-1] Tue Jul 18 22:52:51 2017 @@ -83,7 +83,6 @@ HWND Create(HWND hwndParent) { - // TODO: FreeLibrary when the window is destroyed LoadedLibrary = LoadLibraryW(L"riched20.dll"); m_hWnd = CreateWindowExW(0, Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Tue Jul 18 22:52:51 2017 @@ -23,6 +23,138 @@ #define SEARCH_TIMER_ID 'SR' HWND hListView = NULL; + +class CAvailableAppView +{ + static inline VOID InsertTextAfterLoaded_RichEdit(UINT uStringID, + const ATL::CStringW& szText, + DWORD StringFlags, + DWORD TextFlags) + { + ATL::CStringW szLoadedText; + if (!szText.IsEmpty() && szLoadedText.LoadStringW(hInst, uStringID)) + { + InsertRichEditText(szLoadedText, StringFlags); + InsertRichEditText(szText, TextFlags); + } + } + + static inline VOID InsertLoadedTextNewl_RichEdit(UINT uStringID, + DWORD StringFlags) + { + ATL::CStringW szLoadedText; + if (szLoadedText.LoadStringW(hInst, uStringID)) + { + InsertRichEditText(L"\n", 0); + InsertRichEditText(szLoadedText, StringFlags); + InsertRichEditText(L"\n", 0); + } + } + + static VOID InsertVersionInfo_RichEdit(CAvailableApplicationInfo* Info) + { + if (Info->IsInstalled()) + { + if (Info->HasInstalledVersion()) + { + if (Info->HasUpdate()) + InsertLoadedTextNewl_RichEdit(IDS_STATUS_UPDATE_AVAILABLE, CFE_ITALIC); + else + InsertLoadedTextNewl_RichEdit(IDS_STATUS_INSTALLED, CFE_ITALIC); + + InsertTextAfterLoaded_RichEdit(IDS_AINFO_VERSION, Info->szInstalledVersion, CFE_BOLD, 0); + } + else + { + InsertLoadedTextNewl_RichEdit(IDS_STATUS_INSTALLED, CFE_ITALIC); + } + } + else + { + InsertLoadedTextNewl_RichEdit(IDS_STATUS_NOTINSTALLED, CFE_ITALIC); + } + + InsertTextAfterLoaded_RichEdit(IDS_AINFO_AVAILABLEVERSION, Info->szVersion, CFE_BOLD, 0); + } + + static VOID InsertLicenseInfo_RichEdit(CAvailableApplicationInfo* Info) + { + ATL::CStringW szLicense; + switch (Info->LicenseType) + { + case LICENSE_TYPE::OpenSource: + szLicense.LoadStringW(hInst, IDS_LICENSE_OPENSOURCE); + break; + case LICENSE_TYPE::Freeware: + szLicense.LoadStringW(hInst, IDS_LICENSE_FREEWARE); + break; + case LICENSE_TYPE::Trial: + szLicense.LoadStringW(hInst, IDS_LICENSE_TRIAL); + break; + default: + InsertTextAfterLoaded_RichEdit(IDS_AINFO_LICENSE, Info->szLicense, CFE_BOLD, 0); + return; + } + + szLicense += L" (" + Info->szLicense + L")"; + InsertTextAfterLoaded_RichEdit(IDS_AINFO_LICENSE, szLicense, CFE_BOLD, 0); + } + + static VOID InsertLanguageInfo_RichEdit(CAvailableApplicationInfo* Info) + { + const INT nTranslations = Info->Languages.GetSize(); + ATL::CStringW szLangInfo; + ATL::CStringW szLoadedTextAvailability; + ATL::CStringW szLoadedAInfoText; + szLoadedAInfoText.LoadStringW(IDS_AINFO_LANGUAGES); + + if (Info->HasNativeLanguage()) + { + szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_AVAILABLE_TRANSLATION); + } + else if (Info->HasEnglishLanguage()) + { + szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_ENGLISH_TRANSLATION); + } + else + { + szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_NO_TRANSLATION); + } + + if (nTranslations > 1) + { + szLangInfo.Format(L" (+%d more)", nTranslations - 1); + } + else + { + szLangInfo.LoadStringW(IDS_LANGUAGE_SINGLE); + szLangInfo = L" (" + szLangInfo + L")"; + } + + InsertRichEditText(szLoadedAInfoText, CFE_BOLD); + InsertRichEditText(szLoadedTextAvailability, NULL); + InsertRichEditText(szLangInfo, CFE_ITALIC); + } + +public: + static BOOL ShowAvailableAppInfo(INT Index) + { + CAvailableApplicationInfo* Info = (CAvailableApplicationInfo*) ListViewGetlParam(Index); + if (!Info) return FALSE; + + NewRichEditText(Info->szName, CFE_BOLD); + InsertVersionInfo_RichEdit(Info); + InsertLicenseInfo_RichEdit(Info); + InsertLanguageInfo_RichEdit(Info); + + InsertTextAfterLoaded_RichEdit(IDS_AINFO_SIZE, Info->szSize, CFE_BOLD, 0); + InsertTextAfterLoaded_RichEdit(IDS_AINFO_URLSITE, Info->szUrlSite, CFE_BOLD, CFE_LINK); + InsertTextAfterLoaded_RichEdit(IDS_AINFO_DESCRIPTION, Info->szDesc, CFE_BOLD, 0); + InsertTextAfterLoaded_RichEdit(IDS_AINFO_URLDOWNLOAD, Info->szUrlDownload, CFE_BOLD, CFE_LINK); + + return TRUE; + } +}; class CMainToolbar : public CUiWindow< CToolbar<> > @@ -222,9 +354,7 @@ BOOL AddColumn(INT Index, ATL::CStringW& Text, INT Width, INT Format) { - BOOL result = AddColumn(Index, Text.GetBuffer(), Width, Format); - - return result; + return AddColumn(Index, const_cast<LPWSTR>(Text.GetString()), Width, Format); } BOOL AddColumn(INT Index, LPWSTR lpText, INT Width, INT Format) @@ -315,9 +445,7 @@ public: HTREEITEM AddItem(HTREEITEM hParent, ATL::CStringW &Text, INT Image, INT SelectedImage, LPARAM lParam) { - HTREEITEM result = CUiWindow<CTreeView>::AddItem(hParent, Text.GetBuffer(), Image, SelectedImage, lParam); - Text.ReleaseBuffer(); - return result; + return CUiWindow<CTreeView>::AddItem(hParent, const_cast<LPWSTR>(Text.GetString()), Image, SelectedImage, lParam); } HTREEITEM AddCategory(HTREEITEM hRootItem, UINT TextIndex, UINT IconIndex) @@ -406,6 +534,8 @@ BOOL SearchEnabled; + CAvailableApps m_AvailableApps; + public: CMainWindow() : m_ClientPanel(NULL), @@ -413,7 +543,6 @@ SearchEnabled(TRUE) { } - private: VOID InitApplicationsList(VOID) @@ -538,7 +667,7 @@ m_HSplitter->m_Horizontal = TRUE; m_HSplitter->m_Pos = 32768; m_HSplitter->m_MinFirst = 300; - m_HSplitter->m_MinSecond = 80; + m_HSplitter->m_MinSecond = 150; m_VSplitter->Second().Append(m_HSplitter); return m_HSplitter->Create(m_hWnd) != NULL; @@ -669,8 +798,6 @@ SaveSettings(hwnd); FreeLogs(); - - FreeCachedAvailableEntries(); if (IS_INSTALLED_ENUM(SelectedEnumType)) FreeInstalledAppList(); @@ -839,7 +966,7 @@ if (IS_INSTALLED_ENUM(SelectedEnumType)) ShowInstalledAppInfo(ItemIndex); if (IS_AVAILABLE_ENUM(SelectedEnumType)) - ShowAvailableAppInfo(ItemIndex); + CAvailableAppView::ShowAvailableAppInfo(ItemIndex); } } } @@ -860,7 +987,7 @@ if (IS_INSTALLED_ENUM(SelectedEnumType)) ShowInstalledAppInfo(-1); if (IS_AVAILABLE_ENUM(SelectedEnumType)) - ShowAvailableAppInfo(-1); + CAvailableAppView::ShowAvailableAppInfo(-1); } } break; @@ -1094,7 +1221,7 @@ break; case ID_RESETDB: - UpdateAppsDB(); + m_AvailableApps.UpdateAppsDB(); UpdateApplicationsList(-1); break; @@ -1158,21 +1285,20 @@ /* Get version info */ GetApplicationString(ItemInfo->hSubKey, L"DisplayVersion", szText); - ListView_SetItemText(hListView, Index, 1, szText.GetBuffer()); - szText.ReleaseBuffer(); + ListView_SetItemText(hListView, Index, 1, const_cast<LPWSTR>(szText.GetString())); /* Get comments */ GetApplicationString(ItemInfo->hSubKey, L"Comments", szText); - ListView_SetItemText(hListView, Index, 2, szText.GetBuffer()); - szText.ReleaseBuffer(); + ListView_SetItemText(hListView, Index, 2, const_cast<LPWSTR>(szText.GetString())); + return TRUE; } - static BOOL CALLBACK s_EnumAvailableAppProc(PAPPLICATION_INFO Info) + static BOOL CALLBACK s_EnumAvailableAppProc(PAPPLICATION_INFO Info, LPCWSTR szFolderPath) { INT Index; HICON hIcon = NULL; - ATL::CStringW szIconPath; + HIMAGELIST hImageListView = ListView_GetImageList(hListView, LVSIL_SMALL); if (!SearchPatternMatch(Info->szName, szSearchPattern) && @@ -1181,34 +1307,31 @@ return TRUE; } - if (GetStorageDirectory(szIconPath)) - { - /* Load icon from file */ - szIconPath += L"\\rapps\\icons\\" + Info->szName + L".ico"; - hIcon = (HICON) LoadImageW(NULL, - szIconPath.GetString(), - IMAGE_ICON, - LISTVIEW_ICON_SIZE, - LISTVIEW_ICON_SIZE, - LR_LOADFROMFILE); - } - - if (!hIcon) + /* Load icon from file */ + ATL::CStringW szIconPath; + szIconPath.Format(L"%lsicons\\%ls.ico", szFolderPath, Info->szName); + hIcon = (HICON) LoadImageW(NULL, + szIconPath.GetString(), + IMAGE_ICON, + LISTVIEW_ICON_SIZE, + LISTVIEW_ICON_SIZE, + LR_LOADFROMFILE); + + if (!hIcon || GetLastError() != ERROR_SUCCESS) { /* Load default icon */ hIcon = (HICON) LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); } + Index = ImageList_AddIcon(hImageListView, hIcon); DestroyIcon(hIcon); Index = ListViewAddItem(Info->Category, Index, Info->szName, (LPARAM) Info); - hImageListView = ListView_SetImageList(hListView, hImageListView, LVSIL_SMALL); - - ListView_SetItemText(hListView, Index, 1, Info->szVersion.GetBuffer()); - Info->szVersion.ReleaseBuffer(); - - ListView_SetItemText(hListView, Index, 2, Info->szDesc.GetBuffer()); - Info->szDesc.ReleaseBuffer(); + ListView_SetImageList(hListView, hImageListView, LVSIL_SMALL); + + ListView_SetItemText(hListView, Index, 1, const_cast<LPWSTR>(Info->szVersion.GetString())); + ListView_SetItemText(hListView, Index, 2, const_cast<LPWSTR>(Info->szDesc.GetString())); + return TRUE; } @@ -1216,7 +1339,7 @@ VOID UpdateApplicationsList(INT EnumType) { ATL::CStringW szBuffer1, szBuffer2; - HIMAGELIST hImageListView = NULL; + HIMAGELIST hImageListView; m_ListView->SendMessageW(WM_SETREDRAW, FALSE, 0); @@ -1226,20 +1349,23 @@ FreeInstalledAppList(); (VOID) ListView_DeleteAllItems(hListView); + /* Create new ImageList */ hImageListView = ImageList_Create(LISTVIEW_ICON_SIZE, LISTVIEW_ICON_SIZE, GetSystemColorDepth() | ILC_MASK, 0, 1); - hImageListView = ListView_SetImageList(hListView, hImageListView, LVSIL_SMALL); - - if (hImageListView) - ImageList_Destroy(hImageListView); + HIMAGELIST hImageListBuf = ListView_SetImageList(hListView, hImageListView, LVSIL_SMALL); + if (hImageListBuf) + { + ImageList_Destroy(hImageListBuf); + } + if (IS_AVAILABLE_ENUM(EnumType)) { /* Enum available applications */ - EnumAvailableApplications(EnumType, s_EnumAvailableAppProc); + m_AvailableApps.EnumAvailableApplications(EnumType, s_EnumAvailableAppProc); } SelectedEnumType = EnumType; @@ -1263,18 +1389,18 @@ DWORD csStyle = CS_VREDRAW | CS_HREDRAW; static ATL::CWndClassInfo wc = { - { - sizeof(WNDCLASSEX), - csStyle, + { + sizeof(WNDCLASSEX), + csStyle, StartWindowProc, - 0, - 0, + 0, + 0, NULL, LoadIconW(_AtlBaseModule.GetModuleInstance(), MAKEINTRESOURCEW(IDI_MAIN)), LoadCursorW(NULL, IDC_ARROW), - (HBRUSH) (COLOR_BTNFACE + 1), + (HBRUSH) (COLOR_BTNFACE + 1), MAKEINTRESOURCEW(IDR_MAINMENU), - L"RAppsWnd", + L"RAppsWnd", NULL }, NULL, NULL, IDC_ARROW, TRUE, 0, _T("") @@ -1313,7 +1439,14 @@ { return m_RichEdit; } + + CAvailableApps * GetAvailableApps() + { + return &m_AvailableApps; + } }; + +// File interface CMainWindow * g_MainWindow; @@ -1360,9 +1493,7 @@ INT ListViewAddItem(INT ItemIndex, INT IconIndex, ATL::CStringW & Name, LPARAM lParam) { - INT result = ListViewAddItem(ItemIndex, IconIndex, Name.GetBuffer(), lParam); - Name.ReleaseBuffer(); - return result; + return ListViewAddItem(ItemIndex, IconIndex, const_cast<LPWSTR>(Name.GetString()), lParam); } VOID NewRichEditText(const ATL::CStringW& szText, DWORD flags) @@ -1375,3 +1506,7 @@ InsertRichEditText(szText.GetString(), flags); } +CAvailableApps* GetAvailableApps() +{ + return g_MainWindow->GetAvailableApps(); +} Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp [iso-8859-1] Tue Jul 18 22:52:51 2017 @@ -37,7 +37,10 @@ } BOOL -GetInstalledVersion_WowUser(_Out_opt_ ATL::CStringW* szVersionResult, _In_z_ const ATL::CStringW& RegName, _In_ BOOL IsUserKey, _In_ REGSAM keyWow) +GetInstalledVersion_WowUser(_Out_opt_ ATL::CStringW* szVersionResult, + _In_z_ const ATL::CStringW& RegName, + _In_ BOOL IsUserKey, + _In_ REGSAM keyWow) { HKEY hKey; BOOL bHasSucceded = FALSE; @@ -48,7 +51,7 @@ szPath.GetString(), 0, keyWow | KEY_READ, &hKey) == ERROR_SUCCESS) { - if (szVersionResult) + if (szVersionResult != NULL) { DWORD dwSize = MAX_PATH * sizeof(WCHAR); DWORD dwType = REG_SZ; @@ -80,6 +83,14 @@ return bHasSucceded; } +BOOL GetInstalledVersion(ATL::CStringW* pszVersion, const ATL::CStringW& szRegName) +{ + return (!szRegName.IsEmpty() + && (::GetInstalledVersion_WowUser(pszVersion, szRegName, TRUE, KEY_WOW64_32KEY) + || ::GetInstalledVersion_WowUser(pszVersion, szRegName, FALSE, KEY_WOW64_32KEY) + || ::GetInstalledVersion_WowUser(pszVersion, szRegName, TRUE, KEY_WOW64_64KEY) + || ::GetInstalledVersion_WowUser(pszVersion, szRegName, FALSE, KEY_WOW64_64KEY))); +} BOOL UninstallApplication(INT Index, BOOL bModify) Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Tue Jul 18 22:52:51 2017 @@ -232,4 +232,5 @@ IDS_LANGUAGE_NO_TRANSLATION "In your language" IDS_LANGUAGE_NOT_AVAILABLE "No translations" IDS_LANGUAGE_ENGLISH_TRANSLATION "In English" -END + IDS_LANGUAGE_SINGLE "Single language" +END Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] Tue Jul 18 22:52:51 2017 @@ -111,8 +111,7 @@ uiPercentage, szProgress, szProgressMax); - SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) m_ProgressText.GetBuffer()); - m_ProgressText.ReleaseBuffer(); + SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) m_ProgressText.GetString()); } Item = GetDlgItem(m_hDialog, IDC_DOWNLOAD_STATUS); @@ -134,8 +133,7 @@ } /* paste it into our dialog and don't do it again in this instance */ - SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) buf.GetBuffer()); - buf.ReleaseBuffer(); + SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) buf.GetString()); m_UrlHasBeenCopied = TRUE; } @@ -436,8 +434,7 @@ goto end; SetWindowText(Dlg, szMsgText.GetString()); - SendMessageW(GetDlgItem(Dlg, IDC_DOWNLOAD_STATUS), WM_SETTEXT, 0, (LPARAM) Path.GetBuffer()); - Path.ReleaseBuffer(); + SendMessageW(GetDlgItem(Dlg, IDC_DOWNLOAD_STATUS), WM_SETTEXT, 0, (LPARAM) Path.GetString()); /* this may take a while, depending on the file size */ if (!VerifyInteg(AppInfo->szSHA1, Path.GetString())) Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] Tue Jul 18 22:52:51 2017 @@ -193,8 +193,7 @@ BOOL StartProcess(ATL::CStringW &Path, BOOL Wait) { - BOOL result = StartProcess(Path.GetBuffer(), Wait); - Path.ReleaseBuffer(); + BOOL result = StartProcess(const_cast<LPWSTR>(Path.GetString()), Wait); return result; } Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h [iso-8859-1] Tue Jul 18 22:52:51 2017 @@ -104,7 +104,7 @@ ATL::CSimpleArray<ATL::CStringW> Languages; /* caching mechanism related entries */ - ATL::CStringW cFileName; + ATL::CStringW sFileName; FILETIME ftCacheStamp; /* optional integrity checks (SHA-1 digests are 160 bit = 40 characters in hex string form) */ @@ -143,11 +143,66 @@ } SETTINGS_INFO, *PSETTINGS_INFO; /* available.cpp */ -typedef BOOL (CALLBACK *AVAILENUMPROC)(PAPPLICATION_INFO Info); -BOOL EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc); -BOOL ShowAvailableAppInfo(INT Index); -BOOL UpdateAppsDB(VOID); -VOID FreeCachedAvailableEntries(VOID); +typedef BOOL (CALLBACK *AVAILENUMPROC)(PAPPLICATION_INFO Info, LPCWSTR szFolderPath); +struct CAvailableApplicationInfo : public APPLICATION_INFO +{ + ATL::CStringW szInstalledVersion; + + CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam); + + // Load all info from the file + VOID RefreshAppInfo(); + + + + BOOL HasLanguageInfo() const; + BOOL HasNativeLanguage() const; + BOOL HasEnglishLanguage() const; + BOOL IsInstalled() const; + BOOL HasInstalledVersion() const; + BOOL HasUpdate() const; + + // Set a timestamp + VOID SetLastWriteTime(FILETIME* ftTime); + +private: + BOOL m_IsInstalled = FALSE; + BOOL m_HasLanguageInfo = FALSE; + BOOL m_HasInstalledVersion = FALSE; + + inline BOOL GetString(LPCWSTR lpKeyName, + ATL::CStringW& ReturnedString); + + // Lazily load general info from the file + BOOL RetrieveGeneralInfo(); + VOID RetrieveInstalledStatus(); + VOID RetrieveInstalledVersion(); + BOOL RetrieveLanguages(); + VOID RetrieveLicenseType(); + VOID RetrieveCategory(); +}; + +class CAvailableApps +{ + ATL::CAtlList<CAvailableApplicationInfo*> m_InfoList; + ATL::CStringW m_szPath; + ATL::CStringW m_szCabPath; + ATL::CStringW m_szAppsPath; + ATL::CStringW m_szSearchPath; + +public: + CAvailableApps(); + VOID FreeCachedEntries(); + BOOL DeleteCurrentAppsDB(); + BOOL UpdateAppsDB(); + BOOL EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc); + const ATL::CStringW& GetFolderPath(); + const ATL::CStringW& GetAppPath(); + const ATL::CStringW& GetCabPath(); + const LPCWSTR GetFolderPathString(); + const LPCWSTR GetAppPathString(); + const LPCWSTR GetCabPathString(); +}; /* installdlg.cpp */ BOOL InstallApplication(INT Index); @@ -162,7 +217,7 @@ BOOL UninstallApplication(INT Index, BOOL bModify); VOID RemoveAppFromRegistry(INT Index); -BOOL GetInstalledVersion_WowUser(ATL::CStringW* szVersionResult, const ATL::CStringW& RegName, BOOL IsUserKey, REGSAM keyWow); +BOOL GetInstalledVersion(ATL::CStringW* pszVersion, const ATL::CStringW& szRegName); /* winmain.cpp */ extern HWND hMainWnd; @@ -211,6 +266,7 @@ INT ListViewAddItem(INT ItemIndex, INT IconIndex, ATL::CStringW & Name, LPARAM lParam); VOID NewRichEditText(const ATL::CStringW& szText, DWORD flags); VOID InsertRichEditText(const ATL::CStringW& szText, DWORD flags); +CAvailableApps * GetAvailableApps(); extern HWND hListView; extern ATL::CStringW szSearchPattern; Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h [iso-8859-1] Tue Jul 18 22:52:51 2017 @@ -183,6 +183,7 @@ #define IDS_LANGUAGE_NO_TRANSLATION 911 #define IDS_LANGUAGE_NOT_AVAILABLE 912 #define IDS_LANGUAGE_ENGLISH_TRANSLATION 913 +#define IDS_LANGUAGE_SINGLE 914 /* Accelerators */ #define HOTKEYS 715 Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] Tue Jul 18 22:52:51 2017 @@ -183,8 +183,9 @@ ShowWindow(hMainWnd, (SettingsInfo.bSaveWndPos && SettingsInfo.Maximized ? SW_MAXIMIZE : nShowCmd)); UpdateWindow(hMainWnd); + //TODO: get around the ugliness if (SettingsInfo.bUpdateAtStart) - UpdateAppsDB(); + GetAvailableApps()->UpdateAppsDB(); /* Load the menu hotkeys */ KeyBrd = LoadAccelerators(NULL, MAKEINTRESOURCE(HOTKEYS));

7 years, 5 months

[spetreolle] 75372: [BDASUP] Add digital TV tuning device driver to build.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Tue Jul 18 22:48:18 2017 New Revision: 75372 URL: http://svn.reactos.org/svn/reactos?rev=75372&view=rev Log: [BDASUP] Add digital TV tuning device driver to build. Added: trunk/reactos/drivers/multimedia/CMakeLists.txt (with props) trunk/reactos/drivers/multimedia/bdasup/CMakeLists.txt (with props) Modified: trunk/reactos/drivers/CMakeLists.txt Modified: trunk/reactos/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/drivers/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/CMakeLists.txt [iso-8859-1] Tue Jul 18 22:48:18 2017 @@ -12,6 +12,7 @@ add_subdirectory(hid) add_subdirectory(input) add_subdirectory(ksfilter) +add_subdirectory(multimedia) add_subdirectory(network) add_subdirectory(parallel) add_subdirectory(processor) Added: trunk/reactos/drivers/multimedia/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/CMakeLi… ============================================================================== --- trunk/reactos/drivers/multimedia/CMakeLists.txt (added) +++ trunk/reactos/drivers/multimedia/CMakeLists.txt [iso-8859-1] Tue Jul 18 22:48:18 2017 @@ -0,0 +1 @@ +add_subdirectory(bdasup) Propchange: trunk/reactos/drivers/multimedia/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/CMakeLists.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/drivers/multimedia/bdasup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/CMakeLists.txt (added) +++ trunk/reactos/drivers/multimedia/bdasup/CMakeLists.txt [iso-8859-1] Tue Jul 18 22:48:18 2017 @@ -0,0 +1,10 @@ +spec2def(bdasup.sys bdasup.spec ADD_IMPORTLIB) + +add_library(bdasup SHARED + bdasup.c + ${CMAKE_CURRENT_BINARY_DIR}/bdasup.def) + +set_module_type(bdasup kernelmodedriver ENTRYPOINT 0) +add_importlibs(bdasup ks ntoskrnl hal) +add_cd_file(TARGET bdasup DESTINATION reactos/system32/drivers FOR all) + Propchange: trunk/reactos/drivers/multimedia/bdasup/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/bdasup/CMakeLists.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain

7 years, 5 months

[tthompson] 75371: [NTFS] - Fix some more issues, including remaining issues marked as "unresolved" from CR-123: -Add define for indexed flag for resident attributes, RA_INDEXED. -CreateBTreeFromIn...

by tthompson＠svn.reactos.org

Author: tthompson Date: Tue Jul 18 19:59:36 2017 New Revision: 75371 URL: http://svn.reactos.org/svn/reactos?rev=75371&view=rev Log: [NTFS] - Fix some more issues, including remaining issues marked as "unresolved" from CR-123: -Add define for indexed flag for resident attributes, RA_INDEXED. -CreateBTreeFromIndex() - Don't try to read index entries beyond attribute length. -Move NtfsAddFileNameToDirectory() from dirctl.c to mft.c (no changes to function). -SetResidentAttributeDataLength() - Don't try to free AttribData if it hasn't been allocated. Cast IndexRecord to PUCHAR for WriteAttribute(), and cast BitmapData to PCHAR for ReadAttribute() (make gcc happy). -Replace magic number 16 with a define, NTFS_FILE_FIRST_USER_FILE. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Tue Jul 18 19:59:36 2017 @@ -245,7 +245,7 @@ AttributeAddress->Resident.ValueLength = FIELD_OFFSET(FILENAME_ATTRIBUTE, Name) + FilenameNoPath.Length; AttributeAddress->Resident.ValueOffset = ResidentHeaderLength; - AttributeAddress->Resident.Flags = 1; // indexed + AttributeAddress->Resident.Flags = RA_INDEXED; // move the attribute-end and file-record-end markers to the end of the file record AttributeAddress = (PNTFS_ATTR_RECORD)((ULONG_PTR)AttributeAddress + AttributeAddress->Length); Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c [iso-8859-1] Tue Jul 18 19:59:36 2017 @@ -138,6 +138,7 @@ PB_TREE Tree = ExAllocatePoolWithTag(NonPagedPool, sizeof(B_TREE), TAG_NTFS); PB_TREE_FILENAME_NODE RootNode = ExAllocatePoolWithTag(NonPagedPool, sizeof(B_TREE_FILENAME_NODE), TAG_NTFS); PB_TREE_KEY CurrentKey = ExAllocatePoolWithTag(NonPagedPool, sizeof(B_TREE_KEY), TAG_NTFS); + ULONG CurrentOffset = IndexRoot->Header.FirstEntryOffset; DPRINT1("CreateBTreeFromIndex(%p, %p, %p)\n", IndexRootContext, IndexRoot, NewTree); @@ -161,11 +162,21 @@ RootNode->FirstKey = CurrentKey; Tree->RootNode = RootNode; - // Create a key for each entry in the node + // Make sure we won't try reading past the attribute-end + if (FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header) + IndexRoot->Header.TotalSizeOfEntries > IndexRootContext->Record.Resident.ValueLength) + { + DPRINT1("Filesystem corruption detected!\n"); + DestroyBTree(Tree); + return STATUS_FILE_CORRUPT_ERROR; + } + + // Start at the first node entry CurrentNodeEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexRoot + FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header) + IndexRoot->Header.FirstEntryOffset); - while (TRUE) + + // Create a key for each entry in the node + while (CurrentOffset < IndexRoot->Header.TotalSizeOfEntries) { // Allocate memory for the current entry CurrentKey->IndexEntry = ExAllocatePoolWithTag(NonPagedPool, CurrentNodeEntry->Length, TAG_NTFS); @@ -207,6 +218,7 @@ } // Advance to the next entry + CurrentOffset += CurrentNodeEntry->Length; CurrentNodeEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)CurrentNodeEntry + CurrentNodeEntry->Length); CurrentKey = NextKey; } @@ -336,7 +348,7 @@ // Add Length of Current Entry to Total Size of Entries NewIndexRoot->Header.TotalSizeOfEntries += CurrentNodeEntry->Length; - // Go to the next node + // Go to the next node entry CurrentNodeEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)CurrentNodeEntry + CurrentNodeEntry->Length); CurrentKey = CurrentKey->NextKey; @@ -533,16 +545,12 @@ { // Should the New Key go before the current key? LONG Comparison = CompareTreeKeys(NewKey, CurrentKey, CaseSensitive); - if (Comparison == 0) - { - DPRINT1("DRIVER ERROR: Asked to insert key into tree that already has it!\n"); - ExFreePoolWithTag(NewKey, TAG_NTFS); - ExFreePoolWithTag(NewEntry, TAG_NTFS); - return STATUS_INVALID_PARAMETER; - } + + ASSERT(Comparison != 0); + + // Is NewKey < CurrentKey? if (Comparison < 0) { - // NewKey is < CurrentKey // Insert New Key before Current Key NewKey->NextKey = CurrentKey; Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] Tue Jul 18 19:59:36 2017 @@ -185,7 +185,7 @@ DPRINT1("NtfsOpenFileById(%p, %p, %I64x, %p)\n", DeviceExt, FileObject, MftId, FoundFCB); - ASSERT(MftId < 0x10); + ASSERT(MftId < NTFS_FILE_FIRST_USER_FILE); if (MftId > 0xb) /* No entries are used yet beyond this */ { return STATUS_OBJECT_NAME_NOT_FOUND; @@ -375,7 +375,7 @@ return STATUS_INVALID_PARAMETER; MFTId = (*(PULONGLONG)FileObject->FileName.Buffer) & NTFS_MFT_MASK; - if (MFTId < 0x10) + if (MFTId < NTFS_FILE_FIRST_USER_FILE) { Status = NtfsOpenFileById(DeviceExt, FileObject, MFTId, &Fcb); } Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Tue Jul 18 19:59:36 2017 @@ -34,251 +34,6 @@ /* FUNCTIONS ****************************************************************/ -/** -* @name NtfsAddFilenameToDirectory -* @implemented -* -* Adds a $FILE_NAME attribute to a given directory index. -* -* @param DeviceExt -* Points to the target disk's DEVICE_EXTENSION. -* -* @param DirectoryMftIndex -* Mft index of the parent directory which will receive the file. -* -* @param FileReferenceNumber -* File reference of the file to be added to the directory. This is a combination of the -* Mft index and sequence number. -* -* @param FilenameAttribute -* Pointer to the FILENAME_ATTRIBUTE of the file being added to the directory. -* -* @param CaseSensitive -* Boolean indicating if the function should operate in case-sensitive mode. This will be TRUE -* if an application created the file with the FILE_FLAG_POSIX_SEMANTICS flag. -* -* @return -* STATUS_SUCCESS on success. -* STATUS_INSUFFICIENT_RESOURCES if an allocation fails. -* STATUS_NOT_IMPLEMENTED if target address isn't at the end of the given file record. -* -* @remarks -* WIP - Can only support a few files in a directory. -* One FILENAME_ATTRIBUTE is added to the directory's index for each link to that file. So, each -* file which contains one FILENAME_ATTRIBUTE for a long name and another for the 8.3 name, will -* get both attributes added to its parent directory. -*/ -NTSTATUS -NtfsAddFilenameToDirectory(PDEVICE_EXTENSION DeviceExt, - ULONGLONG DirectoryMftIndex, - ULONGLONG FileReferenceNumber, - PFILENAME_ATTRIBUTE FilenameAttribute, - BOOLEAN CaseSensitive) -{ - NTSTATUS Status = STATUS_SUCCESS; - PFILE_RECORD_HEADER ParentFileRecord; - PNTFS_ATTR_CONTEXT IndexRootContext; - PINDEX_ROOT_ATTRIBUTE I30IndexRoot; - ULONG IndexRootOffset; - ULONGLONG I30IndexRootLength; - ULONG LengthWritten; - PNTFS_ATTR_RECORD DestinationAttribute; - PINDEX_ROOT_ATTRIBUTE NewIndexRoot; - ULONG AttributeLength; - PNTFS_ATTR_RECORD NextAttribute; - PB_TREE NewTree; - ULONG BtreeIndexLength; - ULONG MaxIndexSize; - - // Allocate memory for the parent directory - ParentFileRecord = ExAllocatePoolWithTag(NonPagedPool, - DeviceExt->NtfsInfo.BytesPerFileRecord, - TAG_NTFS); - if (!ParentFileRecord) - { - DPRINT1("ERROR: Couldn't allocate memory for file record!\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - // Open the parent directory - Status = ReadFileRecord(DeviceExt, DirectoryMftIndex, ParentFileRecord); - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); - DPRINT1("ERROR: Couldn't read parent directory with index %I64u\n", - DirectoryMftIndex); - return Status; - } - - DPRINT1("Dumping old parent file record:\n"); - NtfsDumpFileRecord(DeviceExt, ParentFileRecord); - - // Find the index root attribute for the directory - Status = FindAttribute(DeviceExt, - ParentFileRecord, - AttributeIndexRoot, - L"$I30", - 4, - &IndexRootContext, - &IndexRootOffset); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ERROR: Couldn't find $I30 $INDEX_ROOT attribute for parent directory with MFT #: %I64u!\n", - DirectoryMftIndex); - ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); - return Status; - } - - // Find the maximum index size given what the file record can hold - MaxIndexSize = DeviceExt->NtfsInfo.BytesPerFileRecord - - IndexRootOffset - - IndexRootContext->Record.Resident.ValueOffset - - FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header) - - (sizeof(ULONG) * 2); - - // Allocate memory for the index root data - I30IndexRootLength = AttributeDataLength(&IndexRootContext->Record); - I30IndexRoot = ExAllocatePoolWithTag(NonPagedPool, I30IndexRootLength, TAG_NTFS); - if (!I30IndexRoot) - { - DPRINT1("ERROR: Couldn't allocate memory for index root attribute!\n"); - ReleaseAttributeContext(IndexRootContext); - ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); - return STATUS_INSUFFICIENT_RESOURCES; - } - - // Read the Index Root - Status = ReadAttribute(DeviceExt, IndexRootContext, 0, (PCHAR)I30IndexRoot, I30IndexRootLength); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ERROR: Couln't read index root attribute for Mft index #%I64u\n", DirectoryMftIndex); - ReleaseAttributeContext(IndexRootContext); - ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); - ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); - return Status; - } - - // Convert the index to a B*Tree - Status = CreateBTreeFromIndex(IndexRootContext, I30IndexRoot, &NewTree); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ERROR: Failed to create B-Tree from Index!\n"); - ReleaseAttributeContext(IndexRootContext); - ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); - ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); - return Status; - } - - DumpBTree(NewTree); - - // Insert the key for the file we're adding - Status = NtfsInsertKey(FileReferenceNumber, FilenameAttribute, NewTree->RootNode, CaseSensitive); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ERROR: Failed to insert key into B-Tree!\n"); - DestroyBTree(NewTree); - ReleaseAttributeContext(IndexRootContext); - ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); - ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); - return Status; - } - - DumpBTree(NewTree); - - // Convert B*Tree back to Index Root - Status = CreateIndexRootFromBTree(DeviceExt, NewTree, MaxIndexSize, &NewIndexRoot, &BtreeIndexLength); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ERROR: Failed to create Index root from B-Tree!\n"); - DestroyBTree(NewTree); - ReleaseAttributeContext(IndexRootContext); - ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); - ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); - return Status; - } - - // We're done with the B-Tree now - DestroyBTree(NewTree); - - // Write back the new index root attribute to the parent directory file record - - // First, we need to resize the attribute. - // CreateIndexRootFromBTree() should have verified that the index root fits within MaxIndexSize. - // We can't set the size as we normally would, because if we extend past the file record, - // we must create an index allocation and index bitmap (TODO). Also TODO: support file records with - // $ATTRIBUTE_LIST's. - AttributeLength = NewIndexRoot->Header.AllocatedSize + FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header); - DestinationAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)ParentFileRecord + IndexRootOffset); - - // Find the attribute (or attribute-end marker) after the index root - NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)DestinationAttribute + DestinationAttribute->Length); - if (NextAttribute->Type != AttributeEnd) - { - DPRINT1("FIXME: For now, only resizing index root at the end of a file record is supported!\n"); - ExFreePoolWithTag(NewIndexRoot, TAG_NTFS); - ReleaseAttributeContext(IndexRootContext); - ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); - ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); - return STATUS_NOT_IMPLEMENTED; - } - - // Update the length of the attribute in the file record of the parent directory - InternalSetResidentAttributeLength(IndexRootContext, - ParentFileRecord, - IndexRootOffset, - AttributeLength); - - NT_ASSERT(ParentFileRecord->BytesInUse <= DeviceExt->NtfsInfo.BytesPerFileRecord); - - Status = UpdateFileRecord(DeviceExt, DirectoryMftIndex, ParentFileRecord); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ERROR: Failed to update file record of directory with index: %llx\n", DirectoryMftIndex); - ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); - ExFreePoolWithTag(NewIndexRoot, TAG_NTFS); - ReleaseAttributeContext(IndexRootContext); - ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); - return Status; - } - - // Write the new index root to disk - Status = WriteAttribute(DeviceExt, - IndexRootContext, - 0, - (PUCHAR)NewIndexRoot, - AttributeLength, - &LengthWritten); - if (!NT_SUCCESS(Status) ) - { - DPRINT1("ERROR: Unable to write new index root attribute to parent directory!\n"); - ExFreePoolWithTag(NewIndexRoot, TAG_NTFS); - ReleaseAttributeContext(IndexRootContext); - ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); - ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); - return Status; - } - - // re-read the parent file record, so we can dump it - Status = ReadFileRecord(DeviceExt, DirectoryMftIndex, ParentFileRecord); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ERROR: Couldn't read parent directory after messing with it!\n"); - } - else - { - DPRINT1("Dumping new parent file record:\n"); - NtfsDumpFileRecord(DeviceExt, ParentFileRecord); - } - - // Cleanup - ExFreePoolWithTag(NewIndexRoot, TAG_NTFS); - ReleaseAttributeContext(IndexRootContext); - ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); - ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); - - return Status; -} - ULONGLONG NtfsGetFileSize(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Tue Jul 18 19:59:36 2017 @@ -750,7 +750,8 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { DPRINT1("Unable to create LargeMcb!\n"); - ExFreePoolWithTag(AttribData, TAG_NTFS); + if (AttribDataSize.QuadPart > 0) + ExFreePoolWithTag(AttribData, TAG_NTFS); _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; @@ -1452,7 +1453,7 @@ { // we need to write the index root attribute back to disk ULONG LengthWritten; - Status = WriteAttribute(Vcb, IndexRootCtx, 0, IndexRecord, AttributeDataLength(&IndexRootCtx->Record), &LengthWritten); + Status = WriteAttribute(Vcb, IndexRootCtx, 0, (PUCHAR)IndexRecord, AttributeDataLength(&IndexRootCtx->Record), &LengthWritten); if (!NT_SUCCESS(Status)) { DPRINT1("ERROR: Couldn't update Index Root!\n"); @@ -1514,7 +1515,7 @@ while (IndexEntry < LastEntry && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) { - if ((IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK) > 0x10 && + if ((IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK) > NTFS_FILE_FIRST_USER_FILE && *CurrentEntry >= *StartEntry && IndexEntry->FileName.NameType != NTFS_FILE_NAME_DOS && CompareFileName(FileName, IndexEntry, DirSearch, CaseSensitive)) @@ -1755,7 +1756,7 @@ } // read $Bitmap attribute - AttrBytesRead = ReadAttribute(DeviceExt, BitmapContext, 0, BitmapData, BitmapDataSize); + AttrBytesRead = ReadAttribute(DeviceExt, BitmapContext, 0, (PCHAR)BitmapData, BitmapDataSize); if (AttrBytesRead == 0) { @@ -1839,6 +1840,251 @@ ExFreePoolWithTag(BitmapData, TAG_NTFS); ReleaseAttributeContext(BitmapContext); + + return Status; +} + +/** +* @name NtfsAddFilenameToDirectory +* @implemented +* +* Adds a $FILE_NAME attribute to a given directory index. +* +* @param DeviceExt +* Points to the target disk's DEVICE_EXTENSION. +* +* @param DirectoryMftIndex +* Mft index of the parent directory which will receive the file. +* +* @param FileReferenceNumber +* File reference of the file to be added to the directory. This is a combination of the +* Mft index and sequence number. +* +* @param FilenameAttribute +* Pointer to the FILENAME_ATTRIBUTE of the file being added to the directory. +* +* @param CaseSensitive +* Boolean indicating if the function should operate in case-sensitive mode. This will be TRUE +* if an application created the file with the FILE_FLAG_POSIX_SEMANTICS flag. +* +* @return +* STATUS_SUCCESS on success. +* STATUS_INSUFFICIENT_RESOURCES if an allocation fails. +* STATUS_NOT_IMPLEMENTED if target address isn't at the end of the given file record. +* +* @remarks +* WIP - Can only support a few files in a directory. +* One FILENAME_ATTRIBUTE is added to the directory's index for each link to that file. So, each +* file which contains one FILENAME_ATTRIBUTE for a long name and another for the 8.3 name, will +* get both attributes added to its parent directory. +*/ +NTSTATUS +NtfsAddFilenameToDirectory(PDEVICE_EXTENSION DeviceExt, + ULONGLONG DirectoryMftIndex, + ULONGLONG FileReferenceNumber, + PFILENAME_ATTRIBUTE FilenameAttribute, + BOOLEAN CaseSensitive) +{ + NTSTATUS Status = STATUS_SUCCESS; + PFILE_RECORD_HEADER ParentFileRecord; + PNTFS_ATTR_CONTEXT IndexRootContext; + PINDEX_ROOT_ATTRIBUTE I30IndexRoot; + ULONG IndexRootOffset; + ULONGLONG I30IndexRootLength; + ULONG LengthWritten; + PNTFS_ATTR_RECORD DestinationAttribute; + PINDEX_ROOT_ATTRIBUTE NewIndexRoot; + ULONG AttributeLength; + PNTFS_ATTR_RECORD NextAttribute; + PB_TREE NewTree; + ULONG BtreeIndexLength; + ULONG MaxIndexSize; + + // Allocate memory for the parent directory + ParentFileRecord = ExAllocatePoolWithTag(NonPagedPool, + DeviceExt->NtfsInfo.BytesPerFileRecord, + TAG_NTFS); + if (!ParentFileRecord) + { + DPRINT1("ERROR: Couldn't allocate memory for file record!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // Open the parent directory + Status = ReadFileRecord(DeviceExt, DirectoryMftIndex, ParentFileRecord); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + DPRINT1("ERROR: Couldn't read parent directory with index %I64u\n", + DirectoryMftIndex); + return Status; + } + + DPRINT1("Dumping old parent file record:\n"); + NtfsDumpFileRecord(DeviceExt, ParentFileRecord); + + // Find the index root attribute for the directory + Status = FindAttribute(DeviceExt, + ParentFileRecord, + AttributeIndexRoot, + L"$I30", + 4, + &IndexRootContext, + &IndexRootOffset); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Couldn't find $I30 $INDEX_ROOT attribute for parent directory with MFT #: %I64u!\n", + DirectoryMftIndex); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + return Status; + } + + // Find the maximum index size given what the file record can hold + MaxIndexSize = DeviceExt->NtfsInfo.BytesPerFileRecord + - IndexRootOffset + - IndexRootContext->Record.Resident.ValueOffset + - FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header) + - (sizeof(ULONG) * 2); + + // Allocate memory for the index root data + I30IndexRootLength = AttributeDataLength(&IndexRootContext->Record); + I30IndexRoot = ExAllocatePoolWithTag(NonPagedPool, I30IndexRootLength, TAG_NTFS); + if (!I30IndexRoot) + { + DPRINT1("ERROR: Couldn't allocate memory for index root attribute!\n"); + ReleaseAttributeContext(IndexRootContext); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // Read the Index Root + Status = ReadAttribute(DeviceExt, IndexRootContext, 0, (PCHAR)I30IndexRoot, I30IndexRootLength); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Couln't read index root attribute for Mft index #%I64u\n", DirectoryMftIndex); + ReleaseAttributeContext(IndexRootContext); + ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + return Status; + } + + // Convert the index to a B*Tree + Status = CreateBTreeFromIndex(IndexRootContext, I30IndexRoot, &NewTree); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to create B-Tree from Index!\n"); + ReleaseAttributeContext(IndexRootContext); + ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + return Status; + } + + DumpBTree(NewTree); + + // Insert the key for the file we're adding + Status = NtfsInsertKey(FileReferenceNumber, FilenameAttribute, NewTree->RootNode, CaseSensitive); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to insert key into B-Tree!\n"); + DestroyBTree(NewTree); + ReleaseAttributeContext(IndexRootContext); + ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + return Status; + } + + DumpBTree(NewTree); + + // Convert B*Tree back to Index Root + Status = CreateIndexRootFromBTree(DeviceExt, NewTree, MaxIndexSize, &NewIndexRoot, &BtreeIndexLength); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to create Index root from B-Tree!\n"); + DestroyBTree(NewTree); + ReleaseAttributeContext(IndexRootContext); + ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + return Status; + } + + // We're done with the B-Tree now + DestroyBTree(NewTree); + + // Write back the new index root attribute to the parent directory file record + + // First, we need to resize the attribute. + // CreateIndexRootFromBTree() should have verified that the index root fits within MaxIndexSize. + // We can't set the size as we normally would, because if we extend past the file record, + // we must create an index allocation and index bitmap (TODO). Also TODO: support file records with + // $ATTRIBUTE_LIST's. + AttributeLength = NewIndexRoot->Header.AllocatedSize + FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header); + DestinationAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)ParentFileRecord + IndexRootOffset); + + // Find the attribute (or attribute-end marker) after the index root + NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)DestinationAttribute + DestinationAttribute->Length); + if (NextAttribute->Type != AttributeEnd) + { + DPRINT1("FIXME: For now, only resizing index root at the end of a file record is supported!\n"); + ExFreePoolWithTag(NewIndexRoot, TAG_NTFS); + ReleaseAttributeContext(IndexRootContext); + ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + return STATUS_NOT_IMPLEMENTED; + } + + // Update the length of the attribute in the file record of the parent directory + InternalSetResidentAttributeLength(IndexRootContext, + ParentFileRecord, + IndexRootOffset, + AttributeLength); + + NT_ASSERT(ParentFileRecord->BytesInUse <= DeviceExt->NtfsInfo.BytesPerFileRecord); + + Status = UpdateFileRecord(DeviceExt, DirectoryMftIndex, ParentFileRecord); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to update file record of directory with index: %llx\n", DirectoryMftIndex); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + ExFreePoolWithTag(NewIndexRoot, TAG_NTFS); + ReleaseAttributeContext(IndexRootContext); + ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); + return Status; + } + + // Write the new index root to disk + Status = WriteAttribute(DeviceExt, + IndexRootContext, + 0, + (PUCHAR)NewIndexRoot, + AttributeLength, + &LengthWritten); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Unable to write new index root attribute to parent directory!\n"); + ExFreePoolWithTag(NewIndexRoot, TAG_NTFS); + ReleaseAttributeContext(IndexRootContext); + ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + return Status; + } + + // re-read the parent file record, so we can dump it + Status = ReadFileRecord(DeviceExt, DirectoryMftIndex, ParentFileRecord); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Couldn't read parent directory after messing with it!\n"); + } + else + { + DPRINT1("Dumping new parent file record:\n"); + NtfsDumpFileRecord(DeviceExt, ParentFileRecord); + } + + // Cleanup + ExFreePoolWithTag(NewIndexRoot, TAG_NTFS); + ReleaseAttributeContext(IndexRootContext); + ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); return Status; } @@ -1995,7 +2241,7 @@ while (IndexEntry < LastEntry && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) { - if ((IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK) >= 0x10 && + if ((IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK) >= NTFS_FILE_FIRST_USER_FILE && *CurrentEntry >= *StartEntry && IndexEntry->FileName.NameType != NTFS_FILE_NAME_DOS && CompareFileName(FileName, IndexEntry, DirSearch, CaseSensitive)) Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Tue Jul 18 19:59:36 2017 @@ -193,6 +193,7 @@ #define NTFS_FILE_QUOTA 9 #define NTFS_FILE_UPCASE 10 #define NTFS_FILE_EXTEND 11 +#define NTFS_FILE_FIRST_USER_FILE 16 #define NTFS_MFT_MASK 0x0000FFFFFFFFFFFFULL @@ -222,6 +223,9 @@ #define NTFS_FILE_TYPE_REPARSE 0x400 #define NTFS_FILE_TYPE_COMPRESSED 0x800 #define NTFS_FILE_TYPE_DIRECTORY 0x10000000 + +/* Indexed Flag in Resident attributes - still somewhat speculative */ +#define RA_INDEXED 0x01 typedef struct { @@ -740,13 +744,6 @@ /* dirctl.c */ -NTSTATUS -NtfsAddFilenameToDirectory(PDEVICE_EXTENSION DeviceExt, - ULONGLONG DirectoryMftIndex, - ULONGLONG FileReferenceNumber, - PFILENAME_ATTRIBUTE FilenameAttribute, - BOOLEAN CaseSensitive); - ULONGLONG NtfsGetFileSize(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, @@ -888,6 +885,13 @@ /* mft.c */ +NTSTATUS +NtfsAddFilenameToDirectory(PDEVICE_EXTENSION DeviceExt, + ULONGLONG DirectoryMftIndex, + ULONGLONG FileReferenceNumber, + PFILENAME_ATTRIBUTE FilenameAttribute, + BOOLEAN CaseSensitive); + NTSTATUS AddNewMftEntry(PFILE_RECORD_HEADER FileRecord, PDEVICE_EXTENSION DeviceExt,

7 years, 5 months

[hbelusca] 75370: [REACTOS]: Russian translation update part 2/2 by amber: time-zones.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jul 17 21:30:20 2017 New Revision: 75370 URL: http://svn.reactos.org/svn/reactos?rev=75370&view=rev Log: [REACTOS]: Russian translation update part 2/2 by amber: time-zones. Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Mon Jul 17 21:30:20 2017 @@ -2121,7 +2121,7 @@ GMT_PLUS_04_A_DAYLIGHT="Arabian Daylight Time" GMT_PLUS_04_A_STANDARD="Arabian Standard Time" -GMT_PLUS_04_B_DESC ="(UTC+04:00) Yerevan" +GMT_PLUS_04_B_DESC ="(GMT+04:00) Yerevan" GMT_PLUS_04_B_DAYLIGHT="Caucasus Daylight Time" GMT_PLUS_04_B_STANDARD="Caucasus Standard Time" @@ -3177,6 +3177,88 @@ COUNTRY_ZM="ÐÐ°Ð¼Ð±Ð¸Ñ" COUNTRY_ZW="ÐÐ¸Ð¼Ð±Ð°Ð±Ð²Ðµ" +GMT_MINUS_12_A_DESC ="(GMT-12:00) ÐÐµÑÐ¸Ð´Ð¸Ð°Ð½ ÑÐ¼ÐµÐ½Ñ Ð´Ð°Ñ (Ð·Ð°Ð¿Ð°Ð´)" +GMT_MINUS_11_A_DESC ="(GMT-11:00) Ð¾. ÐÐ¸Ð´ÑÑÐ¹, Ð¡Ð°Ð¾Ð¼Ð°" +GMT_MINUS_10_A_DESC ="(GMT-10:00) ÐÐ°Ð²Ð°Ð¹Ð¸" +GMT_MINUS_09_A_DESC ="(GMT-09:00) ÐÐ»ÑÑÐºÐ°" +GMT_MINUS_08_A_DESC ="(GMT-08:00) Ð¢Ð¸ÑÐ¾Ð¾ÐºÐµÐ°Ð½ÑÐºÐ¾Ðµ Ð²ÑÐµÐ¼Ñ (Ð¡Ð¨Ð Ð¸ ÐÐ°Ð½Ð°Ð´Ð°)" +GMT_MINUS_07_A_DESC ="(GMT-07:00) ÐÐ¾ÑÐ½Ð¾Ðµ Ð²ÑÐµÐ¼Ñ (Ð¡Ð¨Ð Ð¸ ÐÐ°Ð½Ð°Ð´Ð°)" +GMT_MINUS_07_B_DESC ="(GMT-07:00) ÐÐ° ÐÐ°Ñ, ÐÐ°Ð·Ð°ÑÐ»Ð°Ð½, Ð§Ð¸ÑÑÐ°ÑÑÐ°" +GMT_MINUS_07_C_DESC ="(GMT-07:00) ÐÑÐ¸Ð·Ð¾Ð½Ð°" +GMT_MINUS_06_A_DESC ="(GMT-06:00) Ð¦ÐµÐ½ÑÑÐ°Ð»ÑÐ½Ð¾Ðµ Ð²ÑÐµÐ¼Ñ (Ð¡Ð¨Ð Ð¸ ÐÐ°Ð½Ð°Ð´Ð°)" +GMT_MINUS_06_B_DESC ="(GMT-06:00) Ð¡Ð°ÑÐºÐ°ÑÐµÐ²Ð°Ð½" +GMT_MINUS_06_C_DESC ="(GMT-06:00) ÐÐ²Ð°Ð´Ð°Ð»Ð°ÑÐ°ÑÐ°, ÐÐµÑÐ¸ÐºÐ¾, ÐÐ¾Ð½ÑÐµÑÑÐµÐ¹" +GMT_MINUS_06_D_DESC ="(GMT-06:00) Ð¦ÐµÐ½ÑÑÐ°Ð»ÑÐ½Ð°Ñ ÐÐ¼ÐµÑÐ¸ÐºÐ°" +GMT_MINUS_05_A_DESC ="(GMT-05:00) ÐÐ¾ÑÑÐ¾ÑÐ½Ð¾Ðµ Ð²ÑÐµÐ¼Ñ (Ð¡Ð¨Ð Ð¸ ÐÐ°Ð½Ð°Ð´Ð°)" +GMT_MINUS_05_B_DESC ="(GMT-05:00) ÐÐ½Ð´Ð¸Ð°Ð½Ð° (ÐÐ¾ÑÑÐ¾Ðº)" +GMT_MINUS_05_C_DESC ="(GMT-05:00) ÐÐ¾Ð³Ð¾ÑÐ°, ÐÐ¸ÑÐ¾, ÐÐ¸Ð¼Ð°, Ð Ð¸Ñ-ÐÑÐ°Ð½ÐºÑ" +GMT_MINUS_04_A_DESC ="(GMT-04:00) ÐÑÐ»Ð°Ð½ÑÐ¸ÑÐµÑÐºÐ¾Ðµ Ð²ÑÐµÐ¼Ñ (ÐÐ°Ð½Ð°Ð´Ð°)" +GMT_MINUS_04_B_DESC ="(GMT-04:00) ÐÐ°-ÐÐ°Ñ" +GMT_MINUS_0330_A_DESC ="(GMT-03:30) ÐÑÑÑÐ°ÑÐ»ÐµÐ½Ð´" +GMT_MINUS_03_A_DESC ="(GMT-03:00) Ð¡Ð°Ð½ÑÑÑÐ³Ð¾" +GMT_MINUS_03_B_DESC ="(GMT-03:00) ÐÑÐ°Ð·Ð¸Ð»Ð¸Ñ" +GMT_MINUS_03_C_DESC ="(GMT-03:00) ÐÑÑÐ½Ð¾Ñ-ÐÐ¹ÑÐµÑ, ÐÐ¶Ð¾ÑÐ´Ð¶ÑÐ°ÑÐ½" +GMT_MINUS_03_D_DESC ="(GMT-03:00) ÐÑÐµÐ½Ð»Ð°Ð½Ð´Ð¸Ñ" +GMT_MINUS_02_A_DESC ="(GMT-02:00) Ð¡ÑÐµÐ´Ð½ÐµÐ°ÑÐ»Ð°Ð½ÑÐ¸ÑÐµÑÐºÐ¾Ðµ Ð²ÑÐµÐ¼Ñ" +GMT_MINUS_01_A_DESC ="(GMT-01:00) ÐÐ·Ð¾ÑÑÐºÐ¸Ðµ Ð¾-Ð²Ð°" +GMT_MINUS_01_B_DESC ="(GMT-01:00) Ð¾-Ð²Ð° ÐÐµÐ»ÐµÐ½Ð¾Ð³Ð¾ Ð¼ÑÑÐ°" +GMT_PLUS_00_A_DESC ="(GMT) ÐÑÐµÐ¼Ñ Ð¿Ð¾ ÐÑÐ¸Ð½Ð²Ð¸ÑÑ: ÐÑÐ±Ð»Ð¸Ð½, ÐÐ¾Ð½Ð´Ð¾Ð½, ÐÐ¸ÑÑÐ°Ð±Ð¾Ð½, ÐÐ´Ð¸Ð½Ð±ÑÑÐ³" +GMT_PLUS_00_B_DESC ="(GMT) ÐÐ°ÑÐ°Ð±Ð»Ð°Ð½ÐºÐ°, ÐÐ¾Ð½ÑÐ¾Ð²Ð¸Ñ, Ð ÐµÐ¹ÐºÑÑÐ²Ð¸Ðº" +GMT_PLUS_01_A_DESC ="(GMT+01:00) ÐÐµÐ»Ð³ÑÐ°Ð´, ÐÑÐ°ÑÐ¸ÑÐ»Ð°Ð²Ð°, ÐÑÐ´Ð°Ð¿ÐµÑÑ, ÐÑÐ±Ð»ÑÐ½Ð°, ÐÑÐ°Ð³Ð°" +GMT_PLUS_01_B_DESC ="(GMT+01:00) ÐÐ°ÑÑÐ°Ð²Ð°, ÐÐ°Ð³ÑÐµÐ±, Ð¡Ð°ÑÐ°ÐµÐ²Ð¾, Ð¡ÐºÐ¾Ð¿ÑÐµ" +GMT_PLUS_01_C_DESC ="(GMT+01:00) ÐÑÑÑÑÐµÐ»Ñ, ÐÐ¾Ð¿ÐµÐ½Ð³Ð°Ð³ÐµÐ½, ÐÐ°Ð´ÑÐ¸Ð´, ÐÐ°ÑÐ¸Ð¶" +GMT_PLUS_01_D_DESC ="(GMT+01:00) ÐÐ¼ÑÑÐµÑÐ´Ð°Ð¼, ÐÐµÑÐ»Ð¸Ð½, ÐÑÐµÐ½, ÐÐµÐ½Ð°, Ð Ð¸Ð¼, Ð¡ÑÐ¾ÐºÐ³Ð¾Ð»ÑÐ¼" +GMT_PLUS_02_A_DESC ="(GMT+02:00) ÐÐ¸Ð½ÑÐº" +GMT_PLUS_02_B_DESC ="(GMT+02:00) ÐÐ°Ð¸Ñ" +GMT_PLUS_02_C_DESC ="(GMT+02:00) ÐÐ¸Ð»ÑÐ½ÑÑ, ÐÐ¸ÐµÐ², Ð Ð¸Ð³Ð°, Ð¡Ð¾ÑÐ¸Ñ, Ð¢Ð°Ð»Ð»Ð¸Ð½, Ð¥ÐµÐ»ÑÑÐ¸Ð½ÐºÐ¸" +GMT_PLUS_02_D_DESC ="(GMT+02:00) ÐÑÐ¸Ð½Ñ, ÐÑÑÐ°ÑÐµÑÑ, Ð¡ÑÐ°Ð¼Ð±ÑÐ»" +GMT_PLUS_02_E_DESC ="(GMT+02:00) ÐÐµÑÑÑÐ°Ð»Ð¸Ð¼" +GMT_PLUS_02_F_DESC ="(GMT+02:00) Ð¥Ð°ÑÐ°ÑÐµ, ÐÑÐµÑÐ¾ÑÐ¸Ñ" +GMT_PLUS_02_G_DESC ="(GMT+02:00) ÐÐ°Ð»Ð¸Ð½Ð¸Ð½Ð³ÑÐ°Ð´" +GMT_PLUS_03_A_DESC ="(GMT+03:00) ÐÐ¸Ð½ÑÐº" +GMT_PLUS_03_B_DESC ="(GMT+03:00) ÐÐ¾Ð»Ð³Ð¾Ð³ÑÐ°Ð´, ÐÐ¾ÑÐºÐ²Ð°, Ð¡Ð°Ð½ÐºÑ-ÐÐµÑÐµÑÐ±ÑÑÐ³" +GMT_PLUS_03_C_DESC ="(GMT+03:00) ÐÑÐ²ÐµÐ¹Ñ, ÐÑ-Ð Ð¸ÑÐ´" +GMT_PLUS_03_D_DESC ="(GMT+03:00) ÐÐ°Ð¹ÑÐ¾Ð±Ð¸" +GMT_PLUS_03_E_DESC ="(GMT+03:00) ÐÐ°Ð³Ð´Ð°Ð´" +GMT_PLUS_0330_A_DESC ="(GMT+03:30) Ð¢ÐµÐ³ÐµÑÐ°Ð½" +GMT_PLUS_04_A_DESC ="(GMT+04:00) ÐÐ±Ñ-ÐÐ°Ð±Ð¸, ÐÑÑÐºÐ°Ñ" +GMT_PLUS_04_B_DESC ="(GMT+04:00) ÐÑÐµÐ²Ð°Ð½" +GMT_PLUS_04_C_DESC ="(GMT+04:00) ÐÐ¶ÐµÐ²ÑÐº, Ð¡Ð°Ð¼Ð°ÑÐ°" +GMT_PLUS_0430_A_DESC ="(GMT+04:30) ÐÐ°Ð±ÑÐ»" +GMT_PLUS_05_A_DESC ="(GMT+05:00) ÐÐºÐ°ÑÐµÑÐ¸Ð½Ð±ÑÑÐ³" +GMT_PLUS_05_B_DESC ="(GMT+05:00) ÐÑÐ»Ð°Ð¼Ð°Ð±Ð°Ð´, ÐÐ°ÑÐ°ÑÐ¸, Ð¢Ð°ÑÐºÐµÐ½Ñ" +GMT_PLUS_0530_A_DESC ="(GMT+05:30) ÐÐ°Ð»ÑÐºÑÑÑÐ°, ÐÑÐ¼Ð±Ð°Ð¸, ÐÑÑ-ÐÐµÐ»Ð¸, Ð§ÐµÐ½Ð½Ð°Ð¸" +GMT_PLUS_0530_B_DESC ="(GMT+05:30) Ð¨ÑÐ¸ ÐÐ¶Ð°ÑÐ²Ð°ÑÐ´ÐµÐ½ÐµÐ¿ÑÑÐ°" +GMT_PLUS_0545_A_DESC ="(GMT+05:45) ÐÐ°ÑÐ¼Ð°Ð½Ð´Ñ" +GMT_PLUS_06_A_DESC ="(GMT+06:00) ÐÑÑÐ°Ð½Ð°, ÐÑÐ°ÐºÐ°" +GMT_PLUS_06_B_DESC ="(GMT+06:00) ÐÐ¾Ð²Ð¾ÑÐ¸Ð±Ð¸ÑÑÐº" +GMT_PLUS_0630_A_DESC ="(GMT+06:30) Ð¯Ð½Ð³ÑÐ½ (Ð Ð°Ð½Ð³ÑÐ½)" +GMT_PLUS_07_A_DESC ="(GMT+07:00) ÐÐ°Ð½Ð³ÐºÐ¾Ðº, ÐÐ¶Ð°ÐºÐ°ÑÑÐ°, Ð¥Ð°Ð½Ð¾Ð¹" +GMT_PLUS_07_B_DESC ="(GMT+07:00) ÐÑÐ°ÑÐ½Ð¾ÑÑÑÐº" +GMT_PLUS_08_A_DESC ="(GMT+08:00) ÐÐ¾Ð½ÐºÐ¾Ð½Ð³, ÐÐµÐºÐ¸Ð½, Ð£ÑÑÐ¼ÑÐ¸, Ð§ÑÐ½ÑÐ¸Ð½" +GMT_PLUS_08_B_DESC ="(GMT+08:00) ÐÑÐ°Ð»Ð°-ÐÑÐ¼Ð¿ÑÑ, Ð¡Ð¸Ð½Ð³Ð°Ð¿ÑÑ" +GMT_PLUS_08_C_DESC ="(GMT+08:00) Ð¢Ð°Ð¹Ð¿ÐµÐ¹" +GMT_PLUS_08_D_DESC ="(GMT+08:00) ÐÐµÑÑ" +GMT_PLUS_08_E_DESC ="(GMT+08:00) Ð£Ð»Ð°Ð½-ÐÐ°ÑÐ¾Ñ" +GMT_PLUS_08_F_DESC ="(GMT+08:00) ÐÑÐºÑÑÑÐº" +GMT_PLUS_09_A_DESC ="(GMT+09:00) Ð¡ÐµÑÐ»" +GMT_PLUS_09_B_DESC ="(GMT+09:00) ÐÑÐ°ÐºÐ°, Ð¡Ð°Ð¿Ð¿Ð¾ÑÐ¾, Ð¢Ð¾ÐºÐ¸Ð¾" +GMT_PLUS_09_C_DESC ="(GMT+09:00) Ð¯ÐºÑÑÑÐº" +GMT_PLUS_0930_A_DESC ="(GMT+09:30) ÐÐ°ÑÐ²Ð¸Ð½" +GMT_PLUS_0930_B_DESC ="(GMT+09:30) ÐÐ´ÐµÐ»Ð°Ð¸Ð´Ð°" +GMT_PLUS_10_A_DESC ="(GMT+10:00) ÐÐ°Ð½Ð±ÐµÑÑÐ°, ÐÐµÐ»ÑÐ±ÑÑÐ½, Ð¡Ð¸Ð´Ð½ÐµÐ¹" +GMT_PLUS_10_B_DESC ="(GMT+10:00) ÐÑÐ¸ÑÐ±ÐµÐ¹Ð½" +GMT_PLUS_10_C_DESC ="(GMT+10:00) Ð¥Ð¾Ð±Ð°ÑÑ" +GMT_PLUS_10_D_DESC ="(GMT+10:00) ÐÐ»Ð°Ð´Ð¸Ð²Ð¾ÑÑÐ¾Ðº" +GMT_PLUS_10_E_DESC ="(GMT+10:00) ÐÑÐ°Ð¼, ÐÐ¾ÑÑ ÐÐ¾ÑÐµÑÐ±Ð¸" +GMT_PLUS_10_F_DESC ="(GMT+10:00) ÐÐ°Ð³Ð°Ð´Ð°Ð½" +GMT_PLUS_11_A_DESC ="(GMT+11:00) Ð¡Ð¾Ð»Ð¾Ð¼Ð¾Ð½Ð¾Ð²Ñ Ð¾-Ð²Ð°, ÐÐ¾Ð²Ð°Ñ ÐÐ°Ð»ÐµÐ´Ð¾Ð½Ð¸Ñ" +GMT_PLUS_11_B_DESC ="(GMT+11:00) Ð§Ð¾ÐºÑÑÐ´Ð°Ñ" +GMT_PLUS_12_A_DESC ="(GMT+12:00) ÐÐ°Ð¼ÑÐ°ÑÐºÐ°, ÐÐ°ÑÑÐ°Ð»Ð»Ð¾Ð²Ñ Ð¾-Ð²Ð°, Ð¤Ð¸Ð´Ð¶Ð¸" +GMT_PLUS_12_B_DESC ="(GMT+12:00) ÐÐ½Ð°Ð´ÑÑÑ, ÐÐµÑÑÐ¾Ð¿Ð°Ð²Ð»Ð¾Ð²ÑÐº-ÐÐ°Ð¼ÑÐ°ÑÑÐºÐ¸Ð¹" +GMT_PLUS_12_C_DESC ="(GMT+12:00) ÐÐºÐ»ÐµÐ½Ð´, ÐÐµÐ»Ð»Ð¸Ð½Ð³ÑÐ¾Ð½" +GMT_PLUS_13_A_DESC ="(GMT+13:00) ÐÑÐºÑ-Ð°Ð»Ð¾ÑÐ°" + ; LANG_UKRAINIAN SUBLANG_NEUTRAL [Strings.0022]

7 years, 5 months

[hbelusca] 75369: [REACTOS]: Russian translation update part 1/2 by amber. CORE-13248

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jul 17 21:26:25 2017 New Revision: 75369 URL: http://svn.reactos.org/svn/reactos?rev=75369&view=rev Log: [REACTOS]: Russian translation update part 1/2 by amber. CORE-13248 Modified: trunk/reactos/base/applications/cmdutils/mode/lang/ru-RU.rc trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc trunk/reactos/base/system/userinit/lang/ru-RU.rc trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/dll/cpl/console/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc trunk/reactos/dll/win32/browseui/lang/ru-RU.rc trunk/reactos/dll/win32/iernonce/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc Modified: trunk/reactos/base/applications/cmdutils/mode/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/mode/lang/ru-RU.rc [iso-8859-1] Mon Jul 17 21:26:25 2017 @@ -54,14 +54,14 @@ STRINGTABLE BEGIN - IDS_ERROR_QUERY_DEVICES "ERROR: Unable to query DOS devices (0x%lx).\n" - IDS_ERROR_QUERY_DEVICES_FORM " QueryDosDeviceW(%s) returned unrecognised form %s.\n" + IDS_ERROR_QUERY_DEVICES "ÐÐ¨ÐÐÐÐ: ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¾Ð¿ÑÐ¾ÑÐ¸ÑÑ DOS ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° (0x%lx).\n" + IDS_ERROR_QUERY_DEVICES_FORM " QueryDosDeviceW(%s) Ð²Ð¾Ð·Ð²ÑÐ°ÑÐ¸Ð»Ð° Ð½Ðµ Ð¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ð¾Ðµ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ðµ %s.\n" IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" - IDS_ERROR_INVALID_PARAMETER "ERROR: Invalid parameter - %s\n" - IDS_ERROR_ILLEGAL_DEVICE_NAME "ERROR: Illegal device name - %s (0x%lx)\n" - IDS_ERROR_STATUS_GET_DEVICE "ERROR: Failed to get the status for device COM%d:\n" - IDS_ERROR_STATUS_SET_DEVICE "ERROR: Failed to set the status for device COM%d:\n" - IDS_ERROR_INVALID_PARITY_BITS "ERROR: Invalid value for Parity Bits %d:\n" - IDS_ERROR_INVALID_STOP_BITS "ERROR: Invalid value for Stop Bits %d:\n" - IDS_ERROR_NO_MEMORY "ERROR: Not enough memory.\n" + IDS_ERROR_INVALID_PARAMETER "ÐÐ¨ÐÐÐÐ: ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ - %s\n" + IDS_ERROR_ILLEGAL_DEVICE_NAME "ÐÐ¨ÐÐÐÐ: ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¾Ðµ Ð¸Ð¼Ñ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° - %s (0x%lx)\n" + IDS_ERROR_STATUS_GET_DEVICE "ÐÐ¨ÐÐÐÐ: ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° COM%d:\n" + IDS_ERROR_STATUS_SET_DEVICE "ÐÐ¨ÐÐÐÐ: ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° COM%d:\n" + IDS_ERROR_INVALID_PARITY_BITS "ÐÐ¨ÐÐÐÐ: ÐÐµÐ²ÐµÑÐ½Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð±Ð¸ÑÐ¾Ð² ÑÐµÑÐ½Ð¾ÑÑÐ¸ %d:\n" + IDS_ERROR_INVALID_STOP_BITS "ÐÐ¨ÐÐÐÐ: ÐÐµÐ²ÐµÑÐ½Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ ÑÑÐ¾Ð¿Ð¾Ð²ÑÑ Ð±Ð¸ÑÐ¾Ð² %d:\n" + IDS_ERROR_NO_MEMORY "ÐÐ¨ÐÐÐÐ: ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸.\n" END Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] Mon Jul 17 21:26:25 2017 @@ -137,7 +137,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10 + RTEXT "ÐÐ±ÑÐ°Ñ ÐºÐ¾Ð»Ð»ÐµÐºÑÐ¸Ñ MIDI DLS:", IDC_STATIC, 0, 0, 100, 10 EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ÐÐ²ÑÐºÐ¾Ð²ÑÐµ Ð¿Ð¾ÑÑÑ", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸ ReactX", IDC_STATIC, 5, 97, 452, 70 Modified: trunk/reactos/base/system/userinit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/ru-RU.rc [iso-8859-1] Mon Jul 17 21:26:25 2017 @@ -37,7 +37,7 @@ BEGIN IDS_SHELL_FAIL "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿ÑÑÐºÐ° Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ¸ Ð¿ÑÐ¸ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð°ÑÐ¸Ð¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¾Ð³Ð¾ ÑÐµÐ°Ð½ÑÐ°!" IDS_INSTALLER_FAIL "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿ÑÑÐºÐ° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸!" - IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." + IDS_CANCEL_CONFIRM "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð²ÑÐ¹ÑÐ¸ Ð¸Ð· ReactOS LiveCD?\nÐÐ°Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð±ÑÐ´ÐµÑ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ¶ÐµÐ½." END STRINGTABLE Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Mon Jul 17 21:26:25 2017 @@ -2264,4 +2264,58 @@ UZBEK_CYRILLIC = "Uzbek (Cyrillic)" VIETNAMESE = "Vietnamese" + +; LANG_RUSSIAN SUBLANG_NEUTRAL +[Strings.0019] + +; Services names and descriptions +AUDIO_SERVICE="ÐÐ²ÑÐº Ð¸ Ð°ÑÐ´Ð¸Ð¾" +AUDIO_SERVICE_DESCRIPTION="ÐÐ±ÐµÑÐ¿ÐµÑÐ¸Ð²Ð°ÐµÑ Ð·Ð²ÑÐºÐ¾Ð²ÑÐ¼Ð¸ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°Ð¼Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ." + +BITS_SERVICE="Ð¤Ð¾Ð½Ð¾Ð²Ð°Ñ Ð¸Ð½ÑÐµÐ»Ð»ÐµÐºÑÑÐ°Ð»ÑÐ½Ð°Ñ ÑÐ»ÑÐ¶Ð±Ð° Ð¿ÐµÑÐµÐ´Ð°ÑÐ¸ (BITS)" +BITS_SERVICE_DESCRIPTION="ÐÐ±ÐµÑÐ¿ÐµÑÐ¸Ð²Ð°ÐµÑ Ð¿ÐµÑÐµÐ´Ð°ÑÑ Ð´Ð°Ð½Ð½ÑÑ Ð¼ÐµÐ¶Ð´Ñ ÐºÐ»Ð¸ÐµÐ½ÑÐ°Ð¼Ð¸ Ð¸ ÑÐµÑÐ²ÐµÑÐ°Ð¼Ð¸ Ð² ÑÐ¾Ð½Ð¾Ð²Ð¾Ð¼ ÑÐµÐ¶Ð¸Ð¼Ðµ Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ Ð¿ÑÐ¾Ð¿ÑÑÐºÐ½Ð¾Ð¹ ÑÐ¿Ð¾ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸ Ð¿ÑÐ¾ÑÑÐ°Ð¸Ð²Ð°ÑÑÐµÐ¹ ÑÐµÑÐ¸." + +EVENTLOG_SERVICE="ÐÑÑÐ½Ð°Ð» ÑÐ¾Ð±ÑÑÐ¸Ð¹" +EVENTLOG_SERVICE_DESCRIPTION="Ð ÐµÐ³Ð¸ÑÑÑÐ¸ÑÑÐµÑ ÑÐ¾Ð±ÑÑÐ¸Ñ Ð¸Ð»Ð¸ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ, Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð½ÑÐµ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð¾Ð¹ ÑÐ¸ÑÑÐµÐ¼Ð¾Ð¹ Ð² Ð±Ð°Ð·Ðµ Ð´Ð°Ð½Ð½ÑÑ, Ð´Ð¾ÑÑÑÐ¿Ð½Ð¾Ð¹ ÑÐµÑÐµÐ· ÑÑÐµÐ´ÑÑÐ²Ð¾ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ° Ð¶ÑÑÐ½Ð°Ð»Ð° ÑÐ¾Ð±ÑÑÐ¸Ð¹." + +MSISERVER_SERVICE="Ð£ÑÑÐ°Ð½Ð¾Ð²ÑÐ¸Ðº ReactOS" +MSISERVER_SERVICE_DESCRIPTION="Ð£Ð¿ÑÐ°Ð²Ð»ÑÐµÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¾Ð¹, Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸ÐµÐ¼ Ð¸ ÑÐ´Ð°Ð»ÐµÐ½Ð¸ÐµÐ¼ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼, ÑÐ¿Ð°ÐºÐ¾Ð²Ð°Ð½Ð½ÑÑ Ð² MSI (ÑÑÑÐ°Ð½Ð¾Ð²ÑÐ¸Ðº Windows)." + +NETLOGON_SERVICE="Ð¡ÐµÑÐµÐ²Ð¾Ð¹ Ð²ÑÐ¾Ð´ Ð² ÑÐ¸ÑÑÐµÐ¼Ñ" +NETLOGON_SERVICE_DESCRIPTION="Ð£ÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½ÑÐ¹ ÐºÐ°Ð½Ð°Ð» ÑÐ²ÑÐ·Ð¸ Ñ ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑÐ¾Ð¼ Ð´Ð¾Ð¼ÐµÐ½Ð° Ð´Ð»Ñ Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ ÐµÐ³Ð¾ Ð¿Ð¾Ð´Ð»Ð¸Ð½Ð½Ð¾ÑÑÐ¸." + +PLUGPLAY_SERVICE="Plug and Play" +PLUGPLAY_SERVICE_DESCRIPTION="ÐÐ±Ð½Ð°ÑÑÐ¶Ð¸Ð²Ð°ÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸ Ð¿Ð¾ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸ ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð½Ð¾Ðµ Ð¾Ð±ÐµÑÐ¿ÐµÑÐµÐ½Ð¸Ðµ." + +RPCSS_SERVICE="Ð£Ð´Ð°Ð»ÐµÐ½Ð½ÑÐ¹ Ð²ÑÐ·Ð¾Ð² Ð¿ÑÐ¾ÑÐµÐ´ÑÑ (RPC)" +RPCSS_SERVICE_DESCRIPTION="ÐÐ¾Ð´ÑÐ¸ÑÑÐµÐ¼Ð° Ð´Ð»Ñ Ð²ÑÐ·Ð¾Ð²Ð° ÑÐ´Ð°Ð»ÐµÐ½Ð½ÑÑ Ð¿ÑÐ¾ÑÐµÐ´ÑÑ Ð½Ð° Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð¹ Ð¼Ð°ÑÐ¸Ð½Ðµ." + +SCHEDULE_SERVICE="ÐÐ»Ð°Ð½Ð¸ÑÐ¾Ð²ÑÐ¸Ðº Ð·Ð°Ð´Ð°Ð½Ð¸Ð¹" +SCHEDULE_SERVICE_DESCRIPTION="ÐÐ¾Ð·Ð²Ð¾Ð»ÑÐµÑ Ð·Ð°Ð¿ÑÑÐºÐ°ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð² Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½Ð¾Ðµ Ð²ÑÐµÐ¼Ñ." + +SERVER_SERVICE="Ð¡ÐµÑÐ²ÐµÑ" +SERVER_SERVICE_DESCRIPTION="ÐÐ¾Ð´Ð´ÐµÑÐ¶ÐºÐ° ÑÐ¾Ð²Ð¼ÐµÑÑÐ½Ð¾Ð³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÑÐ°Ð¹Ð»Ð¾Ð², Ð¿ÑÐ¸Ð½ÑÐµÑÐ¾Ð² Ð¸ ÑÐµÑÑÑÑÐ¾Ð² Ð² ÑÐµÑÐ¸." + +SPOOLER_SERVICE="ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð¾ÑÐµÑÐµÐ´Ð¸ Ð¿ÐµÑÐ°ÑÐ¸" +SPOOLER_SERVICE_DESCRIPTION="ÐÐ°Ð³ÑÑÐ¶Ð°ÐµÑ ÑÐ°Ð¹Ð»Ñ Ð² Ð¿Ð°Ð¼ÑÑÑ Ð´Ð»Ñ Ð¿Ð¾ÑÐ»ÐµÐ´ÑÑÑÐµÐ¹ Ð¿ÐµÑÐ°ÑÐ¸." + +TCPSVCS_SERVICE="ÐÑÐ¾ÑÑÑÐµ ÑÐ»ÑÐ¶Ð±Ñ TCP/IP" +TCPSVCS_SERVICE_DECRIPTION="ÐÐ¾Ð´Ð´ÐµÑÐ¶ÐºÐ° ÑÐ»ÐµÐ´ÑÑÑÐ¸Ñ ÑÐ»ÑÐ¶Ð± TCP/IP: Chargen, Daytime, Discard, Echo, QOTD." + +TELNETD_SERVICE="ReactOS Telnet Service" +TELNETD_SERVICE_DESCRIPTION="ReactOS Telnet Service" + +THEMES_SERVICE="Ð¢ÐµÐ¼Ñ" +THEMES_SERVICE_DESCRIPTION="ÐÐ¾Ð´Ð´ÐµÑÐ¶ÐºÐ° ÑÐµÐ¼ Ð¾ÑÐ¾ÑÐ¼Ð»ÐµÐ½Ð¸Ñ." + +WINMGMT_SERVICE="ÐÐ½ÑÑÑÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ ReactOS" +WINMGMT_SERVICE_DESCRIPTION="ÐÑÐµÐ´Ð¾ÑÑÐ°Ð²Ð»ÑÐµÑ Ð¾Ð±ÑÐ¸Ð¹ Ð¸Ð½ÑÐµÑÑÐµÐ¹Ñ Ð´Ð»Ñ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð¾Ð± ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ð¸ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð¾Ð¹ ÑÐ¸ÑÑÐµÐ¼Ð¾Ð¹." + +WLANSVC_SERVICE="ÐÐµÑÐ¿ÑÐ¾Ð²Ð¾Ð´Ð½Ð°Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð°Ñ ÑÐµÑÑ (WLAN)" +WLANSVC_SERVICE_DESCRIPTION="ÐÐ±ÐµÑÐ¿ÐµÑÐ¸Ð²Ð°ÐµÑ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÑ Ð±ÐµÑÐ¿ÑÐ¾Ð²Ð¾Ð´Ð½Ð¾Ð¹ ÑÐµÑÐ¸." + +WORKSTATION_SERVICE="Ð Ð°Ð±Ð¾ÑÐ°Ñ ÑÑÐ°Ð½ÑÐ¸Ñ" +WORKSTATION_SERVICE_DESCRIPTION="ÐÐ±ÐµÑÐ¿ÐµÑÐ¸Ð²Ð°ÐµÑ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÑ ÑÐµÑÐµÐ²ÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ð¹ Ð¸ ÑÐ²ÑÐ·Ñ." + + ; EOF Modified: trunk/reactos/dll/cpl/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ru-RU… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] Mon Jul 17 21:26:25 2017 @@ -27,7 +27,7 @@ GROUPBOX "Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ", IDC_STATIC, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP AUTOCHECKBOX "&ÐÑÑÑÑÐ¾Ðµ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP AUTOCHECKBOX "&Ð ÐµÐ¶Ð¸Ð¼ Ð²ÑÑÐ°Ð²ÐºÐ¸", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31 + GROUPBOX "ÐÐ¾Ð´Ð¾Ð²Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°", IDC_STATIC, 7, 170, 238, 31 COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END @@ -41,8 +41,8 @@ LTEXT "Ð Ð°Ð·Ð¼ÐµÑ:", IDC_STATIC, 130, 7, 45, 10 LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP - AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP - AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP + AUTORADIOBUTTON "&Ð¿Ð¸ÐºÑÐµÐ»Ñ", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP + AUTORADIOBUTTON "&ÑÐ¾ÑÐºÐ¸", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "&Ð¨ÑÐ¸ÑÑ:", IDC_STATIC, 10, 105, 33, 10 AUTOCHECKBOX "&ÐÐ¸ÑÐ½ÑÐ¹", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] Mon Jul 17 21:26:25 2017 @@ -152,13 +152,13 @@ IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Display Settings" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 +CAPTION "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ ÑÐºÑÐ°Ð½Ð°" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÑÐ½Ð½ÑÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ ÑÐºÑÐ°Ð½Ð°?", IDC_STATIC, 7, 7, 219, 8 LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 - PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 - DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 + PUSHBUTTON "&ÐÐ°", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&ÐÐµÑ", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -189,7 +189,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "ÐÐ±ÑÑÐ½ÑÐ¹" - IDS_CLEARTYPEEFFECT "FreeType Antialiased" + IDS_CLEARTYPEEFFECT "FreeType Ð¡Ð³Ð»Ð°Ð¶Ð¸Ð²Ð°Ð½Ð¸Ðµ" END STRINGTABLE @@ -263,5 +263,5 @@ IDS_DISPLAY_SETTINGS "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ ÑÐºÑÐ°Ð½Ð°" IDS_APPLY_FAILED "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¿ÑÐ¸Ð¼ÐµÐ½Ð¸ÑÑ Ð½Ð¾Ð²ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸..." IDS_APPLY_NEEDS_RESTART "ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð´Ð»Ñ Ð¿ÑÐ¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹." - IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." -END + IDS_TIMEOUTTEXT "ÐÐ¾Ð·Ð²ÑÐ°Ñ Ð½Ð°ÑÑÑÐ¾ÐµÐº ÑÐµÑÐµÐ· %d ÑÐµÐº." +END Modified: trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc [iso-8859-1] Mon Jul 17 21:26:25 2017 @@ -264,6 +264,6 @@ IDS_REACTOS_LOGOFF "ÐÑÑÐ¾Ð´ Ð¸Ð· ReactOS" IDS_REACTOS_LOGON "ÐÑÐ¾Ð´ Ð² ReactOS" 5854 "ÐÑÐ¾Ð²Ð¾Ð´Ð½Ð¸Ðº ReactOS" - IDS_BROWSE_FOR_SOUND "Search for new sounds" - IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" -END + IDS_BROWSE_FOR_SOUND "ÐÐ¾Ð¸ÑÐº Ð·Ð²ÑÐºÐ°" + IDS_WAVE_FILES_FILTER "ÐÐ²ÑÐºÐ¾Ð·Ð°Ð¿Ð¸ÑÐ¸ (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc [iso-8859-1] Mon Jul 17 21:26:25 2017 @@ -38,5 +38,5 @@ IDS_TABTITLE "Ð¡Ð¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÑ" IDS_FAILED_NETWORK "Ð ÐµÐ¶Ð¸Ð¼ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð´Ð»Ñ ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ, Ð¿Ð¾ÑÐ¾Ð¼Ñ ÑÑÐ¾ Ð¾Ð½Ð° Ð½Ð°ÑÐ¾Ð´Ð¸ÑÑÑ Ð½Ð° ÑÐµÑÐµÐ²Ð¾Ð¼ Ð´Ð¸ÑÐºÐµ." IDS_FAILED_PROTECTED "Ð ÐµÐ¶Ð¸Ð¼ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½ Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½ÑÐ¾Ð² ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" + IDS_YOU_DID_NOT_ADD "ÐÑ Ð½Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ð»Ð¸ ÑÐµÐ¶Ð¸Ð¼, Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ ÐµÐ³Ð¾ ÑÐµÐ¹ÑÐ°Ñ?" END Modified: trunk/reactos/dll/win32/browseui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] Mon Jul 17 21:26:25 2017 @@ -91,8 +91,8 @@ IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Sho&w title", IDM_BAND_TITLE - MENUITEM "&Close toolbar", IDM_BAND_CLOSE + MENUITEM "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº", IDM_BAND_TITLE + MENUITEM "ÐÐ°ÐºÑÑÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð²", IDM_BAND_CLOSE END /* Dialogs */ Modified: trunk/reactos/dll/win32/iernonce/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iernonce/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/iernonce/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iernonce/lang/ru-RU.rc [iso-8859-1] Mon Jul 17 21:26:25 2017 @@ -9,7 +9,7 @@ IDS_CALLERROR "ÐÑÐ¸ Ð²ÑÐ·Ð¾Ð²Ðµ ÑÑÐ½ÐºÑÐ¸Ð¸ %1 Ð¸Ð· %2 Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° Ð¸Ð»Ð¸ Ð¸ÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ." IDS_INCORRECTFORMAT "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ RunEx Ð¸Ð»Ð¸ RunOnceEx: %1. ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ¸ Ð´Ð¾Ð»Ð¶Ð½Ð° Ð½Ð°ÑÐ¸Ð½Ð°ÑÑÑÑ Ñ ||." // IDS_INCORRECTFORMAT "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ RunEx Ð¸Ð»Ð¸ RunOnceEx: %1. ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ¸ Ð´Ð¾Ð»Ð¶Ð½Ð° Ð½Ð°ÑÐ¸Ð½Ð°ÑÑÑÑ Ñ ||." - IDS_NOEXPORT "Unable to call the function %1 in the file %2 because that function does not exist or is not exported." + IDS_NOEXPORT "ÐÐµÑÐ´Ð°Ð»Ð¾ÑÑ Ð²ÑÐ·Ð²Ð°ÑÑ ÑÑÐ½ÐºÑÐ¸Ñ %1 Ð² ÑÐ°Ð¹Ð»Ðµ %2. Ð¤ÑÐ½ÐºÑÐ¸Ñ Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ Ð¸Ð»Ð¸ Ð½Ðµ ÑÐºÑÐ¿Ð¾ÑÑÐ¸ÑÑÐµÑÑÑ." IDS_EXECUTEERROR "ÐÐ¾ Ð²ÑÐµÐ¼Ñ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ %1 Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° Ð¸Ð»Ð¸ Ð¸ÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ." IDS_NOFUNCTION "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð½Ð°Ð¹ÑÐ¸ ÑÑÐ½ÐºÑÐ¸Ñ %1 Ð² ÑÐ°Ð¹Ð»Ðµ %2." IDS_NODEPENDENCY "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÑÑÐµÐ±ÑÐµÐ¼ÑÐ¹ ÑÐ°Ð¹Ð» %1." Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Mon Jul 17 21:26:25 2017 @@ -31,7 +31,7 @@ EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "ÐÐ°ÑÐ¾Ð»Ñ:", IDC_STATIC, 6, 78, 52, 8 EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD - LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 + LTEXT "ÐÐ¾Ð¹ÑÐ¸ Ð²:", IDC_STATIC, 6, 96, 52, 8 COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 160, 122, 50, 14 @@ -93,7 +93,7 @@ CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:", IDC_STATIC, 7, 61, 78, 8 EDITTEXT IDC_CHANGEPWD_USERNAME, 90, 59, 127, 12, ES_AUTOHSCROLL - LTEXT "ÐÐ¾Ð¹ÑÐ¸ Ð½Ð°:", IDC_STATIC, 7, 78, 78, 8 + LTEXT "ÐÐ¾Ð¹ÑÐ¸ Ð²:", IDC_STATIC, 7, 78, 78, 8 COMBOBOX IDC_CHANGEPWD_DOMAIN, 90, 75, 127, 144, CBS_DROPDOWNLIST | CBS_SORT | WS_TABSTOP LTEXT "Ð¡ÑÐ°ÑÑÐ¹ Ð¿Ð°ÑÐ¾Ð»Ñ:", IDC_STATIC, 7, 95, 78, 8 EDITTEXT IDC_CHANGEPWD_OLDPWD, 90, 92, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD

7 years, 5 months

[hbelusca] 75368: [CRT]: Add a missing _munlock call, caught by Serge Gautherie. CORE-11568

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jul 17 20:55:34 2017 New Revision: 75368 URL: http://svn.reactos.org/svn/reactos?rev=75368&view=rev Log: [CRT]: Add a missing _munlock call, caught by Serge Gautherie. CORE-11568 Modified: trunk/reactos/sdk/lib/crt/stdio/popen.c Modified: trunk/reactos/sdk/lib/crt/stdio/popen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/stdio/popen.c?… ============================================================================== --- trunk/reactos/sdk/lib/crt/stdio/popen.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/stdio/popen.c [iso-8859-1] Mon Jul 17 20:55:34 2017 @@ -52,7 +52,7 @@ TRACE(MK_STR(_tpopen)"('%"sT"', '%"sT"')\n", cm, md); if (cm == NULL) - return( NULL ); + return NULL; szComSpec = _tgetenv(_T("COMSPEC")); if (szComSpec == NULL) @@ -161,6 +161,7 @@ return ret; error: + _munlock(_POPEN_LOCK); if (ProcessInformation.hProcess != 0) CloseHandle(ProcessInformation.hProcess); return NULL;

7 years, 5 months

[ssawant] 75367: [STOBJECT] -Added support for battery enumeration. -Now battery status is available. -Added icons and resources respectively for battery levels. -Now battery changes its icons dyna...

by ssawant＠svn.reactos.org

Author: ssawant Date: Mon Jul 17 19:43:53 2017 New Revision: 75367 URL: http://svn.reactos.org/svn/reactos?rev=75367&view=rev Log: [STOBJECT] -Added support for battery enumeration. -Now battery status is available. -Added icons and resources respectively for battery levels. -Now battery changes its icons dynamically as per its quantized levels. Added: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/ branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/0.ico (with props) branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/1.ico (with props) branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/2.ico (with props) branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/3.ico (with props) branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/4.ico (with props) branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/5.ico (with props) branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging0.ico (with props) branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging1.ico (with props) branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging2.ico (with props) branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging3.ico (with props) branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging4.ico (with props) branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/error.ico (with props) Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/CMakeLists.txt branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/csystray.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/power.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resource.h branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/stobject.rc Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/CMakeLists.txt [iso-8859-1] Mon Jul 17 19:43:53 2017 @@ -29,6 +29,7 @@ target_link_libraries(stobject uuid wine atlnew) add_importlibs(stobject + setupapi advapi32 winmm ole32 Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/csystray.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] Mon Jul 17 19:43:53 2017 @@ -143,7 +143,7 @@ } HRESULT CSysTray::SysTrayThreadProc() -{ +{ WCHAR strFileName[MAX_PATH]; GetModuleFileNameW(g_hInstance, strFileName, MAX_PATH); HMODULE hLib = LoadLibraryW(strFileName); Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/power.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/power.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/power.cpp [iso-8859-1] Mon Jul 17 19:43:53 2017 @@ -4,19 +4,31 @@ * FILE: dll/shellext/stobject/power.cpp * PURPOSE: Power notification icon handler * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> + Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> * David Quintana <gigaherz(a)gmail.com> */ +#include <Windows.h> +#include <SetupAPI.h> +#include <devguid.h> +#include <BatClass.h> + #include "precomp.h" #include "powrprof.h" #include <mmsystem.h> #include <mmddk.h> +#define GBS_HASBATTERY 0x1 +#define GBS_ONBATTERY 0x2 + #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) WINE_DEFAULT_DEBUG_CHANNEL(stobject); + +int br_icons[5] = { IDI_BATTCAP0, IDI_BATTCAP1, IDI_BATTCAP2, IDI_BATTCAP3, IDI_BATTCAP4 }; +int bc_icons[5] = { IDI_BATTCHA0, IDI_BATTCHA1, IDI_BATTCHA2, IDI_BATTCHA3, IDI_BATTCHA4 }; typedef struct _PWRSCHEMECONTEXT { @@ -25,66 +37,181 @@ UINT uiLast; } PWRSCHEMECONTEXT, *PPWRSCHEMECONTEXT; -//static HICON g_hIconBattery = NULL; +static float g_batCap = 0; +static HICON g_hIconBattery = NULL; static HICON g_hIconAC = NULL; static BOOL g_IsRunning = FALSE; +/*** This function enumerates the available battery devices and provides the remaining capacity +@param cap: if no error occurs, then this will contatin average remaining capacity +@param dwResult: helps in making battery type checks +{ +Returned value includes GBS_HASBATTERY if the system has a non-UPS battery, and GBS_ONBATTERY if the system is running on a battery. +dwResult & GBS_ONBATTERY means we have not yet found AC power. +dwResult & GBS_HASBATTERY means we have found a non-UPS battery. +} +@return : error checking +*/ +static HRESULT GetBatteryState(float& cap, DWORD& dwResult) +{ + cap = 0; + dwResult = GBS_ONBATTERY; + + HDEVINFO hdev = SetupDiGetClassDevs(&GUID_DEVCLASS_BATTERY, 0, 0, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE); + if (INVALID_HANDLE_VALUE == hdev) + return E_HANDLE; + + // Limit search to 100 batteries max + for (int idev = 0, count = 0; idev < 100; idev++) + { + SP_DEVICE_INTERFACE_DATA did = { 0 }; + did.cbSize = sizeof(did); + + if (SetupDiEnumDeviceInterfaces(hdev, 0, &GUID_DEVCLASS_BATTERY, idev, &did)) + { + DWORD cbRequired = 0; + + SetupDiGetDeviceInterfaceDetail(hdev, &did, 0, 0, &cbRequired, 0); + if (ERROR_INSUFFICIENT_BUFFER == GetLastError()) + { + PSP_DEVICE_INTERFACE_DETAIL_DATA pdidd = (PSP_DEVICE_INTERFACE_DETAIL_DATA)LocalAlloc(LPTR, cbRequired); + if (pdidd) + { + pdidd->cbSize = sizeof(*pdidd); + if (SetupDiGetDeviceInterfaceDetail(hdev, &did, pdidd, cbRequired, &cbRequired, 0)) + { + // Enumerated a battery. Ask it for information. + HANDLE hBattery = CreateFile(pdidd->DevicePath, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + + if (INVALID_HANDLE_VALUE != hBattery) + { + // Ask the battery for its tag. + BATTERY_QUERY_INFORMATION bqi = { 0 }; + + DWORD dwWait = 0; + DWORD dwOut; + + if (DeviceIoControl(hBattery, IOCTL_BATTERY_QUERY_TAG, &dwWait, sizeof(dwWait), &bqi.BatteryTag, + sizeof(bqi.BatteryTag), &dwOut, NULL) && bqi.BatteryTag) + { + // With the tag, you can query the battery info. + BATTERY_INFORMATION bi = { 0 }; + bqi.InformationLevel = BatteryInformation; + + if (DeviceIoControl(hBattery, IOCTL_BATTERY_QUERY_INFORMATION, &bqi, sizeof(bqi), &bi, + sizeof(bi), &dwOut, NULL)) + { + // Only non-UPS system batteries count + if (bi.Capabilities & BATTERY_SYSTEM_BATTERY) + { + if (!(bi.Capabilities & BATTERY_IS_SHORT_TERM)) + dwResult |= GBS_HASBATTERY; + + // Query the battery status. + BATTERY_WAIT_STATUS bws = { 0 }; + bws.BatteryTag = bqi.BatteryTag; + + BATTERY_STATUS bs; + if (DeviceIoControl(hBattery, IOCTL_BATTERY_QUERY_STATUS, &bws, sizeof(bws), + &bs, sizeof(bs), &dwOut, NULL)) + { + if (bs.PowerState & BATTERY_POWER_ON_LINE) + dwResult &= ~GBS_ONBATTERY; + + // Take average of total capacity of batteries detected! + cap = cap*(count)+(float)bs.Capacity / bi.FullChargedCapacity * 100; + cap /= count + 1; + count++; + } + } + } + } + CloseHandle(hBattery); + } + } + LocalFree(pdidd); + } + } + } + else if (ERROR_NO_MORE_ITEMS == GetLastError()) + { + break; // Enumeration failed - perhaps we're out of items + } + } + SetupDiDestroyDeviceInfoList(hdev); + + // Final cleanup: If we didn't find a battery, then presume that we + // are on AC power. + + if (!(dwResult & GBS_HASBATTERY)) + dwResult &= ~GBS_ONBATTERY; + + return S_OK; +} + +/*** This function quantizes the mentioned quantity to nearest level +@param p: should be a quantity in percentage +@param lvl: quantization level, default is 10 +@return : nearest quantized level +*/ +static UINT Quantize(float p, UINT lvl = 10) +{ + int i = 0; + float f, q = (float)100 / lvl, d = q / 2; + for (f = 0; f < p; f += q, i++); + + if ((f - d) <= p) + return i; + else + return i - 1; +} + +static HICON DynamicLoadIcon(HINSTANCE hinst) +{ + HICON hBatIcon; + float cap = 0; + DWORD dw = 0; + UINT index = -1; + HRESULT hr = GetBatteryState(cap, dw); + if (!FAILED(hr) && (dw & GBS_HASBATTERY)) + { + index = Quantize(cap, 4); + g_batCap = cap; + } + + if (dw & GBS_ONBATTERY) + hBatIcon = LoadIcon(hinst, MAKEINTRESOURCE(index<0 ? IDI_BATTCAP_ERR : br_icons[index])); + else + hBatIcon = LoadIcon(hinst, MAKEINTRESOURCE(index<0 ? IDI_BATTCAP_ERR : bc_icons[index])); + + return hBatIcon; +} HRESULT STDMETHODCALLTYPE Power_Init(_In_ CSysTray * pSysTray) -{ +{ WCHAR strTooltip[128]; - - TRACE("Power_Init\n"); - -// g_hIconBattery = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_BATTERY)); - g_hIconAC = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_BATTERY)); - - HICON icon; -// if (g_IsMute) -// icon = g_hIconBattery; -// else - icon = g_hIconAC; - - LoadStringW(g_hInstance, IDS_PWR_AC, strTooltip, _countof(strTooltip)); - + + TRACE("Power_Init\n"); + + g_hIconBattery = DynamicLoadIcon(g_hInstance); + swprintf(strTooltip, L"%.2f %% Remaining", g_batCap); g_IsRunning = TRUE; - return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_POWER, icon, strTooltip); + return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_POWER, g_hIconBattery, strTooltip); } HRESULT STDMETHODCALLTYPE Power_Update(_In_ CSysTray * pSysTray) { -// BOOL PrevState; - TRACE("Power_Update\n"); -#if 0 - PrevState = g_IsMute; - Volume_IsMute(); - - if (PrevState != g_IsMute) - { - WCHAR strTooltip[128]; - HICON icon; - if (g_IsMute) { - icon = g_hIconMute; - LoadStringW(g_hInstance, IDS_VOL_MUTED, strTooltip, _countof(strTooltip)); - } - else { - icon = g_hIconVolume; - LoadStringW(g_hInstance, IDS_VOL_VOLUME, strTooltip, _countof(strTooltip)); - } - - return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_POWER, icon, strTooltip); - } - else - { - return S_OK; - } -#endif - return S_OK; + WCHAR strTooltip[128]; + g_hIconBattery = DynamicLoadIcon(g_hInstance); + swprintf(strTooltip, L"%.2f %% Remaining", g_batCap); + + return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_POWER, g_hIconBattery, strTooltip); } HRESULT STDMETHODCALLTYPE Power_Shutdown(_In_ CSysTray * pSysTray) Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resource.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resource.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resource.h [iso-8859-1] Mon Jul 17 19:43:53 2017 @@ -39,4 +39,17 @@ #define IDS_KEYS_MOUSE 331 #define IDS_KEYS_FILTER 332 +#define IDI_BATTCAP0 400 +#define IDI_BATTCAP1 401 +#define IDI_BATTCAP2 402 +#define IDI_BATTCAP3 403 +#define IDI_BATTCAP4 404 +#define IDI_BATTCAP5 405 +#define IDI_BATTCHA0 406 +#define IDI_BATTCHA1 407 +#define IDI_BATTCHA2 408 +#define IDI_BATTCHA3 409 +#define IDI_BATTCHA4 410 +#define IDI_BATTCAP_ERR 412 + #define IDR_SYSTRAY 11001 Added: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/0.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/0.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/1.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/1.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/2.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/2.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/3.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/3.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/4.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/4.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/5.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/5.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging0.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging0.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging1.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging1.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging2.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging2.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging3.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging3.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging4.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging4.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/error.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/error.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/stobject.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] Mon Jul 17 19:43:53 2017 @@ -10,6 +10,21 @@ IDI_EXTRACT ICON "resources/2.ico" IDI_VOLUME ICON "resources/3.ico" IDI_VOLMUTE ICON "resources/4.ico" + +IDI_BATTCAP0 ICON "resources/battery/0.ico" +IDI_BATTCAP1 ICON "resources/battery/1.ico" +IDI_BATTCAP2 ICON "resources/battery/2.ico" +IDI_BATTCAP3 ICON "resources/battery/3.ico" +IDI_BATTCAP4 ICON "resources/battery/4.ico" +IDI_BATTCAP5 ICON "resources/battery/5.ico" + +IDI_BATTCHA0 ICON "resources/battery/charging0.ico" +IDI_BATTCHA1 ICON "resources/battery/charging1.ico" +IDI_BATTCHA2 ICON "resources/battery/charging2.ico" +IDI_BATTCHA3 ICON "resources/battery/charging3.ico" +IDI_BATTCHA4 ICON "resources/battery/charging4.ico" + +IDI_BATTCAP_ERR ICON "resources/battery/error.ico" IDR_SYSTRAY REGISTRY "resources/rgs/systray.rgs"

7 years, 5 months

[hbelusca] 75366: [CMD]: Update the description of the START command, with the commutators that are known to work. Translators, please update the translations based on en-US!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jul 17 17:17:22 2017 New Revision: 75366 URL: http://svn.reactos.org/svn/reactos?rev=75366&view=rev Log: [CMD]: Update the description of the START command, with the commutators that are known to work. Translators, please update the translations based on en-US! Modified: trunk/reactos/base/shell/cmd/lang/cs-CZ.rc trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/shell/cmd/lang/sq-AL.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc trunk/reactos/base/shell/cmd/lang/tr-TR.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/zh-CN.rc trunk/reactos/base/shell/cmd/lang/zh-TW.rc Modified: trunk/reactos/base/shell/cmd/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/cs-CZ.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/cs-CZ.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -381,9 +381,18 @@ string Specifies a series of characters to assign to the variable.\n\n\ Type SET without parameters to display the current environment variables.\n" STRING_START_HELP1 "Starts a command.\n\n\ -START command\n\n\ - command Specifies the command to run.\n\n\ -At the moment all commands are started asynchronously.\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + command Specifies the command or program to run.\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "Sets the window title for the command prompt window.\n\n\ TITLE [string]\n\n\ string Specifies the title for the command prompt window.\n" Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -373,9 +373,18 @@ Zeichenfolge Eine Zeichenfolge, die der Variable zugewiesen werden soll.\n\n\ Der Befehl SET ohne Parameter zeigt die aktuellen Umgebungsvariablen an.\n" STRING_START_HELP1 "Startet einen Befehl.\n\n\ -START Befehl\n\n\ - Befehl Befehl welcher ausgefÃ¼hrt werden soll\n\n\ -Achtung: Derzeit werden alle Befehle asynchron ausgefÃ¼hrt.\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + Befehl Befehl welcher ausgefÃ¼hrt werden soll.\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "Legt den Fenstertitel fÃ¼r das Eingabeaufforderungsfenster fest.\n\n\ TITLE [Zeichenfolge]\n\n\ Zeichenfolge Bezeichnet den Titel des Eingabeaufforderungsfensters." Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -380,9 +380,18 @@ string Specifies a series of characters to assign to the variable.\n\n\ Type SET without parameters to display the current environment variables.\n" STRING_START_HELP1 "ÎÎµÎºÎ¹Î½Î¬ÎµÎ¹ ÎÎ½Î± Î¾ÎµÏÏÏÎ¹ÏÏÏ ÏÎ±ÏÎ¬Î¸ÏÏÎ¿ Î³Î¹Î± ÏÎ·Î½ ÎµÎºÏÎÎ»ÎµÏÎ· ÎµÎ½ÏÏ ÎºÎ±Î¸Î¿ÏÎ¹ÏÎ¼ÎÎ½Î¿Ï ÏÏÎ¿Î³ÏÎ¬Î¼Î¼Î±ÏÎ¿Ï Î® ÎµÎ½ÏÎ¿Î»Î®Ï.\n\n\ -START ÎµÎ½ÏÎ¿Î»Î®\n\n\ - ÎµÎ½ÏÎ¿Î»Î® Î ÏÎ¿ÏÎ´Î¹Î¿ÏÎ¯Î¶ÎµÎ¹ ÏÎ·Î½ ÎµÎ½ÏÎ¿Î»Î® Î³Î¹Î± ÎµÎºÏÎÎ»ÎµÏÎ·.\n\n\ -At the moment all commands are started asynchronously.\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + ÎµÎ½ÏÎ¿Î»Î® Î ÏÎ¿ÏÎ´Î¹Î¿ÏÎ¯Î¶ÎµÎ¹ ÏÎ·Î½ ÎµÎ½ÏÎ¿Î»Î® Î³Î¹Î± ÎµÎºÏÎÎ»ÎµÏÎ·.\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "Sets the window title for the command prompt window.\n\n\ TITLE [string]\n\n\ string Specifies the title for the command prompt window.\n" Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -376,9 +376,18 @@ string Specifies a series of characters to assign to the variable.\n\n\ Type SET without parameters to display the current environment variables.\n" STRING_START_HELP1 "Starts a command.\n\n\ -START command\n\n\ - command Specifies the command to run.\n\n\ -At the moment all commands are started asynchronously.\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + command Specifies the command or program to run.\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "Sets the window title for the command prompt window.\n\n\ TITLE [string]\n\n\ string Specifies the title for the command prompt window.\n" Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -378,9 +378,18 @@ string Especifies la serie de caracteres para asignar a la variable.\n\n\ Escribe SET sin parÃ¡metros para mostrar las variables de entorno actuales.\n" STRING_START_HELP1 "Empieza un comando.\n\n\ -START comando\n\n\ - comando Especifica el comando a ejecutar.\n\n\ -Por el momento todos los comandos son ejecutados de forma asincrÃ³nica.\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + comando Especifica el comando a ejecutar.\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "Cambia el tÃtulo de la ventqana del intÃ©rprete de comandos.\n\n\ TITLE [cadena]\n\n\ cadena Especifica el tÃtulo de la ventana del intÃ©rprete de comandos.\n" Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -390,9 +390,18 @@ chaine Indique une sÃ©rie de caractÃ¨res Ã assigner Ã la variable.\n\n\ Taper SET sans paramÃ¨tres pour afficher les variables d'environnement courantes.\n" STRING_START_HELP1 "Lance une commande.\n\n\ -START commande\n\n\ - commande Indique la commande Ã lancer.\n\n\ -Pour le moment toutes les commandes sont lancÃ©es de faÃ§on asynchrone.\n" +START [""titre""] [/D chemin] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [commande/programme] [paramÃ¨tres]\n\n\ + ""titre"" Titre de la fenÃªtre.\n\ + chemin Indique le rÃ©pertoire de dÃ©part.\n\ + I Utilise l'environnement original passÃ© Ã cmd.exe,\n\ + au lieu de l'environnement actuel.\n\ + B Lance la commande ou le programme sans crÃ©er de fenÃªtre.\n\ + MIN DÃ©marre avec la fenÃªtre rÃ©duite.\n\ + MAX DÃ©marre avec la fenÃªtre agrandie.\n\ + WAIT Lance la commande ou le programme et attend qu'elle termine.\n\ + commande Indique la commande ou le programme Ã lancer.\n\ + paramÃ¨tres SpÃ©cifie les paramÃ¨tres Ã passer Ã la commande ou au programme.\n" STRING_TITLE_HELP "Change le titre de la fenÃªtre de l'invite de commandes.\n\n\ TITLE [chaine]\n\n\ chaine Indique le titre de la fenÃªtre de l'invite de commandes." Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -360,9 +360,18 @@ Ã©rtÃ©k A beÃ¡llÃtandÃ³ Ã©rtÃ©k.\n\n\ ParamÃ©terek nÃ©lkÃ¼l megjelenÃti az Ã¶sszes kÃ¶rnyezetivÃ¡ltozÃ³t.\n" STRING_START_HELP1 "VÃ©grehajt egy parancsot.\n\n\ -START parancs\n\n\ - parancs VÃ©grehajtja a megadott parancsot.\n\n\ -Jelenleg minden parancs aszinkron hajtÃ³dik vÃ©gre.\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + parancs VÃ©grehajtja a megadott parancsot.\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "BeÃ¡llÃtja az ablak cÃmsorÃ¡nak szÃ¶vegÃ©t.\n\n\ TITLE [szÃ¶veg]\n\n\ szÃ¶veg BeÃ¡llÃtja az ablak cÃmsorÃ¡nak szÃ¶vegÃ©t.\n" Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -377,9 +377,18 @@ string Menetapkan deretan karakter untuk ditempatkan ke variabel.\n\n\ Ketik SET tanpa parameter untuk menampilkan variabel lingkungan sekarang.\n" STRING_START_HELP1 "Memulai sebuah perintah.\n\n\ -START command\n\n\ - command Menetapkab perintah yang dilaksanakan.\n\n\ -Untuk saat ini semua perintah dimulai secara asinkronos.\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + command Menetapkab perintah yang dilaksanakan.\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "Menyetel judul jendela untuk jendela prompt perintah.\n\n\ TITLE [string]\n\n\ string Menetapkan judul untuk jendela prompt perintah.\n" Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -384,9 +384,18 @@ stringa Indica il testo da assegnare alla variabile.\n\n\ Usa SET senza parametri per visualizzare le variabili attuali.\n" STRING_START_HELP1 "Attiva un comando.\n\n\ -START comando\n\n\ - comando Indica il comando da eseguire.\n\n\ -Al momento tutti i comandi sono attivati in modo asincrono.\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + comando Indica il comando da eseguire.\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "Assegna il titolo per la finestra dei comandi.\n\n\ TITLE [stringa]\n\n\ stringa Indica il titolo.\n" Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -385,9 +385,18 @@ æåå å¤æ°ã«å²ãå½ã¦ãæååãæå®ãã¾ãã\n\n\ ç¾å¨ã®ç°å¢å¤æ°ãè¡¨ç¤ºããã«ã¯ããã©ã¡ã¼ã¿ãæå®ããã« SET ã¨å¥åãã¦ãã ããã\n" STRING_START_HELP1 "å¥ã®ã¦ã£ã³ãã¦ãèµ·åããæå®ããããã°ã©ã ã¾ãã¯ã³ãã³ããå®è¡ãã¾ãã\n\n\ -START ã³ãã³ã\n\n\ - ã³ãã³ã å®è¡ããã³ãã³ããæå®ãã¾ãã\n\n\ -ç¾æç¹ã§ã¯ãã³ãã³ãã¯ãã¹ã¦åæããã«éå§ããã¾ãã\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + ã³ãã³ã å®è¡ããã³ãã³ããæå®ãã¾ãã\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "ã³ãã³ã ããã³ãã ã¦ã£ã³ãã¦ã®ã¦ã£ã³ãã¦ ã¿ã¤ãã«ãè¨å®ãã¾ãã\n\n\ TITLE [æåå]\n\n\ æåå ã³ãã³ã ããã³ãã ã¦ã£ã³ãã¦ã®ã¿ã¤ãã«ãæå®ãã¾ãã\n" Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -375,9 +375,18 @@ string Spesifisere en serie av tegn til bestemme variabel.\n\n\ Skriv SET uten parameter for Ã¥ vise gjeldende miljÃ¸variabler.\n" STRING_START_HELP1 "Start en kommando.\n\n\ -START kommando\n\n\ - kommando Spesifisere kommando for Ã¥ kjÃ¸re.\n\n\ -NB; for Ã¸yeblikket blir alle kommandoer startet asynkront.\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + kommando Spesifisere kommando for Ã¥ kjÃ¸re.\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "Velg vindustittel for kommandotolkvindu.\n\n\ TITLE [streng]\n\n\ streng Spesifisere tittel for kommandotolkvindu.\n" Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -381,9 +381,18 @@ parametry OkreÅla parametry przypisane do tej zmiennej.\n\n\ Wpisz SET bez Å¼adnych parametrÃ³w, by wyÅwietliÄ obecne ustawienia zmiennych.\n" STRING_START_HELP1 "WywoÅuje komendÄ.\n\n\ -START komenda\n\n\ - komenda OkreÅla komendÄ, jaka ma byÄ wywoÅana.\n\n\ -Obecnie wszystkie komendy sÄ uruchamiane asynchronicznie.\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + komenda OkreÅla komendÄ, jaka ma byÄ wywoÅana.\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "Ustawia tytuÅ dla okna ze znakiem zachÄty.\n\n\ TITLE [tytuÅ]\n\n\ tytuÅ OkreÅla tytuÅ dla okna.\n" Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -412,9 +412,18 @@ Èir Seria de caractere asociate variabilei.\n\n\ TastaÈi SET fÄrÄ argumente pentru afiÈarea variabilelor curente.\n" STRING_START_HELP1 "LanseazÄ o comandÄ.\n\n\ -START comandÄ\n\n\ - comandÄ Comanda specificatÄ pentru lansare.\n\n\ -La moment toate comenzile sunt lansate asincron.\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + comandÄ Comanda specificatÄ pentru lansare.\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "StabileÈte titlul pentru fereastra consolei.\n\n\ TITLE [Èir]\n\n\ Èir Titlul specificat pentru fereastra consolei.\n" Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -385,9 +385,18 @@ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¡ÑÑÐ¾ÐºÐ° ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð², Ð¿ÑÐ¸ÑÐ²Ð°Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ Ð¿ÐµÑÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹.\n\n\ SET Ð±ÐµÐ· Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð²ÑÐ²Ð¾Ð´Ð¸Ñ ÑÐµÐºÑÑÐ¸Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð¿ÐµÑÐµÐ¼ÐµÐ½Ð½ÑÑ ÑÑÐµÐ´Ñ.\n" STRING_START_HELP1 "ÐÐ°Ð¿ÑÑÐº ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð¸Ð»Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ.\n\n\ -START ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°\n\n\ - ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¸Ð»Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð° Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÐ°.\n\n\ -Ð Ð´Ð°Ð½Ð½ÑÐ¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð²ÑÐµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð·Ð°Ð¿ÑÑÐºÐ°ÑÑÑÑ Ð°ÑÐ¸Ð½ÑÑÐ¾Ð½Ð½Ð¾.\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¸Ð»Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð° Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÐ°.\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ° Ð¾ÐºÐ½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸.\n\n\ TITLE [ÑÑÑÐ¾ÐºÐ°]\n\n\ ÑÑÑÐ¾ÐºÐ° ÐÑÐ´ÑÑÐ¸Ð¹ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð¾ÐºÐ½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸.\n" Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -382,9 +382,18 @@ string Specifies a series of characters to assign to the variable.\n\n\ Type SET without parameters to display the current environment variables.\n" STRING_START_HELP1 "Starts a command.\n\n\ -START command\n\n\ - command Specifies the command to run.\n\n\ -At the moment all commands are started asynchronously.\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + command Specifies the command or program to run.\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "Sets the window title for the command prompt window.\n\n\ TITLE [string]\n\n\ string Specifies the title for the command prompt window.\n" Modified: trunk/reactos/base/shell/cmd/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sq-AL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sq-AL.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -380,9 +380,18 @@ string Specifikon njÃ« seri karakteresh qÃ« i pÃ«rkasim variablave.\n\n\ Shkuaj SET pa parametra te paraqitura ne ekran pÃ«r variablet e mjedisit.\n" STRING_START_HELP1 "Fillon nÃ« komandÃ«.\n\n\ -START komande\n\n\ - command Specifiko komandÃ«n pÃ«r tÃ« filluar.\n\n\ -NÃ« kÃ«tÃ« moment tÃ« gjithÃ« komandat janÃ« nisur sipas sinkronizimit.\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + komande Specifiko komandÃ«n pÃ«r tÃ« filluar.\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "Vendos titullin e dritares pÃ«r dritaren e komandÃ«ns se shpejtÃ«.\n\n\ TITLE [string]\n\n\ string Specifikon titullin e dritares pÃ«r dritaren e komandÃ«ns se shpejtÃ«.\n" Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -375,9 +375,18 @@ string Anger en serie av tegn til bestemme variabel.\n\n\ Skriv SET uten parameter fÃ¶r att visa aktuell miljÃ¸variabler.\n" STRING_START_HELP1 "Start en kommando.\n\n\ -START kommando\n\n\ - kommando Anger kommando fÃ¶r att kjÃ¸re.\n\n\ -NB; for Ã¸yeblikket blir alle kommandoer startet asynkront.\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + kommando Anger kommando fÃ¶r att kjÃ¸re.\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "Velg vindustittel for kommandotolkvindu.\n\n\ TITLE [streng]\n\n\ streng Anger tittel for kommandotolkvindu.\n" Modified: trunk/reactos/base/shell/cmd/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/tr-TR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/tr-TR.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -382,9 +382,18 @@ string DeÄiÅkene atamak iÃ§in bir dizi damgayÄ± belirtir.\n\n\ Åimdiki ortam deÄiÅkenlerini gÃ¶rÃ¼ntÃ¼lemek iÃ§in deÄiÅkensiz SET yazÄ±nÄ±z.\n" STRING_START_HELP1 "Bir komut baÅlatÄ±r.\n\n\ -START komut\n\n\ - komut ÃalÄ±ÅtÄ±rÄ±lacak komutu belirtir.\n\n\ -Åu anda tÃ¼m komutlar eÅ zamanlÄ± olmadan Ã§alÄ±ÅtÄ±rÄ±lmÄ±ÅtÄ±r.\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + komut ÃalÄ±ÅtÄ±rÄ±lacak komutu belirtir.\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "Komut istemi penceresi iÃ§in pencere baÅlÄ±ÄÄ±nÄ± ayarlar.\n\n\ TITLE [dizgi]\n\n\ dizgi Komut istemi penceresi iÃ§in baÅlÄ±ÄÄ± belirtir.\n" Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -386,9 +386,18 @@ Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ Ð ÑÐ´Ð¾Ðº ÑÐ¸Ð¼Ð²Ð¾Ð»iÐ², ÑÐ¾ Ð¿ÑÐ¸Ð·Ð½Ð°ÑÐ°ÑÑÑÑÑ Ð²ÐºÐ°Ð·Ð°Ð½iÐ¹ Ð·Ð¼iÐ½Ð½iÐ¹.\n\n\ SET Ð±ÐµÐ· Ð¿Ð°ÑÐ°Ð¼ÐµÑÑiÐ² Ð²Ð¸Ð²Ð¾Ð´Ð¸ÑÑ Ð¿Ð¾ÑÐ¾ÑÐ½i Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ Ð·Ð¼iÐ½Ð½Ð¸Ñ ÑÐµÑÐµÐ´Ð¾Ð²Ð¸ÑÐ°.\n" STRING_START_HELP1 "ÐÐ°Ð¿ÑÑÐº ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸.\n\n\ -START ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°\n\n\ - ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÑ.\n\n\ -ÐÐ° Ð´Ð°Ð½Ð¸Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð²Ñi ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ ÑÑÐ°ÑÑÑÑÑÑ Ð°ÑÐ¸Ð½ÑÑÐ¾Ð½Ð½Ð¾.\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÑ.\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "ÐÐ¼iÐ½Ð° Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ° Ð²iÐºÐ½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ ÑÑÐ´ÐºÐ°.\n\n\ TITLE [ÑÑÐ´Ð¾Ðº]\n\n\ ÑÑÐ´Ð¾Ðº ÐÐ°Ð¹Ð±ÑÑÐ½iÐ¹ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð²iÐºÐ½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ ÑÑÐ´ÐºÐ°.\n" Modified: trunk/reactos/base/shell/cmd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-CN.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -351,9 +351,18 @@ åç¬¦ä¸² æå®è¦èµç»è¯¥ç¯å¢åéçä¸ç³»ååç¬¦ã\n\n\ æ§è¡ä¸å¸¦åæ°ç SET å°ä¼æ¾ç¤ºå½åææç¯å¢åéã\n" STRING_START_HELP1 "å¯å¨ä¸ä¸ªå½ä»¤ã\n\n\ -START å½ä»¤\n\n\ - å½ä»¤ è¦å¯å¨çå½ä»¤ã\n\n\ -ç°å¨ææçå½ä»¤æ¯å¼æ¥å¯å¨çã\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + å½ä»¤ è¦å¯å¨çå½ä»¤ã\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "è®¾ç½®å½ä»¤æç¤ºç¬¦çªå£çæ é¢ã\n\n\ TITLE [åç¬¦ä¸²]\n\n\ åç¬¦ä¸² æå®å½ä»¤æç¤ºç¬¦çªå£çæ é¢ã\n" Modified: trunk/reactos/base/shell/cmd/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-TW.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-TW.rc [iso-8859-1] Mon Jul 17 17:17:22 2017 @@ -351,9 +351,18 @@ ååä¸² æå®è¦è³¦çµ¦è©²ç°å¢è®æ¸çä¸ç³»åååã\n\n\ å·è¡ä¸å¸¶åæ¸ç SET å°æé¡¯ç¤ºç¶åææç°å¢è®æ¸ã\n" STRING_START_HELP1 "ååä¸åå½ä»¤ã\n\n\ -START å½ä»¤\n\n\ - å½ä»¤ è¦ååçå½ä»¤ã\n\n\ -ç¾å¨ææçå½ä»¤æ¯éåæ¥ååçã\n" +START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [command/program] [parameters]\n\n\ + ""title"" Title of the window.\n\ + path Specifies the startup directory.\n\ + I Uses the original environment given to cmd.exe,\n\ + instead of the current environment.\n\ + B Starts the command or program without creating any window.\n\ + MIN Starts with a minimized window.\n\ + MAX Starts with a maximized window.\n\ + WAIT Starts the command or program and waits for its termination.\n\ + å½ä»¤ è¦ååçå½ä»¤ã\n\ + parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "è¨å®å½ä»¤æç¤ºç¬¦è¦çªçæ¨é¡ã\n\n\ TITLE [ååä¸²]\n\n\ ååä¸² æå®å½ä»¤æç¤ºç¬¦è¦çªçæ¨é¡ã\n"

7 years, 5 months

[hbelusca] 75365: [MSVCRT][CRT]: Improvements/fixes over popen(), from Wine code and ported by Andreas Maier: the popen_handles array, which is used in _pclose, was never filled. _popen correctly f...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jul 17 16:11:18 2017 New Revision: 75365 URL: http://svn.reactos.org/svn/reactos?rev=75365&view=rev Log: [MSVCRT][CRT]: Improvements/fixes over popen(), from Wine code and ported by Andreas Maier: the popen_handles array, which is used in _pclose, was never filled. _popen correctly fills it now. Should fix returned codes by popen() and pclose(), which are functions that are called by windres, and this latter expects them to succeed. This was not the case before, in ROS, and therefore trying to e.g. compile ROS within ROS failed from time to time with windres throwing the error that "preprocessing failed". CORE-11568 #resolve Added: trunk/reactos/sdk/lib/crt/include/internal/popen.h (with props) Modified: trunk/reactos/dll/win32/crtdll/dllmain.c trunk/reactos/dll/win32/msvcrt/dllmain.c trunk/reactos/dll/win32/msvcrt20/msvcrt20.c trunk/reactos/dll/win32/msvcrt40/msvcrt40.c trunk/reactos/sdk/lib/crt/include/internal/wine/msvcrt.h trunk/reactos/sdk/lib/crt/precomp.h trunk/reactos/sdk/lib/crt/stdio/popen.c Modified: trunk/reactos/dll/win32/crtdll/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/dllmain.c… ============================================================================== --- trunk/reactos/dll/win32/crtdll/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/dllmain.c [iso-8859-1] Mon Jul 17 16:11:18 2017 @@ -161,6 +161,7 @@ /* Deinit of the WINE code */ msvcrt_free_io(); if (reserved) break; + msvcrt_free_popen_data(); msvcrt_free_mt_locks(); //msvcrt_free_console(); //msvcrt_free_args(); Modified: trunk/reactos/dll/win32/msvcrt/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/dllmain.c… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/dllmain.c [iso-8859-1] Mon Jul 17 16:11:18 2017 @@ -98,6 +98,7 @@ /* Deinit of the WINE code */ msvcrt_free_io(); if (reserved) break; + msvcrt_free_popen_data(); msvcrt_free_mt_locks(); //msvcrt_free_console(); //msvcrt_free_args(); Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2… ============================================================================== --- trunk/reactos/dll/win32/msvcrt20/msvcrt20.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt20/msvcrt20.c [iso-8859-1] Mon Jul 17 16:11:18 2017 @@ -117,6 +117,7 @@ /* Deinit of the WINE code */ msvcrt_free_io(); if (reserved) break; + msvcrt_free_popen_data(); msvcrt_free_mt_locks(); //msvcrt_free_console(); //msvcrt_free_args(); Modified: trunk/reactos/dll/win32/msvcrt40/msvcrt40.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt40/msvcrt4… ============================================================================== --- trunk/reactos/dll/win32/msvcrt40/msvcrt40.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt40/msvcrt40.c [iso-8859-1] Mon Jul 17 16:11:18 2017 @@ -113,6 +113,7 @@ /* Deinit of the WINE code */ msvcrt_free_io(); if (reserved) break; + msvcrt_free_popen_data(); msvcrt_free_mt_locks(); //msvcrt_free_console(); //msvcrt_free_args(); Added: trunk/reactos/sdk/lib/crt/include/internal/popen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/include/intern… ============================================================================== --- trunk/reactos/sdk/lib/crt/include/internal/popen.h (added) +++ trunk/reactos/sdk/lib/crt/include/internal/popen.h [iso-8859-1] Mon Jul 17 16:11:18 2017 @@ -0,0 +1,15 @@ +#ifndef __CRT_INTERNAL_POPEN_H +#define __CRT_INTERNAL_POPEN_H + +#ifndef _CRT_PRECOMP_H +#error DO NOT INCLUDE THIS HEADER DIRECTLY +#endif + +struct popen_handle { + FILE *f; + HANDLE proc; +}; +extern struct popen_handle *popen_handles; +extern DWORD popen_handles_size; + +#endif Propchange: trunk/reactos/sdk/lib/crt/include/internal/popen.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/sdk/lib/crt/include/internal/wine/msvcrt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/include/intern… ============================================================================== --- trunk/reactos/sdk/lib/crt/include/internal/wine/msvcrt.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/include/internal/wine/msvcrt.h [iso-8859-1] Mon Jul 17 16:11:18 2017 @@ -95,6 +95,7 @@ extern void msvcrt_free_args(void); extern void msvcrt_init_signals(void); extern void msvcrt_free_signals(void); +extern void msvcrt_free_popen_data(void); extern unsigned create_io_inherit_block(WORD*, BYTE**); Modified: trunk/reactos/sdk/lib/crt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/precomp.h?rev=… ============================================================================== --- trunk/reactos/sdk/lib/crt/precomp.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/precomp.h [iso-8859-1] Mon Jul 17 16:11:18 2017 @@ -73,6 +73,7 @@ #include <internal/mbstring.h> #include <internal/misc.h> #include <internal/mtdll.h> +#include <internal/popen.h> #include <internal/rterror.h> #include <internal/safecrt.h> #include <internal/time.h> Modified: trunk/reactos/sdk/lib/crt/stdio/popen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/stdio/popen.c?… ============================================================================== --- trunk/reactos/sdk/lib/crt/stdio/popen.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/stdio/popen.c [iso-8859-1] Mon Jul 17 16:11:18 2017 @@ -1,11 +1,12 @@ /* -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS C runtime library -* FILE: lib/sdk/crt/stdio/popen.c -* PURPOSE: Pipe Functions -* PROGRAMERS: Eric Kohl - Hartmut Birr -*/ + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS C runtime library + * FILE: lib/sdk/crt/stdio/popen.c + * PURPOSE: Pipe Functions + * PROGRAMMERS: Eric Kohl + * Hartmut Birr + * Also adapted from Wine team code by Andreas Maier. + */ #include <precomp.h> #include <tchar.h> @@ -22,11 +23,13 @@ unsigned split_oflags(unsigned oflags); //FIXME: Remove #ifndef _UNICODE -static struct popen_handle { - FILE *f; - HANDLE proc; -} *popen_handles; -static DWORD popen_handles_size; +struct popen_handle *popen_handles = NULL; +DWORD popen_handles_size = 0; + +void msvcrt_free_popen_data(void) +{ + free(popen_handles); +} #endif /* @@ -37,12 +40,14 @@ _TCHAR *szCmdLine=NULL; _TCHAR *szComSpec=NULL; _TCHAR *s; - FILE *pf; + FILE *ret; HANDLE hReadPipe, hWritePipe; BOOL result; STARTUPINFO StartupInfo; PROCESS_INFORMATION ProcessInformation; SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE}; + struct popen_handle *container; + DWORD i; TRACE(MK_STR(_tpopen)"('%"sT"', '%"sT"')\n", cm, md); @@ -80,6 +85,7 @@ return NULL; } + memset(&ProcessInformation, 0, sizeof(ProcessInformation)); memset(&StartupInfo, 0, sizeof(STARTUPINFO)); StartupInfo.cb = sizeof(STARTUPINFO); @@ -117,20 +123,47 @@ } CloseHandle(ProcessInformation.hThread); - CloseHandle(ProcessInformation.hProcess); + + _mlock(_POPEN_LOCK); + for(i=0; i<popen_handles_size; i++) + { + if (!popen_handles[i].f) + break; + } + if (i==popen_handles_size) + { + i = (popen_handles_size ? popen_handles_size*2 : 8); + container = realloc(popen_handles, i*sizeof(*container)); + if (!container) goto error; + + popen_handles = container; + container = popen_handles+popen_handles_size; + memset(container, 0, (i-popen_handles_size)*sizeof(*container)); + popen_handles_size = i; + } + else container = popen_handles+i; if ( *md == 'r' ) { - pf = _tfdopen(msvcrt_alloc_fd(hReadPipe, split_oflags(_fmode)) , _T("r")); + ret = _tfdopen(msvcrt_alloc_fd(hReadPipe, split_oflags(_fmode)) , _T("r")); CloseHandle(hWritePipe); } else { - pf = _tfdopen( msvcrt_alloc_fd(hWritePipe, split_oflags(_fmode)) , _T("w")); + ret = _tfdopen( msvcrt_alloc_fd(hWritePipe, split_oflags(_fmode)) , _T("w")); CloseHandle(hReadPipe); } - return( pf ); + container->f = ret; + container->proc = ProcessInformation.hProcess; + _munlock(_POPEN_LOCK); + + return ret; + +error: + if (ProcessInformation.hProcess != 0) + CloseHandle(ProcessInformation.hProcess); + return NULL; } #ifndef _UNICODE

7 years, 5 months

← Newer
1
...
7
8
9
10
11
12
13
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2017