Skip to content

Commit d1e4848

Browse files
florelisflorelis
committed
Merge branch 'master' into versionupdate
2 parents 315aca0 + b717d7c commit d1e4848

File tree

17 files changed

+11147
-1405
lines changed

17 files changed

+11147
-1405
lines changed

‎NOTICE‎

Lines changed: 11003 additions & 1382 deletions
Large diffs are not rendered by default.

‎doc/ReleaseNotes.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
## New in v1.13
22

3-
<!-- Nothing yet! -->
3+
<!-- Nothing yet! -->

‎samples/WinGetUWPCaller/WinGetUWPCaller/MainPage.cpp‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,13 +309,16 @@ namespace winrt::WinGetUWPCaller::implementation
309309

310310
if (selectedItems.Size() == 0)
311311
{
312-
// If no items are selected, we use all available catalogs.
312+
// If no items are selected, we use all implicit catalogs.
313313
CreateCompositePackageCatalogOptions createCompositePackageCatalogOptions;
314314
createCompositePackageCatalogOptions.CompositeSearchBehavior(CompositeSearchBehavior::RemotePackagesFromRemoteCatalogs);
315315

316316
for (const auto& item : m_packageManager.GetPackageCatalogs())
317317
{
318-
createCompositePackageCatalogOptions.Catalogs().Append(item);
318+
if (!item.Info().Explicit())
319+
{
320+
createCompositePackageCatalogOptions.Catalogs().Append(item);
321+
}
319322
}
320323

321324
catalogReference = m_packageManager.CreateCompositePackageCatalog(createCompositePackageCatalogOptions);

‎src/AppInstallerCLICore/Commands/TestCommand.cpp‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "Workflows/MSStoreInstallerHandler.h"
1414
#include <winget/RepositorySource.h>
1515
#include <winrt/Microsoft.Management.Configuration.h>
16+
#include <winrt/Windows.ApplicationModel.Core.h>
1617

1718
using namespace AppInstaller::CLI::Workflow;
1819
using namespace AppInstaller::Utility::literals;
@@ -74,7 +75,7 @@ namespace AppInstaller::CLI
7475
NULL,
7576
ENDSESSION_CLOSEAPP,
7677
(SMTO_ABORTIFHUNG | SMTO_ERRORONEXIT),
77-
5000,
78+
10000,
7879
NULL));
7980
}
8081

@@ -277,6 +278,41 @@ namespace AppInstaller::CLI
277278
return module ? module->GetObjectCount() : 0;
278279
}
279280
};
281+
282+
struct TestTerminateTerminationSignalHandler final : public Command
283+
{
284+
TestTerminateTerminationSignalHandler(std::string_view parent) : Command("term-signal-handler", {}, parent, Visibility::Hidden) {}
285+
286+
Resource::LocString ShortDescription() const override
287+
{
288+
return "Test TerminationSignalHandler thread"_lis;
289+
}
290+
291+
Resource::LocString LongDescription() const override
292+
{
293+
return "Forces the TerminationSignalHandler static object to be destroyed so that the thread behavior can be observed."_lis;
294+
}
295+
296+
protected:
297+
void ExecuteInternal(Execution::Context& context) const override
298+
{
299+
// Destroy the one created by standard execution
300+
// We join on the window thread, so if this never exits we have failed the test.
301+
winrt::Windows::ApplicationModel::Core::CoreApplication::Properties().TryRemove(L"WindowsPackageManager.TerminationSignalHandler");
302+
303+
// Create a new instance
304+
auto instance = ShutdownMonitoring::TerminationSignalHandler::Instance();
305+
306+
if (instance->GetWindowHandle() == nullptr)
307+
{
308+
LogAndReport(context, "Didn't get a window handle");
309+
}
310+
else
311+
{
312+
LogAndReport(context, "Got a window handle");
313+
}
314+
}
315+
};
280316
}
281317

282318
std::vector<std::unique_ptr<Command>> TestCommand::GetCommands() const
@@ -287,6 +323,7 @@ namespace AppInstaller::CLI
287323
std::make_unique<TestConfigurationExportCommand>(FullName()),
288324
std::make_unique<TestConfigurationFindUnitProcessorsCommand>(FullName()),
289325
std::make_unique<TestCanUnloadNowCommand>(FullName()),
326+
std::make_unique<TestTerminateTerminationSignalHandler>(FullName()),
290327
});
291328
}
292329

‎src/AppInstallerCLICore/ShutdownMonitoring.cpp‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
#include <AppInstallerRuntime.h>
88
#include <winget/COMStaticStorage.h>
99

10+
using namespace std::chrono_literals;
11+
1012
namespace AppInstaller::ShutdownMonitoring
1113
{
1214
std::shared_ptr<TerminationSignalHandler> TerminationSignalHandler::Instance()
@@ -102,7 +104,13 @@ namespace AppInstaller::ShutdownMonitoring
102104
// std::thread requires that any managed thread (joinable) be joined or detached before destructing
103105
if (m_windowThread.joinable())
104106
{
105-
m_windowThread.detach();
107+
if (m_windowHandle)
108+
{
109+
// Inform the thread that it should stop.
110+
PostMessageW(m_windowHandle.get(), WM_DESTROY, 0, 0);
111+
}
112+
113+
m_windowThread.join();
106114
}
107115
}
108116

@@ -214,6 +222,12 @@ namespace AppInstaller::ShutdownMonitoring
214222
return;
215223
}
216224

225+
// Unregister the window class on exiting the thread
226+
auto classUnregister = wil::scope_exit([&]()
227+
{
228+
UnregisterClassW(windowClass, hInstance);
229+
});
230+
217231
m_windowHandle = wil::unique_hwnd(CreateWindow(
218232
windowClass,
219233
L"WingetMessageOnlyWindow",
@@ -227,26 +241,38 @@ namespace AppInstaller::ShutdownMonitoring
227241
hInstance,
228242
NULL)); /* lpParam */
229243

230-
if (m_windowHandle == nullptr)
244+
HWND windowHandle = m_windowHandle.get();
245+
if (windowHandle == nullptr)
231246
{
232247
LOG_LAST_ERROR_MSG("Failed creating window");
233248
return;
234249
}
235250

236-
ShowWindow(m_windowHandle.get(), SW_HIDE);
251+
// We must destroy the window first so that the class unregister can succeed
252+
auto destroyWindow = wil::scope_exit([&]()
253+
{
254+
DestroyWindow(windowHandle);
255+
});
256+
257+
ShowWindow(windowHandle, SW_HIDE);
237258

238259
// Force message queue to be created.
239260
MSG msg;
240261
PeekMessage(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE);
241262
m_messageQueueReady.SetEvent();
242263

243-
// Message loop
264+
// Message loop, we send WM_DESTROY to terminate it
244265
BOOL getMessageResult;
245-
while ((getMessageResult = GetMessage(&msg, m_windowHandle.get(), 0, 0)) != 0)
266+
while ((getMessageResult = GetMessage(&msg, windowHandle, 0, 0)) != 0)
246267
{
247268
if (getMessageResult == -1)
248269
{
249270
LOG_LAST_ERROR();
271+
break;
272+
}
273+
else if (msg.message == WM_DESTROY)
274+
{
275+
break;
250276
}
251277
else
252278
{

‎src/AppInstallerCLICore/Workflows/InstallFlow.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ namespace AppInstaller::CLI::Workflow
285285
void FontInstall(Execution::Context& context)
286286
{
287287
context <<
288-
EnsureFeatureEnabled(ExperimentalFeature::Feature::Font) <<
289288
GetInstallerArgs <<
290289
FontInstallImpl <<
291290
ReportInstallerResult("Font"sv, APPINSTALLER_CLI_ERROR_FONT_INSTALL_FAILED, true);

‎src/AppInstallerCLICore/Workflows/UninstallFlow.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,6 @@ namespace AppInstaller::CLI::Workflow
354354
break;
355355
case InstallerTypeEnum::Font:
356356
context <<
357-
EnsureFeatureEnabled(Settings::ExperimentalFeature::Feature::Font) <<
358357
Workflow::FontUninstallImpl <<
359358
ReportUninstallerResult("Font"sv, APPINSTALLER_CLI_ERROR_FONT_UNINSTALL_FAILED, true);
360359
break;

‎src/AppInstallerCLIE2ETests/AppShutdownTests.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,5 +121,15 @@ public void CanUnloadNowTest()
121121
Assert.True(lines[3].Contains("Internal objects: 0"));
122122
Assert.True(lines[4].Contains("External objects: 0"));
123123
}
124+
125+
/// <summary>
126+
/// Runs winget test term-signal-handler to check for proper thread termination.
127+
/// </summary>
128+
[Test]
129+
public void TermSignalHandler()
130+
{
131+
var result = TestCommon.RunAICLICommand("test", "term-signal-handler --verbose");
132+
Assert.True(result.StdOut.Contains("Got a window handle"));
133+
}
124134
}
125135
}

‎src/AppInstallerCLIE2ETests/GroupPolicy.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,7 @@ public void EnableMicrosoftStoreSource()
166166
[Test]
167167
public void EnableFontSource()
168168
{
169-
WinGetSettingsHelper.ConfigureFeature("fonts", true);
170169
GroupPolicyHelper.EnableFontSource.Disable();
171-
172170
var result = TestCommon.RunAICLICommand("source list", "winget-font");
173171
Assert.AreEqual(Constants.ErrorCode.ERROR_SOURCE_NAME_DOES_NOT_EXIST, result.ExitCode);
174172

‎src/AppInstallerCLIE2ETests/UpgradeCommand.cs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,28 @@ public void UpgradePortable()
4949
TestCommon.VerifyPortablePackage(Path.Combine(installDir, packageDirName), commandAlias, fileName, productCode, true);
5050
}
5151

52+
/// <summary>
53+
/// Test upgrade portable package.
54+
/// </summary>
55+
[Test]
56+
public void UpgradePortableNonAsciiPath()
57+
{
58+
string installDir = Path.Combine(TestCommon.GetRandomTestDir(), "Tést");
59+
string packageId, commandAlias, fileName, productCode;
60+
packageId = "AppInstallerTest.TestPortableExe";
61+
productCode = packageId + "_" + Constants.TestSourceIdentifier;
62+
commandAlias = fileName = "AppInstallerTestExeInstaller.exe";
63+
64+
var result = TestCommon.RunAICLICommand("install", $"AppInstallerTest.TestPortableExe -v 1.0.0.0 -l {installDir}");
65+
Assert.AreEqual(Constants.ErrorCode.S_OK, result.ExitCode);
66+
Assert.True(result.StdOut.Contains("Successfully installed"));
67+
68+
var result2 = TestCommon.RunAICLICommand("upgrade", $"{packageId} -v 2.0.0.0 -l {installDir}");
69+
Assert.AreEqual(Constants.ErrorCode.S_OK, result2.ExitCode);
70+
Assert.True(result2.StdOut.Contains("Successfully installed"));
71+
TestCommon.VerifyPortablePackage(installDir, commandAlias, fileName, productCode, true);
72+
}
73+
5274
/// <summary>
5375
/// Test upgrade portable package with arp mismatch.
5476
/// </summary>

0 commit comments

Comments
 (0)