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

[includes] untangled circular includes

Browse Source
This commit is contained in:
akallabeth
2023-03-14 10:39:18 +01:00
committed by akallabeth
parent 61779694ee
commit a5b42f0f84
98 changed files with 225 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
include/freerdp/freerdp.h
View File

@@ -22,49 +22,42 @@
#ifndef FREERDP_H
#define FREERDP_H
#include <winpr/stream.h>
#include <freerdp/api.h>
#include <freerdp/types.h>
#include <freerdp/error.h>
#include <freerdp/event.h>
#include <freerdp/settings.h>
#include <freerdp/gdi/gdi.h>
#include <freerdp/codecs.h>
#include <freerdp/metrics.h>
#include <freerdp/settings.h>
#include <freerdp/extension.h>
#include <winpr/stream.h>
#include <freerdp/input.h>
#include <freerdp/update.h>
#include <freerdp/heartbeat.h>
#include <freerdp/message.h>
#include <freerdp/autodetect.h>
#include <freerdp/heartbeat.h>
#include <freerdp/streamdump.h>
#ifdef __cplusplus
extern "C"
{
#endif
typedef struct stream_dump_context rdpStreamDumpContext;
typedef struct SmartcardCertInfo_st SmartcardCertInfo;
typedef struct rdp_rdp rdpRdp;
typedef struct rdp_gdi rdpGdi;
typedef struct rdp_rail rdpRail;
typedef struct rdp_cache rdpCache;
typedef struct rdp_channels rdpChannels;
typedef struct rdp_graphics rdpGraphics;
typedef struct rdp_metrics rdpMetrics;
typedef struct rdp_codecs rdpCodecs;
typedef struct rdp_transport rdpTransport; /* Opaque */
typedef struct rdp_freerdp freerdp;
typedef struct rdp_context rdpContext;
typedef struct rdp_freerdp_peer freerdp_peer;
typedef struct rdp_client_context rdpClientContext;
typedef struct rdp_client_entry_points_v1 RDP_CLIENT_ENTRY_POINTS_V1;
typedef RDP_CLIENT_ENTRY_POINTS_V1 RDP_CLIENT_ENTRY_POINTS;
#include <freerdp/utils/smartcardlogon.h>
#include <freerdp/update.h>
#include <freerdp/input.h>
#include <freerdp/graphics.h>
#define MCS_BASE_CHANNEL_ID 1001
#define MCS_GLOBAL_CHANNEL_ID 1003
@@ -78,41 +71,6 @@ extern "C"
#define VERIFY_CERT_FLAG_MATCH_LEGACY_SHA1 0x100
#define VERIFY_CERT_FLAG_FP_IS_PEM 0x200
typedef enum
{
CONNECTION_STATE_INITIAL,
CONNECTION_STATE_NEGO,
CONNECTION_STATE_NLA,
CONNECTION_STATE_AAD,
CONNECTION_STATE_MCS_CREATE_REQUEST,
CONNECTION_STATE_MCS_CREATE_RESPONSE,
CONNECTION_STATE_MCS_ERECT_DOMAIN,
CONNECTION_STATE_MCS_ATTACH_USER,
CONNECTION_STATE_MCS_ATTACH_USER_CONFIRM,
CONNECTION_STATE_MCS_CHANNEL_JOIN_REQUEST,
CONNECTION_STATE_MCS_CHANNEL_JOIN_RESPONSE,
CONNECTION_STATE_RDP_SECURITY_COMMENCEMENT,
CONNECTION_STATE_SECURE_SETTINGS_EXCHANGE,
CONNECTION_STATE_CONNECT_TIME_AUTO_DETECT_REQUEST,
CONNECTION_STATE_CONNECT_TIME_AUTO_DETECT_RESPONSE,
CONNECTION_STATE_LICENSING,
CONNECTION_STATE_MULTITRANSPORT_BOOTSTRAPPING_REQUEST,
CONNECTION_STATE_MULTITRANSPORT_BOOTSTRAPPING_RESPONSE,
CONNECTION_STATE_CAPABILITIES_EXCHANGE_DEMAND_ACTIVE,
CONNECTION_STATE_CAPABILITIES_EXCHANGE_MONITOR_LAYOUT,
CONNECTION_STATE_CAPABILITIES_EXCHANGE_CONFIRM_ACTIVE,
CONNECTION_STATE_FINALIZATION_SYNC,
CONNECTION_STATE_FINALIZATION_COOPERATE,
CONNECTION_STATE_FINALIZATION_REQUEST_CONTROL,
CONNECTION_STATE_FINALIZATION_PERSISTENT_KEY_LIST,
CONNECTION_STATE_FINALIZATION_FONT_LIST,
CONNECTION_STATE_FINALIZATION_CLIENT_SYNC,
CONNECTION_STATE_FINALIZATION_CLIENT_COOPERATE,
CONNECTION_STATE_FINALIZATION_CLIENT_GRANTED_CONTROL,
CONNECTION_STATE_FINALIZATION_CLIENT_FONT_MAP,
CONNECTION_STATE_ACTIVE
} CONNECTION_STATE;
/* Message types used by gateway messaging callback */
#define GATEWAY_MESSAGE_CONSENT 1
#define GATEWAY_MESSAGE_SERVICE 2
@@ -136,7 +94,7 @@ extern "C"
/** \brief Authentication callback function pointer definition
*
* \param freerdp A pointer to the instance to work on
* \param instance A pointer to the instance to work on
* \param username A pointer to the username string. On input the current username, on output
* the username that should be used. Must not be NULL. \param password A pointer to the password
* string. On input the current password, on output the password that sohould be used. Must not
@@ -152,7 +110,7 @@ extern "C"
/** \brief Extended authentication callback function pointer definition
*
* \param freerdp A pointer to the instance to work on
* \param instance A pointer to the instance to work on
* \param username A pointer to the username string. On input the current username, on output
* the username that should be used. Must not be NULL. \param password A pointer to the password
* string. On input the current password, on output the password that sohould be used. Must not