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

Merge pull request #11493 from akallabeth/warn-log

Browse Source 
Warn log
This commit is contained in:
akallabeth
2025-04-11 10:52:34 +02:00
committed by GitHub
parent 897012052a b24d13a825
commit 58a17876fc
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/rdpdr/client/rdpdr_main.c
View File

@@ -1494,7 +1494,7 @@ static UINT dummy_irp_response(rdpdrPlugin* rdpdr, wStream* s)
const uint32_t FileId = Stream_Get_UINT32(s); /* FileId (4 bytes) */ const uint32_t FileId = Stream_Get_UINT32(s); /* FileId (4 bytes) */
const uint32_t CompletionId = Stream_Get_UINT32(s); /* CompletionId (4 bytes) */ const uint32_t CompletionId = Stream_Get_UINT32(s); /* CompletionId (4 bytes) */
WLog_Print(rdpdr->log, WLOG_ERROR, WLog_Print(rdpdr->log, WLOG_WARN,
"Dummy response {DeviceId=%" PRIu32 ", FileId=%" PRIu32 ", CompletionId=%" PRIu32 "Dummy response {DeviceId=%" PRIu32 ", FileId=%" PRIu32 ", CompletionId=%" PRIu32
"}", "}",
DeviceId, FileId, CompletionId); DeviceId, FileId, CompletionId);
@@ -1521,13 +1521,13 @@ static UINT rdpdr_process_irp(rdpdrPlugin* rdpdr, wStream* s)
if (!irp) if (!irp)
{ {
WLog_Print(rdpdr->log, WLOG_ERROR, "irp_new failed with %" PRIu32 "!", error); if ((error == CHANNEL_RC_OK) ||
(error == ERROR_DEV_NOT_EXIST && rdpdr->ignoreInvalidDevices))
if (error == CHANNEL_RC_OK || (error == ERROR_DEV_NOT_EXIST && rdpdr->ignoreInvalidDevices))
{ {
return dummy_irp_response(rdpdr, s); return dummy_irp_response(rdpdr, s);
} }
WLog_Print(rdpdr->log, WLOG_ERROR, "irp_new failed with %" PRIu32 "!", error);
return error; return error;
} }

12
libfreerdp/core/capabilities.c
View File

@@ -657,17 +657,15 @@ static BOOL rdp_write_order_capability_set(wLog* log, wStream* s, const rdpSetti
{ {
if ((orderSupportExFlags & CACHE_BITMAP_V3_SUPPORT) == 0) if ((orderSupportExFlags & CACHE_BITMAP_V3_SUPPORT) == 0)
{ {
WLog_Print(log, WLOG_ERROR, WLog_Print(log, WLOG_WARN,
"rdpSettings::BitmapCacheV3Enabled=TRUE, but CACHE_BITMAP_V3_SUPPORT not " "rdpSettings::BitmapCacheV3Enabled=TRUE, but CACHE_BITMAP_V3_SUPPORT not "
"set in rdpSettings::OrderSupportEx, aborting."); "set in rdpSettings::OrderSupportEx, aborting.");
return FALSE;
} }
if ((orderFlags & ORDER_FLAGS_EXTRA_SUPPORT) == 0) if ((orderFlags & ORDER_FLAGS_EXTRA_SUPPORT) == 0)
{ {
WLog_Print(log, WLOG_ERROR, WLog_Print(log, WLOG_WARN,
"rdpSettings::BitmapCacheV3Enabled=TRUE, but ORDER_FLAGS_EXTRA_SUPPORT not " "rdpSettings::BitmapCacheV3Enabled=TRUE, but ORDER_FLAGS_EXTRA_SUPPORT not "
"set in rdpSettings::OrderSupport, aborting."); "set in rdpSettings::OrderSupport, aborting.");
return FALSE;
} }
} }
@@ -676,17 +674,15 @@ static BOOL rdp_write_order_capability_set(wLog* log, wStream* s, const rdpSetti
if ((orderSupportExFlags & ALTSEC_FRAME_MARKER_SUPPORT) == 0) if ((orderSupportExFlags & ALTSEC_FRAME_MARKER_SUPPORT) == 0)
{ {
WLog_Print( WLog_Print(
log, WLOG_ERROR, log, WLOG_WARN,
"rdpSettings::FrameMarkerCommandEnabled=TRUE, but " "rdpSettings::FrameMarkerCommandEnabled=TRUE, but "
"ALTSEC_FRAME_MARKER_SUPPORT not set in rdpSettings::OrderSupportEx, aborting."); "ALTSEC_FRAME_MARKER_SUPPORT not set in rdpSettings::OrderSupportEx, aborting.");
return FALSE;
} }
if ((orderFlags & ORDER_FLAGS_EXTRA_SUPPORT) == 0) if ((orderFlags & ORDER_FLAGS_EXTRA_SUPPORT) == 0)
{ {
WLog_Print(log, WLOG_ERROR, WLog_Print(log, WLOG_WARN,
"rdpSettings::FrameMarkerCommandEnabled=TRUE, but ORDER_FLAGS_EXTRA_SUPPORT " "rdpSettings::FrameMarkerCommandEnabled=TRUE, but ORDER_FLAGS_EXTRA_SUPPORT "
"not set in rdpSettings::OrderSupport, aborting."); "not set in rdpSettings::OrderSupport, aborting.");
return FALSE;
} }
} }