Skip to content

Revert fuzzer windows changes #83551

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 1, 2024
Merged

Revert fuzzer windows changes #83551

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a07a4f
Revert "[compiler-rt][fuzzer] windows build unbreak proposal. (#83538)"
devnexen Mar 1, 2024
c522d48
Revert "[compiler-rt][Fuzzer] SetThreadName windows implementation ne…
devnexen Mar 1, 2024
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
25 changes: 4 additions & 21 deletions compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,10 @@
#include <signal.h>
#include <stdio.h>
#include <sys/types.h>
// clang-format off
#include <windows.h>
// These must be included after windows.h.
// archicture need to be set before including
// libloaderapi
#include <libloaderapi.h>
#include <stringapiset.h>

// This must be included after windows.h.
#include <psapi.h>
// clang-format on

namespace fuzzer {

Expand Down Expand Up @@ -239,20 +234,8 @@ size_t PageSize() {
}

void SetThreadName(std::thread &thread, const std::string &name) {
typedef HRESULT(WINAPI * proc)(HANDLE, PCWSTR);
HMODULE kbase = GetModuleHandleA("KernelBase.dll");
proc ThreadNameProc =
reinterpret_cast<proc>(GetProcAddress, "SetThreadDescription");
if (proc) {
std::wstring buf;
auto sz = MultiByteToWideChar(CP_UTF8, 0, name.data(), -1, nullptr, 0);
if (sz > 0) {
buf.resize(sz);
if (MultyByteToWideChar(CP_UTF8, 0, name.data(), -1, &buf[0], sz) > 0) {
(void)ThreadNameProc(thread.native_handle(), buf.c_str());
}
}
}
// TODO ?
// to UTF-8 then SetThreadDescription ?
}

} // namespace fuzzer
Expand Down