Ros-diffs September 2017

ros-diffs@reactos.org

17 participants
284 discussions

[ashaposhnikov] 75760: [RAPPS] Complete renaming
by ashaposhnikov＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: ashaposhnikov Date: Sun Sep 3 21:03:06 2017 New Revision: 75760 URL: http://svn.reactos.org/svn/reactos?rev=75760&view=rev Log: [RAPPS] Complete renaming Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp 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] Sun Sep 3 21:03:06 2017 @@ -949,7 +949,7 @@ switch (((LPNMTREEVIEW) lParam)->itemNew.lParam) { case IDS_INSTALLED: - UpdateApplicationsList(ENUM_ALL_COMPONENTS); + UpdateApplicationsList(ENUM_ALL_INSTALLED); break; case IDS_APPLICATIONS:

1 0

[ashaposhnikov] 75759: [RAPPS] Amendment: undo renaming in loaddlg.cpp
by ashaposhnikov＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: ashaposhnikov Date: Sun Sep 3 20:48:53 2017 New Revision: 75759 URL: http://svn.reactos.org/svn/reactos?rev=75759&view=rev Log: [RAPPS] Amendment: undo renaming in loaddlg.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp 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] Sun Sep 3 20:48:53 2017 @@ -67,17 +67,16 @@ return szString; } - struct DownloadInfo { DownloadInfo() {} DownloadInfo(const CAvailableApplicationInfo& AppInfo) - :szUrl(AppInfo.m_szUrlDownload), m_szName(AppInfo.m_szName), szSHA1(AppInfo.m_szSHA1) + :szUrl(AppInfo.m_szUrlDownload), szName(AppInfo.m_szName), szSHA1(AppInfo.m_szSHA1) { } ATL::CStringW szUrl; - ATL::CStringW m_szName; + ATL::CStringW szName; ATL::CStringW szSHA1; }; @@ -259,7 +258,7 @@ { for (INT i = 0; i < arrInfo.GetSize(); ++i) { - AddRow(i, arrInfo[i].m_szName.GetString(), DOWNLOAD_STATUS::DLWaiting); + AddRow(i, arrInfo[i].szName.GetString(), DOWNLOAD_STATUS::DLWaiting); } } @@ -639,7 +638,7 @@ // Change caption to show the currently downloaded app if (!bCab) { - szNewCaption.Format(szCaption, CurrentInfo.m_szName.GetString()); + szNewCaption.Format(szCaption, CurrentInfo.szName.GetString()); } else { @@ -868,7 +867,7 @@ { static DownloadInfo DatabaseDLInfo; DatabaseDLInfo.szUrl = lpUrl; - DatabaseDLInfo.m_szName.LoadStringW(IDS_DL_DIALOG_DB_DISP); + DatabaseDLInfo.szName.LoadStringW(IDS_DL_DIALOG_DB_DISP); Download(DatabaseDLInfo, TRUE); }

1 0

[ashaposhnikov] 75758: [RAPPS] Formatting fixes - CAvailableApplicationInfo: added m_ prefixes to members - CAvailableApps: renamed EnumAvailableApplications to Enum - Renamed LICENSE_TYPE enum to ...
by ashaposhnikov＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: ashaposhnikov Date: Sun Sep 3 20:37:14 2017 New Revision: 75758 URL: http://svn.reactos.org/svn/reactos?rev=75758&view=rev Log: [RAPPS] Formatting fixes - CAvailableApplicationInfo: added m_ prefixes to members - CAvailableApps: renamed EnumAvailableApplications to Enum - Renamed LICENSE_TYPE enum to LicenseType and renamed enum values - unattended.cpp: Added license header Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.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] Sun Sep 3 20:37:14 2017 @@ -21,16 +21,16 @@ CAvailableApplicationInfo::CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam) : m_Parser(sFileNameParam) { - LicenseType = LICENSE_TYPE::None; - - sFileName = sFileNameParam; + m_LicenseType = LicenseType::LICENSE_NONE; + + m_sFileName = sFileNameParam; RetrieveGeneralInfo(); } VOID CAvailableApplicationInfo::RefreshAppInfo() { - if (szUrlDownload.IsEmpty()) + if (m_szUrlDownload.IsEmpty()) { RetrieveGeneralInfo(); } @@ -39,23 +39,23 @@ // Lazily load general info from the file VOID CAvailableApplicationInfo::RetrieveGeneralInfo() { - Category = m_Parser.GetInt(L"Category"); - - if (!GetString(L"Name", szName) - || !GetString(L"URLDownload", szUrlDownload)) + m_Category = m_Parser.GetInt(L"Category"); + + if (!GetString(L"Name", m_szName) + || !GetString(L"URLDownload", m_szUrlDownload)) { return; } - 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); + GetString(L"RegName", m_szRegName); + GetString(L"Version", m_szVersion); + GetString(L"License", m_szLicense); + GetString(L"Description", m_szDesc); + GetString(L"Size", m_szSize); + GetString(L"URLSite", m_szUrlSite); + GetString(L"CDPath", m_szCDPath); + GetString(L"Language", m_szRegName); + GetString(L"SHA1", m_szSHA1); RetrieveLicenseType(); RetrieveLanguages(); @@ -68,16 +68,16 @@ VOID CAvailableApplicationInfo::RetrieveInstalledStatus() { - m_IsInstalled = ::GetInstalledVersion(NULL, szRegName) - || ::GetInstalledVersion(NULL, szName); + m_IsInstalled = ::GetInstalledVersion(NULL, m_szRegName) + || ::GetInstalledVersion(NULL, m_szName); } VOID CAvailableApplicationInfo::RetrieveInstalledVersion() { - ATL::CStringW szNameVersion = szName + L" " + szVersion; - m_HasInstalledVersion = ::GetInstalledVersion(&szInstalledVersion, szRegName) - || ::GetInstalledVersion(&szInstalledVersion, szName) - || ::GetInstalledVersion(&szInstalledVersion, szNameVersion); + ATL::CStringW szNameVersion = m_szName + L" " + m_szVersion; + m_HasInstalledVersion = ::GetInstalledVersion(&m_szInstalledVersion, m_szRegName) + || ::GetInstalledVersion(&m_szInstalledVersion, m_szName) + || ::GetInstalledVersion(&m_szInstalledVersion, szNameVersion); } VOID CAvailableApplicationInfo::RetrieveLanguages() @@ -105,7 +105,7 @@ { if (StrToIntExW(m_szLocale.GetString(), STIF_DEFAULT, &iLCID)) { - Languages.Add(static_cast<LCID>(iLCID)); + m_LanguageLCIDs.Add(static_cast<LCID>(iLCID)); m_szLocale.Empty(); } } @@ -116,7 +116,7 @@ { if (StrToIntExW(m_szLocale.GetString(), STIF_DEFAULT, &iLCID)) { - Languages.Add(static_cast<LCID>(iLCID)); + m_LanguageLCIDs.Add(static_cast<LCID>(iLCID)); } } @@ -127,13 +127,13 @@ { INT IntBuffer = m_Parser.GetInt(L"LicenseType"); - if (IntBuffer < 0 || IntBuffer > LICENSE_TYPE::Max) - { - LicenseType = LICENSE_TYPE::None; + if (IsLicenseType(IntBuffer)) + { + m_LicenseType = static_cast<LicenseType>(IntBuffer); } else { - LicenseType = (LICENSE_TYPE) IntBuffer; + m_LicenseType = LicenseType::LICENSE_NONE; } } @@ -145,10 +145,10 @@ } //Find locale code in the list - const INT nLanguagesSize = Languages.GetSize(); + const INT nLanguagesSize = m_LanguageLCIDs.GetSize(); for (INT i = 0; i < nLanguagesSize; ++i) { - if (Languages[i] == what) + if (m_LanguageLCIDs[i] == what) { return TRUE; } @@ -184,12 +184,12 @@ BOOL CAvailableApplicationInfo::HasUpdate() const { - return (szInstalledVersion.Compare(szVersion) < 0) ? TRUE : FALSE; + return (m_szInstalledVersion.Compare(m_szVersion) < 0) ? TRUE : FALSE; } VOID CAvailableApplicationInfo::SetLastWriteTime(FILETIME* ftTime) { - RtlCopyMemory(&ftCacheStamp, ftTime, sizeof(FILETIME)); + RtlCopyMemory(&m_ftCacheStamp, ftTime, sizeof(FILETIME)); } inline BOOL CAvailableApplicationInfo::GetString(LPCWSTR lpKeyName, ATL::CStringW& ReturnedString) @@ -317,7 +317,7 @@ return UpdateAppsDB(); } -BOOL CAvailableApps::EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc) +BOOL CAvailableApps::Enum(INT EnumType, AVAILENUMPROC lpEnumProc) { HANDLE hFind = INVALID_HANDLE_VALUE; @@ -343,10 +343,10 @@ Info = m_InfoList.GetNext(CurrentListPosition); // do we already have this entry in cache? - if (Info->sFileName == FindFileData.cFileName) + if (Info->m_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) + if (CompareFileTime(&FindFileData.ftLastWriteTime, &Info->m_ftCacheStamp) == 1) { // recreate our cache, this is the slow path m_InfoList.RemoveAt(LastListPosition); @@ -371,10 +371,10 @@ m_InfoList.AddTail(Info); skip_if_cached: - if (Info->Category == FALSE) + if (Info->m_Category == FALSE) continue; - if (EnumType != Info->Category && EnumType != ENUM_ALL_AVAILABLE) + if (EnumType != Info->m_Category && EnumType != ENUM_ALL_AVAILABLE) continue; Info->RefreshAppInfo(); @@ -388,7 +388,7 @@ return TRUE; } -CAvailableApplicationInfo* CAvailableApps::FindInfo(const ATL::CStringW& szAppName) +CAvailableApplicationInfo* CAvailableApps::FindInfo(const ATL::CStringW& szAppName) const { if (m_InfoList.IsEmpty()) { @@ -401,7 +401,7 @@ while (CurrentListPosition != NULL) { info = m_InfoList.GetNext(CurrentListPosition); - if (info->szName == szAppName) + if (info->m_szName == szAppName) { return info; } @@ -409,7 +409,7 @@ return NULL; } -ATL::CSimpleArray<CAvailableApplicationInfo*> CAvailableApps::FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) +ATL::CSimpleArray<CAvailableApplicationInfo*> CAvailableApps::FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) const { ATL::CSimpleArray<CAvailableApplicationInfo*> result; for (INT i = 0; i < arrAppsNames.GetSize(); ++i) @@ -423,32 +423,32 @@ return result; } -const ATL::CStringW& CAvailableApps::GetFolderPath() +const ATL::CStringW& CAvailableApps::GetFolderPath() const { return m_szPath; } -const ATL::CStringW& CAvailableApps::GetAppPath() +const ATL::CStringW& CAvailableApps::GetAppPath() const { return m_szAppsPath; } -const ATL::CStringW& CAvailableApps::GetCabPath() +const ATL::CStringW& CAvailableApps::GetCabPath() const { return m_szCabPath; } -const LPCWSTR CAvailableApps::GetFolderPathString() +LPCWSTR CAvailableApps::GetFolderPathString() const { return m_szPath.GetString(); } -const LPCWSTR CAvailableApps::GetAppPathString() +LPCWSTR CAvailableApps::GetAppPathString() const { return m_szPath.GetString(); } -const LPCWSTR CAvailableApps::GetCabPathString() +LPCWSTR CAvailableApps::GetCabPathString() const { return m_szPath.GetString(); } 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] Sun Sep 3 20:37:14 2017 @@ -90,7 +90,7 @@ else InsertLoadedTextNewl_RichEdit(IDS_STATUS_INSTALLED, CFE_ITALIC); - InsertTextAfterLoaded_RichEdit(IDS_AINFO_VERSION, Info->szInstalledVersion, CFE_BOLD, 0); + InsertTextAfterLoaded_RichEdit(IDS_AINFO_VERSION, Info->m_szInstalledVersion, CFE_BOLD, 0); } else { @@ -102,29 +102,29 @@ InsertLoadedTextNewl_RichEdit(IDS_STATUS_NOTINSTALLED, CFE_ITALIC); } - InsertTextAfterLoaded_RichEdit(IDS_AINFO_AVAILABLEVERSION, Info->szVersion, CFE_BOLD, 0); + InsertTextAfterLoaded_RichEdit(IDS_AINFO_AVAILABLEVERSION, Info->m_szVersion, CFE_BOLD, 0); } static VOID InsertLicenseInfo_RichEdit(CAvailableApplicationInfo* Info) { ATL::CStringW szLicense; - switch (Info->LicenseType) - { - case LICENSE_TYPE::OpenSource: + switch (Info->m_LicenseType) + { + case LicenseType::LICENSE_OPENSOURCE: szLicense.LoadStringW(IDS_LICENSE_OPENSOURCE); break; - case LICENSE_TYPE::Freeware: + case LicenseType::LICENSE_FREEWARE: szLicense.LoadStringW(IDS_LICENSE_FREEWARE); break; - case LICENSE_TYPE::Trial: + case LicenseType::LICENSE_TRIAL: szLicense.LoadStringW(IDS_LICENSE_TRIAL); break; default: - InsertTextAfterLoaded_RichEdit(IDS_AINFO_LICENSE, Info->szLicense, CFE_BOLD, 0); + InsertTextAfterLoaded_RichEdit(IDS_AINFO_LICENSE, Info->m_szLicense, CFE_BOLD, 0); return; } - szLicense += L" (" + Info->szLicense + L")"; + szLicense += L" (" + Info->m_szLicense + L")"; InsertTextAfterLoaded_RichEdit(IDS_AINFO_LICENSE, szLicense, CFE_BOLD, 0); } @@ -135,7 +135,7 @@ return; } - const INT nTranslations = Info->Languages.GetSize(); + const INT nTranslations = Info->m_LanguageLCIDs.GetSize(); ATL::CStringW szLangInfo; ATL::CStringW szLoadedTextAvailability; ATL::CStringW szLoadedAInfoText; @@ -189,15 +189,15 @@ CAvailableApplicationInfo* Info = (CAvailableApplicationInfo*) ListViewGetlParam(Index); if (!Info) return FALSE; - NewRichEditText(Info->szName, CFE_BOLD); + NewRichEditText(Info->m_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); + InsertTextAfterLoaded_RichEdit(IDS_AINFO_SIZE, Info->m_szSize, CFE_BOLD, 0); + InsertTextAfterLoaded_RichEdit(IDS_AINFO_URLSITE, Info->m_szUrlSite, CFE_BOLD, CFE_LINK); + InsertTextAfterLoaded_RichEdit(IDS_AINFO_DESCRIPTION, Info->m_szDesc, CFE_BOLD, 0); + InsertTextAfterLoaded_RichEdit(IDS_AINFO_URLDOWNLOAD, Info->m_szUrlDownload, CFE_BOLD, CFE_LINK); return TRUE; } @@ -305,7 +305,7 @@ { 0, ID_INSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szInstallBtn }, { 1, ID_UNINSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szUninstallBtn }, { 2, ID_MODIFY, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szModifyBtn }, - { 3, ID_CHECK_ALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE,{0}, 0, (INT_PTR) szSelectAll}, + { 3, ID_CHECK_ALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szSelectAll}, {-1, 0, TBSTATE_ENABLED, BTNS_SEP, { 0 }, 0, 0 }, { 4, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, { 5, ID_RESETDB, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, @@ -1414,13 +1414,13 @@ return StrStrIW(szHaystack, szNeedle) != NULL; } - static BOOL CALLBACK s_EnumInstalledAppProc(INT ItemIndex, ATL::CStringW &szName, PINSTALLED_INFO Info) + static BOOL CALLBACK s_EnumInstalledAppProc(INT ItemIndex, ATL::CStringW &m_szName, PINSTALLED_INFO Info) { PINSTALLED_INFO ItemInfo; ATL::CStringW szText; INT Index; - if (!SearchPatternMatch(szName.GetString(), szSearchPattern)) + if (!SearchPatternMatch(m_szName.GetString(), szSearchPattern)) { RegCloseKey(Info->hSubKey); return TRUE; @@ -1433,7 +1433,7 @@ return FALSE; } - Index = ListViewAddItem(ItemIndex, 0, szName, (LPARAM) ItemInfo); + Index = ListViewAddItem(ItemIndex, 0, m_szName, (LPARAM) ItemInfo); /* Get version info */ GetApplicationString(ItemInfo->hSubKey, L"DisplayVersion", szText); @@ -1453,15 +1453,15 @@ HIMAGELIST hImageListView = ListView_GetImageList(hListView, LVSIL_SMALL); - if (!SearchPatternMatch(Info->szName, szSearchPattern) && - !SearchPatternMatch(Info->szDesc, szSearchPattern)) + if (!SearchPatternMatch(Info->m_szName, szSearchPattern) && + !SearchPatternMatch(Info->m_szDesc, szSearchPattern)) { return TRUE; } /* Load icon from file */ ATL::CStringW szIconPath; - szIconPath.Format(L"%lsicons\\%ls.ico", szFolderPath, Info->szName); + szIconPath.Format(L"%lsicons\\%ls.ico", szFolderPath, Info->m_szName); hIcon = (HICON) LoadImageW(NULL, szIconPath.GetString(), IMAGE_ICON, @@ -1478,11 +1478,11 @@ Index = ImageList_AddIcon(hImageListView, hIcon); DestroyIcon(hIcon); - Index = ListViewAddItem(Info->Category, Index, Info->szName, (LPARAM) Info); + Index = ListViewAddItem(Info->m_Category, Index, Info->m_szName, (LPARAM) Info); 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())); + ListView_SetItemText(hListView, Index, 1, const_cast<LPWSTR>(Info->m_szVersion.GetString())); + ListView_SetItemText(hListView, Index, 2, const_cast<LPWSTR>(Info->m_szDesc.GetString())); return TRUE; } @@ -1556,7 +1556,7 @@ } // Enum available applications - m_AvailableApps.EnumAvailableApplications(EnumType, s_EnumAvailableAppProc); + m_AvailableApps.Enum(EnumType, s_EnumAvailableAppProc); } SelectedEnumType = EnumType; Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h [iso-8859-1] Sun Sep 3 20:37:14 2017 @@ -4,6 +4,7 @@ #include <atlstr.h> #include <atlsimpcoll.h> #include <atlcoll.h> + #include "misc.h" /* EnumType flags for EnumAvailableApplications */ @@ -31,41 +32,46 @@ inline BOOL IsAvailableEnum(INT x) { - return (x >= ENUM_AVAILABLE_MIN && x <= ENUM_AVAILABLE_MAX); + return (x >= AvailableCategories::ENUM_AVAILABLE_MIN && x <= AvailableCategories::ENUM_AVAILABLE_MAX); } -typedef enum LICENSE_TYPE +enum LicenseType { - None, - OpenSource, - Freeware, - Trial, - Max = Trial, - Min = None -} *PLICENSE_TYPE; + LICENSE_NONE, + LICENSE_OPENSOURCE, + LICENSE_FREEWARE, + LICENSE_TRIAL, + LICENSE_MIN = LICENSE_NONE, + LICENSE_MAX = LICENSE_TRIAL +}; + +inline BOOL IsLicenseType(INT x) +{ + return (x >= LicenseType::LICENSE_MIN && x <= LicenseType::LICENSE_MAX); +} struct CAvailableApplicationInfo { - INT Category; - LICENSE_TYPE LicenseType; - ATL::CStringW szName; - ATL::CStringW szRegName; - ATL::CStringW szVersion; - ATL::CStringW szLicense; - ATL::CStringW szDesc; - ATL::CStringW szSize; - ATL::CStringW szUrlSite; - ATL::CStringW szUrlDownload; - ATL::CStringW szCDPath; - ATL::CSimpleArray<LCID> Languages; + INT m_Category; + LicenseType m_LicenseType; + ATL::CStringW m_szName; + ATL::CStringW m_szRegName; + ATL::CStringW m_szVersion; + ATL::CStringW m_szLicense; + ATL::CStringW m_szDesc; + ATL::CStringW m_szSize; + ATL::CStringW m_szUrlSite; + ATL::CStringW m_szUrlDownload; + ATL::CStringW m_szCDPath; + ATL::CSimpleArray<LCID> m_LanguageLCIDs; // Caching mechanism related entries - ATL::CStringW sFileName; - FILETIME ftCacheStamp; + ATL::CStringW m_sFileName; + FILETIME m_ftCacheStamp; // Optional integrity checks (SHA-1 digests are 160 bit = 40 characters in hex string form) - ATL::CStringW szSHA1; - ATL::CStringW szInstalledVersion; + ATL::CStringW m_szSHA1; + ATL::CStringW m_szInstalledVersion; CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam); @@ -115,16 +121,18 @@ static BOOL UpdateAppsDB(); static BOOL ForceUpdateAppsDB(); + static VOID DeleteCurrentAppsDB(); VOID FreeCachedEntries(); - static VOID DeleteCurrentAppsDB(); - BOOL EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc); - CAvailableApplicationInfo* FindInfo(const ATL::CStringW& szAppName); - ATL::CSimpleArray<CAvailableApplicationInfo*> FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames); - const ATL::CStringW& GetFolderPath(); - const ATL::CStringW& GetAppPath(); - const ATL::CStringW& GetCabPath(); - const LPCWSTR GetFolderPathString(); - const LPCWSTR GetAppPathString(); - const LPCWSTR GetCabPathString(); + BOOL Enum(INT EnumType, AVAILENUMPROC lpEnumProc); + + CAvailableApplicationInfo* FindInfo(const ATL::CStringW& szAppName) const; + ATL::CSimpleArray<CAvailableApplicationInfo*> FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) const; + + const ATL::CStringW& GetFolderPath() const; + const ATL::CStringW& GetAppPath() const; + const ATL::CStringW& GetCabPath() const; + LPCWSTR GetFolderPathString() const; + LPCWSTR GetAppPathString() const; + LPCWSTR GetCabPathString() const; }; 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] Sun Sep 3 20:37:14 2017 @@ -72,12 +72,12 @@ { DownloadInfo() {} DownloadInfo(const CAvailableApplicationInfo& AppInfo) - :szUrl(AppInfo.szUrlDownload), szName(AppInfo.szName), szSHA1(AppInfo.szSHA1) + :szUrl(AppInfo.m_szUrlDownload), m_szName(AppInfo.m_szName), szSHA1(AppInfo.m_szSHA1) { } ATL::CStringW szUrl; - ATL::CStringW szName; + ATL::CStringW m_szName; ATL::CStringW szSHA1; }; @@ -259,7 +259,7 @@ { for (INT i = 0; i < arrInfo.GetSize(); ++i) { - AddRow(i, arrInfo[i].szName.GetString(), DOWNLOAD_STATUS::DLWaiting); + AddRow(i, arrInfo[i].m_szName.GetString(), DOWNLOAD_STATUS::DLWaiting); } } @@ -639,7 +639,7 @@ // Change caption to show the currently downloaded app if (!bCab) { - szNewCaption.Format(szCaption, CurrentInfo.szName.GetString()); + szNewCaption.Format(szCaption, CurrentInfo.m_szName.GetString()); } else { @@ -868,7 +868,7 @@ { static DownloadInfo DatabaseDLInfo; DatabaseDLInfo.szUrl = lpUrl; - DatabaseDLInfo.szName.LoadStringW(IDS_DL_DIALOG_DB_DISP); + DatabaseDLInfo.m_szName.LoadStringW(IDS_DL_DIALOG_DB_DISP); Download(DatabaseDLInfo, TRUE); } Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] Sun Sep 3 20:37:14 2017 @@ -1,3 +1,11 @@ +/* +* PROJECT: ReactOS Applications Manager +* LICENSE: GPL - See COPYING in the top level directory +* FILE: base/applications/rapps/unattended.cpp +* PURPOSE: Functions to parse command-line flags and process them +* PROGRAMMERS: Alexander Shaposhnikov (chaez.san(a)gmail.com) +*/ + #include "unattended.h" #include "defines.h" #include "available.h" @@ -5,13 +13,14 @@ #include "setupapi.h" +#define MIN_ARGS 2 + BOOL CmdParser(LPWSTR lpCmdLine) { INT argc; LPWSTR* argv = CommandLineToArgvW(lpCmdLine, &argc); - ATL::CString szName; - if (!argv || argc < 2) + if (!argv || argc < MIN_ARGS) { return FALSE; } @@ -56,8 +65,9 @@ } CAvailableApps apps; - CAvailableApps::UpdateAppsDB(); - apps.EnumAvailableApplications(ENUM_ALL_AVAILABLE, NULL); + apps.UpdateAppsDB(); + apps.Enum(ENUM_ALL_AVAILABLE, NULL); + ATL::CSimpleArray<CAvailableApplicationInfo*> arrAppInfo = apps.FindInfoList(arrNames); if (arrAppInfo.GetSize() > 0) {

1 0

[hbelusca] 75757: [SETUPLIB]: Use strsafe functions (cont).
by hbelusca＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: hbelusca Date: Sun Sep 3 20:34:29 2017 New Revision: 75757 URL: http://svn.reactos.org/svn/reactos?rev=75757&view=rev Log: [SETUPLIB]: Use strsafe functions (cont). Modified: branches/setup_improvements/base/setup/lib/bootsup.c branches/setup_improvements/base/setup/lib/mui.c branches/setup_improvements/base/setup/lib/settings.c branches/setup_improvements/base/setup/lib/setuplib.c Modified: branches/setup_improvements/base/setup/lib/bootsup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/bootsup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/bootsup.c [iso-8859-1] Sun Sep 3 20:34:29 2017 @@ -368,7 +368,7 @@ goto SkipThisEntry; } - swprintf(SystemPath, L"\"%s\"", Data->ArcPath); + StringCchPrintfW(SystemPath, ARRAYSIZE(SystemPath), L"\"%s\"", Data->ArcPath); if ((_wcsicmp(Options->OsLoadPath, Data->ArcPath) != 0) && (_wcsicmp(Options->OsLoadPath, SystemPath) != 0)) { Modified: branches/setup_improvements/base/setup/lib/mui.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/mui.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/mui.c [iso-8859-1] Sun Sep 3 20:34:29 2017 @@ -298,10 +298,10 @@ { if (uIndex > 19) break; - swprintf(szValueName, L"%u", uIndex + 1); + StringCchPrintfW(szValueName, ARRAYSIZE(szValueName), L"%u", uIndex + 1); RtlInitUnicodeString(&ValueName, szValueName); - swprintf(szLangID, L"0000%s", MuiLayouts[uIndex].LangID); + StringCchPrintfW(szLangID, ARRAYSIZE(szLangID), L"0000%s", MuiLayouts[uIndex].LangID); if (_wcsicmp(szLangID, MuiLayouts[uIndex].LayoutID) == 0) { @@ -321,7 +321,7 @@ } else { - swprintf(szLangID, L"d%03lu%s", uCount, MuiLayouts[uIndex].LangID); + StringCchPrintfW(szLangID, ARRAYSIZE(szLangID), L"d%03lu%s", uCount, MuiLayouts[uIndex].LangID); Status = NtSetValueKey(KeyHandle, &ValueName, 0, Modified: branches/setup_improvements/base/setup/lib/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] Sun Sep 3 20:34:29 2017 @@ -423,7 +423,7 @@ } wcscpy((PWCHAR)*UserData, KeyName); - wcscpy(DisplayText, KeyValue); + StringCbCopyW(DisplayText, DisplayTextSize, KeyValue); *Current = (CompareKey ? !_wcsicmp(KeyName, CompareKey) : FALSE); @@ -484,7 +484,7 @@ } DPRINT("Computer key: %S\n", KeyName); - wcscpy(ComputerKey, KeyName); + StringCchCopyW(ComputerKey, ARRAYSIZE(ComputerKey), KeyName); INF_FreeData(KeyName); } while (SetupFindNextLine(&Context, &Context)); @@ -549,7 +549,7 @@ BusInstance = 0; while (TRUE) { - swprintf(Buffer, L"%lu", BusInstance); + StringCchPrintfW(Buffer, ARRAYSIZE(Buffer), L"%lu", BusInstance); RtlInitUnicodeString(&KeyName, Buffer); InitializeObjectAttributes(&ObjectAttributes, &KeyName, @@ -585,7 +585,7 @@ while (TRUE) { /* Open the pointer controller instance key */ - swprintf(Buffer, L"%lu", ControllerInstance); + StringCchPrintfW(Buffer, ARRAYSIZE(Buffer), L"%lu", ControllerInstance); RtlInitUnicodeString(&KeyName, Buffer); InitializeObjectAttributes(&ObjectAttributes, &KeyName, @@ -720,7 +720,7 @@ } DPRINT("Display key: %S\n", KeyName); - wcscpy(DisplayKey, KeyName); + StringCchCopyW(DisplayKey, ARRAYSIZE(DisplayKey), KeyName); INF_FreeData(KeyName); } while (SetupFindNextLine(&Context, &Context)); @@ -765,8 +765,8 @@ return FALSE; } - wcscpy(SectionName, L"Files."); - wcscat(SectionName, (const wchar_t*)GetListEntryUserData(Entry)); + StringCchPrintfW(SectionName, ARRAYSIZE(SectionName), + L"Files.%s", (PCWSTR)GetListEntryUserData(Entry)); *AdditionalSectionName = SectionName; return TRUE; @@ -814,7 +814,9 @@ ASSERT(wcslen(ServiceName) < 10); DPRINT1("Service name: '%S'\n", ServiceName); - swprintf(RegPath, L"System\\CurrentControlSet\\Services\\%s", ServiceName); + StringCchPrintfW(RegPath, ARRAYSIZE(RegPath), + L"System\\CurrentControlSet\\Services\\%s", + ServiceName); RtlInitUnicodeString(&KeyName, RegPath); InitializeObjectAttributes(&ObjectAttributes, &KeyName, @@ -851,9 +853,9 @@ return FALSE; } - swprintf(RegPath, - L"System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\%s\\Device0", - ServiceName); + StringCchPrintfW(RegPath, ARRAYSIZE(RegPath), + L"System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\%s\\Device0", + ServiceName); DPRINT1("RegPath: '%S'\n", RegPath); RtlInitUnicodeString(&KeyName, RegPath); InitializeObjectAttributes(&ObjectAttributes, @@ -1111,7 +1113,7 @@ } wcscpy((PWCHAR)*UserData, KeyName); - wcscpy(DisplayText, KeyValue); + StringCbCopyW(DisplayText, DisplayTextSize, KeyValue); *Current = FALSE; Modified: branches/setup_improvements/base/setup/lib/setuplib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/setuplib.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/setuplib.c [iso-8859-1] Sun Sep 3 20:34:29 2017 @@ -144,7 +144,11 @@ DPRINT("INF_GetData() failed for key 'InstallationDirectory'\n"); goto Quit; } - wcscpy(pSetupData->InstallationDirectory, Value); + + StringCchCopyW(pSetupData->InstallationDirectory, + ARRAYSIZE(pSetupData->InstallationDirectory), + Value); + INF_FreeData(Value); } @@ -186,7 +190,9 @@ if (INF_GetData(&Context, NULL, &Value)) { LONG Id = wcstol(Value, NULL, 16); - swprintf(pSetupData->LocaleID, L"%08lx", Id); + StringCchPrintfW(pSetupData->LocaleID, + ARRAYSIZE(pSetupData->LocaleID), + L"%08lx", Id); INF_FreeData(Value); } } @@ -558,7 +564,10 @@ if (!INF_GetData(&Context, NULL, &Value)) return ERROR_CORRUPT_TXTSETUPSIF; - wcscpy(pSetupData->InstallationDirectory, Value); + StringCchCopyW(pSetupData->InstallationDirectory, + ARRAYSIZE(pSetupData->InstallationDirectory), + Value); + INF_FreeData(Value); }

1 0

[ashaposhnikov] 75756: [RAPPS] Removed unecessary `inline` in crichedit.h
by ashaposhnikov＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: ashaposhnikov Date: Sun Sep 3 20:23:44 2017 New Revision: 75756 URL: http://svn.reactos.org/svn/reactos?rev=75756&view=rev Log: [RAPPS] Removed unecessary `inline` in crichedit.h Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/crichedit.h Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/crichedit.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/crichedit.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/crichedit.h [iso-8859-1] Sun Sep 3 20:23:44 2017 @@ -5,7 +5,7 @@ public CWindow { HMODULE LoadedLibrary; - inline VOID GenericInsertText(LPCWSTR lpszText, LONG InsertedTextLen, DWORD dwEffects) + VOID GenericInsertText(LPCWSTR lpszText, LONG InsertedTextLen, DWORD dwEffects) { SETTEXTEX SetText; LONG Len = GetTextLen();

1 0

[hbelusca] 75755: [SETUPLIB]: Use strsafe functions.
by hbelusca＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: hbelusca Date: Sun Sep 3 20:05:11 2017 New Revision: 75755 URL: http://svn.reactos.org/svn/reactos?rev=75755&view=rev Log: [SETUPLIB]: Use strsafe functions. Modified: branches/setup_improvements/base/setup/lib/utils/bldrsup.c branches/setup_improvements/base/setup/lib/utils/genlist.c Modified: branches/setup_improvements/base/setup/lib/utils/bldrsup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/utils/bldrsup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/utils/bldrsup.c [iso-8859-1] Sun Sep 3 20:05:11 2017 @@ -999,13 +999,13 @@ return STATUS_INSUFFICIENT_RESOURCES; *Buffer = UNICODE_NULL; - if (IsNameNotQuoted) wcscat(Buffer, L"\""); - wcscat(Buffer, InstallName); - if (IsNameNotQuoted) wcscat(Buffer, L"\""); + if (IsNameNotQuoted) StringCchCatW(Buffer, BufferLength, L"\""); + StringCchCatW(Buffer, BufferLength, InstallName); + if (IsNameNotQuoted) StringCchCatW(Buffer, BufferLength, L"\""); if (OsOptions) { - wcscat(Buffer, L" "); - wcscat(Buffer, OsOptions); + StringCchCatW(Buffer, BufferLength, L" "); + StringCchCatW(Buffer, BufferLength, OsOptions); } /* Insert the entry into the "Operating Systems" section */ Modified: branches/setup_improvements/base/setup/lib/utils/genlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/utils/genlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/utils/genlist.c [iso-8859-1] Sun Sep 3 20:05:11 2017 @@ -23,9 +23,7 @@ { PGENERIC_LIST List; - List = (PGENERIC_LIST)RtlAllocateHeap(ProcessHeap, - 0, - sizeof(GENERIC_LIST)); + List = RtlAllocateHeap(ProcessHeap, 0, sizeof(GENERIC_LIST)); if (List == NULL) return NULL; @@ -72,15 +70,15 @@ IN BOOLEAN Current) { PGENERIC_LIST_ENTRY Entry; + SIZE_T TextSize; - Entry = (PGENERIC_LIST_ENTRY)RtlAllocateHeap(ProcessHeap, - 0, - sizeof(GENERIC_LIST_ENTRY) + - (wcslen(Text) + 1) * sizeof(WCHAR)); + TextSize = (wcslen(Text) + 1) * sizeof(WCHAR); + Entry = RtlAllocateHeap(ProcessHeap, 0, + sizeof(GENERIC_LIST_ENTRY) + TextSize); if (Entry == NULL) return FALSE; - wcscpy(Entry->Text, Text); + StringCbCopyW(Entry->Text, TextSize, Text); Entry->List = List; Entry->UserData = UserData;

1 0

[ashaposhnikov] 75754: [RAPPS] Fixed newline in de-DE.rc
by ashaposhnikov＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: ashaposhnikov Date: Sun Sep 3 19:52:38 2017 New Revision: 75754 URL: http://svn.reactos.org/svn/reactos?rev=75754&view=rev Log: [RAPPS] Fixed newline in de-DE.rc Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/de-DE.rc Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] Sun Sep 3 19:52:38 2017 @@ -203,7 +203,8 @@ IDS_UNABLE_TO_DOWNLOAD2 "Paket konnte nicht geladen werden! PrÃ¼fen Sie Ihre Internetverbindung!" IDS_UNABLE_TO_REMOVE "Konnte die Daten nicht aus der Registry lÃ¶schen!" IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_CERT_DOES_NOT_MATCH "ÃberprÃ¼fung des SSL-Zertifikats fehlgeschlagen." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." + IDS_CERT_DOES_NOT_MATCH "ÃberprÃ¼fung des SSL-Zertifikats fehlgeschlagen." + IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."

1 0

[hbelusca] 75753: [SETUPLIB][USETUP]: Make the GENERIC_LIST store the items display text in UNICODE (and not in ANSI). Only convert to ANSI when needed (e.g. in the display code for usetup). The 1s...
by hbelusca＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: hbelusca Date: Sun Sep 3 19:46:26 2017 New Revision: 75753 URL: http://svn.reactos.org/svn/reactos?rev=75753&view=rev Log: [SETUPLIB][USETUP]: Make the GENERIC_LIST store the items display text in UNICODE (and not in ANSI). Only convert to ANSI when needed (e.g. in the display code for usetup). The 1st-stage GUI setup will however use the UNICODE strings directly. Modified: branches/setup_improvements/base/setup/lib/settings.c branches/setup_improvements/base/setup/lib/utils/genlist.c branches/setup_improvements/base/setup/lib/utils/genlist.h branches/setup_improvements/base/setup/lib/utils/osdetect.c branches/setup_improvements/base/setup/usetup/genlist.c branches/setup_improvements/base/setup/usetup/genlist.h branches/setup_improvements/base/setup/usetup/usetup.c Modified: branches/setup_improvements/base/setup/lib/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] Sun Sep 3 19:46:26 2017 @@ -324,7 +324,7 @@ (NTAPI *PPROCESS_ENTRY_ROUTINE)( IN PWCHAR KeyName, IN PWCHAR KeyValue, - IN PCHAR DisplayText, + OUT PWCHAR DisplayText, IN SIZE_T DisplayTextSize, OUT PVOID* UserData, OUT PBOOLEAN Current, @@ -345,7 +345,7 @@ PVOID UserData; BOOLEAN Current; UCHAR RetVal; - CHAR DisplayText[128]; + WCHAR DisplayText[128]; if (!SetupFindFirstLineW(InfFile, SectionName, NULL, pContext)) return -1; @@ -405,7 +405,7 @@ DefaultProcessEntry( IN PWCHAR KeyName, IN PWCHAR KeyValue, - IN PCHAR DisplayText, + OUT PWCHAR DisplayText, IN SIZE_T DisplayTextSize, OUT PVOID* UserData, OUT PBOOLEAN Current, @@ -423,7 +423,7 @@ } wcscpy((PWCHAR)*UserData, KeyName); - sprintf(DisplayText, "%S", KeyValue); + wcscpy(DisplayText, KeyValue); *Current = (CompareKey ? !_wcsicmp(KeyName, CompareKey) : FALSE); @@ -740,7 +740,7 @@ } #if 0 - AppendGenericListEntry(List, "Other display driver", NULL, TRUE); + AppendGenericListEntry(List, L"Other display driver", NULL, TRUE); #endif return List; @@ -1087,7 +1087,7 @@ ProcessLangEntry( IN PWCHAR KeyName, IN PWCHAR KeyValue, - IN PCHAR DisplayText, + OUT PWCHAR DisplayText, IN SIZE_T DisplayTextSize, OUT PVOID* UserData, OUT PBOOLEAN Current, @@ -1111,7 +1111,7 @@ } wcscpy((PWCHAR)*UserData, KeyName); - sprintf(DisplayText, "%S", KeyValue); + wcscpy(DisplayText, KeyValue); *Current = FALSE; Modified: branches/setup_improvements/base/setup/lib/utils/genlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/utils/genlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/utils/genlist.c [iso-8859-1] Sun Sep 3 19:46:26 2017 @@ -67,7 +67,7 @@ BOOLEAN AppendGenericListEntry( IN OUT PGENERIC_LIST List, - IN PCHAR Text, + IN PCWSTR Text, IN PVOID UserData, IN BOOLEAN Current) { @@ -75,11 +75,12 @@ Entry = (PGENERIC_LIST_ENTRY)RtlAllocateHeap(ProcessHeap, 0, - sizeof(GENERIC_LIST_ENTRY) + strlen(Text)); + sizeof(GENERIC_LIST_ENTRY) + + (wcslen(Text) + 1) * sizeof(WCHAR)); if (Entry == NULL) return FALSE; - strcpy (Entry->Text, Text); + wcscpy(Entry->Text, Text); Entry->List = List; Entry->UserData = UserData; @@ -140,7 +141,7 @@ return Entry->UserData; } -LPCSTR +PCWSTR GetListEntryText( IN PGENERIC_LIST_ENTRY Entry) { Modified: branches/setup_improvements/base/setup/lib/utils/genlist.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/utils/genlist.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/utils/genlist.h [iso-8859-1] Sun Sep 3 19:46:26 2017 @@ -13,7 +13,7 @@ LIST_ENTRY Entry; struct _GENERIC_LIST* List; PVOID UserData; - CHAR Text[1]; // FIXME: UI stuff + WCHAR Text[1]; // FIXME: UI stuff } GENERIC_LIST_ENTRY, *PGENERIC_LIST_ENTRY; @@ -39,7 +39,7 @@ BOOLEAN AppendGenericListEntry( IN OUT PGENERIC_LIST List, - IN PCHAR Text, + IN PCWSTR Text, IN PVOID UserData, IN BOOLEAN Current); @@ -64,7 +64,7 @@ GetListEntryUserData( IN PGENERIC_LIST_ENTRY Entry); -LPCSTR +PCWSTR GetListEntryText( IN PGENERIC_LIST_ENTRY Entry); Modified: branches/setup_improvements/base/setup/lib/utils/osdetect.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/utils/osdetect.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/utils/osdetect.c [iso-8859-1] Sun Sep 3 19:46:26 2017 @@ -571,7 +571,6 @@ { PNTOS_INSTALLATION NtOsInstall; SIZE_T ArcPathLength, NtPathLength; - CHAR InstallNameA[MAX_PATH]; /* Is there already any installation with these settings? */ NtOsInstall = FindExistingNTOSInstall(List, SystemRootArcPath, SystemRootNtPath); @@ -617,8 +616,7 @@ StringCchCopyW(NtOsInstall->InstallationName, ARRAYSIZE(NtOsInstall->InstallationName), InstallationName); // Having the GENERIC_LIST storing the display item string plainly sucks... - StringCchPrintfA(InstallNameA, ARRAYSIZE(InstallNameA), "%S", InstallationName); - AppendGenericListEntry(List, InstallNameA, NtOsInstall, FALSE); + AppendGenericListEntry(List, InstallationName, NtOsInstall, FALSE); return NtOsInstall; } Modified: branches/setup_improvements/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/genlist.c [iso-8859-1] Sun Sep 3 19:46:26 2017 @@ -48,6 +48,8 @@ ListUi->Right = 0; ListUi->Bottom = 0; ListUi->Redraw = TRUE; + + ListUi->CurrentItemText[0] = ANSI_NULL; } static @@ -158,6 +160,8 @@ break; ListUi->LastShown = Entry; + sprintf(ListUi->CurrentItemText, "%S", ListEntry->Text); + FillConsoleOutputAttribute(StdOutput, (List->CurrentEntry == ListEntry) ? FOREGROUND_BLUE | BACKGROUND_WHITE : @@ -174,8 +178,8 @@ coPos.X++; WriteConsoleOutputCharacterA(StdOutput, - ListEntry->Text, - min(strlen(ListEntry->Text), (SIZE_T)Width - 2), + ListUi->CurrentItemText, + min(strlen(ListUi->CurrentItemText), (SIZE_T)Width - 2), coPos, &Written); coPos.X--; @@ -415,7 +419,7 @@ for (i = ListUi->Bottom - 1; i > ListUi->Top + 1; i--) { - ScrollUpGenericList(ListUi); + ScrollUpGenericList(ListUi); } /* Update user interface */ @@ -490,13 +494,17 @@ ListUi->Redraw = FALSE; - if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciiChar) && + sprintf(ListUi->CurrentItemText, "%S", ListEntry->Text); + + if ((strlen(ListUi->CurrentItemText) > 0) && (tolower(ListUi->CurrentItemText[0]) == AsciiChar) && (List->CurrentEntry->Entry.Flink != &List->ListHead)) { ScrollDownGenericList(ListUi); ListEntry = List->CurrentEntry; - if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciiChar)) + sprintf(ListUi->CurrentItemText, "%S", ListEntry->Text); + + if ((strlen(ListUi->CurrentItemText) > 0) && (tolower(ListUi->CurrentItemText[0]) == AsciiChar)) goto End; } @@ -507,7 +515,9 @@ for (;;) { - if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciiChar)) + sprintf(ListUi->CurrentItemText, "%S", ListEntry->Text); + + if ((strlen(ListUi->CurrentItemText) > 0) && (tolower(ListUi->CurrentItemText[0]) == AsciiChar)) { Flag = TRUE; break; Modified: branches/setup_improvements/base/setup/usetup/genlist.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/genlist.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/genlist.h [iso-8859-1] Sun Sep 3 19:46:26 2017 @@ -40,6 +40,9 @@ SHORT Right; SHORT Bottom; BOOL Redraw; + + CHAR CurrentItemText[256]; + } GENERIC_LIST_UI, *PGENERIC_LIST_UI; VOID Modified: branches/setup_improvements/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] Sun Sep 3 19:46:26 2017 @@ -1045,6 +1045,7 @@ DeviceSettingsPage(PINPUT_RECORD Ir) { static ULONG Line = 16; + CHAR CurrentItemText[256]; /* Initialize the computer settings list */ if (ComputerList == NULL) @@ -1099,10 +1100,14 @@ MUIDisplayPage(DEVICE_SETTINGS_PAGE); - CONSOLE_SetTextXY(25, 11, GetListEntryText(GetCurrentListEntry(ComputerList))); - CONSOLE_SetTextXY(25, 12, GetListEntryText(GetCurrentListEntry(DisplayList))); - CONSOLE_SetTextXY(25, 13, GetListEntryText(GetCurrentListEntry(KeyboardList))); - CONSOLE_SetTextXY(25, 14, GetListEntryText(GetCurrentListEntry(LayoutList))); + sprintf(CurrentItemText, "%S", GetListEntryText(GetCurrentListEntry(ComputerList))); + CONSOLE_SetTextXY(25, 11, CurrentItemText); + sprintf(CurrentItemText, "%S", GetListEntryText(GetCurrentListEntry(DisplayList))); + CONSOLE_SetTextXY(25, 12, CurrentItemText); + sprintf(CurrentItemText, "%S", GetListEntryText(GetCurrentListEntry(KeyboardList))); + CONSOLE_SetTextXY(25, 13, CurrentItemText); + sprintf(CurrentItemText, "%S", GetListEntryText(GetCurrentListEntry(LayoutList))); + CONSOLE_SetTextXY(25, 14, CurrentItemText); CONSOLE_InvertTextXY(24, Line, 48, 1);

1 0

[hbelusca] 75752: [USETUP]: Whitespace fixes only.
by hbelusca＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: hbelusca Date: Sun Sep 3 19:31:36 2017 New Revision: 75752 URL: http://svn.reactos.org/svn/reactos?rev=75752&view=rev Log: [USETUP]: Whitespace fixes only. Modified: branches/setup_improvements/base/setup/usetup/genlist.c Modified: branches/setup_improvements/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/genlist.c [iso-8859-1] Sun Sep 3 19:31:36 2017 @@ -16,7 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/genlist.c * PURPOSE: Generic list functions @@ -61,75 +62,75 @@ /* Draw upper left corner */ coPos.X = ListUi->Left; coPos.Y = ListUi->Top; - FillConsoleOutputCharacterA (StdOutput, - 0xDA, // '+', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xDA, // '+', + 1, + coPos, + &Written); /* Draw upper edge */ coPos.X = ListUi->Left + 1; coPos.Y = ListUi->Top; - FillConsoleOutputCharacterA (StdOutput, - 0xC4, // '-', - ListUi->Right - ListUi->Left - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xC4, // '-', + ListUi->Right - ListUi->Left - 1, + coPos, + &Written); /* Draw upper right corner */ coPos.X = ListUi->Right; coPos.Y = ListUi->Top; - FillConsoleOutputCharacterA (StdOutput, - 0xBF, // '+', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xBF, // '+', + 1, + coPos, + &Written); /* Draw left and right edge */ for (i = ListUi->Top + 1; i < ListUi->Bottom; i++) { coPos.X = ListUi->Left; coPos.Y = i; - FillConsoleOutputCharacterA (StdOutput, - 0xB3, // '|', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xB3, // '|', + 1, + coPos, + &Written); coPos.X = ListUi->Right; - FillConsoleOutputCharacterA (StdOutput, - 0xB3, //'|', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xB3, //'|', + 1, + coPos, + &Written); } /* Draw lower left corner */ coPos.X = ListUi->Left; coPos.Y = ListUi->Bottom; - FillConsoleOutputCharacterA (StdOutput, - 0xC0, // '+', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xC0, // '+', + 1, + coPos, + &Written); /* Draw lower edge */ coPos.X = ListUi->Left + 1; coPos.Y = ListUi->Bottom; - FillConsoleOutputCharacterA (StdOutput, - 0xC4, // '-', - ListUi->Right - ListUi->Left - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xC4, // '-', + ListUi->Right - ListUi->Left - 1, + coPos, + &Written); /* Draw lower right corner */ coPos.X = ListUi->Right; coPos.Y = ListUi->Bottom; - FillConsoleOutputCharacterA (StdOutput, - 0xD9, // '+', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xD9, // '+', + 1, + coPos, + &Written); } static @@ -157,26 +158,26 @@ break; ListUi->LastShown = Entry; - FillConsoleOutputAttribute (StdOutput, - (List->CurrentEntry == ListEntry) ? - FOREGROUND_BLUE | BACKGROUND_WHITE : - FOREGROUND_WHITE | BACKGROUND_BLUE, + FillConsoleOutputAttribute(StdOutput, + (List->CurrentEntry == ListEntry) ? + FOREGROUND_BLUE | BACKGROUND_WHITE : + FOREGROUND_WHITE | BACKGROUND_BLUE, + Width, + coPos, + &Written); + + FillConsoleOutputCharacterA(StdOutput, + ' ', Width, coPos, &Written); - FillConsoleOutputCharacterA (StdOutput, - ' ', - Width, + coPos.X++; + WriteConsoleOutputCharacterA(StdOutput, + ListEntry->Text, + min(strlen(ListEntry->Text), (SIZE_T)Width - 2), coPos, &Written); - - coPos.X++; - WriteConsoleOutputCharacterA (StdOutput, - ListEntry->Text, - min (strlen(ListEntry->Text), (SIZE_T)Width - 2), - coPos, - &Written); coPos.X--; coPos.Y++; @@ -185,17 +186,17 @@ while (coPos.Y < ListUi->Bottom) { - FillConsoleOutputAttribute (StdOutput, - FOREGROUND_WHITE | BACKGROUND_BLUE, + FillConsoleOutputAttribute(StdOutput, + FOREGROUND_WHITE | BACKGROUND_BLUE, + Width, + coPos, + &Written); + + FillConsoleOutputCharacterA(StdOutput, + ' ', Width, coPos, &Written); - - FillConsoleOutputCharacterA (StdOutput, - ' ', - Width, - coPos, - &Written); coPos.Y++; } } @@ -214,37 +215,37 @@ if (ListUi->FirstShown != List->ListHead.Flink) { - FillConsoleOutputCharacterA (StdOutput, - '\x18', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + '\x18', + 1, + coPos, + &Written); } else { - FillConsoleOutputCharacterA (StdOutput, - ' ', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + ' ', + 1, + coPos, + &Written); } coPos.Y = ListUi->Bottom; if (ListUi->LastShown != List->ListHead.Blink) { - FillConsoleOutputCharacterA (StdOutput, - '\x19', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + '\x19', + 1, + coPos, + &Written); } else { - FillConsoleOutputCharacterA (StdOutput, - ' ', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + ' ', + 1, + coPos, + &Written); } }

1 0

[hbelusca] 75751: [SETUPLIB][USETUP]: Move the floppy-disk accessibility check into InstallFatBootcodeToFloppy().
by hbelusca＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: hbelusca Date: Sun Sep 3 16:19:59 2017 New Revision: 75751 URL: http://svn.reactos.org/svn/reactos?rev=75751&view=rev Log: [SETUPLIB][USETUP]: Move the floppy-disk accessibility check into InstallFatBootcodeToFloppy(). Modified: branches/setup_improvements/base/setup/lib/bootsup.c branches/setup_improvements/base/setup/usetup/usetup.c Modified: branches/setup_improvements/base/setup/lib/bootsup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/bootsup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/bootsup.c [iso-8859-1] Sun Sep 3 16:19:59 2017 @@ -2268,7 +2268,11 @@ WCHAR SrcPath[MAX_PATH]; WCHAR DstPath[MAX_PATH]; - /* Format the floppy first */ + /* Verify that the floppy disk is accessible */ + if (DoesDirExist(NULL, FloppyDevice.Buffer) == FALSE) + return STATUS_DEVICE_NOT_READY; + + /* Format the floppy disk */ FatFS = GetFileSystemByName(L"FAT"); if (!FatFS) { Modified: branches/setup_improvements/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] Sun Sep 3 16:19:59 2017 @@ -4186,16 +4186,14 @@ } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - if (DoesDirExist(NULL, L"\\Device\\Floppy0\\") == FALSE) - { - MUIDisplayError(ERROR_NO_FLOPPY, Ir, POPUP_WAIT_ENTER); - return BOOT_LOADER_FLOPPY_PAGE; - } - - Status = InstallFatBootcodeToFloppy(&USetupData.SourceRootPath, &USetupData.DestinationArcPath); + Status = InstallFatBootcodeToFloppy(&USetupData.SourceRootPath, + &USetupData.DestinationArcPath); if (!NT_SUCCESS(Status)) { - /* Print error message */ + if (Status == STATUS_DEVICE_NOT_READY) + MUIDisplayError(ERROR_NO_FLOPPY, Ir, POPUP_WAIT_ENTER); + + /* TODO: Print error message */ return BOOT_LOADER_FLOPPY_PAGE; } @@ -4279,8 +4277,7 @@ DestinationDevicePathBuffer); if (!NT_SUCCESS(Status)) { - DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", - Status); + DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", Status); MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2017