timamsk/App-Installer-For-Windows-8.x-Reset
1
0
Fork 0
mirror of https://github.com/modernw/App-Installer-For-Windows-8.x-Reset.git synced 2026-04-11 17:57:19 +10:00
Code Issues Packages Projects Releases Wiki Activity

Update Shell

Browse Source
This commit is contained in:
Bruce
2025-11-27 10:20:29 +08:00
parent a3b3b097b2
commit bd4e0b41a3
8 changed files with 81 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
appinstaller/appinstaller.rc
View File

Binary file not shown.

3
appinstaller/cmdargs.h
View File

@@ -32,7 +32,8 @@ std::vector <cmdarg> g_argslist = {
CMDARG_HELP,
{CMDARG_PREFIXS_DEFAULT, {L"silent", L"quiet", L"passive"}, CMDARG_POSTFIXS_DEFAULT, L"silent", GetRCStringSW (IDS_CMDPARAM_SILENT), CMDARG_IGNOREPREFIXS},
{CMDARG_PREFIXS_DEFAULT, {L"verysilent", L"veryquiet"}, CMDARG_POSTFIXS_DEFAULT, L"verysilent", GetRCStringSW (IDS_CMDPARAM_VERYSILENT), CMDARG_IGNOREPREFIXS},
{CMDARG_PREFIXS_DEFAULT, {L"multiple", L"filelist"}, {L"="}, L"multiple", GetRCStringSW (IDS_CMDPARAM_MULTIPLE), CMDARG_IGNOREPREFIXS | CMDARG_ENABLEPARAMS}
{CMDARG_PREFIXS_DEFAULT, {L"multiple", L"filelist"}, {L"="}, L"multiple", GetRCStringSW (IDS_CMDPARAM_MULTIPLE), CMDARG_IGNOREPREFIXS | CMDARG_ENABLEPARAMS},
{CMDARG_PREFIXS_DEFAULT, {L"language", L"lang"}, {L"="}, L"language", L"", CMDARG_IGNOREPREFIXS | CMDARG_ENABLEPARAMS}
};
bool IsFile (const std::wstring &path)
{

85
appinstaller/main.cpp
View File

@@ -192,7 +192,6 @@ public ref class SplashForm: public System::Windows::Forms::Form
this->BackColor = backcolor;
}
else
{
picbox->BackColor = background;
this->BackColor = background;
@@ -1228,17 +1227,6 @@ public ref class MainHtmlWnd: public System::Windows::Forms::Form
return "{}";
}
};
ref class _I_Storage
{
private:
MainHtmlWnd ^wndinst = nullptr;
public:
_I_Storage (MainHtmlWnd ^wnd): wndinst (wnd) {}
ref class Path
{
};
};
ref class _I_String
{
public:
@@ -1344,14 +1332,12 @@ public ref class MainHtmlWnd: public System::Windows::Forms::Form
private:
_I_System ^system = gcnew _I_System (wndinst);
_I_IEFrame ^ieframe = gcnew _I_IEFrame (wndinst);
_I_Storage ^storage = gcnew _I_Storage (wndinst);
_I_String ^str = gcnew _I_String ();
_I_Package ^pkg = gcnew _I_Package ();
_I_Window ^wnd = gcnew _I_Window (wndinst);
public:
property _I_System ^System { _I_System ^get () { return system; }}
property _I_IEFrame ^IEFrame { _I_IEFrame ^get () { return ieframe; }}
property _I_Storage ^Storage { _I_Storage ^get () { return storage; }}
property _I_String ^String { _I_String ^get () { return str; }}
property _I_Package ^Package { _I_Package ^get () { return pkg; }}
property _I_Window ^Window { _I_Window ^get () { return wnd; }}
@@ -1378,18 +1364,20 @@ public ref class MainHtmlWnd: public System::Windows::Forms::Form
if (savepos.read_bool ())
{
ww = lastw.read_uint (defw.read_uint (rcInt (IDS_DEFAULTWIDTH)));
wh = lastw.read_uint (defh.read_uint (rcInt (IDS_DEFAULTHEIGHT)));
wh = lasth.read_uint (defh.read_uint (rcInt (IDS_DEFAULTHEIGHT)));
}
else
{
ww = defw.read_uint (rcInt (IDS_DEFAULTWIDTH));
wh = defw.read_uint (rcInt (IDS_DEFAULTHEIGHT));
wh = defh.read_uint (rcInt (IDS_DEFAULTHEIGHT));
}
this->MinimumSize = System::Drawing::Size (
minw.read_uint (rcInt (IDS_MINWIDTH)) * DPI,
minh.read_uint (rcInt (IDS_MINHIEHGT)) * DPI
);
this->ClientSize = System::Drawing::Size (ww * DPI, wh * DPI);
int hborder = this->Size.Width - this->ClientSize.Width,
vborder = this->Size.Height - this->ClientSize.Height;
this->MinimumSize = System::Drawing::Size (
minw.read_uint (rcInt (IDS_MINWIDTH)) * DPI + hborder,
minh.read_uint (rcInt (IDS_MINHIEHGT)) * DPI + vborder
);
this->WindowState = (System::Windows::Forms::FormWindowState)lasts.read_int ((int)System::Windows::Forms::FormWindowState::Normal);
}
void Init ()
@@ -1452,11 +1440,11 @@ public ref class MainHtmlWnd: public System::Windows::Forms::Form
}
void OnResizeEnd (Object ^sender, EventArgs ^e)
{
ResizeEvent ();
}
std::wstring GetSuitSplashImage ()
{
std::wstring path = g_scaleres [this->Width >= 1024 && this->Height >= 768 ? L"splashlarge" : L"splash"];
std::wstring path = g_scaleres [this->Width >= 800 * DPI && this->Height >= 600 * DPI ? L"splashlarge" : L"splash"];
if (IsNormalizeStringEmpty (path)) path = g_vemani.splash_screen_image (L"App");
return path;
}
@@ -1665,15 +1653,13 @@ public ref class MainHtmlWnd: public System::Windows::Forms::Form
if (FAILED (pir.result))
pir.result = AddAppxPackageFromPath (pi.filepath, blankdeplist, DEPOLYOPTION_NONE, gcnew InstallProgressCallbackDelegate (this, &MainHtmlWnd::InstallProgressCallback), pir.error, pir.reason);
}
else
{
pir.result = AddAppxPackageFromPath (pi.filepath, blankdeplist, DEPOLYOPTION_NONE, gcnew InstallProgressCallbackDelegate (this, &MainHtmlWnd::InstallProgressCallback), pir.error, pir.reason);
}
else pir.result = AddAppxPackageFromPath (pi.filepath, blankdeplist, DEPOLYOPTION_NONE, gcnew InstallProgressCallbackDelegate (this, &MainHtmlWnd::InstallProgressCallback), pir.error, pir.reason);
g_pkgresult [pi.filepath] = pir;
if (pir.succeeded ())
{
InvokeCallScriptFunction ("noticeLoadInstallSuccessPage", false);
pagetag = "installsuccess";
InvokeLaunchAppForLaunchWhenReady ();
CreateToastNoticeWithImgBase64 (
g_identity,
MPStringToStdW (
@@ -1701,6 +1687,7 @@ public ref class MainHtmlWnd: public System::Windows::Forms::Form
pir.reason,
pi.properties.logo_base64
);
if (g_wcmdflags & (DWORD)CMDPARAM::SILENT) ThreadPackageSuccessInstallCountTask ();
}
}
else
@@ -1746,6 +1733,7 @@ public ref class MainHtmlWnd: public System::Windows::Forms::Form
if (allsuccess)
{
InvokeCallScriptFunction ("noticeLoadInstallSuccessPage", true);
InvokeLaunchAppForLaunchWhenReady ();
pagetag = "installsuccess";
CreateToastNotice (g_identity, GetRCStringSW (IDS_SUCCESS_MTITLE), L"");
ThreadPackageSuccessInstallCountTask ();
@@ -1755,6 +1743,7 @@ public ref class MainHtmlWnd: public System::Windows::Forms::Form
InvokeCallScriptFunction ("noticeLoadInstallFailedPage", true);
CreateToastNotice (g_identity, GetRCStringSW (IDS_FAILED_MTITLE), L"");
pagetag = "installfailed";
if (g_wcmdflags & (DWORD)CMDPARAM::SILENT) ThreadPackageSuccessInstallCountTask ();
}
}
}
@@ -1767,8 +1756,14 @@ public ref class MainHtmlWnd: public System::Windows::Forms::Form
}
void PackageSuccessInstallCountTask ()
{
return;
System::Threading::Thread::Sleep (System::TimeSpan (0, 0, 5));
size_t cnt = 0;
for (auto &it : g_pkginfo)
for (auto &it_s : it.applications)
if (!it_s [L"Id"].empty ()) cnt ++;
if (cnt <= 0) cnt = 1;
if (cnt > 3) cnt = 3;
if (g_wcmdflags & (DWORD)CMDPARAM::SILENT && cnt > 1) cnt = 2;
System::Threading::Thread::Sleep (System::TimeSpan (0, 0, 5 * cnt));
this->InvokeClose ();
}
void InvokeClose ()
@@ -1837,14 +1832,9 @@ public ref class MainHtmlWnd: public System::Windows::Forms::Form
for (auto &it_s : it.applications)
if (!it_s [L"Id"].empty ())
appids.emplace_back (it.identity.package_family_name + L'!' + it_s [L"Id"]);
if (appids.size () == 1)
{
ActivateAppxApplication (appids.at (0));
}
else if (appids.size () > 1)
{
AppListWnd::DisplayWindow ();
}
if (appids.size () == 1) ActivateAppxApplication (appids.at (0));
else if (appids.size () > 1) AppListWnd::DisplayWindow ();
else this->Close ();
}
else if (nequals (current, L"installfailed")) this->Close ();
return;
@@ -1883,6 +1873,24 @@ public ref class MainHtmlWnd: public System::Windows::Forms::Form
return;
System::Windows::Forms::MessageBox::Show ("Button2 按下事件");
}
void LaunchAppForLaunchWhenReady ()
{
if (!(g_wcmdflags & (DWORD)CMDPARAM::SILENT))
{
std::vector <std::wnstring> appids;
for (auto &it : g_pkginfo)
for (auto &it_s : it.applications)
if (!it_s [L"Id"].empty ())
appids.emplace_back (it.identity.package_family_name + L'!' + it_s [L"Id"]);
if (appids.size () == 1) ActivateAppxApplication (appids.at (0));
else if (appids.size () > 1) AppListWnd::DisplayWindow ();
}
}
void InvokeLaunchAppForLaunchWhenReady ()
{
if (this->InvokeRequired) this->Invoke (gcnew Action (this, &MainHtmlWnd::LaunchAppForLaunchWhenReady));
else LaunchAppForLaunchWhenReady ();
}
#ifdef nequals
#undef nequals
#endif
@@ -1999,6 +2007,7 @@ std::wstring GenerateCmdHelper ()
std::wstring ret = GetRCStringSW (IDS_CMDTIP_PRETEXT) + L"\r\n";
for (auto &it : g_argslist)
{
if (it.description.empty ()) continue;
ret += L"\r\n";
ret += L"\t" + (it.prefixs.size () ? it.prefixs.at (0) : L"") + it.commands.at (0) + L"\r\n";
ret += L"\t" + it.description + L"\r\n";
@@ -2042,6 +2051,10 @@ DWORD CmdMapsToFlags (std::map <cmdkey, cmdvalue> cmdpairs, std::vector <std::wn
}
}
}
else if (key.key.equals (L"language"))
{
SetThreadUILanguage (LocaleCodeToLcid (value.value));
}
} break;
}
}

7
pkgmgr/pkgmgr.cpp
View File

@@ -701,7 +701,7 @@ HRESULT FindAppxPackage (LPCWSTR lpPackageFullName, PKGMGR_FINDENUMCALLBACK pfCa
LPCWSTR GetPackageManagerLastErrorCode () { return g_swExceptionCode.c_str (); }
[STAThread]
LPCWSTR GetPackageManagerLastErrorDetailMessage () { return g_swExceptionDetail.c_str (); }
[STAThread]
HRESULT ActivateAppxApplication (LPCWSTR lpAppUserId, PDWORD pdwProcessId)
{
if (FAILED (CoInitializeEx (NULL, COINIT_APARTMENTTHREADED))) return E_INVALIDARG;
@@ -830,4 +830,7 @@ HRESULT FindAppxPackagesByFamilyName (LPCWSTR lpPkgFamilyName, PKGMGR_FINDENUMCA
if (pfCallback) pfCallback ((FIND_PACKAGE_INFO *)bytes.data (), pCustom);
}, pErrorCode, pDetailMsg);
}
void PackageManagerFreeString (LPWSTR lpString) { if (lpString) free (lpString); }
void PackageManagerFreeString (LPWSTR lpString)
{
if (lpString) free (lpString);
}

BIN
shared/config.ini Normal file
View File

Binary file not shown.

12
shared/html/css/pages.css
View File

@@ -201,7 +201,7 @@ progress.win-ring:indeterminate::-ms-fill {
width: 90px;
height: 90px;
position: relative;
background-color: #464646;
/*background-color: #464646;*/
float: right;
display: flex;
flex-direction: row;
@@ -218,6 +218,11 @@ progress.win-ring:indeterminate::-ms-fill {
min-height: 90px;
max-width: 90px;
max-height: 90px;
transition: all 0.5s cubic-bezier(0.1, 0.9, 0.2, 1);
}
.storelogo {
transition: all 0.5s cubic-bezier(0.1, 0.9, 0.2, 1);
}
.storelogo .filter img {
@@ -232,7 +237,7 @@ progress.win-ring:indeterminate::-ms-fill {
left: 0;
right: 0;
bottom: 0;
background-color: rgba(254, 0.1);
/*background-color: rgba(254,254,254, 0.1);*/
display: flex;
flex-direction: row;
-ms-flex-direction: row;
@@ -270,9 +275,6 @@ progress.win-ring:indeterminate::-ms-fill {
transition: width 0.5s cubic-bezier(0.1, 0.9, 0.2, 1), height 0.5s cubic-bezier(0.1, 0.9, 0.2, 1), top 0.5s cubic-bezier(0.1, 0.9, 0.2, 1), left 0.5s cubic-bezier(0.1, 0.9, 0.2, 1), right 0.5s cubic-bezier(0.1, 0.9, 0.2, 1), bottom 0.5s cubic-bezier(0.1, 0.9, 0.2, 1), margin 0.5s cubic-bezier(0.1, 0.9, 0.2, 1), padding 0.5s cubic-bezier(0.1, 0.9, 0.2, 1);
list-style-position: outside;
color: rgb(113, 113, 113);
/*test*/
/*border: 1px solid black;
padding: 5px;*/
}
.page .content p,

19
shared/html/install.html
View File

@@ -28,7 +28,7 @@
<body>
<div id="page-container" class="pagecontainer full">
<div class="page preinstall">
<div class="page splash">
<!-- Splash Screen -->
<img class="splash" src="images/splash.default.png" alt="Splash Screen" width="620" height="300">
<div class="content splash">
@@ -67,6 +67,21 @@
<img src="images/splash.default.png" alt="App Store Logo">
</div>
</div>
<script>
(function() {
"use strict";
var storelogo = document.querySelector(".page .content .storelogo");
var slimg = storelogo.querySelector("img");
var monitor = Windows.UI.Event.Monitor;
monitor.observe(slimg, monitor.EventType.attribute, function() {
if (slimg.hasAttribute("src") && slimg.src && slimg.src.length > 1 && slimg.naturalHeight > 0) {
storelogo.style.display = '';
} else {
storelogo.style.display = 'none';
}
});
})();
</script>
<h1 class="win-type-x-large pkgtitle title single" data-res-byname="IDS_PREINSTALL_TITLE"></h1>
<script>
(function() {
@@ -274,7 +289,7 @@
}
setFlyoutDisplayInfo(pi);
var hres = Bridge.Package.installResult(this.value);
if (hres) {
if (hres && hres.failed) {
reason.textContent = hres.message;
} else {
reason.textContent = Bridge.Resources.byname("IDS_FAILED_MSUCCESS");

2
shared/html/js/tileback.js
View File

@@ -21,7 +21,7 @@
roundToNearestInt(calcColorComponent(basecolor.red)),
roundToNearestInt(calcColorComponent(basecolor.green)),
roundToNearestInt(calcColorComponent(basecolor.blue)),
0.25
63.75 // 0.25
);
return "linear-gradient(to right, rgba(0,0,0,0), " + rightcolor.RGBA.stringify() + ")";
}