morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

Using wlog for server now.

Browse Source
This commit is contained in:
Armin Novak
2014-09-12 17:38:12 +02:00
parent 7913a57bc5
commit 5b5791c8d7
31 changed files with 1986 additions and 1958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
server/Windows/cli/wfreerdp.c
View File

@@ -32,14 +32,16 @@
#include "wfreerdp.h"
#include <freerdp/log.h>
#define TAG SERVER_TAG("windows")
int IDcount = 0;
BOOL CALLBACK moncb(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData)
{
DEBUG_MSG("%d\t(%d, %d), (%d, %d)\n",
IDcount, lprcMonitor->left, lprcMonitor->top,
lprcMonitor->right, lprcMonitor->bottom);
WLog_DBG(TAG, "%d\t(%d, %d), (%d, %d)",
IDcount, lprcMonitor->left, lprcMonitor->top,
lprcMonitor->right, lprcMonitor->bottom);
IDcount++;
return TRUE;
@@ -67,10 +69,9 @@ int main(int argc, char* argv[])
int height;
int bpp;
int i;
WLog_INFO(TAG, "Detecting screens...");
WLog_INFO(TAG, "ID\tResolution\t\tName (Interface)");
_tprintf(_T("Detecting screens...\n"));
_tprintf(_T("\nID\tResolution\t\tName (Interface)\n\n"));
for (i=0; ; i++)
{
if (get_screen_info(i, name, &width, &height, &bpp) != 0)
@@ -78,8 +79,8 @@ int main(int argc, char* argv[])
if ( (width * height * bpp) == 0 )
continue;
_tprintf(_T("%d\t%dx%dx%d\t"), i, width, height, bpp);
_tprintf(_T("%s\n"), name);
WLog_INFO(TAG, "%d\t%dx%dx%d\t", i, width, height, bpp);
WLog_INFO(TAG, "%s", name);
}
else
{
@@ -92,11 +93,10 @@ int main(int argc, char* argv[])
int vscreen_h;
vscreen_w = GetSystemMetrics(SM_CXVIRTUALSCREEN);
vscreen_h = GetSystemMetrics(SM_CYVIRTUALSCREEN);
DEBUG_MSG("\n");
WLog_INFO(TAG, "");
EnumDisplayMonitors(NULL, NULL, moncb, 0);
IDcount = 0;
DEBUG_MSG("\nVirtual Screen = %dx%d\n", vscreen_w, vscreen_h);
WLog_INFO(TAG, "Virtual Screen = %dx%d", vscreen_w, vscreen_h);
}
return 0;
@@ -108,7 +108,7 @@ int main(int argc, char* argv[])
index++;
if (index == argc)
{
DEBUG_MSG("missing screen id parameter\n");
WLog_INFO(TAG, "missing screen id parameter");
return 0;
}
@@ -130,10 +130,9 @@ int main(int argc, char* argv[])
int height;
int bpp;
int i;
_tprintf(_T("screen id not provided. attempting to detect...\n"));
_tprintf(_T("Detecting screens...\n"));
_tprintf(_T("\nID\tResolution\t\tName (Interface)\n\n"));
WLog_INFO(TAG, "screen id not provided. attempting to detect...");
WLog_INFO(TAG, "Detecting screens...");
WLog_INFO(TAG, "ID\tResolution\t\tName (Interface)");
for (i=0; ; i++)
{
@@ -142,8 +141,8 @@ int main(int argc, char* argv[])
if ( (width * height * bpp) == 0 )
continue;
_tprintf(_T("%d\t%dx%dx%d\t"), i, width, height, bpp);
_tprintf(_T("%s\n"), name);
WLog_INFO(TAG, "%d\t%dx%dx%d\t", i, width, height, bpp);
WLog_INFO(TAG, "%s", name);
set_screen_id(i);
break;
}
@@ -154,14 +153,11 @@ int main(int argc, char* argv[])
}
}
DEBUG_MSG("Starting server\n");
WLog_INFO(TAG, "Starting server");
wfreerdp_server_start(server);
WaitForSingleObject(server->thread, INFINITE);
DEBUG_MSG("Stopping server\n");
WLog_INFO(TAG, "Stopping server");
wfreerdp_server_stop(server);
wfreerdp_server_free(server);