Skip to content

Commit d101e72

Browse files
committed
Change AlignAfterOpenBracket: Align and reformat all files
1 parent 2017f1d commit d101e72

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1720
-1852
lines changed

.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Language: Cpp
33
BasedOnStyle: Microsoft
44

55
AccessModifierOffset: -4
6-
AlignAfterOpenBracket: AlwaysBreak
6+
AlignAfterOpenBracket: Align
77
AlignConsecutiveAssignments: false
88
AlignEscapedNewlines: DontAlign
99
AlignOperands: true

cppwinrt/cmd_reader.h

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,11 @@ namespace cppwinrt
8080
optional
8181
};
8282

83-
inline void add_files_from_xml(
84-
std::set<std::string>& files,
85-
std::string const& sdk_version,
86-
std::filesystem::path const& xml_path,
87-
std::filesystem::path const& sdk_path,
88-
xml_requirement xml_path_requirement)
83+
inline void add_files_from_xml(std::set<std::string>& files,
84+
std::string const& sdk_version,
85+
std::filesystem::path const& xml_path,
86+
std::filesystem::path const& sdk_path,
87+
xml_requirement xml_path_requirement)
8988
{
9089
com_ptr<IStream> stream;
9190

@@ -144,14 +143,13 @@ namespace cppwinrt
144143
{
145144
HKEY key;
146145

147-
if (0 != RegOpenKeyExW(
148-
HKEY_LOCAL_MACHINE,
149-
L"SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots",
150-
0,
151-
// https://task.ms/29349404 - The SDK sometimes stores the 64 bit location into KitsRoot10 which is
152-
// wrong, this breaks 64-bit cppwinrt.exe, so work around this by forcing to use the WoW64 hive.
153-
KEY_READ | KEY_WOW64_32KEY,
154-
&key))
146+
if (0 != RegOpenKeyExW(HKEY_LOCAL_MACHINE,
147+
L"SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots",
148+
0,
149+
// https://task.ms/29349404 - The SDK sometimes stores the 64 bit location into KitsRoot10 which is
150+
// wrong, this breaks 64-bit cppwinrt.exe, so work around this by forcing to use the WoW64 hive.
151+
KEY_READ | KEY_WOW64_32KEY,
152+
&key))
155153
{
156154
throw std::invalid_argument("Could not find the Windows SDK in the registry");
157155
}
@@ -562,11 +560,10 @@ namespace cppwinrt
562560
{
563561
std::filesystem::path response_path{ std::string{ arg } };
564562
std::string extension = response_path.extension().generic_string();
565-
std::transform(
566-
extension.begin(),
567-
extension.end(),
568-
extension.begin(),
569-
[](auto c) { return static_cast<unsigned char>(::tolower(c)); });
563+
std::transform(extension.begin(),
564+
extension.end(),
565+
extension.begin(),
566+
[](auto c) { return static_cast<unsigned char>(::tolower(c)); });
570567

571568
// Check if misuse of @ prefix, so if directory or metadata file instead of response file.
572569
if (is_directory(response_path) || extension == ".winmd")

0 commit comments

Comments
 (0)