From b47b126ca9e47abf8388c19883dbd1b9f95ef232 Mon Sep 17 00:00:00 2001 From: fruzitent Date: Sat, 18 May 2024 08:02:33 +0300 Subject: [PATCH] fix: windows.h include on case-sensitive systems --- dev/AccessControl/Security.AccessControl.h | 2 +- dev/AccessControl/SecurityDescriptorHelpers.h | 2 +- dev/Deployment/DeploymentManagerAutoInitializer.cpp | 2 +- dev/DeploymentAgent/pch.h | 2 +- dev/DynamicDependency/API/pch.h | 2 +- dev/MRTCore/mrt/Core/src/MRM.cpp | 8 ++++---- dev/MRTCore/mrt/Core/unittests/MrmTests.cpp | 4 ++-- dev/PackageManager/API/pch.h | 2 +- dev/RestartAgent/pch.h | 2 +- .../UndockedRegFreeWinRT-AutoInitializer.cpp | 2 +- .../MddBootstrapAutoInitializer.cpp | 2 +- dev/WindowsAppRuntime_DLL/pch.h | 2 +- test/AccessControlTests/pch.h | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dev/AccessControl/Security.AccessControl.h b/dev/AccessControl/Security.AccessControl.h index 9bcc74956b..d44dc69b80 100644 --- a/dev/AccessControl/Security.AccessControl.h +++ b/dev/AccessControl/Security.AccessControl.h @@ -3,7 +3,7 @@ #pragma once -#include +#include struct AppContainerNameAndAccess { diff --git a/dev/AccessControl/SecurityDescriptorHelpers.h b/dev/AccessControl/SecurityDescriptorHelpers.h index f4e81db841..74776df2c3 100644 --- a/dev/AccessControl/SecurityDescriptorHelpers.h +++ b/dev/AccessControl/SecurityDescriptorHelpers.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include #include #include diff --git a/dev/Deployment/DeploymentManagerAutoInitializer.cpp b/dev/Deployment/DeploymentManagerAutoInitializer.cpp index f48b7be070..3dad82c106 100644 --- a/dev/Deployment/DeploymentManagerAutoInitializer.cpp +++ b/dev/Deployment/DeploymentManagerAutoInitializer.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation and Contributors. // Licensed under the MIT License. See LICENSE in the project root for license information. -#include +#include #include #include diff --git a/dev/DeploymentAgent/pch.h b/dev/DeploymentAgent/pch.h index 1b19ab0d5e..bd7fef892d 100644 --- a/dev/DeploymentAgent/pch.h +++ b/dev/DeploymentAgent/pch.h @@ -2,7 +2,7 @@ // Licensed under the MIT License. #pragma once -#include +#include #include #include #include diff --git a/dev/DynamicDependency/API/pch.h b/dev/DynamicDependency/API/pch.h index 4d93aa58ee..f8d8bb9180 100644 --- a/dev/DynamicDependency/API/pch.h +++ b/dev/DynamicDependency/API/pch.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include #include diff --git a/dev/MRTCore/mrt/Core/src/MRM.cpp b/dev/MRTCore/mrt/Core/src/MRM.cpp index b1760990fb..4a45ee614c 100644 --- a/dev/MRTCore/mrt/Core/src/MRM.cpp +++ b/dev/MRTCore/mrt/Core/src/MRM.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation and Contributors. // Licensed under the MIT License. -#include +#include #include #include "wil/win32_helpers.h" #include "wil/filesystem.h" @@ -255,7 +255,7 @@ static HRESULT LoadResourceCandidate( wchar_t rootResourceMap[256] = {}; unsigned int relativeIdIndex = 0; RETURN_IF_FAILED(GetRootAndRelativeIdFromUri(resourceIdOrUri, rootResourceMap, ARRAYSIZE(rootResourceMap), &relativeIdIndex)); - + const wchar_t* relativeResourceId = &resourceIdOrUri[relativeIdIndex]; if (relativeResourceId[0] == L'\0') { @@ -686,12 +686,12 @@ STDAPI MrmGetChildResourceMap( if (IsResourceUri(childResourceMapName)) { // If a full URI is passed in, we will respect the URI instead of trying to get the child map. - + // Root resource maps are the authority of the URI, and are limited to 255 characters. wchar_t rootResourceMap[256] = {}; unsigned int relativeIdIndex = 0; RETURN_IF_FAILED(GetRootAndRelativeIdFromUri(childResourceMapName, rootResourceMap, ARRAYSIZE(rootResourceMap), &relativeIdIndex)); - + const IResourceMapBase* internalRootResourceMap; if (rootResourceMap[0] == L'\0') { diff --git a/dev/MRTCore/mrt/Core/unittests/MrmTests.cpp b/dev/MRTCore/mrt/Core/unittests/MrmTests.cpp index a7670fbe9a..942957f350 100644 --- a/dev/MRTCore/mrt/Core/unittests/MrmTests.cpp +++ b/dev/MRTCore/mrt/Core/unittests/MrmTests.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation and Contributors. // Licensed under the MIT License. -#include +#include #include #include "..\src\MRM.h" @@ -38,7 +38,7 @@ class BasicTest VERIFY_ARE_NOT_EQUAL(0u, GetCurrentDirectoryW(ARRAYSIZE(previousWorkingDirectory), previousWorkingDirectory)); Log::Comment(String().Format(L"Test Setup: GetCurrentDirectory: %s", previousWorkingDirectory)); - + String testDeploymentDirectory; VERIFY_SUCCEEDED(RuntimeParameters::TryGetValue(L"TestDeploymentDir", testDeploymentDirectory)); Log::Comment(String().Format(L"Test Setup: TestDeploymentDir: %s", testDeploymentDirectory.GetBuffer())); diff --git a/dev/PackageManager/API/pch.h b/dev/PackageManager/API/pch.h index 3dcd1b1b1a..67564de419 100644 --- a/dev/PackageManager/API/pch.h +++ b/dev/PackageManager/API/pch.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include #include diff --git a/dev/RestartAgent/pch.h b/dev/RestartAgent/pch.h index b3064ded4d..d464ee1862 100644 --- a/dev/RestartAgent/pch.h +++ b/dev/RestartAgent/pch.h @@ -2,7 +2,7 @@ // Licensed under the MIT License. #pragma once -#include +#include #include #include #include diff --git a/dev/UndockedRegFreeWinRT/UndockedRegFreeWinRT-AutoInitializer.cpp b/dev/UndockedRegFreeWinRT/UndockedRegFreeWinRT-AutoInitializer.cpp index e22415b6c3..647e03658d 100644 --- a/dev/UndockedRegFreeWinRT/UndockedRegFreeWinRT-AutoInitializer.cpp +++ b/dev/UndockedRegFreeWinRT/UndockedRegFreeWinRT-AutoInitializer.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation and Contributors. // Licensed under the MIT License. -#include +#include #include // Ensure the including PE file has an import reference to diff --git a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapAutoInitializer.cpp b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapAutoInitializer.cpp index 777a696e84..54e0fab85d 100644 --- a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapAutoInitializer.cpp +++ b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapAutoInitializer.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation and Contributors. // Licensed under the MIT License. -#include +#include #include #include #include diff --git a/dev/WindowsAppRuntime_DLL/pch.h b/dev/WindowsAppRuntime_DLL/pch.h index ec070ce0f0..e857ec5ef8 100644 --- a/dev/WindowsAppRuntime_DLL/pch.h +++ b/dev/WindowsAppRuntime_DLL/pch.h @@ -2,7 +2,7 @@ // Licensed under the MIT License. #pragma once -#include +#include #include #include #include diff --git a/test/AccessControlTests/pch.h b/test/AccessControlTests/pch.h index 018d002eaf..29a89e6993 100644 --- a/test/AccessControlTests/pch.h +++ b/test/AccessControlTests/pch.h @@ -11,7 +11,7 @@ #define PCH_H #include -#include +#include #include #include