Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: windows.h include on case-sensitive systems #4428

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev/AccessControl/Security.AccessControl.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#pragma once

#include <Windows.h>
#include <windows.h>

struct AppContainerNameAndAccess
{
Expand Down
2 changes: 1 addition & 1 deletion dev/AccessControl/SecurityDescriptorHelpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#pragma once

#include <Windows.h>
#include <windows.h>
#include <wil/resource.h>
#include <wil/result.h>
#include <processthreadsapi.h>
Expand Down
2 changes: 1 addition & 1 deletion dev/Deployment/DeploymentManagerAutoInitializer.cpp
Original file line number Diff line number Diff line change
@@ -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 <Windows.h>
#include <windows.h>
#include <stdlib.h>

#include <winrt/Windows.Foundation.h>
Expand Down
2 changes: 1 addition & 1 deletion dev/DeploymentAgent/pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

#pragma once
#include <Windows.h>
#include <windows.h>
#include <filesystem>
#include <shellapi.h>
#include <wil/cppwinrt.h>
Expand Down
2 changes: 1 addition & 1 deletion dev/DynamicDependency/API/pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#pragma once

#include <Windows.h>
#include <windows.h>

#include <appmodel.h>
#include <shlwapi.h>
Expand Down
8 changes: 4 additions & 4 deletions dev/MRTCore/mrt/Core/src/MRM.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License.

#include <Windows.h>
#include <windows.h>
#include <Pathcch.h>
#include "wil/win32_helpers.h"
#include "wil/filesystem.h"
Expand Down Expand Up @@ -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')
{
Expand Down Expand Up @@ -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')
{
Expand Down
4 changes: 2 additions & 2 deletions dev/MRTCore/mrt/Core/unittests/MrmTests.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License.

#include <Windows.h>
#include <windows.h>
#include <WexTestClass.h>
#include "..\src\MRM.h"

Expand Down Expand Up @@ -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()));
Expand Down
2 changes: 1 addition & 1 deletion dev/PackageManager/API/pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#pragma once

#include <Windows.h>
#include <windows.h>

#include <unknwn.h>
#include <appmodel.h>
Expand Down
2 changes: 1 addition & 1 deletion dev/RestartAgent/pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

#pragma once
#include <Windows.h>
#include <windows.h>
#include <shellapi.h>
#include <MddBootstrap.h>
#include <wil/cppwinrt.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License.

#include <Windows.h>
#include <windows.h>
#include <stdlib.h>

// Ensure the including PE file has an import reference to
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License.

#include <Windows.h>
#include <windows.h>
#include <stdint.h>
#include <stdlib.h>
#include <MddBootstrap.h>
Expand Down
2 changes: 1 addition & 1 deletion dev/WindowsAppRuntime_DLL/pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

#pragma once
#include <Windows.h>
#include <windows.h>
#include <assert.h>
#include <unknwn.h>
#include <ShlObj_core.h>
Expand Down
2 changes: 1 addition & 1 deletion test/AccessControlTests/pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define PCH_H

#include <unknwn.h>
#include <Windows.h>
#include <windows.h>
#include <sddl.h>

#include <wil/result.h>
Expand Down
Loading