Merge pull request #859 from awakecoding/master

Unicode Conversion Fix
This commit is contained in:
Marc-André Moreau 2012-12-17 07:48:00 -08:00
commit 61a0cd427e
172 changed files with 2175 additions and 1123 deletions

View File

@ -27,11 +27,10 @@
#include <string.h>
#include <winpr/crt.h>
#include <winpr/print.h>
#include <freerdp/types.h>
#include <freerdp/constants.h>
#include <freerdp/utils/hexdump.h>
#include <freerdp/utils/unicode.h>
#include <freerdp/utils/svc_plugin.h>
#include <freerdp/client/cliprdr.h>
@ -145,7 +144,7 @@ void cliprdr_process_short_format_names(cliprdrPlugin* cliprdr, STREAM* s, UINT3
}
else
{
format_name->length = freerdp_UnicodeToAsciiAlloc((WCHAR*) s->p, &format_name->name, 32 / 2);
format_name->length = ConvertFromUnicode(CP_UTF8, 0, (WCHAR*) s->p, 32 / 2, &format_name->name, 0, NULL, NULL);
}
stream_seek(s, 32);
@ -188,7 +187,8 @@ void cliprdr_process_long_format_names(cliprdrPlugin* cliprdr, STREAM* s, UINT32
break;
}
format_name->length = freerdp_UnicodeToAsciiAlloc((WCHAR*) stream_get_tail(s), &format_name->name, name_len / 2);
format_name->length = ConvertFromUnicode(CP_UTF8, 0, (WCHAR*) stream_get_tail(s), name_len / 2, &format_name->name, 0, NULL, NULL);
stream_seek(s, name_len + 2);
}
}

View File

@ -30,7 +30,6 @@
#include <freerdp/types.h>
#include <freerdp/constants.h>
#include <freerdp/utils/unicode.h>
#include <freerdp/utils/svc_plugin.h>
#include <freerdp/client/cliprdr.h>

View File

@ -42,7 +42,6 @@
#include <winpr/file.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/unicode.h>
#include <freerdp/channels/rdpdr.h>
#include <freerdp/utils/svc_plugin.h>
@ -432,9 +431,9 @@ BOOL drive_file_query_information(DRIVE_FILE* file, UINT32 FsInformationClass, S
BOOL drive_file_set_information(DRIVE_FILE* file, UINT32 FsInformationClass, UINT32 Length, STREAM* input)
{
char* s;
mode_t m;
UINT64 size;
int status;
char* fullpath;
struct STAT st;
struct timeval tv[2];
@ -502,7 +501,11 @@ BOOL drive_file_set_information(DRIVE_FILE* file, UINT32 FsInformationClass, UIN
stream_seek_BYTE(input); /* RootDirectory */
stream_read_UINT32(input, FileNameLength);
freerdp_UnicodeToAsciiAlloc((WCHAR*) stream_get_tail(input), &s, FileNameLength / 2);
status = ConvertFromUnicode(CP_UTF8, 0, (WCHAR*) stream_get_tail(input),
FileNameLength / 2, &s, 0, NULL, NULL);
if (status < 1)
s = (char*) calloc(1, 1);
fullpath = drive_file_combine_fullpath(file->basepath, s);
free(s);
@ -599,7 +602,7 @@ BOOL drive_file_query_directory(DRIVE_FILE* file, UINT32 FsInformationClass, BYT
DEBUG_SVC(" pattern %s matched %s", file->pattern, ent_path);
free(ent_path);
length = freerdp_AsciiToUnicodeAlloc(ent->d_name, &ent_path, 0) * 2;
length = ConvertToUnicode(CP_UTF8, 0, ent->d_name, -1, &ent_path, 0) * 2;
ret = TRUE;

View File

@ -35,17 +35,16 @@
#include <stdlib.h>
#include <string.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/unicode.h>
#include <freerdp/utils/list.h>
#include <freerdp/channels/rdpdr.h>
#include <freerdp/utils/svc_plugin.h>
#include <winpr/crt.h>
#include <winpr/synch.h>
#include <winpr/thread.h>
#include <winpr/interlocked.h>
#include <freerdp/utils/list.h>
#include <freerdp/utils/stream.h>
#include <freerdp/channels/rdpdr.h>
#include <freerdp/utils/svc_plugin.h>
#include "drive_file.h"
typedef struct _DRIVE_DEVICE DRIVE_DEVICE;
@ -119,6 +118,7 @@ static DRIVE_FILE* drive_get_file_by_id(DRIVE_DEVICE* disk, UINT32 id)
static void drive_process_irp_create(DRIVE_DEVICE* disk, IRP* irp)
{
char* path;
int status;
UINT32 FileId;
DRIVE_FILE* file;
BYTE Information;
@ -133,7 +133,11 @@ static void drive_process_irp_create(DRIVE_DEVICE* disk, IRP* irp)
stream_read_UINT32(irp->input, CreateOptions);
stream_read_UINT32(irp->input, PathLength);
freerdp_UnicodeToAsciiAlloc((WCHAR*) stream_get_tail(irp->input), &path, PathLength / 2);
status = ConvertFromUnicode(CP_UTF8, 0, (WCHAR*) stream_get_tail(irp->input),
PathLength / 2, &path, 0, NULL, NULL);
if (status < 1)
path = (char*) calloc(1, 1);
FileId = irp->devman->id_sequence++;
@ -399,7 +403,7 @@ static void drive_process_irp_query_volume_information(DRIVE_DEVICE* disk, IRP*
{
case FileFsVolumeInformation:
/* http://msdn.microsoft.com/en-us/library/cc232108.aspx */
length = freerdp_AsciiToUnicodeAlloc(volumeLabel, &outStr, 0) * 2;
length = ConvertToUnicode(CP_UTF8, 0, volumeLabel, -1, &outStr, 0) * 2;
stream_write_UINT32(output, 17 + length); /* Length */
stream_check_size(output, 17 + length);
stream_write_UINT64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_ctime)); /* VolumeCreationTime */
@ -423,7 +427,7 @@ static void drive_process_irp_query_volume_information(DRIVE_DEVICE* disk, IRP*
case FileFsAttributeInformation:
/* http://msdn.microsoft.com/en-us/library/cc232101.aspx */
length = freerdp_AsciiToUnicodeAlloc(diskType, &outStr, 0) * 2;
length = ConvertToUnicode(CP_UTF8, 0, diskType, -1, &outStr, 0) * 2;
stream_write_UINT32(output, 12 + length); /* Length */
stream_check_size(output, 12 + length);
stream_write_UINT32(output,
@ -468,6 +472,7 @@ static void drive_process_irp_query_volume_information(DRIVE_DEVICE* disk, IRP*
static void drive_process_irp_query_directory(DRIVE_DEVICE* disk, IRP* irp)
{
char* path;
int status;
DRIVE_FILE* file;
BYTE InitialQuery;
UINT32 PathLength;
@ -478,7 +483,11 @@ static void drive_process_irp_query_directory(DRIVE_DEVICE* disk, IRP* irp)
stream_read_UINT32(irp->input, PathLength);
stream_seek(irp->input, 23); /* Padding */
freerdp_UnicodeToAsciiAlloc((WCHAR*) stream_get_tail(irp->input), &path, PathLength / 2);
status = ConvertFromUnicode(CP_UTF8, 0, (WCHAR*) stream_get_tail(irp->input),
PathLength / 2, &path, 0, NULL, NULL);
if (status < 1)
path = (char*) calloc(1, 1);
file = drive_get_file_by_id(disk, irp->FileId);

View File

@ -54,7 +54,6 @@
#include <freerdp/utils/list.h>
#include <freerdp/utils/thread.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/unicode.h>
#include <freerdp/utils/svc_plugin.h>
#include <freerdp/channels/rdpdr.h>
@ -74,6 +73,7 @@ typedef struct _PARALLEL_DEVICE PARALLEL_DEVICE;
static void parallel_process_irp_create(PARALLEL_DEVICE* parallel, IRP* irp)
{
char* path;
int status;
UINT32 PathLength;
stream_seek(irp->input, 28);
@ -81,7 +81,11 @@ static void parallel_process_irp_create(PARALLEL_DEVICE* parallel, IRP* irp)
/* SharedAccess(4) CreateDisposition(4), CreateOptions(4) */
stream_read_UINT32(irp->input, PathLength);
freerdp_UnicodeToAsciiAlloc((WCHAR*) stream_get_tail(irp->input), &path, PathLength / 2);
status = ConvertFromUnicode(CP_UTF8, 0, (WCHAR*) stream_get_tail(irp->input),
PathLength / 2, &path, 0, NULL, NULL);
if (status < 1)
path = (char*) calloc(1, 1);
parallel->id = irp->devman->id_sequence++;
parallel->file = open(parallel->path, O_RDWR);

View File

@ -31,7 +31,6 @@
#include <winpr/interlocked.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/unicode.h>
#include <freerdp/utils/thread.h>
#include <freerdp/utils/svc_plugin.h>
#include <freerdp/channels/rdpdr.h>
@ -266,8 +265,8 @@ void printer_register(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, rdpPrinter* pri
if (printer->is_default)
Flags |= RDPDR_PRINTER_ANNOUNCE_FLAG_DEFAULTPRINTER;
DriverNameLen = freerdp_AsciiToUnicodeAlloc(printer->driver, &DriverName, 0) * 2;
PrintNameLen = freerdp_AsciiToUnicodeAlloc(printer->name, &PrintName, 0) * 2;
DriverNameLen = ConvertToUnicode(CP_UTF8, 0, printer->driver, -1, &DriverName, 0) * 2;
PrintNameLen = ConvertToUnicode(CP_UTF8, 0, printer->name, -1, &PrintName, 0) * 2;
printer_dev->device.data = stream_new(28 + DriverNameLen + PrintNameLen + CachedFieldsLen);

View File

@ -28,7 +28,6 @@
#include <winpr/crt.h>
#include <freerdp/utils/rail.h>
#include <freerdp/utils/unicode.h>
#include "rail_orders.h"
@ -83,7 +82,7 @@ void rail_string_to_unicode_string(rdpRailOrder* rail_order, char* string, RAIL_
if (string == NULL || strlen(string) < 1)
return;
length = freerdp_AsciiToUnicodeAlloc(string, &buffer, 0) * 2;
length = ConvertToUnicode(CP_UTF8, 0, string, -1, &buffer, 0) * 2;
unicode_string->string = (BYTE*) buffer;
unicode_string->length = (UINT16) length;

View File

@ -31,7 +31,6 @@
#include <freerdp/types.h>
#include <freerdp/constants.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/unicode.h>
#include <freerdp/channels/rdpdr.h>
#include <freerdp/utils/svc_plugin.h>
@ -99,7 +98,7 @@ static void rdpdr_send_client_name_request(rdpdrPlugin* rdpdr)
if (!rdpdr->computerName[0])
gethostname(rdpdr->computerName, sizeof(rdpdr->computerName) - 1);
computerNameLenW = freerdp_AsciiToUnicodeAlloc(rdpdr->computerName, &computerNameW, 0) * 2;
computerNameLenW = ConvertToUnicode(CP_UTF8, 0, rdpdr->computerName, -1, &computerNameW, 0) * 2;
data_out = stream_new(16 + computerNameLenW + 2);

View File

@ -43,10 +43,11 @@
#include "serial_tty.h"
#include "serial_constants.h"
#include <winpr/crt.h>
#include <freerdp/freerdp.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/thread.h>
#include <freerdp/utils/unicode.h>
#include <freerdp/channels/rdpdr.h>
typedef struct _SERIAL_DEVICE SERIAL_DEVICE;
@ -79,6 +80,7 @@ static BOOL serial_check_fds(SERIAL_DEVICE* serial);
static void serial_process_irp_create(SERIAL_DEVICE* serial, IRP* irp)
{
char* path;
int status;
SERIAL_TTY* tty;
UINT32 PathLength;
UINT32 FileId;
@ -87,7 +89,11 @@ static void serial_process_irp_create(SERIAL_DEVICE* serial, IRP* irp)
/* SharedAccess(4) CreateDisposition(4), CreateOptions(4) */
stream_read_UINT32(irp->input, PathLength);
freerdp_UnicodeToAsciiAlloc((WCHAR*) stream_get_tail(irp->input), &path, PathLength / 2);
status = ConvertFromUnicode(CP_UTF8, 0, (WCHAR*) stream_get_tail(irp->input),
PathLength / 2, &path, 0, NULL, NULL);
if (status < 1)
path = (char*) calloc(1, 1);
FileId = irp->devman->id_sequence++;

View File

@ -27,13 +27,12 @@
#include <string.h>
#include <winpr/crt.h>
#include <winpr/print.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/unicode.h>
#include <freerdp/utils/list.h>
#include <freerdp/utils/thread.h>
#include <freerdp/utils/svc_plugin.h>
#include <freerdp/utils/hexdump.h>
#include <freerdp/channels/rdpdr.h>
#ifndef _WIN32

View File

@ -40,7 +40,7 @@
#include <winpr/crt.h>
#include <freerdp/freerdp.h>
#include <freerdp/utils/hexdump.h>
#include <winpr/print.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/svc_plugin.h>
#include <freerdp/utils/thread.h>
@ -1547,7 +1547,7 @@ void smartcard_device_control(SMARTCARD_DEVICE* scard, IRP* irp)
stream_set_pos(irp->output, pos);
#ifdef WITH_DEBUG_SCARD
freerdp_hexdump(stream_get_data(irp->output), stream_get_length(irp->output));
winpr_HexDump(stream_get_data(irp->output), stream_get_length(irp->output));
#endif
irp->IoStatus = 0;

View File

@ -27,7 +27,7 @@
#include <string.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/hexdump.h>
#include <winpr/print.h>
#include "tsmf_constants.h"
#include "tsmf_types.h"
@ -425,7 +425,7 @@ BOOL tsmf_codec_parse_media_type(TS_AM_MEDIA_TYPE* mediatype, STREAM* s)
DEBUG_DVC("cbFormat %d", cbFormat);
#ifdef WITH_DEBUG_DVC
freerdp_hexdump(stream_get_tail(s), cbFormat);
winpr_HexDump(stream_get_tail(s), cbFormat);
#endif
switch (mediatype->FormatType)

View File

@ -41,9 +41,9 @@
#include <freerdp/utils/list.h>
#include <freerdp/utils/thread.h>
#include <freerdp/utils/event.h>
#include <freerdp/utils/sleep.h>
#include <freerdp/client/tsmf.h>
#include <winpr/crt.h>
#include <winpr/synch.h>
#include "tsmf_constants.h"
@ -341,7 +341,7 @@ static void tsmf_sample_playback_video(TSMF_SAMPLE* sample)
(sample->end_time >= presentation->audio_start_time ||
sample->end_time < stream->last_end_time))
{
freerdp_usleep((stream->next_start_time - t) / 10);
USleep((stream->next_start_time - t) / 10);
}
stream->next_start_time = t + sample->duration - 50000;
@ -674,10 +674,11 @@ static void* tsmf_stream_playback_func(void* arg)
{
tsmf_stream_process_ack(stream);
sample = tsmf_stream_pop_sample(stream, 1);
if (sample)
tsmf_sample_playback(sample);
else
freerdp_usleep(5000);
USleep(5000);
}
if (stream->eos || presentation->eos)
{

View File

@ -21,9 +21,10 @@
#include "config.h"
#endif
#include <winpr/crt.h>
#include <freerdp/utils/event.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/unicode.h>
#include <freerdp/client/cliprdr.h>
#include "wf_cliprdr.h"

View File

@ -22,7 +22,7 @@
#endif
#include <freerdp/utils/event.h>
#include <freerdp/utils/hexdump.h>
#include <winpr/print.h>
#include <freerdp/utils/rail.h>
#include <freerdp/rail/rail.h>

View File

@ -29,7 +29,6 @@
#include <freerdp/utils/event.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/unicode.h>
#include <freerdp/client/cliprdr.h>
#include "xf_cliprdr.h"
@ -538,7 +537,7 @@ static BYTE* xf_cliprdr_process_requested_unicodetext(BYTE* data, int* size)
int out_size;
inbuf = (char*) lf2crlf(data, size);
out_size = freerdp_AsciiToUnicodeAlloc(inbuf, &outbuf, 0);
out_size = ConvertToUnicode(CP_UTF8, 0, inbuf, -1, &outbuf, 0);
free(inbuf);
*size = (int) ((out_size + 1) * 2);
@ -593,7 +592,8 @@ static BYTE* xf_cliprdr_process_requested_html(BYTE* data, int* size)
if ((BYTE) data[0] == 0xFF && (BYTE) data[1] == 0xFE)
{
freerdp_UnicodeToAsciiAlloc((WCHAR*) (data + 2), &inbuf, (*size - 2) / 2);
ConvertFromUnicode(CP_UTF8, 0, (WCHAR*) (data + 2),
(*size - 2) / 2, &inbuf, 0, NULL, NULL);
}
}
@ -891,7 +891,7 @@ static void xf_cliprdr_process_text(clipboardContext* cb, BYTE* data, int size)
static void xf_cliprdr_process_unicodetext(clipboardContext* cb, BYTE* data, int size)
{
cb->data_length = freerdp_UnicodeToAsciiAlloc((WCHAR*) data, (CHAR**) &(cb->data), size / 2);
ConvertFromUnicode(CP_UTF8, 0, (WCHAR*) data, size / 2, (CHAR**) &(cb->data), 0, NULL, NULL);
crlf2lf(cb->data, &cb->data_length);
}

View File

@ -25,7 +25,7 @@
#include <X11/Xutil.h>
#include <freerdp/utils/event.h>
#include <freerdp/utils/hexdump.h>
#include <winpr/print.h>
#include <freerdp/utils/rail.h>
#include <freerdp/rail/rail.h>
@ -657,7 +657,7 @@ void xf_process_rail_appid_resp_event(xfInfo* xfi, rdpChannels* channels, RDP_EV
"applicationId=(length=%d dump)\n",
appid_resp->windowId, appid_resp->applicationId.length);
freerdp_hexdump(appid_resp->applicationId.string, appid_resp->applicationId.length);
winpr_HexDump(appid_resp->applicationId.string, appid_resp->applicationId.length);
}
void xf_process_rail_langbarinfo_event(xfInfo* xfi, rdpChannels* channels, RDP_EVENT* event)

View File

@ -1131,6 +1131,7 @@ int freerdp_client_parse_command_line_arguments(int argc, char** argv, rdpSettin
settings->ColorDepth = 32;
settings->PerformanceFlags = PERF_FLAG_NONE;
settings->LargePointerFlag = TRUE;
settings->FrameMarkerCommandEnabled = TRUE;
}
CommandLineSwitchCase(arg, "rfx-mode")
{

View File

@ -18,7 +18,7 @@
*/
#include <freerdp/freerdp.h>
#include <freerdp/utils/hexdump.h>
#include <winpr/print.h>
#include <freerdp/utils/stream.h>
#include <freerdp/codec/bitmap.h>

View File

@ -24,7 +24,7 @@
#include <freerdp/constants.h>
#include <freerdp/channels/channels.h>
#include <freerdp/utils/event.h>
#include <freerdp/utils/hexdump.h>
#include <winpr/print.h>
#include <freerdp/client/cliprdr.h>
#include "test_cliprdr.h"
@ -89,7 +89,7 @@ static const BYTE test_data_response_data[] =
static int test_rdp_channel_data(freerdp* instance, int chan_id, BYTE* data, int data_size)
{
printf("chan_id %d data_size %d\n", chan_id, data_size);
freerdp_hexdump(data, data_size);
winpr_HexDump(data, data_size);
return 0;
}
@ -238,7 +238,7 @@ void test_cliprdr(void)
{
data_response_event = (RDP_CB_DATA_RESPONSE_EVENT*)event;
printf("Data response size: %d\n", data_response_event->size);
freerdp_hexdump(data_response_event->data, data_response_event->size);
winpr_HexDump(data_response_event->data, data_response_event->size);
}
freerdp_event_free(event);

View File

@ -25,7 +25,7 @@
#include <freerdp/constants.h>
#include <freerdp/channels/channels.h>
#include <freerdp/utils/event.h>
#include <freerdp/utils/hexdump.h>
#include <winpr/print.h>
#include "test_drdynvc.h"
@ -60,7 +60,7 @@ static int data_received = 0;
static int test_rdp_channel_data(freerdp* instance, int chan_id, BYTE* data, int data_size)
{
printf("chan_id %d data_size %d\n", chan_id, data_size);
freerdp_hexdump(data, data_size);
winpr_HexDump(data, data_size);
data_received = 1;
return 0;
}

View File

@ -77,10 +77,10 @@ void assert_stream(STREAM* s, BYTE* data, int length, const char* func, int line
printf("\n %s (%d): length mismatch, actual:%d, expected:%d\n", func, line, actual_length, length);
printf("\nActual:\n");
freerdp_hexdump(actual_data, actual_length);
winpr_HexDump(actual_data, actual_length);
printf("Expected:\n");
freerdp_hexdump(data, length);
winpr_HexDump(data, length);
CU_FAIL("assert_stream, length mismatch");
return;
@ -93,10 +93,10 @@ void assert_stream(STREAM* s, BYTE* data, int length, const char* func, int line
printf("\n %s (%d): buffer mismatch:\n", func, line);
printf("\nActual:\n");
freerdp_hexdump(actual_data, length);
winpr_HexDump(actual_data, length);
printf("Expected:\n");
freerdp_hexdump(data, length);
winpr_HexDump(data, length);
CU_FAIL("assert_stream, buffer mismatch");
return;

View File

@ -23,7 +23,7 @@
#include <CUnit/CUnit.h>
#include <freerdp/types.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/hexdump.h>
#include <winpr/print.h>
#define add_test_suite(name) \
CU_pSuite pSuite; \

View File

@ -20,7 +20,7 @@
#include "gcc.h"
#include <freerdp/freerdp.h>
#include <freerdp/utils/hexdump.h>
#include <winpr/print.h>
#include <freerdp/utils/stream.h>
#include "test_gcc.h"

View File

@ -20,7 +20,7 @@
#include "license.h"
#include <freerdp/freerdp.h>
#include <freerdp/utils/hexdump.h>
#include <winpr/print.h>
#include <freerdp/utils/stream.h>
#include "test_license.h"
@ -327,44 +327,44 @@ void test_license(void)
printf("\n");
printf("client random:\n");
freerdp_hexdump(license->client_random, 32);
winpr_HexDump(license->client_random, 32);
printf("\n");
printf("server random:\n");
freerdp_hexdump(license->server_random, 32);
winpr_HexDump(license->server_random, 32);
printf("\n");
printf("premaster secret:\n");
freerdp_hexdump(license->premaster_secret, 48);
winpr_HexDump(license->premaster_secret, 48);
printf("\n");
printf("master secret:\n");
freerdp_hexdump(license->master_secret, 48);
winpr_HexDump(license->master_secret, 48);
printf("\n");
printf("session key blob:\n");
freerdp_hexdump(license->session_key_blob, 48);
winpr_HexDump(license->session_key_blob, 48);
printf("\n");
printf("licensing encryption key:\n");
freerdp_hexdump(license->licensing_encryption_key, 16);
winpr_HexDump(license->licensing_encryption_key, 16);
printf("\n");
printf("mac salt key:\n");
freerdp_hexdump(license->mac_salt_key, 16);
winpr_HexDump(license->mac_salt_key, 16);
printf("\n");
printf("modulus:\n");
freerdp_hexdump(license->certificate->cert_info.modulus.data,
winpr_HexDump(license->certificate->cert_info.modulus.data,
license->certificate->cert_info.modulus.length);
printf("\n");
printf("exponent:\n");
freerdp_hexdump(license->certificate->cert_info.exponent, 4);
winpr_HexDump(license->certificate->cert_info.exponent, 4);
printf("\n");
printf("encrypted premaster secret:\n");
freerdp_hexdump(license->encrypted_premaster_secret->data,
winpr_HexDump(license->encrypted_premaster_secret->data,
license->encrypted_premaster_secret->length);
printf("\n");
#endif

View File

@ -20,7 +20,7 @@
#include "mcs.h"
#include <freerdp/freerdp.h>
#include <freerdp/utils/hexdump.h>
#include <winpr/print.h>
#include <freerdp/utils/stream.h>
#include "test_mcs.h"

View File

@ -28,7 +28,7 @@
#include <freerdp/types.h>
#include <freerdp/constants.h>
#include <freerdp/utils/print.h>
#include <freerdp/utils/hexdump.h>
#include <winpr/print.h>
#include <freerdp/codec/nsc.h>
#include "test_nsc.h"
@ -337,7 +337,7 @@ void test_nsc_decode(void)
context = nsc_context_new();
nsc_context_set_cpu_opt(context, CPU_SSE2);
nsc_process_message(context, 32, 15, 10, (BYTE*) nsc_data, sizeof(nsc_data));
/*freerdp_hexdump(context->bmpdata, 15 * 10 * 4);*/
/*winpr_HexDump(context->bmpdata, 15 * 10 * 4);*/
for (i = 0; i < 30000; i++)
{
nsc_process_message(context, 32, 54, 44, (BYTE*) nsc_stress_data, sizeof(nsc_stress_data));
@ -368,9 +368,9 @@ void test_nsc_encode(void)
stream_set_pos(enc_stream, 0);
nsc_compose_message(context, enc_stream, rgb_data, 64, 64, 64 * 3);
}
/*freerdp_hexdump(stream_get_head(enc_stream), stream_get_length(enc_stream));*/
/*winpr_HexDump(stream_get_head(enc_stream), stream_get_length(enc_stream));*/
nsc_process_message(context, 32, 64, 64, stream_get_head(enc_stream), stream_get_length(enc_stream));
/*freerdp_hexdump(context->bmpdata, 64 * 64 * 4);*/
/*winpr_HexDump(context->bmpdata, 64 * 64 * 4);*/
stream_free(enc_stream);
nsc_context_free(context);

View File

@ -18,7 +18,7 @@
*/
#include <freerdp/freerdp.h>
#include <freerdp/utils/hexdump.h>
#include <winpr/print.h>
#include <freerdp/utils/stream.h>
#include "test_orders.h"

View File

@ -18,7 +18,7 @@
*/
#include <freerdp/freerdp.h>
#include <freerdp/utils/hexdump.h>
#include <winpr/print.h>
#include <freerdp/utils/pcap.h>
#include "test_pcap.h"

View File

@ -28,7 +28,7 @@
#include <freerdp/constants.h>
#include <freerdp/channels/channels.h>
#include <freerdp/utils/event.h>
#include <freerdp/utils/hexdump.h>
#include <winpr/print.h>
#include <freerdp/utils/rail.h>
#include <freerdp/rail.h>
@ -446,10 +446,10 @@ int stream_equal_dump(void * dataS, size_t sizeS, void * data, size_t size)
printf("Stream and dump have different length (%d != %d)\n",
(int) sizeS, (int) size);
printf("Stream hexdump:\n");
freerdp_hexdump(dataS, sizeS);
winpr_HexDump(dataS, sizeS);
printf("Dump hexdump:\n");
freerdp_hexdump(data, size);
winpr_HexDump(data, size);
printf("----------------- stream_equal_dump -----------------\n");
return 0;
@ -463,10 +463,10 @@ int stream_equal_dump(void * dataS, size_t sizeS, void * data, size_t size)
printf("----------------- stream_equal_dump -----------------\n");
printf("Stream and dump have different content from %d offset.\n", (int) i);
printf("Stream hexdump:\n");
freerdp_hexdump(dataS, sizeS);
winpr_HexDump(dataS, sizeS);
printf("Dump hexdump:\n");
freerdp_hexdump(data, size);
winpr_HexDump(data, size);
printf("----------------- stream_equal_dump -----------------\n");
return 0;
}
@ -511,7 +511,7 @@ static void emulate_server_send_channel_data(
counter++;
printf("Emulate server packet (%d packet):\n", counter);
freerdp_hexdump(data, size);
winpr_HexDump(data, size);
freerdp_channels_data(instance, 0, (char*)data, size,
CHANNEL_FLAG_FIRST | CHANNEL_FLAG_LAST, size);
@ -539,7 +539,7 @@ static int emulate_client_send_channel_data(
counter++;
printf("Client send to server (%d packet):\n", counter);
freerdp_hexdump(data, size);
winpr_HexDump(data, size);
// add to global dumps list
save_dump(data, size);

View File

@ -30,7 +30,7 @@
#include <freerdp/types.h>
#include <freerdp/utils/print.h>
#include <freerdp/utils/hexdump.h>
#include <winpr/print.h>
#include <freerdp/codec/rfx.h>
#include "rfx_types.h"
@ -337,7 +337,7 @@ void test_encode(void)
rgb_data = (BYTE *) malloc(64 * 64 * 3);
for (i = 0; i < 64; i++)
memcpy(rgb_data + i * 64 * 3, rgb_scanline_data, 64 * 3);
//freerdp_hexdump(rgb_data, 64 * 64 * 3);
//winpr_HexDump(rgb_data, 64 * 64 * 3);
enc_stream = stream_new(65536);
stream_clear(enc_stream);
@ -352,11 +352,11 @@ void test_encode(void)
//dump_buffer(context->priv->cb_g_buffer, 4096);
/*printf("*** Y ***\n");
freerdp_hexdump(stream_get_head(enc_stream), y_size);
winpr_HexDump(stream_get_head(enc_stream), y_size);
printf("*** Cb ***\n");
freerdp_hexdump(stream_get_head(enc_stream) + y_size, cb_size);
winpr_HexDump(stream_get_head(enc_stream) + y_size, cb_size);
printf("*** Cr ***\n");
freerdp_hexdump(stream_get_head(enc_stream) + y_size + cb_size, cr_size);*/
winpr_HexDump(stream_get_head(enc_stream) + y_size + cb_size, cr_size);*/
stream_set_pos(enc_stream, 0);
rfx_decode_rgb(context, enc_stream,

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __UPDATE_ALTSEC_H
#define __UPDATE_ALTSEC_H
#ifndef FREERDP_UPDATE_ALTSEC_H
#define FREERDP_UPDATE_ALTSEC_H
#include <freerdp/types.h>
@ -214,4 +214,4 @@ struct rdp_altsec_update
};
typedef struct rdp_altsec_update rdpAltSecUpdate;
#endif /* __UPDATE_ALTSEC_H */
#endif /* FREERDP_UPDATE_ALTSEC_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __BITMAP_V2_CACHE_H
#define __BITMAP_V2_CACHE_H
#ifndef FREERDP_BITMAP_V2_CACHE_H
#define FREERDP_BITMAP_V2_CACHE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -67,4 +67,4 @@ FREERDP_API void bitmap_cache_register_callbacks(rdpUpdate* update);
FREERDP_API rdpBitmapCache* bitmap_cache_new(rdpSettings* settings);
FREERDP_API void bitmap_cache_free(rdpBitmapCache* bitmap_cache);
#endif /* __BITMAP_V2_CACHE_H */
#endif /* FREERDP_BITMAP_V2_CACHE_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __BRUSH_CACHE_H
#define __BRUSH_CACHE_H
#ifndef FREERDP_BRUSH_CACHE_H
#define FREERDP_BRUSH_CACHE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -64,4 +64,4 @@ FREERDP_API void brush_cache_register_callbacks(rdpUpdate* update);
FREERDP_API rdpBrushCache* brush_cache_new(rdpSettings* settings);
FREERDP_API void brush_cache_free(rdpBrushCache* brush);
#endif /* __BRUSH_CACHE_H */
#endif /* FREERDP_BRUSH_CACHE_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __CACHE_H
#define __CACHE_H
#ifndef FREERDP_CACHE_H
#define FREERDP_CACHE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -51,4 +51,4 @@ struct rdp_cache
FREERDP_API rdpCache* cache_new(rdpSettings* settings);
FREERDP_API void cache_free(rdpCache* cache);
#endif /* __CACHE_H */
#endif /* FREERDP_CACHE_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GLYPH_CACHE_H
#define __GLYPH_CACHE_H
#ifndef FREERDP_GLYPH_CACHE_H
#define FREERDP_GLYPH_CACHE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -70,4 +70,4 @@ FREERDP_API void glyph_cache_register_callbacks(rdpUpdate* update);
FREERDP_API rdpGlyphCache* glyph_cache_new(rdpSettings* settings);
FREERDP_API void glyph_cache_free(rdpGlyphCache* glyph);
#endif /* __GLYPH_CACHE_H */
#endif /* FREERDP_GLYPH_CACHE_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __NINE_GRID_CACHE_H
#define __NINE_GRID_CACHE_H
#ifndef FREERDP_NINE_GRID_CACHE_H
#define FREERDP_NINE_GRID_CACHE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -60,4 +60,4 @@ FREERDP_API void nine_grid_cache_register_callbacks(rdpUpdate* update);
FREERDP_API rdpNineGridCache* nine_grid_cache_new(rdpSettings* settings);
FREERDP_API void nine_grid_cache_free(rdpNineGridCache* nine_grid);
#endif /* __NINE_GRID_CACHE_H */
#endif /* FREERDP_NINE_GRID_CACHE_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __OFFSCREEN_CACHE_H
#define __OFFSCREEN_CACHE_H
#ifndef FREERDP_OFFSCREEN_CACHE_H
#define FREERDP_OFFSCREEN_CACHE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -52,4 +52,4 @@ FREERDP_API void offscreen_cache_register_callbacks(rdpUpdate* update);
FREERDP_API rdpOffscreenCache* offscreen_cache_new(rdpSettings* settings);
FREERDP_API void offscreen_cache_free(rdpOffscreenCache* offscreen);
#endif /* __OFFSCREEN_CACHE_H */
#endif /* FREERDP_OFFSCREEN_CACHE_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __PALETTE_CACHE_H
#define __PALETTE_CACHE_H
#ifndef FREERDP_PALETTE_CACHE_H
#define FREERDP_PALETTE_CACHE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -54,4 +54,4 @@ FREERDP_API void palette_cache_register_callbacks(rdpUpdate* update);
FREERDP_API rdpPaletteCache* palette_cache_new(rdpSettings* settings);
FREERDP_API void palette_cache_free(rdpPaletteCache* palette_cache);
#endif /* __PALETTE_CACHE_H */
#endif /* FREERDP_PALETTE_CACHE_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __POINTER_CACHE_H
#define __POINTER_CACHE_H
#ifndef FREERDP_POINTER_CACHE_H
#define FREERDP_POINTER_CACHE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -50,4 +50,4 @@ FREERDP_API void pointer_cache_register_callbacks(rdpUpdate* update);
FREERDP_API rdpPointerCache* pointer_cache_new(rdpSettings* settings);
FREERDP_API void pointer_cache_free(rdpPointerCache* pointer_cache);
#endif /* __POINTER_CACHE_H */
#endif /* FREERDP_POINTER_CACHE_H */

View File

@ -18,8 +18,8 @@
* limitations under the License.
*/
#ifndef __FREERDP_CHANNELS_H
#define __FREERDP_CHANNELS_H
#ifndef FREERDP_CHANNELS_H
#define FREERDP_CHANNELS_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -52,4 +52,4 @@ FREERDP_API void freerdp_channels_close(rdpChannels* channels, freerdp* instance
}
#endif
#endif /* __FREERDP_CHANNELS_H */
#endif /* FREERDP_CHANNELS_H */

View File

@ -29,8 +29,8 @@
* implementation are thread-safe.
*/
#ifndef __FREERDP_WTSVC_H
#define __FREERDP_WTSVC_H
#ifndef FREERDP_WTSVC_H
#define FREERDP_WTSVC_H
#include <freerdp/types.h>
#include <freerdp/peer.h>
@ -127,4 +127,4 @@ FREERDP_API BOOL WTSVirtualChannelWrite(
FREERDP_API BOOL WTSVirtualChannelClose(
/* __in */ void* hChannelHandle);
#endif /* __FREERDP_WTSVC_H */
#endif /* FREERDP_WTSVC_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __CLIPRDR_PLUGIN
#define __CLIPRDR_PLUGIN
#ifndef FREERDP_CHANNEL_CLIENT_CLIPRDR_H
#define FREERDP_CHANNEL_CLIENT_CLIPRDR_H
/**
* Event Types
@ -71,4 +71,4 @@ struct _RDP_CB_DATA_RESPONSE_EVENT
};
typedef struct _RDP_CB_DATA_RESPONSE_EVENT RDP_CB_DATA_RESPONSE_EVENT;
#endif /* __CLIPRDR_PLUGIN */
#endif /* FREERDP_CHANNEL_CLIENT_CLIPRDR_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef FREERDP_CLIENT_CMDLINE
#define FREERDP_CLIENT_CMDLINE
#ifndef FREERDP_CLIENT_CMDLINE_H
#define FREERDP_CLIENT_CMDLINE_H
#include <freerdp/api.h>
#include <freerdp/freerdp.h>
@ -36,5 +36,4 @@ FREERDP_API int freerdp_client_add_device_channel(rdpSettings* settings, int cou
FREERDP_API int freerdp_client_add_static_channel(rdpSettings* settings, int count, char** params);
FREERDP_API int freerdp_client_add_dynamic_channel(rdpSettings* settings, int count, char** params);
#endif /* FREERDP_CLIENT_CMDLINE */
#endif /* FREERDP_CLIENT_CMDLINE_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef FREERDP_CLIENT_RDP_FILE
#define FREERDP_CLIENT_RDP_FILE
#ifndef FREERDP_CLIENT_RDP_FILE_H
#define FREERDP_CLIENT_RDP_FILE_H
#include <freerdp/api.h>
#include <freerdp/freerdp.h>
@ -140,4 +140,4 @@ FREERDP_API BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, r
FREERDP_API rdpFile* freerdp_client_rdp_file_new();
FREERDP_API void freerdp_client_rdp_file_free(rdpFile* file);
#endif /* FREERDP_CLIENT_RDP_FILE */
#endif /* FREERDP_CLIENT_RDP_FILE_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __TSMF_PLUGIN
#define __TSMF_PLUGIN
#ifndef FREERDP_CHANNEL_CLIENT_TSMF_H
#define FREERDP_CHANNEL_CLIENT_TSMF_H
/**
* Event Types
@ -61,4 +61,4 @@ typedef struct _RDP_REDRAW_EVENT RDP_REDRAW_EVENT;
#define RDP_PIXFMT_I420 0x30323449
#define RDP_PIXFMT_YV12 0x32315659
#endif /* __TSMF_PLUGIN */
#endif /* FREERDP_CHANNEL_CLIENT_TSMF_H */

View File

@ -17,12 +17,12 @@
* limitations under the License.
*/
#ifndef __BITMAP_H
#define __BITMAP_H
#ifndef FREERDP_CODEC_BITMAP_H
#define FREERDP_CODEC_BITMAP_H
#include <freerdp/api.h>
#include <freerdp/types.h>
FREERDP_API BOOL bitmap_decompress(BYTE* srcData, BYTE* dstData, int width, int height, int size, int srcBpp, int dstBpp);
#endif /* __BITMAP_H */
#endif /* FREERDP_CODEC_BITMAP_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __COLOR_H
#define __COLOR_H
#ifndef FREERDP_CODEC_COLOR_H
#define FREERDP_CODEC_COLOR_H
#include <freerdp/api.h>
#include <freerdp/freerdp.h>
@ -264,4 +264,4 @@ FREERDP_API void freerdp_clrconv_free(HCLRCONV clrconv);
}
#endif
#endif /* __COLOR_H */
#endif /* FREERDP_CODEC_COLOR_H */

View File

@ -18,8 +18,8 @@
* limitations under the License.
*/
#ifndef __MPPC_H
#define __MPPC_H
#ifndef FREERDP_CODEC_MPPC_DECODER_H
#define FREERDP_CODEC_MPPC_DECODER_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -53,4 +53,4 @@ FREERDP_API int decompress_rdp_61(struct rdp_mppc_dec* dec, BYTE* cbuf, int len,
FREERDP_API struct rdp_mppc_dec* mppc_dec_new(void);
FREERDP_API void mppc_dec_free(struct rdp_mppc_dec* dec);
#endif
#endif /* FREERDP_CODEC_MPPC_DECODER_H */

View File

@ -18,8 +18,8 @@
* limitations under the License.
*/
#ifndef __MPPC_ENC_H
#define __MPPC_ENC_H
#ifndef FREERDP_CODEC_MPPC_ENCODER_H
#define FREERDP_CODEC_MPPC_ENCODER_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -48,4 +48,4 @@ FREERDP_API BOOL compress_rdp_5(struct rdp_mppc_enc* enc, BYTE* srcData, int len
FREERDP_API struct rdp_mppc_enc* mppc_enc_new(int protocol_type);
FREERDP_API void mppc_enc_free(struct rdp_mppc_enc* enc);
#endif
#endif /* FREERDP_CODEC_MPPC_ENCODER_H */

View File

@ -18,8 +18,8 @@
* limitations under the License.
*/
#ifndef __NSC_H
#define __NSC_H
#ifndef FREERDP_CODEC_NSCODEC_H
#define FREERDP_CODEC_NSCODEC_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -77,4 +77,4 @@ FREERDP_API void nsc_context_free(NSC_CONTEXT* context);
}
#endif
#endif /* __NSC_H */
#endif /* FREERDP_CODEC_NSCODEC_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __RFX_H
#define __RFX_H
#ifndef FREERDP_CODEC_REMOTEFX_H
#define FREERDP_CODEC_REMOTEFX_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -134,4 +134,4 @@ FREERDP_API void rfx_compose_message(RFX_CONTEXT* context, STREAM* s,
}
#endif
#endif /* __RFX_H */
#endif /* FREERDP_CODEC_REMOTEFX_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __FREERDP_CONSTANTS
#define __FREERDP_CONSTANTS
#ifndef FREERDP_CONSTANTS_H
#define FREERDP_CONSTANTS_H
/**
* Codec IDs
@ -110,4 +110,4 @@ typedef enum RDP_PIXEL_FORMAT RDP_PIXEL_FORMAT;
#define OSMINORTYPE_NATIVE_XSERVER 0x0007
#define OSMINORTYPE_PSEUDO_XSERVER 0x0008
#endif
#endif /* FREERDP_CONSTANTS_H */

View File

@ -29,7 +29,7 @@ typedef struct rdp_certificate_store rdpCertificateStore;
#include <freerdp/api.h>
#include <freerdp/settings.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/hexdump.h>
#include <winpr/print.h>
struct rdp_certificate_data
{

View File

@ -48,8 +48,8 @@
* Create IWTSVirtualChannelCallback instance if the new channel is accepted
*/
#ifndef __FREERDP_DVC_H
#define __FREERDP_DVC_H
#ifndef FREERDP_DVC_H
#define FREERDP_DVC_H
#include <freerdp/types.h>
#include <freerdp/addin.h>
@ -151,4 +151,4 @@ struct _IDRDYNVC_ENTRY_POINTS
typedef int (*PDVC_PLUGIN_ENTRY) (IDRDYNVC_ENTRY_POINTS*);
#endif
#endif /* FREERDP_DVC_H */

View File

@ -1,12 +1,24 @@
/*
* File: errorcodes.h
* Author: Arvid
/**
* FreeRDP: A Remote Desktop Protocol Implementation
* Error Codes
*
* Created on April 13, 2012, 9:09 AM
* Copyright 2012 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 ERRORCODES_H
#define ERRORCODES_H
#ifndef FREERDP_ERROR_H
#define FREERDP_ERROR_H
#ifdef __cplusplus
extern "C" {
@ -36,5 +48,4 @@ extern int connectErrorCode;
}
#endif
#endif /* ERRORCODES_H */
#endif /* FREERDP_ERROR_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __RDP_EXTENSION_H
#define __RDP_EXTENSION_H
#ifndef FREERDP_EXTENSION_H
#define FREERDP_EXTENSION_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -55,5 +55,4 @@ typedef FREERDP_EXTENSION_ENTRY_POINTS* PFREERDP_EXTENSION_ENTRY_POINTS;
typedef int (FREERDP_CC* PFREERDP_EXTENSION_ENTRY)(PFREERDP_EXTENSION_ENTRY_POINTS pEntryPoints);
#endif /* __RDP_EXTENSION_H */
#endif /* FREERDP_EXTENSION_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __FREERDP_H
#define __FREERDP_H
#ifndef FREERDP_H
#define FREERDP_H
typedef struct rdp_rdp rdpRdp;
typedef struct rdp_gdi rdpGdi;
@ -33,13 +33,13 @@ typedef struct rdp_freerdp_peer freerdp_peer;
#include <freerdp/api.h>
#include <freerdp/types.h>
#include <freerdp/error.h>
#include <freerdp/settings.h>
#include <freerdp/extension.h>
#include <freerdp/utils/stream.h>
#include <freerdp/input.h>
#include <freerdp/update.h>
#include <freerdp/errorcodes.h>
#ifdef __cplusplus
extern "C" {
@ -202,4 +202,4 @@ FREERDP_API void freerdp_free(freerdp* instance);
}
#endif
#endif
#endif /* FREERDP_H */

View File

@ -17,6 +17,9 @@
* limitations under the License.
*/
#ifndef FREERDP_GDI_16BPP_H
#define FREERDP_GDI_16BPP_H
#include <freerdp/api.h>
#include <freerdp/freerdp.h>
#include <freerdp/gdi/gdi.h>
@ -29,3 +32,5 @@ FREERDP_API int FillRect_16bpp(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr);
FREERDP_API int BitBlt_16bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc, int rop);
FREERDP_API int PatBlt_16bpp(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop);
FREERDP_API int LineTo_16bpp(HGDI_DC hdc, int nXEnd, int nYEnd);
#endif /* FREERDP_GDI_16BPP_H */

View File

@ -17,6 +17,9 @@
* limitations under the License.
*/
#ifndef FREERDP_GDI_32BPP_H
#define FREERDP_GDI_32BPP_H
#include <freerdp/api.h>
#include <freerdp/freerdp.h>
#include <freerdp/gdi/gdi.h>
@ -29,3 +32,5 @@ FREERDP_API int FillRect_32bpp(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr);
FREERDP_API int BitBlt_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc, int rop);
FREERDP_API int PatBlt_32bpp(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop);
FREERDP_API int LineTo_32bpp(HGDI_DC hdc, int nXEnd, int nYEnd);
#endif /* FREERDP_GDI_32BPP_H */

View File

@ -17,6 +17,9 @@
* limitations under the License.
*/
#ifndef FREERDP_GDI_8BPP_H
#define FREERDP_GDI_8BPP_H
#include <freerdp/api.h>
#include <freerdp/freerdp.h>
#include <freerdp/gdi/gdi.h>
@ -29,3 +32,5 @@ FREERDP_API int FillRect_8bpp(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr);
FREERDP_API int BitBlt_8bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc, int rop);
FREERDP_API int PatBlt_8bpp(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop);
FREERDP_API int LineTo_8bpp(HGDI_DC hdc, int nXEnd, int nYEnd);
#endif /* FREERDP_GDI_8BPP_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_BITMAP_H
#define __GDI_BITMAP_H
#ifndef FREERDP_GDI_BITMAP_H
#define FREERDP_GDI_BITMAP_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -40,4 +40,4 @@ FREERDP_API int gdi_BitBlt(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth,
typedef int (*p_BitBlt)(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc, int rop);
#endif /* __GDI_BITMAP_H */
#endif /* FREERDP_GDI_BITMAP_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_BRUSH_H
#define __GDI_BRUSH_H
#ifndef FREERDP_GDI_BRUSH_H
#define FREERDP_GDI_BRUSH_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -29,4 +29,4 @@ FREERDP_API int gdi_PatBlt(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int
typedef int (*p_PatBlt)(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop);
#endif /* __GDI_BRUSH_H */
#endif /* FREERDP_GDI_BRUSH_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_CLIPPING_H
#define __GDI_CLIPPING_H
#ifndef FREERDP_GDI_CLIPPING_H
#define FREERDP_GDI_CLIPPING_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -28,4 +28,4 @@ FREERDP_API HGDI_RGN gdi_GetClipRgn(HGDI_DC hdc);
FREERDP_API int gdi_SetNullClipRgn(HGDI_DC hdc);
FREERDP_API int gdi_ClipCoords(HGDI_DC hdc, int *x, int *y, int *w, int *h, int *srcx, int *srcy);
#endif /* __GDI_CLIPPING_H */
#endif /* FREERDP_GDI_CLIPPING_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_DC_H
#define __GDI_DC_H
#ifndef FREERDP_GDI_DC_H
#define FREERDP_GDI_DC_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -30,4 +30,4 @@ FREERDP_API HGDIOBJECT gdi_SelectObject(HGDI_DC hdc, HGDIOBJECT hgdiobject);
FREERDP_API int gdi_DeleteObject(HGDIOBJECT hgdiobject);
FREERDP_API int gdi_DeleteDC(HGDI_DC hdc);
#endif /* __GDI_DC_H */
#endif /* FREERDP_GDI_DC_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_DRAWING_H
#define __GDI_DRAWING_H
#ifndef FREERDP_GDI_DRAWING_H
#define FREERDP_GDI_DRAWING_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -31,4 +31,4 @@ FREERDP_API int gdi_GetBkMode(HGDI_DC hdc);
FREERDP_API int gdi_SetBkMode(HGDI_DC hdc, int iBkMode);
FREERDP_API GDI_COLOR gdi_SetTextColor(HGDI_DC hdc, GDI_COLOR crColor);
#endif /* __GDI_DRAWING_H */
#endif /* FREERDP_GDI_DRAWING_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_H
#define __GDI_H
#ifndef FREERDP_GDI_H
#define FREERDP_GDI_H
#include <freerdp/api.h>
#include <freerdp/freerdp.h>
@ -296,4 +296,4 @@ FREERDP_API void gdi_free(freerdp* instance);
#define DEBUG_GDI(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__)
#endif
#endif /* __GDI_H */
#endif /* FREERDP_GDI_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_LINE_H
#define __GDI_LINE_H
#ifndef FREERDP_GDI_LINE_H
#define FREERDP_GDI_LINE_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -31,4 +31,4 @@ FREERDP_API int gdi_MoveToEx(HGDI_DC hdc, int X, int Y, HGDI_POINT lpPoint);
typedef int (*p_LineTo)(HGDI_DC hdc, int nXEnd, int nYEnd);
#endif /* __GDI_LINE_H */
#endif /* FREERDP_GDI_LINE_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_PALETTE_H
#define __GDI_PALETTE_H
#ifndef FREERDP_GDI_PALETTE_H
#define FREERDP_GDI_PALETTE_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -26,4 +26,4 @@
FREERDP_API HGDI_PALETTE gdi_CreatePalette(HGDI_PALETTE palette);
FREERDP_API HGDI_PALETTE gdi_GetSystemPalette();
#endif /* __GDI_PALETTE_H */
#endif /* FREERDP_GDI_PALETTE_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_PEN_H
#define __GDI_PEN_H
#ifndef FREERDP_GDI_PEN_H
#define FREERDP_GDI_PEN_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -28,4 +28,4 @@ FREERDP_API BYTE gdi_GetPenColor_8bpp(HGDI_PEN pen);
FREERDP_API UINT16 gdi_GetPenColor_16bpp(HGDI_PEN pen);
FREERDP_API UINT32 gdi_GetPenColor_32bpp(HGDI_PEN pen);
#endif /* __GDI_PEN_H */
#endif /* FREERDP_GDI_PEN_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_REGION_H
#define __GDI_REGION_H
#ifndef FREERDP_GDI_REGION_H
#define FREERDP_GDI_REGION_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -42,4 +42,4 @@ FREERDP_API int gdi_CopyRect(HGDI_RECT dst, HGDI_RECT src);
FREERDP_API int gdi_PtInRect(HGDI_RECT rc, int x, int y);
FREERDP_API int gdi_InvalidateRegion(HGDI_DC hdc, int x, int y, int w, int h);
#endif /* __GDI_REGION_H */
#endif /* FREERDP_GDI_REGION_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_SHAPE_H
#define __GDI_SHAPE_H
#ifndef FREERDP_GDI_SHAPE_H
#define FREERDP_GDI_SHAPE_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -31,4 +31,4 @@ FREERDP_API int gdi_Rectangle(HGDI_DC hdc, int nLeftRect, int nTopRect, int nRig
typedef int (*p_FillRect)(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr);
#endif /* __GDI_SHAPE_H */
#endif /* FREERDP_GDI_SHAPE_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GRAPHICS_H
#define __GRAPHICS_H
#ifndef FREERDP_GRAPHICS_H
#define FREERDP_GRAPHICS_H
typedef struct rdp_bitmap rdpBitmap;
typedef struct rdp_pointer rdpPointer;
@ -166,4 +166,4 @@ FREERDP_API void graphics_register_glyph(rdpGraphics* graphics, rdpGlyph* glyph)
FREERDP_API rdpGraphics* graphics_new(rdpContext* context);
FREERDP_API void graphics_free(rdpGraphics* graphics);
#endif /* __GRAPHICS_H */
#endif /* FREERDP_GRAPHICS_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __INPUT_API_H
#define __INPUT_API_H
#ifndef FREERDP_INPUT_H
#define FREERDP_INPUT_H
typedef struct rdp_input rdpInput;
@ -81,4 +81,4 @@ FREERDP_API void freerdp_input_send_unicode_keyboard_event(rdpInput* input, UINT
FREERDP_API void freerdp_input_send_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y);
FREERDP_API void freerdp_input_send_extended_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y);
#endif /* __INPUT_API_H */
#endif /* FREERDP_INPUT_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __FREERDP_LISTENER_H
#define __FREERDP_LISTENER_H
#ifndef FREERDP_LISTENER_H
#define FREERDP_LISTENER_H
typedef struct rdp_freerdp_listener freerdp_listener;
@ -63,5 +63,4 @@ FREERDP_API void freerdp_listener_free(freerdp_listener* instance);
}
#endif
#endif
#endif /* FREERDP_LISTENER_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __FREERDP_LOCALE_KEYBOARD_H
#define __FREERDP_LOCALE_KEYBOARD_H
#ifndef FREERDP_LOCALE_KEYBOARD_H
#define FREERDP_LOCALE_KEYBOARD_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -205,4 +205,4 @@ FREERDP_API RDP_SCANCODE freerdp_keyboard_get_rdp_scancode_from_x11_keycode(UINT
FREERDP_API UINT32 freerdp_keyboard_get_x11_keycode_from_rdp_scancode(UINT32 scancode, BOOL extended);
FREERDP_API RDP_SCANCODE freerdp_keyboard_get_rdp_scancode_from_virtual_key_code(UINT32 vkcode);
#endif /* __FREERDP_LOCALE_KEYBOARD_H */
#endif /* FREERDP_LOCALE_KEYBOARD_H */

View File

@ -24,8 +24,8 @@
* http://www.microsoft.com/globaldev/reference/winxp/xp-lcid.mspx
*/
#ifndef __FREERDP_LOCALE_H
#define __FREERDP_LOCALE_H
#ifndef FREERDP_LOCALE_H
#define FREERDP_LOCALE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -234,4 +234,4 @@ FREERDP_API UINT32 freerdp_get_system_locale_id();
FREERDP_API UINT32 freerdp_detect_keyboard_layout_from_system_locale();
FREERDP_API const char* freerdp_get_system_locale_name_from_id(UINT32 localeId);
#endif /* __FREERDP_LOCALE_H */
#endif /* FREERDP_LOCALE_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __LOCALE_TIMEZONE_H
#define __LOCALE_TIMEZONE_H
#ifndef FREERDP_LOCALE_TIMEZONE_H
#define FREERDP_LOCALE_TIMEZONE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -26,4 +26,4 @@
FREERDP_API void freerdp_time_zone_detect(TIME_ZONE_INFO* clientTimeZone);
#endif /* __LOCALE_TIMEZONE_H */
#endif /* FREERDP_LOCALE_TIMEZONE_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __FREERDP_VIRTUAL_KEY_CODES_H
#define __FREERDP_VIRTUAL_KEY_CODES_H
#ifndef FREERDP_VIRTUAL_KEY_CODES_H
#define FREERDP_VIRTUAL_KEY_CODES_H
#include <freerdp/types.h>
#include <freerdp/api.h>
@ -306,4 +306,4 @@
FREERDP_API const char* freerdp_keyboard_get_virtual_key_code_name(UINT32 vkcode);
FREERDP_API UINT32 freerdp_keyboard_get_virtual_key_code_from_name(const char* vkcode_name);
#endif /* __FREERDP_VIRTUAL_KEY_CODES_H */
#endif /* FREERDP_VIRTUAL_KEY_CODES_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __FREERDP_PEER_H
#define __FREERDP_PEER_H
#ifndef FREERDP_PEER_H
#define FREERDP_PEER_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -87,5 +87,4 @@ FREERDP_API void freerdp_peer_context_free(freerdp_peer* client);
FREERDP_API freerdp_peer* freerdp_peer_new(int sockfd);
FREERDP_API void freerdp_peer_free(freerdp_peer* client);
#endif /* __FREERDP_PEER_H */
#endif /* FREERDP_PEER_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __UPDATE_POINTER_H
#define __UPDATE_POINTER_H
#ifndef FREERDP_UPDATE_POINTER_H
#define FREERDP_UPDATE_POINTER_H
#include <freerdp/types.h>
@ -99,4 +99,4 @@ struct rdp_pointer_update
};
typedef struct rdp_pointer_update rdpPointerUpdate;
#endif /* __UPDATE_POINTER_H */
#endif /* FREERDP_UPDATE_POINTER_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __UPDATE_PRIMARY_H
#define __UPDATE_PRIMARY_H
#ifndef FREERDP_UPDATE_PRIMARY_H
#define FREERDP_UPDATE_PRIMARY_H
#include <freerdp/types.h>
@ -496,4 +496,4 @@ struct rdp_primary_update
};
typedef struct rdp_primary_update rdpPrimaryUpdate;
#endif /* __UPDATE_PRIMARY_H */
#endif /* FREERDP_UPDATE_PRIMARY_H */

View File

@ -18,8 +18,8 @@
* limitations under the License.
*/
#ifndef __RAIL_GLOBAL_H
#define __RAIL_GLOBAL_H
#ifndef FREERDP_RAIL_GLOBAL_H
#define FREERDP_RAIL_GLOBAL_H
#include <freerdp/types.h>
@ -340,5 +340,4 @@ enum RDP_EVENT_TYPE_RAIL
RDP_EVENT_TYPE_RAIL_CLIENT_LANGBARINFO
};
#endif /* __RAIL_GLOBAL_H */
#endif /* FREERDP_RAIL_GLOBAL_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __RAIL_ICON_CACHE_H
#define __RAIL_ICON_CACHE_H
#ifndef FREERDP_RAIL_ICON_CACHE_H
#define FREERDP_RAIL_ICON_CACHE_H
#include <freerdp/api.h>
#include <freerdp/rail.h>
@ -58,4 +58,4 @@ void icon_cache_put(rdpIconCache* cache, BYTE id, UINT16 index, ICON_INFO* entry
rdpIconCache* icon_cache_new(rdpRail* rail);
void icon_cache_free(rdpIconCache* cache);
#endif /* __RAIL_ICON_H */
#endif /* FREERDP_RAIL_ICON_CACHE_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __RAIL_H
#define __RAIL_H
#ifndef FREERDP_RAIL_H
#define FREERDP_RAIL_H
#include <freerdp/api.h>
#include <freerdp/rail.h>
@ -65,4 +65,4 @@ FREERDP_API void rail_register_update_callbacks(rdpRail* rail, rdpUpdate* update
FREERDP_API rdpRail* rail_new(rdpSettings* settings);
FREERDP_API void rail_free(rdpRail* rail);
#endif /* __RAIL_H */
#endif /* FREERDP_RAIL_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __RAIL_WINDOW_H
#define __RAIL_WINDOW_H
#ifndef FREERDP_RAIL_WINDOW_H
#define FREERDP_RAIL_WINDOW_H
#include <freerdp/api.h>
#include <freerdp/rail.h>
@ -73,4 +73,4 @@ FREERDP_API void rail_CreateWindow(rdpRail* rail, rdpWindow* window);
FREERDP_API void rail_UpdateWindow(rdpRail* rail, rdpWindow* window);
FREERDP_API void rail_DestroyWindow(rdpRail* rail, rdpWindow* window);
#endif /* __RAIL_WINDOW_H */
#endif /* FREERDP_RAIL_WINDOW_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __RAIL_WINDOW_LIST_H
#define __RAIL_WINDOW_LIST_H
#ifndef FREERDP_RAIL_WINDOW_LIST_H
#define FREERDP_RAIL_WINDOW_LIST_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -53,4 +53,4 @@ FREERDP_API void window_list_clear(rdpWindowList* list);
FREERDP_API rdpWindowList* window_list_new(rdpRail* rail);
FREERDP_API void window_list_free(rdpWindowList* list);
#endif /* __RAIL_WINDOW_LIST_H */
#endif /* FREERDP_RAIL_WINDOW_LIST_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __FREERDP_LOCALE_KEYBOARD_RDP_SCANCODE_H
#define __FREERDP_LOCALE_KEYBOARD_RDP_SCANCODE_H
#ifndef FREERDP_LOCALE_KEYBOARD_RDP_SCANCODE_H
#define FREERDP_LOCALE_KEYBOARD_RDP_SCANCODE_H
/* @msdn{cc240584} says:
* "... (a scancode is an 8-bit value specifying a key location on the keyboard).
@ -182,4 +182,4 @@ typedef UINT32 RDP_SCANCODE; /* Our own representation of a RDP protocol scancod
#define RDP_SCANCODE_NUMLOCK_EXTENDED MAKE_RDP_SCANCODE(0x45, TRUE) /* should be RDP_SCANCODE_NUMLOCK */
#define RDP_SCANCODE_RSHIFT_EXTENDED MAKE_RDP_SCANCODE(0x36, TRUE) /* should be RDP_SCANCODE_RSHIFT */
#endif /* __FREERDP_LOCALE_KEYBOARD_RDP_SCANCODE_H */
#endif /* FREERDP_LOCALE_KEYBOARD_RDP_SCANCODE_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __UPDATE_SECONDARY_H
#define __UPDATE_SECONDARY_H
#ifndef FREERDP_UPDATE_SECONDARY_H
#define FREERDP_UPDATE_SECONDARY_H
#include <freerdp/types.h>
@ -221,4 +221,4 @@ struct rdp_secondary_update
};
typedef struct rdp_secondary_update rdpSecondaryUpdate;
#endif /* __UPDATE_SECONDARY_H */
#endif /* FREERDP_UPDATE_SECONDARY_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __SERVER_AUDIN_H
#define __SERVER_AUDIN_H
#ifndef FREERDP_CHANNEL_AUDIN_SERVER_H
#define FREERDP_CHANNEL_AUDIN_SERVER_H
#include <freerdp/channels/wtsvc.h>
#include <freerdp/channels/rdpsnd.h>
@ -92,4 +92,4 @@ struct _audin_server_context
FREERDP_API audin_server_context* audin_server_context_new(WTSVirtualChannelManager* vcm);
FREERDP_API void audin_server_context_free(audin_server_context* context);
#endif
#endif /* FREERDP_CHANNEL_AUDIN_SERVER_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __SERVER_RDPSND_H
#define __SERVER_RDPSND_H
#ifndef FREERDP_CHANNEL_RDPSND_SERVER_H
#define FREERDP_CHANNEL_RDPSND_SERVER_H
#include <freerdp/channels/wtsvc.h>
#include <freerdp/channels/rdpsnd.h>
@ -94,4 +94,4 @@ struct _rdpsnd_server_context
FREERDP_API rdpsnd_server_context* rdpsnd_server_context_new(WTSVirtualChannelManager* vcm);
FREERDP_API void rdpsnd_server_context_free(rdpsnd_server_context* context);
#endif
#endif /* FREERDP_CHANNEL_RDPSND_SERVER_H */

View File

@ -23,8 +23,8 @@
* http://msdn.microsoft.com/en-us/library/aa383580.aspx
*/
#ifndef __FREERDP_SVC_H
#define __FREERDP_SVC_H
#ifndef FREERDP_SVC_H
#define FREERDP_SVC_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -113,4 +113,4 @@ struct _CHANNEL_ENTRY_POINTS_EX
typedef struct _CHANNEL_ENTRY_POINTS_EX CHANNEL_ENTRY_POINTS_EX;
typedef CHANNEL_ENTRY_POINTS_EX* PCHANNEL_ENTRY_POINTS_EX;
#endif
#endif /* FREERDP_SVC_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __UPDATE_API_H
#define __UPDATE_API_H
#ifndef FREERDP_UPDATE_H
#define FREERDP_UPDATE_H
typedef struct rdp_update rdpUpdate;
@ -193,5 +193,4 @@ struct rdp_update
SURFACE_FRAME_MARKER surface_frame_marker;
};
#endif /* __UPDATE_API_H */
#endif /* FREERDP_UPDATE_H */

View File

@ -17,11 +17,11 @@
* limitations under the License.
*/
#ifndef __UTILS_BITMAP_H
#define __UTILS_BITMAP_H
#ifndef FREERDP_UTILS_BITMAP_H
#define FREERDP_UTILS_BITMAP_H
#include <freerdp/api.h>
FREERDP_API void freerdp_bitmap_write(char* filename, void* data, int width, int height, int bpp);
#endif /* __UTILS_BITMAP_H */
#endif /* FREERDP_UTILS_BITMAP_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __UTILS_DEBUG_H
#define __UTILS_DEBUG_H
#ifndef FREERDP_UTILS_DEBUG_H
#define FREERDP_UTILS_DEBUG_H
#include <stdio.h>
@ -33,4 +33,4 @@
#define DEBUG(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__)
#endif
#endif /* __UTILS_DEBUG_H */
#endif /* FREERDP_UTILS_DEBUG_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __DSP_UTILS_H
#define __DSP_UTILS_H
#ifndef FREERDP_UTILS_DSP_H
#define FREERDP_UTILS_DSP_H
#include <freerdp/api.h>
@ -73,5 +73,5 @@ FREERDP_API FREERDP_DSP_CONTEXT* freerdp_dsp_context_new(void);
FREERDP_API void freerdp_dsp_context_free(FREERDP_DSP_CONTEXT* context);
#define freerdp_dsp_context_reset_adpcm(_c) memset(&_c->adpcm, 0, sizeof(ADPCM))
#endif /* __DSP_UTILS_H */
#endif /* FREERDP_UTILS_DSP_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __EVENT_UTILS_H
#define __EVENT_UTILS_H
#ifndef FREERDP_UTILS_EVENT_H
#define FREERDP_UTILS_EVENT_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -27,4 +27,4 @@ FREERDP_API RDP_EVENT* freerdp_event_new(UINT16 event_class, UINT16 event_type,
RDP_EVENT_CALLBACK on_event_free_callback, void* user_data);
FREERDP_API void freerdp_event_free(RDP_EVENT* event);
#endif
#endif /* FREERDP_UTILS_EVENT_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __FILE_UTILS_H
#define __FILE_UTILS_H
#ifndef FREERDP_UTILS_FILE_H
#define FREERDP_UTILS_FILE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -35,4 +35,4 @@ FREERDP_API char* freerdp_get_parent_path(char* base_path, int depth);
FREERDP_API BOOL freerdp_path_contains_separator(char* path);
FREERDP_API void freerdp_detect_paths(rdpSettings* settings);
#endif /* __FILE_UTILS_H */
#endif /* FREERDP_UTILS_FILE_H */

View File

@ -1,29 +0,0 @@
/**
* FreeRDP: A Remote Desktop Protocol Implementation
* Hex Dump Utils
*
* Copyright 2011 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 __UTILS_HEXDUMP_H
#define __UTILS_HEXDUMP_H
#include <freerdp/api.h>
#define FREERDP_HEXDUMP_LINE_LENGTH 16
FREERDP_API void freerdp_hexdump(BYTE* data, int length);
#endif /* __UTILS_HEXDUMP_H */

View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __LIST_UTILS_H
#define __LIST_UTILS_H
#ifndef FREERDP_UTILS_LIST_H
#define FREERDP_UTILS_LIST_H
#include <freerdp/api.h>
@ -50,4 +50,4 @@ FREERDP_API void* list_next(LIST* list, void* data);
FREERDP_API void* list_remove(LIST* list, void* data);
FREERDP_API int list_size(LIST* list);
#endif /* __LIST_UTILS_H */
#endif /* FREERDP_UTILS_LIST_H */

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