mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:mrthebunny/FreeRDP

This commit is contained in:
Marc-André Moreau 2013-11-23 16:31:23 -05:00
parent 76c842285d fce1880cae
commit cf0dace9d9
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/Mac/MRDPView.m
View File

@ -660,6 +660,8 @@ DWORD mac_client_thread(void* param)
if (!is_connected)
return;
gdi_free(context->instance);
freerdp_channels_global_uninit();
if (pixel_data)

3
libfreerdp/core/freerdp.c
View File

@ -40,6 +40,7 @@
#include <freerdp/event.h>
#include <freerdp/locale/keyboard.h>
#include <freerdp/version.h>
#include <freerdp/gdi/gdi.h>
/* connectErrorCode is 'extern' in error.h. See comment there.*/
@ -447,6 +448,8 @@ void freerdp_context_free(freerdp* instance)
graphics_free(instance->context->graphics);
instance->context->graphics = NULL;
gdi_free(instance);
PubSub_Free(instance->context->pubSub);
free(instance->context);

4
winpr/include/winpr/cmdline.h
View File

@ -92,7 +92,7 @@ struct _COMMAND_LINE_ARGUMENT_A
{
LPCSTR Name;
DWORD Flags;
LPSTR Format;
LPCSTR Format;
LPSTR Default;
LPSTR Value;
LONG Index;
@ -104,7 +104,7 @@ struct _COMMAND_LINE_ARGUMENT_W
{
LPCWSTR Name;
DWORD Flags;
LPSTR Format;
LPCSTR Format;
LPWSTR Default;
LPWSTR Value;
LONG Index;

10
winpr/libwinpr/synch/wait.c
View File

@ -87,13 +87,13 @@ int clock_gettime(int clk_id, struct timespec *t)
#if !defined(HAVE_PTHREAD_GNU_EXT)
#include <pthread.h>
static long long ts_difftime(struct timespec *o,
struct timespec *n)
static long long ts_difftime(const struct timespec *o,
const struct timespec *n)
{
long long old = o->tv_sec * 1000000000LL + o->tv_nsec;
long long new = n->tv_sec * 1000000000LL + n->tv_nsec;
long long oldValue = o->tv_sec * 1000000000LL + o->tv_nsec;
long long newValue = n->tv_sec * 1000000000LL + n->tv_nsec;
return new - old;
return newValue - oldValue;
}
static int pthread_timedjoin_np(pthread_t td, void **res,