lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2025-09-07 11:07:23 +03:00
Code Activity

Move windows console creation to a function

Browse Source
This commit is contained in:
bel
2014-04-18 23:09:02 +02:00
parent de735c5544
commit ca564eab93
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main.c
View File

@@ -134,18 +134,17 @@ static void die(const char *fmt, ...)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#ifdef WIN32
static int MakeConsole();
#endif
static void show_usage_and_exit(void) static void show_usage_and_exit(void)
{ {
const struct mg_option *options; const struct mg_option *options;
int i; int i;
#ifdef WIN32 #ifdef WIN32
if (!AttachConsole(ATTACH_PARENT_PROCESS)) { MakeConsole();
AllocConsole();
AttachConsole(GetCurrentProcessId());
}
freopen("CON", "a", stdout);
freopen("CON", "a", stderr);
#endif #endif
fprintf(stderr, "Civetweb v%s, built on %s\n", fprintf(stderr, "Civetweb v%s, built on %s\n",
@@ -1428,6 +1427,27 @@ static LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wParam,
return DefWindowProc(hWnd, msg, wParam, lParam); return DefWindowProc(hWnd, msg, wParam, lParam);
} }
static int MakeConsole() {
DWORD err;
int ok = (GetConsoleWindow() != NULL);
if (!ok) {
if (!AttachConsole(ATTACH_PARENT_PROCESS)) {
FreeConsole();
if (!AllocConsole()) {
err = GetLastError();
if (err==ERROR_ACCESS_DENIED) {
MessageBox(NULL, "Insufficient rights to create a console window", "Error", MB_ICONERROR);
}
}
AttachConsole(GetCurrentProcessId());
}
freopen("CON", "a", stdout);
freopen("CON", "a", stderr);
ok = (GetConsoleWindow() != NULL);
}
return ok;
}
int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR cmdline, int show) int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR cmdline, int show)
{ {
WNDCLASS cls; WNDCLASS cls;