Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ashaposhnikov] 75684: [RAPPS] - Fixed crash when trying to double-click in the "Installed" category - Replaced APPLICATION_INFO with CAvailableApplicationInfo - Added DownloadInfo struct as a repl...
by ashaposhnikov＠svn.reactos.org 26 Aug '17

26 Aug '17

Author: ashaposhnikov Date: Sat Aug 26 22:43:05 2017 New Revision: 75684 URL: http://svn.reactos.org/svn/reactos?rev=75684&view=rev Log: [RAPPS] - Fixed crash when trying to double-click in the "Installed" category - Replaced APPLICATION_INFO with CAvailableApplicationInfo - Added DownloadInfo struct as a replacement of APPLICATION_INFO in CDownloadManager - Minor fixes 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/include/dialogs.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/misc.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/installdlg.cpp 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] Sat Aug 26 22:43:05 2017 @@ -22,6 +22,7 @@ : m_Parser(sFileNameParam) { LicenseType = LICENSE_TYPE::None; + sFileName = sFileNameParam; RetrieveGeneralInfo(); @@ -73,8 +74,10 @@ VOID CAvailableApplicationInfo::RetrieveInstalledVersion() { + ATL::CStringW szNameVersion = szName + L" " + szVersion; m_HasInstalledVersion = ::GetInstalledVersion(&szInstalledVersion, szRegName) - || ::GetInstalledVersion(&szInstalledVersion, szName); + || ::GetInstalledVersion(&szInstalledVersion, szName) + || ::GetInstalledVersion(&szInstalledVersion, szNameVersion); } VOID CAvailableApplicationInfo::RetrieveLanguages() @@ -377,7 +380,7 @@ Info->RefreshAppInfo(); if (lpEnumProc) - lpEnumProc(static_cast<PAPPLICATION_INFO>(Info), m_szAppsPath.GetString()); + lpEnumProc(static_cast<CAvailableApplicationInfo*>(Info), m_szAppsPath.GetString()); } while (FindNextFileW(hFind, &FindFileData) != 0); @@ -385,7 +388,7 @@ return TRUE; } -const PAPPLICATION_INFO CAvailableApps::FindInfo(const ATL::CStringW& szAppName) +CAvailableApplicationInfo* CAvailableApps::FindInfo(const ATL::CStringW& szAppName) { if (m_InfoList.IsEmpty()) { @@ -394,7 +397,7 @@ // linear search POSITION CurrentListPosition = m_InfoList.GetHeadPosition(); - PAPPLICATION_INFO info; + CAvailableApplicationInfo* info; while (CurrentListPosition != NULL) { info = m_InfoList.GetNext(CurrentListPosition); @@ -406,12 +409,12 @@ return NULL; } -ATL::CSimpleArray<PAPPLICATION_INFO> CAvailableApps::FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) -{ - ATL::CSimpleArray<PAPPLICATION_INFO> result; +ATL::CSimpleArray<CAvailableApplicationInfo*> CAvailableApps::FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) +{ + ATL::CSimpleArray<CAvailableApplicationInfo*> result; for (INT i = 0; i < arrAppsNames.GetSize(); ++i) { - PAPPLICATION_INFO Info = FindInfo(arrAppsNames[i]); + CAvailableApplicationInfo* Info = FindInfo(arrAppsNames[i]); if (Info) { result.Add(Info); 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] Sat Aug 26 22:43:05 2017 @@ -504,24 +504,24 @@ SetCheckState(-1, bHasAllChecked); } - ATL::CSimpleArray<PAPPLICATION_INFO> GetCheckedItems() - { - ATL::CSimpleArray<PAPPLICATION_INFO> list; + ATL::CSimpleArray<CAvailableApplicationInfo*> GetCheckedItems() + { + ATL::CSimpleArray<CAvailableApplicationInfo*> list; for (INT i = 0; i >= 0; i = GetNextItem(i, LVNI_ALL)) { if (GetCheckState(i) != FALSE) { - PAPPLICATION_INFO pAppInfo = (PAPPLICATION_INFO) GetItemData(i); + CAvailableApplicationInfo* pAppInfo = (CAvailableApplicationInfo*) GetItemData(i); list.Add(pAppInfo); } } return list; } - PAPPLICATION_INFO GetSelectedData() + CAvailableApplicationInfo* GetSelectedData() { INT item = GetSelectionMark(); - return (PAPPLICATION_INFO) GetItemData(item); + return (CAvailableApplicationInfo*) GetItemData(item); } }; @@ -1062,7 +1062,7 @@ { if (IS_INSTALLED_ENUM(SelectedEnumType)) ShowInstalledAppInfo(ItemIndex); - if (isAvailableEnum(SelectedEnumType)) + if (IsAvailableEnum(SelectedEnumType)) CAvailableAppView::ShowAvailableAppInfo(ItemIndex); } /* Check if the item is checked */ @@ -1100,7 +1100,7 @@ { if (IS_INSTALLED_ENUM(SelectedEnumType)) ShowInstalledAppInfo(-1); - if (isAvailableEnum(SelectedEnumType)) + if (IsAvailableEnum(SelectedEnumType)) CAvailableAppView::ShowAvailableAppInfo(-1); } } @@ -1310,16 +1310,19 @@ break; case ID_INSTALL: - if (nSelectedApps > 0) - { - CDownloadManager::DownloadListOfApplications(m_ListView->GetCheckedItems()); - UpdateApplicationsList(-1); - } - else if (CDownloadManager::DownloadApplication(m_ListView->GetSelectedData())) - { - UpdateApplicationsList(-1); - } - + if (IsAvailableEnum(SelectedEnumType)) + { + if (nSelectedApps > 0) + { + CDownloadManager::DownloadListOfApplications(m_ListView->GetCheckedItems()); + UpdateApplicationsList(-1); + } + else if (CDownloadManager::DownloadApplication(m_ListView->GetSelectedData())) + { + UpdateApplicationsList(-1); + } + + } break; case ID_UNINSTALL: @@ -1416,7 +1419,7 @@ return TRUE; } - static BOOL CALLBACK s_EnumAvailableAppProc(PAPPLICATION_INFO Info, LPCWSTR szFolderPath) + static BOOL CALLBACK s_EnumAvailableAppProc(CAvailableApplicationInfo* Info, LPCWSTR szFolderPath) { INT Index; HICON hIcon = NULL; @@ -1506,7 +1509,7 @@ EnumInstalledApplications(EnumType, TRUE, s_EnumInstalledAppProc); EnumInstalledApplications(EnumType, FALSE, s_EnumInstalledAppProc); } - else if (isAvailableEnum(EnumType)) + else if (IsAvailableEnum(EnumType)) { /* Enum available applications */ m_AvailableApps.EnumAvailableApplications(EnumType, s_EnumAvailableAppProc); 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] Sat Aug 26 22:43:05 2017 @@ -29,7 +29,7 @@ ENUM_AVAILABLE_MAX = ENUM_CAT_OTHER }; -inline BOOL isAvailableEnum(INT x) +inline BOOL IsAvailableEnum(INT x) { return (x >= ENUM_AVAILABLE_MIN && x <= ENUM_AVAILABLE_MAX); } @@ -44,7 +44,7 @@ Min = None } *PLICENSE_TYPE; -typedef struct APPLICATION_INFO +struct CAvailableApplicationInfo { INT Category; LICENSE_TYPE LicenseType; @@ -65,14 +65,8 @@ // Optional integrity checks (SHA-1 digests are 160 bit = 40 characters in hex string form) ATL::CStringW szSHA1; + ATL::CStringW szInstalledVersion; -} *PAPPLICATION_INFO; - -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 @@ -104,6 +98,8 @@ inline BOOL FindInLanguages(LCID what) const; }; +typedef BOOL(CALLBACK *AVAILENUMPROC)(CAvailableApplicationInfo *Info, LPCWSTR szFolderPath); + class CAvailableApps { ATL::CAtlList<CAvailableApplicationInfo*> m_InfoList; @@ -123,8 +119,8 @@ VOID FreeCachedEntries(); static VOID DeleteCurrentAppsDB(); BOOL EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc); - const PAPPLICATION_INFO FindInfo(const ATL::CStringW& szAppName); - ATL::CSimpleArray<PAPPLICATION_INFO> FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames); + 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(); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h [iso-8859-1] Sat Aug 26 22:43:05 2017 @@ -7,13 +7,15 @@ // Download dialog (loaddlg.cpp) class CDowloadingAppsListView; +struct DownloadInfo; class CDownloadManager { - static ATL::CSimpleArray<PAPPLICATION_INFO> AppsToInstallList; + static ATL::CSimpleArray<DownloadInfo> AppsToInstallList; static CDowloadingAppsListView DownloadsListView; static INT iCurrentApp; + static VOID Download(const DownloadInfo& DLInfo, BOOL bIsModal = FALSE); public: static INT_PTR CALLBACK DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK DownloadProgressProc(HWND hWnd, @@ -24,8 +26,8 @@ DWORD_PTR dwRefData); static DWORD WINAPI ThreadFunc(LPVOID Context); - static BOOL DownloadListOfApplications(const ATL::CSimpleArray<PAPPLICATION_INFO>& AppsList, BOOL bIsModal = FALSE); - static BOOL DownloadApplication(PAPPLICATION_INFO pAppInfo, BOOL modal = FALSE); + static BOOL DownloadListOfApplications(const ATL::CSimpleArray<CAvailableApplicationInfo*>& AppsList, BOOL bIsModal = FALSE); + static BOOL DownloadApplication(CAvailableApplicationInfo* pAppInfo, BOOL bIsModal = FALSE); static VOID DownloadApplicationsDB(LPCWSTR lpUrl); static VOID LaunchDownloadDialog(BOOL); }; Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/misc.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/misc.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/misc.h [iso-8859-1] Sat Aug 26 22:43:05 2017 @@ -38,7 +38,7 @@ static const ATL::CStringW& GetLocale(); static INT CConfigParser::GetLocaleSize(); - CConfigParser(const ATL::CStringW& FileName); + CConfigParser(const ATL::CStringW& FileName = ""); UINT GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString); UINT GetInt(const ATL::CStringW& KeyName); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/installdlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/installdlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/installdlg.cpp [iso-8859-1] Sat Aug 26 22:43:05 2017 @@ -10,7 +10,7 @@ #include "dialogs.h" #include "available.h" -static PAPPLICATION_INFO AppInfo; +static CAvailableApplicationInfo* AppInfo; static INT_PTR CALLBACK @@ -42,10 +42,10 @@ BOOL InstallApplication(INT Index) { - if (!isAvailableEnum(SelectedEnumType)) + if (!IsAvailableEnum(SelectedEnumType)) return FALSE; - AppInfo = (PAPPLICATION_INFO) ListViewGetlParam(Index); + AppInfo = (CAvailableApplicationInfo*) ListViewGetlParam(Index); if (!AppInfo) return FALSE; DialogBoxW(hInst, 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] Sat Aug 26 22:43:05 2017 @@ -67,6 +67,34 @@ return szString; } + +struct DownloadInfo +{ + DownloadInfo() {} + DownloadInfo(const CAvailableApplicationInfo& AppInfo) + :szUrl(AppInfo.szUrlDownload), szName(AppInfo.szName), szSHA1(AppInfo.szSHA1) + { + } + + ATL::CStringW szUrl; + ATL::CStringW szName; + ATL::CStringW szSHA1; +}; + +struct DownloadParam +{ + DownloadParam() : Dialog(NULL), AppInfo(), szCaption(NULL) {} + DownloadParam(HWND dlg, const ATL::CSimpleArray<DownloadInfo> &info, LPCWSTR caption) + : Dialog(dlg), AppInfo(info), szCaption(caption) + { + } + + HWND Dialog; + ATL::CSimpleArray<DownloadInfo> AppInfo; + LPCWSTR szCaption; +}; + + class CDownloadDialog : public CComObjectRootEx<CComMultiThreadModelNoCS>, public IBindStatusCallback @@ -227,12 +255,11 @@ return hwnd; } - VOID LoadList(ATL::CSimpleArray<PAPPLICATION_INFO> arrInfo) + VOID LoadList(ATL::CSimpleArray<DownloadInfo> arrInfo) { for (INT i = 0; i < arrInfo.GetSize(); ++i) { - PAPPLICATION_INFO AppInfo = arrInfo[i]; - AddRow(i, AppInfo->szName.GetString(), DOWNLOAD_STATUS::DLWaiting); + AddRow(i, arrInfo[i].szName.GetString(), DOWNLOAD_STATUS::DLWaiting); } } @@ -346,23 +373,17 @@ } } -struct DownloadParam -{ - DownloadParam() : Dialog(NULL), AppInfo(), szCaption(NULL) {} - DownloadParam(HWND dlg, const ATL::CSimpleArray<PAPPLICATION_INFO> &info, LPCWSTR caption) - : Dialog(dlg), AppInfo(info), szCaption(caption) - { - } - - HWND Dialog; - ATL::CSimpleArray<PAPPLICATION_INFO> AppInfo; - LPCWSTR szCaption; -}; - // CDownloadManager -ATL::CSimpleArray<PAPPLICATION_INFO> CDownloadManager::AppsToInstallList; +ATL::CSimpleArray<DownloadInfo> CDownloadManager::AppsToInstallList; CDowloadingAppsListView CDownloadManager::DownloadsListView; INT CDownloadManager::iCurrentApp; + +VOID CDownloadManager::Download(const DownloadInfo &DLInfo, BOOL bIsModal) +{ + AppsToInstallList.RemoveAll(); + AppsToInstallList.Add(DLInfo); + LaunchDownloadDialog(bIsModal); +} INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -419,6 +440,7 @@ } CloseHandle(Thread); + AppsToInstallList.RemoveAll(); return TRUE; } @@ -546,11 +568,11 @@ size_t urlLength, filenameLength; const INT iAppId = iCurrentApp; - const ATL::CSimpleArray<PAPPLICATION_INFO> InfoArray = static_cast<DownloadParam*>(param)->AppInfo; + const ATL::CSimpleArray<DownloadInfo> &InfoArray = static_cast<DownloadParam*>(param)->AppInfo; LPCWSTR szCaption = static_cast<DownloadParam*>(param)->szCaption; ATL::CStringW szNewCaption; - delete param; + if (InfoArray.GetSize() <= 0) { MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD); @@ -559,16 +581,11 @@ for (INT iAppId = 0; iAppId < InfoArray.GetSize(); ++iAppId) { - PAPPLICATION_INFO pCurrentInfo = AppsToInstallList[iAppId]; - if (!pCurrentInfo) - { - MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD); - continue; - } + const DownloadInfo &CurrentInfo = InfoArray[iAppId]; // build the path for the download - p = wcsrchr(pCurrentInfo->szUrlDownload.GetString(), L'/'); - q = wcsrchr(pCurrentInfo->szUrlDownload.GetString(), L'?'); + p = wcsrchr(CurrentInfo.szUrl.GetString(), L'/'); + q = wcsrchr(CurrentInfo.szUrl.GetString(), L'?'); // do we have a final slash separator? if (!p) @@ -583,7 +600,7 @@ filenameLength -= wcslen(q - 1) * sizeof(WCHAR); // is this URL an update package for RAPPS? if so store it in a different place - if (pCurrentInfo->szUrlDownload == APPLICATION_DATABASE_URL) + if (CurrentInfo.szUrl == APPLICATION_DATABASE_URL) { bCab = TRUE; if (!GetStorageDirectory(Path)) @@ -605,10 +622,10 @@ Path += L"\\"; Path += (LPWSTR) (p + 1); - if (!bCab && pCurrentInfo->szSHA1[0] && GetFileAttributesW(Path.GetString()) != INVALID_FILE_ATTRIBUTES) + if (!bCab && CurrentInfo.szSHA1[0] && GetFileAttributesW(Path.GetString()) != INVALID_FILE_ATTRIBUTES) { // only open it in case of total correctness - if (VerifyInteg(pCurrentInfo->szSHA1, Path)) + if (VerifyInteg(CurrentInfo.szSHA1.GetString(), Path)) goto run; } @@ -622,7 +639,7 @@ // Change caption to show the currently downloaded app if (!bCab) { - szNewCaption.Format(szCaption, pCurrentInfo->szName.GetString()); + szNewCaption.Format(szCaption, CurrentInfo.szName.GetString()); } else { @@ -632,7 +649,7 @@ SetWindowTextW(hDlg, szNewCaption.GetString()); // Add the download URL - SetDlgItemTextW(hDlg, IDC_DOWNLOAD_STATUS, pCurrentInfo->szUrlDownload.GetString()); + SetDlgItemTextW(hDlg, IDC_DOWNLOAD_STATUS, CurrentInfo.szUrl.GetString()); DownloadsListView.SetDownloadStatus(iAppId, DOWNLOAD_STATUS::DLDownloading); @@ -663,7 +680,7 @@ if (!hOpen) goto end; - hFile = InternetOpenUrlW(hOpen, pCurrentInfo->szUrlDownload.GetString(), NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_KEEP_CONNECTION, 0); + hFile = InternetOpenUrlW(hOpen, CurrentInfo.szUrl.GetString(), NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_KEEP_CONNECTION, 0); if (!hFile) { @@ -685,13 +702,13 @@ memset(&urlComponents, 0, sizeof(urlComponents)); urlComponents.dwStructSize = sizeof(urlComponents); - urlLength = pCurrentInfo->szUrlDownload.GetLength(); + urlLength = CurrentInfo.szUrl.GetLength(); urlComponents.dwSchemeLength = urlLength + 1; urlComponents.lpszScheme = (LPWSTR) malloc(urlComponents.dwSchemeLength * sizeof(WCHAR)); urlComponents.dwHostNameLength = urlLength + 1; urlComponents.lpszHostName = (LPWSTR) malloc(urlComponents.dwHostNameLength * sizeof(WCHAR)); - if (!InternetCrackUrlW(pCurrentInfo->szUrlDownload, urlLength + 1, ICU_DECODE | ICU_ESCAPE, &urlComponents)) + if (!InternetCrackUrlW(CurrentInfo.szUrl, urlLength + 1, ICU_DECODE | ICU_ESCAPE, &urlComponents)) goto end; if (urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS) @@ -703,7 +720,7 @@ #ifdef USE_CERT_PINNING // are we using HTTPS to download the RAPPS update package? check if the certificate is original if ((urlComponents.nScheme == INTERNET_SCHEME_HTTPS) && - (wcscmp(pCurrentInfo->szUrlDownload, APPLICATION_DATABASE_URL) == 0) && + (wcscmp(CurrentInfo.szUrl, APPLICATION_DATABASE_URL) == 0) && (!CertIsValid(hOpen, urlComponents.lpszHostName))) { MessageBox_LoadString(hMainWnd, IDS_CERT_DOES_NOT_MATCH); @@ -735,7 +752,7 @@ } dwCurrentBytesRead += dwBytesRead; - dl->OnProgress(dwCurrentBytesRead, dwContentLen, 0, pCurrentInfo->szUrlDownload.GetString()); + dl->OnProgress(dwCurrentBytesRead, dwContentLen, 0, CurrentInfo.szUrl.GetString()); } while (dwBytesRead && !bCancelled); CloseHandle(hOut); @@ -746,7 +763,7 @@ /* if this thing isn't a RAPPS update and it has a SHA-1 checksum verify its integrity by using the native advapi32.A_SHA1 functions */ - if (!bCab && pCurrentInfo->szSHA1[0] != 0) + if (!bCab && CurrentInfo.szSHA1[0] != 0) { ATL::CStringW szMsgText; @@ -758,7 +775,7 @@ SendMessageW(GetDlgItem(hDlg, IDC_DOWNLOAD_STATUS), WM_SETTEXT, 0, (LPARAM) Path.GetString()); // this may take a while, depending on the file size - if (!VerifyInteg(pCurrentInfo->szSHA1, Path.GetString())) + if (!VerifyInteg(CurrentInfo.szSHA1.GetString(), Path.GetString())) { if (!szMsgText.LoadStringW(IDS_INTEG_CHECK_FAIL)) goto end; @@ -811,11 +828,12 @@ DownloadsListView.SetDownloadStatus(iAppId, DOWNLOAD_STATUS::DLFinished); } + delete param; SendMessageW(hDlg, WM_CLOSE, 0, 0); return 0; } -BOOL CDownloadManager::DownloadListOfApplications(const ATL::CSimpleArray<PAPPLICATION_INFO>& AppsList, BOOL bIsModal) +BOOL CDownloadManager::DownloadListOfApplications(const ATL::CSimpleArray<CAvailableApplicationInfo*>& AppsList, BOOL bIsModal) { if (AppsList.GetSize() == 0) { @@ -823,7 +841,13 @@ } // Initialize shared variables - AppsToInstallList = AppsList; + for (INT i = 0; i < AppsList.GetSize(); ++i) + { + if (AppsList[i]) + { + AppsToInstallList.Add(*(AppsList[i])); + } + } // Create a dialog and issue a download process LaunchDownloadDialog(bIsModal); @@ -831,26 +855,21 @@ return TRUE; } -BOOL CDownloadManager::DownloadApplication(PAPPLICATION_INFO pAppInfo, BOOL bIsModal) +BOOL CDownloadManager::DownloadApplication(CAvailableApplicationInfo* pAppInfo, BOOL bIsModal) { if (!pAppInfo) - { return FALSE; - } - - AppsToInstallList.RemoveAll(); - AppsToInstallList.Add(pAppInfo); - LaunchDownloadDialog(bIsModal); - + + Download(*pAppInfo, bIsModal); return TRUE; } VOID CDownloadManager::DownloadApplicationsDB(LPCWSTR lpUrl) { - static APPLICATION_INFO IntInfo; - IntInfo.szUrlDownload = lpUrl; - IntInfo.szName.LoadStringW(IDS_DL_DIALOG_DB_DISP); - DownloadApplication(&IntInfo, TRUE); + static DownloadInfo DatabaseDLInfo; + DatabaseDLInfo.szUrl = lpUrl; + DatabaseDLInfo.szName.LoadStringW(IDS_DL_DIALOG_DB_DISP); + Download(DatabaseDLInfo, TRUE); } //TODO: Reuse the dialog 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] Sat Aug 26 22:43:05 2017 @@ -58,7 +58,7 @@ CAvailableApps apps; CAvailableApps::UpdateAppsDB(); apps.EnumAvailableApplications(ENUM_ALL_AVAILABLE, NULL); - ATL::CSimpleArray<PAPPLICATION_INFO> arrAppInfo = apps.FindInfoList(arrNames); + ATL::CSimpleArray<CAvailableApplicationInfo*> arrAppInfo = apps.FindInfoList(arrNames); if (arrAppInfo.GetSize() > 0) { CDownloadManager::DownloadListOfApplications(arrAppInfo, TRUE);

1 0

[ashaposhnikov] 75683: [RAPPS] - Fixed typo in lang/ru-RU.rc
by ashaposhnikov＠svn.reactos.org 26 Aug '17

26 Aug '17

Author: ashaposhnikov Date: Sat Aug 26 22:35:29 2017 New Revision: 75683 URL: http://svn.reactos.org/svn/reactos?rev=75683&view=rev Log: [RAPPS] - Fixed typo in lang/ru-RU.rc Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ru-RU.rc Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Sat Aug 26 22:35:29 2017 @@ -237,7 +237,7 @@ IDS_LANGUAGE_NO_TRANSLATION "ÐÐ¾ÑÑÑÐ¿Ð½Ð¾ Ð½Ð° Ð´ÑÑÐ³Ð¸Ñ ÑÐ·ÑÐºÐ°Ñ" IDS_LANGUAGE_ENGLISH_TRANSLATION "ÐÐ¾ÑÑÑÐ¿Ð½Ð¾ Ð½Ð° ÐÐ½Ð³Ð»Ð¸Ð¹ÑÐºÐ¾Ð¼" IDS_LANGUAGE_SINGLE "ÐÐ´Ð¸Ð½ ÑÐ·ÑÐº" - IDS_LANGUAGE_MORE_PLACEHOLDER " (+ÐµÑÐµ %d ) + IDS_LANGUAGE_MORE_PLACEHOLDER " (+ÐµÑÐµ %d )" IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d Ð´Ð¾ÑÑÑÐ¿Ð½Ð¾)" END

1 0

[khornicek] 75682: [TRANSLATIONS] - Fix missing shortcuts on desktop for Ukrainian localization.
by khornicek＠svn.reactos.org 26 Aug '17

26 Aug '17

Author: khornicek Date: Sat Aug 26 21:19:44 2017 New Revision: 75682 URL: http://svn.reactos.org/svn/reactos?rev=75682&view=rev Log: [TRANSLATIONS] - Fix missing shortcuts on desktop for Ukrainian localization. Modified: trunk/reactos/dll/win32/userenv/lang/uk-UA.rc Modified: trunk/reactos/dll/win32/userenv/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/uk-UA.rc [iso-8859-1] Sat Aug 26 21:19:44 2017 @@ -4,7 +4,7 @@ BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" IDS_APPDATA "Application Data" - IDS_DESKTOP "Desktop" + IDS_DESKTOP "Ð Ð¾Ð±Ð¾ÑÐ¸Ð¹ ÑÑÑÐ»" IDS_FAVORITES "ÐÐ±ÑÐ°Ð½Ðµ" IDS_MYDOCUMENTS "ÐÐ¾Ñ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ¸" IDS_NETHOOD "NetHood"

1 0

[ashaposhnikov] 75681: [RAPPS] - Fixed switching between "Installed" and "Available" - Added default icon to "Installed"
by ashaposhnikov＠svn.reactos.org 26 Aug '17

26 Aug '17

Author: ashaposhnikov Date: Sat Aug 26 19:41:09 2017 New Revision: 75681 URL: http://svn.reactos.org/svn/reactos?rev=75681&view=rev Log: [RAPPS] - Fixed switching between "Installed" and "Available" - Added default icon to "Installed" Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.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] Sat Aug 26 19:41:09 2017 @@ -240,12 +240,11 @@ /* loop and deallocate all the cached app infos in the list */ while (InfoListPosition) { - CAvailableApplicationInfo* Info = m_InfoList.GetAt(InfoListPosition); - m_InfoList.RemoveHead(); + CAvailableApplicationInfo* Info = m_InfoList.GetNext(InfoListPosition); delete Info; - - InfoListPosition = m_InfoList.GetHeadPosition(); - } + } + + m_InfoList.RemoveAll(); } VOID CAvailableApps::DeleteCurrentAppsDB() @@ -317,6 +316,7 @@ BOOL CAvailableApps::EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc) { + HANDLE hFind = INVALID_HANDLE_VALUE; WIN32_FIND_DATAW FindFileData; 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] Sat Aug 26 19:41:09 2017 @@ -1396,14 +1396,12 @@ return TRUE; } - ItemInfo = (PINSTALLED_INFO) HeapAlloc(GetProcessHeap(), 0, sizeof(INSTALLED_INFO)); + ItemInfo = new INSTALLED_INFO(*Info); if (!ItemInfo) { RegCloseKey(Info->hSubKey); return FALSE; } - - RtlCopyMemory(ItemInfo, Info, sizeof(INSTALLED_INFO)); Index = ListViewAddItem(ItemIndex, 0, szName, (LPARAM) ItemInfo); @@ -1481,7 +1479,7 @@ nSelectedApps = 0; if (EnumType < 0) EnumType = SelectedEnumType; - if (IS_INSTALLED_ENUM(EnumType)) + if (IS_INSTALLED_ENUM(SelectedEnumType)) { FreeInstalledAppList(); } @@ -1501,6 +1499,9 @@ if (IS_INSTALLED_ENUM(EnumType)) { + HICON hIcon = (HICON) LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); + ImageList_AddIcon(hImageListView, hIcon); + DestroyIcon(hIcon); /* Enum installed applications and updates */ EnumInstalledApplications(EnumType, TRUE, s_EnumInstalledAppProc); EnumInstalledApplications(EnumType, FALSE, s_EnumInstalledAppProc);

1 0

[ashaposhnikov] 75680: [RAPPS] - Revert s_EnumInstalledAppProc()
by ashaposhnikov＠svn.reactos.org 26 Aug '17

26 Aug '17

Author: ashaposhnikov Date: Sat Aug 26 17:52:55 2017 New Revision: 75680 URL: http://svn.reactos.org/svn/reactos?rev=75680&view=rev Log: [RAPPS] - Revert s_EnumInstalledAppProc() 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] Sat Aug 26 17:52:55 2017 @@ -1384,27 +1384,35 @@ return StrStrIW(szHaystack, szNeedle) != NULL; } - static BOOL CALLBACK s_EnumInstalledAppProc(INT ItemIndex, ATL::CStringW &szName, PINSTALLED_INFO ItemInfo) - { + static BOOL CALLBACK s_EnumInstalledAppProc(INT ItemIndex, ATL::CStringW &szName, PINSTALLED_INFO Info) + { + PINSTALLED_INFO ItemInfo; ATL::CStringW szText; INT Index; - INSTALLED_INFO Info; if (!SearchPatternMatch(szName.GetString(), szSearchPattern)) { - RegCloseKey(ItemInfo->hSubKey); + RegCloseKey(Info->hSubKey); return TRUE; } - RtlCopyMemory(ItemInfo, &Info, sizeof(INSTALLED_INFO)); - Index = ListViewAddItem(ItemIndex, 0, szName, (LPARAM) &Info); + ItemInfo = (PINSTALLED_INFO) HeapAlloc(GetProcessHeap(), 0, sizeof(INSTALLED_INFO)); + if (!ItemInfo) + { + RegCloseKey(Info->hSubKey); + return FALSE; + } + + RtlCopyMemory(ItemInfo, Info, sizeof(INSTALLED_INFO)); + + Index = ListViewAddItem(ItemIndex, 0, szName, (LPARAM) ItemInfo); /* Get version info */ - GetApplicationString(Info.hSubKey, L"DisplayVersion", szText); + GetApplicationString(ItemInfo->hSubKey, L"DisplayVersion", szText); ListView_SetItemText(hListView, Index, 1, const_cast<LPWSTR>(szText.GetString())); /* Get comments */ - GetApplicationString(Info.hSubKey, L"Comments", szText); + GetApplicationString(ItemInfo->hSubKey, L"Comments", szText); ListView_SetItemText(hListView, Index, 2, const_cast<LPWSTR>(szText.GetString())); return TRUE;

1 0

[ashaposhnikov] 75679: [RAPPS] - Amend last commit - added gui.h
by ashaposhnikov＠svn.reactos.org 26 Aug '17

26 Aug '17

Author: ashaposhnikov Date: Sat Aug 26 17:42:21 2017 New Revision: 75679 URL: http://svn.reactos.org/svn/reactos?rev=75679&view=rev Log: [RAPPS] - Amend last commit - added gui.h Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/gui.h Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/gui.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/gui.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/gui.h [iso-8859-1] Sat Aug 26 17:42:21 2017 @@ -12,7 +12,7 @@ VOID InsertRichEditText(LPCWSTR szText, DWORD flags); VOID SetStatusBarText(const ATL::CStringW& szText); -INT ListViewAddItem(INT ItemIndex, INT IconIndex, ATL::CStringW & Name, LPARAM lParam); +INT ListViewAddItem(INT ItemIndex, INT IconIndex, const ATL::CStringW& Name, LPARAM lParam); VOID NewRichEditText(const ATL::CStringW& szText, DWORD flags); VOID InsertRichEditText(const ATL::CStringW& szText, DWORD flags); CAvailableApps * GetAvailableApps();

1 0

[ashaposhnikov] 75678: [RAPPS] - Removed hard-coded string leftover - Re-enabled Installed category
by ashaposhnikov＠svn.reactos.org 26 Aug '17

26 Aug '17

Author: ashaposhnikov Date: Sat Aug 26 16:49:18 2017 New Revision: 75678 URL: http://svn.reactos.org/svn/reactos?rev=75678&view=rev Log: [RAPPS] - Removed hard-coded string leftover - Re-enabled Installed category 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] Sat Aug 26 16:49:18 2017 @@ -166,7 +166,7 @@ { ATL::CStringW buf; buf.LoadStringW(IDS_LANGUAGE_AVAILABLE_PLACEHOLDER); - szLangInfo.Format(L" (+%d available)", nTranslations - 1); + szLangInfo.Format(buf, nTranslations - 1); } else { @@ -661,28 +661,33 @@ VOID InitCategoriesList() { - HTREEITEM hRootItem; - - hRootItem = AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, IDI_CATEGORY); - AddCategory(hRootItem, IDS_CAT_AUDIO, IDI_CAT_AUDIO); - AddCategory(hRootItem, IDS_CAT_VIDEO, IDI_CAT_VIDEO); - AddCategory(hRootItem, IDS_CAT_GRAPHICS, IDI_CAT_GRAPHICS); - AddCategory(hRootItem, IDS_CAT_GAMES, IDI_CAT_GAMES); - AddCategory(hRootItem, IDS_CAT_INTERNET, IDI_CAT_INTERNET); - AddCategory(hRootItem, IDS_CAT_OFFICE, IDI_CAT_OFFICE); - AddCategory(hRootItem, IDS_CAT_DEVEL, IDI_CAT_DEVEL); - AddCategory(hRootItem, IDS_CAT_EDU, IDI_CAT_EDU); - AddCategory(hRootItem, IDS_CAT_ENGINEER, IDI_CAT_ENGINEER); - AddCategory(hRootItem, IDS_CAT_FINANCE, IDI_CAT_FINANCE); - AddCategory(hRootItem, IDS_CAT_SCIENCE, IDI_CAT_SCIENCE); - AddCategory(hRootItem, IDS_CAT_TOOLS, IDI_CAT_TOOLS); - AddCategory(hRootItem, IDS_CAT_DRIVERS, IDI_CAT_DRIVERS); - AddCategory(hRootItem, IDS_CAT_LIBS, IDI_CAT_LIBS); - AddCategory(hRootItem, IDS_CAT_OTHER, IDI_CAT_OTHER); + HTREEITEM hRootItem1, hRootItem2; + + hRootItem1 = AddCategory(TVI_ROOT, IDS_INSTALLED, IDI_CATEGORY); + AddCategory(hRootItem1, IDS_APPLICATIONS, IDI_APPS); + AddCategory(hRootItem1, IDS_UPDATES, IDI_APPUPD); + + hRootItem2 = AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, IDI_CATEGORY); + AddCategory(hRootItem2, IDS_CAT_AUDIO, IDI_CAT_AUDIO); + AddCategory(hRootItem2, IDS_CAT_VIDEO, IDI_CAT_VIDEO); + AddCategory(hRootItem2, IDS_CAT_GRAPHICS, IDI_CAT_GRAPHICS); + AddCategory(hRootItem2, IDS_CAT_GAMES, IDI_CAT_GAMES); + AddCategory(hRootItem2, IDS_CAT_INTERNET, IDI_CAT_INTERNET); + AddCategory(hRootItem2, IDS_CAT_OFFICE, IDI_CAT_OFFICE); + AddCategory(hRootItem2, IDS_CAT_DEVEL, IDI_CAT_DEVEL); + AddCategory(hRootItem2, IDS_CAT_EDU, IDI_CAT_EDU); + AddCategory(hRootItem2, IDS_CAT_ENGINEER, IDI_CAT_ENGINEER); + AddCategory(hRootItem2, IDS_CAT_FINANCE, IDI_CAT_FINANCE); + AddCategory(hRootItem2, IDS_CAT_SCIENCE, IDI_CAT_SCIENCE); + AddCategory(hRootItem2, IDS_CAT_TOOLS, IDI_CAT_TOOLS); + AddCategory(hRootItem2, IDS_CAT_DRIVERS, IDI_CAT_DRIVERS); + AddCategory(hRootItem2, IDS_CAT_LIBS, IDI_CAT_LIBS); + AddCategory(hRootItem2, IDS_CAT_OTHER, IDI_CAT_OTHER); m_TreeView->SetImageList(); - m_TreeView->Expand(hRootItem, TVE_EXPAND); - m_TreeView->SelectItem(hRootItem); + m_TreeView->Expand(hRootItem1, TVE_EXPAND); + m_TreeView->Expand(hRootItem2, TVE_EXPAND); + m_TreeView->SelectItem(hRootItem1); } BOOL CreateStatusBar() @@ -889,6 +894,7 @@ SaveSettings(hwnd); FreeLogs(); + m_AvailableApps.FreeCachedEntries(); if (IS_INSTALLED_ENUM(SelectedEnumType)) FreeInstalledAppList(); @@ -1378,35 +1384,27 @@ return StrStrIW(szHaystack, szNeedle) != NULL; } - static BOOL CALLBACK s_EnumInstalledAppProc(INT ItemIndex, LPWSTR lpName, PINSTALLED_INFO Info) - { - PINSTALLED_INFO ItemInfo; + static BOOL CALLBACK s_EnumInstalledAppProc(INT ItemIndex, ATL::CStringW &szName, PINSTALLED_INFO ItemInfo) + { ATL::CStringW szText; INT Index; - - if (!SearchPatternMatch(lpName, szSearchPattern)) - { - RegCloseKey(Info->hSubKey); + INSTALLED_INFO Info; + + if (!SearchPatternMatch(szName.GetString(), szSearchPattern)) + { + RegCloseKey(ItemInfo->hSubKey); return TRUE; } - ItemInfo = (PINSTALLED_INFO) HeapAlloc(GetProcessHeap(), 0, sizeof(INSTALLED_INFO)); - if (!ItemInfo) - { - RegCloseKey(Info->hSubKey); - return FALSE; - } - - RtlCopyMemory(ItemInfo, Info, sizeof(INSTALLED_INFO)); - - Index = ListViewAddItem(ItemIndex, 0, lpName, (LPARAM) ItemInfo); + RtlCopyMemory(ItemInfo, &Info, sizeof(INSTALLED_INFO)); + Index = ListViewAddItem(ItemIndex, 0, szName, (LPARAM) &Info); /* Get version info */ - GetApplicationString(ItemInfo->hSubKey, L"DisplayVersion", szText); + GetApplicationString(Info.hSubKey, L"DisplayVersion", szText); ListView_SetItemText(hListView, Index, 1, const_cast<LPWSTR>(szText.GetString())); /* Get comments */ - GetApplicationString(ItemInfo->hSubKey, L"Comments", szText); + GetApplicationString(Info.hSubKey, L"Comments", szText); ListView_SetItemText(hListView, Index, 2, const_cast<LPWSTR>(szText.GetString())); return TRUE; @@ -1493,13 +1491,16 @@ ImageList_Destroy(hImageListBuf); } - if (isAvailableEnum(EnumType)) + if (IS_INSTALLED_ENUM(EnumType)) + { + /* Enum installed applications and updates */ + EnumInstalledApplications(EnumType, TRUE, s_EnumInstalledAppProc); + EnumInstalledApplications(EnumType, FALSE, s_EnumInstalledAppProc); + } + else if (isAvailableEnum(EnumType)) { /* Enum available applications */ - if (!m_AvailableApps.EnumAvailableApplications(EnumType, s_EnumAvailableAppProc)) - { - return; - } + m_AvailableApps.EnumAvailableApplications(EnumType, s_EnumAvailableAppProc); } SelectedEnumType = EnumType; @@ -1624,7 +1625,7 @@ SetStatusBarText(szText.GetString()); } -INT ListViewAddItem(INT ItemIndex, INT IconIndex, ATL::CStringW & Name, LPARAM lParam) +INT ListViewAddItem(INT ItemIndex, INT IconIndex, const ATL::CStringW& Name, LPARAM lParam) { return ListViewAddItem(ItemIndex, IconIndex, const_cast<LPWSTR>(Name.GetString()), lParam); }

1 0

[gadamopoulos] 75677: [BROWSEUI][SHELL32] -Move bitmap resources used by browseui from shell32 to browseui. Browseui alongside filebrowser.exe can already be used in windows so it makes sense to le...
by gadamopoulos＠svn.reactos.org 26 Aug '17

26 Aug '17

Author: gadamopoulos Date: Sat Aug 26 14:38:32 2017 New Revision: 75677 URL: http://svn.reactos.org/svn/reactos?rev=75677&view=rev Log: [BROWSEUI][SHELL32] -Move bitmap resources used by browseui from shell32 to browseui. Browseui alongside filebrowser.exe can already be used in windows so it makes sense to let it have toolbar icons even in latest windows versions. (It works from xp to win10). Added: trunk/reactos/dll/win32/browseui/res/214.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/214.bmp trunk/reactos/dll/win32/browseui/res/215.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/215.bmp trunk/reactos/dll/win32/browseui/res/216.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/216.bmp trunk/reactos/dll/win32/browseui/res/217.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/217.bmp trunk/reactos/dll/win32/browseui/res/230.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/230.bmp trunk/reactos/dll/win32/browseui/res/231.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/231.bmp trunk/reactos/dll/win32/browseui/res/240.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/240.bmp trunk/reactos/dll/win32/browseui/res/241.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/241.bmp trunk/reactos/dll/win32/browseui/res/242.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/242.bmp trunk/reactos/dll/win32/browseui/res/245.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/245.bmp trunk/reactos/dll/win32/browseui/res/246.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/246.bmp trunk/reactos/dll/win32/browseui/res/247.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/247.bmp Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/214.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/215.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/216.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/217.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/230.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/231.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/240.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/241.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/242.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/245.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/246.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/247.bmp Modified: trunk/reactos/dll/win32/browseui/addressband.cpp trunk/reactos/dll/win32/browseui/brandband.cpp trunk/reactos/dll/win32/browseui/browseui.rc trunk/reactos/dll/win32/browseui/resource.h trunk/reactos/dll/win32/browseui/toolsband.cpp trunk/reactos/dll/win32/shell32/bitmap_res.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] Sat Aug 26 14:38:32 2017 @@ -529,7 +529,7 @@ const TBBUTTON buttonInfo [] = { { 0, 1, TBSTATE_ENABLED, 0 } }; HINSTANCE shellInstance; - shellInstance = GetModuleHandle(_T("shell32.dll")); + shellInstance = _AtlBaseModule.GetResourceInstance(); m_himlNormal = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); m_himlHot = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), Modified: trunk/reactos/dll/win32/browseui/brandband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/brandba… ============================================================================== --- trunk/reactos/dll/win32/browseui/brandband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/brandband.cpp [iso-8859-1] Sat Aug 26 14:38:32 2017 @@ -85,7 +85,6 @@ int clientWidth; int clientHeight; int clientSize; - HINSTANCE shell32Instance; BITMAP bitmapInfo; int resourceID; @@ -102,8 +101,7 @@ resourceID += 2; else if (clientSize >= gMediumImageSize) resourceID += 1; - shell32Instance = GetModuleHandle(L"shell32.dll"); - fImageBitmap = LoadBitmap(shell32Instance, MAKEINTRESOURCE(resourceID)); + fImageBitmap = LoadBitmap(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(resourceID)); GetObjectW(fImageBitmap, sizeof(bitmapInfo), &bitmapInfo); fBitmapSize = bitmapInfo.bmWidth; fMaxFrameCount = bitmapInfo.bmHeight / fBitmapSize; Modified: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] Sat Aug 26 14:38:32 2017 @@ -110,3 +110,15 @@ /* Include band button bitmaps */ IDB_BANDBUTTONS BITMAP "res/barbtn.bmp" +IDB_SHELL_EXPLORER_LG BITMAP "res/214.bmp" +IDB_SHELL_EXPLORER_LG_HOT BITMAP "res/215.bmp" +IDB_SHELL_EXPLORER_SM BITMAP "res/216.bmp" +IDB_SHELL_EXPLORER_SM_HOT BITMAP "res/217.bmp" +IDB_SHELL_GO BITMAP "res/230.bmp" +IDB_SHELL_GO_HOT BITMAP "res/231.bmp" +IDB_SHELL_BRANDBAND_SM_HI BITMAP "res/240.bmp" +/*IDB_SHELL_BRANDBAND_MD_HI BITMAP "res/241.bmp" +IDB_SHELL_BRANDBAND_LG_HI BITMAP "res/242.bmp" +IDB_SHELL_BRANDBAND_SM_LO BITMAP "res/245.bmp" +IDB_SHELL_BRANDBAND_MD_LO BITMAP "res/246.bmp" +IDB_SHELL_BRANDBAND_LG_LO BITMAP "res/247.bmp"*/ Modified: trunk/reactos/dll/win32/browseui/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/resourc… ============================================================================== --- trunk/reactos/dll/win32/browseui/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/resource.h [iso-8859-1] Sat Aug 26 14:38:32 2017 @@ -129,3 +129,15 @@ #define IDC_ICONOPTIONS 4097 #define IDB_BANDBUTTONS 545 +#define IDB_SHELL_EXPLORER_LG 214 +#define IDB_SHELL_EXPLORER_LG_HOT 215 +#define IDB_SHELL_EXPLORER_SM 216 +#define IDB_SHELL_EXPLORER_SM_HOT 217 +#define IDB_SHELL_GO 230 +#define IDB_SHELL_GO_HOT 231 +#define IDB_SHELL_BRANDBAND_SM_HI 240 +/*#define IDB_SHELL_BRANDBAND_MD_HI 241 +#define IDB_SHELL_BRANDBAND_LG_HI 242 +#define IDB_SHELL_BRANDBAND_SM_LO 245 +#define IDB_SHELL_BRANDBAND_MD_LO 246 +#define IDB_SHELL_BRANDBAND_LG_LO 247*/ Modified: trunk/reactos/dll/win32/browseui/toolsband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/toolsba… ============================================================================== --- trunk/reactos/dll/win32/browseui/toolsband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/toolsband.cpp [iso-8859-1] Sat Aug 26 14:38:32 2017 @@ -295,12 +295,13 @@ SendMessage(TB_SETMAXTEXTROWS, 1, 0); SendMessage(TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DRAWDDARROWS); - HINSTANCE shell32Instance = GetModuleHandle(_T("shell32.dll")); - m_himlNormal = ImageList_LoadImageW(shell32Instance, MAKEINTRESOURCE(214), - 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); - - m_himlHot = ImageList_LoadImageW(shell32Instance, MAKEINTRESOURCE(215), - 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); + m_himlNormal = ImageList_LoadImageW(_AtlBaseModule.GetResourceInstance(), + MAKEINTRESOURCE(IDB_SHELL_EXPLORER_LG), + 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); + + m_himlHot = ImageList_LoadImageW(_AtlBaseModule.GetResourceInstance(), + MAKEINTRESOURCE(IDB_SHELL_EXPLORER_LG_HOT), + 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); SendMessage(TB_SETIMAGELIST, 0, (LPARAM) m_himlNormal); SendMessage(TB_SETHOTIMAGELIST, 0, (LPARAM) m_himlHot); Modified: trunk/reactos/dll/win32/shell32/bitmap_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/bitmap_r… ============================================================================== --- trunk/reactos/dll/win32/shell32/bitmap_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/bitmap_res.rc [iso-8859-1] Sat Aug 26 14:38:32 2017 @@ -4,19 +4,7 @@ IDB_SHELL_IEXPLORE_LG_HOT BITMAP "res/bitmaps/205.bmp" IDB_SHELL_IEXPLORE_SM BITMAP "res/bitmaps/206.bmp" IDB_SHELL_IEXPLORE_SM_HOT BITMAP "res/bitmaps/207.bmp" -IDB_SHELL_EXPLORER_LG BITMAP "res/bitmaps/214.bmp" -IDB_SHELL_EXPLORER_LG_HOT BITMAP "res/bitmaps/215.bmp" -IDB_SHELL_EXPLORER_SM BITMAP "res/bitmaps/216.bmp" -IDB_SHELL_EXPLORER_SM_HOT BITMAP "res/bitmaps/217.bmp" IDB_SHELL_EDIT_LG BITMAP "res/bitmaps/225.bmp" IDB_SHELL_EDIT_LG_HOT BITMAP "res/bitmaps/226.bmp" IDB_SHELL_EDIT_SM BITMAP "res/bitmaps/227.bmp" IDB_SHELL_EDIT_SM_HOT BITMAP "res/bitmaps/228.bmp" -IDB_SHELL_GO BITMAP "res/bitmaps/230.bmp" -IDB_SHELL_GO_HOT BITMAP "res/bitmaps/231.bmp" -IDB_SHELL_BRANDBAND_SM_HI BITMAP "res/bitmaps/240.bmp" -/*IDB_SHELL_BRANDBAND_MD_HI BITMAP "res/bitmaps/241.bmp" -IDB_SHELL_BRANDBAND_LG_HI BITMAP "res/bitmaps/242.bmp" -IDB_SHELL_BRANDBAND_SM_LO BITMAP "res/bitmaps/245.bmp" -IDB_SHELL_BRANDBAND_MD_LO BITMAP "res/bitmaps/246.bmp" -IDB_SHELL_BRANDBAND_LG_LO BITMAP "res/bitmaps/247.bmp"*/ Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/214.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/215.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/216.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/217.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/230.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/231.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/240.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/241.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/242.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/245.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/246.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/247.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… ============================================================================== Binary file - no diff available. Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Sat Aug 26 14:38:32 2017 @@ -31,22 +31,10 @@ #define IDB_SHELL_IEXPLORE_LG_HOT 205 #define IDB_SHELL_IEXPLORE_SM 206 #define IDB_SHELL_IEXPLORE_SM_HOT 207 -#define IDB_SHELL_EXPLORER_LG 214 -#define IDB_SHELL_EXPLORER_LG_HOT 215 -#define IDB_SHELL_EXPLORER_SM 216 -#define IDB_SHELL_EXPLORER_SM_HOT 217 #define IDB_SHELL_EDIT_LG 225 #define IDB_SHELL_EDIT_LG_HOT 226 #define IDB_SHELL_EDIT_SM 227 #define IDB_SHELL_EDIT_SM_HOT 228 -#define IDB_SHELL_GO 230 -#define IDB_SHELL_GO_HOT 231 -#define IDB_SHELL_BRANDBAND_SM_HI 240 -/*#define IDB_SHELL_BRANDBAND_MD_HI 241 -#define IDB_SHELL_BRANDBAND_LG_HI 242 -#define IDB_SHELL_BRANDBAND_SM_LO 245 -#define IDB_SHELL_BRANDBAND_MD_LO 246 -#define IDB_SHELL_BRANDBAND_LG_LO 247*/ /* Strings */

1 0

[hbelusca] 75676: [SETUPLIB]: Initialization fixes: - Use correct inf style flags in SetupOpenInfFileEx() calls when opening txtsetup.sif and unattend.inf. Technically txtsetup.sif would be INF_STY...
by hbelusca＠svn.reactos.org 26 Aug '17

26 Aug '17

Author: hbelusca Date: Sat Aug 26 14:33:48 2017 New Revision: 75676 URL: http://svn.reactos.org/svn/reactos?rev=75676&view=rev Log: [SETUPLIB]: Initialization fixes: - Use correct inf style flags in SetupOpenInfFileEx() calls when opening txtsetup.sif and unattend.inf. Technically txtsetup.sif would be INF_STYLE_WIN4 but since we use "$ReactOS$" as its version signature, it would not work when opening it with setupapi.dll functions. Hence I combine the flag with INF_STYLE_OLDNT too. - Don't fail if opening the \SystemRoot symbolic link doesn't work (usually due to incorrect access rights); in that case, just use the installer image file path as the installation source path. Modified: branches/setup_improvements/base/setup/lib/setuplib.c 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] Sat Aug 26 14:33:48 2017 @@ -49,7 +49,7 @@ /* Load 'unattend.inf' from installation media */ UnattendInf = SetupOpenInfFileExW(UnattendInfPath, NULL, - INF_STYLE_WIN4, + INF_STYLE_OLDNT, pSetupData->LanguageId, &ErrorLine); @@ -262,7 +262,8 @@ #if 0 /* TODO: Append the standard unattend.inf file */ - CombinePaths(UnattendInfPath, ARRAYSIZE(UnattendInfPath), 2, pSetupData->SourcePath.Buffer, L"unattend.inf"); + CombinePaths(UnattendInfPath, ARRAYSIZE(UnattendInfPath), 2, + pSetupData->SourcePath.Buffer, L"unattend.inf"); if (DoesFileExist(NULL, UnattendInfPath) == FALSE) { DPRINT("Does not exist: %S\n", UnattendInfPath); @@ -437,7 +438,16 @@ SYMBOLIC_LINK_QUERY, &ObjectAttributes); if (!NT_SUCCESS(Status)) - return Status; + { + /* + * We failed at opening the \SystemRoot link (usually due to wrong + * access rights). Do not consider this as a fatal error, but use + * instead the image file path as the installation source path. + */ + DPRINT1("NtOpenSymbolicLinkObject(%wZ) failed with Status 0x%08lx\n", + &SystemRootPath, Status); + goto InitPaths; + } RtlInitEmptyUnicodeString(&SystemRootPath, SystemRootBuffer, @@ -449,7 +459,7 @@ NtClose(Handle); if (!NT_SUCCESS(Status)) - return Status; + return Status; // Unexpected error /* Check whether the resolved \SystemRoot is a prefix of the image file path */ if (RtlPrefixUnicodeString(&SystemRootPath, InstallSourcePath, TRUE)) @@ -459,6 +469,7 @@ } +InitPaths: /* * Retrieve the different source path components */ @@ -499,7 +510,7 @@ *SetupInf = SetupOpenInfFileExW(FileNameBuffer, NULL, - INF_STYLE_WIN4, + INF_STYLE_WIN4 | INF_STYLE_OLDNT, pSetupData->LanguageId, &ErrorLine);

1 0

[hbelusca] 75675: [BOOTDATA]: Move an inf comment where it belongs.
by hbelusca＠svn.reactos.org 26 Aug '17

26 Aug '17

Author: hbelusca Date: Sat Aug 26 12:52:28 2017 New Revision: 75675 URL: http://svn.reactos.org/svn/reactos?rev=75675&view=rev Log: [BOOTDATA]: Move an inf comment where it belongs. Modified: trunk/reactos/boot/bootdata/bootcd/unattend.inf trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf Modified: trunk/reactos/boot/bootdata/bootcd/unattend.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd/unatt… ============================================================================== --- trunk/reactos/boot/bootdata/bootcd/unattend.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcd/unattend.inf [iso-8859-1] Sat Aug 26 12:52:28 2017 @@ -1,8 +1,7 @@ -; Set UnattendSetupEnabled to yes in order to get unattended setup working - [Unattend] Signature = "$ReactOS$" +; Set UnattendSetupEnabled to yes in order to get unattended setup working ; yes - unattend setup enabled ; no - unattend setup disabled UnattendSetupEnabled = no Modified: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] Sat Aug 26 12:52:28 2017 @@ -1,8 +1,7 @@ -; Set UnattendSetupEnabled to yes in order to get unattended setup working - [Unattend] Signature = "$ReactOS$" +; Set UnattendSetupEnabled to yes in order to get unattended setup working ; yes - unattend setup enabled ; no - unattend setup disabled UnattendSetupEnabled = yes

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