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

Unify struct definitions (#7633)

Browse Source 
* Unified enum/struct definitions, fixed include issues

* Fixed mac compilation issues

* Added missing include

* Fixed windows server build warnings

* Fixed VS2010 build issue

* Removed unnecessary library linking

* Fixed ThreadPool WinXP compatibility

* Fixed pr review remarks
This commit is contained in:
akallabeth 2022-02-14 13:59:22 +00:00 committed by GitHub
parent e27a7e834e
commit 8cc6582044
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
334 changed files with 1980 additions and 2635 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/audin/client/alsa/audin_alsa.c
View File

@ -40,7 +40,7 @@
#include "audin_main.h"
typedef struct _AudinALSADevice
typedef struct
{
IAudinDevice iface;

15
channels/audin/client/audin_main.c
View File

@ -51,17 +51,15 @@
#define MSG_SNDIN_DATA 0x06
#define MSG_SNDIN_FORMATCHANGE 0x07
typedef struct _AUDIN_LISTENER_CALLBACK AUDIN_LISTENER_CALLBACK;
struct _AUDIN_LISTENER_CALLBACK
typedef struct
{
IWTSListenerCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
};
} AUDIN_LISTENER_CALLBACK;
typedef struct _AUDIN_CHANNEL_CALLBACK AUDIN_CHANNEL_CALLBACK;
struct _AUDIN_CHANNEL_CALLBACK
typedef struct
{
IWTSVirtualChannelCallback iface;
@ -76,10 +74,9 @@ struct _AUDIN_CHANNEL_CALLBACK
*/
AUDIO_FORMAT* formats;
UINT32 formats_count;
};
} AUDIN_CHANNEL_CALLBACK;
typedef struct _AUDIN_PLUGIN AUDIN_PLUGIN;
struct _AUDIN_PLUGIN
typedef struct
{
IWTSPlugin iface;
@ -105,7 +102,7 @@ struct _AUDIN_PLUGIN
IWTSListener* listener;
BOOL initialized;
};
} AUDIN_PLUGIN;
static BOOL audin_process_addin_args(AUDIN_PLUGIN* audin, const ADDIN_ARGV* args);

12
channels/audin/client/ios/audin_ios.m
View File

@ -53,11 +53,11 @@
#define IOS_AUDIO_QUEUE_NUM_BUFFERS 100
typedef struct _AudinIosDevice
{
IAudinDevice iface;
typedef struct
{
IAudinDevice iface;
AUDIO_FORMAT format;
AUDIO_FORMAT format;
UINT32 FramesPerPacket;
int dev_unit;
@ -70,7 +70,7 @@
AudioQueueRef audioQueue;
AudioStreamBasicDescription audioFormat;
AudioQueueBufferRef audioBuffers[IOS_AUDIO_QUEUE_NUM_BUFFERS];
} AudinIosDevice;
} AudinIosDevice;
static AudioFormatID audin_ios_get_format(const AUDIO_FORMAT *format)
{
@ -338,4 +338,4 @@
error_out:
free(ios);
return error;
}
}

2
channels/audin/client/mac/audin_mac.m
View File

@ -65,7 +65,7 @@ typedef UInt32 AudioFormatID;
typedef UInt32 AudioFormatFlags;
#endif
typedef struct _AudinMacDevice
typedef struct
{
IAudinDevice iface;

2
channels/audin/client/opensles/audin_opensl_es.c
View File

@ -40,7 +40,7 @@
#include "audin_main.h"
#include "opensl_io.h"
typedef struct _AudinOpenSLESDevice
typedef struct
{
IAudinDevice iface;

2
channels/audin/client/oss/audin_oss.c
View File

@ -51,7 +51,7 @@
#include "audin_main.h"
typedef struct _AudinOSSDevice
typedef struct
{
IAudinDevice iface;

2
channels/audin/client/pulse/audin_pulse.c
View File

@ -40,7 +40,7 @@
#include "audin_main.h"
typedef struct _AudinPulseDevice
typedef struct
{
IAudinDevice iface;

2
channels/audin/client/sndio/audin_sndio.c
View File

@ -32,7 +32,7 @@
#include "audin_main.h"
typedef struct _AudinSndioDevice
typedef struct
{
IAudinDevice device;

2
channels/audin/client/winmm/audin_winmm.c
View File

@ -42,7 +42,7 @@
#define WAVE_MAPPED_DEFAULT_COMMUNICATION_DEVICE 0x0010
#endif
typedef struct _AudinWinmmDevice
typedef struct
{
IAudinDevice iface;

2
channels/audin/server/audin.c
View File

@ -49,7 +49,7 @@
#define MSG_SNDIN_DATA 0x06
#define MSG_SNDIN_FORMATCHANGE 0x07
typedef struct _audin_server
typedef struct
{
audin_server_context context;

21
channels/client/tables.h
View File

@ -24,36 +24,33 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
#endif
struct _STATIC_ENTRY
typedef struct
{
const char* name;
UINT (*entry)();
};
typedef struct _STATIC_ENTRY STATIC_ENTRY;
} STATIC_ENTRY;
struct _STATIC_ENTRY_TABLE
typedef struct
{
const char* name;
const STATIC_ENTRY* table;
};
typedef struct _STATIC_ENTRY_TABLE STATIC_ENTRY_TABLE;
} STATIC_ENTRY_TABLE;
struct _STATIC_SUBSYSTEM_ENTRY
typedef struct
{
const char* name;
const char* type;
UINT (*entry)();
};
typedef struct _STATIC_SUBSYSTEM_ENTRY STATIC_SUBSYSTEM_ENTRY;
} STATIC_SUBSYSTEM_ENTRY;
struct _STATIC_ADDIN_TABLE
typedef struct
{
const char* name;
const char* type;
UINT (*entry)();
const STATIC_SUBSYSTEM_ENTRY* table;
};
typedef struct _STATIC_ADDIN_TABLE STATIC_ADDIN_TABLE;
} STATIC_ADDIN_TABLE;
#if defined(__GNUC__)
#pragma GCC diagnostic pop

5
channels/cliprdr/client/cliprdr_main.h
View File

@ -30,7 +30,7 @@
#define TAG CHANNELS_TAG("cliprdr.client")
struct cliprdr_plugin
typedef struct
{
CHANNEL_DEF channelDef;
CHANNEL_ENTRY_POINTS_FREERDP_EX channelEntryPoints;
@ -48,8 +48,7 @@ struct cliprdr_plugin
BOOL fileClipNoFilePaths;
BOOL canLockClipData;
BOOL hasHugeFileSupport;
};
typedef struct cliprdr_plugin cliprdrPlugin;
} cliprdrPlugin;
CliprdrClientContext* cliprdr_get_client_interface(cliprdrPlugin* cliprdr);

5
channels/cliprdr/server/cliprdr_main.h
View File

@ -32,7 +32,7 @@
#define CLIPRDR_HEADER_LENGTH 8
struct _cliprdr_server_private
typedef struct
{
HANDLE vcm;
HANDLE Thread;
@ -42,7 +42,6 @@ struct _cliprdr_server_private
wStream* s;
char* temporaryDirectory;
};
typedef struct _cliprdr_server_private CliprdrServerPrivate;
} CliprdrServerPrivate;
#endif /* FREERDP_CHANNEL_CLIPRDR_SERVER_MAIN_H */

15
channels/disp/client/disp_main.c
View File

@ -42,27 +42,25 @@
#include "disp_main.h"
#include "../disp_common.h"
struct _DISP_CHANNEL_CALLBACK
typedef struct
{
IWTSVirtualChannelCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
IWTSVirtualChannel* channel;
};
typedef struct _DISP_CHANNEL_CALLBACK DISP_CHANNEL_CALLBACK;
} DISP_CHANNEL_CALLBACK;
struct _DISP_LISTENER_CALLBACK
typedef struct
{
IWTSListenerCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
DISP_CHANNEL_CALLBACK* channel_callback;
};
typedef struct _DISP_LISTENER_CALLBACK DISP_LISTENER_CALLBACK;
} DISP_LISTENER_CALLBACK;
struct _DISP_PLUGIN
typedef struct
{
IWTSPlugin iface;
@ -73,8 +71,7 @@ struct _DISP_PLUGIN
UINT32 MaxMonitorAreaFactorA;
UINT32 MaxMonitorAreaFactorB;
BOOL initialized;
};
typedef struct _DISP_PLUGIN DISP_PLUGIN;
} DISP_PLUGIN;
/**
* Function description

2
channels/disp/server/disp_main.h
View File

@ -22,7 +22,7 @@
#include <freerdp/server/disp.h>
struct _disp_server_private
struct s_disp_server_private
{
BOOL isReady;
wStream* input_stream;

25
channels/drdynvc/client/drdynvc_main.h
View File

@ -37,7 +37,7 @@
typedef struct drdynvc_plugin drdynvcPlugin;
struct _DVCMAN
typedef struct
{
IWTSVirtualChannelManager iface;
@ -49,10 +49,9 @@ struct _DVCMAN
wArrayList* listeners;
wArrayList* channels;
wStreamPool* pool;
};
typedef struct _DVCMAN DVCMAN;
} DVCMAN;
struct _DVCMAN_LISTENER
typedef struct
{
IWTSListener iface;
@ -60,20 +59,18 @@ struct _DVCMAN_LISTENER
char* channel_name;
UINT32 flags;
IWTSListenerCallback* listener_callback;
};
typedef struct _DVCMAN_LISTENER DVCMAN_LISTENER;
} DVCMAN_LISTENER;
struct _DVCMAN_ENTRY_POINTS
typedef struct
{
IDRDYNVC_ENTRY_POINTS iface;
DVCMAN* dvcman;
const ADDIN_ARGV* args;
rdpSettings* settings;
};
typedef struct _DVCMAN_ENTRY_POINTS DVCMAN_ENTRY_POINTS;
} DVCMAN_ENTRY_POINTS;
struct _DVCMAN_CHANNEL
typedef struct
{
IWTSVirtualChannel iface;
@ -87,10 +84,9 @@ struct _DVCMAN_CHANNEL
wStream* dvc_data;
UINT32 dvc_data_length;
CRITICAL_SECTION lock;
};
typedef struct _DVCMAN_CHANNEL DVCMAN_CHANNEL;
} DVCMAN_CHANNEL;
enum _DRDYNVC_STATE
typedef enum
{
DRDYNVC_STATE_INITIAL,
DRDYNVC_STATE_CAPABILITIES,
@ -98,8 +94,7 @@ enum _DRDYNVC_STATE
DRDYNVC_STATE_OPENING_CHANNEL,
DRDYNVC_STATE_SEND_RECEIVE,
DRDYNVC_STATE_FINAL
};
typedef enum _DRDYNVC_STATE DRDYNVC_STATE;
} DRDYNVC_STATE;
struct drdynvc_plugin
{

2
channels/drdynvc/server/drdynvc_main.h
View File

@ -27,7 +27,7 @@
#include <freerdp/settings.h>
#include <freerdp/server/drdynvc.h>
struct _drdynvc_server_private
struct s_drdynvc_server_private
{
HANDLE Thread;
HANDLE StopEvent;

6
channels/drive/client/drive_file.h
View File

@ -31,9 +31,7 @@
#define TAG CHANNELS_TAG("drive.client")
typedef struct _DRIVE_FILE DRIVE_FILE;
struct _DRIVE_FILE
typedef struct
{
UINT32 id;
BOOL is_dir;
@ -49,7 +47,7 @@ struct _DRIVE_FILE
UINT32 DesiredAccess;
UINT32 CreateDisposition;
UINT32 CreateOptions;
};
} DRIVE_FILE;
DRIVE_FILE* drive_file_new(const WCHAR* base_path, const WCHAR* path, UINT32 PathLength, UINT32 id,
UINT32 DesiredAccess, UINT32 CreateDisposition, UINT32 CreateOptions,

6
channels/drive/client/drive_main.c
View File

@ -47,9 +47,7 @@
#include "drive_file.h"
typedef struct _DRIVE_DEVICE DRIVE_DEVICE;
struct _DRIVE_DEVICE
typedef struct
{
DEVICE device;
@ -64,7 +62,7 @@ struct _DRIVE_DEVICE
DEVMAN* devman;
rdpContext* rdpcontext;
};
} DRIVE_DEVICE;
static UINT sys_code_page = 0;

15
channels/echo/client/echo_main.c
View File

@ -35,34 +35,31 @@
#define TAG CHANNELS_TAG("echo.client")
typedef struct _ECHO_LISTENER_CALLBACK ECHO_LISTENER_CALLBACK;
struct _ECHO_LISTENER_CALLBACK
typedef struct
{
IWTSListenerCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
};
} ECHO_LISTENER_CALLBACK;
typedef struct _ECHO_CHANNEL_CALLBACK ECHO_CHANNEL_CALLBACK;
struct _ECHO_CHANNEL_CALLBACK
typedef struct
{
IWTSVirtualChannelCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
IWTSVirtualChannel* channel;
};
} ECHO_CHANNEL_CALLBACK;
typedef struct _ECHO_PLUGIN ECHO_PLUGIN;
struct _ECHO_PLUGIN
typedef struct
{
IWTSPlugin iface;
ECHO_LISTENER_CALLBACK* listener_callback;
IWTSListener* listener;
BOOL initialized;
};
} ECHO_PLUGIN;
/**
* Function description

2
channels/echo/server/echo_main.c
View File

@ -39,7 +39,7 @@
#define TAG CHANNELS_TAG("echo.server")
typedef struct _echo_server
typedef struct
{
echo_server_context context;

2
channels/encomsp/server/encomsp_main.h
View File

@ -26,7 +26,7 @@
#include <freerdp/server/encomsp.h>
struct _encomsp_server_private
struct s_encomsp_server_private
{
HANDLE Thread;
HANDLE StopEvent;

15
channels/geometry/client/geometry_main.c
View File

@ -40,27 +40,25 @@
#include "geometry_main.h"
struct _GEOMETRY_CHANNEL_CALLBACK
typedef struct
{
IWTSVirtualChannelCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
IWTSVirtualChannel* channel;
};
typedef struct _GEOMETRY_CHANNEL_CALLBACK GEOMETRY_CHANNEL_CALLBACK;
} GEOMETRY_CHANNEL_CALLBACK;
struct _GEOMETRY_LISTENER_CALLBACK
typedef struct
{
IWTSListenerCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
GEOMETRY_CHANNEL_CALLBACK* channel_callback;
};
typedef struct _GEOMETRY_LISTENER_CALLBACK GEOMETRY_LISTENER_CALLBACK;
} GEOMETRY_LISTENER_CALLBACK;
struct _GEOMETRY_PLUGIN
typedef struct
{
IWTSPlugin iface;
@ -69,8 +67,7 @@ struct _GEOMETRY_PLUGIN
GeometryClientContext* context;
BOOL initialized;
};
typedef struct _GEOMETRY_PLUGIN GEOMETRY_PLUGIN;
} GEOMETRY_PLUGIN;
static UINT32 mappedGeometryHash(const void* v)
{

2
channels/gfxredir/server/gfxredir_main.h
View File

@ -22,7 +22,7 @@
#include <freerdp/server/gfxredir.h>
struct _gfxredir_server_private
struct s_gfxredir_server_private
{
BOOL isReady;
wStream* input_stream;

5
channels/parallel/client/parallel_main.c
View File

@ -61,7 +61,7 @@
#define TAG CHANNELS_TAG("drive.client")
struct _PARALLEL_DEVICE
typedef struct
{
DEVICE device;
@ -72,8 +72,7 @@ struct _PARALLEL_DEVICE
HANDLE thread;
wMessageQueue* queue;
rdpContext* rdpcontext;
};
typedef struct _PARALLEL_DEVICE PARALLEL_DEVICE;
} PARALLEL_DEVICE;
/**
* Function description

26
channels/printer/client/cups/printer_cups.c
View File

@ -40,32 +40,28 @@
#include <freerdp/client/printer.h>
typedef struct rdp_cups_printer_driver rdpCupsPrinterDriver;
typedef struct rdp_cups_printer rdpCupsPrinter;
typedef struct rdp_cups_print_job rdpCupsPrintJob;
struct rdp_cups_printer_driver
typedef struct
{
rdpPrinterDriver driver;
int id_sequence;
size_t references;
};
} rdpCupsPrinterDriver;
struct rdp_cups_printer
{
rdpPrinter printer;
rdpCupsPrintJob* printjob;
};
struct rdp_cups_print_job
typedef struct
{
rdpPrintJob printjob;
void* printjob_object;
int printjob_id;
};
} rdpCupsPrintJob;
typedef struct
{
rdpPrinter printer;
rdpCupsPrintJob* printjob;
} rdpCupsPrinter;
static void printer_cups_get_printjob_name(char* buf, size_t size, size_t id)
{

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

@ -48,8 +48,7 @@
#define TAG CHANNELS_TAG("printer.client")
typedef struct _PRINTER_DEVICE PRINTER_DEVICE;
struct _PRINTER_DEVICE
typedef struct
{
DEVICE device;
@ -63,7 +62,7 @@ struct _PRINTER_DEVICE
HANDLE thread;
rdpContext* rdpcontext;
char port[64];
};
} PRINTER_DEVICE;
typedef enum
{

26
channels/printer/client/win/printer_win.c
View File

@ -48,26 +48,15 @@
} while (0)
#endif
typedef struct rdp_win_printer_driver rdpWinPrinterDriver;
typedef struct rdp_win_printer rdpWinPrinter;
typedef struct rdp_win_print_job rdpWinPrintJob;
struct rdp_win_printer_driver
typedef struct
{
rdpPrinterDriver driver;
size_t id_sequence;
size_t references;
};
} rdpWinPrinterDriver;
struct rdp_win_printer
{
rdpPrinter printer;
HANDLE hPrinter;
rdpWinPrintJob* printjob;
};
struct rdp_win_print_job
typedef struct
{
rdpPrintJob printjob;
DOC_INFO_1 di;
@ -75,7 +64,14 @@ struct rdp_win_print_job
void* printjob_object;
int printjob_id;
};
} rdpWinPrintJob;
typedef struct
{
rdpPrinter printer;
HANDLE hPrinter;
rdpWinPrintJob* printjob;
} rdpWinPrinter;
static WCHAR* printer_win_get_printjob_name(size_t id)
{

5
channels/rail/client/rail_main.h
View File

@ -36,7 +36,7 @@
#include "../rail_common.h"
struct rail_plugin
typedef struct
{
CHANNEL_DEF channelDef;
CHANNEL_ENTRY_POINTS_FREERDP_EX channelEntryPoints;
@ -52,8 +52,7 @@ struct rail_plugin
DWORD channelFlags;
RAIL_CLIENT_STATUS_ORDER clientStatus;
BOOL sendHandshake;
};
typedef struct rail_plugin railPlugin;
} railPlugin;
RailClientContext* rail_get_client_interface(railPlugin* rail);
UINT rail_send_channel_data(railPlugin* rail, wStream* s);

2
channels/rail/server/rail_main.h
View File

@ -29,7 +29,7 @@
#include "../rail_common.h"
struct _rail_server_private
struct s_rail_server_private
{
HANDLE thread;
HANDLE stopEvent;

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

@ -72,14 +72,13 @@
#include "rdpdr_main.h"
typedef struct _DEVICE_DRIVE_EXT DEVICE_DRIVE_EXT;
/* IMPORTANT: Keep in sync with DRIVE_DEVICE */
struct _DEVICE_DRIVE_EXT
typedef struct
{
DEVICE device;
WCHAR* path;
BOOL automount;
};
} DEVICE_DRIVE_EXT;
static const char* rdpdr_device_type_string(UINT32 type)
{
@ -426,7 +425,7 @@ static UINT drive_hotplug_thread_terminate(rdpdrPlugin* rdpdr)
#define MAX_USB_DEVICES 100
typedef struct _hotplug_dev
typedef struct
{
char* path;
BOOL to_add;
@ -695,7 +694,7 @@ static BOOL isAutomountLocation(const char* path)
#define MAX_USB_DEVICES 100
typedef struct _hotplug_dev
typedef struct
{
char* path;
BOOL to_add;

6
channels/rdpdr/client/rdpdr_main.h
View File

@ -44,9 +44,7 @@
#define TAG CHANNELS_TAG("rdpdr.client")
typedef struct rdpdr_plugin rdpdrPlugin;
struct rdpdr_plugin
typedef struct
{
CHANNEL_DEF channelDef;
CHANNEL_ENTRY_POINTS_FREERDP_EX channelEntryPoints;
@ -78,7 +76,7 @@ struct rdpdr_plugin
HANDLE stopEvent;
#endif
rdpContext* rdpcontext;
};
} rdpdrPlugin;
UINT rdpdr_send(rdpdrPlugin* rdpdr, wStream* s);

19
channels/rdpdr/server/rdpdr_main.h
View File

@ -31,7 +31,7 @@
#include <freerdp/settings.h>
#include <freerdp/server/rdpdr.h>
struct _rdpdr_server_private
struct s_rdpdr_server_private
{
HANDLE Thread;
HANDLE StopEvent;
@ -50,24 +50,22 @@ struct _rdpdr_server_private
#define RDPDR_HEADER_LENGTH 4
struct _RDPDR_HEADER
typedef struct
{
UINT16 Component;
UINT16 PacketId;
};
typedef struct _RDPDR_HEADER RDPDR_HEADER;
} RDPDR_HEADER;
#define RDPDR_CAPABILITY_HEADER_LENGTH 8
struct _RDPDR_CAPABILITY_HEADER
typedef struct
{
UINT16 CapabilityType;
UINT16 CapabilityLength;
UINT32 Version;
};
typedef struct _RDPDR_CAPABILITY_HEADER RDPDR_CAPABILITY_HEADER;
} RDPDR_CAPABILITY_HEADER;
struct _RDPDR_IRP
typedef struct S_RDPDR_IRP
{
UINT32 CompletionId;
UINT32 DeviceId;
@ -76,9 +74,8 @@ struct _RDPDR_IRP
char ExtraBuffer[256];
void* CallbackData;
UINT(*Callback)
(RdpdrServerContext* context, wStream* s, struct _RDPDR_IRP* irp, UINT32 deviceId,
(RdpdrServerContext* context, wStream* s, struct S_RDPDR_IRP* irp, UINT32 deviceId,
UINT32 completionId, UINT32 ioStatus);
};
typedef struct _RDPDR_IRP RDPDR_IRP;
} RDPDR_IRP;
#endif /* FREERDP_CHANNEL_RDPDR_SERVER_MAIN_H */

15
channels/rdpei/client/rdpei_main.c
View File

@ -65,27 +65,25 @@
#define MAX_CONTACTS 64
#define MAX_PEN_CONTACTS 4
struct _RDPEI_CHANNEL_CALLBACK
typedef struct
{
IWTSVirtualChannelCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
IWTSVirtualChannel* channel;
};
typedef struct _RDPEI_CHANNEL_CALLBACK RDPEI_CHANNEL_CALLBACK;
} RDPEI_CHANNEL_CALLBACK;
struct _RDPEI_LISTENER_CALLBACK
typedef struct
{
IWTSListenerCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
RDPEI_CHANNEL_CALLBACK* channel_callback;
};
typedef struct _RDPEI_LISTENER_CALLBACK RDPEI_LISTENER_CALLBACK;
} RDPEI_LISTENER_CALLBACK;
struct _RDPEI_PLUGIN
typedef struct
{
IWTSPlugin iface;
@ -111,8 +109,7 @@ struct _RDPEI_PLUGIN
BOOL initialized;
HANDLE thread;
HANDLE event;
};
typedef struct _RDPEI_PLUGIN RDPEI_PLUGIN;
} RDPEI_PLUGIN;
/**
* Function description

10
channels/rdpei/client/rdpei_main.h
View File

@ -62,24 +62,22 @@
*
*/
struct _RDPINPUT_CONTACT_POINT
typedef struct
{
BOOL dirty;
BOOL active;
UINT32 contactId;
INT32 externalId;
RDPINPUT_CONTACT_DATA data;
};
typedef struct _RDPINPUT_CONTACT_POINT RDPINPUT_CONTACT_POINT;
} RDPINPUT_CONTACT_POINT;
struct _RDPINPUT_PEN_CONTACT_POINT
typedef struct
{
BOOL dirty;
BOOL active;
INT32 externalId;
RDPINPUT_PEN_CONTACT data;
};
typedef struct _RDPINPUT_PEN_CONTACT_POINT RDPINPUT_PEN_CONTACT_POINT;
} RDPINPUT_PEN_CONTACT_POINT;
#ifdef WITH_DEBUG_DVC
#define DEBUG_DVC(...) WLog_DBG(TAG, __VA_ARGS__)

2
channels/rdpei/server/rdpei_main.c
View File

@ -42,7 +42,7 @@ enum RdpEiState
STATE_SUSPENDED,
};
struct _rdpei_server_private
struct s_rdpei_server_private
{
HANDLE channelHandle;
HANDLE eventHandle;

15
channels/rdpgfx/client/rdpgfx_main.h
View File

@ -32,27 +32,25 @@
#include <freerdp/codec/zgfx.h>
#include <freerdp/freerdp.h>
struct _RDPGFX_CHANNEL_CALLBACK
typedef struct
{
IWTSVirtualChannelCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
IWTSVirtualChannel* channel;
};
typedef struct _RDPGFX_CHANNEL_CALLBACK RDPGFX_CHANNEL_CALLBACK;
} RDPGFX_CHANNEL_CALLBACK;
struct _RDPGFX_LISTENER_CALLBACK
typedef struct
{
IWTSListenerCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
RDPGFX_CHANNEL_CALLBACK* channel_callback;
};
typedef struct _RDPGFX_LISTENER_CALLBACK RDPGFX_LISTENER_CALLBACK;
} RDPGFX_LISTENER_CALLBACK;
struct _RDPGFX_PLUGIN
typedef struct
{
IWTSPlugin iface;
@ -86,7 +84,6 @@ struct _RDPGFX_PLUGIN
RDPGFX_CAPSET ConnectionCaps;
BOOL SendQoeAck;
BOOL initialized;
};
typedef struct _RDPGFX_PLUGIN RDPGFX_PLUGIN;
} RDPGFX_PLUGIN;
#endif /* FREERDP_CHANNEL_RDPGFX_CLIENT_MAIN_H */

2
channels/rdpgfx/server/rdpgfx_main.h
View File

@ -23,7 +23,7 @@
#include <freerdp/server/rdpgfx.h>
#include <freerdp/codec/zgfx.h>
struct _rdpgfx_server_private
struct s_rdpgfx_server_private
{
ZGFX_CONTEXT* zgfx;
BOOL ownThread;

6
channels/rdpsnd/client/alsa/rdpsnd_alsa.c
View File

@ -41,9 +41,7 @@
#include "rdpsnd_main.h"
typedef struct rdpsnd_alsa_plugin rdpsndAlsaPlugin;
struct rdpsnd_alsa_plugin
typedef struct
{
rdpsndDevicePlugin device;
@ -59,7 +57,7 @@ struct rdpsnd_alsa_plugin
snd_pcm_uframes_t buffer_size;
snd_pcm_uframes_t period_size;
};
} rdpsndAlsaPlugin;
#define SND_PCM_CHECK(_func, _status) \
do \

6
channels/rdpsnd/client/fake/rdpsnd_fake.c
View File

@ -34,12 +34,10 @@
#include "rdpsnd_main.h"
typedef struct rdpsnd_fake_plugin rdpsndFakePlugin;
struct rdpsnd_fake_plugin
typedef struct
{
rdpsndDevicePlugin device;
};
} rdpsndFakePlugin;
static BOOL rdpsnd_fake_open(rdpsndDevicePlugin* device, const AUDIO_FORMAT* format, UINT32 latency)
{

2
channels/rdpsnd/client/ios/rdpsnd_ios.c
View File

@ -36,7 +36,7 @@
#define INPUT_BUFFER_SIZE 32768
#define CIRCULAR_BUFFER_SIZE (INPUT_BUFFER_SIZE * 4)
typedef struct rdpsnd_ios_plugin
typedef struct
{
rdpsndDevicePlugin device;
AudioComponentInstance audio_unit;

5
channels/rdpsnd/client/mac/rdpsnd_mac.m
View File

@ -39,7 +39,7 @@
#include "rdpsnd_main.h"
struct rdpsnd_mac_plugin
typedef struct
{
rdpsndDevicePlugin device;
@ -52,8 +52,7 @@ struct rdpsnd_mac_plugin
AVAudioEngine *engine;
AVAudioPlayerNode *player;
UINT64 diff;
};
typedef struct rdpsnd_mac_plugin rdpsndMacPlugin;
} rdpsndMacPlugin;
static BOOL rdpsnd_mac_set_format(rdpsndDevicePlugin *device, const AUDIO_FORMAT *format,
UINT32 latency)

2
channels/rdpsnd/client/opensles/opensl_io.h
View File

@ -42,7 +42,7 @@ extern "C"
{
#endif
typedef struct opensl_stream
typedef struct
{
// engine interfaces
SLObjectItf engineObject;

6
channels/rdpsnd/client/opensles/rdpsnd_opensles.c
View File

@ -41,9 +41,7 @@
#include "opensl_io.h"
#include "rdpsnd_main.h"
typedef struct rdpsnd_opensles_plugin rdpsndopenslesPlugin;
struct rdpsnd_opensles_plugin
typedef struct
{
rdpsndDevicePlugin device;
@ -59,7 +57,7 @@ struct rdpsnd_opensles_plugin
UINT32 rate;
UINT32 channels;
int format;
};
} rdpsndopenslesPlugin;
static int rdpsnd_opensles_volume_to_millibel(unsigned short level, int max)
{

6
channels/rdpsnd/client/oss/rdpsnd_oss.c
View File

@ -51,9 +51,7 @@
#include "rdpsnd_main.h"
typedef struct rdpsnd_oss_plugin rdpsndOssPlugin;
struct rdpsnd_oss_plugin
typedef struct
{
rdpsndDevicePlugin device;
@ -65,7 +63,7 @@ struct rdpsnd_oss_plugin
UINT32 latency;
AUDIO_FORMAT format;
};
} rdpsndOssPlugin;
#define OSS_LOG_ERR(_text, _error) \
do \

6
channels/rdpsnd/client/pulse/rdpsnd_pulse.c
View File

@ -38,9 +38,7 @@
#include "rdpsnd_main.h"
typedef struct rdpsnd_pulse_plugin rdpsndPulsePlugin;
struct rdpsnd_pulse_plugin
typedef struct
{
rdpsndDevicePlugin device;
@ -51,7 +49,7 @@ struct rdpsnd_pulse_plugin
pa_stream* stream;
UINT32 latency;
UINT32 volume;
};
} rdpsndPulsePlugin;
static BOOL rdpsnd_pulse_format_supported(rdpsndDevicePlugin* device, const AUDIO_FORMAT* format);

10
channels/rdpsnd/client/rdpsnd_main.c
View File

@ -51,25 +51,23 @@
#include "rdpsnd_common.h"
#include "rdpsnd_main.h"
struct _RDPSND_CHANNEL_CALLBACK
typedef struct
{
IWTSVirtualChannelCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
IWTSVirtualChannel* channel;
};
typedef struct _RDPSND_CHANNEL_CALLBACK RDPSND_CHANNEL_CALLBACK;
} RDPSND_CHANNEL_CALLBACK;
struct _RDPSND_LISTENER_CALLBACK
typedef struct
{
IWTSListenerCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
RDPSND_CHANNEL_CALLBACK* channel_callback;
};
typedef struct _RDPSND_LISTENER_CALLBACK RDPSND_LISTENER_CALLBACK;
} RDPSND_LISTENER_CALLBACK;
struct rdpsnd_plugin
{

6
channels/rdpsnd/client/sndio/rdpsnd_sndio.c
View File

@ -36,15 +36,13 @@
#include "rdpsnd_main.h"
typedef struct rdpsnd_sndio_plugin rdpsndSndioPlugin;
struct rdpsnd_sndio_plugin
typedef struct
{
rdpsndDevicePlugin device;
struct sio_hdl* hdl;
struct sio_par par;
};
} rdpsndSndioPlugin;
static BOOL rdpsnd_sndio_open(rdpsndDevicePlugin* device, AUDIO_FORMAT* format, int latency)
{

6
channels/rdpsnd/client/winmm/rdpsnd_winmm.c
View File

@ -41,9 +41,7 @@
#include "rdpsnd_main.h"
typedef struct rdpsnd_winmm_plugin rdpsndWinmmPlugin;
struct rdpsnd_winmm_plugin
typedef struct
{
rdpsndDevicePlugin device;
@ -55,7 +53,7 @@ struct rdpsnd_winmm_plugin
HANDLE hThread;
DWORD threadId;
CRITICAL_SECTION cs;
};
} rdpsndWinmmPlugin;
static BOOL rdpsnd_winmm_convert_format(const AUDIO_FORMAT* in, WAVEFORMATEX* out)
{

2
channels/rdpsnd/server/rdpsnd_main.h
View File

@ -32,7 +32,7 @@
#define TAG CHANNELS_TAG("rdpsnd.server")
struct _rdpsnd_server_private
struct s_rdpsnd_server_private
{
BOOL ownThread;
HANDLE Thread;

5
channels/remdesk/client/remdesk_main.h
View File

@ -38,7 +38,7 @@
#include <freerdp/channels/log.h>
#define TAG CHANNELS_TAG("remdesk.client")
struct remdesk_plugin
typedef struct
{
CHANNEL_DEF channelDef;
CHANNEL_ENTRY_POINTS_FREERDP_EX channelEntryPoints;
@ -57,7 +57,6 @@ struct remdesk_plugin
BYTE* EncryptedPassStub;
size_t EncryptedPassStubSize;
rdpContext* rdpcontext;
};
typedef struct remdesk_plugin remdeskPlugin;
} remdeskPlugin;
#endif /* FREERDP_CHANNEL_REMDESK_CLIENT_MAIN_H */

2
channels/remdesk/server/remdesk_main.h
View File

@ -29,7 +29,7 @@
#define TAG CHANNELS_TAG("remdesk.server")
struct _remdesk_server_private
struct s_remdesk_server_private
{
HANDLE Thread;
HANDLE StopEvent;

12
channels/serial/client/serial_main.c
View File

@ -52,9 +52,7 @@
#define MAX_IRP_THREADS 5
typedef struct _SERIAL_DEVICE SERIAL_DEVICE;
struct _SERIAL_DEVICE
typedef struct
{
DEVICE device;
BOOL permissive;
@ -70,15 +68,13 @@ struct _SERIAL_DEVICE
UINT32 IrpThreadToBeTerminatedCount;
CRITICAL_SECTION TerminatingIrpThreadsLock;
rdpContext* rdpcontext;
};
} SERIAL_DEVICE;
typedef struct _IRP_THREAD_DATA IRP_THREAD_DATA;
struct _IRP_THREAD_DATA
typedef struct
{
SERIAL_DEVICE* serial;
IRP* irp;
};
} IRP_THREAD_DATA;
static UINT32 _GetLastErrorToIoStatus(SERIAL_DEVICE* serial)
{

23
channels/smartcard/client/smartcard_main.h
View File

@ -41,18 +41,7 @@
#define TAG CHANNELS_TAG("smartcard.client")
typedef struct _SMARTCARD_DEVICE SMARTCARD_DEVICE;
struct _SMARTCARD_CONTEXT
{
HANDLE thread;
SCARDCONTEXT hContext;
wMessageQueue* IrpQueue;
SMARTCARD_DEVICE* smartcard;
};
typedef struct _SMARTCARD_CONTEXT SMARTCARD_CONTEXT;
struct _SMARTCARD_DEVICE
typedef struct
{
DEVICE device;
@ -61,6 +50,14 @@ struct _SMARTCARD_DEVICE
wMessageQueue* IrpQueue;
wListDictionary* rgOutstandingMessages;
rdpContext* rdpcontext;
};
} SMARTCARD_DEVICE;
typedef struct
{
HANDLE thread;
SCARDCONTEXT hContext;
wMessageQueue* IrpQueue;
SMARTCARD_DEVICE* smartcard;
} SMARTCARD_CONTEXT;
#endif /* FREERDP_CHANNEL_SMARTCARD_CLIENT_MAIN_H */

15
channels/sshagent/client/sshagent_main.c
View File

@ -58,8 +58,7 @@
#define TAG CHANNELS_TAG("sshagent.client")
typedef struct _SSHAGENT_LISTENER_CALLBACK SSHAGENT_LISTENER_CALLBACK;
struct _SSHAGENT_LISTENER_CALLBACK
typedef struct
{
IWTSListenerCallback iface;
@ -68,10 +67,9 @@ struct _SSHAGENT_LISTENER_CALLBACK
rdpContext* rdpcontext;
const char* agent_uds_path;
};
} SSHAGENT_LISTENER_CALLBACK;
typedef struct _SSHAGENT_CHANNEL_CALLBACK SSHAGENT_CHANNEL_CALLBACK;
struct _SSHAGENT_CHANNEL_CALLBACK
typedef struct
{
IWTSVirtualChannelCallback iface;
@ -83,17 +81,16 @@ struct _SSHAGENT_CHANNEL_CALLBACK
int agent_fd;
HANDLE thread;
CRITICAL_SECTION lock;
};
} SSHAGENT_CHANNEL_CALLBACK;
typedef struct _SSHAGENT_PLUGIN SSHAGENT_PLUGIN;
struct _SSHAGENT_PLUGIN
typedef struct
{
IWTSPlugin iface;
SSHAGENT_LISTENER_CALLBACK* listener_callback;
rdpContext* rdpcontext;
};
} SSHAGENT_PLUGIN;
/**
* Function to open the connection to the sshagent

2
channels/tsmf/client/alsa/tsmf_alsa.c
View File

@ -35,7 +35,7 @@
#include "tsmf_audio.h"
typedef struct _TSMFALSAAudioDevice
typedef struct
{
ITSMFAudioDevice iface;

2
channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
View File

@ -70,7 +70,7 @@
#define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P
#endif
typedef struct _TSMFFFmpegDecoder
typedef struct
{
ITSMFDecoder iface;

2
channels/tsmf/client/gstreamer/tsmf_platform.h
View File

@ -25,7 +25,7 @@
#include <gst/gst.h>
#include <tsmf_decoder.h>
typedef struct _TSMFGstreamerDecoder
typedef struct
{
ITSMFDecoder iface;

2
channels/tsmf/client/oss/tsmf_oss.c
View File

@ -46,7 +46,7 @@
#include "tsmf_audio.h"
typedef struct _TSMFOSSAudioDevice
typedef struct
{
ITSMFAudioDevice iface;

2
channels/tsmf/client/pulse/tsmf_pulse.c
View File

@ -32,7 +32,7 @@
#include "tsmf_audio.h"
typedef struct _TSMFPulseAudioDevice
typedef struct
{
ITSMFAudioDevice iface;

4
channels/tsmf/client/tsmf_audio.h
View File

@ -22,9 +22,9 @@
#include "tsmf_types.h"
typedef struct _ITSMFAudioDevice ITSMFAudioDevice;
typedef struct s_ITSMFAudioDevice ITSMFAudioDevice;
struct _ITSMFAudioDevice
struct s_ITSMFAudioDevice
{
/* Open the audio device. */
BOOL (*Open)(ITSMFAudioDevice* audio, const char* device);

4
channels/tsmf/client/tsmf_codec.c
View File

@ -36,7 +36,7 @@
#define TAG CHANNELS_TAG("tsmf.client")
typedef struct _TSMFMediaTypeMap
typedef struct
{
BYTE guid[16];
const char* name;
@ -330,7 +330,7 @@ static UINT32 tsmf_codec_parse_VIDEOINFOHEADER2(TS_AM_MEDIA_TYPE* mediatype, wSt
static UINT32 tsmf_codec_parse_VIDEOINFOHEADER(TS_AM_MEDIA_TYPE* mediatype, wStream* s)
{
/*
typedef struct tagVIDEOINFOHEADER {
typedef struct {
RECT rcSource; //16
RECT rcTarget; //16 32
DWORD dwBitRate; //4 36

6
channels/tsmf/client/tsmf_decoder.h
View File

@ -23,7 +23,7 @@
#include "tsmf_types.h"
typedef enum _ITSMFControlMsg
typedef enum
{
Control_Pause,
Control_Resume,
@ -31,9 +31,9 @@ typedef enum _ITSMFControlMsg
Control_Stop
} ITSMFControlMsg;
typedef struct _ITSMFDecoder ITSMFDecoder;
typedef struct s_ITSMFDecoder ITSMFDecoder;
struct _ITSMFDecoder
struct s_ITSMFDecoder
{
/* Set the decoder format. Return true if supported. */
BOOL (*SetFormat)(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* media_type);

5
channels/tsmf/client/tsmf_ifman.h
View File

@ -24,8 +24,7 @@
#include <freerdp/freerdp.h>
typedef struct _TSMF_IFMAN TSMF_IFMAN;
struct _TSMF_IFMAN
typedef struct
{
IWTSVirtualChannelCallback* channel_callback;
const char* decoder_name;
@ -40,7 +39,7 @@ struct _TSMF_IFMAN
wStream* output;
BOOL output_pending;
UINT32 output_interface_id;
};
} TSMF_IFMAN;
UINT tsmf_ifman_rim_exchange_capability_request(TSMF_IFMAN* ifman);
UINT tsmf_ifman_exchange_capability_request(TSMF_IFMAN* ifman);

18
channels/tsmf/client/tsmf_main.h
View File

@ -24,21 +24,15 @@
#include <freerdp/freerdp.h>
typedef struct _TSMF_LISTENER_CALLBACK TSMF_LISTENER_CALLBACK;
typedef struct _TSMF_CHANNEL_CALLBACK TSMF_CHANNEL_CALLBACK;
typedef struct _TSMF_PLUGIN TSMF_PLUGIN;
struct _TSMF_LISTENER_CALLBACK
typedef struct
{
IWTSListenerCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
};
} TSMF_LISTENER_CALLBACK;
struct _TSMF_CHANNEL_CALLBACK
typedef struct
{
IWTSVirtualChannelCallback iface;
@ -48,9 +42,9 @@ struct _TSMF_CHANNEL_CALLBACK
BYTE presentation_id[GUID_SIZE];
UINT32 stream_id;
};
} TSMF_CHANNEL_CALLBACK;
struct _TSMF_PLUGIN
typedef struct
{
IWTSPlugin iface;
@ -62,7 +56,7 @@ struct _TSMF_PLUGIN
const char* audio_device;
rdpContext* rdpcontext;
};
} TSMF_PLUGIN;
BOOL tsmf_send_eos_response(IWTSVirtualChannelCallback* pChannelCallback, UINT32 message_id);
BOOL tsmf_playback_ack(IWTSVirtualChannelCallback* pChannelCallback, UINT32 message_id,

6
channels/tsmf/client/tsmf_media.c
View File

@ -67,7 +67,7 @@
#define VIDEO_MIN_BUFFER_LEVEL 10
#define VIDEO_MAX_BUFFER_LEVEL 30
struct _TSMF_PRESENTATION
struct S_TSMF_PRESENTATION
{
BYTE presentation_id[GUID_SIZE];
@ -93,7 +93,7 @@ struct _TSMF_PRESENTATION
void* rects;
};
struct _TSMF_STREAM
struct S_TSMF_STREAM
{
UINT32 stream_id;
@ -137,7 +137,7 @@ struct _TSMF_STREAM
BOOL seeking;
};
struct _TSMF_SAMPLE
struct S_TSMF_SAMPLE
{
UINT32 sample_id;
UINT64 start_time;

6
channels/tsmf/client/tsmf_media.h
View File

@ -30,11 +30,11 @@
#include <freerdp/freerdp.h>
typedef struct _TSMF_PRESENTATION TSMF_PRESENTATION;
typedef struct S_TSMF_PRESENTATION TSMF_PRESENTATION;
typedef struct _TSMF_STREAM TSMF_STREAM;
typedef struct S_TSMF_STREAM TSMF_STREAM;
typedef struct _TSMF_SAMPLE TSMF_SAMPLE;
typedef struct S_TSMF_SAMPLE TSMF_SAMPLE;
TSMF_PRESENTATION* tsmf_presentation_new(const BYTE* guid,
IWTSVirtualChannelCallback* pChannelCallback);

2
channels/tsmf/client/tsmf_types.h
View File

@ -39,7 +39,7 @@
} while (0)
#endif
typedef struct _TS_AM_MEDIA_TYPE
typedef struct
{
int MajorType;
int SubType;

6
channels/urbdrc/client/libusb/libusb_udevice.c
View File

@ -62,9 +62,7 @@
#define HAVE_STREAM_ID_API 1
#endif
typedef struct _ASYNC_TRANSFER_USER_DATA ASYNC_TRANSFER_USER_DATA;
struct _ASYNC_TRANSFER_USER_DATA
typedef struct
{
wStream* data;
BOOL noack;
@ -79,7 +77,7 @@ struct _ASYNC_TRANSFER_USER_DATA
#if !defined(HAVE_STREAM_ID_API)
UINT32 streamID;
#endif
};
} ASYNC_TRANSFER_USER_DATA;
static void request_free(void* value);

6
channels/urbdrc/client/libusb/libusb_udevice.h
View File

@ -35,9 +35,7 @@ typedef struct libusb_interface LIBUSB_INTERFACE;
typedef struct libusb_interface_descriptor LIBUSB_INTERFACE_DESCRIPTOR;
typedef struct libusb_endpoint_descriptor LIBUSB_ENDPOINT_DESCEIPTOR;
typedef struct _UDEVICE UDEVICE;
struct _UDEVICE
typedef struct
{
IUDEVICE iface;
@ -66,7 +64,7 @@ struct _UDEVICE
wArrayList* request_queue;
URBDRC_PLUGIN* urbdrc;
};
} UDEVICE;
typedef UDEVICE* PUDEVICE;
size_t udev_new_by_id(URBDRC_PLUGIN* urbdrc, libusb_context* ctx, UINT16 idVendor, UINT16 idProduct,

12
channels/urbdrc/client/libusb/libusb_udevman.c
View File

@ -56,17 +56,13 @@
_man->iface.get_##_arg = udevman_get_##_arg; \
_man->iface.set_##_arg = udevman_set_##_arg
typedef struct _VID_PID_PAIR VID_PID_PAIR;
struct _VID_PID_PAIR
typedef struct
{
UINT16 vid;
UINT16 pid;
};
} VID_PID_PAIR;
typedef struct _UDEVMAN UDEVMAN;
struct _UDEVMAN
typedef struct
{
IUDEVMAN iface;
@ -86,7 +82,7 @@ struct _UDEVMAN
libusb_context* context;
HANDLE thread;
BOOL running;
};
} UDEVMAN;
typedef UDEVMAN* PUDEVMAN;
static BOOL poll_libusb_events(UDEVMAN* udevman);

37
channels/urbdrc/client/urbdrc_main.h
View File

@ -39,8 +39,8 @@
} while (0)
#endif
typedef struct _IUDEVICE IUDEVICE;
typedef struct _IUDEVMAN IUDEVMAN;
typedef struct S_IUDEVICE IUDEVICE;
typedef struct S_IUDEVMAN IUDEVMAN;
#define BASIC_DEV_STATE_DEFINED(_arg, _type) \
_type (*get_##_arg)(IUDEVICE * pdev); \
@ -50,30 +50,24 @@ typedef struct _IUDEVMAN IUDEVMAN;
_type (*get_##_arg)(IUDEVMAN * udevman); \
void (*set_##_arg)(IUDEVMAN * udevman, _type _arg)
typedef struct _URBDRC_LISTENER_CALLBACK URBDRC_LISTENER_CALLBACK;
struct _URBDRC_LISTENER_CALLBACK
typedef struct
{
IWTSListenerCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
};
} URBDRC_LISTENER_CALLBACK;
typedef struct _URBDRC_CHANNEL_CALLBACK URBDRC_CHANNEL_CALLBACK;
struct _URBDRC_CHANNEL_CALLBACK
typedef struct
{
IWTSVirtualChannelCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
IWTSVirtualChannel* channel;
};
} URBDRC_CHANNEL_CALLBACK;
typedef struct _URBDRC_PLUGIN URBDRC_PLUGIN;
struct _URBDRC_PLUGIN
typedef struct
{
IWTSPlugin iface;
@ -86,37 +80,34 @@ struct _URBDRC_PLUGIN
wLog* log;
IWTSListener* listener;
BOOL initialized;
};
} URBDRC_PLUGIN;
typedef BOOL (*PREGISTERURBDRCSERVICE)(IWTSPlugin* plugin, IUDEVMAN* udevman);
struct _FREERDP_URBDRC_SERVICE_ENTRY_POINTS
typedef struct
{
IWTSPlugin* plugin;
PREGISTERURBDRCSERVICE pRegisterUDEVMAN;
const ADDIN_ARGV* args;
};
typedef struct _FREERDP_URBDRC_SERVICE_ENTRY_POINTS FREERDP_URBDRC_SERVICE_ENTRY_POINTS;
} FREERDP_URBDRC_SERVICE_ENTRY_POINTS;
typedef FREERDP_URBDRC_SERVICE_ENTRY_POINTS* PFREERDP_URBDRC_SERVICE_ENTRY_POINTS;
typedef int (*PFREERDP_URBDRC_DEVICE_ENTRY)(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints);
typedef struct _TRANSFER_DATA TRANSFER_DATA;
struct _TRANSFER_DATA
typedef struct
{
URBDRC_CHANNEL_CALLBACK* callback;
URBDRC_PLUGIN* urbdrc;
IUDEVMAN* udevman;
IWTSVirtualChannel* channel;
wStream* s;
};
} TRANSFER_DATA;
typedef void (*t_isoch_transfer_cb)(IUDEVICE* idev, URBDRC_CHANNEL_CALLBACK* callback, wStream* out,
UINT32 InterfaceId, BOOL noAck, UINT32 MessageId,
UINT32 RequestId, UINT32 NumberOfPackets, UINT32 status,
UINT32 StartFrame, UINT32 ErrorCount, UINT32 OutputBufferSize);
struct _IUDEVICE
struct S_IUDEVICE
{
/* Transfer */
int (*isoch_transfer)(IUDEVICE* idev, URBDRC_CHANNEL_CALLBACK* callback, UINT32 MessageId,
@ -194,7 +185,7 @@ struct _IUDEVICE
BASIC_DEV_STATE_DEFINED(p_next, void*);
};
struct _IUDEVMAN
struct S_IUDEVMAN
{
/* Standard */
void (*free)(IUDEVMAN* idevman);

16
channels/urbdrc/common/msusb.h
View File

@ -24,11 +24,7 @@
#include <winpr/stream.h>
#include <freerdp/api.h>
typedef struct _MSUSB_INTERFACE_DESCRIPTOR MSUSB_INTERFACE_DESCRIPTOR;
typedef struct _MSUSB_PIPE_DESCRIPTOR MSUSB_PIPE_DESCRIPTOR;
typedef struct _MSUSB_CONFIG_DESCRIPTOR MSUSB_CONFIG_DESCRIPTOR;
struct _MSUSB_PIPE_DESCRIPTOR
typedef struct
{
UINT16 MaximumPacketSize;
UINT32 MaximumTransferSize;
@ -38,9 +34,9 @@ struct _MSUSB_PIPE_DESCRIPTOR
BYTE bInterval;
BYTE PipeType;
int InitCompleted;
};
} MSUSB_PIPE_DESCRIPTOR;
struct _MSUSB_INTERFACE_DESCRIPTOR
typedef struct
{
UINT16 Length;
UINT16 NumberOfPipesExpected;
@ -53,9 +49,9 @@ struct _MSUSB_INTERFACE_DESCRIPTOR
BYTE bInterfaceProtocol;
MSUSB_PIPE_DESCRIPTOR** MsPipes;
int InitCompleted;
};
} MSUSB_INTERFACE_DESCRIPTOR;
struct _MSUSB_CONFIG_DESCRIPTOR
typedef struct
{
UINT16 wTotalLength;
BYTE bConfigurationValue;
@ -64,7 +60,7 @@ struct _MSUSB_CONFIG_DESCRIPTOR
MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces;
int InitCompleted;
int MsOutSize;
};
} MSUSB_CONFIG_DESCRIPTOR;
#ifdef __cplusplus
extern "C"

74
channels/video/client/video_main.c
View File

@ -47,27 +47,25 @@
#include "video_main.h"
struct _VIDEO_CHANNEL_CALLBACK
typedef struct
{
IWTSVirtualChannelCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
IWTSVirtualChannel* channel;
};
typedef struct _VIDEO_CHANNEL_CALLBACK VIDEO_CHANNEL_CALLBACK;
} VIDEO_CHANNEL_CALLBACK;
struct _VIDEO_LISTENER_CALLBACK
typedef struct
{
IWTSListenerCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
VIDEO_CHANNEL_CALLBACK* channel_callback;
};
typedef struct _VIDEO_LISTENER_CALLBACK VIDEO_LISTENER_CALLBACK;
} VIDEO_LISTENER_CALLBACK;
struct _VIDEO_PLUGIN
typedef struct
{
IWTSPlugin wtsPlugin;
@ -78,46 +76,15 @@ struct _VIDEO_PLUGIN
VideoClientContext* context;
BOOL initialized;
};
typedef struct _VIDEO_PLUGIN VIDEO_PLUGIN;
} VIDEO_PLUGIN;
#define XF_VIDEO_UNLIMITED_RATE 31
static const BYTE MFVideoFormat_H264[] = { 'H', '2', '6', '4', 0x00, 0x00, 0x10, 0x00,
0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71 };
typedef struct _PresentationContext PresentationContext;
typedef struct _VideoFrame VideoFrame;
/** @brief private data for the channel */
struct _VideoClientContextPriv
{
VideoClientContext* video;
GeometryClientContext* geometry;
wQueue* frames;
CRITICAL_SECTION framesLock;
wBufferPool* surfacePool;
UINT32 publishedFrames;
UINT32 droppedFrames;
UINT32 lastSentRate;
UINT64 nextFeedbackTime;
PresentationContext* currentPresentation;
};
/** @brief */
struct _VideoFrame
{
UINT64 publishTime;
UINT64 hnsDuration;
MAPPED_GEOMETRY* geometry;
UINT32 w, h;
UINT32 scanline;
BYTE* surfaceData;
PresentationContext* presentation;
};
/** @brief */
struct _PresentationContext
typedef struct
{
VideoClientContext* video;
BYTE PresentationId;
@ -131,6 +98,33 @@ struct _PresentationContext
UINT64 lastPublishTime, nextPublishTime;
volatile LONG refCounter;
VideoSurface* surface;
} PresentationContext;
/** @brief */
typedef struct
{
UINT64 publishTime;
UINT64 hnsDuration;
MAPPED_GEOMETRY* geometry;
UINT32 w, h;
UINT32 scanline;
BYTE* surfaceData;
PresentationContext* presentation;
} VideoFrame;
/** @brief private data for the channel */
struct s_VideoClientContextPriv
{
VideoClientContext* video;
GeometryClientContext* geometry;
wQueue* frames;
CRITICAL_SECTION framesLock;
wBufferPool* surfacePool;
UINT32 publishedFrames;
UINT32 droppedFrames;
UINT32 lastSentRate;
UINT64 nextFeedbackTime;
PresentationContext* currentPresentation;
};
static void PresentationContext_unref(PresentationContext* presentation);

28
client/Android/android_event.h
View File

@ -20,45 +20,40 @@
#define EVENT_TYPE_KEY_UNICODE 4
#define EVENT_TYPE_CLIPBOARD 5
struct _ANDROID_EVENT
typedef struct
{
int type;
};
typedef struct _ANDROID_EVENT ANDROID_EVENT;
} ANDROID_EVENT;
struct _ANDROID_EVENT_KEY
typedef struct
{
int type;
int flags;
UINT16 scancode;
};
typedef struct _ANDROID_EVENT_KEY ANDROID_EVENT_KEY;
} ANDROID_EVENT_KEY;
struct _ANDROID_EVENT_CURSOR
typedef struct
{
int type;
UINT16 flags;
UINT16 x;
UINT16 y;
};
typedef struct _ANDROID_EVENT_CURSOR ANDROID_EVENT_CURSOR;
} ANDROID_EVENT_CURSOR;
struct _ANDROID_EVENT_CLIPBOARD
typedef struct
{
int type;
void* data;
int data_length;
};
typedef struct _ANDROID_EVENT_CLIPBOARD ANDROID_EVENT_CLIPBOARD;
} ANDROID_EVENT_CLIPBOARD;
struct _ANDROID_EVENT_QUEUE
typedef struct
{
int size;
int count;
HANDLE isSet;
ANDROID_EVENT** events;
};
typedef struct _ANDROID_EVENT_QUEUE ANDROID_EVENT_QUEUE;
} ANDROID_EVENT_QUEUE;
FREERDP_LOCAL BOOL android_push_event(freerdp* inst, ANDROID_EVENT* event);
@ -69,7 +64,8 @@ FREERDP_LOCAL ANDROID_EVENT_KEY* android_event_key_new(int flags, UINT16 scancod
FREERDP_LOCAL ANDROID_EVENT_KEY* android_event_unicodekey_new(UINT16 flags, UINT16 key);
FREERDP_LOCAL ANDROID_EVENT_CURSOR* android_event_cursor_new(UINT16 flags, UINT16 x, UINT16 y);
FREERDP_LOCAL ANDROID_EVENT* android_event_disconnect_new(void);
FREERDP_LOCAL ANDROID_EVENT_CLIPBOARD* android_event_clipboard_new(const void* data, size_t data_length);
FREERDP_LOCAL ANDROID_EVENT_CLIPBOARD* android_event_clipboard_new(const void* data,
size_t data_length);
FREERDP_LOCAL void android_event_free(ANDROID_EVENT* event);

5
client/Android/android_freerdp.h
View File

@ -21,7 +21,7 @@
#include "android_event.h"
struct android_context
typedef struct
{
rdpContext rdpCtx;
@ -38,7 +38,6 @@ struct android_context
CLIPRDR_FORMAT* serverFormats;
CliprdrClientContext* cliprdr;
UINT32 clipboardCapabilities;
};
typedef struct android_context androidContext;
} androidContext;
#endif /* FREERDP_CLIENT_ANDROID_FREERDP_H */

5
client/Mac/Keyboard.m
View File

@ -24,12 +24,11 @@
#include <IOKit/IOKitLib.h>
#include <IOKit/hid/IOHIDManager.h>
struct _APPLE_KEYBOARD_DESC
typedef struct
{
uint32_t ProductId;
enum APPLE_KEYBOARD_TYPE Type;
};
typedef struct _APPLE_KEYBOARD_DESC APPLE_KEYBOARD_DESC;
} APPLE_KEYBOARD_DESC;
/* VendorID: 0x05AC (Apple, Inc.) */

6
client/Mac/mfreerdp.h
View File

@ -1,8 +1,6 @@
#ifndef FREERDP_CLIENT_MAC_FREERDP_H
#define FREERDP_CLIENT_MAC_FREERDP_H
typedef struct mf_context mfContext;
#include <freerdp/freerdp.h>
#include <freerdp/client/file.h>
#include <freerdp/api.h>
@ -29,7 +27,7 @@ typedef struct mf_context mfContext;
#include "Keyboard.h"
#include <CoreGraphics/CoreGraphics.h>
struct mf_context
typedef struct
{
rdpContext context;
DEFINE_RDP_CLIENT_COMMON();
@ -85,6 +83,6 @@ struct mf_context
int yMaxScroll; // maximum vertical scroll value
CGEventFlags kbdFlags;
};
} mfContext;
#endif /* FREERDP_CLIENT_MAC_FREERDP_H */

5
client/Sample/tf_freerdp.h
View File

@ -28,7 +28,7 @@
#include <freerdp/client/rdpgfx.h>
#include <freerdp/client/encomsp.h>
struct tf_context
typedef struct
{
rdpContext context;
@ -36,7 +36,6 @@ struct tf_context
RdpeiClientContext* rdpei;
RdpgfxClientContext* gfx;
EncomspClientContext* encomsp;
};
typedef struct tf_context tfContext;
} tfContext;
#endif /* FREERDP_CLIENT_SAMPLE_H */

2
client/Wayland/wlf_disp.c
View File

@ -26,7 +26,7 @@
#define RESIZE_MIN_DELAY 200 /* minimum delay in ms between two resizes */
struct _wlfDispContext
struct s_wlfDispContext
{
wlfContext* wlc;
DispClientContext* disp;

5
client/Wayland/wlf_pointer.c
View File

@ -27,13 +27,12 @@
#define TAG CLIENT_TAG("wayland.pointer")
struct wlf_pointer
typedef struct
{
rdpPointer pointer;
size_t size;
void* data;
};
typedef struct wlf_pointer wlfPointer;
} wlfPointer;
static BOOL wlf_Pointer_New(rdpContext* context, rdpPointer* pointer)
{

9
client/Wayland/wlfreerdp.h
View File

@ -28,13 +28,12 @@
#include <winpr/wtypes.h>
#include <uwac/uwac.h>
typedef struct wlf_context wlfContext;
typedef struct wlf_clipboard wfClipboard;
typedef struct _wlfDispContext wlfDispContext;
typedef struct s_wlfDispContext wlfDispContext;
#define MAX_CONTACTS 20
typedef struct touch_contact
typedef struct
{
int id;
double pos_x;
@ -42,7 +41,7 @@ typedef struct touch_contact
BOOL emulate_mouse;
} touchContact;
struct wlf_context
typedef struct
{
rdpContext context;
@ -66,7 +65,7 @@ struct wlf_context
wArrayList* events;
touchContact contacts[MAX_CONTACTS];
};
} wlfContext;
BOOL wlf_scale_coordinates(rdpContext* context, UINT32* px, UINT32* py, BOOL fromLocalToRDP);
BOOL wlf_copy_image(const void* src, size_t srcStride, size_t srcWidth, size_t srcHeight, void* dst,

12
client/Windows/wf_client.h
View File

@ -44,8 +44,6 @@
#include <freerdp/codec/nsc.h>
#include <freerdp/client/file.h>
typedef struct wf_context wfContext;
#include "wf_channels.h"
#include "wf_floatbar.h"
#include "wf_event.h"
@ -59,22 +57,20 @@ extern "C"
// System menu constants
#define SYSCOMMAND_ID_SMARTSIZING 1000
struct wf_bitmap
typedef struct
{
rdpBitmap _bitmap;
HDC hdc;
HBITMAP bitmap;
HBITMAP org_bitmap;
BYTE* pdata;
};
typedef struct wf_bitmap wfBitmap;
} wfBitmap;
struct wf_pointer
typedef struct
{
rdpPointer pointer;
HCURSOR cursor;
};
typedef struct wf_pointer wfPointer;
} wfPointer;
struct wf_context
{

25
client/Windows/wf_cliprdr.c
View File

@ -61,15 +61,14 @@ typedef BOOL(WINAPI* fnRemoveClipboardFormatListener)(HWND hwnd);
typedef BOOL(WINAPI* fnGetUpdatedClipboardFormats)(PUINT lpuiFormats, UINT cFormats,
PUINT pcFormatsOut);
struct format_mapping
typedef struct
{
UINT32 remote_format_id;
UINT32 local_format_id;
WCHAR* name;
};
typedef struct format_mapping formatMapping;
} formatMapping;
struct _CliprdrEnumFORMATETC
typedef struct
{
IEnumFORMATETC iEnumFORMATETC;
@ -77,10 +76,9 @@ struct _CliprdrEnumFORMATETC
LONG m_nIndex;
LONG m_nNumFormats;
FORMATETC* m_pFormatEtc;
};
typedef struct _CliprdrEnumFORMATETC CliprdrEnumFORMATETC;
} CliprdrEnumFORMATETC;
struct _CliprdrStream
typedef struct
{
IStream iStream;
@ -90,10 +88,9 @@ struct _CliprdrStream
ULARGE_INTEGER m_lOffset;
FILEDESCRIPTORW m_Dsc;
void* m_pData;
};
typedef struct _CliprdrStream CliprdrStream;
} CliprdrStream;
struct _CliprdrDataObject
typedef struct
{
IDataObject iDataObject;
@ -104,10 +101,9 @@ struct _CliprdrDataObject
ULONG m_nStreams;
IStream** m_pStream;
void* m_pData;
};
typedef struct _CliprdrDataObject CliprdrDataObject;
} CliprdrDataObject;
struct wf_clipboard
typedef struct
{
wfContext* wfc;
rdpChannels* channels;
@ -143,8 +139,7 @@ struct wf_clipboard
fnAddClipboardFormatListener AddClipboardFormatListener;
fnRemoveClipboardFormatListener RemoveClipboardFormatListener;
fnGetUpdatedClipboardFormats GetUpdatedClipboardFormats;
};
typedef struct wf_clipboard wfClipboard;
} wfClipboard;
#define WM_CLIPRDR_MESSAGE (WM_USER + 156)
#define OLE_SETCLIPBOARD 1

8
client/Windows/wf_floatbar.c
View File

@ -31,8 +31,6 @@
#define TAG CLIENT_TAG("windows.floatbar")
typedef struct _Button Button;
/* TIMERs */
#define TIMER_HIDE 1
#define TIMER_ANIMAT_SHOW 2
@ -60,7 +58,7 @@ typedef struct _Button Button;
#define MINIMIZE_X (RESTORE_X - (BUTTON_WIDTH + BUTTON_SPACING))
#define TEXT_X (BACKGROUND_H + ((BUTTON_WIDTH + BUTTON_SPACING) * 3) + 5)
struct _Button
typedef struct
{
wfFloatBar* floatbar;
int type;
@ -74,9 +72,9 @@ struct _Button
HBITMAP locked_bmp_act;
HBITMAP unlocked_bmp;
HBITMAP unlocked_bmp_act;
};
} Button;
struct _FloatBar
struct s_FloatBar
{
HINSTANCE root_window;
DWORD flags;

2
client/Windows/wf_floatbar.h
View File

@ -22,7 +22,7 @@
#include <winpr/crt.h>
typedef struct _FloatBar wfFloatBar;
typedef struct s_FloatBar wfFloatBar;
typedef struct wf_context wfContext;
wfFloatBar* wf_floatbar_new(wfContext* wfc, HINSTANCE window, DWORD flags);

5
client/Windows/wf_rail.c
View File

@ -50,13 +50,12 @@ struct wf_rail_window
/* RemoteApp Core Protocol Extension */
struct _WINDOW_STYLE
typedef struct
{
UINT32 style;
const char* name;
BOOL multi;
};
typedef struct _WINDOW_STYLE WINDOW_STYLE;
} WINDOW_STYLE;
static const WINDOW_STYLE WINDOW_STYLES[] = { { WS_BORDER, "WS_BORDER", FALSE },
{ WS_CAPTION, "WS_CAPTION", FALSE },

15
client/X11/xf_cliprdr.c
View File

@ -64,16 +64,15 @@
#define MAX_CLIPBOARD_FORMATS 255
#define WIN32_FILETIME_TO_UNIX_EPOCH_USEC UINT64_C(116444736000000000)
struct xf_cliprdr_format
typedef struct
{
Atom atom;
UINT32 formatId;
char* formatName;
};
typedef struct xf_cliprdr_format xfCliprdrFormat;
} xfCliprdrFormat;
#ifdef WITH_FUSE
struct xf_cliprdr_fuse_stream
typedef struct
{
UINT32 stream_id;
/* must be one of FILECONTENTS_SIZE or FILECONTENTS_RANGE*/
@ -81,10 +80,9 @@ struct xf_cliprdr_fuse_stream
fuse_req_t req;
/*for FILECONTENTS_SIZE must be ino number* */
size_t req_ino;
};
typedef struct xf_cliprdr_fuse_stream xfCliprdrFuseStream;
} xfCliprdrFuseStream;
struct xf_cliprdr_fuse_inode
typedef struct
{
size_t parent_ino;
size_t ino;
@ -95,8 +93,7 @@ struct xf_cliprdr_fuse_inode
struct timespec st_mtim;
char* name;
wArrayList* child_inos;
};
typedef struct xf_cliprdr_fuse_inode xfCliprdrFuseInode;
} xfCliprdrFuseInode;
static void xf_cliprdr_fuse_inode_free(void* obj)
{

2
client/X11/xf_disp.c
View File

@ -36,7 +36,7 @@
#define TAG CLIENT_TAG("x11disp")
#define RESIZE_MIN_DELAY 200 /* minimum delay in ms between two resizes */
struct _xfDispContext
struct s_xfDispContext
{
xfContext* xfc;
DispClientContext* disp;

22
client/X11/xf_floatbar.c
View File

@ -60,7 +60,16 @@
typedef BOOL (*OnClick)(xfFloatbar*);
typedef struct xf_floatbar_button xfFloatbarButton;
typedef struct
{
int x;
int y;
int type;
bool focus;
bool clicked;
OnClick onclick;
Window handle;
} xfFloatbarButton;
struct xf_floatbar
{
@ -82,17 +91,6 @@ struct xf_floatbar
char* title;
};
struct xf_floatbar_button
{
int x;
int y;
int type;
bool focus;
bool clicked;
OnClick onclick;
Window handle;
};
static xfFloatbarButton* xf_floatbar_new_button(xfFloatbar* floatbar, int type);
static BOOL xf_floatbar_button_onclick_close(xfFloatbar* floatbar)

5
client/X11/xf_keyboard.h
View File

@ -25,7 +25,7 @@
#include "xf_client.h"
#include "xfreerdp.h"
struct _XF_MODIFIER_KEYS
typedef struct
{
BOOL Shift;
BOOL LeftShift;
@ -39,8 +39,7 @@ struct _XF_MODIFIER_KEYS
BOOL Super;
BOOL LeftSuper;
BOOL RightSuper;
};
typedef struct _XF_MODIFIER_KEYS XF_MODIFIER_KEYS;
} XF_MODIFIER_KEYS;
BOOL xf_keyboard_init(xfContext* xfc);
void xf_keyboard_free(xfContext* xfc);

10
client/X11/xf_monitor.h
View File

@ -23,22 +23,20 @@
#include <freerdp/api.h>
#include <freerdp/freerdp.h>
struct _MONITOR_INFO
typedef struct
{
RECTANGLE_16 area;
RECTANGLE_16 workarea;
BOOL primary;
};
typedef struct _MONITOR_INFO MONITOR_INFO;
} MONITOR_INFO;
struct _VIRTUAL_SCREEN
typedef struct
{
int nmonitors;
RECTANGLE_16 area;
RECTANGLE_16 workarea;
MONITOR_INFO* monitors;
};
typedef struct _VIRTUAL_SCREEN VIRTUAL_SCREEN;
} VIRTUAL_SCREEN;
#include "xf_client.h"
#include "xfreerdp.h"

5
client/X11/xf_window.c
View File

@ -98,15 +98,14 @@
#define PROP_MOTIF_WM_HINTS_ELEMENTS 5
struct _PropMotifWmHints
typedef struct
{
unsigned long flags;
unsigned long functions;
unsigned long decorations;
long inputMode;
unsigned long status;
};
typedef struct _PropMotifWmHints PropMotifWmHints;
} PropMotifWmHints;
static void xf_SetWindowTitleText(xfContext* xfc, Window window, const char* name)
{

4
client/X11/xfreerdp.h
View File

@ -111,8 +111,8 @@ struct xf_glyph
typedef struct xf_glyph xfGlyph;
typedef struct xf_clipboard xfClipboard;
typedef struct _xfDispContext xfDispContext;
typedef struct _xfVideoContext xfVideoContext;
typedef struct s_xfDispContext xfDispContext;
typedef struct s_xfVideoContext xfVideoContext;
typedef struct xf_rail_icon_cache xfRailIconCache;
/* Number of buttons that are mapped from X11 to RDP button events. */

8
client/iOS/Misc/TSXTypes.h
View File

@ -14,7 +14,7 @@
#pragma mark Internal state
// Represents the underlying state of a TWSession RDP connection.
typedef enum _TSXConnectionState
typedef enum
{
TSXConnectionClosed =
0, // Session either hasn't begun connecting, or its connection has finished disconnecting.
@ -32,21 +32,21 @@ typedef enum _TSXConnectionState
// Represents the type of screen resolution the user has selected. Most are dynamic sizes, meaning
// that the actual session dimensions are calculated when connecting.
typedef enum _TSXScreenOptions
typedef enum
{
TSXScreenOptionFixed = 0, // A static resolution, like 1024x768
TSXScreenOptionFitScreen = 1, // Upon connection, fit the session to the entire screen size
TSXScreenOptionCustom = 2, // Like fixed just specified by the user
} TSXScreenOptions;
typedef enum _TSXAudioPlaybackOptions
typedef enum
{
TSXAudioPlaybackLocal = 0,
TSXAudioPlaybackServer = 1,
TSXAudioPlaybackSilent = 2
} TSXAudioPlaybackOptions;
typedef enum _TSXProtocolSecurityOptions
typedef enum
{
TSXProtocolSecurityAutomatic = 0,
TSXProtocolSecurityRDP = 1,

5
include/freerdp/addin.h
View File

@ -38,14 +38,13 @@
#define FREERDP_ADDIN_CHANNEL_DEVICE 0x00004000
#define FREERDP_ADDIN_CHANNEL_ENTRYEX 0x00008000
struct _FREERDP_ADDIN
typedef struct
{
DWORD dwFlags;
CHAR cName[16];
CHAR cType[16];
CHAR cSubsystem[16];
};
typedef struct _FREERDP_ADDIN FREERDP_ADDIN;
} FREERDP_ADDIN;
typedef PVIRTUALCHANNELENTRY (*FREERDP_LOAD_CHANNEL_ADDIN_ENTRY_FN)(LPCSTR pszName,
LPCSTR pszSubsystem,

70
include/freerdp/altsec.h
View File

@ -36,30 +36,27 @@
#define STREAM_BITMAP_COMPRESSED 0x02
#define STREAM_BITMAP_V2 0x04
struct _OFFSCREEN_DELETE_LIST
typedef struct
{
UINT32 sIndices;
UINT32 cIndices;
UINT16* indices;
};
typedef struct _OFFSCREEN_DELETE_LIST OFFSCREEN_DELETE_LIST;
} OFFSCREEN_DELETE_LIST;
struct _CREATE_OFFSCREEN_BITMAP_ORDER
typedef struct
{
UINT32 id;
UINT32 cx;
UINT32 cy;
OFFSCREEN_DELETE_LIST deleteList;
};
typedef struct _CREATE_OFFSCREEN_BITMAP_ORDER CREATE_OFFSCREEN_BITMAP_ORDER;
} CREATE_OFFSCREEN_BITMAP_ORDER;
struct _SWITCH_SURFACE_ORDER
typedef struct
{
UINT32 bitmapId;
};
typedef struct _SWITCH_SURFACE_ORDER SWITCH_SURFACE_ORDER;
} SWITCH_SURFACE_ORDER;
struct _NINE_GRID_BITMAP_INFO
typedef struct
{
UINT32 flFlags;
UINT32 ulLeftWidth;
@ -67,26 +64,23 @@ struct _NINE_GRID_BITMAP_INFO
UINT32 ulTopHeight;
UINT32 ulBottomHeight;
UINT32 crTransparent;
};
typedef struct _NINE_GRID_BITMAP_INFO NINE_GRID_BITMAP_INFO;
} NINE_GRID_BITMAP_INFO;
struct _CREATE_NINE_GRID_BITMAP_ORDER
typedef struct
{
UINT32 bitmapBpp;
UINT32 bitmapId;
UINT32 cx;
UINT32 cy;
NINE_GRID_BITMAP_INFO nineGridInfo;
};
typedef struct _CREATE_NINE_GRID_BITMAP_ORDER CREATE_NINE_GRID_BITMAP_ORDER;
} CREATE_NINE_GRID_BITMAP_ORDER;
struct _FRAME_MARKER_ORDER
typedef struct
{
UINT32 action;
};
typedef struct _FRAME_MARKER_ORDER FRAME_MARKER_ORDER;
} FRAME_MARKER_ORDER;
struct _STREAM_BITMAP_FIRST_ORDER
typedef struct
{
UINT32 bitmapFlags;
UINT32 bitmapBpp;
@ -96,44 +90,39 @@ struct _STREAM_BITMAP_FIRST_ORDER
UINT32 bitmapSize;
UINT32 bitmapBlockSize;
BYTE* bitmapBlock;
};
typedef struct _STREAM_BITMAP_FIRST_ORDER STREAM_BITMAP_FIRST_ORDER;
} STREAM_BITMAP_FIRST_ORDER;
struct _STREAM_BITMAP_NEXT_ORDER
typedef struct
{
UINT32 bitmapFlags;
UINT32 bitmapType;
UINT32 bitmapBlockSize;
BYTE* bitmapBlock;
};
typedef struct _STREAM_BITMAP_NEXT_ORDER STREAM_BITMAP_NEXT_ORDER;
} STREAM_BITMAP_NEXT_ORDER;
struct _DRAW_GDIPLUS_FIRST_ORDER
typedef struct
{
UINT32 cbSize;
UINT32 cbTotalSize;
UINT32 cbTotalEmfSize;
BYTE* emfRecords;
};
typedef struct _DRAW_GDIPLUS_FIRST_ORDER DRAW_GDIPLUS_FIRST_ORDER;
} DRAW_GDIPLUS_FIRST_ORDER;
struct _DRAW_GDIPLUS_NEXT_ORDER
typedef struct
{
UINT32 cbSize;
BYTE* emfRecords;
};
typedef struct _DRAW_GDIPLUS_NEXT_ORDER DRAW_GDIPLUS_NEXT_ORDER;
} DRAW_GDIPLUS_NEXT_ORDER;
struct _DRAW_GDIPLUS_END_ORDER
typedef struct
{
UINT32 cbSize;
UINT32 cbTotalSize;
UINT32 cbTotalEmfSize;
BYTE* emfRecords;
};
typedef struct _DRAW_GDIPLUS_END_ORDER DRAW_GDIPLUS_END_ORDER;
} DRAW_GDIPLUS_END_ORDER;
struct _DRAW_GDIPLUS_CACHE_FIRST_ORDER
typedef struct
{
UINT32 flags;
UINT32 cacheType;
@ -141,20 +130,18 @@ struct _DRAW_GDIPLUS_CACHE_FIRST_ORDER
UINT32 cbSize;
UINT32 cbTotalSize;
BYTE* emfRecords;
};
typedef struct _DRAW_GDIPLUS_CACHE_FIRST_ORDER DRAW_GDIPLUS_CACHE_FIRST_ORDER;
} DRAW_GDIPLUS_CACHE_FIRST_ORDER;
struct _DRAW_GDIPLUS_CACHE_NEXT_ORDER
typedef struct
{
UINT32 flags;
UINT32 cacheType;
UINT32 cacheIndex;
UINT32 cbSize;
BYTE* emfRecords;
};
typedef struct _DRAW_GDIPLUS_CACHE_NEXT_ORDER DRAW_GDIPLUS_CACHE_NEXT_ORDER;
} DRAW_GDIPLUS_CACHE_NEXT_ORDER;
struct _DRAW_GDIPLUS_CACHE_END_ORDER
typedef struct
{
UINT32 flags;
UINT32 cacheType;
@ -162,8 +149,7 @@ struct _DRAW_GDIPLUS_CACHE_END_ORDER
UINT32 cbSize;
UINT32 cbTotalSize;
BYTE* emfRecords;
};
typedef struct _DRAW_GDIPLUS_CACHE_END_ORDER DRAW_GDIPLUS_CACHE_END_ORDER;
} DRAW_GDIPLUS_CACHE_END_ORDER;
typedef BOOL (*pCreateOffscreenBitmap)(
rdpContext* context, const CREATE_OFFSCREEN_BITMAP_ORDER* create_offscreen_bitmap);

13
include/freerdp/cache/bitmap.h vendored
View File

@ -27,18 +27,13 @@
#include <winpr/stream.h>
typedef struct _BITMAP_V2_CELL BITMAP_V2_CELL;
typedef struct rdp_bitmap_cache rdpBitmapCache;
#include <freerdp/cache/cache.h>
struct _BITMAP_V2_CELL
typedef struct
{
UINT32 number;
rdpBitmap** entries;
};
} BITMAP_V2_CELL;
struct rdp_bitmap_cache
typedef struct
{
pMemBlt MemBlt; /* 0 */
pMem3Blt Mem3Blt; /* 1 */
@ -54,7 +49,7 @@ struct rdp_bitmap_cache
/* internal */
rdpContext* context;
};
} rdpBitmapCache;
#ifdef __cplusplus
extern "C"

23
include/freerdp/cache/glyph.h vendored
View File

@ -27,39 +27,32 @@
#include <winpr/wlog.h>
#include <winpr/stream.h>
typedef struct _GLYPH_CACHE GLYPH_CACHE;
typedef struct _FRAGMENT_CACHE_ENTRY FRAGMENT_CACHE_ENTRY;
typedef struct _FRAGMENT_CACHE FRAGMENT_CACHE;
typedef struct rdp_glyph_cache rdpGlyphCache;
#include <freerdp/cache/cache.h>
struct _GLYPH_CACHE
typedef struct
{
UINT32 number;
UINT32 maxCellSize;
rdpGlyph** entries;
};
} GLYPH_CACHE;
struct _FRAGMENT_CACHE_ENTRY
typedef struct
{
void* fragment;
UINT32 size;
};
} FRAGMENT_CACHE_ENTRY;
struct _FRAGMENT_CACHE
typedef struct
{
FRAGMENT_CACHE_ENTRY* entries;
};
} FRAGMENT_CACHE;
struct rdp_glyph_cache
typedef struct
{
FRAGMENT_CACHE fragCache;
GLYPH_CACHE glyphCache[10];
wLog* log;
rdpContext* context;
};
} rdpGlyphCache;
#ifdef __cplusplus
extern "C"

5
include/freerdp/cache/palette.h vendored
View File

@ -27,15 +27,14 @@
#include <winpr/stream.h>
typedef struct _PALETTE_TABLE_ENTRY PALETTE_TABLE_ENTRY;
typedef struct rdp_palette_cache rdpPaletteCache;
#include <freerdp/cache/cache.h>
struct _PALETTE_TABLE_ENTRY
typedef struct
{
void* entry;
};
} PALETTE_TABLE_ENTRY;
struct rdp_palette_cache
{

Some files were not shown because too many files have changed in this diff Show More