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

Merge pull request #5634 from akallabeth/error_code_update

Browse Source 
Added missing error codes.
This commit is contained in:
Martin Fleisz 2019-10-03 08:45:44 +02:00 committed by GitHub
commit 9a33a82fb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/printer/client/printer_main.c
View File

@ -885,7 +885,7 @@ static UINT printer_register(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints,
if (!printer_dev->device.data)
goto error_out;
sprintf_s(printer_dev->port, sizeof(printer_dev->port), "PRN%d", printer->id);
sprintf_s(printer_dev->port, sizeof(printer_dev->port), "PRN%"PRIdz, printer->id);
printer_dev->device.type = RDPDR_DTYP_PRINT;
printer_dev->device.name = printer_dev->port;
printer_dev->device.IRPRequest = printer_irp_request;

13
include/freerdp/error.h
View File

@ -44,6 +44,12 @@ extern "C" {
#define ERRINFO_SERVER_FRESH_CREDENTIALS_REQUIRED 0x0000000A
#define ERRINFO_RPC_INITIATED_DISCONNECT_BY_USER 0x0000000B
#define ERRINFO_LOGOFF_BY_USER 0x0000000C
#define ERRINFO_CLOSE_STACK_ON_DRIVER_NOT_READY 0x0000000F
#define ERRINFO_SERVER_DWM_CRASH 0x00000010
#define ERRINFO_CLOSE_STACK_ON_DRIVER_FAILURE 0x00000011
#define ERRINFO_CLOSE_STACK_ON_DRIVER_IFACE_FAILURE 0x00000012
#define ERRINFO_SERVER_WINLOGON_CRASH 0x00000017
#define ERRINFO_SERVER_CSRSS_CRASH 0x00000018
/* Protocol-independent licensing codes */
#define ERRINFO_LICENSE_INTERNAL 0x00000100
@ -228,6 +234,13 @@ FREERDP_API const char* freerdp_get_error_base_name(UINT32 code);
#define FREERDP_ERROR_RPC_INITIATED_DISCONNECT_BY_USER MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_RPC_INITIATED_DISCONNECT_BY_USER)
#define FREERDP_ERROR_LOGOFF_BY_USER MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_LOGOFF_BY_USER)
#define FREERDP_ERROR_CLOSE_STACK_ON_DRIVER_NOT_READY MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_CLOSE_STACK_ON_DRIVER_NOT_READY)
#define FREERDP_ERROR_SERVER_DWM_CRASH MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_SERVER_DWM_CRASH)
#define FREERDP_ERROR_CLOSE_STACK_ON_DRIVER_FAILURE MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_CLOSE_STACK_ON_DRIVER_FAILURE)
#define FREERDP_ERROR_CLOSE_STACK_ON_DRIVER_IFACE_FAILURE MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_CLOSE_STACK_ON_DRIVER_IFACE_FAILURE)
#define FREERDP_ERROR_SERVER_WINLOGON_CRASH MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_SERVER_WINLOGON_CRASH)
#define FREERDP_ERROR_SERVER_CSRSS_CRASH MAKE_FREERDP_ERROR(ERRINFO, ERRINFO_SERVER_CSRSS_CRASH)
/* Connection Error Codes */
#define ERRCONNECT_PRE_CONNECT_FAILED 0x00000001
#define ERRCONNECT_CONNECT_UNDEFINED 0x00000002

25
libfreerdp/core/errinfo.c
View File

@ -68,6 +68,25 @@ int connectErrorCode;
#define ERRINFO_LOGOFF_BY_USER_STRING \
"The disconnection was initiated by the user logging off their session on the server."
#define ERRINFO_CLOSE_STACK_ON_DRIVER_NOT_READY_STRING \
"The display driver in the remote session did not report any status within the time allotted for startup."
#define ERRINFO_SERVER_DWM_CRASH_STRING \
"The DWM process running in the remote session terminated unexpectedly."
#define ERRINFO_CLOSE_STACK_ON_DRIVER_FAILURE_STRING \
"The display driver in the remote session was unable to complete all the tasks required for startup."
#define ERRINFO_CLOSE_STACK_ON_DRIVER_IFACE_FAILURE_STRING \
"The display driver in the remote session started up successfully, but due to internal failures was not usable by the remoting stack."
#define ERRINFO_SERVER_WINLOGON_CRASH_STRING \
"The Winlogon process running in the remote session terminated unexpectedly."
#define ERRINFO_SERVER_CSRSS_CRASH_STRING \
"The CSRSS process running in the remote session terminated unexpectedly."
/* Protocol-independent codes generated by the Connection Broker */
#define ERRINFO_CB_DESTINATION_NOT_FOUND_STRING \
@ -427,6 +446,12 @@ static const ERRINFO ERRINFO_CODES[] =
ERRINFO_DEFINE(SERVER_FRESH_CREDENTIALS_REQUIRED),
ERRINFO_DEFINE(RPC_INITIATED_DISCONNECT_BY_USER),
ERRINFO_DEFINE(LOGOFF_BY_USER),
ERRINFO_DEFINE(CLOSE_STACK_ON_DRIVER_NOT_READY),
ERRINFO_DEFINE(SERVER_DWM_CRASH),
ERRINFO_DEFINE(CLOSE_STACK_ON_DRIVER_FAILURE),
ERRINFO_DEFINE(CLOSE_STACK_ON_DRIVER_IFACE_FAILURE),
ERRINFO_DEFINE(SERVER_WINLOGON_CRASH),
ERRINFO_DEFINE(SERVER_CSRSS_CRASH),
/* Protocol-independent licensing codes */
ERRINFO_DEFINE(LICENSE_INTERNAL),