mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6321 from akallabeth/extended_order_warn

Browse Source 
Added hint for errors due to missing offscreen-cache
This commit is contained in:
Martin Fleisz 2020-07-06 16:28:40 +02:00 committed by GitHub
commit 1996fde3d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libfreerdp/core/orders.c
View File

@ -184,7 +184,7 @@ static BYTE get_bpp_bmf(UINT32 bpp, BOOL* pValid)
} }
static BOOL check_order_activated(wLog* log, rdpSettings* settings, const char* orderName, static BOOL check_order_activated(wLog* log, rdpSettings* settings, const char* orderName,
BOOL condition) BOOL condition, const char* extendedMessage)
{ {
if (!condition) if (!condition)
{ {
@ -193,6 +193,8 @@ static BOOL check_order_activated(wLog* log, rdpSettings* settings, const char*
WLog_Print(log, WLOG_WARN, WLog_Print(log, WLOG_WARN,
"%s - SERVER BUG: The support for this feature was not announced!", "%s - SERVER BUG: The support for this feature was not announced!",
orderName); orderName);
if (extendedMessage)
WLog_Print(log, WLOG_WARN, "%s", extendedMessage);
return TRUE; return TRUE;
} }
else else
@ -201,6 +203,8 @@ static BOOL check_order_activated(wLog* log, rdpSettings* settings, const char*
"%s - SERVER BUG: The support for this feature was not announced! Use " "%s - SERVER BUG: The support for this feature was not announced! Use "
"/relax-order-checks to ignore", "/relax-order-checks to ignore",
orderName); orderName);
if (extendedMessage)
WLog_Print(log, WLOG_WARN, "%s", extendedMessage);
return FALSE; return FALSE;
} }
} }
@ -211,6 +215,7 @@ static BOOL check_order_activated(wLog* log, rdpSettings* settings, const char*
static BOOL check_alt_order_supported(wLog* log, rdpSettings* settings, BYTE orderType, static BOOL check_alt_order_supported(wLog* log, rdpSettings* settings, BYTE orderType,
const char* orderName) const char* orderName)
{ {
const char* extendedMessage = NULL;
BOOL condition = FALSE; BOOL condition = FALSE;
switch (orderType) switch (orderType)
@ -218,6 +223,7 @@ static BOOL check_alt_order_supported(wLog* log, rdpSettings* settings, BYTE ord
case ORDER_TYPE_CREATE_OFFSCREEN_BITMAP: case ORDER_TYPE_CREATE_OFFSCREEN_BITMAP:
case ORDER_TYPE_SWITCH_SURFACE: case ORDER_TYPE_SWITCH_SURFACE:
condition = settings->OffscreenSupportLevel != 0; condition = settings->OffscreenSupportLevel != 0;
extendedMessage = "Adding +offscreen-cache might mitigate";
break; break;
case ORDER_TYPE_CREATE_NINE_GRID_BITMAP: case ORDER_TYPE_CREATE_NINE_GRID_BITMAP:
@ -253,12 +259,13 @@ static BOOL check_alt_order_supported(wLog* log, rdpSettings* settings, BYTE ord
break; break;
} }
return check_order_activated(log, settings, orderName, condition); return check_order_activated(log, settings, orderName, condition, extendedMessage);
} }
static BOOL check_secondary_order_supported(wLog* log, rdpSettings* settings, BYTE orderType, static BOOL check_secondary_order_supported(wLog* log, rdpSettings* settings, BYTE orderType,
const char* orderName) const char* orderName)
{ {
const char* extendedMessage = NULL;
BOOL condition = FALSE; BOOL condition = FALSE;
switch (orderType) switch (orderType)
@ -266,15 +273,18 @@ static BOOL check_secondary_order_supported(wLog* log, rdpSettings* settings, BY
case ORDER_TYPE_BITMAP_UNCOMPRESSED: case ORDER_TYPE_BITMAP_UNCOMPRESSED:
case ORDER_TYPE_CACHE_BITMAP_COMPRESSED: case ORDER_TYPE_CACHE_BITMAP_COMPRESSED:
condition = settings->BitmapCacheEnabled; condition = settings->BitmapCacheEnabled;
extendedMessage = "Adding +bitmap-cache might mitigate";
break; break;
case ORDER_TYPE_BITMAP_UNCOMPRESSED_V2: case ORDER_TYPE_BITMAP_UNCOMPRESSED_V2:
case ORDER_TYPE_BITMAP_COMPRESSED_V2: case ORDER_TYPE_BITMAP_COMPRESSED_V2:
condition = settings->BitmapCacheEnabled; condition = settings->BitmapCacheEnabled;
extendedMessage = "Adding +bitmap-cache might mitigate";
break; break;
case ORDER_TYPE_BITMAP_COMPRESSED_V3: case ORDER_TYPE_BITMAP_COMPRESSED_V3:
condition = settings->BitmapCacheV3Enabled; condition = settings->BitmapCacheV3Enabled;
extendedMessage = "Adding +bitmap-cache might mitigate";
break; break;
case ORDER_TYPE_CACHE_COLOR_TABLE: case ORDER_TYPE_CACHE_COLOR_TABLE:
@ -309,12 +319,13 @@ static BOOL check_secondary_order_supported(wLog* log, rdpSettings* settings, BY
break; break;
} }
return check_order_activated(log, settings, orderName, condition); return check_order_activated(log, settings, orderName, condition, extendedMessage);
} }
static BOOL check_primary_order_supported(wLog* log, rdpSettings* settings, UINT32 orderType, static BOOL check_primary_order_supported(wLog* log, rdpSettings* settings, UINT32 orderType,
const char* orderName) const char* orderName)
{ {
const char* extendedMessage = NULL;
BOOL condition = FALSE; BOOL condition = FALSE;
switch (orderType) switch (orderType)
@ -412,7 +423,7 @@ static BOOL check_primary_order_supported(wLog* log, rdpSettings* settings, UINT
break; break;
} }
return check_order_activated(log, settings, orderName, condition); return check_order_activated(log, settings, orderName, condition, extendedMessage);
} }
static const char* primary_order_string(UINT32 orderType) static const char* primary_order_string(UINT32 orderType)