AxioDL
/
logvisor
mirror of https://github.com/AxioDL/logvisor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UWP support

This commit is contained in:
Jack Andersen 2017-12-05 17:20:32 -10:00
parent 59741b63b8
commit 408ae926d7
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/logvisor.cpp
View File

@ -82,8 +82,15 @@ void RegisterThreadName(const char* name)
#include <DbgHelp.h> #include <DbgHelp.h>
#pragma comment(lib, "Dbghelp.lib") #pragma comment(lib, "Dbghelp.lib")
#if defined(WINAPI_FAMILY) && WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP
#define WINDOWS_STORE 1
#else
#define WINDOWS_STORE 0
#endif
void logvisorAbort() void logvisorAbort()
{ {
#if !WINDOWS_STORE
unsigned int i; unsigned int i;
void* stack[100]; void* stack[100];
unsigned short frames; unsigned short frames;
@ -122,6 +129,7 @@ void logvisorAbort()
fflush(stderr); fflush(stderr);
free(symbol); free(symbol);
#endif
// If you caught one of the above signals, it is likely you just // If you caught one of the above signals, it is likely you just
// want to quit your program right now. // want to quit your program right now.
signal(SIGABRT, SIG_DFL); signal(SIGABRT, SIG_DFL);
@ -234,9 +242,11 @@ static inline int ConsoleWidth()
{ {
int retval = 80; int retval = 80;
#if _WIN32 #if _WIN32
#if !WINDOWS_STORE
CONSOLE_SCREEN_BUFFER_INFO info; CONSOLE_SCREEN_BUFFER_INFO info;
GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &info); GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &info);
retval = info.dwSize.X - 1; retval = info.dwSize.X - 1;
#endif
#else #else
struct winsize w; struct winsize w;
if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) != -1) if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) != -1)
@ -258,9 +268,11 @@ struct ConsoleLogger : public ILogger
ConsoleLogger() ConsoleLogger()
{ {
#if _WIN32 #if _WIN32
#if !WINDOWS_STORE
const char* conemuANSI = getenv("ConEmuANSI"); const char* conemuANSI = getenv("ConEmuANSI");
if (conemuANSI && !strcmp(conemuANSI, "ON")) if (conemuANSI && !strcmp(conemuANSI, "ON"))
XtermColor = true; XtermColor = true;
#endif
if (!Term) if (!Term)
Term = GetStdHandle(STD_ERROR_HANDLE); Term = GetStdHandle(STD_ERROR_HANDLE);
#else #else
@ -328,6 +340,7 @@ struct ConsoleLogger : public ILogger
else else
{ {
#if _WIN32 #if _WIN32
#if !WINDOWS_STORE
SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_WHITE); SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_WHITE);
fprintf(stderr, "["); fprintf(stderr, "[");
SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_GREEN); SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_GREEN);
@ -367,6 +380,7 @@ struct ConsoleLogger : public ILogger
SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_WHITE); SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_WHITE);
fprintf(stderr, "] "); fprintf(stderr, "] ");
SetConsoleTextAttribute(Term, FOREGROUND_WHITE); SetConsoleTextAttribute(Term, FOREGROUND_WHITE);
#endif
#else #else
fprintf(stderr, "["); fprintf(stderr, "[");
fprintf(stderr, "%5.4f ", tmd); fprintf(stderr, "%5.4f ", tmd);
@ -455,12 +469,14 @@ void RegisterConsoleLogger()
#if _WIN32 #if _WIN32
void CreateWin32Console() void CreateWin32Console()
{ {
#if !WINDOWS_STORE
/* Debug console */ /* Debug console */
AllocConsole(); AllocConsole();
freopen("CONIN$", "r", stdin); freopen("CONIN$", "r", stdin);
freopen("CONOUT$", "w", stdout); freopen("CONOUT$", "w", stdout);
freopen("CONOUT$", "w", stderr); freopen("CONOUT$", "w", stderr);
#endif
} }
#endif #endif