github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

macosx: update client

Browse Source
This commit is contained in:
Marc-André Moreau 2012-11-22 15:32:21 -05:00
parent 70170c7437
commit 6b2db2d103
10 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/Mac/MRDPView.h
View File

@ -16,7 +16,8 @@
#import "freerdp/graphics.h"
#import "freerdp/utils/event.h"
#import "freerdp/client/cliprdr.h"
#import "freerdp/utils/args.h"
#import "freerdp/client/file.h"
#import "freerdp/client/cmdline.h"
#import "freerdp/rail/rail.h"
#import "freerdp/rail.h"
#import "freerdp/utils/rail.h"

29
client/Mac/MRDPView.m
View File

@ -1016,6 +1016,7 @@ int rdp_connect()
BOOL mac_pre_connect(freerdp *inst)
{
int status;
char *cptr;
int len;
int i;
@ -1213,12 +1214,28 @@ BOOL mac_pre_connect(freerdp *inst)
}
}
#endif
freerdp_parse_args(inst->settings, g_mrdpview->argc, g_mrdpview->argv, process_plugin_args, inst->context->channels, NULL, NULL);
if ((strcmp(g_mrdpview->argv[1], "-h") == 0) || (strcmp(g_mrdpview->argv[1], "--help") == 0)) {
[NSApp terminate:nil];
return TRUE;
}
if (freerdp_detect_old_command_line_syntax(inst->context->argc, inst->context->argv))
{
printf("warning: deprecated command-line syntax detected!\n");
freerdp_client_print_command_line_help(inst->context->argc, inst->context->argv);
[NSApp terminate:nil];
return TRUE;
}
inst->context->argc = g_mrdpview->argc;
inst->context->argv = g_mrdpview->argv;
status = freerdp_client_parse_command_line_arguments(inst->context->argc, inst->context->argv, inst->settings);
if (status < 0)
{
[NSApp terminate:nil];
return TRUE;
}
freerdp_client_load_addins(inst->context->channels, inst->settings);
[g_mrdpview setViewSize:inst->settings->DesktopWidth :inst->settings->DesktopHeight];

2
libfreerdp/codec/CMakeLists.txt
View File

@ -99,6 +99,8 @@ set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
MODULE freerdp
MODULES freerdp-utils)
message(STATUS "libfreerdp-codec libs: ${${MODULE_PREFIX}_LIBS}")
if(MONOLITHIC_BUILD)
set(FREERDP_LIBS ${FREERDP_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
else()

2
libfreerdp/codec/mppc_enc.c
View File

@ -772,7 +772,7 @@ BOOL compress_rdp_5(struct rdp_mppc_enc* enc, BYTE* srcData, int len)
/* encode copy_offset and insert into output buffer */
if ((copy_offset >= 0) && (copy_offset <= 63))
if (copy_offset <= 63) /* (copy_offset >= 0) is always true */
{
/* insert binary header */
data = 0x1f;

2
libfreerdp/core/CMakeLists.txt
View File

@ -113,7 +113,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${OPENSSL_LIBRARIES})
set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
MONOLITHIC ${MONOLITHIC_BUILD} INTERNAL
MODULE freerdp
MODULES freerdp-core freerdp-crypto freerdp-codec freerdp-locale freerdp-utils)
MODULES freerdp-crypto freerdp-codec freerdp-locale freerdp-utils)
set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
MONOLITHIC ${MONOLITHIC_BUILD}

8
libfreerdp/core/rpc.c
View File

@ -809,6 +809,12 @@ int rpc_in_write(rdpRpc* rpc, BYTE* data, int length)
{
int status;
#ifdef WITH_DEBUG_TSG
rpc_pdu_header_print((rpcconn_hdr_t*) data);
printf("Sending PDU (length: %d)\n", length);
freerdp_hexdump(data, length);
#endif
status = tls_write_all(rpc->TlsIn, data, length);
return status;
@ -871,6 +877,8 @@ int rpc_recv_pdu(rdpRpc* rpc)
header = (rpcconn_hdr_t*) rpc->buffer;
bytesRead += status;
rpc_pdu_header_print(header);
if (header->common.frag_length > rpc->length)
{
rpc->length = header->common.frag_length;

2
libfreerdp/crypto/CMakeLists.txt
View File

@ -59,7 +59,7 @@ set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
MONOLITHIC ${MONOLITHIC_BUILD}
MODULE winpr
MODULES winpr-crt)
MODULES winpr-crt winpr-library)
if(MONOLITHIC_BUILD)
set(FREERDP_LIBS ${FREERDP_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)

3
libfreerdp/locale/keyboard_xkbfile.c
View File

@ -183,7 +183,8 @@ void* freerdp_keyboard_xkb_init()
UINT32 freerdp_keyboard_init_xkbfile(UINT32 keyboardLayoutId, RDP_SCANCODE x11_keycode_to_rdp_scancode[256])
{
void* display;
memset(x11_keycode_to_rdp_scancode, 0, sizeof(x11_keycode_to_rdp_scancode));
ZeroMemory(x11_keycode_to_rdp_scancode, sizeof(RDP_SCANCODE) * 256);
display = freerdp_keyboard_xkb_init();

7
libfreerdp/utils/CMakeLists.txt
View File

@ -65,15 +65,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES SunOS)
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} rt)
endif()
set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
MONOLITHIC ${MONOLITHIC_BUILD} INTERNAL
MODULE freerdp
MODULES freerdp-common)
set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
MONOLITHIC ${MONOLITHIC_BUILD}
MODULE winpr
MODULES winpr-crt winpr-synch)
MODULES winpr-crt winpr-synch winpr-thread)
if(MONOLITHIC_BUILD)
set(FREERDP_LIBS ${FREERDP_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)

2
winpr/libwinpr/file/file.c
View File

@ -300,7 +300,7 @@ HANDLE FindFirstFileA(LPCSTR lpFileName, LPWIN32_FIND_DATAA lpFindFileData)
struct stat fileStat;
WIN32_FILE_SEARCH* pFileSearch;
ZeroMemory(lpFindFileData, sizeof(LPWIN32_FIND_DATAA));
ZeroMemory(lpFindFileData, sizeof(WIN32_FIND_DATAA));
pFileSearch = (WIN32_FILE_SEARCH*) malloc(sizeof(WIN32_FILE_SEARCH));
ZeroMemory(pFileSearch, sizeof(WIN32_FILE_SEARCH));