Ros-diffs September 2020

ros-diffs@reactos.org

25 participants
382 discussions

[reactos] 01/01: [SHELLFIND] Encoding-aware file search (#3134)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7376cdebb6fc945798b29… commit 7376cdebb6fc945798b29212c9f3239ea52cf89f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 7 22:30:47 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 7 22:30:47 2020 +0900 [SHELLFIND] Encoding-aware file search (#3134) Consider UTF-8/UTF-16/UTF-16BE encodings in file search. Recognize UTF-8/UTF-16/UTF-16BE BOM and NULs at the beginning of the file contents. Optimize for speed. CORE-17250 --- dll/win32/browseui/shellfind/CFindFolder.cpp | 110 ++++++++++++++++++--------- 1 file changed, 75 insertions(+), 35 deletions(-) diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp index d3c2b6f3c5c..ec24b116c29 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.cpp +++ b/dll/win32/browseui/shellfind/CFindFolder.cpp @@ -152,6 +152,8 @@ struct _SearchData CStringW szFileName; CStringA szQueryA; CStringW szQueryW; + CStringW szQueryU16BE; + CStringA szQueryU8; BOOL SearchHidden; CComPtr<CFindFolder> pFindFolder; }; @@ -171,61 +173,68 @@ static const TChar* StrStrN(const TChar *lpFirst, const TString &lpSrch, UINT cc return NULL; } -template<typename TChar, typename TString, int (&StrNCmp)(const TChar *, const TChar *, size_t)> -static UINT StrStrNCount(const TChar *lpFirst, const TString &lpSrch, UINT cchMax) -{ - const TChar *lpSearchEnd = lpFirst + cchMax; - UINT uCount = 0; - while (lpFirst < lpSearchEnd && (lpFirst = StrStrN<TChar, TString, StrNCmp>(lpFirst, lpSrch, cchMax))) - { - uCount++; - lpFirst += lpSrch.GetLength(); - cchMax = lpSearchEnd - lpFirst; - } - return uCount; -} - -static UINT StrStrCountNIA(const CHAR *lpFirst, const CStringA &lpSrch, UINT cchMax) +static inline BOOL +StrFindNIA(const CHAR *lpFirst, const CStringA &lpSrch, UINT cchMax) { - return StrStrNCount<CHAR, CStringA, _strnicmp>(lpFirst, lpSrch, cchMax); + return StrStrN<CHAR, CStringA, _strnicmp>(lpFirst, lpSrch, cchMax) != NULL; } -static UINT StrStrCountNIW(const WCHAR *lpFirst, const CStringW &lpSrch, UINT cchMax) +static inline BOOL +StrFindNIW(const WCHAR *lpFirst, const CStringW &lpSrch, UINT cchMax) { - return StrStrNCount<WCHAR, CStringW, _wcsnicmp>(lpFirst, lpSrch, cchMax); + return StrStrN<WCHAR, CStringW, _wcsnicmp>(lpFirst, lpSrch, cchMax) != NULL; } -static UINT SearchFile(LPCWSTR lpFilePath, _SearchData *pSearchData) +static BOOL SearchFile(LPCWSTR lpFilePath, _SearchData *pSearchData) { HANDLE hFile = CreateFileW(lpFilePath, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); if (hFile == INVALID_HANDLE_VALUE) - return 0; + return FALSE; + // FIXME: support large file DWORD size = GetFileSize(hFile, NULL); - HANDLE hFileMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL); + if (size == 0 || size == INVALID_FILE_SIZE) + { + CloseHandle(hFile); + return FALSE; + } + + HANDLE hFileMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, size, NULL); CloseHandle(hFile); if (hFileMap == INVALID_HANDLE_VALUE) - return 0; + return FALSE; - LPBYTE lpFileContent = (LPBYTE) MapViewOfFile(hFileMap, FILE_MAP_READ, 0, 0, 0); + LPBYTE pbContents = (LPBYTE)MapViewOfFile(hFileMap, FILE_MAP_READ, 0, 0, size); CloseHandle(hFileMap); - if (!lpFileContent) - return 0; + if (!pbContents) + return FALSE; - UINT uMatches = 0; - // Check for UTF-16 BOM - if (size >= 2 && lpFileContent[0] == 0xFF && lpFileContent[1] == 0xFE) + BOOL bFound; + if (size >= 2 && + (memcmp(pbContents, "\xFF\xFE", 2) == 0 || (pbContents[0] && !pbContents[1]))) + { + // UTF-16 + bFound = StrFindNIW((LPCWSTR)pbContents, pSearchData->szQueryW, size / sizeof(WCHAR)); + } + else if (size >= 2 && + (memcmp(pbContents, "\xFE\xFF", 2) == 0 || (!pbContents[0] && pbContents[1]))) + { + // UTF-16 BE + bFound = StrFindNIW((LPCWSTR)pbContents, pSearchData->szQueryU16BE, size / sizeof(WCHAR)); + } + else if (size >= 3 && memcmp(pbContents, "\xEF\xBB\xBF", 3) == 0) { - uMatches = StrStrCountNIW((LPCWSTR) lpFileContent, pSearchData->szQueryW, size / sizeof(WCHAR)); + // UTF-8 + bFound = StrFindNIA((LPCSTR)pbContents, pSearchData->szQueryU8, size / sizeof(CHAR)); } else { - uMatches = StrStrCountNIA((LPCSTR) lpFileContent, pSearchData->szQueryA, size / sizeof(CHAR)); + // ANSI + bFound = StrFindNIA((LPCSTR)pbContents, pSearchData->szQueryA, size / sizeof(CHAR)); } - UnmapViewOfFile(lpFileContent); - - return uMatches; + UnmapViewOfFile(pbContents); + return bFound; } static BOOL FileNameMatch(LPCWSTR FindDataFileName, _SearchData *pSearchData) @@ -266,13 +275,14 @@ static UINT RecursiveFind(LPCWSTR lpPath, _SearchData *pSearchData) BOOL bMoreFiles = TRUE; UINT uTotalFound = 0; - PathCombineW(szPath, lpPath, L"*.*"); + PathCombineW(szPath, lpPath, L"*"); for (hFindFile = FindFirstFileW(szPath, &FindData); bMoreFiles && hFindFile != INVALID_HANDLE_VALUE; bMoreFiles = FindNextFileW(hFindFile, &FindData)) { - if (!wcscmp(FindData.cFileName, L".") || !wcscmp(FindData.cFileName, L"..")) +#define IS_DOTS(psz) ((psz)[0] == L'.' && ((psz)[1] == 0 || ((psz)[1] == L'.' && (psz)[2] == 0))) + if (IS_DOTS(FindData.cFileName)) continue; PathCombineW(szPath, lpPath, FindData.cFileName); @@ -368,6 +378,36 @@ LRESULT CFindFolder::StartSearch(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL & pSearchData->szFileName = pSearchParams->szFileName; pSearchData->szQueryA = pSearchParams->szQuery; pSearchData->szQueryW = pSearchParams->szQuery; + + // UTF-16 BE + { + CStringW utf16 = pSearchData->szQueryW; + LPWSTR psz = utf16.GetBuffer(); + for (SIZE_T i = 0; psz[i]; ++i) + { + psz[i] = MAKEWORD(HIBYTE(psz[i]), LOBYTE(psz[i])); + } + utf16.ReleaseBuffer(); + pSearchData->szQueryU16BE = utf16; + } + + // UTF-8 + { + CStringA utf8; + INT cch = WideCharToMultiByte(CP_UTF8, 0, pSearchData->szQueryW, -1, NULL, 0, NULL, NULL); + if (cch > 0) + { + LPSTR psz = utf8.GetBuffer(cch); + WideCharToMultiByte(CP_UTF8, 0, pSearchData->szQueryW, -1, psz, cch, NULL, NULL); + utf8.ReleaseBuffer(); + pSearchData->szQueryU8 = utf8; + } + else + { + pSearchData->szQueryU8 = pSearchData->szQueryA; + } + } + pSearchData->SearchHidden = pSearchParams->SearchHidden; SHFree(pSearchParams);

4 years, 3 months

[reactos] 01/01: [BROWSEUI] Improve Japanese translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ea54062b07fb5ed255a8… commit 7ea54062b07fb5ed255a858ae4182c7756114d78 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 7 17:11:31 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Sep 7 17:11:31 2020 +0900 [BROWSEUI] Improve Japanese translation --- dll/win32/browseui/lang/ja-JP.rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/browseui/lang/ja-JP.rc b/dll/win32/browseui/lang/ja-JP.rc index aac4a1e3105..569fd619fef 100644 --- a/dll/win32/browseui/lang/ja-JP.rc +++ b/dll/win32/browseui/lang/ja-JP.rc @@ -1,4 +1,4 @@ -/* + /* * Copyright 2016-2020 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or @@ -156,10 +156,10 @@ FONT 9, "MS UI Gothic", 0, 0, 0x1 BEGIN LTEXT "以下に指定した検索条件で検索します。", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "ファイル名の一部または全部の(&O):", -1, 10, 25, 500, 10 + LTEXT "ファイル名の一部または全部(&O):", -1, 10, 25, 500, 10 EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "ファイル内部の単語またはフレーズ(&W):", -1, 10, 50, 500, 10 + LTEXT "ファイル内部の単語または句(&W):", -1, 10, 50, 500, 10 EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP LTEXT "次のフォルダ内部(&L):", -1, 10, 75, 500, 10 @@ -345,7 +345,7 @@ END STRINGTABLE BEGIN - IDS_SEARCH_RESULTS "Search Results" + IDS_SEARCH_RESULTS "検索結果" IDS_SEARCHINVALID "'%1' は有効なフォルダではありません。" IDS_SEARCH_FOLDER "%s を検索中" IDS_SEARCH_FILES_FOUND "%u 個のファイルが見つかりました" @@ -357,6 +357,6 @@ END STRINGTABLE BEGIN - IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" - IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." + IDS_PARSE_ADDR_ERR_TITLE "ReactOS エクスプローラ" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS エクスプローラは '%1' を見つけられませんでした。スペルを確認してやり直して下さい。" END

4 years, 3 months

[reactos] 01/01: [SHELLFIND] Fix directory search upon non-empty word/phrase query (#3130)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2dd4f8714d72cebeaca3b… commit 2dd4f8714d72cebeaca3b50ba4d48df7e91e7375 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 7 15:48:25 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 7 15:48:25 2020 +0900 [SHELLFIND] Fix directory search upon non-empty word/phrase query (#3130) If the search phrase was not empty, it must not match the directory. CORE-17244 --- dll/win32/browseui/shellfind/CFindFolder.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp index fb6ba371dda..d3c2b6f3c5c 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.cpp +++ b/dll/win32/browseui/shellfind/CFindFolder.cpp @@ -280,8 +280,9 @@ static UINT RecursiveFind(LPCWSTR lpPath, _SearchData *pSearchData) if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { CStringW status; - if (FileNameMatch(FindData.cFileName, pSearchData) - && AttribHiddenMatch(FindData.dwFileAttributes, pSearchData)) + if (pSearchData->szQueryW.IsEmpty() && + FileNameMatch(FindData.cFileName, pSearchData) && + AttribHiddenMatch(FindData.dwFileAttributes, pSearchData)) { PostMessageW(pSearchData->hwnd, WM_SEARCH_ADD_RESULT, 0, (LPARAM) StrDupW(szPath)); uTotalFound++;

4 years, 3 months

[reactos] 01/01: [NTOS:IO] Fix IRP stack location check in IoForwardIrpSynchronously We are doing IoCallDriver here, so the valid stack location should be CurrentLocation <= Irp->StackCount (just a check for a completly incorrect value) && CurrentLocation > 1 (ensure that we have a place for another call)

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f562f9c5c629cba3f370f… commit f562f9c5c629cba3f370f078d12c2f13a997c8f2 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Sep 7 04:57:17 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Sep 7 04:57:17 2020 +0300 [NTOS:IO] Fix IRP stack location check in IoForwardIrpSynchronously We are doing IoCallDriver here, so the valid stack location should be CurrentLocation <= Irp->StackCount (just a check for a completly incorrect value) && CurrentLocation > 1 (ensure that we have a place for another call) CORE-17189 Co-authored-by: Thomas Faber <thomas.faber(a)reactos.org> --- ntoskrnl/io/iomgr/irp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/irp.c b/ntoskrnl/io/iomgr/irp.c index 1b19d49e9a4..2de843975e0 100644 --- a/ntoskrnl/io/iomgr/irp.c +++ b/ntoskrnl/io/iomgr/irp.c @@ -1629,7 +1629,7 @@ IoForwardIrpSynchronously(IN PDEVICE_OBJECT DeviceObject, NTSTATUS Status; /* Check if next stack location is available */ - if (Irp->CurrentLocation < Irp->StackCount) + if (Irp->CurrentLocation > Irp->StackCount || Irp->CurrentLocation <= 1) { /* No more stack location */ return FALSE;

4 years, 3 months

[reactos] 01/01: [BROWSEUI][SHELL32] Implement MoveTo/CopyTo buttons (#3128)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8fa3c147b6d15eca9e081… commit 8fa3c147b6d15eca9e081df9dfcb487f723dbd0a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 7 09:42:43 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 7 09:42:43 2020 +0900 [BROWSEUI][SHELL32] Implement MoveTo/CopyTo buttons (#3128) Implement the actions of the MoveTo/CopyTo/Delete buttons. CORE-11132 --- dll/win32/browseui/internettoolbar.cpp | 4 ++++ dll/win32/shell32/CDefaultContextMenu.cpp | 11 +++++++++++ dll/win32/shell32/shresdef.h | 1 + 3 files changed, 16 insertions(+) diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index d6f6145553d..ea67bd576d5 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -1539,6 +1539,10 @@ LRESULT CInternetToolbar::OnForwardToCommandTarget(WORD wNotifyCode, WORD wID, H if (fCommandTarget.p != NULL) { hResult = fCommandTarget->Exec(&fCommandCategory, wID, 0, NULL, NULL); + if (FAILED(hResult)) + { + ::SendMessageW(::GetParent(m_hWnd), WM_COMMAND, wID, 0); + } } return 1; } diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index 30d1433df65..d6b0d98d7a8 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -95,6 +95,7 @@ class CDefaultContextMenu : HRESULT DoCopyOrCut(LPCMINVOKECOMMANDINFO lpcmi, BOOL bCopy); HRESULT DoRename(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoProperties(LPCMINVOKECOMMANDINFO lpcmi); + HRESULT DoUndo(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoCreateNewFolder(LPCMINVOKECOMMANDINFO lpici); HRESULT DoCopyToMoveToFolder(LPCMINVOKECOMMANDINFO lpici, BOOL bCopy); HRESULT InvokeShellExt(LPCMINVOKECOMMANDINFO lpcmi); @@ -895,6 +896,13 @@ CDefaultContextMenu::DoProperties( return S_OK; } +HRESULT +CDefaultContextMenu::DoUndo(LPCMINVOKECOMMANDINFO lpcmi) +{ + ERR("TODO: Undo"); + return E_NOTIMPL; +} + HRESULT CDefaultContextMenu::DoCopyToMoveToFolder(LPCMINVOKECOMMANDINFO lpici, BOOL bCopy) { @@ -1293,6 +1301,9 @@ CDefaultContextMenu::InvokeCommand( case FCIDM_SHVIEW_MOVETO: Result = DoCopyToMoveToFolder(&LocalInvokeInfo, FALSE); break; + case FCIDM_SHVIEW_UNDO: + Result = DoUndo(&LocalInvokeInfo); + break; default: Result = E_INVALIDARG; ERR("Unhandled Verb %xl\n", LOWORD(LocalInvokeInfo.lpVerb)); diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index e3be5f4f255..391b8330b2b 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -797,6 +797,7 @@ #define FCIDM_TB_REPORTVIEW 0xA004 #define FCIDM_TB_DESKTOP 0xA005 /* FIXME */ +#define IDM_UNDO (FCIDM_SHVIEW_UNDO - 0x7000) #define IDM_CUT (FCIDM_SHVIEW_CUT - 0x7000) #define IDM_COPY (FCIDM_SHVIEW_COPY - 0x7000) #define IDM_INSERT (FCIDM_SHVIEW_INSERT - 0x7000)

4 years, 3 months

[reactos] 01/01: [BROWSEUI] Set DT_VCENTER to Explorer bars (#3135)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=828cf19a2905331e2ea27… commit 828cf19a2905331e2ea27d2210a3be5ea23c6404 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 7 09:33:21 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 7 09:33:21 2020 +0900 [BROWSEUI] Set DT_VCENTER to Explorer bars (#3135) Make the captions of the explorer bars vertically centered. --- dll/win32/browseui/basebarsite.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/browseui/basebarsite.cpp b/dll/win32/browseui/basebarsite.cpp index 292d897e879..0677e2a9e4f 100644 --- a/dll/win32/browseui/basebarsite.cpp +++ b/dll/win32/browseui/basebarsite.cpp @@ -729,12 +729,13 @@ LRESULT CBaseBarSite::OnCustomDraw(LPNMCUSTOMDRAW pnmcd) rt = pnmcd->rc; rt.right -= 24; rt.left += 2; + rt.bottom -= 1; if (FAILED_UNEXPECTEDLY(GetInternalBandInfo(index, &info, RBBIM_TEXT))) return CDRF_SKIPDEFAULT; newFont = GetTitleFont(); if (newFont) oldFont = (HFONT)SelectObject(pnmcd->hdc, newFont); - DrawText(pnmcd->hdc, info.lpText, -1, &rt, DT_SINGLELINE | DT_LEFT); + DrawText(pnmcd->hdc, info.lpText, -1, &rt, DT_SINGLELINE | DT_LEFT | DT_VCENTER); SelectObject(pnmcd->hdc, oldFont); DeleteObject(newFont); return CDRF_SKIPDEFAULT;

4 years, 3 months

[reactos] 01/01: [GDI32] Fix double cx's in call to HANDLE_METADC in win32ss painting.c (#3137)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7624a987063888e275c18… commit 7624a987063888e275c18a9e8c10c01a19b971a1 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Sep 6 11:08:03 2020 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 6 18:08:03 2020 +0200 [GDI32] Fix double cx's in call to HANDLE_METADC in win32ss painting.c (#3137) Fix copy-paste error. --- win32ss/gdi/gdi32/objects/painting.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/painting.c b/win32ss/gdi/gdi32/objects/painting.c index 2f9564ceb22..17f64b8b384 100644 --- a/win32ss/gdi/gdi32/objects/painting.c +++ b/win32ss/gdi/gdi32/objects/painting.c @@ -469,12 +469,12 @@ BitBlt( xDest, yDest, cx, - cx, + cy, hdcSrc, xSrc, ySrc, cx, - cx, + cy, dwRop); if ( GdiConvertAndCheckDC(hdcDest) == NULL ) return FALSE;

4 years, 3 months

[reactos] 19/19: [RAPPS] settings read/write refactor (#3101)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1974d21dc591615968c9… commit e1974d21dc591615968c995b054e96d80d6229f8 Author: He Yang <1160386205(a)qq.com> AuthorDate: Sat Aug 29 20:32:59 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:10:18 2020 +0200 [RAPPS] settings read/write refactor (#3101) * [RAPPS] move settings-related stuff to a separate file * [RAPPS] refactor reg read/write * [RAPPS] add params for Load/SaveSettings, no longer use global vars --- base/applications/rapps/CMakeLists.txt | 2 + base/applications/rapps/gui.cpp | 2 +- .../rapps/include/{winmain.h => settings.h} | 13 +- base/applications/rapps/include/winmain.h | 30 +-- base/applications/rapps/settings.cpp | 243 +++++++++++++++++++++ base/applications/rapps/settingsdlg.cpp | 2 +- base/applications/rapps/winmain.cpp | 86 +------- 7 files changed, 254 insertions(+), 124 deletions(-) diff --git a/base/applications/rapps/CMakeLists.txt b/base/applications/rapps/CMakeLists.txt index 4a0dfabfd7f..62a61d24b95 100644 --- a/base/applications/rapps/CMakeLists.txt +++ b/base/applications/rapps/CMakeLists.txt @@ -17,6 +17,7 @@ list(APPEND SOURCE integrity.cpp loaddlg.cpp misc.cpp + settings.cpp settingsdlg.cpp winmain.cpp unattended.cpp @@ -30,6 +31,7 @@ list(APPEND SOURCE include/crichedit.h include/defines.h include/misc.h + include/settings.h include/resource.h include/rosui.h include/winmain.h diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 50f4b14f810..fb414504fc7 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -316,7 +316,7 @@ BOOL CMainWindow::ProcessWindowMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARA case WM_DESTROY: { ShowWindow(SW_HIDE); - SaveSettings(hwnd); + SaveSettings(hwnd, &SettingsInfo); FreeLogs(); m_AvailableApps.FreeCachedEntries(); diff --git a/base/applications/rapps/include/winmain.h b/base/applications/rapps/include/settings.h similarity index 73% copy from base/applications/rapps/include/winmain.h copy to base/applications/rapps/include/settings.h index 3b9397a0eda..a3b4b867ffd 100644 --- a/base/applications/rapps/include/winmain.h +++ b/base/applications/rapps/include/settings.h @@ -2,9 +2,6 @@ #include <windef.h> #include <wininet.h> -extern LPCWSTR szWindowClass; - -//TODO: Separate main and settings related definitions struct SETTINGS_INFO { BOOL bSaveWndPos; @@ -29,12 +26,8 @@ struct SETTINGS_INFO typedef SETTINGS_INFO *PSETTINGS_INFO; -extern HWND hMainWnd; -extern HINSTANCE hInst; -extern SETTINGS_INFO SettingsInfo; - -VOID SaveSettings(HWND hwnd); +BOOL LoadSettings(PSETTINGS_INFO pSettingsInfo); +BOOL SaveSettings(HWND hwnd, PSETTINGS_INFO pSettingsInfo); VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo); -// integrity.cpp -BOOL VerifyInteg(LPCWSTR lpSHA1Hash, LPCWSTR lpFileName); +extern SETTINGS_INFO SettingsInfo; diff --git a/base/applications/rapps/include/winmain.h b/base/applications/rapps/include/winmain.h index 3b9397a0eda..d6a214298a6 100644 --- a/base/applications/rapps/include/winmain.h +++ b/base/applications/rapps/include/winmain.h @@ -1,40 +1,12 @@ #pragma once #include <windef.h> #include <wininet.h> +#include "settings.h" extern LPCWSTR szWindowClass; -//TODO: Separate main and settings related definitions -struct SETTINGS_INFO -{ - BOOL bSaveWndPos; - BOOL bUpdateAtStart; - BOOL bLogEnabled; - WCHAR szDownloadDir[MAX_PATH]; - BOOL bDelInstaller; - /* Window Pos */ - BOOL Maximized; - INT Left; - INT Top; - INT Width; - INT Height; - /* Proxy settings */ - INT Proxy; - WCHAR szProxyServer[MAX_PATH]; - WCHAR szNoProxyFor[MAX_PATH]; - /* Software source settings */ - BOOL bUseSource; - WCHAR szSourceURL[INTERNET_MAX_URL_LENGTH]; -}; - -typedef SETTINGS_INFO *PSETTINGS_INFO; - extern HWND hMainWnd; extern HINSTANCE hInst; -extern SETTINGS_INFO SettingsInfo; - -VOID SaveSettings(HWND hwnd); -VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo); // integrity.cpp BOOL VerifyInteg(LPCWSTR lpSHA1Hash, LPCWSTR lpFileName); diff --git a/base/applications/rapps/settings.cpp b/base/applications/rapps/settings.cpp new file mode 100644 index 00000000000..57c7b55ba06 --- /dev/null +++ b/base/applications/rapps/settings.cpp @@ -0,0 +1,243 @@ +/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Functions to load / save settings from reg. + * COPYRIGHT: Copyright 2020 He Yang (1160386205(a)qq.com) + */ + +#include "rapps.h" +#include "settings.h" + + +class SettingsField +{ +public: + virtual ~SettingsField() { ; } + virtual BOOL Save(CRegKey &key) = 0; + virtual BOOL Load(CRegKey &key) = 0; +}; + +class SettingsFieldBool : public SettingsField +{ +public: + SettingsFieldBool(BOOL *pValue, LPCWSTR szRegName) + : m_pValueStore(pValue), m_RegName(szRegName) + { + } + + virtual BOOL Save(CRegKey &key) override + { + return key.SetDWORDValue(m_RegName, (DWORD)(*m_pValueStore)) == ERROR_SUCCESS; + } + virtual BOOL Load(CRegKey &key) override + { + DWORD dwField; + LONG lResult = key.QueryDWORDValue(m_RegName, dwField); + if (lResult != ERROR_SUCCESS) + { + return FALSE; + } + *m_pValueStore = (BOOL)dwField; + return TRUE; + } + +private: + BOOL *m_pValueStore; // where to read/store the value + LPCWSTR m_RegName; // key name in registery +}; + +class SettingsFieldInt : public SettingsField +{ +public: + SettingsFieldInt(INT *pValue, LPCWSTR szRegName) + : m_pValueStore(pValue), m_RegName(szRegName) + { + } + + virtual BOOL Save(CRegKey &key) override + { + return key.SetDWORDValue(m_RegName, (DWORD)(*m_pValueStore)) == ERROR_SUCCESS; + } + virtual BOOL Load(CRegKey &key) override + { + DWORD dwField; + LONG lResult = key.QueryDWORDValue(m_RegName, dwField); + if (lResult != ERROR_SUCCESS) + { + return FALSE; + } + *m_pValueStore = (INT)dwField; + return TRUE; + } + +private: + INT *m_pValueStore; // where to read/store the value + LPCWSTR m_RegName; // key name in registery +}; + +class SettingsFieldString : public SettingsField +{ +public: + SettingsFieldString(WCHAR *pString, ULONG cchLen, LPCWSTR szRegName) + : m_pStringStore(pString), m_StringLen(cchLen), m_RegName(szRegName) + { + } + + virtual BOOL Save(CRegKey &key) override + { + return key.SetStringValue(m_RegName, m_pStringStore) == ERROR_SUCCESS; + } + virtual BOOL Load(CRegKey &key) override + { + ULONG nChar = m_StringLen - 1; // make sure the terminating L'\0' + LONG lResult = key.QueryStringValue(m_RegName, m_pStringStore, &nChar); + return lResult == ERROR_SUCCESS; + } + +private: + WCHAR *m_pStringStore; // where to read/store the value + ULONG m_StringLen; // string length, in chars + LPCWSTR m_RegName; // key name in registery +}; + + +void AddInfoFields(ATL::CAtlList<SettingsField *> &infoFields, SETTINGS_INFO &settings) +{ + infoFields.AddTail(new SettingsFieldBool(&(settings.bSaveWndPos), L"bSaveWndPos")); + infoFields.AddTail(new SettingsFieldBool(&(settings.bUpdateAtStart), L"bUpdateAtStart")); + infoFields.AddTail(new SettingsFieldBool(&(settings.bLogEnabled), L"bLogEnabled")); + infoFields.AddTail(new SettingsFieldString(settings.szDownloadDir, MAX_PATH, L"szDownloadDir")); + infoFields.AddTail(new SettingsFieldBool(&(settings.bDelInstaller), L"bDelInstaller")); + infoFields.AddTail(new SettingsFieldBool(&(settings.Maximized), L"WindowPosMaximized")); + infoFields.AddTail(new SettingsFieldInt(&(settings.Left), L"WindowPosLeft")); + infoFields.AddTail(new SettingsFieldInt(&(settings.Top), L"WindowPosTop")); + infoFields.AddTail(new SettingsFieldInt(&(settings.Width), L"WindowPosWidth")); + infoFields.AddTail(new SettingsFieldInt(&(settings.Height), L"WindowPosHeight")); + infoFields.AddTail(new SettingsFieldInt(&(settings.Proxy), L"ProxyMode")); + infoFields.AddTail(new SettingsFieldString((settings.szProxyServer), MAX_PATH, L"ProxyServer")); + infoFields.AddTail(new SettingsFieldString((settings.szNoProxyFor), MAX_PATH, L"NoProxyFor")); + infoFields.AddTail(new SettingsFieldBool(&(settings.bUseSource), L"bUseSource")); + infoFields.AddTail(new SettingsFieldString((settings.szSourceURL), INTERNET_MAX_URL_LENGTH, L"SourceURL")); + + return; +} + +BOOL SaveAllSettings(CRegKey &key, SETTINGS_INFO &settings) +{ + BOOL bAllSuccess = TRUE; + ATL::CAtlList<SettingsField *> infoFields; + + AddInfoFields(infoFields, settings); + + POSITION InfoListPosition = infoFields.GetHeadPosition(); + while (InfoListPosition) + { + SettingsField *Info = infoFields.GetNext(InfoListPosition); + if (!Info->Save(key)) + { + bAllSuccess = FALSE; + // TODO: error log + } + delete Info; + } + return bAllSuccess; +} + +BOOL LoadAllSettings(CRegKey &key, SETTINGS_INFO &settings) +{ + BOOL bAllSuccess = TRUE; + ATL::CAtlList<SettingsField *> infoFields; + + AddInfoFields(infoFields, settings); + + POSITION InfoListPosition = infoFields.GetHeadPosition(); + while (InfoListPosition) + { + SettingsField *Info = infoFields.GetNext(InfoListPosition); + if (!Info->Load(key)) + { + bAllSuccess = FALSE; + // TODO: error log + } + delete Info; + } + return bAllSuccess; +} + +VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo) +{ + ATL::CStringW szDownloadDir; + ZeroMemory(pSettingsInfo, sizeof(SETTINGS_INFO)); + + pSettingsInfo->bSaveWndPos = TRUE; + pSettingsInfo->bUpdateAtStart = FALSE; + pSettingsInfo->bLogEnabled = TRUE; + pSettingsInfo->bUseSource = FALSE; + + if (FAILED(SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, szDownloadDir.GetBuffer(MAX_PATH)))) + { + szDownloadDir.ReleaseBuffer(); + if (!szDownloadDir.GetEnvironmentVariableW(L"SystemDrive")) + { + szDownloadDir = L"C:"; + } + } + else + { + szDownloadDir.ReleaseBuffer(); + } + + PathAppendW(szDownloadDir.GetBuffer(MAX_PATH), L"\\RAPPS Downloads"); + szDownloadDir.ReleaseBuffer(); + + ATL::CStringW::CopyChars(pSettingsInfo->szDownloadDir, + _countof(pSettingsInfo->szDownloadDir), + szDownloadDir.GetString(), + szDownloadDir.GetLength() + 1); + + pSettingsInfo->bDelInstaller = FALSE; + pSettingsInfo->Maximized = FALSE; + pSettingsInfo->Left = CW_USEDEFAULT; + pSettingsInfo->Top = CW_USEDEFAULT; + pSettingsInfo->Width = 680; + pSettingsInfo->Height = 450; +} + +BOOL LoadSettings(PSETTINGS_INFO pSettingsInfo) +{ + ATL::CRegKey RegKey; + if (RegKey.Open(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", KEY_READ) != ERROR_SUCCESS) + { + return FALSE; + } + + return LoadAllSettings(RegKey, *pSettingsInfo); +} + +BOOL SaveSettings(HWND hwnd, PSETTINGS_INFO pSettingsInfo) +{ + WINDOWPLACEMENT wp; + ATL::CRegKey RegKey; + + if (pSettingsInfo->bSaveWndPos) + { + wp.length = sizeof(wp); + GetWindowPlacement(hwnd, &wp); + + pSettingsInfo->Left = wp.rcNormalPosition.left; + pSettingsInfo->Top = wp.rcNormalPosition.top; + pSettingsInfo->Width = wp.rcNormalPosition.right - wp.rcNormalPosition.left; + pSettingsInfo->Height = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top; + pSettingsInfo->Maximized = (wp.showCmd == SW_MAXIMIZE + || (wp.showCmd == SW_SHOWMINIMIZED + && (wp.flags & WPF_RESTORETOMAXIMIZED))); + } + + if (RegKey.Create(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", NULL, + REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, NULL) != ERROR_SUCCESS) + { + return FALSE; + } + + return SaveAllSettings(RegKey, *pSettingsInfo); +} diff --git a/base/applications/rapps/settingsdlg.cpp b/base/applications/rapps/settingsdlg.cpp index 8943c1ac98e..d1f36519d9a 100644 --- a/base/applications/rapps/settingsdlg.cpp +++ b/base/applications/rapps/settingsdlg.cpp @@ -260,7 +260,7 @@ namespace } SettingsInfo = NewSettingsInfo; - SaveSettings(GetParent(hDlg)); + SaveSettings(GetParent(hDlg), &SettingsInfo); EndDialog(hDlg, LOWORD(wParam)); } break; diff --git a/base/applications/rapps/winmain.cpp b/base/applications/rapps/winmain.cpp index 253c802ad61..9d36df598eb 100644 --- a/base/applications/rapps/winmain.cpp +++ b/base/applications/rapps/winmain.cpp @@ -10,6 +10,8 @@ #include "unattended.h" +#include "winmain.h" + #include <atlcom.h> #include <gdiplus.h> @@ -61,88 +63,6 @@ VOID InitializeGDIPlus(BOOL bInitialize) } } -VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo) -{ - ATL::CStringW szDownloadDir; - ZeroMemory(pSettingsInfo, sizeof(SETTINGS_INFO)); - - pSettingsInfo->bSaveWndPos = TRUE; - pSettingsInfo->bUpdateAtStart = FALSE; - pSettingsInfo->bLogEnabled = TRUE; - pSettingsInfo->bUseSource = FALSE; - - if (FAILED(SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, szDownloadDir.GetBuffer(MAX_PATH)))) - { - szDownloadDir.ReleaseBuffer(); - if (!szDownloadDir.GetEnvironmentVariableW(L"SystemDrive")) - { - szDownloadDir = L"C:"; - } - } - else - { - szDownloadDir.ReleaseBuffer(); - } - - PathAppendW(szDownloadDir.GetBuffer(MAX_PATH), L"\\RAPPS Downloads"); - szDownloadDir.ReleaseBuffer(); - - ATL::CStringW::CopyChars(pSettingsInfo->szDownloadDir, - _countof(pSettingsInfo->szDownloadDir), - szDownloadDir.GetString(), - szDownloadDir.GetLength() + 1); - - pSettingsInfo->bDelInstaller = FALSE; - pSettingsInfo->Maximized = FALSE; - pSettingsInfo->Left = CW_USEDEFAULT; - pSettingsInfo->Top = CW_USEDEFAULT; - pSettingsInfo->Width = 680; - pSettingsInfo->Height = 450; -} - -static BOOL LoadSettings() -{ - ATL::CRegKey RegKey; - DWORD dwSize; - BOOL bResult = FALSE; - if (RegKey.Open(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", KEY_READ) == ERROR_SUCCESS) - { - dwSize = sizeof(SettingsInfo); - bResult = (RegKey.QueryBinaryValue(L"Settings", (PVOID) &SettingsInfo, &dwSize) == ERROR_SUCCESS); - - RegKey.Close(); - } - - return bResult; -} - -VOID SaveSettings(HWND hwnd) -{ - WINDOWPLACEMENT wp; - ATL::CRegKey RegKey; - - if (SettingsInfo.bSaveWndPos) - { - wp.length = sizeof(wp); - GetWindowPlacement(hwnd, &wp); - - SettingsInfo.Left = wp.rcNormalPosition.left; - SettingsInfo.Top = wp.rcNormalPosition.top; - SettingsInfo.Width = wp.rcNormalPosition.right - wp.rcNormalPosition.left; - SettingsInfo.Height = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top; - SettingsInfo.Maximized = (wp.showCmd == SW_MAXIMIZE - || (wp.showCmd == SW_SHOWMINIMIZED - && (wp.flags & WPF_RESTORETOMAXIMIZED))); - } - - if (RegKey.Create(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", NULL, - REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, NULL) == ERROR_SUCCESS) - { - RegKey.SetBinaryValue(L"Settings", (const PVOID) &SettingsInfo, sizeof(SettingsInfo)); - RegKey.Close(); - } -} - int wmain(int argc, wchar_t *argv[]) { BOOL bIsFirstLaunch; @@ -157,7 +77,7 @@ int wmain(int argc, wchar_t *argv[]) hInst = GetModuleHandle(NULL); - bIsFirstLaunch = !LoadSettings(); + bIsFirstLaunch = !LoadSettings(&SettingsInfo); if (bIsFirstLaunch) { FillDefaultSettings(&SettingsInfo);

4 years, 3 months

[reactos] 18/19: [RAPPS] improve ConInitStdStreams initialization logic (#3098)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce0110195bad5df47b8ec… commit ce0110195bad5df47b8ec2c87ac539c81297409f Author: He Yang <1160386205(a)qq.com> AuthorDate: Wed Aug 26 17:10:51 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:10:18 2020 +0200 [RAPPS] improve ConInitStdStreams initialization logic (#3098) --- base/applications/rapps/unattended.cpp | 14 ++++++++++---- base/applications/rapps/winmain.cpp | 2 -- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/base/applications/rapps/unattended.cpp b/base/applications/rapps/unattended.cpp index 839d8a53dcf..d20ef8aa3f2 100644 --- a/base/applications/rapps/unattended.cpp +++ b/base/applications/rapps/unattended.cpp @@ -40,6 +40,7 @@ BOOL HandleInstallCommand(LPWSTR szCommand, int argcLeft, LPWSTR * argvLeft) { if (argcLeft == 0) { + ConInitStdStreams(); // Initialize the Console Standard Streams ConResMsgPrintf(StdOut, NULL, IDS_CMD_NEED_PACKAGE_NAME, szCommand); return FALSE; } @@ -72,9 +73,11 @@ BOOL HandleSetupCommand(LPWSTR szCommand, int argcLeft, LPWSTR * argvLeft) { if (argcLeft != 1) { + ConInitStdStreams(); // Initialize the Console Standard Streams ConResMsgPrintf(StdOut, NULL, IDS_CMD_NEED_FILE_NAME, szCommand); return FALSE; } + FreeConsole(); ATL::CSimpleArray<ATL::CStringW> PkgNameList; HINF InfHandle = SetupOpenInfFileW(argvLeft[0], NULL, INF_STYLE_WIN4, NULL); @@ -272,6 +275,8 @@ BOOL ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow) if (hMutex) CloseHandle(hMutex); + + return TRUE; } else if (MatchCmdOption(argv[1], CMD_KEY_INSTALL)) { @@ -281,7 +286,11 @@ BOOL ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow) { return HandleSetupCommand(argv[1], argc - 2, argv + 2); } - else if (MatchCmdOption(argv[1], CMD_KEY_FIND)) + + + ConInitStdStreams(); // Initialize the Console Standard Streams + + if (MatchCmdOption(argv[1], CMD_KEY_FIND)) { return HandleFindCommand(argv[1], argc - 2, argv + 2); } @@ -299,7 +308,4 @@ BOOL ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow) ConResPuts(StdOut, IDS_CMD_INVALID_OPTION); return FALSE; } - - - return TRUE; } diff --git a/base/applications/rapps/winmain.cpp b/base/applications/rapps/winmain.cpp index 740e4fa828f..253c802ad61 100644 --- a/base/applications/rapps/winmain.cpp +++ b/base/applications/rapps/winmain.cpp @@ -145,8 +145,6 @@ VOID SaveSettings(HWND hwnd) int wmain(int argc, wchar_t *argv[]) { - ConInitStdStreams(); // Initialize the Console Standard Streams - BOOL bIsFirstLaunch; InitializeAtlModule(GetModuleHandle(NULL), TRUE);

4 years, 3 months

[reactos] 17/19: [RAPPS] cmdline enhancement (#3087)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a11c65561d224c688ba3… commit 7a11c65561d224c688ba371044e52b17e1a70b6d Author: He Yang <1160386205(a)qq.com> AuthorDate: Tue Aug 25 17:06:30 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:10:18 2020 +0200 [RAPPS] cmdline enhancement (#3087) * [RAPPS] now command-line option supports begin with both / and - * [RAPPS] Add help command with /? * [RAPPS] add /find command * [RAPPS] add /info option * [RAPPS] add copyright and contact e-mail --- base/applications/rapps/CMakeLists.txt | 5 +- base/applications/rapps/gui.cpp | 15 +- base/applications/rapps/include/dialogs.h | 2 +- base/applications/rapps/include/gui.h | 4 +- base/applications/rapps/include/misc.h | 2 + base/applications/rapps/include/resource.h | 10 + base/applications/rapps/include/unattended.h | 12 +- base/applications/rapps/include/winmain.h | 2 + base/applications/rapps/lang/bg-BG.rc | 12 ++ base/applications/rapps/lang/cs-CZ.rc | 12 ++ base/applications/rapps/lang/de-DE.rc | 12 ++ base/applications/rapps/lang/en-US.rc | 12 ++ base/applications/rapps/lang/es-ES.rc | 12 ++ base/applications/rapps/lang/et-EE.rc | 12 ++ base/applications/rapps/lang/fr-FR.rc | 12 ++ base/applications/rapps/lang/he-IL.rc | 12 ++ base/applications/rapps/lang/id-ID.rc | 12 ++ base/applications/rapps/lang/it-IT.rc | 12 ++ base/applications/rapps/lang/ja-JP.rc | 12 ++ base/applications/rapps/lang/no-NO.rc | 12 ++ base/applications/rapps/lang/pl-PL.rc | 12 ++ base/applications/rapps/lang/pt-BR.rc | 12 ++ base/applications/rapps/lang/pt-PT.rc | 12 ++ base/applications/rapps/lang/ro-RO.rc | 12 ++ base/applications/rapps/lang/ru-RU.rc | 12 ++ base/applications/rapps/lang/sk-SK.rc | 12 ++ base/applications/rapps/lang/sq-AL.rc | 12 ++ base/applications/rapps/lang/sv-SE.rc | 12 ++ base/applications/rapps/lang/tr-TR.rc | 12 ++ base/applications/rapps/lang/uk-UA.rc | 12 ++ base/applications/rapps/lang/zh-CN.rc | 12 ++ base/applications/rapps/lang/zh-TW.rc | 12 ++ base/applications/rapps/misc.cpp | 8 + base/applications/rapps/unattended.cpp | 294 ++++++++++++++++++++++++--- base/applications/rapps/winmain.cpp | 46 ++--- 35 files changed, 605 insertions(+), 83 deletions(-) diff --git a/base/applications/rapps/CMakeLists.txt b/base/applications/rapps/CMakeLists.txt index 4be7ed458bf..4a0dfabfd7f 100644 --- a/base/applications/rapps/CMakeLists.txt +++ b/base/applications/rapps/CMakeLists.txt @@ -4,6 +4,7 @@ set_cpp(WITH_RUNTIME) include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/cryptlib) +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) include_directories(include) list(APPEND SOURCE @@ -42,8 +43,8 @@ add_definitions( file(GLOB_RECURSE rapps_rc_deps res/*.*) add_rc_deps(rapps.rc ${rapps_rc_deps}) add_executable(rapps ${SOURCE} rapps.rc) -set_module_type(rapps win32gui UNICODE) -target_link_libraries(rapps uuid wine) +set_module_type(rapps win32cui UNICODE) +target_link_libraries(rapps conutils ${PSEH_LIB} uuid wine) add_importlibs(rapps advapi32 comctl32 gdi32 wininet user32 shell32 shlwapi ole32 setupapi gdiplus msvcrt kernel32 ntdll) add_pch(rapps include/rapps.h SOURCE) add_dependencies(rapps rappsmsg) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 7732d18e501..50f4b14f810 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -15,6 +15,7 @@ #include "misc.h" #include "gui.h" #include "appview.h" +#include "winmain.h" #include <shlobj_undoc.h> #include <shlguid_undoc.h> @@ -51,7 +52,7 @@ HTREEITEM CSideTreeView::AddItem(HTREEITEM hParent, ATL::CStringW &Text, INT Ima HTREEITEM CSideTreeView::AddCategory(HTREEITEM hRootItem, UINT TextIndex, UINT IconIndex) { ATL::CStringW szText; - INT Index; + INT Index = 0; HICON hIcon; hIcon = (HICON)LoadImageW(hInst, @@ -613,14 +614,6 @@ VOID CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) } } -BOOL CMainWindow::SearchPatternMatch(LPCWSTR szHaystack, LPCWSTR szNeedle) -{ - if (!*szNeedle) - return TRUE; - /* TODO: Improve pattern search beyond a simple case-insensitive substring search. */ - return StrStrIW(szHaystack, szNeedle) != NULL; -} - BOOL CALLBACK CMainWindow::EnumInstalledAppProc(CInstalledApplicationInfo *Info) { if (!SearchPatternMatch(Info->szDisplayName.GetString(), szSearchPattern)) @@ -723,7 +716,7 @@ ATL::CWndClassInfo &CMainWindow::GetWndClassInfo() LoadCursorW(NULL, IDC_ARROW), (HBRUSH)(COLOR_BTNFACE + 1), MAKEINTRESOURCEW(IDR_MAINMENU), - L"RAppsWnd", + szWindowClass, NULL }, NULL, NULL, IDC_ARROW, TRUE, 0, _T("") @@ -861,7 +854,7 @@ void CMainWindow::HandleTabOrder(int direction) -VOID ShowMainWindow(INT nShowCmd) +VOID MainWindowLoop(INT nShowCmd) { HACCEL KeyBrd; MSG Msg; diff --git a/base/applications/rapps/include/dialogs.h b/base/applications/rapps/include/dialogs.h index aa5afa6ce7c..917effd8c6e 100644 --- a/base/applications/rapps/include/dialogs.h +++ b/base/applications/rapps/include/dialogs.h @@ -9,7 +9,7 @@ VOID CreateSettingsDlg(HWND hwnd); //Main window -VOID ShowMainWindow(INT nShowCmd); +VOID MainWindowLoop(INT nShowCmd); // Download dialogs VOID DownloadApplicationsDB(LPCWSTR lpUrl, BOOL IsOfficial); diff --git a/base/applications/rapps/include/gui.h b/base/applications/rapps/include/gui.h index 772bd2f71cb..1d8b6141ece 100644 --- a/base/applications/rapps/include/gui.h +++ b/base/applications/rapps/include/gui.h @@ -98,8 +98,6 @@ private: VOID OnCommand(WPARAM wParam, LPARAM lParam); - static BOOL SearchPatternMatch(LPCWSTR szHaystack, LPCWSTR szNeedle); - BOOL CALLBACK EnumInstalledAppProc(CInstalledApplicationInfo *Info); BOOL CALLBACK EnumAvailableAppProc(CAvailableApplicationInfo *Info, BOOL bInitialCheckState); @@ -134,4 +132,4 @@ public: }; -VOID ShowMainWindow(INT nShowCmd); +VOID MainWindowLoop(INT nShowCmd); diff --git a/base/applications/rapps/include/misc.h b/base/applications/rapps/include/misc.h index 9f28f267033..58890958f3d 100644 --- a/base/applications/rapps/include/misc.h +++ b/base/applications/rapps/include/misc.h @@ -56,3 +56,5 @@ BOOL IsSystem64Bit(); INT GetSystemColorDepth(); void UnixTimeToFileTime(DWORD dwUnixTime, LPFILETIME pFileTime); + +BOOL SearchPatternMatch(LPCWSTR szHaystack, LPCWSTR szNeedle); diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index 6ea0ca1a321..023fcdda882 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -218,6 +218,16 @@ #define IDS_DL_DIALOG_DB_DOWNLOAD_DISP 951 #define IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP 952 +/* Command-line related strings */ +#define IDS_CMD_USAGE 953 +#define IDS_CMD_NEED_PACKAGE_NAME 954 +#define IDS_CMD_NEED_FILE_NAME 955 +#define IDS_CMD_NEED_PARAMS 956 +#define IDS_CMD_INVALID_OPTION 957 +#define IDS_CMD_FIND_RESULT_FOR 958 +#define IDS_CMD_PACKAGE_NOT_FOUND 959 +#define IDS_CMD_PACKAGE_INFO 960 + /* Accelerators */ #define HOTKEYS 715 diff --git a/base/applications/rapps/include/unattended.h b/base/applications/rapps/include/unattended.h index 93d19344260..c5bc8797b01 100644 --- a/base/applications/rapps/include/unattended.h +++ b/base/applications/rapps/include/unattended.h @@ -1,7 +1,11 @@ #pragma once -#define CMD_KEY_INSTALL L"/INSTALL" -#define CMD_KEY_SETUP L"/SETUP" +#define CMD_KEY_INSTALL L"INSTALL" +#define CMD_KEY_SETUP L"SETUP" +#define CMD_KEY_FIND L"FIND" +#define CMD_KEY_INFO L"INFO" +#define CMD_KEY_HELP L"?" -// return TRUE if the SETUP key was valid -BOOL UseCmdParameters(LPWSTR lpCmdLine); +const WCHAR UsageString[] = L"RAPPS [/" CMD_KEY_HELP "] [/" CMD_KEY_INSTALL " packagename] [/" CMD_KEY_SETUP " filename]"; + +BOOL ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow); diff --git a/base/applications/rapps/include/winmain.h b/base/applications/rapps/include/winmain.h index cbd9f3727f7..3b9397a0eda 100644 --- a/base/applications/rapps/include/winmain.h +++ b/base/applications/rapps/include/winmain.h @@ -2,6 +2,8 @@ #include <windef.h> #include <wininet.h> +extern LPCWSTR szWindowClass; + //TODO: Separate main and settings related definitions struct SETTINGS_INFO { diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index 4ac81b14652..02cd569901c 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -255,3 +255,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index 965c5b31380..4d1c6d6f20b 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -256,3 +256,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index 8bd0a0bc36a..8e6a9e60374 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -251,3 +251,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Datenbank-Aktualisierung…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index 869868fd255..876d6675dcc 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -251,3 +251,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index c9f224c17c3..634e868c375 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -254,3 +254,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Actualizando listado…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Actualizando listado… (Origen no oficial)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/et-EE.rc b/base/applications/rapps/lang/et-EE.rc index 95f2f57a6f9..e1cea69039d 100644 --- a/base/applications/rapps/lang/et-EE.rc +++ b/base/applications/rapps/lang/et-EE.rc @@ -259,3 +259,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Andmebaasi uuendamine…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index 22077326c2e..996ffa5c212 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -251,3 +251,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Mise à jour de la base de données…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Mise à jour de la base de données… (Non officielle)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index 79a272acb1c..b8054551e94 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -257,3 +257,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "מעדכן את מסד הנתונים..." IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/id-ID.rc b/base/applications/rapps/lang/id-ID.rc index 0a65bcc1605..6da2e240587 100644 --- a/base/applications/rapps/lang/id-ID.rc +++ b/base/applications/rapps/lang/id-ID.rc @@ -251,3 +251,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Memperbarui database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index 6321268e6b1..b8567c41293 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -251,3 +251,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Aggiornamento Database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index 384eec172de..056c3f83086 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -251,3 +251,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "データベースを更新中..." IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index 8ce8f1915b3..75d6cd9228d 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -251,3 +251,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index ca5b2615153..78ff3c3fc1a 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -259,3 +259,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Aktualizowanie bazy programów…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index f60e57c4557..93bebf7c027 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -253,3 +253,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/pt-PT.rc b/base/applications/rapps/lang/pt-PT.rc index 31d968a260a..e41033d6904 100644 --- a/base/applications/rapps/lang/pt-PT.rc +++ b/base/applications/rapps/lang/pt-PT.rc @@ -253,3 +253,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Actualizar base de dados…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "A actualizar Base de dados… (Fonte não oficial)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index 7e28b9e41d1..2492348948b 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -260,3 +260,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Actualizare baza de date…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index 1ff0dd8651b..75095bb8148 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -251,3 +251,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Обновление базы данных…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index 293028d37d6..9c2adf6c5d5 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -256,3 +256,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index 51be3ed3eca..0dda1a8d984 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -255,3 +255,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index d4715ed0b35..5e5bfb233b3 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -258,3 +258,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index a612fc9b503..597055cd0dc 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -253,3 +253,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Veri Tabanı güncelleniyor…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index 29067f4871f..54a7d402d51 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -259,3 +259,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Оновлення списку програм…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index 25a12c4fb1f..a0e025ab3c9 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -254,3 +254,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "正在更新数据库…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "正在更新数据库… (非官方源)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 49f7dfb2c9f..82d2393d634 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -253,3 +253,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "更新資料庫…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "正在更新資料庫… (非官方源)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index 086adfcfb68..54a965bce13 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -522,3 +522,11 @@ void UnixTimeToFileTime(DWORD dwUnixTime, LPFILETIME pFileTime) pFileTime->dwLowDateTime = (DWORD)ll; pFileTime->dwHighDateTime = ll >> 32; } + +BOOL SearchPatternMatch(LPCWSTR szHaystack, LPCWSTR szNeedle) +{ + if (!*szNeedle) + return TRUE; + /* TODO: Improve pattern search beyond a simple case-insensitive substring search. */ + return StrStrIW(szHaystack, szNeedle) != NULL; +} diff --git a/base/applications/rapps/unattended.cpp b/base/applications/rapps/unattended.cpp index b37610c4149..839d8a53dcf 100644 --- a/base/applications/rapps/unattended.cpp +++ b/base/applications/rapps/unattended.cpp @@ -3,61 +3,100 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Functions to parse command-line flags and process them * COPYRIGHT: Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) + * Copyright 2020 He Yang (1160386205(a)qq.com) */ #include "rapps.h" #include "unattended.h" +#include "winmain.h" + #include <setupapi.h> -#define MIN_ARGS 3 +#include <conutils.h> -BOOL UseCmdParameters(LPWSTR lpCmdLine) +BOOL MatchCmdOption(LPWSTR argvOption, LPCWSTR szOptToMacth) { - INT argc; - LPWSTR* argv = CommandLineToArgvW(lpCmdLine, &argc); + WCHAR FirstCharList[] = { L'-', L'/' }; - if (!argv || argc < MIN_ARGS) + for (UINT i = 0; i < _countof(FirstCharList); i++) { + if (argvOption[0] == FirstCharList[i]) + { + if (StrCmpIW(argvOption + 1, szOptToMacth) == 0) + { + return TRUE; + } + else + { + return FALSE; + } + } + } + return FALSE; +} + +BOOL HandleInstallCommand(LPWSTR szCommand, int argcLeft, LPWSTR * argvLeft) +{ + if (argcLeft == 0) + { + ConResMsgPrintf(StdOut, NULL, IDS_CMD_NEED_PACKAGE_NAME, szCommand); return FALSE; } + FreeConsole(); ATL::CSimpleArray<ATL::CStringW> PkgNameList; - if (!StrCmpIW(argv[1], CMD_KEY_INSTALL)) + + for (int i = 0; i < argcLeft; i++) { - for (INT i = 2; i < argc; ++i) - { - PkgNameList.Add(argv[i]); - } + PkgNameList.Add(argvLeft[i]); + } + + CAvailableApps apps; + apps.UpdateAppsDB(); + apps.Enum(ENUM_ALL_AVAILABLE, NULL, NULL); + + ATL::CSimpleArray<CAvailableApplicationInfo> arrAppInfo = apps.FindAppsByPkgNameList(PkgNameList); + if (arrAppInfo.GetSize() > 0) + { + DownloadListOfApplications(arrAppInfo, TRUE); + return TRUE; } else - if (!StrCmpIW(argv[1], CMD_KEY_SETUP)) { - HINF InfHandle = SetupOpenInfFileW(argv[2], NULL, INF_STYLE_WIN4, NULL); - if (InfHandle == INVALID_HANDLE_VALUE) - { - return FALSE; - } + return FALSE; + } +} - INFCONTEXT Context; - if (SetupFindFirstLineW(InfHandle, L"RAPPS", L"Install", &Context)) - { - WCHAR szPkgName[MAX_PATH]; - do - { - if (SetupGetStringFieldW(&Context, 1, szPkgName, _countof(szPkgName), NULL)) - { - PkgNameList.Add(szPkgName); - } - } while (SetupFindNextLine(&Context, &Context)); - } - SetupCloseInfFile(InfHandle); +BOOL HandleSetupCommand(LPWSTR szCommand, int argcLeft, LPWSTR * argvLeft) +{ + if (argcLeft != 1) + { + ConResMsgPrintf(StdOut, NULL, IDS_CMD_NEED_FILE_NAME, szCommand); + return FALSE; } - else + + ATL::CSimpleArray<ATL::CStringW> PkgNameList; + HINF InfHandle = SetupOpenInfFileW(argvLeft[0], NULL, INF_STYLE_WIN4, NULL); + if (InfHandle == INVALID_HANDLE_VALUE) { return FALSE; } + INFCONTEXT Context; + if (SetupFindFirstLineW(InfHandle, L"RAPPS", L"Install", &Context)) + { + WCHAR szPkgName[MAX_PATH]; + do + { + if (SetupGetStringFieldW(&Context, 1, szPkgName, _countof(szPkgName), NULL)) + { + PkgNameList.Add(szPkgName); + } + } while (SetupFindNextLine(&Context, &Context)); + } + SetupCloseInfFile(InfHandle); + CAvailableApps apps; apps.UpdateAppsDB(); apps.Enum(ENUM_ALL_AVAILABLE, NULL, NULL); @@ -68,6 +107,199 @@ BOOL UseCmdParameters(LPWSTR lpCmdLine) DownloadListOfApplications(arrAppInfo, TRUE); return TRUE; } + else + { + return FALSE; + } +} - return FALSE; +BOOL CALLBACK CmdFindAppEnum(CAvailableApplicationInfo *Info, BOOL bInitialCheckState, PVOID param) +{ + LPCWSTR lpszSearch = (LPCWSTR)param; + if (!SearchPatternMatch(Info->m_szName.GetString(), lpszSearch) && + !SearchPatternMatch(Info->m_szDesc.GetString(), lpszSearch)) + { + return TRUE; + } + + ConPrintf(StdOut, (LPWSTR)L"%s (%s)\n", (LPCWSTR)(Info->m_szName), (LPCWSTR)(Info->m_szPkgName)); + return TRUE; +} + +BOOL HandleFindCommand(LPWSTR szCommand, int argcLeft, LPWSTR *argvLeft) +{ + if (argcLeft < 1) + { + ConResMsgPrintf(StdOut, NULL, IDS_CMD_NEED_PARAMS, szCommand); + return FALSE; + } + + CAvailableApps apps; + apps.UpdateAppsDB(); + + for (int i = 0; i < argcLeft; i++) + { + ConResMsgPrintf(StdOut, NULL, IDS_CMD_FIND_RESULT_FOR, argvLeft[i]); + apps.Enum(ENUM_ALL_AVAILABLE, CmdFindAppEnum, argvLeft[i]); + ConPrintf(StdOut, (LPWSTR)L"\n"); + } + + return TRUE; +} + +BOOL HandleInfoCommand(LPWSTR szCommand, int argcLeft, LPWSTR *argvLeft) +{ + if (argcLeft < 1) + { + ConResMsgPrintf(StdOut, NULL, IDS_CMD_NEED_PARAMS, szCommand); + return FALSE; + } + + CAvailableApps apps; + apps.UpdateAppsDB(); + apps.Enum(ENUM_ALL_AVAILABLE, NULL, NULL); + + for (int i = 0; i < argcLeft; i++) + { + CAvailableApplicationInfo *AppInfo = apps.FindAppByPkgName(argvLeft[i]); + if (!AppInfo) + { + ConResMsgPrintf(StdOut, NULL, IDS_CMD_PACKAGE_NOT_FOUND, argvLeft[i]); + } + else + { + ConResMsgPrintf(StdOut, NULL, IDS_CMD_PACKAGE_INFO, argvLeft[i]); + // TODO: code about extracting information from CAvailableApplicationInfo (in appview.cpp, class CAppRichEdit) + // is in a mess. It should be refactored, and should not placed in class CAppRichEdit. + // and the code here should reused that code after refactor. + + ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szName); + + if (AppInfo->m_szVersion) + { + ConResPrintf(StdOut, IDS_AINFO_VERSION); + ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szVersion); + } + + if (AppInfo->m_szLicense) + { + ConResPrintf(StdOut, IDS_AINFO_LICENSE); + ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szLicense); + } + + if (AppInfo->m_szSize) + { + ConResPrintf(StdOut, IDS_AINFO_SIZE); + ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szSize); + } + + if (AppInfo->m_szUrlSite) + { + ConResPrintf(StdOut, IDS_AINFO_URLSITE); + ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szUrlSite); + } + + if (AppInfo->m_szDesc) + { + ConResPrintf(StdOut, IDS_AINFO_DESCRIPTION); + ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szDesc); + } + + if (AppInfo->m_szUrlDownload) + { + ConResPrintf(StdOut, IDS_AINFO_URLDOWNLOAD); + ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szUrlDownload); + } + + ConPrintf(StdOut, (LPWSTR)L"\n"); + } + ConPrintf(StdOut, (LPWSTR)L"\n"); + } + return TRUE; +} + +BOOL HandleHelpCommand(LPWSTR szCommand, int argcLeft, LPWSTR * argvLeft) +{ + if (argcLeft != 0) + { + return FALSE; + } + + ConPrintf(StdOut, (LPWSTR)L"\n"); + ConResPuts(StdOut, IDS_APPTITLE); + ConPrintf(StdOut, (LPWSTR)L"\n\n"); + + ConResPuts(StdOut, IDS_CMD_USAGE); + ConPrintf(StdOut, (LPWSTR)L"%ls\n", UsageString); + return TRUE; +} + +BOOL ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow) +{ + INT argc; + LPWSTR *argv = CommandLineToArgvW(lpCmdLine, &argc); + + if (!argv) + { + return FALSE; + } + + if (argc == 1) // RAPPS is launched without options + { + // Close the console, and open MainWindow + FreeConsole(); + + + // Check for if rapps MainWindow is already launched in another process + HANDLE hMutex; + + hMutex = CreateMutexW(NULL, FALSE, szWindowClass); + if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS)) + { + /* If already started, it is found its window */ + HWND hWindow = FindWindowW(szWindowClass, NULL); + + /* Activate window */ + ShowWindow(hWindow, SW_SHOWNORMAL); + SetForegroundWindow(hWindow); + return FALSE; + } + + if (SettingsInfo.bUpdateAtStart || bIsFirstLaunch) + CAvailableApps::ForceUpdateAppsDB(); + + MainWindowLoop(nCmdShow); + + if (hMutex) + CloseHandle(hMutex); + } + else if (MatchCmdOption(argv[1], CMD_KEY_INSTALL)) + { + return HandleInstallCommand(argv[1], argc - 2, argv + 2); + } + else if (MatchCmdOption(argv[1], CMD_KEY_SETUP)) + { + return HandleSetupCommand(argv[1], argc - 2, argv + 2); + } + else if (MatchCmdOption(argv[1], CMD_KEY_FIND)) + { + return HandleFindCommand(argv[1], argc - 2, argv + 2); + } + else if (MatchCmdOption(argv[1], CMD_KEY_INFO)) + { + return HandleInfoCommand(argv[1], argc - 2, argv + 2); + } + else if (MatchCmdOption(argv[1], CMD_KEY_HELP)) + { + return HandleHelpCommand(argv[1], argc - 2, argv + 2); + } + else + { + // unrecognized/invalid options + ConResPuts(StdOut, IDS_CMD_INVALID_OPTION); + return FALSE; + } + + + return TRUE; } diff --git a/base/applications/rapps/winmain.cpp b/base/applications/rapps/winmain.cpp index 2f462459113..740e4fa828f 100644 --- a/base/applications/rapps/winmain.cpp +++ b/base/applications/rapps/winmain.cpp @@ -14,6 +14,10 @@ #include <gdiplus.h> +#include <conutils.h> + +LPCWSTR szWindowClass = L"ROSAPPMGR"; + HWND hMainWnd; HINSTANCE hInst; SETTINGS_INFO SettingsInfo; @@ -139,13 +143,13 @@ VOID SaveSettings(HWND hwnd) } } -INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, INT nShowCmd) +int wmain(int argc, wchar_t *argv[]) { - LPCWSTR szWindowClass = L"ROSAPPMGR"; - HANDLE hMutex; - BOOL bIsFirstLaunch; + ConInitStdStreams(); // Initialize the Console Standard Streams - InitializeAtlModule(hInstance, TRUE); + BOOL bIsFirstLaunch; + + InitializeAtlModule(GetModuleHandle(NULL), TRUE); InitializeGDIPlus(TRUE); if (GetUserDefaultUILanguage() == MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT)) @@ -153,19 +157,8 @@ INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi SetProcessDefaultLayout(LAYOUT_RTL); } - hInst = hInstance; - - hMutex = CreateMutexW(NULL, FALSE, szWindowClass); - if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS)) - { - /* If already started, it is found its window */ - HWND hWindow = FindWindowW(szWindowClass, NULL); + hInst = GetModuleHandle(NULL); - /* Activate window */ - ShowWindow(hWindow, SW_SHOWNORMAL); - SetForegroundWindow(hWindow); - return 1; - } bIsFirstLaunch = !LoadSettings(); if (bIsFirstLaunch) { @@ -175,20 +168,11 @@ INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi InitLogs(); InitCommonControls(); - // skip window creation if there were some keys - if (!UseCmdParameters(GetCommandLineW())) - { - if (SettingsInfo.bUpdateAtStart || bIsFirstLaunch) - CAvailableApps::ForceUpdateAppsDB(); - - ShowMainWindow(nShowCmd); - } - - if (hMutex) - CloseHandle(hMutex); - + // parse cmd-line and perform the corresponding operation + BOOL bSuccess = ParseCmdAndExecute(GetCommandLineW(), bIsFirstLaunch, SW_SHOWNORMAL); + InitializeGDIPlus(FALSE); - InitializeAtlModule(hInstance, FALSE); + InitializeAtlModule(GetModuleHandle(NULL), FALSE); - return 0; + return bSuccess ? 0 : 1; }

4 years, 3 months

← Newer
1
...
32
33
34
35
36
37
38
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2020