maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Explicitly specify the ANSI version of these Win32 APIs. While these are seemingly unrelated changes, they are all NFC because we currently default to the ANSI versions of the APIs when building for Windows. This simply makes the ANSI usage explicit. 

llvm-svn: 273564
This commit is contained in:
Aaron Ballman 2016-06-23 14:45:54 +00:00
parent b06a359beb
commit 0da8b2ec09
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/lib/Support/Windows/Signals.inc
View File

@ -588,9 +588,9 @@ void llvm::sys::RunInterruptHandlers() {
/// \returns a valid HKEY if the location exists, else NULL.
static HKEY FindWERKey(const llvm::Twine &RegistryLocation) {
HKEY Key;
if (ERROR_SUCCESS != ::RegOpenKeyEx(HKEY_LOCAL_MACHINE,
RegistryLocation.str().c_str(), 0,
KEY_QUERY_VALUE | KEY_READ, &Key))
if (ERROR_SUCCESS != ::RegOpenKeyExA(HKEY_LOCAL_MACHINE,
RegistryLocation.str().c_str(), 0,
KEY_QUERY_VALUE | KEY_READ, &Key))
return NULL;
return Key;

10
llvm/lib/Support/Windows/WindowsSupport.h
View File

@ -68,15 +68,15 @@ inline bool RunningWindows8OrGreater() {
Mask) != FALSE;
}
inline bool MakeErrMsg(std::string* ErrMsg, const std::string& prefix) {
inline bool MakeErrMsg(std::string *ErrMsg, const std::string &prefix) {
if (!ErrMsg)
return true;
char *buffer = NULL;
DWORD LastError = GetLastError();
DWORD R = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_MAX_WIDTH_MASK,
NULL, LastError, 0, (LPSTR)&buffer, 1, NULL);
DWORD R = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_MAX_WIDTH_MASK,
NULL, LastError, 0, (LPSTR)&buffer, 1, NULL);
if (R)
*ErrMsg = prefix + ": " + buffer;
else

2
llvm/utils/KillTheDoctor/KillTheDoctor.cpp
View File

@ -337,7 +337,7 @@ int main(int argc, char **argv) {
errs() << ToolName << ": Program Image Path: " << ProgramToRun << '\n'
<< ToolName << ": Command Line: " << CommandLine << '\n';
STARTUPINFO StartupInfo;
STARTUPINFOA StartupInfo;
PROCESS_INFORMATION ProcessInfo;
std::memset(&StartupInfo, 0, sizeof(StartupInfo));
StartupInfo.cb = sizeof(StartupInfo);