mirror of
https://github.com/chromium/crashpad.git
synced 2024-12-26 23:01:05 +08:00
Fix line endings on files introduced in 359fc4a1336d
"\r\n" was used instead of "\n" on four new files. No other "\r" appears in any text file, repository-wide. Bug: crashpad:316 Change-Id: I94f5d20cd2498e76efdee6062382669362e6e53d Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/1954713 Reviewed-by: Joshua Peraza <jperaza@chromium.org> Commit-Queue: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Mark Mentovai
Commit Bot
parent
bcab7ad54c
commit
31470459b6
@ -1,52 +1,52 @@
|
||||
// Copyright 2019 The Crashpad Authors. All rights reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "util/win/loader_lock.h"
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
#include "build/build_config.h"
|
||||
#include "util/win/process_structs.h"
|
||||
|
||||
namespace crashpad {
|
||||
|
||||
namespace {
|
||||
|
||||
#ifdef ARCH_CPU_64_BITS
|
||||
using NativeTraits = process_types::internal::Traits64;
|
||||
#else
|
||||
using NativeTraits = process_types::internal::Traits32;
|
||||
#endif // ARCH_CPU_64_BITS
|
||||
|
||||
using PEB = process_types::PEB<NativeTraits>;
|
||||
using TEB = process_types::TEB<NativeTraits>;
|
||||
using RTL_CRITICAL_SECTION = process_types::RTL_CRITICAL_SECTION<NativeTraits>;
|
||||
|
||||
TEB* GetTeb() {
|
||||
return reinterpret_cast<TEB*>(NtCurrentTeb());
|
||||
}
|
||||
|
||||
PEB* GetPeb() {
|
||||
return reinterpret_cast<PEB*>(GetTeb()->ProcessEnvironmentBlock);
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
bool IsThreadInLoaderLock() {
|
||||
RTL_CRITICAL_SECTION* loader_lock =
|
||||
reinterpret_cast<RTL_CRITICAL_SECTION*>(GetPeb()->LoaderLock);
|
||||
return loader_lock->OwningThread == GetTeb()->ClientId.UniqueThread;
|
||||
}
|
||||
|
||||
} // namespace crashpad
|
||||
// Copyright 2019 The Crashpad Authors. All rights reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "util/win/loader_lock.h"
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
#include "build/build_config.h"
|
||||
#include "util/win/process_structs.h"
|
||||
|
||||
namespace crashpad {
|
||||
|
||||
namespace {
|
||||
|
||||
#ifdef ARCH_CPU_64_BITS
|
||||
using NativeTraits = process_types::internal::Traits64;
|
||||
#else
|
||||
using NativeTraits = process_types::internal::Traits32;
|
||||
#endif // ARCH_CPU_64_BITS
|
||||
|
||||
using PEB = process_types::PEB<NativeTraits>;
|
||||
using TEB = process_types::TEB<NativeTraits>;
|
||||
using RTL_CRITICAL_SECTION = process_types::RTL_CRITICAL_SECTION<NativeTraits>;
|
||||
|
||||
TEB* GetTeb() {
|
||||
return reinterpret_cast<TEB*>(NtCurrentTeb());
|
||||
}
|
||||
|
||||
PEB* GetPeb() {
|
||||
return reinterpret_cast<PEB*>(GetTeb()->ProcessEnvironmentBlock);
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
bool IsThreadInLoaderLock() {
|
||||
RTL_CRITICAL_SECTION* loader_lock =
|
||||
reinterpret_cast<RTL_CRITICAL_SECTION*>(GetPeb()->LoaderLock);
|
||||
return loader_lock->OwningThread == GetTeb()->ClientId.UniqueThread;
|
||||
}
|
||||
|
||||
} // namespace crashpad
|
||||
|
||||
@ -1,25 +1,25 @@
|
||||
// Copyright 2019 The Crashpad Authors. All rights reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#ifndef CRASHPAD_UTIL_WIN_LOADER_LOCK_H_
|
||||
#define CRASHPAD_UTIL_WIN_LOADER_LOCK_H_
|
||||
|
||||
namespace crashpad {
|
||||
|
||||
//! \return `true` if the current thread holds the loader lock.
|
||||
bool IsThreadInLoaderLock();
|
||||
|
||||
} // namespace crashpad
|
||||
|
||||
#endif // CRASHPAD_UTIL_WIN_LOADER_LOCK_H_
|
||||
// Copyright 2019 The Crashpad Authors. All rights reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#ifndef CRASHPAD_UTIL_WIN_LOADER_LOCK_H_
|
||||
#define CRASHPAD_UTIL_WIN_LOADER_LOCK_H_
|
||||
|
||||
namespace crashpad {
|
||||
|
||||
//! \return `true` if the current thread holds the loader lock.
|
||||
bool IsThreadInLoaderLock();
|
||||
|
||||
} // namespace crashpad
|
||||
|
||||
#endif // CRASHPAD_UTIL_WIN_LOADER_LOCK_H_
|
||||
|
||||
@ -1,36 +1,36 @@
|
||||
// Copyright 2019 The Crashpad Authors. All rights reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "util/win/loader_lock.h"
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
#include "util/win/get_function.h"
|
||||
|
||||
extern "C" bool LoaderLockDetected();
|
||||
|
||||
namespace crashpad {
|
||||
namespace test {
|
||||
namespace {
|
||||
|
||||
TEST(LoaderLock, Detected) {
|
||||
EXPECT_FALSE(IsThreadInLoaderLock());
|
||||
auto* loader_lock_detected = GET_FUNCTION_REQUIRED(
|
||||
L"crashpad_util_test_loader_lock_test.dll", LoaderLockDetected);
|
||||
EXPECT_TRUE(loader_lock_detected());
|
||||
EXPECT_FALSE(IsThreadInLoaderLock());
|
||||
}
|
||||
|
||||
} // namespace
|
||||
} // namespace test
|
||||
} // namespace crashpad
|
||||
// Copyright 2019 The Crashpad Authors. All rights reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "util/win/loader_lock.h"
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
#include "util/win/get_function.h"
|
||||
|
||||
extern "C" bool LoaderLockDetected();
|
||||
|
||||
namespace crashpad {
|
||||
namespace test {
|
||||
namespace {
|
||||
|
||||
TEST(LoaderLock, Detected) {
|
||||
EXPECT_FALSE(IsThreadInLoaderLock());
|
||||
auto* loader_lock_detected = GET_FUNCTION_REQUIRED(
|
||||
L"crashpad_util_test_loader_lock_test.dll", LoaderLockDetected);
|
||||
EXPECT_TRUE(loader_lock_detected());
|
||||
EXPECT_FALSE(IsThreadInLoaderLock());
|
||||
}
|
||||
|
||||
} // namespace
|
||||
} // namespace test
|
||||
} // namespace crashpad
|
||||
|
||||
@ -1,41 +1,41 @@
|
||||
// Copyright 2019 The Crashpad Authors. All rights reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
#include "util/win/loader_lock.h"
|
||||
|
||||
namespace {
|
||||
|
||||
bool g_loader_lock_detected = false;
|
||||
|
||||
} // namespace
|
||||
|
||||
extern "C" {
|
||||
|
||||
__declspec(dllexport) bool LoaderLockDetected() {
|
||||
return g_loader_lock_detected;
|
||||
}
|
||||
|
||||
} // extern "C"
|
||||
|
||||
BOOL WINAPI DllMain(HINSTANCE, DWORD reason, LPVOID) {
|
||||
switch (reason) {
|
||||
case DLL_PROCESS_ATTACH:
|
||||
g_loader_lock_detected = crashpad::IsThreadInLoaderLock();
|
||||
break;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
// Copyright 2019 The Crashpad Authors. All rights reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
#include "util/win/loader_lock.h"
|
||||
|
||||
namespace {
|
||||
|
||||
bool g_loader_lock_detected = false;
|
||||
|
||||
} // namespace
|
||||
|
||||
extern "C" {
|
||||
|
||||
__declspec(dllexport) bool LoaderLockDetected() {
|
||||
return g_loader_lock_detected;
|
||||
}
|
||||
|
||||
} // extern "C"
|
||||
|
||||
BOOL WINAPI DllMain(HINSTANCE, DWORD reason, LPVOID) {
|
||||
switch (reason) {
|
||||
case DLL_PROCESS_ATTACH:
|
||||
g_loader_lock_detected = crashpad::IsThreadInLoaderLock();
|
||||
break;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user