ef1fd12b15
1) Added missing checks for CreateEvent which also required the following related changes: - changed freerdp_context_new API to BOOL - changed freerdp_peer_context_new API to BOOL - changed pRdpClientNew callback to BOOL - changed pContextNew callback to BOOL - changed psPeerAccepted callback to BOOL - changed psPeerContextNew callback to BOOL 2) Fixed lots of missing alloc and error checks in the changed code's neighbourhood. 3) Check freerdp_client_codecs_prepare result to avoid segfaults caused by using non-initialized codecs. 4) Fixed deadlocks in x11 caused by missing xf_unlock_x11() calls in some error handlers 5) Some fixes in thread pool: - DEFAULT_POOL assignment did not match TP_POOL definition - don't free the pool pointer if it points to the static DEFAULT_POOL - added error handling and cleanup in InitializeThreadpool
102 lines
2.9 KiB
C
102 lines
2.9 KiB
C
/**
|
|
* FreeRDP: A Remote Desktop Protocol Implementation
|
|
* Client Interface
|
|
*
|
|
* Copyright 2013 Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef FREERDP_CLIENT_H
|
|
#define FREERDP_CLIENT_H
|
|
|
|
#include <freerdp/api.h>
|
|
#include <freerdp/freerdp.h>
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/**
|
|
* Client Entry Points
|
|
*/
|
|
|
|
typedef BOOL (*pRdpGlobalInit)(void);
|
|
typedef void (*pRdpGlobalUninit)(void);
|
|
|
|
typedef BOOL (*pRdpClientNew)(freerdp* instance, rdpContext* context);
|
|
typedef void (*pRdpClientFree)(freerdp* instance, rdpContext* context);
|
|
|
|
typedef int (*pRdpClientStart)(rdpContext* context);
|
|
typedef int (*pRdpClientStop)(rdpContext* context);
|
|
|
|
struct rdp_client_entry_points_v1
|
|
{
|
|
DWORD Size;
|
|
DWORD Version;
|
|
|
|
rdpSettings* settings;
|
|
|
|
pRdpGlobalInit GlobalInit;
|
|
pRdpGlobalUninit GlobalUninit;
|
|
|
|
DWORD ContextSize;
|
|
pRdpClientNew ClientNew;
|
|
pRdpClientFree ClientFree;
|
|
|
|
pRdpClientStart ClientStart;
|
|
pRdpClientStop ClientStop;
|
|
};
|
|
|
|
#define RDP_CLIENT_INTERFACE_VERSION 1
|
|
#define RDP_CLIENT_ENTRY_POINT_NAME "RdpClientEntry"
|
|
|
|
typedef int (*pRdpClientEntry)(RDP_CLIENT_ENTRY_POINTS* pEntryPoints);
|
|
|
|
/* Common Client Interface */
|
|
|
|
#define DEFINE_RDP_CLIENT_COMMON() \
|
|
HANDLE thread
|
|
|
|
struct rdp_client_context
|
|
{
|
|
rdpContext context;
|
|
DEFINE_RDP_CLIENT_COMMON();
|
|
};
|
|
|
|
/* Common client functions */
|
|
|
|
FREERDP_API rdpContext* freerdp_client_context_new(RDP_CLIENT_ENTRY_POINTS* pEntryPoints);
|
|
FREERDP_API void freerdp_client_context_free(rdpContext* context);
|
|
|
|
FREERDP_API int freerdp_client_start(rdpContext* context);
|
|
FREERDP_API int freerdp_client_stop(rdpContext* context);
|
|
|
|
FREERDP_API freerdp* freerdp_client_get_instance(rdpContext* context);
|
|
FREERDP_API HANDLE freerdp_client_get_thread(rdpContext* context);
|
|
|
|
FREERDP_API int freerdp_client_settings_parse_command_line(rdpSettings* settings,
|
|
int argc, char** argv, BOOL allowUnknown);
|
|
|
|
FREERDP_API int freerdp_client_settings_parse_connection_file(rdpSettings* settings, const char* filename);
|
|
FREERDP_API int freerdp_client_settings_parse_connection_file_buffer(rdpSettings* settings, const BYTE* buffer, size_t size);
|
|
FREERDP_API int freerdp_client_settings_write_connection_file(const rdpSettings* settings, const char* filename, BOOL unicode);
|
|
|
|
FREERDP_API int freerdp_client_settings_parse_assistance_file(rdpSettings* settings, const char* filename);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* FREERDP_CLIENT_H */
|