diff --git a/channels/audin/client/alsa/audin_alsa.c b/channels/audin/client/alsa/audin_alsa.c index baeec2edd..bb2e04dd3 100644 --- a/channels/audin/client/alsa/audin_alsa.c +++ b/channels/audin/client/alsa/audin_alsa.c @@ -37,12 +37,12 @@ typedef struct _AudinALSADevice IAudinDevice iface; char device_name[32]; - uint32 frames_per_packet; - uint32 target_rate; - uint32 actual_rate; + UINT32 frames_per_packet; + UINT32 target_rate; + UINT32 actual_rate; snd_pcm_format_t format; - uint32 target_channels; - uint32 actual_channels; + UINT32 target_channels; + UINT32 actual_channels; int bytes_per_channel; int wformat; int block_size; @@ -265,7 +265,7 @@ static BOOL audin_alsa_format_supported(IAudinDevice* device, audinFormat* forma return FALSE; } -static void audin_alsa_set_format(IAudinDevice* device, audinFormat* format, uint32 FramesPerPacket) +static void audin_alsa_set_format(IAudinDevice* device, audinFormat* format, UINT32 FramesPerPacket) { int bs; AudinALSADevice* alsa = (AudinALSADevice*) device; diff --git a/channels/audin/client/audin_main.c b/channels/audin/client/audin_main.c index 6d6f397d3..f4546319d 100644 --- a/channels/audin/client/audin_main.c +++ b/channels/audin/client/audin_main.c @@ -76,7 +76,7 @@ struct _AUDIN_PLUGIN /* Parsed plugin data */ UINT16 fixed_format; UINT16 fixed_channel; - uint32 fixed_rate; + UINT32 fixed_rate; /* Device interface */ IAudinDevice* device; @@ -86,16 +86,16 @@ static int audin_process_version(IWTSVirtualChannelCallback* pChannelCallback, S { int error; STREAM* out; - uint32 Version; + UINT32 Version; AUDIN_CHANNEL_CALLBACK* callback = (AUDIN_CHANNEL_CALLBACK*) pChannelCallback; - stream_read_uint32(s, Version); + stream_read_UINT32(s, Version); DEBUG_DVC("Version=%d", Version); out = stream_new(5); stream_write_BYTE(out, MSG_SNDIN_VERSION); - stream_write_uint32(out, Version); + stream_write_UINT32(out, Version); error = callback->channel->Write(callback->channel, stream_get_length(s), stream_get_head(s), NULL); stream_free(out); @@ -115,22 +115,22 @@ static int audin_process_formats(IWTSVirtualChannelCallback* pChannelCallback, S { AUDIN_CHANNEL_CALLBACK* callback = (AUDIN_CHANNEL_CALLBACK*) pChannelCallback; AUDIN_PLUGIN* audin = (AUDIN_PLUGIN*) callback->plugin; - uint32 i; + UINT32 i; BYTE* fm; int error; STREAM* out; - uint32 NumFormats; + UINT32 NumFormats; audinFormat format; - uint32 cbSizeFormatsPacket; + UINT32 cbSizeFormatsPacket; - stream_read_uint32(s, NumFormats); + stream_read_UINT32(s, NumFormats); DEBUG_DVC("NumFormats %d", NumFormats); if ((NumFormats < 1) || (NumFormats > 1000)) { DEBUG_WARN("bad NumFormats %d", NumFormats); return 1; } - stream_seek_uint32(s); /* cbSizeFormatsPacket */ + stream_seek_UINT32(s); /* cbSizeFormatsPacket */ callback->formats = (audinFormat*) xzalloc(NumFormats * sizeof(audinFormat)); @@ -143,8 +143,8 @@ static int audin_process_formats(IWTSVirtualChannelCallback* pChannelCallback, S stream_get_mark(s, fm); stream_read_UINT16(s, format.wFormatTag); stream_read_UINT16(s, format.nChannels); - stream_read_uint32(s, format.nSamplesPerSec); - stream_seek_uint32(s); /* nAvgBytesPerSec */ + stream_read_UINT32(s, format.nSamplesPerSec); + stream_seek_UINT32(s); /* nAvgBytesPerSec */ stream_read_UINT16(s, format.nBlockAlign); stream_read_UINT16(s, format.wBitsPerSample); stream_read_UINT16(s, format.cbSize); @@ -180,8 +180,8 @@ static int audin_process_formats(IWTSVirtualChannelCallback* pChannelCallback, S stream_set_pos(out, 0); stream_write_BYTE(out, MSG_SNDIN_FORMATS); /* Header (1 byte) */ - stream_write_uint32(out, callback->formats_count); /* NumFormats (4 bytes) */ - stream_write_uint32(out, cbSizeFormatsPacket); /* cbSizeFormatsPacket (4 bytes) */ + stream_write_UINT32(out, callback->formats_count); /* NumFormats (4 bytes) */ + stream_write_UINT32(out, cbSizeFormatsPacket); /* cbSizeFormatsPacket (4 bytes) */ error = callback->channel->Write(callback->channel, cbSizeFormatsPacket, stream_get_head(out), NULL); stream_free(out); @@ -189,7 +189,7 @@ static int audin_process_formats(IWTSVirtualChannelCallback* pChannelCallback, S return error; } -static int audin_send_format_change_pdu(IWTSVirtualChannelCallback* pChannelCallback, uint32 NewFormat) +static int audin_send_format_change_pdu(IWTSVirtualChannelCallback* pChannelCallback, UINT32 NewFormat) { int error; STREAM* out; @@ -197,14 +197,14 @@ static int audin_send_format_change_pdu(IWTSVirtualChannelCallback* pChannelCall out = stream_new(5); stream_write_BYTE(out, MSG_SNDIN_FORMATCHANGE); - stream_write_uint32(out, NewFormat); + stream_write_UINT32(out, NewFormat); error = callback->channel->Write(callback->channel, 5, stream_get_head(out), NULL); stream_free(out); return error; } -static int audin_send_open_reply_pdu(IWTSVirtualChannelCallback* pChannelCallback, uint32 Result) +static int audin_send_open_reply_pdu(IWTSVirtualChannelCallback* pChannelCallback, UINT32 Result) { int error; STREAM* out; @@ -212,7 +212,7 @@ static int audin_send_open_reply_pdu(IWTSVirtualChannelCallback* pChannelCallbac out = stream_new(5); stream_write_BYTE(out, MSG_SNDIN_OPEN_REPLY); - stream_write_uint32(out, Result); + stream_write_UINT32(out, Result); error = callback->channel->Write(callback->channel, 5, stream_get_head(out), NULL); stream_free(out); @@ -244,16 +244,16 @@ static int audin_process_open(IWTSVirtualChannelCallback* pChannelCallback, STRE AUDIN_CHANNEL_CALLBACK* callback = (AUDIN_CHANNEL_CALLBACK*) pChannelCallback; AUDIN_PLUGIN* audin = (AUDIN_PLUGIN*) callback->plugin; audinFormat* format; - uint32 initialFormat; - uint32 FramesPerPacket; + UINT32 initialFormat; + UINT32 FramesPerPacket; - stream_read_uint32(s, FramesPerPacket); - stream_read_uint32(s, initialFormat); + stream_read_UINT32(s, FramesPerPacket); + stream_read_UINT32(s, initialFormat); DEBUG_DVC("FramesPerPacket=%d initialFormat=%d", FramesPerPacket, initialFormat); - if (initialFormat >= (uint32) callback->formats_count) + if (initialFormat >= (UINT32) callback->formats_count) { DEBUG_WARN("invalid format index %d (total %d)", initialFormat, callback->formats_count); @@ -277,14 +277,14 @@ static int audin_process_format_change(IWTSVirtualChannelCallback* pChannelCallb { AUDIN_CHANNEL_CALLBACK* callback = (AUDIN_CHANNEL_CALLBACK*) pChannelCallback; AUDIN_PLUGIN * audin = (AUDIN_PLUGIN*) callback->plugin; - uint32 NewFormat; + UINT32 NewFormat; audinFormat* format; - stream_read_uint32(s, NewFormat); + stream_read_UINT32(s, NewFormat); DEBUG_DVC("NewFormat=%d", NewFormat); - if (NewFormat >= (uint32) callback->formats_count) + if (NewFormat >= (UINT32) callback->formats_count) { DEBUG_WARN("invalid format index %d (total %d)", NewFormat, callback->formats_count); @@ -305,7 +305,7 @@ static int audin_process_format_change(IWTSVirtualChannelCallback* pChannelCallb return 0; } -static int audin_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, uint32 cbSize, BYTE* pBuffer) +static int audin_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, UINT32 cbSize, BYTE* pBuffer) { int error; STREAM* s; diff --git a/channels/audin/client/audin_main.h b/channels/audin/client/audin_main.h index 60bfbcd25..761cf572c 100644 --- a/channels/audin/client/audin_main.h +++ b/channels/audin/client/audin_main.h @@ -41,7 +41,7 @@ struct audin_format { UINT16 wFormatTag; UINT16 nChannels; - uint32 nSamplesPerSec; + UINT32 nSamplesPerSec; UINT16 nBlockAlign; UINT16 wBitsPerSample; UINT16 cbSize; @@ -53,7 +53,7 @@ struct _IAudinDevice { void (*Open) (IAudinDevice* devplugin, AudinReceive receive, void* user_data); BOOL (*FormatSupported) (IAudinDevice* devplugin, audinFormat* format); - void (*SetFormat) (IAudinDevice* devplugin, audinFormat* format, uint32 FramesPerPacket); + void (*SetFormat) (IAudinDevice* devplugin, audinFormat* format, UINT32 FramesPerPacket); void (*Close) (IAudinDevice* devplugin); void (*Free) (IAudinDevice* devplugin); }; diff --git a/channels/audin/client/pulse/audin_pulse.c b/channels/audin/client/pulse/audin_pulse.c index 3b86afac5..9797b275e 100644 --- a/channels/audin/client/pulse/audin_pulse.c +++ b/channels/audin/client/pulse/audin_pulse.c @@ -37,7 +37,7 @@ typedef struct _AudinPulseDevice IAudinDevice iface; char device_name[32]; - uint32 frames_per_packet; + UINT32 frames_per_packet; pa_threaded_mainloop* mainloop; pa_context* context; pa_sample_spec sample_spec; @@ -197,7 +197,7 @@ static BOOL audin_pulse_format_supported(IAudinDevice* device, audinFormat* form return FALSE; } -static void audin_pulse_set_format(IAudinDevice* device, audinFormat* format, uint32 FramesPerPacket) +static void audin_pulse_set_format(IAudinDevice* device, audinFormat* format, UINT32 FramesPerPacket) { int bs; pa_sample_spec sample_spec = { 0 }; @@ -387,10 +387,10 @@ static void audin_pulse_open(IAudinDevice* device, AudinReceive receive, void* u audin_pulse_stream_state_callback, pulse); pa_stream_set_read_callback(pulse->stream, audin_pulse_stream_request_callback, pulse); - buffer_attr.maxlength = (uint32_t) -1; - buffer_attr.tlength = (uint32_t) -1; - buffer_attr.prebuf = (uint32_t) -1; - buffer_attr.minreq = (uint32_t) -1; + buffer_attr.maxlength = (UINT32_t) -1; + buffer_attr.tlength = (UINT32_t) -1; + buffer_attr.prebuf = (UINT32_t) -1; + buffer_attr.minreq = (UINT32_t) -1; /* 500ms latency */ buffer_attr.fragsize = pa_usec_to_bytes(500000, &pulse->sample_spec); if (pa_stream_connect_record(pulse->stream, diff --git a/channels/audin/server/audin.c b/channels/audin/server/audin.c index 92987902e..8ed36382b 100644 --- a/channels/audin/server/audin.c +++ b/channels/audin/server/audin.c @@ -69,17 +69,17 @@ static void audin_server_select_format(audin_server_context* context, int client static void audin_server_send_version(audin_server* audin, STREAM* s) { stream_write_BYTE(s, MSG_SNDIN_VERSION); - stream_write_uint32(s, 1); /* Version (4 bytes) */ + stream_write_UINT32(s, 1); /* Version (4 bytes) */ WTSVirtualChannelWrite(audin->audin_channel, stream_get_head(s), stream_get_length(s), NULL); } -static BOOL audin_server_recv_version(audin_server* audin, STREAM* s, uint32 length) +static BOOL audin_server_recv_version(audin_server* audin, STREAM* s, UINT32 length) { - uint32 Version; + UINT32 Version; if (length < 4) return FALSE; - stream_read_uint32(s, Version); + stream_read_UINT32(s, Version); if (Version < 1) return FALSE; @@ -89,12 +89,12 @@ static BOOL audin_server_recv_version(audin_server* audin, STREAM* s, uint32 len static void audin_server_send_formats(audin_server* audin, STREAM* s) { int i; - uint32 nAvgBytesPerSec; + UINT32 nAvgBytesPerSec; stream_set_pos(s, 0); stream_write_BYTE(s, MSG_SNDIN_FORMATS); - stream_write_uint32(s, audin->context.num_server_formats); /* NumFormats (4 bytes) */ - stream_write_uint32(s, 0); /* cbSizeFormatsPacket (4 bytes), client-to-server only */ + stream_write_UINT32(s, audin->context.num_server_formats); /* NumFormats (4 bytes) */ + stream_write_UINT32(s, 0); /* cbSizeFormatsPacket (4 bytes), client-to-server only */ for (i = 0; i < audin->context.num_server_formats; i++) { @@ -104,8 +104,8 @@ static void audin_server_send_formats(audin_server* audin, STREAM* s) stream_check_size(s, 18); stream_write_UINT16(s, audin->context.server_formats[i].wFormatTag); stream_write_UINT16(s, audin->context.server_formats[i].nChannels); - stream_write_uint32(s, audin->context.server_formats[i].nSamplesPerSec); - stream_write_uint32(s, nAvgBytesPerSec); + stream_write_UINT32(s, audin->context.server_formats[i].nSamplesPerSec); + stream_write_UINT32(s, nAvgBytesPerSec); stream_write_UINT16(s, audin->context.server_formats[i].nBlockAlign); stream_write_UINT16(s, audin->context.server_formats[i].wBitsPerSample); stream_write_UINT16(s, audin->context.server_formats[i].cbSize); @@ -120,15 +120,15 @@ static void audin_server_send_formats(audin_server* audin, STREAM* s) WTSVirtualChannelWrite(audin->audin_channel, stream_get_head(s), stream_get_length(s), NULL); } -static BOOL audin_server_recv_formats(audin_server* audin, STREAM* s, uint32 length) +static BOOL audin_server_recv_formats(audin_server* audin, STREAM* s, UINT32 length) { int i; if (length < 8) return FALSE; - stream_read_uint32(s, audin->context.num_client_formats); /* NumFormats (4 bytes) */ - stream_seek_uint32(s); /* cbSizeFormatsPacket (4 bytes) */ + stream_read_UINT32(s, audin->context.num_client_formats); /* NumFormats (4 bytes) */ + stream_seek_UINT32(s); /* cbSizeFormatsPacket (4 bytes) */ length -= 8; if (audin->context.num_client_formats <= 0) @@ -146,8 +146,8 @@ static BOOL audin_server_recv_formats(audin_server* audin, STREAM* s, uint32 len stream_read_UINT16(s, audin->context.client_formats[i].wFormatTag); stream_read_UINT16(s, audin->context.client_formats[i].nChannels); - stream_read_uint32(s, audin->context.client_formats[i].nSamplesPerSec); - stream_seek_uint32(s); /* nAvgBytesPerSec */ + stream_read_UINT32(s, audin->context.client_formats[i].nSamplesPerSec); + stream_seek_UINT32(s); /* nAvgBytesPerSec */ stream_read_UINT16(s, audin->context.client_formats[i].nBlockAlign); stream_read_UINT16(s, audin->context.client_formats[i].wBitsPerSample); stream_read_UINT16(s, audin->context.client_formats[i].cbSize); @@ -171,8 +171,8 @@ static void audin_server_send_open(audin_server* audin, STREAM* s) stream_set_pos(s, 0); stream_write_BYTE(s, MSG_SNDIN_OPEN); - stream_write_uint32(s, audin->context.frames_per_packet); /* FramesPerPacket (4 bytes) */ - stream_write_uint32(s, audin->context.selected_client_format); /* initialFormat (4 bytes) */ + stream_write_UINT32(s, audin->context.frames_per_packet); /* FramesPerPacket (4 bytes) */ + stream_write_UINT32(s, audin->context.selected_client_format); /* initialFormat (4 bytes) */ /* * [MS-RDPEAI] 3.2.5.1.6 * The second format specify the format that SHOULD be used to capture data from @@ -180,8 +180,8 @@ static void audin_server_send_open(audin_server* audin, STREAM* s) */ stream_write_UINT16(s, 1); /* wFormatTag = PCM */ stream_write_UINT16(s, 2); /* nChannels */ - stream_write_uint32(s, 44100); /* nSamplesPerSec */ - stream_write_uint32(s, 44100 * 2 * 2); /* nAvgBytesPerSec */ + stream_write_UINT32(s, 44100); /* nSamplesPerSec */ + stream_write_UINT32(s, 44100 * 2 * 2); /* nAvgBytesPerSec */ stream_write_UINT16(s, 4); /* nBlockAlign */ stream_write_UINT16(s, 16); /* wBitsPerSample */ stream_write_UINT16(s, 0); /* cbSize */ @@ -189,20 +189,20 @@ static void audin_server_send_open(audin_server* audin, STREAM* s) WTSVirtualChannelWrite(audin->audin_channel, stream_get_head(s), stream_get_length(s), NULL); } -static BOOL audin_server_recv_open_reply(audin_server* audin, STREAM* s, uint32 length) +static BOOL audin_server_recv_open_reply(audin_server* audin, STREAM* s, UINT32 length) { - uint32 Result; + UINT32 Result; if (length < 4) return FALSE; - stream_read_uint32(s, Result); + stream_read_UINT32(s, Result); IFCALL(audin->context.OpenResult, &audin->context, Result); return TRUE; } -static BOOL audin_server_recv_data(audin_server* audin, STREAM* s, uint32 length) +static BOOL audin_server_recv_data(audin_server* audin, STREAM* s, UINT32 length) { rdpsndFormat* format; int sbytes_per_sample; @@ -267,7 +267,7 @@ static void* audin_server_thread_func(void* arg) void* buffer; BYTE MessageId; BOOL ready = FALSE; - uint32 bytes_returned = 0; + UINT32 bytes_returned = 0; audin_server* audin = (audin_server*) arg; freerdp_thread* thread = audin->audin_channel_thread; diff --git a/channels/cliprdr/client/cliprdr_format.c b/channels/cliprdr/client/cliprdr_format.c index d079dee4e..895d75269 100644 --- a/channels/cliprdr/client/cliprdr_format.c +++ b/channels/cliprdr/client/cliprdr_format.c @@ -89,7 +89,7 @@ void cliprdr_process_format_list_event(cliprdrPlugin* cliprdr, RDP_CB_FORMAT_LIS stream_extend(body, stream_get_size(body) + 4 + name_length); - stream_write_uint32(body, cb_event->formats[i]); + stream_write_UINT32(body, cb_event->formats[i]); stream_write(body, name, name_length); } @@ -109,7 +109,7 @@ static void cliprdr_send_format_list_response(cliprdrPlugin* cliprdr) cliprdr_packet_send(cliprdr, s); } -void cliprdr_process_short_format_names(cliprdrPlugin* cliprdr, STREAM* s, uint32 length, UINT16 flags) +void cliprdr_process_short_format_names(cliprdrPlugin* cliprdr, STREAM* s, UINT32 length, UINT16 flags) { int i; BOOL ascii; @@ -137,7 +137,7 @@ void cliprdr_process_short_format_names(cliprdrPlugin* cliprdr, STREAM* s, uint3 { format_name = &cliprdr->format_names[i]; - stream_read_uint32(s, format_name->id); + stream_read_UINT32(s, format_name->id); if (ascii) { @@ -153,7 +153,7 @@ void cliprdr_process_short_format_names(cliprdrPlugin* cliprdr, STREAM* s, uint3 } } -void cliprdr_process_long_format_names(cliprdrPlugin* cliprdr, STREAM* s, uint32 length, UINT16 flags) +void cliprdr_process_long_format_names(cliprdrPlugin* cliprdr, STREAM* s, UINT32 length, UINT16 flags) { int allocated_formats = 8; BYTE* end_mark; @@ -178,7 +178,7 @@ void cliprdr_process_long_format_names(cliprdrPlugin* cliprdr, STREAM* s, uint32 } format_name = &cliprdr->format_names[cliprdr->num_format_names++]; - stream_read_uint32(s, format_name->id); + stream_read_UINT32(s, format_name->id); format_name->name = NULL; format_name->length = 0; @@ -194,10 +194,10 @@ void cliprdr_process_long_format_names(cliprdrPlugin* cliprdr, STREAM* s, uint32 } } -void cliprdr_process_format_list(cliprdrPlugin* cliprdr, STREAM* s, uint32 dataLen, UINT16 msgFlags) +void cliprdr_process_format_list(cliprdrPlugin* cliprdr, STREAM* s, UINT32 dataLen, UINT16 msgFlags) { int i; - uint32 format; + UINT32 format; BOOL supported; CLIPRDR_FORMAT_NAME* format_name; RDP_CB_FORMAT_LIST_EVENT* cb_event; @@ -218,7 +218,7 @@ void cliprdr_process_format_list(cliprdrPlugin* cliprdr, STREAM* s, uint32 dataL cliprdr_process_short_format_names(cliprdr, s, dataLen, msgFlags); if (cliprdr->num_format_names > 0) - cb_event->formats = (uint32*) malloc(sizeof(uint32) * cliprdr->num_format_names); + cb_event->formats = (UINT32*) malloc(sizeof(UINT32) * cliprdr->num_format_names); cb_event->num_formats = 0; @@ -286,7 +286,7 @@ void cliprdr_process_format_list(cliprdrPlugin* cliprdr, STREAM* s, uint32 dataL cliprdr_send_format_list_response(cliprdr); } -void cliprdr_process_format_list_response(cliprdrPlugin* cliprdr, STREAM* s, uint32 dataLen, UINT16 msgFlags) +void cliprdr_process_format_list_response(cliprdrPlugin* cliprdr, STREAM* s, UINT32 dataLen, UINT16 msgFlags) { /* where is this documented? */ #if 0 @@ -300,14 +300,14 @@ void cliprdr_process_format_list_response(cliprdrPlugin* cliprdr, STREAM* s, uin #endif } -void cliprdr_process_format_data_request(cliprdrPlugin* cliprdr, STREAM* s, uint32 dataLen, UINT16 msgFlags) +void cliprdr_process_format_data_request(cliprdrPlugin* cliprdr, STREAM* s, UINT32 dataLen, UINT16 msgFlags) { RDP_CB_DATA_REQUEST_EVENT* cb_event; cb_event = (RDP_CB_DATA_REQUEST_EVENT*) freerdp_event_new(RDP_EVENT_CLASS_CLIPRDR, RDP_EVENT_TYPE_CB_DATA_REQUEST, NULL, NULL); - stream_read_uint32(s, cb_event->format); + stream_read_UINT32(s, cb_event->format); svc_plugin_send_event((rdpSvcPlugin*) cliprdr, (RDP_EVENT*) cb_event); } @@ -337,11 +337,11 @@ void cliprdr_process_format_data_request_event(cliprdrPlugin* cliprdr, RDP_CB_DA DEBUG_CLIPRDR("Sending Format Data Request"); s = cliprdr_packet_new(CB_FORMAT_DATA_REQUEST, 0, 4); - stream_write_uint32(s, cb_event->format); + stream_write_UINT32(s, cb_event->format); cliprdr_packet_send(cliprdr, s); } -void cliprdr_process_format_data_response(cliprdrPlugin* cliprdr, STREAM* s, uint32 dataLen, UINT16 msgFlags) +void cliprdr_process_format_data_response(cliprdrPlugin* cliprdr, STREAM* s, UINT32 dataLen, UINT16 msgFlags) { RDP_CB_DATA_RESPONSE_EVENT* cb_event; diff --git a/channels/cliprdr/client/cliprdr_format.h b/channels/cliprdr/client/cliprdr_format.h index df0424007..ec6bb343d 100644 --- a/channels/cliprdr/client/cliprdr_format.h +++ b/channels/cliprdr/client/cliprdr_format.h @@ -22,13 +22,13 @@ #define __CLIPRDR_FORMAT_H void cliprdr_process_format_list_event(cliprdrPlugin* cliprdr, RDP_CB_FORMAT_LIST_EVENT* cb_event); -void cliprdr_process_format_list(cliprdrPlugin* cliprdr, STREAM* s, uint32 dataLen, UINT16 msgFlags); -void cliprdr_process_format_list_response(cliprdrPlugin* cliprdr, STREAM* s, uint32 dataLen, UINT16 msgFlags); +void cliprdr_process_format_list(cliprdrPlugin* cliprdr, STREAM* s, UINT32 dataLen, UINT16 msgFlags); +void cliprdr_process_format_list_response(cliprdrPlugin* cliprdr, STREAM* s, UINT32 dataLen, UINT16 msgFlags); -void cliprdr_process_format_data_request(cliprdrPlugin* cliprdr, STREAM* s, uint32 dataLen, UINT16 msgFlags); +void cliprdr_process_format_data_request(cliprdrPlugin* cliprdr, STREAM* s, UINT32 dataLen, UINT16 msgFlags); void cliprdr_process_format_data_response_event(cliprdrPlugin* cliprdr, RDP_CB_DATA_RESPONSE_EVENT* cb_event); void cliprdr_process_format_data_request_event(cliprdrPlugin* cliprdr, RDP_CB_DATA_REQUEST_EVENT* cb_event); -void cliprdr_process_format_data_response(cliprdrPlugin* cliprdr, STREAM* s, uint32 dataLen, UINT16 msgFlags); +void cliprdr_process_format_data_response(cliprdrPlugin* cliprdr, STREAM* s, UINT32 dataLen, UINT16 msgFlags); #endif /* __CLIPRDR_FORMAT_H */ diff --git a/channels/cliprdr/client/cliprdr_main.c b/channels/cliprdr/client/cliprdr_main.c index 101c2fa9e..b42338579 100644 --- a/channels/cliprdr/client/cliprdr_main.c +++ b/channels/cliprdr/client/cliprdr_main.c @@ -55,7 +55,7 @@ static const char* const CB_MSG_TYPE_STRINGS[] = "CB_UNLOCK_CLIPDATA" }; -STREAM* cliprdr_packet_new(UINT16 msgType, UINT16 msgFlags, uint32 dataLen) +STREAM* cliprdr_packet_new(UINT16 msgType, UINT16 msgFlags, UINT32 dataLen) { STREAM* s; @@ -71,12 +71,12 @@ STREAM* cliprdr_packet_new(UINT16 msgType, UINT16 msgFlags, uint32 dataLen) void cliprdr_packet_send(cliprdrPlugin* cliprdr, STREAM* s) { int pos; - uint32 dataLen; + UINT32 dataLen; pos = stream_get_pos(s); dataLen = pos - 8; stream_set_pos(s, 4); - stream_write_uint32(s, dataLen); + stream_write_UINT32(s, dataLen); stream_set_pos(s, pos); svc_plugin_send((rdpSvcPlugin*) cliprdr, s); @@ -87,7 +87,7 @@ static void cliprdr_process_connect(rdpSvcPlugin* plugin) DEBUG_CLIPRDR("connecting"); } -void cliprdr_print_general_capability_flags(uint32 flags) +void cliprdr_print_general_capability_flags(UINT32 flags) { printf("generalFlags (0x%08X) {\n", flags); @@ -105,11 +105,11 @@ void cliprdr_print_general_capability_flags(uint32 flags) static void cliprdr_process_general_capability(cliprdrPlugin* cliprdr, STREAM* s) { - uint32 version; - uint32 generalFlags; + UINT32 version; + UINT32 generalFlags; - stream_read_uint32(s, version); /* version (4 bytes) */ - stream_read_uint32(s, generalFlags); /* generalFlags (4 bytes) */ + stream_read_UINT32(s, version); /* version (4 bytes) */ + stream_read_UINT32(s, generalFlags); /* generalFlags (4 bytes) */ DEBUG_CLIPRDR("Version: %d", version); @@ -165,7 +165,7 @@ static void cliprdr_process_clip_caps(cliprdrPlugin* cliprdr, STREAM* s, UINT16 static void cliprdr_send_clip_caps(cliprdrPlugin* cliprdr) { STREAM* s; - uint32 flags; + UINT32 flags; s = cliprdr_packet_new(CB_CLIP_CAPS, 0, 4 + CB_CAPSTYPE_GENERAL_LEN); @@ -177,8 +177,8 @@ static void cliprdr_send_clip_caps(cliprdrPlugin* cliprdr) stream_write_UINT16(s, 0); /* pad1 */ stream_write_UINT16(s, CB_CAPSTYPE_GENERAL); /* capabilitySetType */ stream_write_UINT16(s, CB_CAPSTYPE_GENERAL_LEN); /* lengthCapability */ - stream_write_uint32(s, CB_CAPS_VERSION_2); /* version */ - stream_write_uint32(s, flags); /* generalFlags */ + stream_write_UINT32(s, CB_CAPS_VERSION_2); /* version */ + stream_write_UINT32(s, flags); /* generalFlags */ cliprdr_packet_send(cliprdr, s); } @@ -198,12 +198,12 @@ static void cliprdr_process_receive(rdpSvcPlugin* plugin, STREAM* s) { UINT16 msgType; UINT16 msgFlags; - uint32 dataLen; + UINT32 dataLen; cliprdrPlugin* cliprdr = (cliprdrPlugin*) plugin; stream_read_UINT16(s, msgType); stream_read_UINT16(s, msgFlags); - stream_read_uint32(s, dataLen); + stream_read_UINT32(s, dataLen); DEBUG_CLIPRDR("msgType: %s (%d), msgFlags: %d dataLen: %d", CB_MSG_TYPE_STRINGS[msgType], msgType, msgFlags, dataLen); diff --git a/channels/cliprdr/client/cliprdr_main.h b/channels/cliprdr/client/cliprdr_main.h index 6daf7d42e..f48a4a742 100644 --- a/channels/cliprdr/client/cliprdr_main.h +++ b/channels/cliprdr/client/cliprdr_main.h @@ -26,7 +26,7 @@ struct _CLIPRDR_FORMAT_NAME { - uint32 id; + UINT32 id; char* name; int length; }; @@ -45,7 +45,7 @@ struct cliprdr_plugin }; typedef struct cliprdr_plugin cliprdrPlugin; -STREAM* cliprdr_packet_new(UINT16 msgType, UINT16 msgFlags, uint32 dataLen); +STREAM* cliprdr_packet_new(UINT16 msgType, UINT16 msgFlags, UINT32 dataLen); void cliprdr_packet_send(cliprdrPlugin* cliprdr, STREAM* data_out); #ifdef WITH_DEBUG_CLIPRDR diff --git a/channels/disk/client/disk_file.c b/channels/disk/client/disk_file.c index f513c2268..7afa38575 100644 --- a/channels/disk/client/disk_file.c +++ b/channels/disk/client/disk_file.c @@ -200,7 +200,7 @@ static void disk_file_set_fullpath(DISK_FILE* file, char* fullpath) file->filename += 1; } -static BOOL disk_file_init(DISK_FILE* file, uint32 DesiredAccess, uint32 CreateDisposition, uint32 CreateOptions) +static BOOL disk_file_init(DISK_FILE* file, UINT32 DesiredAccess, UINT32 CreateDisposition, UINT32 CreateOptions) { struct STAT st; BOOL exists; @@ -306,8 +306,8 @@ static BOOL disk_file_init(DISK_FILE* file, uint32 DesiredAccess, uint32 CreateD return TRUE; } -DISK_FILE* disk_file_new(const char* base_path, const char* path, uint32 id, - uint32 DesiredAccess, uint32 CreateDisposition, uint32 CreateOptions) +DISK_FILE* disk_file_new(const char* base_path, const char* path, UINT32 id, + UINT32 DesiredAccess, UINT32 CreateDisposition, UINT32 CreateOptions) { DISK_FILE* file; @@ -346,7 +346,7 @@ void disk_file_free(DISK_FILE* file) free(file); } -BOOL disk_file_seek(DISK_FILE* file, uint64 Offset) +BOOL disk_file_seek(DISK_FILE* file, UINT64 Offset) { if (file->is_dir || file->fd == -1) return FALSE; @@ -357,7 +357,7 @@ BOOL disk_file_seek(DISK_FILE* file, uint64 Offset) return TRUE; } -BOOL disk_file_read(DISK_FILE* file, BYTE* buffer, uint32* Length) +BOOL disk_file_read(DISK_FILE* file, BYTE* buffer, UINT32* Length) { ssize_t r; @@ -367,12 +367,12 @@ BOOL disk_file_read(DISK_FILE* file, BYTE* buffer, uint32* Length) r = read(file->fd, buffer, *Length); if (r < 0) return FALSE; - *Length = (uint32)r; + *Length = (UINT32)r; return TRUE; } -BOOL disk_file_write(DISK_FILE* file, BYTE* buffer, uint32 Length) +BOOL disk_file_write(DISK_FILE* file, BYTE* buffer, UINT32 Length) { ssize_t r; @@ -391,36 +391,36 @@ BOOL disk_file_write(DISK_FILE* file, BYTE* buffer, uint32 Length) return TRUE; } -BOOL disk_file_query_information(DISK_FILE* file, uint32 FsInformationClass, STREAM* output) +BOOL disk_file_query_information(DISK_FILE* file, UINT32 FsInformationClass, STREAM* output) { struct STAT st; if (STAT(file->fullpath, &st) != 0) { - stream_write_uint32(output, 0); /* Length */ + stream_write_UINT32(output, 0); /* Length */ return FALSE; } switch (FsInformationClass) { case FileBasicInformation: /* http://msdn.microsoft.com/en-us/library/cc232094.aspx */ - stream_write_uint32(output, 36); /* Length */ + stream_write_UINT32(output, 36); /* Length */ stream_check_size(output, 36); - stream_write_uint64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_mtime)); /* CreationTime */ - stream_write_uint64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_atime)); /* LastAccessTime */ - stream_write_uint64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_mtime)); /* LastWriteTime */ - stream_write_uint64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_ctime)); /* ChangeTime */ - stream_write_uint32(output, FILE_ATTR_SYSTEM_TO_RDP(file, st)); /* FileAttributes */ + stream_write_UINT64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_mtime)); /* CreationTime */ + stream_write_UINT64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_atime)); /* LastAccessTime */ + stream_write_UINT64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_mtime)); /* LastWriteTime */ + stream_write_UINT64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_ctime)); /* ChangeTime */ + stream_write_UINT32(output, FILE_ATTR_SYSTEM_TO_RDP(file, st)); /* FileAttributes */ /* Reserved(4), MUST NOT be added! */ break; case FileStandardInformation: /* http://msdn.microsoft.com/en-us/library/cc232088.aspx */ - stream_write_uint32(output, 22); /* Length */ + stream_write_UINT32(output, 22); /* Length */ stream_check_size(output, 22); - stream_write_uint64(output, st.st_size); /* AllocationSize */ - stream_write_uint64(output, st.st_size); /* EndOfFile */ - stream_write_uint32(output, st.st_nlink); /* NumberOfLinks */ + stream_write_UINT64(output, st.st_size); /* AllocationSize */ + stream_write_UINT64(output, st.st_size); /* EndOfFile */ + stream_write_UINT32(output, st.st_nlink); /* NumberOfLinks */ stream_write_BYTE(output, file->delete_pending ? 1 : 0); /* DeletePending */ stream_write_BYTE(output, file->is_dir ? 1 : 0); /* Directory */ /* Reserved(2), MUST NOT be added! */ @@ -428,42 +428,42 @@ BOOL disk_file_query_information(DISK_FILE* file, uint32 FsInformationClass, STR case FileAttributeTagInformation: /* http://msdn.microsoft.com/en-us/library/cc232093.aspx */ - stream_write_uint32(output, 8); /* Length */ + stream_write_UINT32(output, 8); /* Length */ stream_check_size(output, 8); - stream_write_uint32(output, FILE_ATTR_SYSTEM_TO_RDP(file, st)); /* FileAttributes */ - stream_write_uint32(output, 0); /* ReparseTag */ + stream_write_UINT32(output, FILE_ATTR_SYSTEM_TO_RDP(file, st)); /* FileAttributes */ + stream_write_UINT32(output, 0); /* ReparseTag */ break; default: - stream_write_uint32(output, 0); /* Length */ + stream_write_UINT32(output, 0); /* Length */ DEBUG_WARN("invalid FsInformationClass %d", FsInformationClass); return FALSE; } return TRUE; } -BOOL disk_file_set_information(DISK_FILE* file, uint32 FsInformationClass, uint32 Length, STREAM* input) +BOOL disk_file_set_information(DISK_FILE* file, UINT32 FsInformationClass, UINT32 Length, STREAM* input) { char* s; mode_t m; - uint64 size; + UINT64 size; char* fullpath; struct STAT st; struct timeval tv[2]; - uint64 LastWriteTime; - uint32 FileAttributes; - uint32 FileNameLength; + UINT64 LastWriteTime; + UINT32 FileAttributes; + UINT32 FileNameLength; switch (FsInformationClass) { case FileBasicInformation: /* http://msdn.microsoft.com/en-us/library/cc232094.aspx */ - stream_seek_uint64(input); /* CreationTime */ - stream_seek_uint64(input); /* LastAccessTime */ - stream_read_uint64(input, LastWriteTime); - stream_seek_uint64(input); /* ChangeTime */ - stream_read_uint32(input, FileAttributes); + stream_seek_UINT64(input); /* CreationTime */ + stream_seek_UINT64(input); /* LastAccessTime */ + stream_read_UINT64(input, LastWriteTime); + stream_seek_UINT64(input); /* ChangeTime */ + stream_read_UINT32(input, FileAttributes); if (FSTAT(file->fd, &st) != 0) return FALSE; @@ -493,7 +493,7 @@ BOOL disk_file_set_information(DISK_FILE* file, uint32 FsInformationClass, uint3 /* http://msdn.microsoft.com/en-us/library/cc232067.aspx */ case FileAllocationInformation: /* http://msdn.microsoft.com/en-us/library/cc232076.aspx */ - stream_read_uint64(input, size); + stream_read_UINT64(input, size); if (ftruncate(file->fd, size) != 0) return FALSE; break; @@ -511,7 +511,7 @@ BOOL disk_file_set_information(DISK_FILE* file, uint32 FsInformationClass, uint3 /* http://msdn.microsoft.com/en-us/library/cc232085.aspx */ stream_seek_BYTE(input); /* ReplaceIfExists */ stream_seek_BYTE(input); /* RootDirectory */ - stream_read_uint32(input, FileNameLength); + stream_read_UINT32(input, FileNameLength); freerdp_UnicodeToAsciiAlloc((WCHAR*) stream_get_tail(input), &s, FileNameLength / 2); @@ -541,7 +541,7 @@ BOOL disk_file_set_information(DISK_FILE* file, uint32 FsInformationClass, uint3 return TRUE; } -BOOL disk_file_query_directory(DISK_FILE* file, uint32 FsInformationClass, BYTE InitialQuery, +BOOL disk_file_query_directory(DISK_FILE* file, UINT32 FsInformationClass, BYTE InitialQuery, const char* path, STREAM* output) { int length; @@ -554,7 +554,7 @@ BOOL disk_file_query_directory(DISK_FILE* file, uint32 FsInformationClass, BYTE if (!file->dir) { - stream_write_uint32(output, 0); /* Length */ + stream_write_UINT32(output, 0); /* Length */ stream_write_BYTE(output, 0); /* Padding */ return FALSE; } @@ -591,7 +591,7 @@ BOOL disk_file_query_directory(DISK_FILE* file, uint32 FsInformationClass, BYTE if (ent == NULL) { DEBUG_SVC(" pattern %s not found.", file->pattern); - stream_write_uint32(output, 0); /* Length */ + stream_write_UINT32(output, 0); /* Length */ stream_write_BYTE(output, 0); /* Padding */ return FALSE; } @@ -616,54 +616,54 @@ BOOL disk_file_query_directory(DISK_FILE* file, uint32 FsInformationClass, BYTE { case FileDirectoryInformation: /* http://msdn.microsoft.com/en-us/library/cc232097.aspx */ - stream_write_uint32(output, 64 + length); /* Length */ + stream_write_UINT32(output, 64 + length); /* Length */ stream_check_size(output, 64 + length); - stream_write_uint32(output, 0); /* NextEntryOffset */ - stream_write_uint32(output, 0); /* FileIndex */ - stream_write_uint64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_mtime)); /* CreationTime */ - stream_write_uint64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_atime)); /* LastAccessTime */ - stream_write_uint64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_mtime)); /* LastWriteTime */ - stream_write_uint64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_ctime)); /* ChangeTime */ - stream_write_uint64(output, st.st_size); /* EndOfFile */ - stream_write_uint64(output, st.st_size); /* AllocationSize */ - stream_write_uint32(output, FILE_ATTR_SYSTEM_TO_RDP(file, st)); /* FileAttributes */ - stream_write_uint32(output, length); /* FileNameLength */ + stream_write_UINT32(output, 0); /* NextEntryOffset */ + stream_write_UINT32(output, 0); /* FileIndex */ + stream_write_UINT64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_mtime)); /* CreationTime */ + stream_write_UINT64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_atime)); /* LastAccessTime */ + stream_write_UINT64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_mtime)); /* LastWriteTime */ + stream_write_UINT64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_ctime)); /* ChangeTime */ + stream_write_UINT64(output, st.st_size); /* EndOfFile */ + stream_write_UINT64(output, st.st_size); /* AllocationSize */ + stream_write_UINT32(output, FILE_ATTR_SYSTEM_TO_RDP(file, st)); /* FileAttributes */ + stream_write_UINT32(output, length); /* FileNameLength */ stream_write(output, ent_path, length); break; case FileFullDirectoryInformation: /* http://msdn.microsoft.com/en-us/library/cc232068.aspx */ - stream_write_uint32(output, 68 + length); /* Length */ + stream_write_UINT32(output, 68 + length); /* Length */ stream_check_size(output, 68 + length); - stream_write_uint32(output, 0); /* NextEntryOffset */ - stream_write_uint32(output, 0); /* FileIndex */ - stream_write_uint64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_mtime)); /* CreationTime */ - stream_write_uint64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_atime)); /* LastAccessTime */ - stream_write_uint64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_mtime)); /* LastWriteTime */ - stream_write_uint64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_ctime)); /* ChangeTime */ - stream_write_uint64(output, st.st_size); /* EndOfFile */ - stream_write_uint64(output, st.st_size); /* AllocationSize */ - stream_write_uint32(output, FILE_ATTR_SYSTEM_TO_RDP(file, st)); /* FileAttributes */ - stream_write_uint32(output, length); /* FileNameLength */ - stream_write_uint32(output, 0); /* EaSize */ + stream_write_UINT32(output, 0); /* NextEntryOffset */ + stream_write_UINT32(output, 0); /* FileIndex */ + stream_write_UINT64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_mtime)); /* CreationTime */ + stream_write_UINT64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_atime)); /* LastAccessTime */ + stream_write_UINT64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_mtime)); /* LastWriteTime */ + stream_write_UINT64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_ctime)); /* ChangeTime */ + stream_write_UINT64(output, st.st_size); /* EndOfFile */ + stream_write_UINT64(output, st.st_size); /* AllocationSize */ + stream_write_UINT32(output, FILE_ATTR_SYSTEM_TO_RDP(file, st)); /* FileAttributes */ + stream_write_UINT32(output, length); /* FileNameLength */ + stream_write_UINT32(output, 0); /* EaSize */ stream_write(output, ent_path, length); break; case FileBothDirectoryInformation: /* http://msdn.microsoft.com/en-us/library/cc232095.aspx */ - stream_write_uint32(output, 93 + length); /* Length */ + stream_write_UINT32(output, 93 + length); /* Length */ stream_check_size(output, 93 + length); - stream_write_uint32(output, 0); /* NextEntryOffset */ - stream_write_uint32(output, 0); /* FileIndex */ - stream_write_uint64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_mtime)); /* CreationTime */ - stream_write_uint64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_atime)); /* LastAccessTime */ - stream_write_uint64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_mtime)); /* LastWriteTime */ - stream_write_uint64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_ctime)); /* ChangeTime */ - stream_write_uint64(output, st.st_size); /* EndOfFile */ - stream_write_uint64(output, st.st_size); /* AllocationSize */ - stream_write_uint32(output, FILE_ATTR_SYSTEM_TO_RDP(file, st)); /* FileAttributes */ - stream_write_uint32(output, length); /* FileNameLength */ - stream_write_uint32(output, 0); /* EaSize */ + stream_write_UINT32(output, 0); /* NextEntryOffset */ + stream_write_UINT32(output, 0); /* FileIndex */ + stream_write_UINT64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_mtime)); /* CreationTime */ + stream_write_UINT64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_atime)); /* LastAccessTime */ + stream_write_UINT64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_mtime)); /* LastWriteTime */ + stream_write_UINT64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_ctime)); /* ChangeTime */ + stream_write_UINT64(output, st.st_size); /* EndOfFile */ + stream_write_UINT64(output, st.st_size); /* AllocationSize */ + stream_write_UINT32(output, FILE_ATTR_SYSTEM_TO_RDP(file, st)); /* FileAttributes */ + stream_write_UINT32(output, length); /* FileNameLength */ + stream_write_UINT32(output, 0); /* EaSize */ stream_write_BYTE(output, 0); /* ShortNameLength */ /* Reserved(1), MUST NOT be added! */ stream_write_zero(output, 24); /* ShortName */ @@ -672,16 +672,16 @@ BOOL disk_file_query_directory(DISK_FILE* file, uint32 FsInformationClass, BYTE case FileNamesInformation: /* http://msdn.microsoft.com/en-us/library/cc232077.aspx */ - stream_write_uint32(output, 12 + length); /* Length */ + stream_write_UINT32(output, 12 + length); /* Length */ stream_check_size(output, 12 + length); - stream_write_uint32(output, 0); /* NextEntryOffset */ - stream_write_uint32(output, 0); /* FileIndex */ - stream_write_uint32(output, length); /* FileNameLength */ + stream_write_UINT32(output, 0); /* NextEntryOffset */ + stream_write_UINT32(output, 0); /* FileIndex */ + stream_write_UINT32(output, length); /* FileNameLength */ stream_write(output, ent_path, length); break; default: - stream_write_uint32(output, 0); /* Length */ + stream_write_UINT32(output, 0); /* Length */ stream_write_BYTE(output, 0); /* Padding */ DEBUG_WARN("invalid FsInformationClass %d", FsInformationClass); ret = FALSE; diff --git a/channels/disk/client/disk_file.h b/channels/disk/client/disk_file.h index b0c9a4e50..60147fc9b 100644 --- a/channels/disk/client/disk_file.h +++ b/channels/disk/client/disk_file.h @@ -49,8 +49,8 @@ #define unlink(a) _unlink(a) #define ftruncate(a,b) _chsize(a,b) -typedef uint32 ssize_t ; -typedef uint32 mode_t ; +typedef UINT32 ssize_t ; +typedef UINT32 mode_t ; #elif defined(__APPLE__) || defined(__FreeBSD__) #define STAT stat @@ -70,9 +70,9 @@ typedef uint32 mode_t ; #define EPOCH_DIFF 11644473600LL #define FILE_TIME_SYSTEM_TO_RDP(_t) \ - (((uint64)(_t) + EPOCH_DIFF) * 10000000LL) + (((UINT64)(_t) + EPOCH_DIFF) * 10000000LL) #define FILE_TIME_RDP_TO_SYSTEM(_t) \ - (((_t) == 0LL || (_t) == (uint64)(-1LL)) ? 0 : (time_t)((_t) / 10000000LL - EPOCH_DIFF)) + (((_t) == 0LL || (_t) == (UINT64)(-1LL)) ? 0 : (time_t)((_t) / 10000000LL - EPOCH_DIFF)) #define FILE_ATTR_SYSTEM_TO_RDP(_f, _st) ( \ (S_ISDIR(_st.st_mode) ? FILE_ATTRIBUTE_DIRECTORY : 0) | \ @@ -83,7 +83,7 @@ typedef uint32 mode_t ; typedef struct _DISK_FILE DISK_FILE; struct _DISK_FILE { - uint32 id; + UINT32 id; BOOL is_dir; int fd; int err; @@ -95,16 +95,16 @@ struct _DISK_FILE BOOL delete_pending; }; -DISK_FILE* disk_file_new(const char* base_path, const char* path, uint32 id, - uint32 DesiredAccess, uint32 CreateDisposition, uint32 CreateOptions); +DISK_FILE* disk_file_new(const char* base_path, const char* path, UINT32 id, + UINT32 DesiredAccess, UINT32 CreateDisposition, UINT32 CreateOptions); void disk_file_free(DISK_FILE* file); -BOOL disk_file_seek(DISK_FILE* file, uint64 Offset); -BOOL disk_file_read(DISK_FILE* file, BYTE* buffer, uint32* Length); -BOOL disk_file_write(DISK_FILE* file, BYTE* buffer, uint32 Length); -BOOL disk_file_query_information(DISK_FILE* file, uint32 FsInformationClass, STREAM* output); -BOOL disk_file_set_information(DISK_FILE* file, uint32 FsInformationClass, uint32 Length, STREAM* input); -BOOL disk_file_query_directory(DISK_FILE* file, uint32 FsInformationClass, BYTE InitialQuery, +BOOL disk_file_seek(DISK_FILE* file, UINT64 Offset); +BOOL disk_file_read(DISK_FILE* file, BYTE* buffer, UINT32* Length); +BOOL disk_file_write(DISK_FILE* file, BYTE* buffer, UINT32 Length); +BOOL disk_file_query_information(DISK_FILE* file, UINT32 FsInformationClass, STREAM* output); +BOOL disk_file_set_information(DISK_FILE* file, UINT32 FsInformationClass, UINT32 Length, STREAM* input); +BOOL disk_file_query_directory(DISK_FILE* file, UINT32 FsInformationClass, BYTE InitialQuery, const char* path, STREAM* output); #endif /* __DISK_FILE_H */ diff --git a/channels/disk/client/disk_main.c b/channels/disk/client/disk_main.c index 0a13571d5..e721f67ae 100644 --- a/channels/disk/client/disk_main.c +++ b/channels/disk/client/disk_main.c @@ -66,9 +66,9 @@ struct _DISK_DEVICE DEVMAN* devman; }; -static uint32 disk_map_posix_err(int fs_errno) +static UINT32 disk_map_posix_err(int fs_errno) { - uint32 rc; + UINT32 rc; /* try to return NTSTATUS version of error code */ @@ -101,7 +101,7 @@ static uint32 disk_map_posix_err(int fs_errno) return rc; } -static DISK_FILE* disk_get_file_by_id(DISK_DEVICE* disk, uint32 id) +static DISK_FILE* disk_get_file_by_id(DISK_DEVICE* disk, UINT32 id) { LIST_ITEM* item; DISK_FILE* file; @@ -120,19 +120,19 @@ static DISK_FILE* disk_get_file_by_id(DISK_DEVICE* disk, uint32 id) static void disk_process_irp_create(DISK_DEVICE* disk, IRP* irp) { char* path; - uint32 FileId; + UINT32 FileId; DISK_FILE* file; BYTE Information; - uint32 DesiredAccess; - uint32 CreateDisposition; - uint32 CreateOptions; - uint32 PathLength; + UINT32 DesiredAccess; + UINT32 CreateDisposition; + UINT32 CreateOptions; + UINT32 PathLength; - stream_read_uint32(irp->input, DesiredAccess); + stream_read_UINT32(irp->input, DesiredAccess); stream_seek(irp->input, 16); /* AllocationSize(8), FileAttributes(4), SharedAccess(4) */ - stream_read_uint32(irp->input, CreateDisposition); - stream_read_uint32(irp->input, CreateOptions); - stream_read_uint32(irp->input, PathLength); + stream_read_UINT32(irp->input, CreateDisposition); + stream_read_UINT32(irp->input, CreateOptions); + stream_read_UINT32(irp->input, PathLength); freerdp_UnicodeToAsciiAlloc((WCHAR*) stream_get_tail(irp->input), &path, PathLength / 2); @@ -183,7 +183,7 @@ static void disk_process_irp_create(DISK_DEVICE* disk, IRP* irp) DEBUG_SVC("%s(%d) created.", file->fullpath, file->id); } - stream_write_uint32(irp->output, FileId); + stream_write_UINT32(irp->output, FileId); stream_write_BYTE(irp->output, Information); free(path); @@ -219,12 +219,12 @@ static void disk_process_irp_close(DISK_DEVICE* disk, IRP* irp) static void disk_process_irp_read(DISK_DEVICE* disk, IRP* irp) { DISK_FILE* file; - uint32 Length; - uint64 Offset; + UINT32 Length; + UINT64 Offset; BYTE* buffer = NULL; - stream_read_uint32(irp->input, Length); - stream_read_uint64(irp->input, Offset); + stream_read_UINT32(irp->input, Length); + stream_read_UINT64(irp->input, Offset); file = disk_get_file_by_id(disk, irp->FileId); @@ -260,7 +260,7 @@ static void disk_process_irp_read(DISK_DEVICE* disk, IRP* irp) } } - stream_write_uint32(irp->output, Length); + stream_write_UINT32(irp->output, Length); if (Length > 0) { @@ -276,11 +276,11 @@ static void disk_process_irp_read(DISK_DEVICE* disk, IRP* irp) static void disk_process_irp_write(DISK_DEVICE* disk, IRP* irp) { DISK_FILE* file; - uint32 Length; - uint64 Offset; + UINT32 Length; + UINT64 Offset; - stream_read_uint32(irp->input, Length); - stream_read_uint64(irp->input, Offset); + stream_read_UINT32(irp->input, Length); + stream_read_UINT64(irp->input, Offset); stream_seek(irp->input, 20); /* Padding */ file = disk_get_file_by_id(disk, irp->FileId); @@ -311,7 +311,7 @@ static void disk_process_irp_write(DISK_DEVICE* disk, IRP* irp) DEBUG_SVC("write %llu-%llu to %s(%d).", Offset, Offset + Length, file->fullpath, file->id); } - stream_write_uint32(irp->output, Length); + stream_write_UINT32(irp->output, Length); stream_write_BYTE(irp->output, 0); /* Padding */ irp->Complete(irp); @@ -320,9 +320,9 @@ static void disk_process_irp_write(DISK_DEVICE* disk, IRP* irp) static void disk_process_irp_query_information(DISK_DEVICE* disk, IRP* irp) { DISK_FILE* file; - uint32 FsInformationClass; + UINT32 FsInformationClass; - stream_read_uint32(irp->input, FsInformationClass); + stream_read_UINT32(irp->input, FsInformationClass); file = disk_get_file_by_id(disk, irp->FileId); @@ -349,11 +349,11 @@ static void disk_process_irp_query_information(DISK_DEVICE* disk, IRP* irp) static void disk_process_irp_set_information(DISK_DEVICE* disk, IRP* irp) { DISK_FILE* file; - uint32 FsInformationClass; - uint32 Length; + UINT32 FsInformationClass; + UINT32 Length; - stream_read_uint32(irp->input, FsInformationClass); - stream_read_uint32(irp->input, Length); + stream_read_UINT32(irp->input, FsInformationClass); + stream_read_UINT32(irp->input, Length); stream_seek(irp->input, 24); /* Padding */ file = disk_get_file_by_id(disk, irp->FileId); @@ -375,14 +375,14 @@ static void disk_process_irp_set_information(DISK_DEVICE* disk, IRP* irp) DEBUG_SVC("FsInformationClass %d on %s(%d) ok.", FsInformationClass, file->fullpath, file->id); } - stream_write_uint32(irp->output, Length); + stream_write_UINT32(irp->output, Length); irp->Complete(irp); } static void disk_process_irp_query_volume_information(DISK_DEVICE* disk, IRP* irp) { - uint32 FsInformationClass; + UINT32 FsInformationClass; STREAM* output = irp->output; struct STATVFS svfst; struct STAT st; @@ -391,7 +391,7 @@ static void disk_process_irp_query_volume_information(DISK_DEVICE* disk, IRP* ir WCHAR* outStr; int length; - stream_read_uint32(irp->input, FsInformationClass); + stream_read_UINT32(irp->input, FsInformationClass); STATVFS(disk->path, &svfst); STAT(disk->path, &st); @@ -401,11 +401,11 @@ static void disk_process_irp_query_volume_information(DISK_DEVICE* disk, IRP* ir case FileFsVolumeInformation: /* http://msdn.microsoft.com/en-us/library/cc232108.aspx */ length = freerdp_AsciiToUnicodeAlloc(volumeLabel, &outStr, 0) * 2; - stream_write_uint32(output, 17 + length); /* Length */ + 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 */ - stream_write_uint32(output, svfst.f_fsid); /* VolumeSerialNumber */ - stream_write_uint32(output, length); /* VolumeLabelLength */ + stream_write_UINT64(output, FILE_TIME_SYSTEM_TO_RDP(st.st_ctime)); /* VolumeCreationTime */ + stream_write_UINT32(output, svfst.f_fsid); /* VolumeSerialNumber */ + stream_write_UINT32(output, length); /* VolumeLabelLength */ stream_write_BYTE(output, 0); /* SupportsObjects */ /* Reserved(1), MUST NOT be added! */ stream_write(output, outStr, length); /* VolumeLabel (Unicode) */ @@ -414,51 +414,51 @@ static void disk_process_irp_query_volume_information(DISK_DEVICE* disk, IRP* ir case FileFsSizeInformation: /* http://msdn.microsoft.com/en-us/library/cc232107.aspx */ - stream_write_uint32(output, 24); /* Length */ + stream_write_UINT32(output, 24); /* Length */ stream_check_size(output, 24); - stream_write_uint64(output, svfst.f_blocks); /* TotalAllocationUnits */ - stream_write_uint64(output, svfst.f_bavail); /* AvailableAllocationUnits */ - stream_write_uint32(output, 1); /* SectorsPerAllocationUnit */ - stream_write_uint32(output, svfst.f_bsize); /* BytesPerSector */ + stream_write_UINT64(output, svfst.f_blocks); /* TotalAllocationUnits */ + stream_write_UINT64(output, svfst.f_bavail); /* AvailableAllocationUnits */ + stream_write_UINT32(output, 1); /* SectorsPerAllocationUnit */ + stream_write_UINT32(output, svfst.f_bsize); /* BytesPerSector */ break; case FileFsAttributeInformation: /* http://msdn.microsoft.com/en-us/library/cc232101.aspx */ length = freerdp_AsciiToUnicodeAlloc(diskType, &outStr, 0) * 2; - stream_write_uint32(output, 12 + length); /* Length */ + stream_write_UINT32(output, 12 + length); /* Length */ stream_check_size(output, 12 + length); - stream_write_uint32(output, + stream_write_UINT32(output, FILE_CASE_SENSITIVE_SEARCH | FILE_CASE_PRESERVED_NAMES | FILE_UNICODE_ON_DISK); /* FileSystemAttributes */ - stream_write_uint32(output, svfst.f_namemax/*510*/); /* MaximumComponentNameLength */ - stream_write_uint32(output, length); /* FileSystemNameLength */ + stream_write_UINT32(output, svfst.f_namemax/*510*/); /* MaximumComponentNameLength */ + stream_write_UINT32(output, length); /* FileSystemNameLength */ stream_write(output, outStr, length); /* FileSystemName (Unicode) */ free(outStr); break; case FileFsFullSizeInformation: /* http://msdn.microsoft.com/en-us/library/cc232104.aspx */ - stream_write_uint32(output, 32); /* Length */ + stream_write_UINT32(output, 32); /* Length */ stream_check_size(output, 32); - stream_write_uint64(output, svfst.f_blocks); /* TotalAllocationUnits */ - stream_write_uint64(output, svfst.f_bavail); /* CallerAvailableAllocationUnits */ - stream_write_uint64(output, svfst.f_bfree); /* AvailableAllocationUnits */ - stream_write_uint32(output, 1); /* SectorsPerAllocationUnit */ - stream_write_uint32(output, svfst.f_bsize); /* BytesPerSector */ + stream_write_UINT64(output, svfst.f_blocks); /* TotalAllocationUnits */ + stream_write_UINT64(output, svfst.f_bavail); /* CallerAvailableAllocationUnits */ + stream_write_UINT64(output, svfst.f_bfree); /* AvailableAllocationUnits */ + stream_write_UINT32(output, 1); /* SectorsPerAllocationUnit */ + stream_write_UINT32(output, svfst.f_bsize); /* BytesPerSector */ break; case FileFsDeviceInformation: /* http://msdn.microsoft.com/en-us/library/cc232109.aspx */ - stream_write_uint32(output, 8); /* Length */ + stream_write_UINT32(output, 8); /* Length */ stream_check_size(output, 8); - stream_write_uint32(output, FILE_DEVICE_DISK); /* DeviceType */ - stream_write_uint32(output, 0); /* Characteristics */ + stream_write_UINT32(output, FILE_DEVICE_DISK); /* DeviceType */ + stream_write_UINT32(output, 0); /* Characteristics */ break; default: irp->IoStatus = STATUS_UNSUCCESSFUL; - stream_write_uint32(output, 0); /* Length */ + stream_write_UINT32(output, 0); /* Length */ DEBUG_WARN("invalid FsInformationClass %d", FsInformationClass); break; } @@ -471,12 +471,12 @@ static void disk_process_irp_query_directory(DISK_DEVICE* disk, IRP* irp) char* path; DISK_FILE* file; BYTE InitialQuery; - uint32 PathLength; - uint32 FsInformationClass; + UINT32 PathLength; + UINT32 FsInformationClass; - stream_read_uint32(irp->input, FsInformationClass); + stream_read_UINT32(irp->input, FsInformationClass); stream_read_BYTE(irp->input, InitialQuery); - stream_read_uint32(irp->input, PathLength); + stream_read_UINT32(irp->input, PathLength); stream_seek(irp->input, 23); /* Padding */ freerdp_UnicodeToAsciiAlloc((WCHAR*) stream_get_tail(irp->input), &path, PathLength / 2); @@ -486,7 +486,7 @@ static void disk_process_irp_query_directory(DISK_DEVICE* disk, IRP* irp) if (file == NULL) { irp->IoStatus = STATUS_UNSUCCESSFUL; - stream_write_uint32(irp->output, 0); /* Length */ + stream_write_UINT32(irp->output, 0); /* Length */ DEBUG_WARN("FileId %d not valid.", irp->FileId); } else if (!disk_file_query_directory(file, FsInformationClass, InitialQuery, path, irp->output)) @@ -514,7 +514,7 @@ static void disk_process_irp_directory_control(DISK_DEVICE* disk, IRP* irp) default: DEBUG_WARN("MinorFunction 0x%X not supported", irp->MinorFunction); irp->IoStatus = STATUS_NOT_SUPPORTED; - stream_write_uint32(irp->output, 0); /* Length */ + stream_write_UINT32(irp->output, 0); /* Length */ irp->Complete(irp); break; } @@ -522,7 +522,7 @@ static void disk_process_irp_directory_control(DISK_DEVICE* disk, IRP* irp) static void disk_process_irp_device_control(DISK_DEVICE* disk, IRP* irp) { - stream_write_uint32(irp->output, 0); /* OutputBufferLength */ + stream_write_UINT32(irp->output, 0); /* OutputBufferLength */ irp->Complete(irp); } diff --git a/channels/drdynvc/client/drdynvc_main.c b/channels/drdynvc/client/drdynvc_main.c index 692f28a92..3f581159d 100644 --- a/channels/drdynvc/client/drdynvc_main.c +++ b/channels/drdynvc/client/drdynvc_main.c @@ -57,7 +57,7 @@ struct drdynvc_plugin IWTSVirtualChannelManager* channel_mgr; }; -static int drdynvc_write_variable_uint(STREAM* stream, uint32 val) +static int drdynvc_write_variable_uint(STREAM* stream, UINT32 val) { int cb; @@ -74,18 +74,18 @@ static int drdynvc_write_variable_uint(STREAM* stream, uint32 val) else { cb = 2; - stream_write_uint32(stream, val); + stream_write_UINT32(stream, val); } return cb; } -int drdynvc_write_data(drdynvcPlugin* drdynvc, uint32 ChannelId, BYTE* data, uint32 data_size) +int drdynvc_write_data(drdynvcPlugin* drdynvc, UINT32 ChannelId, BYTE* data, UINT32 data_size) { STREAM* data_out; - uint32 pos = 0; - uint32 cbChId; - uint32 cbLen; - uint32 chunk_len; + UINT32 pos = 0; + UINT32 cbChId; + UINT32 cbLen; + UINT32 chunk_len; int error; DEBUG_DVC("ChannelId=%d size=%d", ChannelId, data_size); @@ -199,9 +199,9 @@ static int drdynvc_process_capability_request(drdynvcPlugin* drdynvc, int Sp, in return 0; } -static uint32 drdynvc_read_variable_uint(STREAM* stream, int cbLen) +static UINT32 drdynvc_read_variable_uint(STREAM* stream, int cbLen) { - uint32 val; + UINT32 val; switch (cbLen) { @@ -212,7 +212,7 @@ static uint32 drdynvc_read_variable_uint(STREAM* stream, int cbLen) stream_read_UINT16(stream, val); break; default: - stream_read_uint32(stream, val); + stream_read_UINT32(stream, val); break; } return val; @@ -223,7 +223,7 @@ static int drdynvc_process_create_request(drdynvcPlugin* drdynvc, int Sp, int cb STREAM* data_out; int pos; int error; - uint32 ChannelId; + UINT32 ChannelId; ChannelId = drdynvc_read_variable_uint(s, cbChId); pos = stream_get_pos(s); @@ -239,12 +239,12 @@ static int drdynvc_process_create_request(drdynvcPlugin* drdynvc, int Sp, int cb if (error == 0) { DEBUG_DVC("channel created"); - stream_write_uint32(data_out, 0); + stream_write_UINT32(data_out, 0); } else { DEBUG_DVC("no listener"); - stream_write_uint32(data_out, (uint32)(-1)); + stream_write_UINT32(data_out, (UINT32)(-1)); } error = svc_plugin_send((rdpSvcPlugin*)drdynvc, data_out); @@ -258,8 +258,8 @@ static int drdynvc_process_create_request(drdynvcPlugin* drdynvc, int Sp, int cb static int drdynvc_process_data_first(drdynvcPlugin* drdynvc, int Sp, int cbChId, STREAM* s) { - uint32 ChannelId; - uint32 Length; + UINT32 ChannelId; + UINT32 Length; int error; ChannelId = drdynvc_read_variable_uint(s, cbChId); @@ -276,7 +276,7 @@ static int drdynvc_process_data_first(drdynvcPlugin* drdynvc, int Sp, int cbChId static int drdynvc_process_data(drdynvcPlugin* drdynvc, int Sp, int cbChId, STREAM* s) { - uint32 ChannelId; + UINT32 ChannelId; ChannelId = drdynvc_read_variable_uint(s, cbChId); DEBUG_DVC("ChannelId=%d", ChannelId); @@ -287,7 +287,7 @@ static int drdynvc_process_data(drdynvcPlugin* drdynvc, int Sp, int cbChId, STRE static int drdynvc_process_close_request(drdynvcPlugin* drdynvc, int Sp, int cbChId, STREAM* s) { - uint32 ChannelId; + UINT32 ChannelId; ChannelId = drdynvc_read_variable_uint(s, cbChId); DEBUG_DVC("ChannelId=%d", ChannelId); diff --git a/channels/drdynvc/client/drdynvc_main.h b/channels/drdynvc/client/drdynvc_main.h index 70892626e..3cfdcd6d3 100644 --- a/channels/drdynvc/client/drdynvc_main.h +++ b/channels/drdynvc/client/drdynvc_main.h @@ -24,7 +24,7 @@ typedef struct drdynvc_plugin drdynvcPlugin; -int drdynvc_write_data(drdynvcPlugin* plugin, uint32 ChannelId, BYTE* data, uint32 data_size); +int drdynvc_write_data(drdynvcPlugin* plugin, UINT32 ChannelId, BYTE* data, UINT32 data_size); int drdynvc_push_event(drdynvcPlugin* plugin, RDP_EVENT* event); #endif diff --git a/channels/drdynvc/client/dvcman.c b/channels/drdynvc/client/dvcman.c index c0d496e07..6db0744fa 100644 --- a/channels/drdynvc/client/dvcman.c +++ b/channels/drdynvc/client/dvcman.c @@ -62,7 +62,7 @@ struct _DVCMAN_LISTENER DVCMAN* dvcman; char* channel_name; - uint32 flags; + UINT32 flags; IWTSListenerCallback* listener_callback; }; @@ -82,7 +82,7 @@ struct _DVCMAN_CHANNEL DVCMAN* dvcman; DVCMAN_CHANNEL* next; - uint32 channel_id; + UINT32 channel_id; IWTSVirtualChannelCallback* channel_callback; STREAM* dvc_data; @@ -97,7 +97,7 @@ static int dvcman_get_configuration(IWTSListener* pListener, void** ppPropertyBa } static int dvcman_create_listener(IWTSVirtualChannelManager* pChannelMgr, - const char* pszChannelName, uint32 ulFlags, + const char* pszChannelName, UINT32 ulFlags, IWTSListenerCallback* pListenerCallback, IWTSListener** ppListener) { DVCMAN* dvcman = (DVCMAN*)pChannelMgr; @@ -186,12 +186,12 @@ RDP_PLUGIN_DATA* dvcman_get_plugin_data(IDRDYNVC_ENTRY_POINTS* pEntryPoints) return ((DVCMAN_ENTRY_POINTS*) pEntryPoints)->plugin_data; } -uint32 dvcman_get_channel_id(IWTSVirtualChannel * channel) +UINT32 dvcman_get_channel_id(IWTSVirtualChannel * channel) { return ((DVCMAN_CHANNEL*)channel)->channel_id; } -IWTSVirtualChannel* dvcman_find_channel_by_id(IWTSVirtualChannelManager* pChannelMgr, uint32 ChannelId) +IWTSVirtualChannel* dvcman_find_channel_by_id(IWTSVirtualChannelManager* pChannelMgr, UINT32 ChannelId) { LIST_ITEM* curr; DVCMAN* dvcman = (DVCMAN*) pChannelMgr; @@ -303,7 +303,7 @@ int dvcman_init(IWTSVirtualChannelManager* pChannelMgr) return 0; } -static int dvcman_write_channel(IWTSVirtualChannel* pChannel, uint32 cbSize, BYTE* pBuffer, void* pReserved) +static int dvcman_write_channel(IWTSVirtualChannel* pChannel, UINT32 cbSize, BYTE* pBuffer, void* pReserved) { int status; DVCMAN_CHANNEL* channel = (DVCMAN_CHANNEL*) pChannel; @@ -330,7 +330,7 @@ static int dvcman_close_channel_iface(IWTSVirtualChannel* pChannel) return 1; } -int dvcman_create_channel(IWTSVirtualChannelManager* pChannelMgr, uint32 ChannelId, const char* ChannelName) +int dvcman_create_channel(IWTSVirtualChannelManager* pChannelMgr, UINT32 ChannelId, const char* ChannelName) { int i; int bAccept; @@ -378,7 +378,7 @@ int dvcman_create_channel(IWTSVirtualChannelManager* pChannelMgr, uint32 Channel } -int dvcman_close_channel(IWTSVirtualChannelManager* pChannelMgr, uint32 ChannelId) +int dvcman_close_channel(IWTSVirtualChannelManager* pChannelMgr, UINT32 ChannelId) { DVCMAN_CHANNEL* channel; IWTSVirtualChannel* ichannel; @@ -404,7 +404,7 @@ int dvcman_close_channel(IWTSVirtualChannelManager* pChannelMgr, uint32 ChannelI return 0; } -int dvcman_receive_channel_data_first(IWTSVirtualChannelManager* pChannelMgr, uint32 ChannelId, uint32 length) +int dvcman_receive_channel_data_first(IWTSVirtualChannelManager* pChannelMgr, UINT32 ChannelId, UINT32 length) { DVCMAN_CHANNEL* channel; @@ -424,7 +424,7 @@ int dvcman_receive_channel_data_first(IWTSVirtualChannelManager* pChannelMgr, ui return 0; } -int dvcman_receive_channel_data(IWTSVirtualChannelManager* pChannelMgr, uint32 ChannelId, BYTE* data, uint32 data_size) +int dvcman_receive_channel_data(IWTSVirtualChannelManager* pChannelMgr, UINT32 ChannelId, BYTE* data, UINT32 data_size) { int error = 0; DVCMAN_CHANNEL* channel; @@ -440,7 +440,7 @@ int dvcman_receive_channel_data(IWTSVirtualChannelManager* pChannelMgr, uint32 C if (channel->dvc_data) { /* Fragmented data */ - if (stream_get_length(channel->dvc_data) + data_size > (uint32) stream_get_size(channel->dvc_data)) + if (stream_get_length(channel->dvc_data) + data_size > (UINT32) stream_get_size(channel->dvc_data)) { DEBUG_WARN("data exceeding declared length!"); stream_free(channel->dvc_data); diff --git a/channels/drdynvc/client/dvcman.h b/channels/drdynvc/client/dvcman.h index 95d5a119b..479434187 100644 --- a/channels/drdynvc/client/dvcman.h +++ b/channels/drdynvc/client/dvcman.h @@ -27,10 +27,10 @@ IWTSVirtualChannelManager* dvcman_new(drdynvcPlugin* plugin); int dvcman_load_plugin(IWTSVirtualChannelManager* pChannelMgr, RDP_PLUGIN_DATA* data); void dvcman_free(IWTSVirtualChannelManager* pChannelMgr); int dvcman_init(IWTSVirtualChannelManager* pChannelMgr); -int dvcman_create_channel(IWTSVirtualChannelManager* pChannelMgr, uint32 ChannelId, const char* ChannelName); -int dvcman_close_channel(IWTSVirtualChannelManager* pChannelMgr, uint32 ChannelId); -int dvcman_receive_channel_data_first(IWTSVirtualChannelManager* pChannelMgr, uint32 ChannelId, uint32 length); -int dvcman_receive_channel_data(IWTSVirtualChannelManager* pChannelMgr, uint32 ChannelId, BYTE* data, uint32 data_size); +int dvcman_create_channel(IWTSVirtualChannelManager* pChannelMgr, UINT32 ChannelId, const char* ChannelName); +int dvcman_close_channel(IWTSVirtualChannelManager* pChannelMgr, UINT32 ChannelId); +int dvcman_receive_channel_data_first(IWTSVirtualChannelManager* pChannelMgr, UINT32 ChannelId, UINT32 length); +int dvcman_receive_channel_data(IWTSVirtualChannelManager* pChannelMgr, UINT32 ChannelId, BYTE* data, UINT32 data_size); #endif diff --git a/channels/parallel/client/parallel_main.c b/channels/parallel/client/parallel_main.c index 9f55bf03b..a8ddab6e0 100644 --- a/channels/parallel/client/parallel_main.c +++ b/channels/parallel/client/parallel_main.c @@ -65,7 +65,7 @@ struct _PARALLEL_DEVICE int file; char* path; - uint32 id; + UINT32 id; PSLIST_HEADER pIrpList; freerdp_thread* thread; @@ -75,12 +75,12 @@ typedef struct _PARALLEL_DEVICE PARALLEL_DEVICE; static void parallel_process_irp_create(PARALLEL_DEVICE* parallel, IRP* irp) { char* path; - uint32 PathLength; + UINT32 PathLength; stream_seek(irp->input, 28); /* DesiredAccess(4) AllocationSize(8), FileAttributes(4) */ /* SharedAccess(4) CreateDisposition(4), CreateOptions(4) */ - stream_read_uint32(irp->input, PathLength); + stream_read_UINT32(irp->input, PathLength); freerdp_UnicodeToAsciiAlloc((WCHAR*) stream_get_tail(irp->input), &path, PathLength / 2); @@ -103,7 +103,7 @@ static void parallel_process_irp_create(PARALLEL_DEVICE* parallel, IRP* irp) DEBUG_SVC("%s(%d) created", parallel->path, parallel->file); } - stream_write_uint32(irp->output, parallel->id); + stream_write_UINT32(irp->output, parallel->id); stream_write_BYTE(irp->output, 0); free(path); @@ -125,13 +125,13 @@ static void parallel_process_irp_close(PARALLEL_DEVICE* parallel, IRP* irp) static void parallel_process_irp_read(PARALLEL_DEVICE* parallel, IRP* irp) { - uint32 Length; - uint64 Offset; + UINT32 Length; + UINT64 Offset; ssize_t status; BYTE* buffer = NULL; - stream_read_uint32(irp->input, Length); - stream_read_uint64(irp->input, Offset); + stream_read_UINT32(irp->input, Length); + stream_read_UINT64(irp->input, Offset); buffer = (BYTE*) malloc(Length); @@ -151,7 +151,7 @@ static void parallel_process_irp_read(PARALLEL_DEVICE* parallel, IRP* irp) DEBUG_SVC("read %llu-%llu from %d", Offset, Offset + Length, parallel->id); } - stream_write_uint32(irp->output, Length); + stream_write_UINT32(irp->output, Length); if (Length > 0) { stream_check_size(irp->output, Length); @@ -164,13 +164,13 @@ static void parallel_process_irp_read(PARALLEL_DEVICE* parallel, IRP* irp) static void parallel_process_irp_write(PARALLEL_DEVICE* parallel, IRP* irp) { - uint32 Length; - uint64 Offset; + UINT32 Length; + UINT64 Offset; ssize_t status; - uint32 len; + UINT32 len; - stream_read_uint32(irp->input, Length); - stream_read_uint64(irp->input, Offset); + stream_read_UINT32(irp->input, Length); + stream_read_UINT64(irp->input, Offset); stream_seek(irp->input, 20); /* Padding */ DEBUG_SVC("Length %u Offset %llu", Length, Offset); @@ -194,7 +194,7 @@ static void parallel_process_irp_write(PARALLEL_DEVICE* parallel, IRP* irp) len -= status; } - stream_write_uint32(irp->output, Length); + stream_write_UINT32(irp->output, Length); stream_write_BYTE(irp->output, 0); /* Padding */ irp->Complete(irp); @@ -203,7 +203,7 @@ static void parallel_process_irp_write(PARALLEL_DEVICE* parallel, IRP* irp) static void parallel_process_irp_device_control(PARALLEL_DEVICE* parallel, IRP* irp) { DEBUG_SVC("in"); - stream_write_uint32(irp->output, 0); /* OutputBufferLength */ + stream_write_UINT32(irp->output, 0); /* OutputBufferLength */ irp->Complete(irp); } diff --git a/channels/printer/client/printer_cups.c b/channels/printer/client/printer_cups.c index 40b71f598..08c9f1483 100644 --- a/channels/printer/client/printer_cups.c +++ b/channels/printer/client/printer_cups.c @@ -136,7 +136,7 @@ static void printer_cups_close_printjob(rdpPrintJob* printjob) free(cups_printjob) ; } -static rdpPrintJob* printer_cups_create_printjob(rdpPrinter* printer, uint32 id) +static rdpPrintJob* printer_cups_create_printjob(rdpPrinter* printer, UINT32 id) { rdpCupsPrinter* cups_printer = (rdpCupsPrinter*)printer; rdpCupsPrintJob* cups_printjob; @@ -191,7 +191,7 @@ static rdpPrintJob* printer_cups_create_printjob(rdpPrinter* printer, uint32 id) return (rdpPrintJob*)cups_printjob; } -static rdpPrintJob* printer_cups_find_printjob(rdpPrinter* printer, uint32 id) +static rdpPrintJob* printer_cups_find_printjob(rdpPrinter* printer, UINT32 id) { rdpCupsPrinter* cups_printer = (rdpCupsPrinter*)printer; diff --git a/channels/printer/client/printer_main.c b/channels/printer/client/printer_main.c index ac20f1d5f..da235cefd 100644 --- a/channels/printer/client/printer_main.c +++ b/channels/printer/client/printer_main.c @@ -67,13 +67,13 @@ static void printer_process_irp_create(PRINTER_DEVICE* printer_dev, IRP* irp) if (printjob != NULL) { - stream_write_uint32(irp->output, printjob->id); /* FileId */ + stream_write_UINT32(irp->output, printjob->id); /* FileId */ DEBUG_SVC("printjob id: %d", printjob->id); } else { - stream_write_uint32(irp->output, 0); /* FileId */ + stream_write_UINT32(irp->output, 0); /* FileId */ irp->IoStatus = STATUS_PRINT_QUEUE_FULL; DEBUG_WARN("error creating print job."); @@ -109,12 +109,12 @@ static void printer_process_irp_close(PRINTER_DEVICE* printer_dev, IRP* irp) static void printer_process_irp_write(PRINTER_DEVICE* printer_dev, IRP* irp) { - uint32 Length; - uint64 Offset; + UINT32 Length; + UINT64 Offset; rdpPrintJob* printjob = NULL; - stream_read_uint32(irp->input, Length); - stream_read_uint64(irp->input, Offset); + stream_read_UINT32(irp->input, Length); + stream_read_UINT64(irp->input, Offset); stream_seek(irp->input, 20); /* Padding */ if (printer_dev->printer != NULL) @@ -134,7 +134,7 @@ static void printer_process_irp_write(PRINTER_DEVICE* printer_dev, IRP* irp) DEBUG_SVC("printjob id %d written %d bytes.", irp->FileId, Length); } - stream_write_uint32(irp->output, Length); + stream_write_UINT32(irp->output, Length); stream_write_BYTE(irp->output, 0); /* Padding */ irp->Complete(irp); @@ -235,12 +235,12 @@ static void printer_free(DEVICE* device) void printer_register(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, rdpPrinter* printer) { char* port; - uint32 Flags; + UINT32 Flags; int DriverNameLen; WCHAR* DriverName; int PrintNameLen; WCHAR* PrintName; - uint32 CachedFieldsLen; + UINT32 CachedFieldsLen; BYTE* CachedPrinterConfigData; PRINTER_DEVICE* printer_dev; @@ -271,12 +271,12 @@ void printer_register(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, rdpPrinter* pri printer_dev->device.data = stream_new(28 + DriverNameLen + PrintNameLen + CachedFieldsLen); - stream_write_uint32(printer_dev->device.data, Flags); - stream_write_uint32(printer_dev->device.data, 0); /* CodePage, reserved */ - stream_write_uint32(printer_dev->device.data, 0); /* PnPNameLen */ - stream_write_uint32(printer_dev->device.data, DriverNameLen + 2); - stream_write_uint32(printer_dev->device.data, PrintNameLen + 2); - stream_write_uint32(printer_dev->device.data, CachedFieldsLen); + stream_write_UINT32(printer_dev->device.data, Flags); + stream_write_UINT32(printer_dev->device.data, 0); /* CodePage, reserved */ + stream_write_UINT32(printer_dev->device.data, 0); /* PnPNameLen */ + stream_write_UINT32(printer_dev->device.data, DriverNameLen + 2); + stream_write_UINT32(printer_dev->device.data, PrintNameLen + 2); + stream_write_UINT32(printer_dev->device.data, CachedFieldsLen); stream_write(printer_dev->device.data, DriverName, DriverNameLen); stream_write_UINT16(printer_dev->device.data, 0); stream_write(printer_dev->device.data, PrintName, PrintNameLen); diff --git a/channels/printer/client/printer_main.h b/channels/printer/client/printer_main.h index a2c70ee30..55df7309b 100644 --- a/channels/printer/client/printer_main.h +++ b/channels/printer/client/printer_main.h @@ -48,8 +48,8 @@ struct rdp_printer_driver pcGetPrinter GetPrinter; }; -typedef rdpPrintJob* (*pcCreatePrintJob) (rdpPrinter* printer, uint32 id); -typedef rdpPrintJob* (*pcFindPrintJob) (rdpPrinter* printer, uint32 id); +typedef rdpPrintJob* (*pcCreatePrintJob) (rdpPrinter* printer, UINT32 id); +typedef rdpPrintJob* (*pcFindPrintJob) (rdpPrinter* printer, UINT32 id); typedef void (*pcFreePrinter) (rdpPrinter* printer); struct rdp_printer @@ -69,7 +69,7 @@ typedef void (*pcClosePrintJob) (rdpPrintJob* printjob); struct rdp_print_job { - uint32 id; + UINT32 id; rdpPrinter* printer; pcWritePrintJob Write; diff --git a/channels/printer/client/printer_win.c b/channels/printer/client/printer_win.c index 35e7bac88..787de648c 100644 --- a/channels/printer/client/printer_win.c +++ b/channels/printer/client/printer_win.c @@ -111,7 +111,7 @@ static void printer_win_close_printjob(rdpPrintJob* printjob) free(win_printjob) ; } -static rdpPrintJob* printer_win_create_printjob(rdpPrinter* printer, uint32 id) +static rdpPrintJob* printer_win_create_printjob(rdpPrinter* printer, UINT32 id) { rdpWinPrinter* win_printer = (rdpWinPrinter*)printer; rdpWinPrintJob* win_printjob; @@ -145,7 +145,7 @@ static rdpPrintJob* printer_win_create_printjob(rdpPrinter* printer, uint32 id) return (rdpPrintJob*)win_printjob; } -static rdpPrintJob* printer_win_find_printjob(rdpPrinter* printer, uint32 id) +static rdpPrintJob* printer_win_find_printjob(rdpPrinter* printer, UINT32 id) { rdpWinPrinter* win_printer = (rdpWinPrinter*)printer; diff --git a/channels/rail/client/rail_orders.c b/channels/rail/client/rail_orders.c index 34ab88bf4..c9c529ebe 100644 --- a/channels/rail/client/rail_orders.c +++ b/channels/rail/client/rail_orders.c @@ -129,21 +129,21 @@ void rail_send_pdu(rdpRailOrder* rail_order, STREAM* s, UINT16 orderType) void rail_write_high_contrast(STREAM* s, HIGH_CONTRAST* high_contrast) { high_contrast->colorSchemeLength = high_contrast->colorScheme.length + 2; - stream_write_uint32(s, high_contrast->flags); /* flags (4 bytes) */ - stream_write_uint32(s, high_contrast->colorSchemeLength); /* colorSchemeLength (4 bytes) */ + stream_write_UINT32(s, high_contrast->flags); /* flags (4 bytes) */ + stream_write_UINT32(s, high_contrast->colorSchemeLength); /* colorSchemeLength (4 bytes) */ rail_write_unicode_string(s, &high_contrast->colorScheme); /* colorScheme */ } void rail_read_handshake_order(STREAM* s, RAIL_HANDSHAKE_ORDER* handshake) { - stream_read_uint32(s, handshake->buildNumber); /* buildNumber (4 bytes) */ + stream_read_UINT32(s, handshake->buildNumber); /* buildNumber (4 bytes) */ } void rail_read_server_exec_result_order(STREAM* s, RAIL_EXEC_RESULT_ORDER* exec_result) { stream_read_UINT16(s, exec_result->flags); /* flags (2 bytes) */ stream_read_UINT16(s, exec_result->execResult); /* execResult (2 bytes) */ - stream_read_uint32(s, exec_result->rawResult); /* rawResult (4 bytes) */ + stream_read_UINT32(s, exec_result->rawResult); /* rawResult (4 bytes) */ stream_seek_UINT16(s); /* padding (2 bytes) */ rail_read_unicode_string(s, &exec_result->exeOrFile); /* exeOrFile */ } @@ -151,7 +151,7 @@ void rail_read_server_exec_result_order(STREAM* s, RAIL_EXEC_RESULT_ORDER* exec_ void rail_read_server_sysparam_order(STREAM* s, RAIL_SYSPARAM_ORDER* sysparam) { BYTE body; - stream_read_uint32(s, sysparam->param); /* systemParam (4 bytes) */ + stream_read_UINT32(s, sysparam->param); /* systemParam (4 bytes) */ stream_read_BYTE(s, body); /* body (1 byte) */ switch (sysparam->param) @@ -171,7 +171,7 @@ void rail_read_server_sysparam_order(STREAM* s, RAIL_SYSPARAM_ORDER* sysparam) void rail_read_server_minmaxinfo_order(STREAM* s, RAIL_MINMAXINFO_ORDER* minmaxinfo) { - stream_read_uint32(s, minmaxinfo->windowId); /* windowId (4 bytes) */ + stream_read_UINT32(s, minmaxinfo->windowId); /* windowId (4 bytes) */ stream_read_UINT16(s, minmaxinfo->maxWidth); /* maxWidth (2 bytes) */ stream_read_UINT16(s, minmaxinfo->maxHeight); /* maxHeight (2 bytes) */ stream_read_UINT16(s, minmaxinfo->maxPosX); /* maxPosX (2 bytes) */ @@ -185,7 +185,7 @@ void rail_read_server_minmaxinfo_order(STREAM* s, RAIL_MINMAXINFO_ORDER* minmaxi void rail_read_server_localmovesize_order(STREAM* s, RAIL_LOCALMOVESIZE_ORDER* localmovesize) { UINT16 isMoveSizeStart; - stream_read_uint32(s, localmovesize->windowId); /* windowId (4 bytes) */ + stream_read_UINT32(s, localmovesize->windowId); /* windowId (4 bytes) */ stream_read_UINT16(s, isMoveSizeStart); /* isMoveSizeStart (2 bytes) */ localmovesize->isMoveSizeStart = (isMoveSizeStart != 0) ? TRUE : FALSE; @@ -197,7 +197,7 @@ void rail_read_server_localmovesize_order(STREAM* s, RAIL_LOCALMOVESIZE_ORDER* l void rail_read_server_get_appid_resp_order(STREAM* s, RAIL_GET_APPID_RESP_ORDER* get_appid_resp) { - stream_read_uint32(s, get_appid_resp->windowId); /* windowId (4 bytes) */ + stream_read_UINT32(s, get_appid_resp->windowId); /* windowId (4 bytes) */ stream_read(s, &get_appid_resp->applicationIdBuffer[0], 512); /* applicationId (256 UNICODE chars) */ get_appid_resp->applicationId.length = 512; @@ -206,17 +206,17 @@ void rail_read_server_get_appid_resp_order(STREAM* s, RAIL_GET_APPID_RESP_ORDER* void rail_read_langbar_info_order(STREAM* s, RAIL_LANGBAR_INFO_ORDER* langbar_info) { - stream_read_uint32(s, langbar_info->languageBarStatus); /* languageBarStatus (4 bytes) */ + stream_read_UINT32(s, langbar_info->languageBarStatus); /* languageBarStatus (4 bytes) */ } void rail_write_handshake_order(STREAM* s, RAIL_HANDSHAKE_ORDER* handshake) { - stream_write_uint32(s, handshake->buildNumber); /* buildNumber (4 bytes) */ + stream_write_UINT32(s, handshake->buildNumber); /* buildNumber (4 bytes) */ } void rail_write_client_status_order(STREAM* s, RAIL_CLIENT_STATUS_ORDER* client_status) { - stream_write_uint32(s, client_status->flags); /* flags (4 bytes) */ + stream_write_UINT32(s, client_status->flags); /* flags (4 bytes) */ } void rail_write_client_exec_order(STREAM* s, RAIL_EXEC_ORDER* exec) @@ -233,7 +233,7 @@ void rail_write_client_exec_order(STREAM* s, RAIL_EXEC_ORDER* exec) void rail_write_client_sysparam_order(STREAM* s, RAIL_SYSPARAM_ORDER* sysparam) { BYTE body; - stream_write_uint32(s, sysparam->param); /* systemParam (4 bytes) */ + stream_write_UINT32(s, sysparam->param); /* systemParam (4 bytes) */ switch (sysparam->param) { @@ -288,7 +288,7 @@ void rail_write_client_activate_order(STREAM* s, RAIL_ACTIVATE_ORDER* activate) { BYTE enabled; - stream_write_uint32(s, activate->windowId); /* windowId (4 bytes) */ + stream_write_UINT32(s, activate->windowId); /* windowId (4 bytes) */ enabled = activate->enabled; stream_write_BYTE(s, enabled); /* enabled (1 byte) */ @@ -296,27 +296,27 @@ void rail_write_client_activate_order(STREAM* s, RAIL_ACTIVATE_ORDER* activate) void rail_write_client_sysmenu_order(STREAM* s, RAIL_SYSMENU_ORDER* sysmenu) { - stream_write_uint32(s, sysmenu->windowId); /* windowId (4 bytes) */ + stream_write_UINT32(s, sysmenu->windowId); /* windowId (4 bytes) */ stream_write_UINT16(s, sysmenu->left); /* left (2 bytes) */ stream_write_UINT16(s, sysmenu->top); /* top (2 bytes) */ } void rail_write_client_syscommand_order(STREAM* s, RAIL_SYSCOMMAND_ORDER* syscommand) { - stream_write_uint32(s, syscommand->windowId); /* windowId (4 bytes) */ + stream_write_UINT32(s, syscommand->windowId); /* windowId (4 bytes) */ stream_write_UINT16(s, syscommand->command); /* command (2 bytes) */ } void rail_write_client_notify_event_order(STREAM* s, RAIL_NOTIFY_EVENT_ORDER* notify_event) { - stream_write_uint32(s, notify_event->windowId); /* windowId (4 bytes) */ - stream_write_uint32(s, notify_event->notifyIconId); /* notifyIconId (4 bytes) */ - stream_write_uint32(s, notify_event->message); /* notifyIconId (4 bytes) */ + stream_write_UINT32(s, notify_event->windowId); /* windowId (4 bytes) */ + stream_write_UINT32(s, notify_event->notifyIconId); /* notifyIconId (4 bytes) */ + stream_write_UINT32(s, notify_event->message); /* notifyIconId (4 bytes) */ } void rail_write_client_window_move_order(STREAM* s, RAIL_WINDOW_MOVE_ORDER* window_move) { - stream_write_uint32(s, window_move->windowId); /* windowId (4 bytes) */ + stream_write_UINT32(s, window_move->windowId); /* windowId (4 bytes) */ stream_write_UINT16(s, window_move->left); /* left (2 bytes) */ stream_write_UINT16(s, window_move->top); /* top (2 bytes) */ stream_write_UINT16(s, window_move->right); /* right (2 bytes) */ @@ -325,12 +325,12 @@ void rail_write_client_window_move_order(STREAM* s, RAIL_WINDOW_MOVE_ORDER* wind void rail_write_client_get_appid_req_order(STREAM* s, RAIL_GET_APPID_REQ_ORDER* get_appid_req) { - stream_write_uint32(s, get_appid_req->windowId); /* windowId (4 bytes) */ + stream_write_UINT32(s, get_appid_req->windowId); /* windowId (4 bytes) */ } void rail_write_langbar_info_order(STREAM* s, RAIL_LANGBAR_INFO_ORDER* langbar_info) { - stream_write_uint32(s, langbar_info->languageBarStatus); /* languageBarStatus (4 bytes) */ + stream_write_UINT32(s, langbar_info->languageBarStatus); /* languageBarStatus (4 bytes) */ } void rail_recv_handshake_order(rdpRailOrder* rail_order, STREAM* s) diff --git a/channels/rdpdr/client/devman.c b/channels/rdpdr/client/devman.c index 9fd28c4c2..2273d2aa8 100644 --- a/channels/rdpdr/client/devman.c +++ b/channels/rdpdr/client/devman.c @@ -100,7 +100,7 @@ BOOL devman_load_device_service(DEVMAN* devman, RDP_PLUGIN_DATA* plugin_data) return TRUE; } -DEVICE* devman_get_device_by_id(DEVMAN* devman, uint32 id) +DEVICE* devman_get_device_by_id(DEVMAN* devman, UINT32 id) { LIST_ITEM* item; DEVICE* device; diff --git a/channels/rdpdr/client/devman.h b/channels/rdpdr/client/devman.h index fb23f3987..290e897a5 100644 --- a/channels/rdpdr/client/devman.h +++ b/channels/rdpdr/client/devman.h @@ -24,6 +24,6 @@ DEVMAN* devman_new(rdpSvcPlugin* plugin); void devman_free(DEVMAN* devman); BOOL devman_load_device_service(DEVMAN* devman, RDP_PLUGIN_DATA* plugin_data); -DEVICE* devman_get_device_by_id(DEVMAN* devman, uint32 id); +DEVICE* devman_get_device_by_id(DEVMAN* devman, UINT32 id); #endif /* FREERDP_CHANNEL_RDPDR_CLIENT_DEVMAN_H */ diff --git a/channels/rdpdr/client/irp.c b/channels/rdpdr/client/irp.c index 3b20ee8da..154540fba 100644 --- a/channels/rdpdr/client/irp.c +++ b/channels/rdpdr/client/irp.c @@ -54,7 +54,7 @@ static void irp_complete(IRP* irp) pos = stream_get_pos(irp->output); stream_set_pos(irp->output, 12); - stream_write_uint32(irp->output, irp->IoStatus); + stream_write_UINT32(irp->output, irp->IoStatus); stream_set_pos(irp->output, pos); svc_plugin_send(irp->devman->plugin, irp->output); @@ -66,10 +66,10 @@ static void irp_complete(IRP* irp) IRP* irp_new(DEVMAN* devman, STREAM* data_in) { IRP* irp; - uint32 DeviceId; + UINT32 DeviceId; DEVICE* device; - stream_read_uint32(data_in, DeviceId); + stream_read_UINT32(data_in, DeviceId); device = devman_get_device_by_id(devman, DeviceId); if (device == NULL) @@ -83,18 +83,18 @@ IRP* irp_new(DEVMAN* devman, STREAM* data_in) irp->device = device; irp->devman = devman; - stream_read_uint32(data_in, irp->FileId); - stream_read_uint32(data_in, irp->CompletionId); - stream_read_uint32(data_in, irp->MajorFunction); - stream_read_uint32(data_in, irp->MinorFunction); + stream_read_UINT32(data_in, irp->FileId); + stream_read_UINT32(data_in, irp->CompletionId); + stream_read_UINT32(data_in, irp->MajorFunction); + stream_read_UINT32(data_in, irp->MinorFunction); irp->input = data_in; irp->output = stream_new(256); stream_write_UINT16(irp->output, RDPDR_CTYP_CORE); stream_write_UINT16(irp->output, PAKID_CORE_DEVICE_IOCOMPLETION); - stream_write_uint32(irp->output, DeviceId); - stream_write_uint32(irp->output, irp->CompletionId); - stream_seek_uint32(irp->output); /* IoStatus */ + stream_write_UINT32(irp->output, DeviceId); + stream_write_UINT32(irp->output, irp->CompletionId); + stream_seek_UINT32(irp->output); /* IoStatus */ irp->Complete = irp_complete; irp->Discard = irp_free; diff --git a/channels/rdpdr/client/rdpdr_capabilities.c b/channels/rdpdr/client/rdpdr_capabilities.c index 4b1656841..de983d8ea 100644 --- a/channels/rdpdr/client/rdpdr_capabilities.c +++ b/channels/rdpdr/client/rdpdr_capabilities.c @@ -33,11 +33,11 @@ #include "rdpdr_capabilities.h" /* Output device redirection capability set header */ -static void rdpdr_write_capset_header(STREAM* data_out, UINT16 capabilityType, UINT16 capabilityLength, uint32 version) +static void rdpdr_write_capset_header(STREAM* data_out, UINT16 capabilityType, UINT16 capabilityLength, UINT32 version) { stream_write_UINT16(data_out, capabilityType); stream_write_UINT16(data_out, capabilityLength); - stream_write_uint32(data_out, version); + stream_write_UINT32(data_out, version); } /* Output device direction general capability set */ @@ -45,16 +45,16 @@ static void rdpdr_write_general_capset(rdpdrPlugin* rdpdr, STREAM* data_out) { rdpdr_write_capset_header(data_out, CAP_GENERAL_TYPE, 44, GENERAL_CAPABILITY_VERSION_02); - stream_write_uint32(data_out, 0); /* osType, ignored on receipt */ - stream_write_uint32(data_out, 0); /* osVersion, unused and must be set to zero */ + stream_write_UINT32(data_out, 0); /* osType, ignored on receipt */ + stream_write_UINT32(data_out, 0); /* osVersion, unused and must be set to zero */ stream_write_UINT16(data_out, 1); /* protocolMajorVersion, must be set to 1 */ stream_write_UINT16(data_out, RDPDR_MINOR_RDP_VERSION_5_2); /* protocolMinorVersion */ - stream_write_uint32(data_out, 0x0000FFFF); /* ioCode1 */ - stream_write_uint32(data_out, 0); /* ioCode2, must be set to zero, reserved for future use */ - stream_write_uint32(data_out, RDPDR_DEVICE_REMOVE_PDUS | RDPDR_CLIENT_DISPLAY_NAME_PDU | RDPDR_USER_LOGGEDON_PDU); /* extendedPDU */ - stream_write_uint32(data_out, ENABLE_ASYNCIO); /* extraFlags1 */ - stream_write_uint32(data_out, 0); /* extraFlags2, must be set to zero, reserved for future use */ - stream_write_uint32(data_out, 0); /* SpecialTypeDeviceCap, number of special devices to be redirected before logon */ + stream_write_UINT32(data_out, 0x0000FFFF); /* ioCode1 */ + stream_write_UINT32(data_out, 0); /* ioCode2, must be set to zero, reserved for future use */ + stream_write_UINT32(data_out, RDPDR_DEVICE_REMOVE_PDUS | RDPDR_CLIENT_DISPLAY_NAME_PDU | RDPDR_USER_LOGGEDON_PDU); /* extendedPDU */ + stream_write_UINT32(data_out, ENABLE_ASYNCIO); /* extraFlags1 */ + stream_write_UINT32(data_out, 0); /* extraFlags2, must be set to zero, reserved for future use */ + stream_write_UINT32(data_out, 0); /* SpecialTypeDeviceCap, number of special devices to be redirected before logon */ } /* Process device direction general capability set */ diff --git a/channels/rdpdr/client/rdpdr_main.c b/channels/rdpdr/client/rdpdr_main.c index ea7ee87ce..379555e3e 100644 --- a/channels/rdpdr/client/rdpdr_main.c +++ b/channels/rdpdr/client/rdpdr_main.c @@ -75,7 +75,7 @@ static void rdpdr_process_server_announce_request(rdpdrPlugin* rdpdr, STREAM* da { stream_read_UINT16(data_in, rdpdr->versionMajor); stream_read_UINT16(data_in, rdpdr->versionMinor); - stream_read_uint32(data_in, rdpdr->clientID); + stream_read_UINT32(data_in, rdpdr->clientID); DEBUG_SVC("version %d.%d clientID %d", rdpdr->versionMajor, rdpdr->versionMinor, rdpdr->clientID); } @@ -91,7 +91,7 @@ static void rdpdr_send_client_announce_reply(rdpdrPlugin* rdpdr) stream_write_UINT16(data_out, rdpdr->versionMajor); stream_write_UINT16(data_out, rdpdr->versionMinor); - stream_write_uint32(data_out, (uint32) rdpdr->clientID); + stream_write_UINT32(data_out, (UINT32) rdpdr->clientID); svc_plugin_send((rdpSvcPlugin*) rdpdr, data_out); } @@ -112,9 +112,9 @@ static void rdpdr_send_client_name_request(rdpdrPlugin* rdpdr) stream_write_UINT16(data_out, RDPDR_CTYP_CORE); stream_write_UINT16(data_out, PAKID_CORE_CLIENT_NAME); - stream_write_uint32(data_out, 1); /* unicodeFlag, 0 for ASCII and 1 for Unicode */ - stream_write_uint32(data_out, 0); /* codePage, must be set to zero */ - stream_write_uint32(data_out, computerNameLenW + 2); /* computerNameLen, including null terminator */ + stream_write_UINT32(data_out, 1); /* unicodeFlag, 0 for ASCII and 1 for Unicode */ + stream_write_UINT32(data_out, 0); /* codePage, must be set to zero */ + stream_write_UINT32(data_out, computerNameLenW + 2); /* computerNameLen, including null terminator */ stream_write(data_out, computerNameW, computerNameLenW); stream_write_UINT16(data_out, 0); /* null terminator */ @@ -127,11 +127,11 @@ static void rdpdr_process_server_clientid_confirm(rdpdrPlugin* rdpdr, STREAM* da { UINT16 versionMajor; UINT16 versionMinor; - uint32 clientID; + UINT32 clientID; stream_read_UINT16(data_in, versionMajor); stream_read_UINT16(data_in, versionMinor); - stream_read_uint32(data_in, clientID); + stream_read_UINT32(data_in, clientID); if (versionMajor != rdpdr->versionMajor || versionMinor != rdpdr->versionMinor) { @@ -152,7 +152,7 @@ static void rdpdr_send_device_list_announce_request(rdpdrPlugin* rdpdr, BOOL use int i; int pos; BYTE c; - uint32 count; + UINT32 count; int data_len; int count_pos; STREAM* data_out; @@ -166,7 +166,7 @@ static void rdpdr_send_device_list_announce_request(rdpdrPlugin* rdpdr, BOOL use count_pos = stream_get_pos(data_out); count = 0; - stream_seek_uint32(data_out); /* deviceCount */ + stream_seek_UINT32(data_out); /* deviceCount */ for (item = rdpdr->devman->devices->head; item; item = item->next) { @@ -184,8 +184,8 @@ static void rdpdr_send_device_list_announce_request(rdpdrPlugin* rdpdr, BOOL use data_len = (device->data == NULL ? 0 : stream_get_length(device->data)); stream_check_size(data_out, 20 + data_len); - stream_write_uint32(data_out, device->type); /* deviceType */ - stream_write_uint32(data_out, device->id); /* deviceID */ + stream_write_UINT32(data_out, device->type); /* deviceType */ + stream_write_UINT32(data_out, device->id); /* deviceID */ strncpy((char*) stream_get_tail(data_out), device->name, 8); for (i = 0; i < 8; i++) @@ -198,7 +198,7 @@ static void rdpdr_send_device_list_announce_request(rdpdrPlugin* rdpdr, BOOL use stream_seek_BYTE(data_out); } - stream_write_uint32(data_out, data_len); + stream_write_UINT32(data_out, data_len); if (data_len > 0) stream_write(data_out, stream_get_data(device->data), data_len); @@ -212,7 +212,7 @@ static void rdpdr_send_device_list_announce_request(rdpdrPlugin* rdpdr, BOOL use pos = stream_get_pos(data_out); stream_set_pos(data_out, count_pos); - stream_write_uint32(data_out, count); + stream_write_UINT32(data_out, count); stream_set_pos(data_out, pos); stream_seal(data_out); @@ -237,8 +237,8 @@ static void rdpdr_process_receive(rdpSvcPlugin* plugin, STREAM* data_in) { UINT16 component; UINT16 packetID; - uint32 deviceID; - uint32 status; + UINT32 deviceID; + UINT32 status; rdpdrPlugin* rdpdr = (rdpdrPlugin*) plugin; stream_read_UINT16(data_in, component); @@ -274,8 +274,8 @@ static void rdpdr_process_receive(rdpSvcPlugin* plugin, STREAM* data_in) case PAKID_CORE_DEVICE_REPLY: /* connect to a specific resource */ - stream_read_uint32(data_in, deviceID); - stream_read_uint32(data_in, status); + stream_read_UINT32(data_in, deviceID); + stream_read_UINT32(data_in, status); DEBUG_SVC("RDPDR_CTYP_CORE / PAKID_CORE_DEVICE_REPLY (deviceID=%d status=0x%08X)", deviceID, status); break; diff --git a/channels/rdpsnd/client/MacAudio/rdpsnd_audio_q.c b/channels/rdpsnd/client/MacAudio/rdpsnd_audio_q.c index 1f0c61e5e..477c90256 100644 --- a/channels/rdpsnd/client/MacAudio/rdpsnd_audio_q.c +++ b/channels/rdpsnd/client/MacAudio/rdpsnd_audio_q.c @@ -146,7 +146,7 @@ static void rdpsnd_audio_set_format(rdpsndDevicePlugin* device, rdpsndFormat* fo { } -static void rdpsnd_audio_set_volume(rdpsndDevicePlugin* device, uint32 value) +static void rdpsnd_audio_set_volume(rdpsndDevicePlugin* device, UINT32 value) { } diff --git a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c index aadb8085c..8331b5e08 100644 --- a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c +++ b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c @@ -45,11 +45,11 @@ struct rdpsnd_alsa_plugin char* device_name; snd_pcm_t* out_handle; snd_mixer_t* mixer_handle; - uint32 source_rate; - uint32 actual_rate; + UINT32 source_rate; + UINT32 actual_rate; snd_pcm_format_t format; - uint32 source_channels; - uint32 actual_channels; + UINT32 source_channels; + UINT32 actual_channels; int bytes_per_channel; int wformat; int block_size; @@ -291,7 +291,7 @@ static BOOL rdpsnd_alsa_format_supported(rdpsndDevicePlugin* device, rdpsndForma return FALSE; } -static void rdpsnd_alsa_set_volume(rdpsndDevicePlugin* device, uint32 value) +static void rdpsnd_alsa_set_volume(rdpsndDevicePlugin* device, UINT32 value) { long left; long right; diff --git a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c index aeabe087f..4710eb88f 100644 --- a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c +++ b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c @@ -288,9 +288,9 @@ static void rdpsnd_pulse_open(rdpsndDevicePlugin* device, rdpsndFormat* format, { buffer_attr.maxlength = pa_usec_to_bytes(pulse->latency * 2 * 1000, &pulse->sample_spec); buffer_attr.tlength = pa_usec_to_bytes(pulse->latency * 1000, &pulse->sample_spec); - buffer_attr.prebuf = (uint32_t) -1; - buffer_attr.minreq = (uint32_t) -1; - buffer_attr.fragsize = (uint32_t) -1; + buffer_attr.prebuf = (UINT32_t) -1; + buffer_attr.minreq = (UINT32_t) -1; + buffer_attr.fragsize = (UINT32_t) -1; flags |= PA_STREAM_ADJUST_LATENCY; } @@ -424,7 +424,7 @@ static void rdpsnd_pulse_set_format(rdpsndDevicePlugin* device, rdpsndFormat* fo rdpsnd_pulse_open(device, format, latency); } -static void rdpsnd_pulse_set_volume(rdpsndDevicePlugin* device, uint32 value) +static void rdpsnd_pulse_set_volume(rdpsndDevicePlugin* device, UINT32 value) { pa_cvolume cv; pa_volume_t left; diff --git a/channels/rdpsnd/client/rdpsnd_main.c b/channels/rdpsnd/client/rdpsnd_main.c index 7fba7bfa8..182457311 100644 --- a/channels/rdpsnd/client/rdpsnd_main.c +++ b/channels/rdpsnd/client/rdpsnd_main.c @@ -56,15 +56,15 @@ struct rdpsnd_plugin BOOL expectingWave; BYTE waveData[4]; UINT16 waveDataSize; - uint32 wTimeStamp; /* server timestamp */ - uint32 wave_timestamp; /* client timestamp */ + UINT32 wTimeStamp; /* server timestamp */ + UINT32 wave_timestamp; /* client timestamp */ BOOL is_open; - uint32 close_timestamp; + UINT32 close_timestamp; UINT16 fixed_format; UINT16 fixed_channel; - uint32 fixed_rate; + UINT32 fixed_rate; int latency; /* Device plugin */ @@ -74,11 +74,11 @@ struct rdpsnd_plugin struct data_out_item { STREAM* data_out; - uint32 out_timestamp; + UINT32 out_timestamp; }; /* get time in milliseconds */ -static uint32 get_mstime(void) +static UINT32 get_mstime(void) { struct timeval tp; @@ -91,7 +91,7 @@ static void rdpsnd_process_interval(rdpSvcPlugin* plugin) { rdpsndPlugin* rdpsnd = (rdpsndPlugin*)plugin; struct data_out_item* item; - uint32 cur_time; + UINT32 cur_time; while (list_size(rdpsnd->data_out_list) > 0) { @@ -159,9 +159,9 @@ static void rdpsnd_process_message_formats(rdpsndPlugin* rdpsnd, STREAM* data_in rdpsnd_free_supported_formats(rdpsnd); - stream_seek_uint32(data_in); /* dwFlags */ - stream_seek_uint32(data_in); /* dwVolume */ - stream_seek_uint32(data_in); /* dwPitch */ + stream_seek_UINT32(data_in); /* dwFlags */ + stream_seek_UINT32(data_in); /* dwVolume */ + stream_seek_UINT32(data_in); /* dwPitch */ stream_seek_UINT16(data_in); /* wDGramPort */ stream_read_UINT16(data_in, wNumberOfFormats); stream_read_BYTE(data_in, rdpsnd->cBlockNo); /* cLastBlockConfirmed */ @@ -182,9 +182,9 @@ static void rdpsnd_process_message_formats(rdpsndPlugin* rdpsnd, STREAM* data_in stream_write_BYTE(data_out, SNDC_FORMATS); /* msgType */ stream_write_BYTE(data_out, 0); /* bPad */ stream_seek_UINT16(data_out); /* BodySize */ - stream_write_uint32(data_out, TSSNDCAPS_ALIVE | TSSNDCAPS_VOLUME); /* dwFlags */ - stream_write_uint32(data_out, 0xFFFFFFFF); /* dwVolume */ - stream_write_uint32(data_out, 0); /* dwPitch */ + stream_write_UINT32(data_out, TSSNDCAPS_ALIVE | TSSNDCAPS_VOLUME); /* dwFlags */ + stream_write_UINT32(data_out, 0xFFFFFFFF); /* dwVolume */ + stream_write_UINT32(data_out, 0); /* dwPitch */ stream_write_UINT16_be(data_out, 0); /* wDGramPort */ stream_seek_UINT16(data_out); /* wNumberOfFormats */ stream_write_BYTE(data_out, 0); /* cLastBlockConfirmed */ @@ -197,8 +197,8 @@ static void rdpsnd_process_message_formats(rdpsndPlugin* rdpsnd, STREAM* data_in format = &out_formats[n_out_formats]; stream_read_UINT16(data_in, format->wFormatTag); stream_read_UINT16(data_in, format->nChannels); - stream_read_uint32(data_in, format->nSamplesPerSec); - stream_seek_uint32(data_in); /* nAvgBytesPerSec */ + stream_read_UINT32(data_in, format->nSamplesPerSec); + stream_seek_UINT32(data_in); /* nAvgBytesPerSec */ stream_read_UINT16(data_in, format->nBlockAlign); stream_read_UINT16(data_in, format->wBitsPerSample); stream_read_UINT16(data_in, format->cbSize); @@ -321,8 +321,8 @@ static void rdpsnd_process_message_wave_info(rdpsndPlugin* rdpsnd, STREAM* data_ static void rdpsnd_process_message_wave(rdpsndPlugin* rdpsnd, STREAM* data_in) { UINT16 wTimeStamp; - uint32 delay_ms; - uint32 process_ms; + UINT32 delay_ms; + UINT32 process_ms; struct data_out_item* item; rdpsnd->expectingWave = 0; @@ -367,9 +367,9 @@ static void rdpsnd_process_message_close(rdpsndPlugin* rdpsnd) static void rdpsnd_process_message_setvolume(rdpsndPlugin* rdpsnd, STREAM* data_in) { - uint32 dwVolume; + UINT32 dwVolume; - stream_read_uint32(data_in, dwVolume); + stream_read_UINT32(data_in, dwVolume); DEBUG_SVC("dwVolume 0x%X", dwVolume); if (rdpsnd->device) IFCALL(rdpsnd->device->SetVolume, rdpsnd->device, dwVolume); diff --git a/channels/rdpsnd/client/rdpsnd_main.h b/channels/rdpsnd/client/rdpsnd_main.h index 1ca778428..d92bdafe3 100644 --- a/channels/rdpsnd/client/rdpsnd_main.h +++ b/channels/rdpsnd/client/rdpsnd_main.h @@ -29,7 +29,7 @@ typedef struct rdpsnd_device_plugin rdpsndDevicePlugin; typedef BOOL (*pcFormatSupported) (rdpsndDevicePlugin* device, rdpsndFormat* format); typedef void (*pcOpen) (rdpsndDevicePlugin* device, rdpsndFormat* format, int latency); typedef void (*pcSetFormat) (rdpsndDevicePlugin* device, rdpsndFormat* format, int latency); -typedef void (*pcSetVolume) (rdpsndDevicePlugin* device, uint32 value); +typedef void (*pcSetVolume) (rdpsndDevicePlugin* device, UINT32 value); typedef void (*pcPlay) (rdpsndDevicePlugin* device, BYTE* data, int size); typedef void (*pcStart) (rdpsndDevicePlugin* device); typedef void (*pcClose) (rdpsndDevicePlugin* device); diff --git a/channels/rdpsnd/server/rdpsnd.c b/channels/rdpsnd/server/rdpsnd.c index 2427044f8..c4f261751 100644 --- a/channels/rdpsnd/server/rdpsnd.c +++ b/channels/rdpsnd/server/rdpsnd.c @@ -47,8 +47,8 @@ typedef struct _rdpsnd_server int out_frames; int out_pending_frames; - uint32 src_bytes_per_sample; - uint32 src_bytes_per_frame; + UINT32 src_bytes_per_sample; + UINT32 src_bytes_per_frame; } rdpsnd_server; #define RDPSND_PDU_INIT(_s, _msgType) \ @@ -77,9 +77,9 @@ static BOOL rdpsnd_server_send_formats(rdpsnd_server* rdpsnd, STREAM* s) RDPSND_PDU_INIT(s, SNDC_FORMATS); - stream_write_uint32(s, 0); /* dwFlags */ - stream_write_uint32(s, 0); /* dwVolume */ - stream_write_uint32(s, 0); /* dwPitch */ + stream_write_UINT32(s, 0); /* dwFlags */ + stream_write_UINT32(s, 0); /* dwVolume */ + stream_write_UINT32(s, 0); /* dwPitch */ stream_write_UINT16(s, 0); /* wDGramPort */ stream_write_UINT16(s, rdpsnd->context.num_server_formats); /* wNumberOfFormats */ stream_write_BYTE(s, rdpsnd->context.block_no); /* cLastBlockConfirmed */ @@ -90,9 +90,9 @@ static BOOL rdpsnd_server_send_formats(rdpsnd_server* rdpsnd, STREAM* s) { stream_write_UINT16(s, rdpsnd->context.server_formats[i].wFormatTag); /* wFormatTag (WAVE_FORMAT_PCM) */ stream_write_UINT16(s, rdpsnd->context.server_formats[i].nChannels); /* nChannels */ - stream_write_uint32(s, rdpsnd->context.server_formats[i].nSamplesPerSec); /* nSamplesPerSec */ + stream_write_UINT32(s, rdpsnd->context.server_formats[i].nSamplesPerSec); /* nSamplesPerSec */ - stream_write_uint32(s, rdpsnd->context.server_formats[i].nSamplesPerSec * + stream_write_UINT32(s, rdpsnd->context.server_formats[i].nSamplesPerSec * rdpsnd->context.server_formats[i].nChannels * rdpsnd->context.server_formats[i].wBitsPerSample / 8); /* nAvgBytesPerSec */ @@ -116,9 +116,9 @@ static BOOL rdpsnd_server_recv_formats(rdpsnd_server* rdpsnd, STREAM* s) if (stream_get_left(s) < 20) return FALSE; - stream_seek_uint32(s); /* dwFlags */ - stream_seek_uint32(s); /* dwVolume */ - stream_seek_uint32(s); /* dwPitch */ + stream_seek_UINT32(s); /* dwFlags */ + stream_seek_UINT32(s); /* dwVolume */ + stream_seek_UINT32(s); /* dwPitch */ stream_seek_UINT16(s); /* wDGramPort */ stream_read_UINT16(s, rdpsnd->context.num_client_formats); /* wNumberOfFormats */ stream_seek_BYTE(s); /* cLastBlockConfirmed */ @@ -140,8 +140,8 @@ static BOOL rdpsnd_server_recv_formats(rdpsnd_server* rdpsnd, STREAM* s) stream_read_UINT16(s, rdpsnd->context.client_formats[i].wFormatTag); stream_read_UINT16(s, rdpsnd->context.client_formats[i].nChannels); - stream_read_uint32(s, rdpsnd->context.client_formats[i].nSamplesPerSec); - stream_seek_uint32(s); /* nAvgBytesPerSec */ + stream_read_UINT32(s, rdpsnd->context.client_formats[i].nSamplesPerSec); + stream_seek_UINT32(s); /* nAvgBytesPerSec */ stream_read_UINT16(s, rdpsnd->context.client_formats[i].nBlockAlign); stream_read_UINT16(s, rdpsnd->context.client_formats[i].wBitsPerSample); stream_read_UINT16(s, rdpsnd->context.client_formats[i].cbSize); @@ -163,7 +163,7 @@ static void* rdpsnd_server_thread_func(void* arg) void* buffer; BYTE msgType; UINT16 BodySize; - uint32 bytes_returned = 0; + UINT32 bytes_returned = 0; rdpsnd_server* rdpsnd = (rdpsnd_server*) arg; freerdp_thread* thread = rdpsnd->rdpsnd_channel_thread; @@ -368,7 +368,7 @@ static BOOL rdpsnd_server_send_audio_pdu(rdpsnd_server* rdpsnd) /* Wave PDU */ stream_check_size(s, size + fill_size); - stream_write_uint32(s, 0); /* bPad */ + stream_write_UINT32(s, 0); /* bPad */ stream_write(s, src + 4, size - 4); if (fill_size > 0) diff --git a/channels/serial/client/serial_main.c b/channels/serial/client/serial_main.c index 06960d73d..edd4308a5 100644 --- a/channels/serial/client/serial_main.c +++ b/channels/serial/client/serial_main.c @@ -66,13 +66,13 @@ struct _SERIAL_DEVICE fd_set read_fds; fd_set write_fds; - uint32 nfds; + UINT32 nfds; struct timeval tv; - uint32 select_timeout; - uint32 timeout_id; + UINT32 select_timeout; + UINT32 timeout_id; }; -static void serial_abort_single_io(SERIAL_DEVICE* serial, uint32 file_id, uint32 abort_io, uint32 io_status); +static void serial_abort_single_io(SERIAL_DEVICE* serial, UINT32 file_id, UINT32 abort_io, UINT32 io_status); static void serial_check_for_events(SERIAL_DEVICE* serial); static void serial_handle_async_irp(SERIAL_DEVICE* serial, IRP* irp); static BOOL serial_check_fds(SERIAL_DEVICE* serial); @@ -81,12 +81,12 @@ static void serial_process_irp_create(SERIAL_DEVICE* serial, IRP* irp) { char* path; SERIAL_TTY* tty; - uint32 PathLength; - uint32 FileId; + UINT32 PathLength; + UINT32 FileId; stream_seek(irp->input, 28); /* DesiredAccess(4) AllocationSize(8), FileAttributes(4) */ /* SharedAccess(4) CreateDisposition(4), CreateOptions(4) */ - stream_read_uint32(irp->input, PathLength); + stream_read_UINT32(irp->input, PathLength); freerdp_UnicodeToAsciiAlloc((WCHAR*) stream_get_tail(irp->input), &path, PathLength / 2); @@ -107,7 +107,7 @@ static void serial_process_irp_create(SERIAL_DEVICE* serial, IRP* irp) DEBUG_SVC("%s(%d) created.", serial->path, FileId); } - stream_write_uint32(irp->output, FileId); + stream_write_UINT32(irp->output, FileId); stream_write_BYTE(irp->output, 0); free(path); @@ -142,12 +142,12 @@ static void serial_process_irp_close(SERIAL_DEVICE* serial, IRP* irp) static void serial_process_irp_read(SERIAL_DEVICE* serial, IRP* irp) { SERIAL_TTY* tty; - uint32 Length; - uint64 Offset; + UINT32 Length; + UINT64 Offset; BYTE* buffer = NULL; - stream_read_uint32(irp->input, Length); - stream_read_uint64(irp->input, Offset); + stream_read_UINT32(irp->input, Length); + stream_read_UINT64(irp->input, Offset); DEBUG_SVC("length %u offset %llu", Length, Offset); @@ -179,7 +179,7 @@ static void serial_process_irp_read(SERIAL_DEVICE* serial, IRP* irp) } } - stream_write_uint32(irp->output, Length); + stream_write_UINT32(irp->output, Length); if (Length > 0) { @@ -195,11 +195,11 @@ static void serial_process_irp_read(SERIAL_DEVICE* serial, IRP* irp) static void serial_process_irp_write(SERIAL_DEVICE* serial, IRP* irp) { SERIAL_TTY* tty; - uint32 Length; - uint64 Offset; + UINT32 Length; + UINT64 Offset; - stream_read_uint32(irp->input, Length); - stream_read_uint64(irp->input, Offset); + stream_read_UINT32(irp->input, Length); + stream_read_UINT64(irp->input, Offset); stream_seek(irp->input, 20); /* Padding */ DEBUG_SVC("length %u offset %llu", Length, Offset); @@ -225,7 +225,7 @@ static void serial_process_irp_write(SERIAL_DEVICE* serial, IRP* irp) DEBUG_SVC("write %llu-%llu to %s(%d).", Offset, Offset + Length, serial->path, tty->id); } - stream_write_uint32(irp->output, Length); + stream_write_UINT32(irp->output, Length); stream_write_BYTE(irp->output, 0); /* Padding */ irp->Complete(irp); @@ -234,16 +234,16 @@ static void serial_process_irp_write(SERIAL_DEVICE* serial, IRP* irp) static void serial_process_irp_device_control(SERIAL_DEVICE* serial, IRP* irp) { SERIAL_TTY* tty; - uint32 IoControlCode; - uint32 InputBufferLength; - uint32 OutputBufferLength; - uint32 abort_io = SERIAL_ABORT_IO_NONE; + UINT32 IoControlCode; + UINT32 InputBufferLength; + UINT32 OutputBufferLength; + UINT32 abort_io = SERIAL_ABORT_IO_NONE; DEBUG_SVC("[in] pending size %d", list_size(serial->pending_irps)); - stream_read_uint32(irp->input, InputBufferLength); - stream_read_uint32(irp->input, OutputBufferLength); - stream_read_uint32(irp->input, IoControlCode); + stream_read_UINT32(irp->input, InputBufferLength); + stream_read_UINT32(irp->input, OutputBufferLength); + stream_read_UINT32(irp->input, IoControlCode); stream_seek(irp->input, 20); /* Padding */ tty = serial->tty; @@ -436,10 +436,10 @@ int DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints) return 0; } -static void serial_abort_single_io(SERIAL_DEVICE* serial, uint32 file_id, uint32 abort_io, uint32 io_status) +static void serial_abort_single_io(SERIAL_DEVICE* serial, UINT32 file_id, UINT32 abort_io, UINT32 io_status) { IRP* irp = NULL; - uint32 major; + UINT32 major; SERIAL_TTY* tty; DEBUG_SVC("[in] pending size %d", list_size(serial->pending_irps)); @@ -478,7 +478,7 @@ static void serial_abort_single_io(SERIAL_DEVICE* serial, uint32 file_id, uint32 /* Process a SINGLE FileId and MajorFunction */ list_remove(serial->pending_irps, irp); irp->IoStatus = io_status; - stream_write_uint32(irp->output, 0); + stream_write_UINT32(irp->output, 0); irp->Complete(irp); wait_obj_set(serial->in_event); @@ -492,7 +492,7 @@ static void serial_check_for_events(SERIAL_DEVICE* serial) { IRP* irp = NULL; IRP* prev; - uint32 result = 0; + UINT32 result = 0; SERIAL_TTY* tty; tty = serial->tty; @@ -512,7 +512,7 @@ static void serial_check_for_events(SERIAL_DEVICE* serial) DEBUG_SVC("got event result %u", result); irp->IoStatus = STATUS_SUCCESS; - stream_write_uint32(irp->output, result); + stream_write_UINT32(irp->output, result); irp->Complete(irp); prev = irp; @@ -530,14 +530,14 @@ static void serial_check_for_events(SERIAL_DEVICE* serial) DEBUG_SVC("[out] pending size %d", list_size(serial->pending_irps)); } -void serial_get_timeouts(SERIAL_DEVICE* serial, IRP* irp, uint32* timeout, uint32* interval_timeout) +void serial_get_timeouts(SERIAL_DEVICE* serial, IRP* irp, UINT32* timeout, UINT32* interval_timeout) { SERIAL_TTY* tty; - uint32 Length; - uint32 pos; + UINT32 Length; + UINT32 pos; pos = stream_get_pos(irp->input); - stream_read_uint32(irp->input, Length); + stream_read_UINT32(irp->input, Length); stream_set_pos(irp->input, pos); DEBUG_SVC("length read %u", Length); @@ -552,8 +552,8 @@ void serial_get_timeouts(SERIAL_DEVICE* serial, IRP* irp, uint32* timeout, uint3 static void serial_handle_async_irp(SERIAL_DEVICE* serial, IRP* irp) { - uint32 timeout = 0; - uint32 itv_timeout = 0; + UINT32 timeout = 0; + UINT32 itv_timeout = 0; SERIAL_TTY* tty; tty = serial->tty; @@ -603,7 +603,7 @@ static void __serial_check_fds(SERIAL_DEVICE* serial) IRP* irp; IRP* prev; SERIAL_TTY* tty; - uint32 result = 0; + UINT32 result = 0; memset(&serial->tv, 0, sizeof(struct timeval)); tty = serial->tty; @@ -639,7 +639,7 @@ static void __serial_check_fds(SERIAL_DEVICE* serial) DEBUG_SVC("got event result %u", result); irp->IoStatus = STATUS_SUCCESS; - stream_write_uint32(irp->output, result); + stream_write_UINT32(irp->output, result); irp->Complete(irp); } break; diff --git a/channels/serial/client/serial_tty.c b/channels/serial/client/serial_tty.c index d567b8312..c5761f26b 100644 --- a/channels/serial/client/serial_tty.c +++ b/channels/serial/client/serial_tty.c @@ -73,42 +73,42 @@ #define TIOCOUTQ FIONWRITE #endif -static uint32 tty_write_data(SERIAL_TTY* tty, BYTE* data, int len); +static UINT32 tty_write_data(SERIAL_TTY* tty, BYTE* data, int len); static void tty_set_termios(SERIAL_TTY* tty); static BOOL tty_get_termios(SERIAL_TTY* tty); static int tty_get_error_status(); -uint32 serial_tty_control(SERIAL_TTY* tty, uint32 IoControlCode, STREAM* input, STREAM* output, uint32* abort_io) +UINT32 serial_tty_control(SERIAL_TTY* tty, UINT32 IoControlCode, STREAM* input, STREAM* output, UINT32* abort_io) { int purge_mask; - uint32 result; - uint32 modemstate; + UINT32 result; + UINT32 modemstate; BYTE immediate; - uint32 ret = STATUS_SUCCESS; - uint32 length = 0; - uint32 pos; + UINT32 ret = STATUS_SUCCESS; + UINT32 length = 0; + UINT32 pos; DEBUG_SVC("in"); - stream_seek(output, sizeof(uint32)); + stream_seek(output, sizeof(UINT32)); switch (IoControlCode) { case IOCTL_SERIAL_SET_BAUD_RATE: - stream_read_uint32(input, tty->baud_rate); + stream_read_UINT32(input, tty->baud_rate); tty_set_termios(tty); DEBUG_SVC("SERIAL_SET_BAUD_RATE %d", tty->baud_rate); break; case IOCTL_SERIAL_GET_BAUD_RATE: length = 4; - stream_write_uint32(output, tty->baud_rate); + stream_write_UINT32(output, tty->baud_rate); DEBUG_SVC("SERIAL_GET_BAUD_RATE %d", tty->baud_rate); break; case IOCTL_SERIAL_SET_QUEUE_SIZE: - stream_read_uint32(input, tty->queue_in_size); - stream_read_uint32(input, tty->queue_out_size); + stream_read_UINT32(input, tty->queue_in_size); + stream_read_UINT32(input, tty->queue_out_size); DEBUG_SVC("SERIAL_SET_QUEUE_SIZE in %d out %d", tty->queue_in_size, tty->queue_out_size); break; @@ -138,7 +138,7 @@ uint32 serial_tty_control(SERIAL_TTY* tty, uint32 IoControlCode, STREAM* input, case IOCTL_SERIAL_CONFIG_SIZE: DEBUG_SVC("SERIAL_CONFIG_SIZE"); length = 4; - stream_write_uint32(output, 0); + stream_write_UINT32(output, 0); break; case IOCTL_SERIAL_GET_CHARS: @@ -156,30 +156,30 @@ uint32 serial_tty_control(SERIAL_TTY* tty, uint32 IoControlCode, STREAM* input, case IOCTL_SERIAL_GET_HANDFLOW: length = 16; tty_get_termios(tty); - stream_write_uint32(output, tty->control); - stream_write_uint32(output, tty->xonoff); - stream_write_uint32(output, tty->onlimit); - stream_write_uint32(output, tty->offlimit); + stream_write_UINT32(output, tty->control); + stream_write_UINT32(output, tty->xonoff); + stream_write_UINT32(output, tty->onlimit); + stream_write_UINT32(output, tty->offlimit); DEBUG_SVC("IOCTL_SERIAL_GET_HANDFLOW %X %X %X %X", tty->control, tty->xonoff, tty->onlimit, tty->offlimit); break; case IOCTL_SERIAL_SET_HANDFLOW: - stream_read_uint32(input, tty->control); - stream_read_uint32(input, tty->xonoff); - stream_read_uint32(input, tty->onlimit); - stream_read_uint32(input, tty->offlimit); + stream_read_UINT32(input, tty->control); + stream_read_UINT32(input, tty->xonoff); + stream_read_UINT32(input, tty->onlimit); + stream_read_UINT32(input, tty->offlimit); DEBUG_SVC("IOCTL_SERIAL_SET_HANDFLOW %X %X %X %X", tty->control, tty->xonoff, tty->onlimit, tty->offlimit); tty_set_termios(tty); break; case IOCTL_SERIAL_SET_TIMEOUTS: - stream_read_uint32(input, tty->read_interval_timeout); - stream_read_uint32(input, tty->read_total_timeout_multiplier); - stream_read_uint32(input, tty->read_total_timeout_constant); - stream_read_uint32(input, tty->write_total_timeout_multiplier); - stream_read_uint32(input, tty->write_total_timeout_constant); + stream_read_UINT32(input, tty->read_interval_timeout); + stream_read_UINT32(input, tty->read_total_timeout_multiplier); + stream_read_UINT32(input, tty->read_total_timeout_constant); + stream_read_UINT32(input, tty->write_total_timeout_multiplier); + stream_read_UINT32(input, tty->write_total_timeout_constant); /* http://www.codeproject.com/KB/system/chaiyasit_t.aspx, see 'ReadIntervalTimeout' section http://msdn.microsoft.com/en-us/library/ms885171.aspx */ @@ -201,21 +201,21 @@ uint32 serial_tty_control(SERIAL_TTY* tty, uint32 IoControlCode, STREAM* input, tty->read_total_timeout_multiplier, tty->read_total_timeout_constant); length = 20; - stream_write_uint32(output, tty->read_interval_timeout); - stream_write_uint32(output, tty->read_total_timeout_multiplier); - stream_write_uint32(output, tty->read_total_timeout_constant); - stream_write_uint32(output, tty->write_total_timeout_multiplier); - stream_write_uint32(output, tty->write_total_timeout_constant); + stream_write_UINT32(output, tty->read_interval_timeout); + stream_write_UINT32(output, tty->read_total_timeout_multiplier); + stream_write_UINT32(output, tty->read_total_timeout_constant); + stream_write_UINT32(output, tty->write_total_timeout_multiplier); + stream_write_UINT32(output, tty->write_total_timeout_constant); break; case IOCTL_SERIAL_GET_WAIT_MASK: DEBUG_SVC("SERIAL_GET_WAIT_MASK %X", tty->wait_mask); length = 4; - stream_write_uint32(output, tty->wait_mask); + stream_write_UINT32(output, tty->wait_mask); break; case IOCTL_SERIAL_SET_WAIT_MASK: - stream_read_uint32(input, tty->wait_mask); + stream_read_UINT32(input, tty->wait_mask); DEBUG_SVC("SERIAL_SET_WAIT_MASK %X", tty->wait_mask); break; @@ -270,19 +270,19 @@ uint32 serial_tty_control(SERIAL_TTY* tty, uint32 IoControlCode, STREAM* input, #endif DEBUG_SVC("SERIAL_GET_MODEMSTATUS %X", modemstate); length = 4; - stream_write_uint32(output, modemstate); + stream_write_UINT32(output, modemstate); break; case IOCTL_SERIAL_GET_COMMSTATUS: length = 18; - stream_write_uint32(output, 0); /* Errors */ - stream_write_uint32(output, 0); /* Hold reasons */ + stream_write_UINT32(output, 0); /* Errors */ + stream_write_UINT32(output, 0); /* Hold reasons */ result = 0; #ifdef TIOCINQ ioctl(tty->fd, TIOCINQ, &result); #endif - stream_write_uint32(output, result); /* Amount in in queue */ + stream_write_UINT32(output, result); /* Amount in in queue */ if (result) DEBUG_SVC("SERIAL_GET_COMMSTATUS in queue %d", result); @@ -290,7 +290,7 @@ uint32 serial_tty_control(SERIAL_TTY* tty, uint32 IoControlCode, STREAM* input, #ifdef TIOCOUTQ ioctl(tty->fd, TIOCOUTQ, &result); #endif - stream_write_uint32(output, result); /* Amount in out queue */ + stream_write_UINT32(output, result); /* Amount in out queue */ DEBUG_SVC("SERIAL_GET_COMMSTATUS out queue %d", result); stream_write_BYTE(output, 0); /* EofReceived */ @@ -298,7 +298,7 @@ uint32 serial_tty_control(SERIAL_TTY* tty, uint32 IoControlCode, STREAM* input, break; case IOCTL_SERIAL_PURGE: - stream_read_uint32(input, purge_mask); + stream_read_UINT32(input, purge_mask); DEBUG_SVC("SERIAL_PURGE purge_mask %X", purge_mask); /* See http://msdn.microsoft.com/en-us/library/ms901431.aspx @@ -327,7 +327,7 @@ uint32 serial_tty_control(SERIAL_TTY* tty, uint32 IoControlCode, STREAM* input, if (serial_tty_get_event(tty, &result)) { DEBUG_SVC("WAIT end event = %X", result); - stream_write_uint32(output, result); + stream_write_UINT32(output, result); break; } ret = STATUS_PENDING; @@ -363,13 +363,13 @@ uint32 serial_tty_control(SERIAL_TTY* tty, uint32 IoControlCode, STREAM* input, /* Write OutputBufferLength */ pos = stream_get_pos(output); stream_set_pos(output, 16); - stream_write_uint32(output, length); + stream_write_UINT32(output, length); stream_set_pos(output, pos); return ret; } -BOOL serial_tty_read(SERIAL_TTY* tty, BYTE* buffer, uint32* Length) +BOOL serial_tty_read(SERIAL_TTY* tty, BYTE* buffer, UINT32* Length) { long timeout = 90; struct termios *ptermios; @@ -418,10 +418,10 @@ BOOL serial_tty_read(SERIAL_TTY* tty, BYTE* buffer, uint32* Length) return TRUE; } -BOOL serial_tty_write(SERIAL_TTY* tty, BYTE* buffer, uint32 Length) +BOOL serial_tty_write(SERIAL_TTY* tty, BYTE* buffer, UINT32 Length) { ssize_t r; - uint32 event_txempty = Length; + UINT32 event_txempty = Length; DEBUG_SVC("in"); @@ -463,7 +463,7 @@ void serial_tty_free(SERIAL_TTY* tty) } -SERIAL_TTY* serial_tty_new(const char* path, uint32 id) +SERIAL_TTY* serial_tty_new(const char* path, UINT32 id) { SERIAL_TTY* tty; @@ -531,7 +531,7 @@ SERIAL_TTY* serial_tty_new(const char* path, uint32 id) return tty; } -BOOL serial_tty_get_event(SERIAL_TTY* tty, uint32* result) +BOOL serial_tty_get_event(SERIAL_TTY* tty, UINT32* result) { int bytes; BOOL ret = FALSE; @@ -969,7 +969,7 @@ static void tty_set_termios(SERIAL_TTY* tty) tcsetattr(tty->fd, TCSANOW, ptermios); } -static uint32 tty_write_data(SERIAL_TTY* tty, BYTE* data, int len) +static UINT32 tty_write_data(SERIAL_TTY* tty, BYTE* data, int len) { ssize_t r; diff --git a/channels/serial/client/serial_tty.h b/channels/serial/client/serial_tty.h index c5b959626..bace6e709 100644 --- a/channels/serial/client/serial_tty.h +++ b/channels/serial/client/serial_tty.h @@ -35,24 +35,24 @@ typedef struct _SERIAL_TTY SERIAL_TTY; struct _SERIAL_TTY { - uint32 id; + UINT32 id; int fd; int dtr; int rts; - uint32 control; - uint32 xonoff; - uint32 onlimit; - uint32 offlimit; - uint32 baud_rate; - uint32 queue_in_size; - uint32 queue_out_size; - uint32 wait_mask; - uint32 read_interval_timeout; - uint32 read_total_timeout_multiplier; - uint32 read_total_timeout_constant; - uint32 write_total_timeout_multiplier; - uint32 write_total_timeout_constant; + UINT32 control; + UINT32 xonoff; + UINT32 onlimit; + UINT32 offlimit; + UINT32 baud_rate; + UINT32 queue_in_size; + UINT32 queue_out_size; + UINT32 wait_mask; + UINT32 read_interval_timeout; + UINT32 read_total_timeout_multiplier; + UINT32 read_total_timeout_constant; + UINT32 write_total_timeout_multiplier; + UINT32 write_total_timeout_constant; BYTE stop_bits; BYTE parity; BYTE word_length; @@ -66,13 +66,13 @@ struct _SERIAL_TTY int event_pending; }; -SERIAL_TTY* serial_tty_new(const char* path, uint32 id); +SERIAL_TTY* serial_tty_new(const char* path, UINT32 id); void serial_tty_free(SERIAL_TTY* tty); -BOOL serial_tty_read(SERIAL_TTY* tty, BYTE* buffer, uint32* Length); -BOOL serial_tty_write(SERIAL_TTY* tty, BYTE* buffer, uint32 Length); -uint32 serial_tty_control(SERIAL_TTY* tty, uint32 IoControlCode, STREAM* input, STREAM* output, uint32* abort_io); +BOOL serial_tty_read(SERIAL_TTY* tty, BYTE* buffer, UINT32* Length); +BOOL serial_tty_write(SERIAL_TTY* tty, BYTE* buffer, UINT32 Length); +UINT32 serial_tty_control(SERIAL_TTY* tty, UINT32 IoControlCode, STREAM* input, STREAM* output, UINT32* abort_io); -BOOL serial_tty_get_event(SERIAL_TTY* tty, uint32* result); +BOOL serial_tty_get_event(SERIAL_TTY* tty, UINT32* result); #endif /* __SERIAL_TTY_H */ diff --git a/channels/smartcard/client/scard_main.c b/channels/smartcard/client/scard_main.c index 17ffa0b1f..38e0b8976 100644 --- a/channels/smartcard/client/scard_main.c +++ b/channels/smartcard/client/scard_main.c @@ -130,7 +130,7 @@ static void* scard_thread_func(void* arg) } /* Begin TS Client defect workaround. */ -static COMPLETIONIDINFO* scard_mark_duplicate_id(SCARD_DEVICE* scard, uint32 CompletionId) +static COMPLETIONIDINFO* scard_mark_duplicate_id(SCARD_DEVICE* scard, UINT32 CompletionId) { /* * Search from the beginning of the LIST for one outstanding "CompletionID" @@ -157,7 +157,7 @@ static COMPLETIONIDINFO* scard_mark_duplicate_id(SCARD_DEVICE* scard, uint32 Com return NULL; /* Either no items in the list or no match. */ } -static BOOL scard_check_for_duplicate_id(SCARD_DEVICE* scard, uint32 CompletionId) +static BOOL scard_check_for_duplicate_id(SCARD_DEVICE* scard, UINT32 CompletionId) { /* * Search from the end of the LIST for one outstanding "CompletionID" @@ -208,7 +208,7 @@ static void scard_irp_complete(IRP* irp) pos = stream_get_pos(irp->output); stream_set_pos(irp->output, 12); - stream_write_uint32(irp->output, irp->IoStatus); + stream_write_UINT32(irp->output, irp->IoStatus); stream_set_pos(irp->output, pos); /* Begin TS Client defect workaround. */ diff --git a/channels/smartcard/client/scard_main.h b/channels/smartcard/client/scard_main.h index 4844eeecf..103a03f2a 100644 --- a/channels/smartcard/client/scard_main.h +++ b/channels/smartcard/client/scard_main.h @@ -83,7 +83,7 @@ */ struct _COMPLETIONIDINFO { - uint32 ID; /* CompletionID */ + UINT32 ID; /* CompletionID */ BOOL duplicate; /* Indicates whether or not this * CompletionID is a duplicate of an * earlier, outstanding, CompletionID. diff --git a/channels/smartcard/client/scard_operations.c b/channels/smartcard/client/scard_operations.c index 9c235715b..c0c07e990 100644 --- a/channels/smartcard/client/scard_operations.c +++ b/channels/smartcard/client/scard_operations.c @@ -84,10 +84,10 @@ #define WIN_FILE_DEVICE_SMARTCARD 0x00000031 -static uint32 sc_output_string(IRP* irp, char *src, BOOL wide) +static UINT32 sc_output_string(IRP* irp, char *src, BOOL wide) { BYTE* p; - uint32 len; + UINT32 len; p = stream_get_tail(irp->output); len = strlen(src) + 1; @@ -113,29 +113,29 @@ static uint32 sc_output_string(IRP* irp, char *src, BOOL wide) return len; } -static void sc_output_alignment(IRP *irp, uint32 seed) +static void sc_output_alignment(IRP *irp, UINT32 seed) { - const uint32 field_lengths = 20;/* Remove the lengths of the fields + const UINT32 field_lengths = 20;/* Remove the lengths of the fields * RDPDR_HEADER, DeviceID, * CompletionID, and IoStatus * of Section 2.2.1.5.5 of MS-RDPEFS. */ - uint32 size = stream_get_length(irp->output) - field_lengths; - uint32 add = (seed - (size % seed)) % seed; + UINT32 size = stream_get_length(irp->output) - field_lengths; + UINT32 add = (seed - (size % seed)) % seed; if (add > 0) stream_write_zero(irp->output, add); } -static void sc_output_repos(IRP* irp, uint32 written) +static void sc_output_repos(IRP* irp, UINT32 written) { - uint32 add = (4 - (written % 4)) % 4; + UINT32 add = (4 - (written % 4)) % 4; if (add > 0) stream_write_zero(irp->output, add); } -static uint32 sc_output_return(IRP* irp, uint32 rv) +static UINT32 sc_output_return(IRP* irp, UINT32 rv) { stream_write_zero(irp->output, 256); return rv; @@ -145,11 +145,11 @@ static void sc_output_buffer_limit(IRP* irp, char *buffer, unsigned int length, { int header = (length < 0) ? (0) : ((length > highLimit) ? (highLimit) : (length)); - stream_write_uint32(irp->output, header); + stream_write_UINT32(irp->output, header); if (length <= 0) { - stream_write_uint32(irp->output, 0); + stream_write_UINT32(irp->output, 0); } else { @@ -170,8 +170,8 @@ static void sc_output_buffer_start_limit(IRP *irp, int length, int highLimit) { int header = (length < 0) ? (0) : ((length > highLimit) ? (highLimit) : (length)); - stream_write_uint32(irp->output, header); - stream_write_uint32(irp->output, 0x00000001); /* Magic DWORD - any non zero */ + stream_write_UINT32(irp->output, header); + stream_write_UINT32(irp->output, 0x00000001); /* Magic DWORD - any non zero */ } static void sc_output_buffer_start(IRP *irp, int length) @@ -179,7 +179,7 @@ static void sc_output_buffer_start(IRP *irp, int length) sc_output_buffer_start_limit(irp, length, 0x7FFFFFFF); } -static uint32 sc_input_string(IRP* irp, char **dest, uint32 dataLength, BOOL wide) +static UINT32 sc_input_string(IRP* irp, char **dest, UINT32 dataLength, BOOL wide) { char* buffer; int bufferSize; @@ -207,9 +207,9 @@ static uint32 sc_input_string(IRP* irp, char **dest, uint32 dataLength, BOOL wid return bufferSize; } -static void sc_input_repos(IRP* irp, uint32 read) +static void sc_input_repos(IRP* irp, UINT32 read) { - uint32 add = 4 - (read % 4); + UINT32 add = 4 - (read % 4); if (add < 4 && add > 0) stream_seek(irp->input, add); @@ -217,10 +217,10 @@ static void sc_input_repos(IRP* irp, uint32 read) static void sc_input_reader_name(IRP* irp, char **dest, BOOL wide) { - uint32 dataLength; + UINT32 dataLength; stream_seek(irp->input, 8); - stream_read_uint32(irp->input, dataLength); + stream_read_UINT32(irp->input, dataLength); DEBUG_SCARD("datalength %d", dataLength); sc_input_repos(irp, sc_input_string(irp, dest, dataLength, wide)); @@ -228,8 +228,8 @@ static void sc_input_reader_name(IRP* irp, char **dest, BOOL wide) static void sc_input_skip_linked(IRP* irp) { - uint32 len; - stream_read_uint32(irp->input, len); + UINT32 len; + stream_read_UINT32(irp->input, len); if (len > 0) { @@ -238,7 +238,7 @@ static void sc_input_skip_linked(IRP* irp) } } -static uint32 sc_map_state(uint32 state) +static UINT32 sc_map_state(UINT32 state) { /* is this mapping still needed? */ @@ -260,28 +260,28 @@ static uint32 sc_map_state(uint32 state) return state; } -static uint32 handle_EstablishContext(IRP* irp) +static UINT32 handle_EstablishContext(IRP* irp) { - uint32 len, rv; - uint32 scope; + UINT32 len, rv; + UINT32 scope; SCARDCONTEXT hContext = -1; stream_seek(irp->input, 8); - stream_read_uint32(irp->input, len); + stream_read_UINT32(irp->input, len); if (len != 8) return SCARD_F_INTERNAL_ERROR; - stream_seek_uint32(irp->input); - stream_read_uint32(irp->input, scope); + stream_seek_UINT32(irp->input); + stream_read_UINT32(irp->input, scope); rv = SCardEstablishContext(scope, NULL, NULL, &hContext); - stream_write_uint32(irp->output, 4); // cbContext - stream_write_uint32(irp->output, -1); // ReferentID + stream_write_UINT32(irp->output, 4); // cbContext + stream_write_UINT32(irp->output, -1); // ReferentID - stream_write_uint32(irp->output, 4); - stream_write_uint32(irp->output, hContext); + stream_write_UINT32(irp->output, 4); + stream_write_UINT32(irp->output, hContext); /* TODO: store hContext in allowed context list */ @@ -289,16 +289,16 @@ static uint32 handle_EstablishContext(IRP* irp) return SCARD_S_SUCCESS; } -static uint32 handle_ReleaseContext(IRP* irp) +static UINT32 handle_ReleaseContext(IRP* irp) { - uint32 len, rv; + UINT32 len, rv; SCARDCONTEXT hContext = -1; stream_seek(irp->input, 8); - stream_read_uint32(irp->input, len); + stream_read_UINT32(irp->input, len); stream_seek(irp->input, 0x10); - stream_read_uint32(irp->input, hContext); + stream_read_UINT32(irp->input, hContext); rv = SCardReleaseContext(hContext); if (rv) @@ -310,13 +310,13 @@ static uint32 handle_ReleaseContext(IRP* irp) return rv; } -static uint32 handle_IsValidContext(IRP* irp) +static UINT32 handle_IsValidContext(IRP* irp) { - uint32 rv; + UINT32 rv; SCARDCONTEXT hContext; stream_seek(irp->input, 0x1C); - stream_read_uint32(irp->input, hContext); + stream_read_UINT32(irp->input, hContext); rv = SCardIsValidContext(hContext); @@ -330,9 +330,9 @@ static uint32 handle_IsValidContext(IRP* irp) return rv; } -static uint32 handle_ListReaders(IRP* irp, BOOL wide) +static UINT32 handle_ListReaders(IRP* irp, BOOL wide) { - uint32 len, rv; + UINT32 len, rv; SCARDCONTEXT hContext; DWORD dwReaders; char *readerList = NULL, *walker; @@ -340,15 +340,15 @@ static uint32 handle_ListReaders(IRP* irp, BOOL wide) int pos, poslen1, poslen2; stream_seek(irp->input, 8); - stream_read_uint32(irp->input, len); + stream_read_UINT32(irp->input, len); stream_seek(irp->input, 0x1c); - stream_read_uint32(irp->input, len); + stream_read_UINT32(irp->input, len); if (len != 4) return SCARD_F_INTERNAL_ERROR; - stream_read_uint32(irp->input, hContext); + stream_read_UINT32(irp->input, hContext); /* ignore rest of [MS-RDPESC] 2.2.2.4 ListReaders_Call */ @@ -371,12 +371,12 @@ static uint32 handle_ListReaders(IRP* irp, BOOL wide) /* DEBUG_SCARD("Success 0x%08x %d %d", (unsigned) hContext, (unsigned) cchReaders, (int) strlen(readerList));*/ poslen1 = stream_get_pos(irp->output); - stream_seek_uint32(irp->output); + stream_seek_UINT32(irp->output); - stream_write_uint32(irp->output, 0x01760650); + stream_write_UINT32(irp->output, 0x01760650); poslen2 = stream_get_pos(irp->output); - stream_seek_uint32(irp->output); + stream_seek_UINT32(irp->output); walker = readerList; dataLength = 0; @@ -397,9 +397,9 @@ static uint32 handle_ListReaders(IRP* irp, BOOL wide) pos = stream_get_pos(irp->output); stream_set_pos(irp->output, poslen1); - stream_write_uint32(irp->output, dataLength); + stream_write_UINT32(irp->output, dataLength); stream_set_pos(irp->output, poslen2); - stream_write_uint32(irp->output, dataLength); + stream_write_UINT32(irp->output, dataLength); stream_set_pos(irp->output, pos); @@ -415,7 +415,7 @@ static uint32 handle_ListReaders(IRP* irp, BOOL wide) return rv; } -static uint32 handle_GetStatusChange(IRP* irp, BOOL wide) +static UINT32 handle_GetStatusChange(IRP* irp, BOOL wide) { LONG rv; SCARDCONTEXT hContext; @@ -425,12 +425,12 @@ static uint32 handle_GetStatusChange(IRP* irp, BOOL wide) int i; stream_seek(irp->input, 0x18); - stream_read_uint32(irp->input, dwTimeout); - stream_read_uint32(irp->input, readerCount); + stream_read_UINT32(irp->input, dwTimeout); + stream_read_UINT32(irp->input, readerCount); stream_seek(irp->input, 8); - stream_read_uint32(irp->input, hContext); + stream_read_UINT32(irp->input, hContext); stream_seek(irp->input, 4); @@ -454,9 +454,9 @@ static uint32 handle_GetStatusChange(IRP* irp, BOOL wide) * convert to host endian or fix the headers to * request the order we want */ - stream_read_uint32(irp->input, cur->dwCurrentState); - stream_read_uint32(irp->input, cur->dwEventState); - stream_read_uint32(irp->input, cur->cbAtr); + stream_read_UINT32(irp->input, cur->dwCurrentState); + stream_read_UINT32(irp->input, cur->dwEventState); + stream_read_UINT32(irp->input, cur->cbAtr); stream_read(irp->input, cur->rgbAtr, 32); stream_seek(irp->input, 4); @@ -469,10 +469,10 @@ static uint32 handle_GetStatusChange(IRP* irp, BOOL wide) for (i = 0; i < readerCount; i++) { cur = &readerStates[i]; - uint32 dataLength; + UINT32 dataLength; stream_seek(irp->input, 8); - stream_read_uint32(irp->input, dataLength); + stream_read_UINT32(irp->input, dataLength); sc_input_repos(irp, sc_input_string(irp, (char **) &cur->szReader, dataLength, wide)); DEBUG_SCARD(" \"%s\"", cur->szReader ? cur->szReader : "NULL"); @@ -496,9 +496,9 @@ static uint32 handle_GetStatusChange(IRP* irp, BOOL wide) else DEBUG_SCARD("Success"); - stream_write_uint32(irp->output, readerCount); - stream_write_uint32(irp->output, 0x00084dd8); - stream_write_uint32(irp->output, readerCount); + stream_write_UINT32(irp->output, readerCount); + stream_write_UINT32(irp->output, 0x00084dd8); + stream_write_UINT32(irp->output, readerCount); for (i = 0; i < readerCount; i++) { @@ -510,9 +510,9 @@ static uint32 handle_GetStatusChange(IRP* irp, BOOL wide) (unsigned) cur->dwEventState); /* TODO: do byte conversions if necessary */ - stream_write_uint32(irp->output, cur->dwCurrentState); - stream_write_uint32(irp->output, cur->dwEventState); - stream_write_uint32(irp->output, cur->cbAtr); + stream_write_UINT32(irp->output, cur->dwCurrentState); + stream_write_UINT32(irp->output, cur->dwEventState); + stream_write_UINT32(irp->output, cur->cbAtr); stream_write(irp->output, cur->rgbAtr, 32); stream_write_zero(irp->output, 4); @@ -526,13 +526,13 @@ static uint32 handle_GetStatusChange(IRP* irp, BOOL wide) return rv; } -static uint32 handle_Cancel(IRP *irp) +static UINT32 handle_Cancel(IRP *irp) { LONG rv; SCARDCONTEXT hContext; stream_seek(irp->input, 0x1C); - stream_read_uint32(irp->input, hContext); + stream_read_UINT32(irp->input, hContext); rv = SCardCancel(hContext); @@ -546,7 +546,7 @@ static uint32 handle_Cancel(IRP *irp) return rv; } -static uint32 handle_Connect(IRP* irp, BOOL wide) +static UINT32 handle_Connect(IRP* irp, BOOL wide) { LONG rv; SCARDCONTEXT hContext; @@ -557,13 +557,13 @@ static uint32 handle_Connect(IRP* irp, BOOL wide) SCARDHANDLE hCard; stream_seek(irp->input, 0x1c); - stream_read_uint32(irp->input, dwShareMode); - stream_read_uint32(irp->input, dwPreferredProtocol); + stream_read_UINT32(irp->input, dwShareMode); + stream_read_UINT32(irp->input, dwPreferredProtocol); sc_input_reader_name(irp, &readerName, wide); stream_seek(irp->input, 4); - stream_read_uint32(irp->input, hContext); + stream_read_UINT32(irp->input, hContext); DEBUG_SCARD("(context: 0x%08x, share: 0x%08x, proto: 0x%08x, reader: \"%s\")", (unsigned) hContext, (unsigned) dwShareMode, @@ -577,13 +577,13 @@ static uint32 handle_Connect(IRP* irp, BOOL wide) else DEBUG_SCARD("Success 0x%08x", (unsigned) hCard); - stream_write_uint32(irp->output, 0x00000000); - stream_write_uint32(irp->output, 0x00000000); - stream_write_uint32(irp->output, 0x00000004); - stream_write_uint32(irp->output, 0x016Cff34); - stream_write_uint32(irp->output, dwActiveProtocol); - stream_write_uint32(irp->output, 0x00000004); - stream_write_uint32(irp->output, hCard); + stream_write_UINT32(irp->output, 0x00000000); + stream_write_UINT32(irp->output, 0x00000000); + stream_write_UINT32(irp->output, 0x00000004); + stream_write_UINT32(irp->output, 0x016Cff34); + stream_write_UINT32(irp->output, dwActiveProtocol); + stream_write_UINT32(irp->output, 0x00000004); + stream_write_UINT32(irp->output, hCard); sc_output_alignment(irp, 8); @@ -591,7 +591,7 @@ static uint32 handle_Connect(IRP* irp, BOOL wide) return rv; } -static uint32 handle_Reconnect(IRP* irp) +static UINT32 handle_Reconnect(IRP* irp) { LONG rv; SCARDCONTEXT hContext; @@ -602,14 +602,14 @@ static uint32 handle_Reconnect(IRP* irp) DWORD dwActiveProtocol = 0; stream_seek(irp->input, 0x20); - stream_read_uint32(irp->input, dwShareMode); - stream_read_uint32(irp->input, dwPreferredProtocol); - stream_read_uint32(irp->input, dwInitialization); + stream_read_UINT32(irp->input, dwShareMode); + stream_read_UINT32(irp->input, dwPreferredProtocol); + stream_read_UINT32(irp->input, dwInitialization); stream_seek(irp->input, 0x4); - stream_read_uint32(irp->input, hContext); + stream_read_UINT32(irp->input, hContext); stream_seek(irp->input, 0x4); - stream_read_uint32(irp->input, hCard); + stream_read_UINT32(irp->input, hCard); DEBUG_SCARD("(context: 0x%08x, hcard: 0x%08x, share: 0x%08x, proto: 0x%08x, init: 0x%08x)", (unsigned) hContext, (unsigned) hCard, @@ -623,13 +623,13 @@ static uint32 handle_Reconnect(IRP* irp) else DEBUG_SCARD("Success (proto: 0x%08x)", (unsigned) dwActiveProtocol); - stream_write_uint32(irp->output, dwActiveProtocol); + stream_write_UINT32(irp->output, dwActiveProtocol); sc_output_alignment(irp, 8); return rv; } -static uint32 handle_Disconnect(IRP* irp) +static UINT32 handle_Disconnect(IRP* irp) { LONG rv; SCARDCONTEXT hContext; @@ -637,11 +637,11 @@ static uint32 handle_Disconnect(IRP* irp) DWORD dwDisposition = 0; stream_seek(irp->input, 0x20); - stream_read_uint32(irp->input, dwDisposition); + stream_read_UINT32(irp->input, dwDisposition); stream_seek(irp->input, 4); - stream_read_uint32(irp->input, hContext); + stream_read_UINT32(irp->input, hContext); stream_seek(irp->input, 4); - stream_read_uint32(irp->input, hCard); + stream_read_UINT32(irp->input, hCard); DEBUG_SCARD("(context: 0x%08x, hcard: 0x%08x, disposition: 0x%08x)", (unsigned) hContext, (unsigned) hCard, (unsigned) dwDisposition); @@ -658,13 +658,13 @@ static uint32 handle_Disconnect(IRP* irp) return rv; } -static uint32 handle_BeginTransaction(IRP* irp) +static UINT32 handle_BeginTransaction(IRP* irp) { LONG rv; SCARDCONTEXT hCard; stream_seek(irp->input, 0x30); - stream_read_uint32(irp->input, hCard); + stream_read_UINT32(irp->input, hCard); rv = SCardBeginTransaction(hCard); @@ -678,17 +678,17 @@ static uint32 handle_BeginTransaction(IRP* irp) return rv; } -static uint32 handle_EndTransaction(IRP* irp) +static UINT32 handle_EndTransaction(IRP* irp) { LONG rv; SCARDCONTEXT hCard; DWORD dwDisposition = 0; stream_seek(irp->input, 0x20); - stream_read_uint32(irp->input, dwDisposition); + stream_read_UINT32(irp->input, dwDisposition); stream_seek(irp->input, 0x0C); - stream_read_uint32(irp->input, hCard); + stream_read_UINT32(irp->input, hCard); rv = SCardEndTransaction(hCard, dwDisposition); @@ -702,7 +702,7 @@ static uint32 handle_EndTransaction(IRP* irp) return rv; } -static uint32 handle_State(IRP* irp) +static UINT32 handle_State(IRP* irp) { LONG rv; SCARDHANDLE hCard; @@ -717,10 +717,10 @@ static uint32 handle_State(IRP* irp) #endif stream_seek(irp->input, 0x24); - stream_seek_uint32(irp->input); /* atrLen */ + stream_seek_UINT32(irp->input); /* atrLen */ stream_seek(irp->input, 0x0c); - stream_read_uint32(irp->input, hCard); + stream_read_UINT32(irp->input, hCard); stream_seek(irp->input, 0x04); #ifdef SCARD_AUTOALLOCATE @@ -752,11 +752,11 @@ static uint32 handle_State(IRP* irp) state = sc_map_state(state); - stream_write_uint32(irp->output, state); - stream_write_uint32(irp->output, protocol); - stream_write_uint32(irp->output, atrLen); - stream_write_uint32(irp->output, 0x00000001); - stream_write_uint32(irp->output, atrLen); + stream_write_UINT32(irp->output, state); + stream_write_UINT32(irp->output, protocol); + stream_write_UINT32(irp->output, atrLen); + stream_write_UINT32(irp->output, 0x00000001); + stream_write_UINT32(irp->output, atrLen); stream_write(irp->output, pbAtr, atrLen); sc_output_repos(irp, atrLen); @@ -780,7 +780,7 @@ static DWORD handle_Status(IRP *irp, BOOL wide) DWORD atrLen = 0; char * readerName; BYTE pbAtr[MAX_ATR_SIZE]; - uint32 dataLength; + UINT32 dataLength; int pos, poslen1, poslen2; #ifdef WITH_DEBUG_SCARD @@ -788,10 +788,10 @@ static DWORD handle_Status(IRP *irp, BOOL wide) #endif stream_seek(irp->input, 0x24); - stream_read_uint32(irp->input, readerLen); - stream_read_uint32(irp->input, atrLen); + stream_read_UINT32(irp->input, readerLen); + stream_read_UINT32(irp->input, atrLen); stream_seek(irp->input, 0x0c); - stream_read_uint32(irp->input, hCard); + stream_read_UINT32(irp->input, hCard); stream_seek(irp->input, 0x4); atrLen = MAX_ATR_SIZE; @@ -826,18 +826,18 @@ static DWORD handle_Status(IRP *irp, BOOL wide) state = sc_map_state(state); poslen1 = stream_get_pos(irp->output); - stream_write_uint32(irp->output, readerLen); - stream_write_uint32(irp->output, 0x00020000); - stream_write_uint32(irp->output, state); - stream_write_uint32(irp->output, protocol); + stream_write_UINT32(irp->output, readerLen); + stream_write_UINT32(irp->output, 0x00020000); + stream_write_UINT32(irp->output, state); + stream_write_UINT32(irp->output, protocol); stream_write(irp->output, pbAtr, atrLen); if (atrLen < 32) stream_write_zero(irp->output, 32 - atrLen); - stream_write_uint32(irp->output, atrLen); + stream_write_UINT32(irp->output, atrLen); poslen2 = stream_get_pos(irp->output); - stream_write_uint32(irp->output, readerLen); + stream_write_UINT32(irp->output, readerLen); dataLength = sc_output_string(irp, readerName, wide); dataLength += sc_output_string(irp, "\0", wide); @@ -845,9 +845,9 @@ static DWORD handle_Status(IRP *irp, BOOL wide) pos = stream_get_pos(irp->output); stream_set_pos(irp->output, poslen1); - stream_write_uint32(irp->output,dataLength); + stream_write_UINT32(irp->output,dataLength); stream_set_pos(irp->output, poslen2); - stream_write_uint32(irp->output,dataLength); + stream_write_UINT32(irp->output,dataLength); stream_set_pos(irp->output, pos); sc_output_alignment(irp, 8); @@ -862,42 +862,42 @@ static DWORD handle_Status(IRP *irp, BOOL wide) return rv; } -static uint32 handle_Transmit(IRP* irp) +static UINT32 handle_Transmit(IRP* irp) { LONG rv; SCARDCONTEXT hCard; - uint32 map[7], linkedLen; + UINT32 map[7], linkedLen; SCARD_IO_REQUEST pioSendPci, pioRecvPci, *pPioRecvPci; DWORD cbSendLength = 0, cbRecvLength = 0; BYTE *sendBuf = NULL, *recvBuf = NULL; stream_seek(irp->input, 0x14); - stream_read_uint32(irp->input, map[0]); + stream_read_UINT32(irp->input, map[0]); stream_seek(irp->input, 0x4); - stream_read_uint32(irp->input, map[1]); + stream_read_UINT32(irp->input, map[1]); - stream_read_uint32(irp->input, pioSendPci.dwProtocol); - stream_read_uint32(irp->input, pioSendPci.cbPciLength); + stream_read_UINT32(irp->input, pioSendPci.dwProtocol); + stream_read_UINT32(irp->input, pioSendPci.cbPciLength); - stream_read_uint32(irp->input, map[2]); - stream_read_uint32(irp->input, cbSendLength); - stream_read_uint32(irp->input, map[3]); - stream_read_uint32(irp->input, map[4]); - stream_read_uint32(irp->input, map[5]); - stream_read_uint32(irp->input, cbRecvLength); + stream_read_UINT32(irp->input, map[2]); + stream_read_UINT32(irp->input, cbSendLength); + stream_read_UINT32(irp->input, map[3]); + stream_read_UINT32(irp->input, map[4]); + stream_read_UINT32(irp->input, map[5]); + stream_read_UINT32(irp->input, cbRecvLength); if (map[0] & SCARD_INPUT_LINKED) sc_input_skip_linked(irp); stream_seek(irp->input, 4); - stream_read_uint32(irp->input, hCard); + stream_read_UINT32(irp->input, hCard); if (map[2] & SCARD_INPUT_LINKED) { /* sendPci */ - stream_read_uint32(irp->input, linkedLen); + stream_read_UINT32(irp->input, linkedLen); - stream_read_uint32(irp->input, pioSendPci.dwProtocol); + stream_read_UINT32(irp->input, pioSendPci.dwProtocol); stream_seek(irp->input, linkedLen - 4); sc_input_repos(irp, linkedLen); @@ -907,7 +907,7 @@ static uint32 handle_Transmit(IRP* irp) if (map[3] & SCARD_INPUT_LINKED) { /* send buffer */ - stream_read_uint32(irp->input, linkedLen); + stream_read_UINT32(irp->input, linkedLen); sendBuf = malloc(linkedLen); stream_read(irp->input, sendBuf, linkedLen); @@ -920,18 +920,18 @@ static uint32 handle_Transmit(IRP* irp) if (map[4] & SCARD_INPUT_LINKED) { /* recvPci */ - stream_read_uint32(irp->input, linkedLen); + stream_read_UINT32(irp->input, linkedLen); - stream_read_uint32(irp->input, pioRecvPci.dwProtocol); + stream_read_UINT32(irp->input, pioRecvPci.dwProtocol); stream_seek(irp->input, linkedLen - 4); sc_input_repos(irp, linkedLen); - stream_read_uint32(irp->input, map[6]); + stream_read_UINT32(irp->input, map[6]); if (map[6] & SCARD_INPUT_LINKED) { /* not sure what this is */ - stream_read_uint32(irp->input, linkedLen); + stream_read_UINT32(irp->input, linkedLen); stream_seek(irp->input, linkedLen); sc_input_repos(irp, linkedLen); @@ -959,7 +959,7 @@ static uint32 handle_Transmit(IRP* irp) { DEBUG_SCARD("Success (%d bytes)", (int) cbRecvLength); - stream_write_uint32(irp->output, 0); /* pioRecvPci 0x00; */ + stream_write_UINT32(irp->output, 0); /* pioRecvPci 0x00; */ sc_output_buffer_start(irp, cbRecvLength); /* start of recvBuf output */ @@ -974,32 +974,32 @@ static uint32 handle_Transmit(IRP* irp) return rv; } -static uint32 handle_Control(IRP* irp) +static UINT32 handle_Control(IRP* irp) { LONG rv; SCARDCONTEXT hContext; SCARDHANDLE hCard; - uint32 map[3]; - uint32 controlCode; - uint32 controlFunction; + UINT32 map[3]; + UINT32 controlCode; + UINT32 controlFunction; BYTE *recvBuffer = NULL, *sendBuffer = NULL; - uint32 recvLength; + UINT32 recvLength; DWORD nBytesReturned; DWORD outBufferSize; stream_seek(irp->input, 0x14); - stream_read_uint32(irp->input, map[0]); + stream_read_UINT32(irp->input, map[0]); stream_seek(irp->input, 0x4); - stream_read_uint32(irp->input, map[1]); - stream_read_uint32(irp->input, controlCode); - stream_read_uint32(irp->input, recvLength); - stream_read_uint32(irp->input, map[2]); + stream_read_UINT32(irp->input, map[1]); + stream_read_UINT32(irp->input, controlCode); + stream_read_UINT32(irp->input, recvLength); + stream_read_UINT32(irp->input, map[2]); stream_seek(irp->input, 0x4); - stream_read_uint32(irp->input, outBufferSize); + stream_read_UINT32(irp->input, outBufferSize); stream_seek(irp->input, 0x4); - stream_read_uint32(irp->input, hContext); + stream_read_UINT32(irp->input, hContext); stream_seek(irp->input, 0x4); - stream_read_uint32(irp->input, hCard); + stream_read_UINT32(irp->input, hCard); /* Translate Windows SCARD_CTL_CODE's to corresponding local code */ if (WIN_CTL_DEVICE_TYPE(controlCode) == WIN_FILE_DEVICE_SMARTCARD) @@ -1012,7 +1012,7 @@ static uint32 handle_Control(IRP* irp) if (map[2] & SCARD_INPUT_LINKED) { /* read real input size */ - stream_read_uint32(irp->input, recvLength); + stream_read_UINT32(irp->input, recvLength); recvBuffer = malloc(recvLength); @@ -1036,9 +1036,9 @@ static uint32 handle_Control(IRP* irp) else DEBUG_SCARD("Success (out: %u bytes)", (unsigned) nBytesReturned); - stream_write_uint32(irp->output, (uint32) nBytesReturned); - stream_write_uint32(irp->output, 0x00000004); - stream_write_uint32(irp->output, nBytesReturned); + stream_write_UINT32(irp->output, (UINT32) nBytesReturned); + stream_write_UINT32(irp->output, 0x00000004); + stream_write_UINT32(irp->output, nBytesReturned); if (nBytesReturned > 0) { @@ -1054,7 +1054,7 @@ static uint32 handle_Control(IRP* irp) return rv; } -static uint32 handle_GetAttrib(IRP* irp) +static UINT32 handle_GetAttrib(IRP* irp) { LONG rv; SCARDHANDLE hCard; @@ -1063,11 +1063,11 @@ static uint32 handle_GetAttrib(IRP* irp) BYTE* pbAttr = NULL; stream_seek(irp->input, 0x20); - stream_read_uint32(irp->input, dwAttrId); + stream_read_UINT32(irp->input, dwAttrId); stream_seek(irp->input, 0x4); - stream_read_uint32(irp->input, dwAttrLen); + stream_read_UINT32(irp->input, dwAttrLen); stream_seek(irp->input, 0xC); - stream_read_uint32(irp->input, hCard); + stream_read_UINT32(irp->input, hCard); DEBUG_SCARD("hcard: 0x%08x, attrib: 0x%08x (%d bytes)", (unsigned) hCard, (unsigned) dwAttrId, (int) dwAttrLen); @@ -1147,9 +1147,9 @@ static uint32 handle_GetAttrib(IRP* irp) { DEBUG_SCARD("Success (%d bytes)", (int) dwAttrLen); - stream_write_uint32(irp->output, dwAttrLen); - stream_write_uint32(irp->output, 0x00000200); - stream_write_uint32(irp->output, dwAttrLen); + stream_write_UINT32(irp->output, dwAttrLen); + stream_write_UINT32(irp->output, 0x00000200); + stream_write_UINT32(irp->output, dwAttrLen); if (!pbAttr) { @@ -1161,7 +1161,7 @@ static uint32 handle_GetAttrib(IRP* irp) } sc_output_repos(irp, dwAttrLen); /* align to multiple of 4 */ - stream_write_uint32(irp->output, 0); + stream_write_UINT32(irp->output, 0); } sc_output_alignment(irp, 8); @@ -1170,13 +1170,13 @@ static uint32 handle_GetAttrib(IRP* irp) return rv; } -static uint32 handle_AccessStartedEvent(IRP* irp) +static UINT32 handle_AccessStartedEvent(IRP* irp) { sc_output_alignment(irp, 8); return SCARD_S_SUCCESS; } -void scard_error(SCARD_DEVICE* scard, IRP* irp, uint32 ntstatus) +void scard_error(SCARD_DEVICE* scard, IRP* irp, UINT32 ntstatus) { /* [MS-RDPESC] 3.1.4.4 */ printf("scard processing error %x\n", ntstatus); @@ -1189,19 +1189,19 @@ void scard_error(SCARD_DEVICE* scard, IRP* irp, uint32 ntstatus) /* http://msdn.microsoft.com/en-gb/library/ms938473.aspx */ typedef struct _SERVER_SCARD_ATRMASK { - uint32 cbAtr; + UINT32 cbAtr; BYTE rgbAtr[36]; BYTE rgbMask[36]; } SERVER_SCARD_ATRMASK; -static uint32 handle_LocateCardsByATR(IRP* irp, BOOL wide) +static UINT32 handle_LocateCardsByATR(IRP* irp, BOOL wide) { LONG rv; int i, j, k; SCARDCONTEXT hContext; - uint32 atrMaskCount = 0; - uint32 readerCount = 0; + UINT32 atrMaskCount = 0; + UINT32 readerCount = 0; SCARD_READERSTATE* cur = NULL; SCARD_READERSTATE* rsCur = NULL; SCARD_READERSTATE* readerStates = NULL; @@ -1209,8 +1209,8 @@ static uint32 handle_LocateCardsByATR(IRP* irp, BOOL wide) SERVER_SCARD_ATRMASK* pAtrMasks = NULL; stream_seek(irp->input, 0x2C); - stream_read_uint32(irp->input, hContext); - stream_read_uint32(irp->input, atrMaskCount); + stream_read_UINT32(irp->input, hContext); + stream_read_UINT32(irp->input, atrMaskCount); pAtrMasks = malloc(atrMaskCount * sizeof(SERVER_SCARD_ATRMASK)); @@ -1219,12 +1219,12 @@ static uint32 handle_LocateCardsByATR(IRP* irp, BOOL wide) for (i = 0; i < atrMaskCount; i++) { - stream_read_uint32(irp->input, pAtrMasks[i].cbAtr); + stream_read_UINT32(irp->input, pAtrMasks[i].cbAtr); stream_read(irp->input, pAtrMasks[i].rgbAtr, 36); stream_read(irp->input, pAtrMasks[i].rgbMask, 36); } - stream_read_uint32(irp->input, readerCount); + stream_read_UINT32(irp->input, readerCount); readerStates = xzalloc(readerCount * sizeof(SCARD_READERSTATE)); @@ -1242,9 +1242,9 @@ static uint32 handle_LocateCardsByATR(IRP* irp, BOOL wide) * convert to host endian or fix the headers to * request the order we want */ - stream_read_uint32(irp->input, cur->dwCurrentState); - stream_read_uint32(irp->input, cur->dwEventState); - stream_read_uint32(irp->input, cur->cbAtr); + stream_read_UINT32(irp->input, cur->dwCurrentState); + stream_read_UINT32(irp->input, cur->dwEventState); + stream_read_UINT32(irp->input, cur->cbAtr); stream_read(irp->input, cur->rgbAtr, 32); stream_seek(irp->input, 4); @@ -1258,10 +1258,10 @@ static uint32 handle_LocateCardsByATR(IRP* irp, BOOL wide) for (i = 0; i < readerCount; i++) { cur = &readerStates[i]; - uint32 dataLength; + UINT32 dataLength; stream_seek(irp->input, 8); - stream_read_uint32(irp->input, dataLength); + stream_read_UINT32(irp->input, dataLength); sc_input_repos(irp, sc_input_string(irp, (char **) &cur->szReader, dataLength, wide)); DEBUG_SCARD(" \"%s\"", cur->szReader ? cur->szReader : "NULL"); @@ -1304,15 +1304,15 @@ static uint32 handle_LocateCardsByATR(IRP* irp, BOOL wide) } } - stream_write_uint32(irp->output, readerCount); - stream_write_uint32(irp->output, 0x00084dd8); - stream_write_uint32(irp->output, readerCount); + stream_write_UINT32(irp->output, readerCount); + stream_write_UINT32(irp->output, 0x00084dd8); + stream_write_UINT32(irp->output, readerCount); for (i = 0, rsCur = readerStates; i < readerCount; i++, rsCur++) { - stream_write_uint32(irp->output, cur->dwCurrentState); - stream_write_uint32(irp->output, cur->dwEventState); - stream_write_uint32(irp->output, cur->cbAtr); + stream_write_UINT32(irp->output, cur->dwCurrentState); + stream_write_UINT32(irp->output, cur->dwEventState); + stream_write_UINT32(irp->output, cur->cbAtr); stream_write(irp->output, cur->rgbAtr, 32); stream_write_zero(irp->output, 4); @@ -1329,11 +1329,11 @@ static uint32 handle_LocateCardsByATR(IRP* irp, BOOL wide) BOOL scard_async_op(IRP* irp) { - uint32 ioctl_code; + UINT32 ioctl_code; /* peek ahead */ stream_seek(irp->input, 8); - stream_read_uint32(irp->input, ioctl_code); + stream_read_UINT32(irp->input, ioctl_code); stream_rewind(irp->input, 12); switch (ioctl_code) @@ -1369,22 +1369,22 @@ BOOL scard_async_op(IRP* irp) void scard_device_control(SCARD_DEVICE* scard, IRP* irp) { - uint32 pos; - uint32 result; - uint32 result_pos; - uint32 output_len; - uint32 input_len; - uint32 ioctl_code; - uint32 stream_len; - uint32 irp_result_pos; - uint32 output_len_pos; - const uint32 header_lengths = 16; /* MS-RPCE, Sections 2.2.6.1 + UINT32 pos; + UINT32 result; + UINT32 result_pos; + UINT32 output_len; + UINT32 input_len; + UINT32 ioctl_code; + UINT32 stream_len; + UINT32 irp_result_pos; + UINT32 output_len_pos; + const UINT32 header_lengths = 16; /* MS-RPCE, Sections 2.2.6.1 * and 2.2.6.2. */ - stream_read_uint32(irp->input, output_len); - stream_read_uint32(irp->input, input_len); - stream_read_uint32(irp->input, ioctl_code); + stream_read_UINT32(irp->input, output_len); + stream_read_UINT32(irp->input, input_len); + stream_read_UINT32(irp->input, ioctl_code); stream_seek(irp->input, 20); /* padding */ @@ -1397,20 +1397,20 @@ void scard_device_control(SCARD_DEVICE* scard, IRP* irp) irp_result_pos = stream_get_pos(irp->output); - stream_write_uint32(irp->output, 0x00000000); /* MS-RDPEFS + stream_write_UINT32(irp->output, 0x00000000); /* MS-RDPEFS * OutputBufferLength * will be updated * later in this * function. */ /* [MS-RPCE] 2.2.6.1 */ - stream_write_uint32(irp->output, 0x00081001); /* len 8, LE, v1 */ - stream_write_uint32(irp->output, 0xcccccccc); /* filler */ + stream_write_UINT32(irp->output, 0x00081001); /* len 8, LE, v1 */ + stream_write_UINT32(irp->output, 0xcccccccc); /* filler */ output_len_pos = stream_get_pos(irp->output); stream_seek(irp->output, 4); /* size */ - stream_write_uint32(irp->output, 0x0); /* filler */ + stream_write_UINT32(irp->output, 0x0); /* filler */ result_pos = stream_get_pos(irp->output); stream_seek(irp->output, 4); /* result */ @@ -1530,16 +1530,16 @@ void scard_device_control(SCARD_DEVICE* scard, IRP* irp) pos = stream_get_pos(irp->output); stream_len = pos - irp_result_pos - 4; /* Value of OutputBufferLength */ stream_set_pos(irp->output, irp_result_pos); - stream_write_uint32(irp->output, stream_len); + stream_write_UINT32(irp->output, stream_len); stream_set_pos(irp->output, output_len_pos); /* Remove the effect of the MS-RPCE Common Type Header and Private * Header (Sections 2.2.6.1 and 2.2.6.2). */ - stream_write_uint32(irp->output, stream_len - header_lengths); + stream_write_UINT32(irp->output, stream_len - header_lengths); stream_set_pos(irp->output, result_pos); - stream_write_uint32(irp->output, result); + stream_write_UINT32(irp->output, result); stream_set_pos(irp->output, pos); diff --git a/channels/tsmf/client/alsa/tsmf_alsa.c b/channels/tsmf/client/alsa/tsmf_alsa.c index af72e4a2b..176e89dce 100644 --- a/channels/tsmf/client/alsa/tsmf_alsa.c +++ b/channels/tsmf/client/alsa/tsmf_alsa.c @@ -39,11 +39,11 @@ typedef struct _TSMFALSAAudioDevice char device[32]; snd_pcm_t* out_handle; - uint32 source_rate; - uint32 actual_rate; - uint32 source_channels; - uint32 actual_channels; - uint32 bytes_per_sample; + UINT32 source_rate; + UINT32 actual_rate; + UINT32 source_channels; + UINT32 actual_channels; + UINT32 bytes_per_sample; FREERDP_DSP_CONTEXT* dsp_context; } TSMFALSAAudioDevice; @@ -81,7 +81,7 @@ static BOOL tsmf_alsa_open(ITSMFAudioDevice* audio, const char* device) } static BOOL tsmf_alsa_set_format(ITSMFAudioDevice* audio, - uint32 sample_rate, uint32 channels, uint32 bits_per_sample) + UINT32 sample_rate, UINT32 channels, UINT32 bits_per_sample) { int error; snd_pcm_uframes_t frames; @@ -147,7 +147,7 @@ static BOOL tsmf_alsa_set_format(ITSMFAudioDevice* audio, return TRUE; } -static BOOL tsmf_alsa_play(ITSMFAudioDevice* audio, BYTE* data, uint32 data_size) +static BOOL tsmf_alsa_play(ITSMFAudioDevice* audio, BYTE* data, UINT32 data_size) { int len; int error; @@ -214,9 +214,9 @@ static BOOL tsmf_alsa_play(ITSMFAudioDevice* audio, BYTE* data, uint32 data_size return TRUE; } -static uint64 tsmf_alsa_get_latency(ITSMFAudioDevice* audio) +static UINT64 tsmf_alsa_get_latency(ITSMFAudioDevice* audio) { - uint64 latency = 0; + UINT64 latency = 0; snd_pcm_sframes_t frames = 0; TSMFALSAAudioDevice* alsa = (TSMFALSAAudioDevice*) audio; @@ -224,7 +224,7 @@ static uint64 tsmf_alsa_get_latency(ITSMFAudioDevice* audio) snd_pcm_delay(alsa->out_handle, &frames) == 0 && frames > 0) { - latency = ((uint64)frames) * 10000000LL / (uint64)alsa->actual_rate; + latency = ((UINT64)frames) * 10000000LL / (UINT64)alsa->actual_rate; } return latency; } diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c index a6d348baf..d085a32e7 100644 --- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c +++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c @@ -51,8 +51,8 @@ typedef struct _TSMFFFmpegDecoder int prepared; BYTE* decoded_data; - uint32 decoded_size; - uint32 decoded_size_max; + UINT32 decoded_size; + UINT32 decoded_size_max; } TSMFFFmpegDecoder; static BOOL tsmf_ffmpeg_init_context(ITSMFDecoder* decoder) @@ -109,7 +109,7 @@ static BOOL tsmf_ffmpeg_init_audio_stream(ITSMFDecoder* decoder, const TS_AM_MED static BOOL tsmf_ffmpeg_init_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYPE* media_type) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; - uint32 size; + UINT32 size; const BYTE* s; BYTE* p; @@ -151,12 +151,12 @@ static BOOL tsmf_ffmpeg_init_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYP *p++ = 0xff; /* Flag? */ *p++ = 0xe0 | 0x01; /* Reserved | #sps */ s = media_type->ExtraData + 20; - size = ((uint32)(*s)) * 256 + ((uint32)(*(s + 1))); + size = ((UINT32)(*s)) * 256 + ((UINT32)(*(s + 1))); memcpy(p, s, size + 2); s += size + 2; p += size + 2; *p++ = 1; /* #pps */ - size = ((uint32)(*s)) * 256 + ((uint32)(*(s + 1))); + size = ((UINT32)(*s)) * 256 + ((UINT32)(*(s + 1))); memcpy(p, s, size + 2); } else @@ -260,7 +260,7 @@ static BOOL tsmf_ffmpeg_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* medi return TRUE; } -static BOOL tsmf_ffmpeg_decode_video(ITSMFDecoder* decoder, const BYTE* data, uint32 data_size, uint32 extensions) +static BOOL tsmf_ffmpeg_decode_video(ITSMFDecoder* decoder, const BYTE* data, UINT32 data_size, UINT32 extensions) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; int decoded; @@ -319,12 +319,12 @@ static BOOL tsmf_ffmpeg_decode_video(ITSMFDecoder* decoder, const BYTE* data, ui return ret; } -static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const BYTE* data, uint32 data_size, uint32 extensions) +static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const BYTE* data, UINT32 data_size, UINT32 extensions) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; int len; int frame_size; - uint32 src_size; + UINT32 src_size; const BYTE* src; BYTE* dst; int dst_offset; @@ -419,7 +419,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const BYTE* data, ui return TRUE; } -static BOOL tsmf_ffmpeg_decode(ITSMFDecoder* decoder, const BYTE* data, uint32 data_size, uint32 extensions) +static BOOL tsmf_ffmpeg_decode(ITSMFDecoder* decoder, const BYTE* data, UINT32 data_size, UINT32 extensions) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; @@ -442,7 +442,7 @@ static BOOL tsmf_ffmpeg_decode(ITSMFDecoder* decoder, const BYTE* data, uint32 d } } -static BYTE* tsmf_ffmpeg_get_decoded_data(ITSMFDecoder* decoder, uint32* size) +static BYTE* tsmf_ffmpeg_get_decoded_data(ITSMFDecoder* decoder, UINT32* size) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; BYTE* buf; @@ -454,7 +454,7 @@ static BYTE* tsmf_ffmpeg_get_decoded_data(ITSMFDecoder* decoder, uint32* size) return buf; } -static uint32 tsmf_ffmpeg_get_decoded_format(ITSMFDecoder* decoder) +static UINT32 tsmf_ffmpeg_get_decoded_format(ITSMFDecoder* decoder) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; @@ -466,11 +466,11 @@ static uint32 tsmf_ffmpeg_get_decoded_format(ITSMFDecoder* decoder) default: DEBUG_WARN("unsupported pixel format %u", mdecoder->codec_context->pix_fmt); - return (uint32) -1; + return (UINT32) -1; } } -static BOOL tsmf_ffmpeg_get_decoded_dimension(ITSMFDecoder* decoder, uint32* width, uint32* height) +static BOOL tsmf_ffmpeg_get_decoded_dimension(ITSMFDecoder* decoder, UINT32* width, UINT32* height) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; diff --git a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c index 058933579..89b52e6d4 100644 --- a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c +++ b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c @@ -70,7 +70,7 @@ typedef struct _TSMFGstreamerDecoder GstElement *aVolume; BOOL paused; - uint64 last_sample_end_time; + UINT64 last_sample_end_time; Display *disp; int *xfwin; @@ -95,7 +95,7 @@ const char *NAME_GST_STATE_NULL = "GST_STATE_NULL"; const char *NAME_GST_STATE_VOID_PENDING = "GST_STATE_VOID_PENDING"; const char *NAME_GST_STATE_OTHER = "GST_STATE_?"; -static inline const GstClockTime tsmf_gstreamer_timestamp_ms_to_gst(uint64 ms_timestamp) +static inline const GstClockTime tsmf_gstreamer_timestamp_ms_to_gst(UINT64 ms_timestamp) { /* * Convert Microsoft 100ns timestamps to Gstreamer 1ns units. @@ -1094,8 +1094,8 @@ static BOOL tsmf_gstreamer_pipeline_build(TSMFGstreamerDecoder * mdecoder) return TRUE; } -static BOOL tsmf_gstreamer_decodeEx(ITSMFDecoder * decoder, const BYTE * data, uint32 data_size, uint32 extensions, - uint64 start_time, uint64 end_time, uint64 duration) +static BOOL tsmf_gstreamer_decodeEx(ITSMFDecoder * decoder, const BYTE * data, UINT32 data_size, UINT32 extensions, + UINT64 start_time, UINT64 end_time, UINT64 duration) { TSMFGstreamerDecoder * mdecoder = (TSMFGstreamerDecoder *) decoder; if (!mdecoder) @@ -1215,12 +1215,12 @@ static BOOL tsmf_gstreamer_decodeEx(ITSMFDecoder * decoder, const BYTE * data, u FILE *fin = fopen("/tmp/tsmf_aseek.info", "rt"); if (fin) { - uint64 AStartTime = 0; + UINT64 AStartTime = 0; fscanf(fin, "%"PRIu64, &AStartTime); fclose(fin); if (start_time > AStartTime) { - uint64 streamDelay = (start_time - AStartTime) / 10; + UINT64 streamDelay = (start_time - AStartTime) / 10; usleep(streamDelay); } unlink("/tmp/tsmf_aseek.info"); @@ -1249,12 +1249,12 @@ static BOOL tsmf_gstreamer_decodeEx(ITSMFDecoder * decoder, const BYTE * data, u fin = fopen("/tmp/tsmf_vseek.info", "rt"); if (fin) { - uint64 VStartTime = 0; + UINT64 VStartTime = 0; fscanf(fin, "%"PRIu64, &VStartTime); fclose(fin); if (start_time > VStartTime) { - uint64 streamDelay = (start_time - VStartTime) / 10; + UINT64 streamDelay = (start_time - VStartTime) / 10; usleep(streamDelay); } unlink("/tmp/tsmf_vseek.info"); @@ -1301,7 +1301,7 @@ static BOOL tsmf_gstreamer_decodeEx(ITSMFDecoder * decoder, const BYTE * data, u return TRUE; } -static void tsmf_gstreamer_change_volume(ITSMFDecoder * decoder, uint32 newVolume, uint32 muted) +static void tsmf_gstreamer_change_volume(ITSMFDecoder * decoder, UINT32 newVolume, UINT32 muted) { TSMFGstreamerDecoder * mdecoder = (TSMFGstreamerDecoder *) decoder; if (!mdecoder) @@ -1327,7 +1327,7 @@ static void tsmf_gstreamer_change_volume(ITSMFDecoder * decoder, uint32 newVolum g_object_set(mdecoder->aVolume, "volume", mdecoder->gstVolume, NULL); } -static void tsmf_gstreamer_control(ITSMFDecoder * decoder, ITSMFControlMsg control_msg, uint32 *arg) +static void tsmf_gstreamer_control(ITSMFDecoder * decoder, ITSMFControlMsg control_msg, UINT32 *arg) { TSMFGstreamerDecoder * mdecoder = (TSMFGstreamerDecoder *) decoder; if (!mdecoder) @@ -1453,7 +1453,7 @@ static void tsmf_gstreamer_free(ITSMFDecoder * decoder) } } -static uint64 tsmf_gstreamer_get_running_time(ITSMFDecoder * decoder) +static UINT64 tsmf_gstreamer_get_running_time(ITSMFDecoder * decoder) { TSMFGstreamerDecoder *mdecoder = (TSMFGstreamerDecoder *) decoder; if (!mdecoder) diff --git a/channels/tsmf/client/pulse/tsmf_pulse.c b/channels/tsmf/client/pulse/tsmf_pulse.c index 0a867af84..08d776179 100644 --- a/channels/tsmf/client/pulse/tsmf_pulse.c +++ b/channels/tsmf/client/pulse/tsmf_pulse.c @@ -243,9 +243,9 @@ static BOOL tsmf_pulse_open_stream(TSMFPulseAudioDevice* pulse) tsmf_pulse_stream_request_callback, pulse); buffer_attr.maxlength = pa_usec_to_bytes(500000, &pulse->sample_spec); buffer_attr.tlength = pa_usec_to_bytes(250000, &pulse->sample_spec); - buffer_attr.prebuf = (uint32_t) -1; - buffer_attr.minreq = (uint32_t) -1; - buffer_attr.fragsize = (uint32_t) -1; + buffer_attr.prebuf = (UINT32_t) -1; + buffer_attr.minreq = (UINT32_t) -1; + buffer_attr.fragsize = (UINT32_t) -1; if (pa_stream_connect_playback(pulse->stream, pulse->device[0] ? pulse->device : NULL, &buffer_attr, PA_STREAM_ADJUST_LATENCY | PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE, @@ -284,7 +284,7 @@ static BOOL tsmf_pulse_open_stream(TSMFPulseAudioDevice* pulse) } static BOOL tsmf_pulse_set_format(ITSMFAudioDevice* audio, - uint32 sample_rate, uint32 channels, uint32 bits_per_sample) + UINT32 sample_rate, UINT32 channels, UINT32 bits_per_sample) { TSMFPulseAudioDevice* pulse = (TSMFPulseAudioDevice*) audio; @@ -298,7 +298,7 @@ static BOOL tsmf_pulse_set_format(ITSMFAudioDevice* audio, return tsmf_pulse_open_stream(pulse); } -static BOOL tsmf_pulse_play(ITSMFAudioDevice* audio, BYTE* data, uint32 data_size) +static BOOL tsmf_pulse_play(ITSMFAudioDevice* audio, BYTE* data, UINT32 data_size) { TSMFPulseAudioDevice* pulse = (TSMFPulseAudioDevice*) audio; BYTE* src; @@ -341,15 +341,15 @@ static BOOL tsmf_pulse_play(ITSMFAudioDevice* audio, BYTE* data, uint32 data_siz return TRUE; } -static uint64 tsmf_pulse_get_latency(ITSMFAudioDevice* audio) +static UINT64 tsmf_pulse_get_latency(ITSMFAudioDevice* audio) { pa_usec_t usec; - uint64 latency = 0; + UINT64 latency = 0; TSMFPulseAudioDevice* pulse = (TSMFPulseAudioDevice*) audio; if (pulse->stream && pa_stream_get_latency(pulse->stream, &usec, NULL) == 0) { - latency = ((uint64)usec) * 10LL; + latency = ((UINT64)usec) * 10LL; } return latency; } diff --git a/channels/tsmf/client/tsmf_audio.h b/channels/tsmf/client/tsmf_audio.h index cdad9dd40..98af8013d 100644 --- a/channels/tsmf/client/tsmf_audio.h +++ b/channels/tsmf/client/tsmf_audio.h @@ -29,13 +29,13 @@ struct _ITSMFAudioDevice /* Open the audio device. */ BOOL (*Open) (ITSMFAudioDevice* audio, const char* device); /* Set the audio data format. */ - BOOL (*SetFormat) (ITSMFAudioDevice* audio, uint32 sample_rate, uint32 channels, uint32 bits_per_sample); + BOOL (*SetFormat) (ITSMFAudioDevice* audio, UINT32 sample_rate, UINT32 channels, UINT32 bits_per_sample); /* Play audio data. */ - BOOL (*Play) (ITSMFAudioDevice* audio, BYTE* data, uint32 data_size); + BOOL (*Play) (ITSMFAudioDevice* audio, BYTE* data, UINT32 data_size); /* Get the latency of the last written sample, in 100ns */ - uint64 (*GetLatency) (ITSMFAudioDevice* audio); + UINT64 (*GetLatency) (ITSMFAudioDevice* audio); /* Change the playback volume level */ - void (*ChangeVolume) (ITSMFAudioDevice* audio, uint32 newVolume, uint32 muted); + void (*ChangeVolume) (ITSMFAudioDevice* audio, UINT32 newVolume, UINT32 muted); /* Flush queued audio data */ void (*Flush) (ITSMFAudioDevice* audio); /* Free the audio device */ diff --git a/channels/tsmf/client/tsmf_codec.c b/channels/tsmf/client/tsmf_codec.c index 136030340..e0d1c8efc 100644 --- a/channels/tsmf/client/tsmf_codec.c +++ b/channels/tsmf/client/tsmf_codec.c @@ -284,15 +284,15 @@ static void tsmf_print_guid(const BYTE* guid) } /* http://msdn.microsoft.com/en-us/library/dd318229.aspx */ -static uint32 tsmf_codec_parse_BITMAPINFOHEADER(TS_AM_MEDIA_TYPE* mediatype, STREAM* s, BOOL bypass) +static UINT32 tsmf_codec_parse_BITMAPINFOHEADER(TS_AM_MEDIA_TYPE* mediatype, STREAM* s, BOOL bypass) { - uint32 biSize; - uint32 biWidth; - uint32 biHeight; + UINT32 biSize; + UINT32 biWidth; + UINT32 biHeight; - stream_read_uint32(s, biSize); - stream_read_uint32(s, biWidth); - stream_read_uint32(s, biHeight); + stream_read_UINT32(s, biSize); + stream_read_UINT32(s, biWidth); + stream_read_UINT32(s, biHeight); stream_seek(s, 28); if (mediatype->Width == 0) @@ -308,23 +308,23 @@ static uint32 tsmf_codec_parse_BITMAPINFOHEADER(TS_AM_MEDIA_TYPE* mediatype, STR } /* http://msdn.microsoft.com/en-us/library/dd407326.aspx */ -static uint32 tsmf_codec_parse_VIDEOINFOHEADER2(TS_AM_MEDIA_TYPE* mediatype, STREAM* s) +static UINT32 tsmf_codec_parse_VIDEOINFOHEADER2(TS_AM_MEDIA_TYPE* mediatype, STREAM* s) { - uint64 AvgTimePerFrame; + UINT64 AvgTimePerFrame; /* VIDEOINFOHEADER2.rcSource, RECT(LONG left, LONG top, LONG right, LONG bottom) */ - stream_seek_uint32(s); - stream_seek_uint32(s); - stream_read_uint32(s, mediatype->Width); - stream_read_uint32(s, mediatype->Height); + stream_seek_UINT32(s); + stream_seek_UINT32(s); + stream_read_UINT32(s, mediatype->Width); + stream_read_UINT32(s, mediatype->Height); /* VIDEOINFOHEADER2.rcTarget */ stream_seek(s, 16); /* VIDEOINFOHEADER2.dwBitRate */ - stream_read_uint32(s, mediatype->BitRate); + stream_read_UINT32(s, mediatype->BitRate); /* VIDEOINFOHEADER2.dwBitErrorRate */ - stream_seek_uint32(s); + stream_seek_UINT32(s); /* VIDEOINFOHEADER2.AvgTimePerFrame */ - stream_read_uint64(s, AvgTimePerFrame); + stream_read_UINT64(s, AvgTimePerFrame); mediatype->SamplesPerSecond.Numerator = 1000000; mediatype->SamplesPerSecond.Denominator = (int)(AvgTimePerFrame / 10LL); /* Remaining fields before bmiHeader */ @@ -334,7 +334,7 @@ static uint32 tsmf_codec_parse_VIDEOINFOHEADER2(TS_AM_MEDIA_TYPE* mediatype, STR } /* http://msdn.microsoft.com/en-us/library/dd390700.aspx */ -static uint32 tsmf_codec_parse_VIDEOINFOHEADER(TS_AM_MEDIA_TYPE* mediatype, STREAM* s) +static UINT32 tsmf_codec_parse_VIDEOINFOHEADER(TS_AM_MEDIA_TYPE* mediatype, STREAM* s) { /* typedef struct tagVIDEOINFOHEADER { @@ -346,21 +346,21 @@ typedef struct tagVIDEOINFOHEADER { BITMAPINFOHEADER bmiHeader; } VIDEOINFOHEADER; */ - uint64 AvgTimePerFrame; + UINT64 AvgTimePerFrame; /* VIDEOINFOHEADER.rcSource, RECT(LONG left, LONG top, LONG right, LONG bottom) */ - stream_seek_uint32(s); - stream_seek_uint32(s); - stream_read_uint32(s, mediatype->Width); - stream_read_uint32(s, mediatype->Height); + stream_seek_UINT32(s); + stream_seek_UINT32(s); + stream_read_UINT32(s, mediatype->Width); + stream_read_UINT32(s, mediatype->Height); /* VIDEOINFOHEADER.rcTarget */ stream_seek(s, 16); /* VIDEOINFOHEADER.dwBitRate */ - stream_read_uint32(s, mediatype->BitRate); + stream_read_UINT32(s, mediatype->BitRate); /* VIDEOINFOHEADER.dwBitErrorRate */ - stream_seek_uint32(s); + stream_seek_UINT32(s); /* VIDEOINFOHEADER.AvgTimePerFrame */ - stream_read_uint64(s, AvgTimePerFrame); + stream_read_UINT64(s, AvgTimePerFrame); mediatype->SamplesPerSecond.Numerator = 1000000; mediatype->SamplesPerSecond.Denominator = (int)(AvgTimePerFrame / 10LL); @@ -370,7 +370,7 @@ typedef struct tagVIDEOINFOHEADER { BOOL tsmf_codec_parse_media_type(TS_AM_MEDIA_TYPE* mediatype, STREAM* s) { int i; - uint32 cbFormat; + UINT32 cbFormat; BOOL ret = TRUE; memset(mediatype, 0, sizeof(TS_AM_MEDIA_TYPE)); @@ -421,7 +421,7 @@ BOOL tsmf_codec_parse_media_type(TS_AM_MEDIA_TYPE* mediatype, STREAM* s) stream_seek(s, 16); /* cbFormat */ - stream_read_uint32(s, cbFormat); + stream_read_UINT32(s, cbFormat); DEBUG_DVC("cbFormat %d", cbFormat); #ifdef WITH_DEBUG_DVC @@ -434,14 +434,14 @@ BOOL tsmf_codec_parse_media_type(TS_AM_MEDIA_TYPE* mediatype, STREAM* s) /* http://msdn.microsoft.com/en-us/library/aa473808.aspx */ stream_seek(s, 8); /* dwSize and ? */ - stream_read_uint32(s, mediatype->Width); /* videoInfo.dwWidth */ - stream_read_uint32(s, mediatype->Height); /* videoInfo.dwHeight */ + stream_read_UINT32(s, mediatype->Width); /* videoInfo.dwWidth */ + stream_read_UINT32(s, mediatype->Height); /* videoInfo.dwHeight */ stream_seek(s, 32); /* videoInfo.FramesPerSecond */ - stream_read_uint32(s, mediatype->SamplesPerSecond.Numerator); - stream_read_uint32(s, mediatype->SamplesPerSecond.Denominator); + stream_read_UINT32(s, mediatype->SamplesPerSecond.Numerator); + stream_read_UINT32(s, mediatype->SamplesPerSecond.Denominator); stream_seek(s, 80); - stream_read_uint32(s, mediatype->BitRate); /* compressedInfo.AvgBitrate */ + stream_read_UINT32(s, mediatype->BitRate); /* compressedInfo.AvgBitrate */ stream_seek(s, 36); if (cbFormat > 176) @@ -456,9 +456,9 @@ BOOL tsmf_codec_parse_media_type(TS_AM_MEDIA_TYPE* mediatype, STREAM* s) stream_seek_UINT16(s); stream_read_UINT16(s, mediatype->Channels); - stream_read_uint32(s, mediatype->SamplesPerSecond.Numerator); + stream_read_UINT32(s, mediatype->SamplesPerSecond.Numerator); mediatype->SamplesPerSecond.Denominator = 1; - stream_read_uint32(s, mediatype->BitRate); + stream_read_UINT32(s, mediatype->BitRate); mediatype->BitRate *= 8; stream_read_UINT16(s, mediatype->BlockAlign); stream_read_UINT16(s, mediatype->BitsPerSample); diff --git a/channels/tsmf/client/tsmf_decoder.h b/channels/tsmf/client/tsmf_decoder.h index 9f222d1c7..792bc6e62 100644 --- a/channels/tsmf/client/tsmf_decoder.h +++ b/channels/tsmf/client/tsmf_decoder.h @@ -38,28 +38,28 @@ struct _ITSMFDecoder /* Set the decoder format. Return true if supported. */ BOOL (*SetFormat) (ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* media_type); /* Decode a sample. */ - BOOL (*Decode) (ITSMFDecoder* decoder, const BYTE* data, uint32 data_size, uint32 extensions); + BOOL (*Decode) (ITSMFDecoder* decoder, const BYTE* data, UINT32 data_size, UINT32 extensions); /* Get the decoded data */ - BYTE* (*GetDecodedData) (ITSMFDecoder* decoder, uint32* size); + BYTE* (*GetDecodedData) (ITSMFDecoder* decoder, UINT32* size); /* Get the pixel format of decoded video frame */ - uint32 (*GetDecodedFormat) (ITSMFDecoder* decoder); + UINT32 (*GetDecodedFormat) (ITSMFDecoder* decoder); /* Get the width and height of decoded video frame */ - BOOL (*GetDecodedDimension) (ITSMFDecoder* decoder, uint32* width, uint32* height); + BOOL (*GetDecodedDimension) (ITSMFDecoder* decoder, UINT32* width, UINT32* height); /* Free the decoder */ void (*Free) (ITSMFDecoder * decoder); /* Optional Contol function */ - void (*Control) (ITSMFDecoder * decoder, ITSMFControlMsg control_msg, uint32 *arg); + void (*Control) (ITSMFDecoder * decoder, ITSMFControlMsg control_msg, UINT32 *arg); /* Decode a sample with extended interface. */ - int (*DecodeEx) (ITSMFDecoder * decoder, const BYTE * data, uint32 data_size, uint32 extensions, - uint64 start_time, uint64 end_time, uint64 duration); + int (*DecodeEx) (ITSMFDecoder * decoder, const BYTE * data, UINT32 data_size, UINT32 extensions, + UINT64 start_time, UINT64 end_time, UINT64 duration); /* Get current play time */ - uint64 (*GetRunningTime) (ITSMFDecoder * decoder); + UINT64 (*GetRunningTime) (ITSMFDecoder * decoder); /* Update Gstreamer Rendering Area */ void (*UpdateRenderingArea) (ITSMFDecoder * decoder, int newX, int newY, int newWidth, int newHeight, int numRectangles, RDP_RECT *rectangles); /* Change Gstreamer Audio Volume */ - void (*ChangeVolume) (ITSMFDecoder * decoder, uint32 newVolume, uint32 muted); + void (*ChangeVolume) (ITSMFDecoder * decoder, UINT32 newVolume, UINT32 muted); /* Check buffer level */ - uint32 (*BufferLevel) (ITSMFDecoder * decoder); + UINT32 (*BufferLevel) (ITSMFDecoder * decoder); }; #define TSMF_DECODER_EXPORT_FUNC_NAME "TSMFDecoderEntry" diff --git a/channels/tsmf/client/tsmf_ifman.c b/channels/tsmf/client/tsmf_ifman.c index a55fed3f5..f33b26f3e 100644 --- a/channels/tsmf/client/tsmf_ifman.c +++ b/channels/tsmf/client/tsmf_ifman.c @@ -38,49 +38,49 @@ int tsmf_ifman_rim_exchange_capability_request(TSMF_IFMAN* ifman) { - uint32 CapabilityValue; + UINT32 CapabilityValue; - stream_read_uint32(ifman->input, CapabilityValue); + stream_read_UINT32(ifman->input, CapabilityValue); DEBUG_DVC("server CapabilityValue %d", CapabilityValue); stream_check_size(ifman->output, 8); - stream_write_uint32(ifman->output, 1); /* CapabilityValue */ - stream_write_uint32(ifman->output, 0); /* Result */ + stream_write_UINT32(ifman->output, 1); /* CapabilityValue */ + stream_write_UINT32(ifman->output, 0); /* Result */ return 0; } int tsmf_ifman_exchange_capability_request(TSMF_IFMAN* ifman) { - uint32 i; - uint32 v; - uint32 pos; - uint32 CapabilityType; - uint32 cbCapabilityLength; - uint32 numHostCapabilities; + UINT32 i; + UINT32 v; + UINT32 pos; + UINT32 CapabilityType; + UINT32 cbCapabilityLength; + UINT32 numHostCapabilities; pos = stream_get_pos(ifman->output); stream_check_size(ifman->output, ifman->input_size + 4); stream_copy(ifman->output, ifman->input, ifman->input_size); stream_set_pos(ifman->output, pos); - stream_read_uint32(ifman->output, numHostCapabilities); + stream_read_UINT32(ifman->output, numHostCapabilities); for (i = 0; i < numHostCapabilities; i++) { - stream_read_uint32(ifman->output, CapabilityType); - stream_read_uint32(ifman->output, cbCapabilityLength); + stream_read_UINT32(ifman->output, CapabilityType); + stream_read_UINT32(ifman->output, cbCapabilityLength); pos = stream_get_pos(ifman->output); switch (CapabilityType) { case 1: /* Protocol version request */ - stream_read_uint32(ifman->output, v); + stream_read_UINT32(ifman->output, v); DEBUG_DVC("server protocol version %d", v); break; case 2: /* Supported platform */ - stream_peek_uint32(ifman->output, v); + stream_peek_UINT32(ifman->output, v); DEBUG_DVC("server supported platform %d", v); /* Claim that we support both MF and DShow platforms. */ - stream_write_uint32(ifman->output, + stream_write_UINT32(ifman->output, MMREDIR_CAPABILITY_PLATFORM_MF | MMREDIR_CAPABILITY_PLATFORM_DSHOW); break; default: @@ -89,7 +89,7 @@ int tsmf_ifman_exchange_capability_request(TSMF_IFMAN* ifman) } stream_set_pos(ifman->output, pos + cbCapabilityLength); } - stream_write_uint32(ifman->output, 0); /* Result */ + stream_write_UINT32(ifman->output, 0); /* Result */ ifman->output_interface_id = TSMF_INTERFACE_DEFAULT | STREAM_ID_STUB; @@ -98,13 +98,13 @@ int tsmf_ifman_exchange_capability_request(TSMF_IFMAN* ifman) int tsmf_ifman_check_format_support_request(TSMF_IFMAN* ifman) { - uint32 numMediaType; - uint32 PlatformCookie; - uint32 FormatSupported = 1; + UINT32 numMediaType; + UINT32 PlatformCookie; + UINT32 FormatSupported = 1; - stream_read_uint32(ifman->input, PlatformCookie); - stream_seek_uint32(ifman->input); /* NoRolloverFlags (4 bytes) */ - stream_read_uint32(ifman->input, numMediaType); + stream_read_UINT32(ifman->input, PlatformCookie); + stream_seek_UINT32(ifman->input); /* NoRolloverFlags (4 bytes) */ + stream_read_UINT32(ifman->input, numMediaType); DEBUG_DVC("PlatformCookie %d numMediaType %d", PlatformCookie, numMediaType); @@ -115,9 +115,9 @@ int tsmf_ifman_check_format_support_request(TSMF_IFMAN* ifman) DEBUG_DVC("format ok."); stream_check_size(ifman->output, 12); - stream_write_uint32(ifman->output, FormatSupported); - stream_write_uint32(ifman->output, PlatformCookie); - stream_write_uint32(ifman->output, 0); /* Result */ + stream_write_UINT32(ifman->output, FormatSupported); + stream_write_UINT32(ifman->output, PlatformCookie); + stream_write_UINT32(ifman->output, 0); /* Result */ ifman->output_interface_id = TSMF_INTERFACE_DEFAULT | STREAM_ID_STUB; @@ -151,7 +151,7 @@ int tsmf_ifman_on_new_presentation(TSMF_IFMAN* ifman) int tsmf_ifman_add_stream(TSMF_IFMAN* ifman) { - uint32 StreamId; + UINT32 StreamId; int error = 0; TSMF_STREAM* stream; TSMF_PRESENTATION* presentation; @@ -165,8 +165,8 @@ int tsmf_ifman_add_stream(TSMF_IFMAN* ifman) error = 1; else { - stream_read_uint32(ifman->input, StreamId); - stream_seek_uint32(ifman->input); /* numMediaType */ + stream_read_UINT32(ifman->input, StreamId); + stream_seek_UINT32(ifman->input); /* numMediaType */ stream = tsmf_stream_new(presentation, StreamId); if (stream) tsmf_stream_set_format(stream, ifman->decoder_name, ifman->input); @@ -180,8 +180,8 @@ int tsmf_ifman_set_topology_request(TSMF_IFMAN* ifman) DEBUG_DVC(""); stream_check_size(ifman->output, 8); - stream_write_uint32(ifman->output, 1); /* TopologyReady */ - stream_write_uint32(ifman->output, 0); /* Result */ + stream_write_UINT32(ifman->output, 1); /* TopologyReady */ + stream_write_UINT32(ifman->output, 0); /* Result */ ifman->output_interface_id = TSMF_INTERFACE_DEFAULT | STREAM_ID_STUB; return 0; } @@ -189,7 +189,7 @@ int tsmf_ifman_set_topology_request(TSMF_IFMAN* ifman) int tsmf_ifman_remove_stream(TSMF_IFMAN* ifman) { int error = 0; - uint32 StreamId; + UINT32 StreamId; TSMF_STREAM* stream; TSMF_PRESENTATION* presentation; @@ -202,7 +202,7 @@ int tsmf_ifman_remove_stream(TSMF_IFMAN* ifman) error = 1; else { - stream_read_uint32(ifman->input, StreamId); + stream_read_UINT32(ifman->input, StreamId); stream = tsmf_stream_find_by_id(presentation, StreamId); if (stream) tsmf_stream_free(stream); @@ -226,7 +226,7 @@ int tsmf_ifman_shutdown_presentation(TSMF_IFMAN* ifman) pexisted = 0; stream_check_size(ifman->output, 4); - stream_write_uint32(ifman->output, 0); /* Result */ + stream_write_UINT32(ifman->output, 0); /* Result */ ifman->output_interface_id = TSMF_INTERFACE_DEFAULT | STREAM_ID_STUB; return 0; } @@ -241,13 +241,13 @@ int tsmf_ifman_on_stream_volume(TSMF_IFMAN* ifman) if (presentation) { - uint32 newVolume; - uint32 muted; + UINT32 newVolume; + UINT32 muted; stream_seek(ifman->input, 16); - stream_read_uint32(ifman->input, newVolume); + stream_read_UINT32(ifman->input, newVolume); DEBUG_DVC("on stream volume: new volume=[%d]", newVolume); - stream_read_uint32(ifman->input, muted); + stream_read_UINT32(ifman->input, muted); DEBUG_DVC("on stream volume: muted=[%d]", muted); tsmf_presentation_volume_changed(presentation, newVolume, muted); } @@ -271,13 +271,13 @@ int tsmf_ifman_on_channel_volume(TSMF_IFMAN* ifman) if (presentation) { - uint32 channelVolume; - uint32 changedChannel; + UINT32 channelVolume; + UINT32 changedChannel; stream_seek(ifman->input, 16); - stream_read_uint32(ifman->input, channelVolume); + stream_read_UINT32(ifman->input, channelVolume); DEBUG_DVC("on channel volume: channel volume=[%d]", channelVolume); - stream_read_uint32(ifman->input, changedChannel); + stream_read_UINT32(ifman->input, changedChannel); DEBUG_DVC("on stream volume: changed channel=[%d]", changedChannel); } @@ -296,12 +296,12 @@ int tsmf_ifman_set_video_window(TSMF_IFMAN* ifman) int tsmf_ifman_update_geometry_info(TSMF_IFMAN* ifman) { TSMF_PRESENTATION* presentation; - uint32 numGeometryInfo; - uint32 Left; - uint32 Top; - uint32 Width; - uint32 Height; - uint32 cbVisibleRect; + UINT32 numGeometryInfo; + UINT32 Left; + UINT32 Top; + UINT32 Width; + UINT32 Height; + UINT32 cbVisibleRect; RDP_RECT* rects = NULL; int num_rects = 0; int error = 0; @@ -311,17 +311,17 @@ int tsmf_ifman_update_geometry_info(TSMF_IFMAN* ifman) presentation = tsmf_presentation_find_by_id(stream_get_tail(ifman->input)); stream_seek(ifman->input, 16); - stream_read_uint32(ifman->input, numGeometryInfo); + stream_read_UINT32(ifman->input, numGeometryInfo); pos = stream_get_pos(ifman->input); stream_seek(ifman->input, 12); /* VideoWindowId (8 bytes), VideoWindowState (4 bytes) */ - stream_read_uint32(ifman->input, Width); - stream_read_uint32(ifman->input, Height); - stream_read_uint32(ifman->input, Left); - stream_read_uint32(ifman->input, Top); + stream_read_UINT32(ifman->input, Width); + stream_read_UINT32(ifman->input, Height); + stream_read_UINT32(ifman->input, Left); + stream_read_UINT32(ifman->input, Top); stream_set_pos(ifman->input, pos + numGeometryInfo); - stream_read_uint32(ifman->input, cbVisibleRect); + stream_read_UINT32(ifman->input, cbVisibleRect); num_rects = cbVisibleRect / 16; DEBUG_DVC("numGeometryInfo %d Width %d Height %d Left %d Top %d cbVisibleRect %d num_rects %d", @@ -379,22 +379,22 @@ int tsmf_ifman_on_sample(TSMF_IFMAN* ifman) { TSMF_PRESENTATION* presentation; TSMF_STREAM* stream; - uint32 StreamId; - uint64 SampleStartTime; - uint64 SampleEndTime; - uint64 ThrottleDuration; - uint32 SampleExtensions; - uint32 cbData; + UINT32 StreamId; + UINT64 SampleStartTime; + UINT64 SampleEndTime; + UINT64 ThrottleDuration; + UINT32 SampleExtensions; + UINT32 cbData; stream_seek(ifman->input, 16); - stream_read_uint32(ifman->input, StreamId); - stream_seek_uint32(ifman->input); /* numSample */ - stream_read_uint64(ifman->input, SampleStartTime); - stream_read_uint64(ifman->input, SampleEndTime); - stream_read_uint64(ifman->input, ThrottleDuration); - stream_seek_uint32(ifman->input); /* SampleFlags */ - stream_read_uint32(ifman->input, SampleExtensions); - stream_read_uint32(ifman->input, cbData); + stream_read_UINT32(ifman->input, StreamId); + stream_seek_UINT32(ifman->input); /* numSample */ + stream_read_UINT64(ifman->input, SampleStartTime); + stream_read_UINT64(ifman->input, SampleEndTime); + stream_read_UINT64(ifman->input, ThrottleDuration); + stream_seek_UINT32(ifman->input); /* SampleFlags */ + stream_read_UINT32(ifman->input, SampleExtensions); + stream_read_UINT32(ifman->input, cbData); DEBUG_DVC("MessageId %d StreamId %d SampleStartTime %d SampleEndTime %d " "ThrottleDuration %d SampleExtensions %d cbData %d", @@ -424,10 +424,10 @@ int tsmf_ifman_on_sample(TSMF_IFMAN* ifman) int tsmf_ifman_on_flush(TSMF_IFMAN* ifman) { TSMF_PRESENTATION* presentation; - uint32 StreamId; + UINT32 StreamId; stream_seek(ifman->input, 16); - stream_read_uint32(ifman->input, StreamId); + stream_read_UINT32(ifman->input, StreamId); DEBUG_DVC("StreamId %d", StreamId); presentation = tsmf_presentation_find_by_id(ifman->presentation_id); @@ -447,11 +447,11 @@ int tsmf_ifman_on_end_of_stream(TSMF_IFMAN* ifman) { TSMF_PRESENTATION* presentation; TSMF_STREAM* stream; - uint32 StreamId; + UINT32 StreamId; presentation = tsmf_presentation_find_by_id(stream_get_tail(ifman->input)); stream_seek(ifman->input, 16); - stream_read_uint32(ifman->input, StreamId); + stream_read_UINT32(ifman->input, StreamId); if (presentation) { stream = tsmf_stream_find_by_id(presentation, StreamId); @@ -461,10 +461,10 @@ int tsmf_ifman_on_end_of_stream(TSMF_IFMAN* ifman) DEBUG_DVC("StreamId %d", StreamId); stream_check_size(ifman->output, 16); - stream_write_uint32(ifman->output, CLIENT_EVENT_NOTIFICATION); /* FunctionId */ - stream_write_uint32(ifman->output, StreamId); /* StreamId */ - stream_write_uint32(ifman->output, TSMM_CLIENT_EVENT_ENDOFSTREAM); /* EventId */ - stream_write_uint32(ifman->output, 0); /* cbData */ + stream_write_UINT32(ifman->output, CLIENT_EVENT_NOTIFICATION); /* FunctionId */ + stream_write_UINT32(ifman->output, StreamId); /* StreamId */ + stream_write_UINT32(ifman->output, TSMM_CLIENT_EVENT_ENDOFSTREAM); /* EventId */ + stream_write_UINT32(ifman->output, 0); /* cbData */ ifman->output_interface_id = TSMF_INTERFACE_CLIENT_NOTIFICATIONS | STREAM_ID_PROXY; return 0; @@ -483,10 +483,10 @@ int tsmf_ifman_on_playback_started(TSMF_IFMAN* ifman) DEBUG_WARN("unknown presentation id"); stream_check_size(ifman->output, 16); - stream_write_uint32(ifman->output, CLIENT_EVENT_NOTIFICATION); /* FunctionId */ - stream_write_uint32(ifman->output, 0); /* StreamId */ - stream_write_uint32(ifman->output, TSMM_CLIENT_EVENT_START_COMPLETED); /* EventId */ - stream_write_uint32(ifman->output, 0); /* cbData */ + stream_write_UINT32(ifman->output, CLIENT_EVENT_NOTIFICATION); /* FunctionId */ + stream_write_UINT32(ifman->output, 0); /* StreamId */ + stream_write_UINT32(ifman->output, TSMM_CLIENT_EVENT_START_COMPLETED); /* EventId */ + stream_write_UINT32(ifman->output, 0); /* cbData */ ifman->output_interface_id = TSMF_INTERFACE_CLIENT_NOTIFICATIONS | STREAM_ID_PROXY; return 0; @@ -542,10 +542,10 @@ int tsmf_ifman_on_playback_stopped(TSMF_IFMAN* ifman) DEBUG_WARN("unknown presentation id"); stream_check_size(ifman->output, 16); - stream_write_uint32(ifman->output, CLIENT_EVENT_NOTIFICATION); /* FunctionId */ - stream_write_uint32(ifman->output, 0); /* StreamId */ - stream_write_uint32(ifman->output, TSMM_CLIENT_EVENT_STOP_COMPLETED); /* EventId */ - stream_write_uint32(ifman->output, 0); /* cbData */ + stream_write_UINT32(ifman->output, CLIENT_EVENT_NOTIFICATION); /* FunctionId */ + stream_write_UINT32(ifman->output, 0); /* StreamId */ + stream_write_UINT32(ifman->output, TSMM_CLIENT_EVENT_STOP_COMPLETED); /* EventId */ + stream_write_UINT32(ifman->output, 0); /* cbData */ ifman->output_interface_id = TSMF_INTERFACE_CLIENT_NOTIFICATIONS | STREAM_ID_PROXY; return 0; @@ -556,10 +556,10 @@ int tsmf_ifman_on_playback_rate_changed(TSMF_IFMAN * ifman) DEBUG_DVC(""); stream_check_size(ifman->output, 16); - stream_write_uint32(ifman->output, CLIENT_EVENT_NOTIFICATION); /* FunctionId */ - stream_write_uint32(ifman->output, 0); /* StreamId */ - stream_write_uint32(ifman->output, TSMM_CLIENT_EVENT_MONITORCHANGED); /* EventId */ - stream_write_uint32(ifman->output, 0); /* cbData */ + stream_write_UINT32(ifman->output, CLIENT_EVENT_NOTIFICATION); /* FunctionId */ + stream_write_UINT32(ifman->output, 0); /* StreamId */ + stream_write_UINT32(ifman->output, TSMM_CLIENT_EVENT_MONITORCHANGED); /* EventId */ + stream_write_UINT32(ifman->output, 0); /* cbData */ ifman->output_interface_id = TSMF_INTERFACE_CLIENT_NOTIFICATIONS | STREAM_ID_PROXY; return 0; diff --git a/channels/tsmf/client/tsmf_ifman.h b/channels/tsmf/client/tsmf_ifman.h index 0827ddec6..90719f85f 100644 --- a/channels/tsmf/client/tsmf_ifman.h +++ b/channels/tsmf/client/tsmf_ifman.h @@ -28,14 +28,14 @@ struct _TSMF_IFMAN const char* audio_name; const char* audio_device; BYTE presentation_id[16]; - uint32 stream_id; - uint32 message_id; + UINT32 stream_id; + UINT32 message_id; STREAM* input; - uint32 input_size; + UINT32 input_size; STREAM* output; BOOL output_pending; - uint32 output_interface_id; + UINT32 output_interface_id; }; int tsmf_ifman_rim_exchange_capability_request(TSMF_IFMAN* ifman); diff --git a/channels/tsmf/client/tsmf_main.c b/channels/tsmf/client/tsmf_main.c index 922e064ad..fd0472cfc 100644 --- a/channels/tsmf/client/tsmf_main.c +++ b/channels/tsmf/client/tsmf_main.c @@ -58,7 +58,7 @@ struct _TSMF_CHANNEL_CALLBACK IWTSVirtualChannel* channel; BYTE presentation_id[16]; - uint32 stream_id; + UINT32 stream_id; }; struct _TSMF_PLUGIN @@ -73,19 +73,19 @@ struct _TSMF_PLUGIN }; void tsmf_playback_ack(IWTSVirtualChannelCallback* pChannelCallback, - uint32 message_id, uint64 duration, uint32 data_size) + UINT32 message_id, UINT64 duration, UINT32 data_size) { STREAM* s; int error; TSMF_CHANNEL_CALLBACK* callback = (TSMF_CHANNEL_CALLBACK*) pChannelCallback; s = stream_new(32); - stream_write_uint32(s, TSMF_INTERFACE_CLIENT_NOTIFICATIONS | STREAM_ID_PROXY); - stream_write_uint32(s, message_id); - stream_write_uint32(s, PLAYBACK_ACK); /* FunctionId */ - stream_write_uint32(s, callback->stream_id); /* StreamId */ - stream_write_uint64(s, duration); /* DataDuration */ - stream_write_uint64(s, data_size); /* cbData */ + stream_write_UINT32(s, TSMF_INTERFACE_CLIENT_NOTIFICATIONS | STREAM_ID_PROXY); + stream_write_UINT32(s, message_id); + stream_write_UINT32(s, PLAYBACK_ACK); /* FunctionId */ + stream_write_UINT32(s, callback->stream_id); /* StreamId */ + stream_write_UINT64(s, duration); /* DataDuration */ + stream_write_UINT64(s, data_size); /* cbData */ DEBUG_DVC("response size %d", (int) stream_get_length(s)); error = callback->channel->Write(callback->channel, stream_get_length(s), stream_get_head(s), NULL); @@ -112,7 +112,7 @@ BOOL tsmf_push_event(IWTSVirtualChannelCallback* pChannelCallback, } static int tsmf_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, - uint32 cbSize, + UINT32 cbSize, BYTE* pBuffer) { int length; @@ -120,9 +120,9 @@ static int tsmf_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, STREAM* output; int error = -1; TSMF_IFMAN ifman; - uint32 MessageId; - uint32 FunctionId; - uint32 InterfaceId; + UINT32 MessageId; + UINT32 FunctionId; + UINT32 InterfaceId; TSMF_CHANNEL_CALLBACK* callback = (TSMF_CHANNEL_CALLBACK*) pChannelCallback; /* 2.2.1 Shared Message Header (SHARED_MSG_HEADER) */ @@ -136,9 +136,9 @@ static int tsmf_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, output = stream_new(256); stream_seek(output, 8); - stream_read_uint32(input, InterfaceId); - stream_read_uint32(input, MessageId); - stream_read_uint32(input, FunctionId); + stream_read_UINT32(input, InterfaceId); + stream_read_UINT32(input, MessageId); + stream_read_UINT32(input, FunctionId); DEBUG_DVC("cbSize=%d InterfaceId=0x%X MessageId=0x%X FunctionId=0x%X", cbSize, InterfaceId, MessageId, FunctionId); @@ -178,7 +178,7 @@ static int tsmf_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, case SET_CHANNEL_PARAMS: memcpy(callback->presentation_id, stream_get_tail(input), 16); stream_seek(input, 16); - stream_read_uint32(input, callback->stream_id); + stream_read_UINT32(input, callback->stream_id); DEBUG_DVC("SET_CHANNEL_PARAMS StreamId=%d", callback->stream_id); ifman.output_pending = TRUE; error = 0; @@ -314,8 +314,8 @@ static int tsmf_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, /* Response packet does not have FunctionId */ length = stream_get_length(output); stream_set_pos(output, 0); - stream_write_uint32(output, ifman.output_interface_id); - stream_write_uint32(output, MessageId); + stream_write_UINT32(output, ifman.output_interface_id); + stream_write_UINT32(output, MessageId); DEBUG_DVC("response size %d", length); error = callback->channel->Write(callback->channel, length, stream_get_head(output), NULL); diff --git a/channels/tsmf/client/tsmf_main.h b/channels/tsmf/client/tsmf_main.h index 892992cbc..b7b9589a8 100644 --- a/channels/tsmf/client/tsmf_main.h +++ b/channels/tsmf/client/tsmf_main.h @@ -21,7 +21,7 @@ #define __TSMF_MAIN_H void tsmf_playback_ack(IWTSVirtualChannelCallback* pChannelCallback, - uint32 message_id, uint64 duration, uint32 data_size); + UINT32 message_id, UINT64 duration, UINT32 data_size); BOOL tsmf_push_event(IWTSVirtualChannelCallback* pChannelCallback, RDP_EVENT* event); diff --git a/channels/tsmf/client/tsmf_media.c b/channels/tsmf/client/tsmf_media.c index 31db61f40..ab091de2c 100644 --- a/channels/tsmf/client/tsmf_media.c +++ b/channels/tsmf/client/tsmf_media.c @@ -63,24 +63,24 @@ struct _TSMF_PRESENTATION const char* audio_device; int eos; - uint32 last_x; - uint32 last_y; - uint32 last_width; - uint32 last_height; + UINT32 last_x; + UINT32 last_y; + UINT32 last_width; + UINT32 last_height; UINT16 last_num_rects; RDP_RECT* last_rects; - uint32 output_x; - uint32 output_y; - uint32 output_width; - uint32 output_height; + UINT32 output_x; + UINT32 output_y; + UINT32 output_width; + UINT32 output_height; UINT16 output_num_rects; RDP_RECT* output_rects; IWTSVirtualChannelCallback* channel_callback; - uint64 audio_start_time; - uint64 audio_end_time; + UINT64 audio_start_time; + UINT64 audio_end_time; /* The stream list could be accessed by different threads and need to be protected. */ HANDLE mutex; @@ -90,7 +90,7 @@ struct _TSMF_PRESENTATION struct _TSMF_STREAM { - uint32 stream_id; + UINT32 stream_id; TSMF_PRESENTATION* presentation; @@ -98,18 +98,18 @@ struct _TSMF_STREAM int major_type; int eos; - uint32 width; - uint32 height; + UINT32 width; + UINT32 height; ITSMFAudioDevice* audio; - uint32 sample_rate; - uint32 channels; - uint32 bits_per_sample; + UINT32 sample_rate; + UINT32 channels; + UINT32 bits_per_sample; /* The end_time of last played sample */ - uint64 last_end_time; + UINT64 last_end_time; /* Next sample should not start before this system time. */ - uint64 next_start_time; + UINT64 next_start_time; freerdp_thread* thread; @@ -121,32 +121,32 @@ struct _TSMF_STREAM struct _TSMF_SAMPLE { - uint32 sample_id; - uint64 start_time; - uint64 end_time; - uint64 duration; - uint32 extensions; - uint32 data_size; + UINT32 sample_id; + UINT64 start_time; + UINT64 end_time; + UINT64 duration; + UINT32 extensions; + UINT32 data_size; BYTE* data; - uint32 decoded_size; - uint32 pixfmt; + UINT32 decoded_size; + UINT32 pixfmt; TSMF_STREAM* stream; IWTSVirtualChannelCallback* channel_callback; - uint64 ack_time; + UINT64 ack_time; }; static LIST* presentation_list = NULL; -static uint64 last_played_audio_time = 0; +static UINT64 last_played_audio_time = 0; static HANDLE tsmf_mutex = NULL; static int TERMINATING = 0; -static uint64 get_current_time(void) +static UINT64 get_current_time(void) { struct timeval tp; gettimeofday(&tp, 0); - return ((uint64)tp.tv_sec) * 10000000LL + ((uint64)tp.tv_usec) * 10LL; + return ((UINT64)tp.tv_sec) * 10000000LL + ((UINT64)tp.tv_usec) * 10LL; } static TSMF_SAMPLE* tsmf_stream_pop_sample(TSMF_STREAM* stream, int sync) @@ -235,7 +235,7 @@ static void tsmf_sample_queue_ack(TSMF_SAMPLE* sample) static void tsmf_stream_process_ack(TSMF_STREAM* stream) { TSMF_SAMPLE* sample; - uint64 ack_time; + UINT64 ack_time; ack_time = get_current_time(); while (list_size(stream->sample_ack_list) > 0 && !freerdp_thread_is_stopped(stream->thread)) @@ -323,7 +323,7 @@ static void tsmf_presentation_restore_last_video_frame(TSMF_PRESENTATION* presen static void tsmf_sample_playback_video(TSMF_SAMPLE* sample) { - uint64 t; + UINT64 t; RDP_VIDEO_FRAME_EVENT* vevent; TSMF_STREAM* stream = sample->stream; TSMF_PRESENTATION* presentation = stream->presentation; @@ -426,7 +426,7 @@ static void tsmf_sample_playback_video(TSMF_SAMPLE* sample) static void tsmf_sample_playback_audio(TSMF_SAMPLE* sample) { - uint64 latency = 0; + UINT64 latency = 0; TSMF_STREAM* stream = sample->stream; DEBUG_DVC("MessageId %d EndTime %d consumed.", @@ -456,9 +456,9 @@ static void tsmf_sample_playback_audio(TSMF_SAMPLE* sample) static void tsmf_sample_playback(TSMF_SAMPLE* sample) { BOOL ret = FALSE; - uint32 width; - uint32 height; - uint32 pixfmt = 0; + UINT32 width; + UINT32 height; + UINT32 pixfmt = 0; TSMF_STREAM* stream = sample->stream; if (stream->decoder) @@ -485,7 +485,7 @@ static void tsmf_sample_playback(TSMF_SAMPLE* sample) if (stream->decoder->GetDecodedFormat) { pixfmt = stream->decoder->GetDecodedFormat(stream->decoder); - if (pixfmt == ((uint32) -1)) + if (pixfmt == ((UINT32) -1)) { tsmf_sample_ack(sample); tsmf_sample_free(sample); @@ -526,9 +526,9 @@ static void tsmf_sample_playback(TSMF_SAMPLE* sample) else { TSMF_STREAM * stream = sample->stream; - uint64 ack_anticipation_time = get_current_time(); - uint64 currentRunningTime = sample->start_time; - uint32 bufferLevel = 0; + UINT64 ack_anticipation_time = get_current_time(); + UINT64 currentRunningTime = sample->start_time; + UINT32 bufferLevel = 0; if (stream->decoder->GetRunningTime) { currentRunningTime = stream->decoder->GetRunningTime(stream->decoder); @@ -738,7 +738,7 @@ static void tsmf_stream_restart(TSMF_STREAM* stream) } } -static void tsmf_stream_change_volume(TSMF_STREAM* stream, uint32 newVolume, uint32 muted) +static void tsmf_stream_change_volume(TSMF_STREAM* stream, UINT32 newVolume, UINT32 muted) { if (!stream) return; @@ -753,7 +753,7 @@ static void tsmf_stream_change_volume(TSMF_STREAM* stream, uint32 newVolume, uin } } -void tsmf_presentation_volume_changed(TSMF_PRESENTATION* presentation, uint32 newVolume, uint32 muted) +void tsmf_presentation_volume_changed(TSMF_PRESENTATION* presentation, UINT32 newVolume, UINT32 muted) { LIST_ITEM* item; TSMF_STREAM* stream; @@ -831,7 +831,7 @@ void tsmf_presentation_stop(TSMF_PRESENTATION* presentation) } void tsmf_presentation_set_geometry_info(TSMF_PRESENTATION* presentation, - uint32 x, uint32 y, uint32 width, uint32 height, + UINT32 x, UINT32 y, UINT32 width, UINT32 height, int num_rects, RDP_RECT* rects) { presentation->output_x = x; @@ -910,7 +910,7 @@ void tsmf_presentation_free(TSMF_PRESENTATION* presentation) free(presentation); } -TSMF_STREAM* tsmf_stream_new(TSMF_PRESENTATION* presentation, uint32 stream_id) +TSMF_STREAM* tsmf_stream_new(TSMF_PRESENTATION* presentation, UINT32 stream_id) { TSMF_STREAM* stream; @@ -936,7 +936,7 @@ TSMF_STREAM* tsmf_stream_new(TSMF_PRESENTATION* presentation, uint32 stream_id) return stream; } -TSMF_STREAM* tsmf_stream_find_by_id(TSMF_PRESENTATION* presentation, uint32 stream_id) +TSMF_STREAM* tsmf_stream_find_by_id(TSMF_PRESENTATION* presentation, UINT32 stream_id) { LIST_ITEM* item; TSMF_STREAM* stream; @@ -1020,8 +1020,8 @@ void tsmf_stream_free(TSMF_STREAM* stream) } void tsmf_stream_push_sample(TSMF_STREAM* stream, IWTSVirtualChannelCallback* pChannelCallback, - uint32 sample_id, uint64 start_time, uint64 end_time, uint64 duration, uint32 extensions, - uint32 data_size, BYTE* data) + UINT32 sample_id, UINT64 start_time, UINT64 end_time, UINT64 duration, UINT32 extensions, + UINT32 data_size, BYTE* data) { TSMF_SAMPLE* sample; diff --git a/channels/tsmf/client/tsmf_media.h b/channels/tsmf/client/tsmf_media.h index e1d21c87c..9ba358820 100644 --- a/channels/tsmf/client/tsmf_media.h +++ b/channels/tsmf/client/tsmf_media.h @@ -38,24 +38,24 @@ void tsmf_presentation_start(TSMF_PRESENTATION* presentation); void tsmf_presentation_stop(TSMF_PRESENTATION* presentation); void tsmf_presentation_paused(TSMF_PRESENTATION* presentation); void tsmf_presentation_restarted(TSMF_PRESENTATION* presentation); -void tsmf_presentation_volume_changed(TSMF_PRESENTATION* presentation, uint32 newVolume, uint32 muted); +void tsmf_presentation_volume_changed(TSMF_PRESENTATION* presentation, UINT32 newVolume, UINT32 muted); void tsmf_presentation_set_geometry_info(TSMF_PRESENTATION* presentation, - uint32 x, uint32 y, uint32 width, uint32 height, + UINT32 x, UINT32 y, UINT32 width, UINT32 height, int num_rects, RDP_RECT* rects); void tsmf_presentation_set_audio_device(TSMF_PRESENTATION* presentation, const char* name, const char* device); void tsmf_presentation_flush(TSMF_PRESENTATION* presentation); void tsmf_presentation_free(TSMF_PRESENTATION* presentation); -TSMF_STREAM* tsmf_stream_new(TSMF_PRESENTATION* presentation, uint32 stream_id); -TSMF_STREAM* tsmf_stream_find_by_id(TSMF_PRESENTATION* presentation, uint32 stream_id); +TSMF_STREAM* tsmf_stream_new(TSMF_PRESENTATION* presentation, UINT32 stream_id); +TSMF_STREAM* tsmf_stream_find_by_id(TSMF_PRESENTATION* presentation, UINT32 stream_id); void tsmf_stream_set_format(TSMF_STREAM* stream, const char* name, STREAM* s); void tsmf_stream_end(TSMF_STREAM* stream); void tsmf_stream_free(TSMF_STREAM* stream); void tsmf_stream_push_sample(TSMF_STREAM* stream, IWTSVirtualChannelCallback* pChannelCallback, - uint32 sample_id, uint64 start_time, uint64 end_time, uint64 duration, uint32 extensions, - uint32 data_size, BYTE* data); + UINT32 sample_id, UINT64 start_time, UINT64 end_time, UINT64 duration, UINT32 extensions, + UINT32 data_size, BYTE* data); void tsmf_media_init(void); diff --git a/channels/tsmf/client/tsmf_types.h b/channels/tsmf/client/tsmf_types.h index b42e32961..0ccdafae8 100644 --- a/channels/tsmf/client/tsmf_types.h +++ b/channels/tsmf/client/tsmf_types.h @@ -40,19 +40,19 @@ typedef struct _TS_AM_MEDIA_TYPE int SubType; int FormatType; - uint32 Width; - uint32 Height; - uint32 BitRate; + UINT32 Width; + UINT32 Height; + UINT32 BitRate; struct { - uint32 Numerator; - uint32 Denominator; + UINT32 Numerator; + UINT32 Denominator; } SamplesPerSecond; - uint32 Channels; - uint32 BitsPerSample; - uint32 BlockAlign; + UINT32 Channels; + UINT32 BitsPerSample; + UINT32 BlockAlign; const BYTE* ExtraData; - uint32 ExtraDataSize; + UINT32 ExtraDataSize; } TS_AM_MEDIA_TYPE; #endif diff --git a/channels/urbdrc/client/data_transfer.c b/channels/urbdrc/client/data_transfer.c index 746720ea3..45fc217ee 100644 --- a/channels/urbdrc/client/data_transfer.c +++ b/channels/urbdrc/client/data_transfer.c @@ -37,19 +37,19 @@ static void usb_process_get_port_status(IUDEVICE* pdev, BYTE* OutputBuffer) switch (bcdUSB) { case USB_v1_0: - data_write_uint32(OutputBuffer, 0x303); + data_write_UINT32(OutputBuffer, 0x303); break; case USB_v1_1: - data_write_uint32(OutputBuffer, 0x103); + data_write_UINT32(OutputBuffer, 0x103); break; case USB_v2_0: - data_write_uint32(OutputBuffer, 0x503); + data_write_UINT32(OutputBuffer, 0x503); break; default: - data_write_uint32(OutputBuffer, 0x503); + data_write_UINT32(OutputBuffer, 0x503); break; } } @@ -60,7 +60,7 @@ static int func_check_isochronous_fds(IUDEVICE* pdev) { int ret = 0; BYTE* data_temp; - uint32 size_temp, process_times = 2; + UINT32 size_temp, process_times = 2; ISOCH_CALLBACK_QUEUE* isoch_queue = NULL; ISOCH_CALLBACK_DATA* isoch = NULL; URBDRC_CHANNEL_CALLBACK* callback; @@ -118,11 +118,11 @@ static int func_check_isochronous_fds(IUDEVICE* pdev) #endif static int urbdrc_process_register_request_callback(URBDRC_CHANNEL_CALLBACK* callback, - BYTE* data, uint32 data_sizem, IUDEVMAN* udevman, uint32 UsbDevice) + BYTE* data, UINT32 data_sizem, IUDEVMAN* udevman, UINT32 UsbDevice) { IUDEVICE* pdev; - uint32 NumRequestCompletion = 0; - uint32 RequestCompletion = 0; + UINT32 NumRequestCompletion = 0; + UINT32 RequestCompletion = 0; LLOGLN(urbdrc_debug, ("urbdrc_process_register_request_callback")); @@ -133,15 +133,15 @@ static int urbdrc_process_register_request_callback(URBDRC_CHANNEL_CALLBACK* cal if (data_sizem >= 8) { - data_read_uint32(data + 0, NumRequestCompletion); /** must be 1 */ + data_read_UINT32(data + 0, NumRequestCompletion); /** must be 1 */ /** RequestCompletion: * unique Request Completion interface for the client to use */ - data_read_uint32(data + 4, RequestCompletion); + data_read_UINT32(data + 4, RequestCompletion); pdev->set_ReqCompletion(pdev, RequestCompletion); } else /** Unregister the device */ { - data_read_uint32(data + 0, RequestCompletion); + data_read_UINT32(data + 0, RequestCompletion); if (1)//(pdev->get_ReqCompletion(pdev) == RequestCompletion) { @@ -157,13 +157,13 @@ static int urbdrc_process_register_request_callback(URBDRC_CHANNEL_CALLBACK* cal return 0; } -static int urbdrc_process_cancel_request(BYTE* data, uint32 data_sizem, IUDEVMAN* udevman, uint32 UsbDevice) +static int urbdrc_process_cancel_request(BYTE* data, UINT32 data_sizem, IUDEVMAN* udevman, UINT32 UsbDevice) { IUDEVICE* pdev; - uint32 CancelId; + UINT32 CancelId; int error = 0; - data_read_uint32(data + 0, CancelId); /** RequestId */ + data_read_UINT32(data + 0, CancelId); /** RequestId */ LLOGLN(urbdrc_debug, ("urbdrc_process_cancel_request: id 0x%x", CancelId)); @@ -177,12 +177,12 @@ static int urbdrc_process_cancel_request(BYTE* data, uint32 data_sizem, IUDEVMAN return error; } -static int urbdrc_process_retract_device_request(BYTE* data, uint32 data_sizem, IUDEVMAN* udevman, uint32 UsbDevice) +static int urbdrc_process_retract_device_request(BYTE* data, UINT32 data_sizem, IUDEVMAN* udevman, UINT32 UsbDevice) { - uint32 Reason; + UINT32 Reason; LLOGLN(urbdrc_debug, ("urbdrc_process_retract_device_request")); - data_read_uint32(data + 0, Reason); /** Reason */ + data_read_UINT32(data + 0, Reason); /** Reason */ switch (Reason) { @@ -201,26 +201,26 @@ static int urbdrc_process_retract_device_request(BYTE* data, uint32 data_sizem, } static int urbdrc_process_io_control(URBDRC_CHANNEL_CALLBACK* callback, BYTE* data, - uint32 data_sizem, uint32 MessageId, IUDEVMAN * udevman, uint32 UsbDevice) + UINT32 data_sizem, UINT32 MessageId, IUDEVMAN * udevman, UINT32 UsbDevice) { IUDEVICE* pdev; - uint32 out_size; - uint32 InterfaceId; - uint32 IoControlCode; - uint32 InputBufferSize; - uint32 OutputBufferSize; - uint32 RequestId; - uint32 usbd_status = USBD_STATUS_SUCCESS; + UINT32 out_size; + UINT32 InterfaceId; + UINT32 IoControlCode; + UINT32 InputBufferSize; + UINT32 OutputBufferSize; + UINT32 RequestId; + UINT32 usbd_status = USBD_STATUS_SUCCESS; BYTE* OutputBuffer; BYTE* out_data; int i, offset, success = 0; LLOGLN(urbdrc_debug, ("urbdrc_process__io_control")); - data_read_uint32(data + 0, IoControlCode); - data_read_uint32(data + 4, InputBufferSize); - data_read_uint32(data + 8 + InputBufferSize, OutputBufferSize); - data_read_uint32(data + 12 + InputBufferSize, RequestId); + data_read_UINT32(data + 0, IoControlCode); + data_read_UINT32(data + 4, InputBufferSize); + data_read_UINT32(data + 8 + InputBufferSize, OutputBufferSize); + data_read_UINT32(data + 12 + InputBufferSize, RequestId); pdev = udevman->get_udevice_by_UsbDevice(udevman, UsbDevice); @@ -253,7 +253,7 @@ static int urbdrc_process_io_control(URBDRC_CHANNEL_CALLBACK* callback, BYTE* da { if (pdev->isExist(pdev) == 0) { - data_write_uint32(OutputBuffer, 0); + data_write_UINT32(OutputBuffer, 0); } else { @@ -287,13 +287,13 @@ static int urbdrc_process_io_control(URBDRC_CHANNEL_CALLBACK* callback, BYTE* da out_size = offset + OutputBufferSize; out_data = (BYTE *) malloc(out_size); memset(out_data, 0, out_size); - data_write_uint32(out_data + 0, InterfaceId); /** interface */ - data_write_uint32(out_data + 4, MessageId); /** message id */ - data_write_uint32(out_data + 8, IOCONTROL_COMPLETION); /** function id */ - data_write_uint32(out_data + 12, RequestId); /** RequestId */ - data_write_uint32(out_data + 16, USBD_STATUS_SUCCESS); /** HResult */ - data_write_uint32(out_data + 20, OutputBufferSize); /** Information */ - data_write_uint32(out_data + 24, OutputBufferSize); /** OutputBufferSize */ + data_write_UINT32(out_data + 0, InterfaceId); /** interface */ + data_write_UINT32(out_data + 4, MessageId); /** message id */ + data_write_UINT32(out_data + 8, IOCONTROL_COMPLETION); /** function id */ + data_write_UINT32(out_data + 12, RequestId); /** RequestId */ + data_write_UINT32(out_data + 16, USBD_STATUS_SUCCESS); /** HResult */ + data_write_UINT32(out_data + 20, OutputBufferSize); /** Information */ + data_write_UINT32(out_data + 24, OutputBufferSize); /** OutputBufferSize */ for (i=0;iget_udevice_by_UsbDevice(udevman, UsbDevice); @@ -339,14 +339,14 @@ static int urbdrc_process_internal_io_control(URBDRC_CHANNEL_CALLBACK* callback, out_size = 32; out_data = (BYTE *) malloc(out_size); memset(out_data, 0, out_size); - data_write_uint32(out_data + 0, InterfaceId); /** interface */ - data_write_uint32(out_data + 4, MessageId); /** message id */ - data_write_uint32(out_data + 8, IOCONTROL_COMPLETION); /** function id */ - data_write_uint32(out_data + 12, RequestId); /** RequestId */ - data_write_uint32(out_data + 16, 0); /** HResult */ - data_write_uint32(out_data + 20, 4); /** Information */ - data_write_uint32(out_data + 24, 4); /** OutputBufferSize */ - data_write_uint32(out_data + 28, frames); /** OutputBuffer */ + data_write_UINT32(out_data + 0, InterfaceId); /** interface */ + data_write_UINT32(out_data + 4, MessageId); /** message id */ + data_write_UINT32(out_data + 8, IOCONTROL_COMPLETION); /** function id */ + data_write_UINT32(out_data + 12, RequestId); /** RequestId */ + data_write_UINT32(out_data + 16, 0); /** HResult */ + data_write_UINT32(out_data + 20, 4); /** Information */ + data_write_UINT32(out_data + 24, 4); /** OutputBufferSize */ + data_write_UINT32(out_data + 28, frames); /** OutputBuffer */ if (!pdev->isSigToEnd(pdev)) callback->channel->Write(callback->channel, out_size, out_data, NULL); @@ -357,22 +357,22 @@ static int urbdrc_process_internal_io_control(URBDRC_CHANNEL_CALLBACK* callback, } static int urbdrc_process_query_device_text(URBDRC_CHANNEL_CALLBACK* callback, BYTE* data, - uint32 data_sizem, uint32 MessageId, IUDEVMAN* udevman, uint32 UsbDevice) + UINT32 data_sizem, UINT32 MessageId, IUDEVMAN* udevman, UINT32 UsbDevice) { IUDEVICE* pdev; - uint32 out_size; - uint32 InterfaceId; - uint32 TextType; - uint32 LocaleId; - uint32 bufferSize = 1024; + UINT32 out_size; + UINT32 InterfaceId; + UINT32 TextType; + UINT32 LocaleId; + UINT32 bufferSize = 1024; BYTE* out_data; BYTE DeviceDescription[bufferSize]; int out_offset; LLOGLN(urbdrc_debug, ("urbdrc_process_query_device_text")); - data_read_uint32(data + 0, TextType); - data_read_uint32(data + 4, LocaleId); + data_read_UINT32(data + 0, TextType); + data_read_UINT32(data + 4, LocaleId); pdev = udevman->get_udevice_by_UsbDevice(udevman, UsbDevice); @@ -392,12 +392,12 @@ static int urbdrc_process_query_device_text(URBDRC_CHANNEL_CALLBACK* callback, B out_data = (BYTE*) malloc(out_size); memset(out_data, 0, out_size); - data_write_uint32(out_data + 0, InterfaceId); /** interface */ - data_write_uint32(out_data + 4, MessageId); /** message id */ + data_write_UINT32(out_data + 0, InterfaceId); /** interface */ + data_write_UINT32(out_data + 4, MessageId); /** message id */ if (bufferSize != 0) { - data_write_uint32(out_data + 8, (bufferSize/2)+1); /** cchDeviceDescription */ + data_write_UINT32(out_data + 8, (bufferSize/2)+1); /** cchDeviceDescription */ out_offset = 12; memcpy(out_data + out_offset, DeviceDescription, bufferSize); out_offset += bufferSize; @@ -406,11 +406,11 @@ static int urbdrc_process_query_device_text(URBDRC_CHANNEL_CALLBACK* callback, B } else { - data_write_uint32(out_data + 8, 0); /** cchDeviceDescription */ + data_write_UINT32(out_data + 8, 0); /** cchDeviceDescription */ out_offset = 12; } - data_write_uint32(out_data + out_offset, 0); /** HResult */ + data_write_UINT32(out_data + out_offset, 0); /** HResult */ if (!pdev->isSigToEnd(pdev)) callback->channel->Write(callback->channel, out_size, out_data, NULL); @@ -425,7 +425,7 @@ static void func_select_all_interface_for_msconfig(IUDEVICE* pdev, MSUSB_CONFIG_ int inum; MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces = MsConfig->MsInterfaces; BYTE InterfaceNumber, AlternateSetting; - uint32 NumInterfaces = MsConfig->NumInterfaces; + UINT32 NumInterfaces = MsConfig->NumInterfaces; for (inum = 0; inum < NumInterfaces; inum++) { @@ -436,11 +436,11 @@ static void func_select_all_interface_for_msconfig(IUDEVICE* pdev, MSUSB_CONFIG_ } static int urb_select_configuration(URBDRC_CHANNEL_CALLBACK* callback, BYTE* data, - uint32 data_sizem, uint32 MessageId, IUDEVMAN* udevman, uint32 UsbDevice, int transferDir) + UINT32 data_sizem, UINT32 MessageId, IUDEVMAN* udevman, UINT32 UsbDevice, int transferDir) { MSUSB_CONFIG_DESCRIPTOR * MsConfig = NULL; IUDEVICE* pdev = NULL; - uint32 out_size, InterfaceId, RequestId, NumInterfaces, usbd_status = 0; + UINT32 out_size, InterfaceId, RequestId, NumInterfaces, usbd_status = 0; BYTE ConfigurationDescriptorIsValid; BYTE* out_data; int MsOutSize = 0, offset = 0; @@ -457,9 +457,9 @@ static int urb_select_configuration(URBDRC_CHANNEL_CALLBACK* callback, BYTE* dat return 0; InterfaceId = ((STREAM_ID_PROXY<<30) | pdev->get_ReqCompletion(pdev)); - data_read_uint32(data + 0, RequestId); + data_read_UINT32(data + 0, RequestId); data_read_BYTE(data + 4, ConfigurationDescriptorIsValid); - data_read_uint32(data + 8, NumInterfaces); + data_read_UINT32(data + 8, NumInterfaces); offset = 12; /** if ConfigurationDescriptorIsValid is zero, then just do nothing.*/ @@ -484,26 +484,26 @@ static int urb_select_configuration(URBDRC_CHANNEL_CALLBACK* callback, BYTE* dat out_size = 44; out_data = (BYTE *) malloc(out_size); memset(out_data, 0, out_size); - data_write_uint32(out_data + 0, InterfaceId); /** interface */ - data_write_uint32(out_data + 4, MessageId); /** message id */ - data_write_uint32(out_data + 8, URB_COMPLETION_NO_DATA); /** function id */ - data_write_uint32(out_data + 12, RequestId); /** RequestId */ + data_write_UINT32(out_data + 0, InterfaceId); /** interface */ + data_write_UINT32(out_data + 4, MessageId); /** message id */ + data_write_UINT32(out_data + 8, URB_COMPLETION_NO_DATA); /** function id */ + data_write_UINT32(out_data + 12, RequestId); /** RequestId */ if (MsOutSize > 0) { /** CbTsUrbResult */ - data_write_uint32(out_data + 16, 8 + MsOutSize); + data_write_UINT32(out_data + 16, 8 + MsOutSize); /** TS_URB_RESULT_HEADER Size*/ data_write_UINT16(out_data + 20, 8 + MsOutSize); } else { - data_write_uint32(out_data + 16, 16); + data_write_UINT32(out_data + 16, 16); data_write_UINT16(out_data + 20, 16); } /** Padding, MUST be ignored upon receipt */ data_write_UINT16(out_data + 22, URB_FUNCTION_SELECT_CONFIGURATION); - data_write_uint32(out_data + 24, usbd_status); /** UsbdStatus */ + data_write_UINT32(out_data + 24, usbd_status); /** UsbdStatus */ offset = 28; /** TS_URB_SELECT_CONFIGURATION_RESULT */ if (MsOutSize > 0) @@ -512,12 +512,12 @@ static int urb_select_configuration(URBDRC_CHANNEL_CALLBACK* callback, BYTE* dat } else { - data_write_uint32(out_data + offset, 0); /** ConfigurationHandle */ - data_write_uint32(out_data + offset + 4, NumInterfaces); /** NumInterfaces */ + data_write_UINT32(out_data + offset, 0); /** ConfigurationHandle */ + data_write_UINT32(out_data + offset + 4, NumInterfaces); /** NumInterfaces */ offset += 8; } - data_write_uint32(out_data + offset, 0); /** HResult */ - data_write_uint32(out_data + offset + 4, 0); /** OutputBufferSize */ + data_write_UINT32(out_data + offset, 0); /** HResult */ + data_write_UINT32(out_data + offset + 4, 0); /** OutputBufferSize */ if (!pdev->isSigToEnd(pdev)) callback->channel->Write(callback->channel, out_size, out_data, NULL); @@ -525,14 +525,14 @@ static int urb_select_configuration(URBDRC_CHANNEL_CALLBACK* callback, BYTE* dat return 0; } -static int urb_select_interface(URBDRC_CHANNEL_CALLBACK* callback, BYTE* data, uint32 data_sizem, - uint32 MessageId, IUDEVMAN* udevman, uint32 UsbDevice, int transferDir) +static int urb_select_interface(URBDRC_CHANNEL_CALLBACK* callback, BYTE* data, UINT32 data_sizem, + UINT32 MessageId, IUDEVMAN* udevman, UINT32 UsbDevice, int transferDir) { MSUSB_CONFIG_DESCRIPTOR* MsConfig; MSUSB_INTERFACE_DESCRIPTOR* MsInterface; IUDEVICE* pdev; - uint32 out_size, InterfaceId, RequestId, ConfigurationHandle; - uint32 OutputBufferSize; + UINT32 out_size, InterfaceId, RequestId, ConfigurationHandle; + UINT32 OutputBufferSize; BYTE InterfaceNumber; BYTE* out_data; int out_offset, interface_size; @@ -550,13 +550,13 @@ static int urb_select_interface(URBDRC_CHANNEL_CALLBACK* callback, BYTE* data, u InterfaceId = ((STREAM_ID_PROXY << 30) | pdev->get_ReqCompletion(pdev)); - data_read_uint32(data + 0, RequestId); - data_read_uint32(data + 4, ConfigurationHandle); + data_read_UINT32(data + 0, RequestId); + data_read_UINT32(data + 4, ConfigurationHandle); out_offset = 8; MsInterface = msusb_msinterface_read(data + out_offset, data_sizem - out_offset, &out_offset); - data_read_uint32(data + out_offset, OutputBufferSize); + data_read_UINT32(data + out_offset, OutputBufferSize); pdev->select_interface(pdev, MsInterface->InterfaceNumber, MsInterface->AlternateSetting); @@ -574,23 +574,23 @@ static int urb_select_interface(URBDRC_CHANNEL_CALLBACK* callback, BYTE* data, u out_data = (BYTE*) malloc(out_size); memset(out_data, 0, out_size); - data_write_uint32(out_data + 0, InterfaceId); /** interface */ - data_write_uint32(out_data + 4, MessageId); /** message id */ - data_write_uint32(out_data + 8, URB_COMPLETION_NO_DATA); /** function id */ - data_write_uint32(out_data + 12, RequestId); /** RequestId */ - data_write_uint32(out_data + 16, 8 + interface_size); /** CbTsUrbResult */ + data_write_UINT32(out_data + 0, InterfaceId); /** interface */ + data_write_UINT32(out_data + 4, MessageId); /** message id */ + data_write_UINT32(out_data + 8, URB_COMPLETION_NO_DATA); /** function id */ + data_write_UINT32(out_data + 12, RequestId); /** RequestId */ + data_write_UINT32(out_data + 16, 8 + interface_size); /** CbTsUrbResult */ /** TS_URB_RESULT_HEADER */ data_write_UINT16(out_data + 20, 8 + interface_size); /** Size */ /** Padding, MUST be ignored upon receipt */ data_write_UINT16(out_data + 22, URB_FUNCTION_SELECT_INTERFACE); - data_write_uint32(out_data + 24, USBD_STATUS_SUCCESS); /** UsbdStatus */ + data_write_UINT32(out_data + 24, USBD_STATUS_SUCCESS); /** UsbdStatus */ out_offset = 28; /** TS_URB_SELECT_INTERFACE_RESULT */ msusb_msinterface_write(MsInterface, out_data + out_offset, &out_offset); - data_write_uint32(out_data + out_offset, 0); /** HResult */ - data_write_uint32(out_data + out_offset + 4, OutputBufferSize); /** OutputBufferSize */ + data_write_UINT32(out_data + out_offset, 0); /** HResult */ + data_write_UINT32(out_data + out_offset + 4, OutputBufferSize); /** OutputBufferSize */ if (!pdev->isSigToEnd(pdev)) callback->channel->Write(callback->channel, out_size, out_data, NULL); @@ -601,11 +601,11 @@ static int urb_select_interface(URBDRC_CHANNEL_CALLBACK* callback, BYTE* data, u } static int urb_control_transfer(URBDRC_CHANNEL_CALLBACK* callback, BYTE* data, - uint32 data_sizem, uint32 MessageId, IUDEVMAN* udevman, uint32 UsbDevice, int transferDir, int External) + UINT32 data_sizem, UINT32 MessageId, IUDEVMAN* udevman, UINT32 UsbDevice, int transferDir, int External) { IUDEVICE* pdev; - uint32 out_size, RequestId, InterfaceId, EndpointAddress, PipeHandle; - uint32 TransferFlags, OutputBufferSize, usbd_status, Timeout; + UINT32 out_size, RequestId, InterfaceId, EndpointAddress, PipeHandle; + UINT32 TransferFlags, OutputBufferSize, usbd_status, Timeout; BYTE bmRequestType, Request; UINT16 Value, Index, length; BYTE* buffer; @@ -618,9 +618,9 @@ static int urb_control_transfer(URBDRC_CHANNEL_CALLBACK* callback, BYTE* data, return 0; InterfaceId = ((STREAM_ID_PROXY << 30) | pdev->get_ReqCompletion(pdev)); - data_read_uint32(data + 0, RequestId); - data_read_uint32(data + 4, PipeHandle); - data_read_uint32(data + 8, TransferFlags); /** TransferFlags */ + data_read_UINT32(data + 0, RequestId); + data_read_UINT32(data + 4, PipeHandle); + data_read_UINT32(data + 8, TransferFlags); /** TransferFlags */ EndpointAddress = (PipeHandle & 0x000000ff); offset = 12; @@ -629,7 +629,7 @@ static int urb_control_transfer(URBDRC_CHANNEL_CALLBACK* callback, BYTE* data, switch (External) { case URB_CONTROL_TRANSFER_EXTERNAL: - data_read_uint32(data + offset, Timeout); /** TransferFlags */ + data_read_UINT32(data + offset, Timeout); /** TransferFlags */ offset += 4; break; case URB_CONTROL_TRANSFER_NONEXTERNAL: @@ -642,7 +642,7 @@ static int urb_control_transfer(URBDRC_CHANNEL_CALLBACK* callback, BYTE* data, data_read_UINT16(data + offset + 2, Value); data_read_UINT16(data + offset + 4, Index); data_read_UINT16(data + offset + 6, length); - data_read_uint32(data + offset + 8, OutputBufferSize); + data_read_UINT32(data + offset + 8, OutputBufferSize); offset += 12; if (length != OutputBufferSize) @@ -685,24 +685,24 @@ static int urb_control_transfer(URBDRC_CHANNEL_CALLBACK* callback, BYTE* data, else out_size = offset; - data_write_uint32(out_data + 0, InterfaceId); /** interface */ - data_write_uint32(out_data + 4, MessageId); /** message id */ + data_write_UINT32(out_data + 0, InterfaceId); /** interface */ + data_write_UINT32(out_data + 4, MessageId); /** message id */ if(transferDir == USBD_TRANSFER_DIRECTION_IN && OutputBufferSize != 0) - data_write_uint32(out_data + 8, URB_COMPLETION); /** function id */ + data_write_UINT32(out_data + 8, URB_COMPLETION); /** function id */ else - data_write_uint32(out_data + 8, URB_COMPLETION_NO_DATA); - data_write_uint32(out_data + 12, RequestId); /** RequestId */ - data_write_uint32(out_data + 16, 0x00000008); /** CbTsUrbResult */ + data_write_UINT32(out_data + 8, URB_COMPLETION_NO_DATA); + data_write_UINT32(out_data + 12, RequestId); /** RequestId */ + data_write_UINT32(out_data + 16, 0x00000008); /** CbTsUrbResult */ /** TsUrbResult TS_URB_RESULT_HEADER */ data_write_UINT16(out_data + 20, 0x0008); /** Size */ /** Padding, MUST be ignored upon receipt */ data_write_UINT16(out_data + 22, URB_FUNCTION_CONTROL_TRANSFER); - data_write_uint32(out_data + 24, usbd_status); /** UsbdStatus */ + data_write_UINT32(out_data + 24, usbd_status); /** UsbdStatus */ - data_write_uint32(out_data + 28, 0); /** HResult */ - data_write_uint32(out_data + 32, OutputBufferSize); /** OutputBufferSize */ + data_write_UINT32(out_data + 28, 0); /** HResult */ + data_write_UINT32(out_data + 32, OutputBufferSize); /** OutputBufferSize */ if (!pdev->isSigToEnd(pdev)) callback->channel->Write(callback->channel, out_size, out_data, NULL); @@ -713,11 +713,11 @@ static int urb_control_transfer(URBDRC_CHANNEL_CALLBACK* callback, BYTE* data, } static int urb_bulk_or_interrupt_transfer(URBDRC_CHANNEL_CALLBACK* callback, BYTE* data, - uint32 data_sizem, uint32 MessageId, IUDEVMAN* udevman, uint32 UsbDevice, int transferDir) + UINT32 data_sizem, UINT32 MessageId, IUDEVMAN* udevman, UINT32 UsbDevice, int transferDir) { IUDEVICE * pdev; - uint32 out_size, RequestId, InterfaceId, EndpointAddress, PipeHandle; - uint32 TransferFlags, OutputBufferSize, usbd_status = 0; + UINT32 out_size, RequestId, InterfaceId, EndpointAddress, PipeHandle; + UINT32 TransferFlags, OutputBufferSize, usbd_status = 0; BYTE * Buffer; BYTE * out_data; int offset; @@ -728,10 +728,10 @@ static int urb_bulk_or_interrupt_transfer(URBDRC_CHANNEL_CALLBACK* callback, BYT InterfaceId = ((STREAM_ID_PROXY<<30) | pdev->get_ReqCompletion(pdev)); - data_read_uint32(data + 0, RequestId); - data_read_uint32(data + 4, PipeHandle); - data_read_uint32(data + 8, TransferFlags); /** TransferFlags */ - data_read_uint32(data + 12, OutputBufferSize); + data_read_UINT32(data + 0, RequestId); + data_read_UINT32(data + 4, PipeHandle); + data_read_UINT32(data + 8, TransferFlags); /** TransferFlags */ + data_read_UINT32(data + 12, OutputBufferSize); offset = 16; EndpointAddress = (PipeHandle & 0x000000ff); @@ -767,23 +767,23 @@ static int urb_bulk_or_interrupt_transfer(URBDRC_CHANNEL_CALLBACK* callback, BYT else out_size = offset; /** send data */ - data_write_uint32(out_data + 0, InterfaceId); /** interface */ - data_write_uint32(out_data + 4, MessageId); /** message id */ + data_write_UINT32(out_data + 0, InterfaceId); /** interface */ + data_write_UINT32(out_data + 4, MessageId); /** message id */ if(transferDir == USBD_TRANSFER_DIRECTION_IN && OutputBufferSize != 0) - data_write_uint32(out_data + 8, URB_COMPLETION); /** function id */ + data_write_UINT32(out_data + 8, URB_COMPLETION); /** function id */ else - data_write_uint32(out_data + 8, URB_COMPLETION_NO_DATA); - data_write_uint32(out_data + 12, RequestId); /** RequestId */ - data_write_uint32(out_data + 16, 0x00000008); /** CbTsUrbResult */ + data_write_UINT32(out_data + 8, URB_COMPLETION_NO_DATA); + data_write_UINT32(out_data + 12, RequestId); /** RequestId */ + data_write_UINT32(out_data + 16, 0x00000008); /** CbTsUrbResult */ /** TsUrbResult TS_URB_RESULT_HEADER */ data_write_UINT16(out_data + 20, 0x0008); /** Size */ /** Padding, MUST be ignored upon receipt */ data_write_UINT16(out_data + 22, URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER); - data_write_uint32(out_data + 24, usbd_status); /** UsbdStatus */ + data_write_UINT32(out_data + 24, usbd_status); /** UsbdStatus */ - data_write_uint32(out_data + 28, 0); /** HResult */ - data_write_uint32(out_data + 32, OutputBufferSize); /** OutputBufferSize */ + data_write_UINT32(out_data + 28, 0); /** HResult */ + data_write_UINT32(out_data + 32, OutputBufferSize); /** OutputBufferSize */ if (pdev && !pdev->isSigToEnd(pdev)) callback->channel->Write(callback->channel, out_size, out_data, NULL); @@ -796,18 +796,18 @@ static int urb_bulk_or_interrupt_transfer(URBDRC_CHANNEL_CALLBACK* callback, BYT static int urb_isoch_transfer(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, - uint32 data_sizem, - uint32 MessageId, + UINT32 data_sizem, + UINT32 MessageId, IUDEVMAN * udevman, - uint32 UsbDevice, + UINT32 UsbDevice, int transferDir) { IUDEVICE * pdev; - uint32 RequestId, InterfaceId, EndpointAddress; - uint32 PipeHandle, TransferFlags, StartFrame, NumberOfPackets; - uint32 ErrorCount, OutputBufferSize, usbd_status = 0; - uint32 RequestField, noAck = 0; - uint32 out_size = 0; + UINT32 RequestId, InterfaceId, EndpointAddress; + UINT32 PipeHandle, TransferFlags, StartFrame, NumberOfPackets; + UINT32 ErrorCount, OutputBufferSize, usbd_status = 0; + UINT32 RequestField, noAck = 0; + UINT32 out_size = 0; BYTE * iso_buffer = NULL; BYTE * iso_packets = NULL; BYTE * out_data = NULL; @@ -820,17 +820,17 @@ urb_isoch_transfer(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, return 0; InterfaceId = ((STREAM_ID_PROXY<<30) | pdev->get_ReqCompletion(pdev)); - data_read_uint32(data + 0, RequestField); + data_read_UINT32(data + 0, RequestField); RequestId = RequestField & 0x7fffffff; noAck = (RequestField & 0x80000000)>>31; - data_read_uint32(data + 4, PipeHandle); + data_read_UINT32(data + 4, PipeHandle); EndpointAddress = (PipeHandle & 0x000000ff); - data_read_uint32(data + 8, TransferFlags); /** TransferFlags */ - data_read_uint32(data + 12, StartFrame); /** StartFrame */ - data_read_uint32(data + 16, NumberOfPackets); /** NumberOfPackets */ - data_read_uint32(data + 20, ErrorCount); /** ErrorCount */ + data_read_UINT32(data + 8, TransferFlags); /** TransferFlags */ + data_read_UINT32(data + 12, StartFrame); /** StartFrame */ + data_read_UINT32(data + 16, NumberOfPackets); /** NumberOfPackets */ + data_read_UINT32(data + 20, ErrorCount); /** ErrorCount */ offset = 24 + (NumberOfPackets * 12); - data_read_uint32(data + offset, OutputBufferSize); + data_read_UINT32(data + offset, OutputBufferSize); offset += 4; /** send data memory alloc */ @@ -908,37 +908,37 @@ urb_isoch_transfer(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, else out_size += OutputBufferSize + (NumberOfPackets * 12); /* fill the send data */ - data_write_uint32(out_data + 0, InterfaceId); /** interface */ - data_write_uint32(out_data + 4, MessageId); /** message id */ + data_write_UINT32(out_data + 0, InterfaceId); /** interface */ + data_write_UINT32(out_data + 4, MessageId); /** message id */ if(OutputBufferSize != 0 && !nullBuffer) - data_write_uint32(out_data + 8, URB_COMPLETION); /** function id */ + data_write_UINT32(out_data + 8, URB_COMPLETION); /** function id */ else - data_write_uint32(out_data + 8, URB_COMPLETION_NO_DATA); - data_write_uint32(out_data + 12, RequestId); /** RequestId */ - data_write_uint32(out_data + 16, 20 + (NumberOfPackets * 12)); /** CbTsUrbResult */ + data_write_UINT32(out_data + 8, URB_COMPLETION_NO_DATA); + data_write_UINT32(out_data + 12, RequestId); /** RequestId */ + data_write_UINT32(out_data + 16, 20 + (NumberOfPackets * 12)); /** CbTsUrbResult */ /** TsUrbResult TS_URB_RESULT_HEADER */ data_write_UINT16(out_data + 20, 20 + (NumberOfPackets * 12)); /** Size */ /** Padding, MUST be ignored upon receipt */ data_write_UINT16(out_data + 22, URB_FUNCTION_ISOCH_TRANSFER); - data_write_uint32(out_data + 24, usbd_status); /** UsbdStatus */ + data_write_UINT32(out_data + 24, usbd_status); /** UsbdStatus */ - data_write_uint32(out_data + 28, StartFrame); /** StartFrame */ + data_write_UINT32(out_data + 28, StartFrame); /** StartFrame */ if (!nullBuffer) { /** NumberOfPackets */ - data_write_uint32(out_data + 32, NumberOfPackets); - data_write_uint32(out_data + 36, ErrorCount); /** ErrorCount */ + data_write_UINT32(out_data + 32, NumberOfPackets); + data_write_UINT32(out_data + 36, ErrorCount); /** ErrorCount */ offset = 40 + (NumberOfPackets * 12); } else { - data_write_uint32(out_data + 32, 0); /** NumberOfPackets */ - data_write_uint32(out_data + 36, NumberOfPackets); /** ErrorCount */ + data_write_UINT32(out_data + 32, 0); /** NumberOfPackets */ + data_write_UINT32(out_data + 36, NumberOfPackets); /** ErrorCount */ offset = 40; } - data_write_uint32(out_data + offset, 0); /** HResult */ - data_write_uint32(out_data + offset + 4, OutputBufferSize); /** OutputBufferSize */ + data_write_UINT32(out_data + offset, 0); /** HResult */ + data_write_UINT32(out_data + offset + 4, OutputBufferSize); /** OutputBufferSize */ #if ISOCH_FIFO if(!noAck){ @@ -962,15 +962,15 @@ urb_isoch_transfer(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, static int urb_control_descriptor_request(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, - uint32 data_sizem, - uint32 MessageId, + UINT32 data_sizem, + UINT32 MessageId, IUDEVMAN * udevman, - uint32 UsbDevice, + UINT32 UsbDevice, BYTE func_recipient, int transferDir) { IUDEVICE * pdev; - uint32 out_size, InterfaceId, RequestId, OutputBufferSize, usbd_status; + UINT32 out_size, InterfaceId, RequestId, OutputBufferSize, usbd_status; BYTE bmRequestType, desc_index, desc_type; UINT16 langId; BYTE * buffer; @@ -981,11 +981,11 @@ urb_control_descriptor_request(URBDRC_CHANNEL_CALLBACK * callback, if (pdev == NULL) return 0; InterfaceId = ((STREAM_ID_PROXY<<30) | pdev->get_ReqCompletion(pdev)); - data_read_uint32(data + 0, RequestId); + data_read_UINT32(data + 0, RequestId); data_read_BYTE(data + 4, desc_index); data_read_BYTE(data + 5, desc_type); data_read_UINT16(data + 6, langId); - data_read_uint32(data + 8, OutputBufferSize); + data_read_UINT32(data + 8, OutputBufferSize); out_size = 36 + OutputBufferSize; out_data = (BYTE *) malloc(out_size); @@ -1031,18 +1031,18 @@ urb_control_descriptor_request(URBDRC_CHANNEL_CALLBACK * callback, offset = 36; out_size = offset + OutputBufferSize; - data_write_uint32(out_data + 0, InterfaceId); /** interface */ - data_write_uint32(out_data + 4, MessageId); /** message id */ - data_write_uint32(out_data + 8, URB_COMPLETION); /** function id */ - data_write_uint32(out_data + 12, RequestId); /** RequestId */ - data_write_uint32(out_data + 16, 0x00000008); /** CbTsUrbResult */ + data_write_UINT32(out_data + 0, InterfaceId); /** interface */ + data_write_UINT32(out_data + 4, MessageId); /** message id */ + data_write_UINT32(out_data + 8, URB_COMPLETION); /** function id */ + data_write_UINT32(out_data + 12, RequestId); /** RequestId */ + data_write_UINT32(out_data + 16, 0x00000008); /** CbTsUrbResult */ /** TsUrbResult TS_URB_RESULT_HEADER */ data_write_UINT16(out_data + 20, 0x0008); /** Size */ /** Padding, MUST be ignored upon receipt */ data_write_UINT16(out_data + 22, URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE); - data_write_uint32(out_data + 24, usbd_status); /** UsbdStatus */ - data_write_uint32(out_data + 28, 0); /** HResult */ - data_write_uint32(out_data + 32, OutputBufferSize); /** OutputBufferSize */ + data_write_UINT32(out_data + 24, usbd_status); /** UsbdStatus */ + data_write_UINT32(out_data + 28, 0); /** HResult */ + data_write_UINT32(out_data + 32, OutputBufferSize); /** OutputBufferSize */ if (!pdev->isSigToEnd(pdev)) callback->channel->Write(callback->channel, out_size, out_data, NULL); @@ -1056,15 +1056,15 @@ urb_control_descriptor_request(URBDRC_CHANNEL_CALLBACK * callback, static int urb_control_get_status_request(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, - uint32 data_sizem, - uint32 MessageId, + UINT32 data_sizem, + UINT32 MessageId, IUDEVMAN * udevman, - uint32 UsbDevice, + UINT32 UsbDevice, BYTE func_recipient, int transferDir) { IUDEVICE * pdev; - uint32 out_size, RequestId, InterfaceId, OutputBufferSize, usbd_status; + UINT32 out_size, RequestId, InterfaceId, OutputBufferSize, usbd_status; UINT16 Index; BYTE bmRequestType; BYTE * buffer; @@ -1081,9 +1081,9 @@ urb_control_get_status_request(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, return 0; InterfaceId = ((STREAM_ID_PROXY<<30) | pdev->get_ReqCompletion(pdev)); - data_read_uint32(data + 0, RequestId); + data_read_UINT32(data + 0, RequestId); data_read_UINT16(data + 4, Index); /** Index */ - data_read_uint32(data + 8, OutputBufferSize); + data_read_UINT32(data + 8, OutputBufferSize); out_size = 36 + OutputBufferSize; out_data = (BYTE *) malloc(out_size); @@ -1119,24 +1119,24 @@ urb_control_get_status_request(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, else out_size = offset; - data_write_uint32(out_data + 0, InterfaceId); /** interface */ - data_write_uint32(out_data + 4, MessageId); /** message id */ + data_write_UINT32(out_data + 0, InterfaceId); /** interface */ + data_write_UINT32(out_data + 4, MessageId); /** message id */ if(transferDir == USBD_TRANSFER_DIRECTION_IN && OutputBufferSize != 0) - data_write_uint32(out_data + 8, URB_COMPLETION); /** function id */ + data_write_UINT32(out_data + 8, URB_COMPLETION); /** function id */ else - data_write_uint32(out_data + 8, URB_COMPLETION_NO_DATA); + data_write_UINT32(out_data + 8, URB_COMPLETION_NO_DATA); - data_write_uint32(out_data + 12, RequestId); /** RequestId, include NoAck*/ - data_write_uint32(out_data + 16, 0x00000008); /** CbTsUrbResult */ + data_write_UINT32(out_data + 12, RequestId); /** RequestId, include NoAck*/ + data_write_UINT32(out_data + 16, 0x00000008); /** CbTsUrbResult */ /** TsUrbResult TS_URB_RESULT_HEADER */ data_write_UINT16(out_data + 20, 0x0008); /** Size */ /** Padding, MUST be ignored upon receipt */ data_write_UINT16(out_data + 22, URB_FUNCTION_VENDOR_DEVICE); - data_write_uint32(out_data + 24, usbd_status); /** UsbdStatus */ + data_write_UINT32(out_data + 24, usbd_status); /** UsbdStatus */ - data_write_uint32(out_data + 28, 0); /** HResult */ - data_write_uint32(out_data + 32, OutputBufferSize); /** OutputBufferSize */ + data_write_UINT32(out_data + 28, 0); /** HResult */ + data_write_UINT32(out_data + 32, OutputBufferSize); /** OutputBufferSize */ if (!pdev->isSigToEnd(pdev)) callback->channel->Write(callback->channel, out_size, out_data, NULL); @@ -1149,17 +1149,17 @@ urb_control_get_status_request(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, static int urb_control_vendor_or_class_request(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, - uint32 data_sizem, - uint32 MessageId, + UINT32 data_sizem, + UINT32 MessageId, IUDEVMAN * udevman, - uint32 UsbDevice, + UINT32 UsbDevice, BYTE func_type, BYTE func_recipient, int transferDir) { IUDEVICE * pdev; - uint32 out_size, RequestId, InterfaceId, TransferFlags, usbd_status; - uint32 OutputBufferSize; + UINT32 out_size, RequestId, InterfaceId, TransferFlags, usbd_status; + UINT32 OutputBufferSize; BYTE ReqTypeReservedBits, Request, bmRequestType; UINT16 Value, Index, Padding; BYTE * buffer; @@ -1172,14 +1172,14 @@ urb_control_vendor_or_class_request(URBDRC_CHANNEL_CALLBACK * callback, return 0; InterfaceId = ((STREAM_ID_PROXY<<30) | pdev->get_ReqCompletion(pdev)); - data_read_uint32(data + 0, RequestId); - data_read_uint32(data + 4, TransferFlags); /** TransferFlags */ + data_read_UINT32(data + 0, RequestId); + data_read_UINT32(data + 4, TransferFlags); /** TransferFlags */ data_read_BYTE(data + 8, ReqTypeReservedBits); /** ReqTypeReservedBids */ data_read_BYTE(data + 9, Request); /** Request */ data_read_UINT16(data + 10, Value); /** value */ data_read_UINT16(data + 12, Index); /** index */ data_read_UINT16(data + 14, Padding); /** Padding */ - data_read_uint32(data + 16, OutputBufferSize); + data_read_UINT32(data + 16, OutputBufferSize); offset = 20; out_size = 36 + OutputBufferSize; @@ -1229,23 +1229,23 @@ urb_control_vendor_or_class_request(URBDRC_CHANNEL_CALLBACK * callback, else out_size = offset; /** send data */ - data_write_uint32(out_data + 0, InterfaceId); /** interface */ - data_write_uint32(out_data + 4, MessageId); /** message id */ + data_write_UINT32(out_data + 0, InterfaceId); /** interface */ + data_write_UINT32(out_data + 4, MessageId); /** message id */ if(transferDir == USBD_TRANSFER_DIRECTION_IN && OutputBufferSize != 0) - data_write_uint32(out_data + 8, URB_COMPLETION); /** function id */ + data_write_UINT32(out_data + 8, URB_COMPLETION); /** function id */ else - data_write_uint32(out_data + 8, URB_COMPLETION_NO_DATA); + data_write_UINT32(out_data + 8, URB_COMPLETION_NO_DATA); - data_write_uint32(out_data + 12, RequestId); /** RequestId, include NoAck*/ - data_write_uint32(out_data + 16, 0x00000008); /** CbTsUrbResult */ + data_write_UINT32(out_data + 12, RequestId); /** RequestId, include NoAck*/ + data_write_UINT32(out_data + 16, 0x00000008); /** CbTsUrbResult */ /** TsUrbResult TS_URB_RESULT_HEADER */ data_write_UINT16(out_data + 20, 0x0008); /** Size */ data_write_UINT16(out_data + 22, URB_FUNCTION_VENDOR_DEVICE); /** Padding, MUST be ignored upon receipt */ - data_write_uint32(out_data + 24, usbd_status); /** UsbdStatus */ + data_write_UINT32(out_data + 24, usbd_status); /** UsbdStatus */ - data_write_uint32(out_data + 28, 0); /** HResult */ - data_write_uint32(out_data + 32, OutputBufferSize); /** OutputBufferSize */ + data_write_UINT32(out_data + 28, 0); /** HResult */ + data_write_UINT32(out_data + 32, OutputBufferSize); /** OutputBufferSize */ if (!pdev->isSigToEnd(pdev)) callback->channel->Write(callback->channel, out_size, out_data, NULL); @@ -1259,14 +1259,14 @@ urb_control_vendor_or_class_request(URBDRC_CHANNEL_CALLBACK * callback, static int urb_os_feature_descriptor_request(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, - uint32 data_sizem, - uint32 MessageId, + UINT32 data_sizem, + UINT32 MessageId, IUDEVMAN * udevman, - uint32 UsbDevice, + UINT32 UsbDevice, int transferDir) { IUDEVICE * pdev; - uint32 out_size, RequestId, InterfaceId, OutputBufferSize, usbd_status; + UINT32 out_size, RequestId, InterfaceId, OutputBufferSize, usbd_status; BYTE Recipient, InterfaceNumber, Ms_PageIndex; UINT16 Ms_featureDescIndex; BYTE * out_data; @@ -1278,13 +1278,13 @@ urb_os_feature_descriptor_request(URBDRC_CHANNEL_CALLBACK * callback, return 0; InterfaceId = ((STREAM_ID_PROXY<<30) | pdev->get_ReqCompletion(pdev)); - data_read_uint32(data + 0, RequestId); + data_read_UINT32(data + 0, RequestId); data_read_BYTE(data + 4, Recipient); /** Recipient */ Recipient = Recipient && 0x1f; data_read_BYTE(data + 5, InterfaceNumber); /** InterfaceNumber */ data_read_BYTE(data + 6, Ms_PageIndex); /** Ms_PageIndex */ data_read_UINT16(data + 7, Ms_featureDescIndex); /** Ms_featureDescIndex */ - data_read_uint32(data + 12, OutputBufferSize); + data_read_UINT32(data + 12, OutputBufferSize); offset = 16; out_size = 36 + OutputBufferSize; @@ -1325,23 +1325,23 @@ urb_os_feature_descriptor_request(URBDRC_CHANNEL_CALLBACK * callback, offset = 36; out_size = offset + OutputBufferSize; /** send data */ - data_write_uint32(out_data + 0, InterfaceId); /** interface */ - data_write_uint32(out_data + 4, MessageId); /** message id */ + data_write_UINT32(out_data + 0, InterfaceId); /** interface */ + data_write_UINT32(out_data + 4, MessageId); /** message id */ if(OutputBufferSize!=0) - data_write_uint32(out_data + 8, URB_COMPLETION); /** function id */ + data_write_UINT32(out_data + 8, URB_COMPLETION); /** function id */ else - data_write_uint32(out_data + 8, URB_COMPLETION_NO_DATA); - data_write_uint32(out_data + 12, RequestId); /** RequestId */ - data_write_uint32(out_data + 16, 0x00000008); /** CbTsUrbResult */ + data_write_UINT32(out_data + 8, URB_COMPLETION_NO_DATA); + data_write_UINT32(out_data + 12, RequestId); /** RequestId */ + data_write_UINT32(out_data + 16, 0x00000008); /** CbTsUrbResult */ /** TsUrbResult TS_URB_RESULT_HEADER */ data_write_UINT16(out_data + 20, 0x0008); /** Size */ /** Padding, MUST be ignored upon receipt */ data_write_UINT16(out_data + 22, URB_FUNCTION_GET_MS_FEATURE_DESCRIPTOR); - data_write_uint32(out_data + 24, usbd_status); /** UsbdStatus */ + data_write_UINT32(out_data + 24, usbd_status); /** UsbdStatus */ - data_write_uint32(out_data + 28, 0); /** HResult */ - data_write_uint32(out_data + 32, OutputBufferSize); /** OutputBufferSize */ + data_write_UINT32(out_data + 28, 0); /** HResult */ + data_write_UINT32(out_data + 32, OutputBufferSize); /** OutputBufferSize */ if (!pdev->isSigToEnd(pdev)) callback->channel->Write(callback->channel, out_size, out_data, NULL); @@ -1355,16 +1355,16 @@ urb_os_feature_descriptor_request(URBDRC_CHANNEL_CALLBACK * callback, static int urb_pipe_request(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, - uint32 data_sizem, - uint32 MessageId, + UINT32 data_sizem, + UINT32 MessageId, IUDEVMAN * udevman, - uint32 UsbDevice, + UINT32 UsbDevice, int transferDir, int action) { IUDEVICE * pdev; - uint32 out_size, RequestId, InterfaceId, PipeHandle, EndpointAddress; - uint32 OutputBufferSize, usbd_status = 0; + UINT32 out_size, RequestId, InterfaceId, PipeHandle, EndpointAddress; + UINT32 OutputBufferSize, usbd_status = 0; BYTE * out_data; int out_offset, ret; @@ -1378,9 +1378,9 @@ urb_pipe_request(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, return 0; InterfaceId = ((STREAM_ID_PROXY<<30) | pdev->get_ReqCompletion(pdev)); - data_read_uint32(data + 0, RequestId); - data_read_uint32(data + 4, PipeHandle); /** PipeHandle */ - data_read_uint32(data + 8, OutputBufferSize); + data_read_UINT32(data + 0, RequestId); + data_read_UINT32(data + 4, PipeHandle); /** PipeHandle */ + data_read_UINT32(data + 8, OutputBufferSize); EndpointAddress = (PipeHandle & 0x000000ff); @@ -1422,21 +1422,21 @@ urb_pipe_request(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, out_size = out_offset + OutputBufferSize; out_data = (BYTE *) malloc(out_size); memset(out_data, 0, out_size); - data_write_uint32(out_data + 0, InterfaceId); /** interface */ - data_write_uint32(out_data + 4, MessageId); /** message id */ + data_write_UINT32(out_data + 0, InterfaceId); /** interface */ + data_write_UINT32(out_data + 4, MessageId); /** message id */ - data_write_uint32(out_data + 8, URB_COMPLETION_NO_DATA); - data_write_uint32(out_data + 12, RequestId); /** RequestId */ - data_write_uint32(out_data + 16, 0x00000008); /** CbTsUrbResult */ + data_write_UINT32(out_data + 8, URB_COMPLETION_NO_DATA); + data_write_UINT32(out_data + 12, RequestId); /** RequestId */ + data_write_UINT32(out_data + 16, 0x00000008); /** CbTsUrbResult */ /** TsUrbResult TS_URB_RESULT_HEADER */ data_write_UINT16(out_data + 20, 0x0008); /** Size */ /** Padding, MUST be ignored upon receipt */ data_write_UINT16(out_data + 22, URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL); - data_write_uint32(out_data + 24, usbd_status); /** UsbdStatus */ + data_write_UINT32(out_data + 24, usbd_status); /** UsbdStatus */ - data_write_uint32(out_data + 28, 0); /** HResult */ - data_write_uint32(out_data + 32, 0); /** OutputBufferSize */ + data_write_UINT32(out_data + 28, 0); /** HResult */ + data_write_UINT32(out_data + 32, 0); /** OutputBufferSize */ if (!pdev->isSigToEnd(pdev)) callback->channel->Write(callback->channel, out_size, out_data, NULL); @@ -1450,15 +1450,15 @@ urb_pipe_request(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, static int urb_get_current_frame_number(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, - uint32 data_sizem, - uint32 MessageId, + UINT32 data_sizem, + UINT32 MessageId, IUDEVMAN * udevman, - uint32 UsbDevice, + UINT32 UsbDevice, int transferDir) { IUDEVICE * pdev; - uint32 out_size, RequestId, InterfaceId, OutputBufferSize; - uint32 dummy_frames; + UINT32 out_size, RequestId, InterfaceId, OutputBufferSize; + UINT32 dummy_frames; BYTE * out_data; if (transferDir == 0){ @@ -1472,8 +1472,8 @@ urb_get_current_frame_number(URBDRC_CHANNEL_CALLBACK * callback, return 0; InterfaceId = ((STREAM_ID_PROXY<<30) | pdev->get_ReqCompletion(pdev)); - data_read_uint32(data + 0, RequestId); - data_read_uint32(data + 4, OutputBufferSize); + data_read_UINT32(data + 0, RequestId); + data_read_UINT32(data + 4, OutputBufferSize); /** Fixme: Need to fill actual frame number!!*/ urbdrc_get_mstime(dummy_frames); @@ -1481,22 +1481,22 @@ urb_get_current_frame_number(URBDRC_CHANNEL_CALLBACK * callback, out_size = 40; out_data = (BYTE *) malloc(out_size); memset(out_data, 0, out_size); - data_write_uint32(out_data + 0, InterfaceId); /** interface */ - data_write_uint32(out_data + 4, MessageId); /** message id */ + data_write_UINT32(out_data + 0, InterfaceId); /** interface */ + data_write_UINT32(out_data + 4, MessageId); /** message id */ - data_write_uint32(out_data + 8, URB_COMPLETION_NO_DATA); - data_write_uint32(out_data + 12, RequestId); /** RequestId */ - data_write_uint32(out_data + 16, 12); /** CbTsUrbResult */ + data_write_UINT32(out_data + 8, URB_COMPLETION_NO_DATA); + data_write_UINT32(out_data + 12, RequestId); /** RequestId */ + data_write_UINT32(out_data + 16, 12); /** CbTsUrbResult */ /** TsUrbResult TS_URB_RESULT_HEADER */ data_write_UINT16(out_data + 20, 12); /** Size */ /** Padding, MUST be ignored upon receipt */ data_write_UINT16(out_data + 22, URB_FUNCTION_GET_CURRENT_FRAME_NUMBER); - data_write_uint32(out_data + 24, USBD_STATUS_SUCCESS); /** UsbdStatus */ - data_write_uint32(out_data + 28, dummy_frames); /** FrameNumber */ + data_write_UINT32(out_data + 24, USBD_STATUS_SUCCESS); /** UsbdStatus */ + data_write_UINT32(out_data + 28, dummy_frames); /** FrameNumber */ - data_write_uint32(out_data + 32, 0); /** HResult */ - data_write_uint32(out_data + 36, 0); /** OutputBufferSize */ + data_write_UINT32(out_data + 32, 0); /** HResult */ + data_write_UINT32(out_data + 36, 0); /** OutputBufferSize */ if (!pdev->isSigToEnd(pdev)) callback->channel->Write(callback->channel, out_size, out_data, NULL); @@ -1509,14 +1509,14 @@ urb_get_current_frame_number(URBDRC_CHANNEL_CALLBACK * callback, static int urb_control_get_configuration_request(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, - uint32 data_sizem, - uint32 MessageId, + UINT32 data_sizem, + UINT32 MessageId, IUDEVMAN * udevman, - uint32 UsbDevice, + UINT32 UsbDevice, int transferDir) { IUDEVICE * pdev; - uint32 out_size, RequestId, InterfaceId, OutputBufferSize, usbd_status; + UINT32 out_size, RequestId, InterfaceId, OutputBufferSize, usbd_status; BYTE * buffer; BYTE * out_data; int ret, offset; @@ -1532,8 +1532,8 @@ urb_control_get_configuration_request(URBDRC_CHANNEL_CALLBACK * callback, return 0; InterfaceId = ((STREAM_ID_PROXY<<30) | pdev->get_ReqCompletion(pdev)); - data_read_uint32(data + 0, RequestId); - data_read_uint32(data + 4, OutputBufferSize); + data_read_UINT32(data + 0, RequestId); + data_read_UINT32(data + 4, OutputBufferSize); out_size = 36 + OutputBufferSize; out_data = (BYTE *) malloc(out_size); @@ -1559,24 +1559,24 @@ urb_control_get_configuration_request(URBDRC_CHANNEL_CALLBACK * callback, offset = 36; out_size = offset + OutputBufferSize; - data_write_uint32(out_data + 0, InterfaceId); /** interface */ - data_write_uint32(out_data + 4, MessageId); /** message id */ + data_write_UINT32(out_data + 0, InterfaceId); /** interface */ + data_write_UINT32(out_data + 4, MessageId); /** message id */ if (OutputBufferSize != 0) - data_write_uint32(out_data + 8, URB_COMPLETION); + data_write_UINT32(out_data + 8, URB_COMPLETION); else - data_write_uint32(out_data + 8, URB_COMPLETION_NO_DATA); - data_write_uint32(out_data + 12, RequestId); /** RequestId */ - data_write_uint32(out_data + 16, 8); /** CbTsUrbResult */ + data_write_UINT32(out_data + 8, URB_COMPLETION_NO_DATA); + data_write_UINT32(out_data + 12, RequestId); /** RequestId */ + data_write_UINT32(out_data + 16, 8); /** CbTsUrbResult */ /** TsUrbResult TS_URB_RESULT_HEADER */ data_write_UINT16(out_data + 20, 8); /** Size */ /** Padding, MUST be ignored upon receipt */ data_write_UINT16(out_data + 22, URB_FUNCTION_GET_CONFIGURATION); - data_write_uint32(out_data + 24, usbd_status); /** UsbdStatus */ + data_write_UINT32(out_data + 24, usbd_status); /** UsbdStatus */ - data_write_uint32(out_data + 28, 0); /** HResult */ - data_write_uint32(out_data + 32, OutputBufferSize); /** OutputBufferSize */ + data_write_UINT32(out_data + 28, 0); /** HResult */ + data_write_UINT32(out_data + 32, OutputBufferSize); /** OutputBufferSize */ if (!pdev->isSigToEnd(pdev)) callback->channel->Write(callback->channel, out_size, out_data, NULL); @@ -1588,14 +1588,14 @@ urb_control_get_configuration_request(URBDRC_CHANNEL_CALLBACK * callback, static int urb_control_get_interface_request(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, - uint32 data_sizem, - uint32 MessageId, + UINT32 data_sizem, + UINT32 MessageId, IUDEVMAN * udevman, - uint32 UsbDevice, + UINT32 UsbDevice, int transferDir) { IUDEVICE * pdev; - uint32 out_size, RequestId, InterfaceId, OutputBufferSize, usbd_status; + UINT32 out_size, RequestId, InterfaceId, OutputBufferSize, usbd_status; UINT16 interface; BYTE * buffer; BYTE * out_data; @@ -1611,9 +1611,9 @@ urb_control_get_interface_request(URBDRC_CHANNEL_CALLBACK * callback, return 0; InterfaceId = ((STREAM_ID_PROXY<<30) | pdev->get_ReqCompletion(pdev)); - data_read_uint32(data + 0, RequestId); + data_read_UINT32(data + 0, RequestId); data_read_UINT16(data + 4, interface); - data_read_uint32(data + 8, OutputBufferSize); + data_read_UINT32(data + 8, OutputBufferSize); out_size = 36 + OutputBufferSize; out_data = (BYTE *) malloc(out_size); @@ -1637,24 +1637,24 @@ urb_control_get_interface_request(URBDRC_CHANNEL_CALLBACK * callback, offset = 36; out_size = offset + OutputBufferSize; - data_write_uint32(out_data + 0, InterfaceId); /** interface */ - data_write_uint32(out_data + 4, MessageId); /** message id */ + data_write_UINT32(out_data + 0, InterfaceId); /** interface */ + data_write_UINT32(out_data + 4, MessageId); /** message id */ if (OutputBufferSize != 0) - data_write_uint32(out_data + 8, URB_COMPLETION); + data_write_UINT32(out_data + 8, URB_COMPLETION); else - data_write_uint32(out_data + 8, URB_COMPLETION_NO_DATA); - data_write_uint32(out_data + 12, RequestId); /** RequestId */ - data_write_uint32(out_data + 16, 8); /** CbTsUrbResult */ + data_write_UINT32(out_data + 8, URB_COMPLETION_NO_DATA); + data_write_UINT32(out_data + 12, RequestId); /** RequestId */ + data_write_UINT32(out_data + 16, 8); /** CbTsUrbResult */ /** TsUrbResult TS_URB_RESULT_HEADER */ data_write_UINT16(out_data + 20, 8); /** Size */ /** Padding, MUST be ignored upon receipt */ data_write_UINT16(out_data + 22, URB_FUNCTION_GET_INTERFACE); - data_write_uint32(out_data + 24, usbd_status); /** UsbdStatus */ + data_write_UINT32(out_data + 24, usbd_status); /** UsbdStatus */ - data_write_uint32(out_data + 28, 0); /** HResult */ - data_write_uint32(out_data + 32, OutputBufferSize); /** OutputBufferSize */ + data_write_UINT32(out_data + 28, 0); /** HResult */ + data_write_UINT32(out_data + 32, OutputBufferSize); /** OutputBufferSize */ if (!pdev->isSigToEnd(pdev)) callback->channel->Write(callback->channel, out_size, out_data, NULL); @@ -1664,16 +1664,16 @@ urb_control_get_interface_request(URBDRC_CHANNEL_CALLBACK * callback, static int urb_control_feature_request(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, - uint32 data_sizem, - uint32 MessageId, + UINT32 data_sizem, + UINT32 MessageId, IUDEVMAN * udevman, - uint32 UsbDevice, + UINT32 UsbDevice, BYTE func_recipient, BYTE command, int transferDir) { IUDEVICE * pdev; - uint32 out_size, RequestId, InterfaceId, OutputBufferSize, usbd_status; + UINT32 out_size, RequestId, InterfaceId, OutputBufferSize, usbd_status; UINT16 FeatureSelector, Index; BYTE bmRequestType, bmRequest; BYTE * buffer; @@ -1685,10 +1685,10 @@ urb_control_feature_request(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, return 0; InterfaceId = ((STREAM_ID_PROXY<<30) | pdev->get_ReqCompletion(pdev)); - data_read_uint32(data + 0, RequestId); + data_read_UINT32(data + 0, RequestId); data_read_UINT16(data + 4, FeatureSelector); data_read_UINT16(data + 6, Index); - data_read_uint32(data + 8, OutputBufferSize); + data_read_UINT32(data + 8, OutputBufferSize); offset = 12; out_size = 36 + OutputBufferSize; @@ -1739,24 +1739,24 @@ urb_control_feature_request(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, offset = 36; out_size = offset + OutputBufferSize; - data_write_uint32(out_data + 0, InterfaceId); /** interface */ - data_write_uint32(out_data + 4, MessageId); /** message id */ + data_write_UINT32(out_data + 0, InterfaceId); /** interface */ + data_write_UINT32(out_data + 4, MessageId); /** message id */ if (OutputBufferSize != 0) - data_write_uint32(out_data + 8, URB_COMPLETION); + data_write_UINT32(out_data + 8, URB_COMPLETION); else - data_write_uint32(out_data + 8, URB_COMPLETION_NO_DATA); - data_write_uint32(out_data + 12, RequestId); /** RequestId */ - data_write_uint32(out_data + 16, 8); /** CbTsUrbResult */ + data_write_UINT32(out_data + 8, URB_COMPLETION_NO_DATA); + data_write_UINT32(out_data + 12, RequestId); /** RequestId */ + data_write_UINT32(out_data + 16, 8); /** CbTsUrbResult */ /** TsUrbResult TS_URB_RESULT_HEADER */ data_write_UINT16(out_data + 20, 8); /** Size */ /** Padding, MUST be ignored upon receipt */ data_write_UINT16(out_data + 22, URB_FUNCTION_GET_INTERFACE); - data_write_uint32(out_data + 24, usbd_status); /** UsbdStatus */ + data_write_UINT32(out_data + 24, usbd_status); /** UsbdStatus */ - data_write_uint32(out_data + 28, 0); /** HResult */ - data_write_uint32(out_data + 32, OutputBufferSize); /** OutputBufferSize */ + data_write_UINT32(out_data + 28, 0); /** HResult */ + data_write_UINT32(out_data + 32, OutputBufferSize); /** OutputBufferSize */ if (!pdev->isSigToEnd(pdev)) @@ -1767,26 +1767,26 @@ urb_control_feature_request(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, static int urbdrc_process_transfer_request(URBDRC_CHANNEL_CALLBACK * callback, BYTE * data, - uint32 data_sizem, - uint32 MessageId, + UINT32 data_sizem, + UINT32 MessageId, IUDEVMAN * udevman, - uint32 UsbDevice, + UINT32 UsbDevice, int transferDir) { IUDEVICE * pdev; - uint32 CbTsUrb; + UINT32 CbTsUrb; UINT16 Size; UINT16 URB_Function; - uint32 OutputBufferSize; + UINT32 OutputBufferSize; int error = 0; pdev = udevman->get_udevice_by_UsbDevice(udevman, UsbDevice); if (pdev == NULL) return 0; - data_read_uint32(data + 0, CbTsUrb); /** CbTsUrb */ + data_read_UINT32(data + 0, CbTsUrb); /** CbTsUrb */ data_read_UINT16(data + 4, Size); /** size */ data_read_UINT16(data + 6, URB_Function); - data_read_uint32(data + 4 + CbTsUrb, OutputBufferSize); + data_read_UINT32(data + 4 + CbTsUrb, OutputBufferSize); switch (URB_Function) { @@ -2303,11 +2303,11 @@ urbdrc_process_udev_data_transfer(void* arg) TRANSFER_DATA* transfer_data = (TRANSFER_DATA*) arg; URBDRC_CHANNEL_CALLBACK * callback = transfer_data->callback; BYTE * pBuffer = transfer_data->pBuffer; - uint32 cbSize = transfer_data->cbSize; - uint32 UsbDevice = transfer_data->UsbDevice; + UINT32 cbSize = transfer_data->cbSize; + UINT32 UsbDevice = transfer_data->UsbDevice; IUDEVMAN * udevman = transfer_data->udevman; - uint32 MessageId; - uint32 FunctionId; + UINT32 MessageId; + UINT32 FunctionId; IUDEVICE* pdev; int error = 0; pdev = udevman->get_udevice_by_UsbDevice(udevman, UsbDevice); @@ -2327,8 +2327,8 @@ urbdrc_process_udev_data_transfer(void* arg) /* USB kernel driver detach!! */ pdev->detach_kernel_driver(pdev); - data_read_uint32(pBuffer + 0, MessageId); - data_read_uint32(pBuffer + 4, FunctionId); + data_read_UINT32(pBuffer + 0, MessageId); + data_read_UINT32(pBuffer + 4, FunctionId); switch (FunctionId) { case CANCEL_REQUEST: diff --git a/channels/urbdrc/client/isoch_queue.h b/channels/urbdrc/client/isoch_queue.h index 0aacb1c2a..14e3b5cf3 100644 --- a/channels/urbdrc/client/isoch_queue.h +++ b/channels/urbdrc/client/isoch_queue.h @@ -35,7 +35,7 @@ struct _ISOCH_CALLBACK_DATA void * next; void * device; BYTE * out_data; - uint32 out_size; + UINT32 out_size; void * callback; }; diff --git a/channels/urbdrc/client/searchman.c b/channels/urbdrc/client/searchman.c index 12ee8b1cb..1d760c5da 100644 --- a/channels/urbdrc/client/searchman.c +++ b/channels/urbdrc/client/searchman.c @@ -180,7 +180,7 @@ void searchman_free(USB_SEARCHMAN* self) free(self); } -USB_SEARCHMAN* searchman_new(void * urbdrc, uint32 UsbDevice) +USB_SEARCHMAN* searchman_new(void * urbdrc, UINT32 UsbDevice) { int ret; USB_SEARCHMAN* searchman; diff --git a/channels/urbdrc/client/searchman.h b/channels/urbdrc/client/searchman.h index d83d17aa5..c6d20c511 100644 --- a/channels/urbdrc/client/searchman.h +++ b/channels/urbdrc/client/searchman.h @@ -38,7 +38,7 @@ typedef struct _USB_SEARCHMAN USB_SEARCHMAN; struct _USB_SEARCHMAN { int usb_numbers; - uint32 UsbDevice; + UINT32 UsbDevice; USB_SEARCHDEV * idev; /* iterator device */ USB_SEARCHDEV * head; /* head device in linked list */ USB_SEARCHDEV * tail; /* tail device in linked list */ @@ -71,7 +71,7 @@ struct _USB_SEARCHMAN void (*free) (USB_SEARCHMAN* searchman); }; -USB_SEARCHMAN * searchman_new(void * urbdrc, uint32 UsbDevice); +USB_SEARCHMAN * searchman_new(void * urbdrc, UINT32 UsbDevice); #endif diff --git a/channels/urbdrc/client/urbdrc_main.c b/channels/urbdrc/client/urbdrc_main.c index f5ce42e12..270b7ca1d 100644 --- a/channels/urbdrc/client/urbdrc_main.c +++ b/channels/urbdrc/client/urbdrc_main.c @@ -185,14 +185,14 @@ static void func_lock_isoch_mutex(TRANSFER_DATA* transfer_data) { int noAck = 0; IUDEVICE* pdev; - uint32 FunctionId; - uint32 RequestField; + UINT32 FunctionId; + UINT32 RequestField; UINT16 URB_Function; IUDEVMAN* udevman = transfer_data->udevman; if (transfer_data->cbSize >= 8) { - data_read_uint32(transfer_data->pBuffer + 4, FunctionId); + data_read_UINT32(transfer_data->pBuffer + 4, FunctionId); if ((FunctionId == TRANSFER_IN_REQUEST || FunctionId == TRANSFER_OUT_REQUEST) && @@ -203,7 +203,7 @@ static void func_lock_isoch_mutex(TRANSFER_DATA* transfer_data) if (URB_Function == URB_FUNCTION_ISOCH_TRANSFER && transfer_data->cbSize >= 20) { - data_read_uint32(transfer_data->pBuffer + 16, RequestField); + data_read_UINT32(transfer_data->pBuffer + 16, RequestField); noAck = (RequestField & 0x80000000)>>31; if (!noAck) @@ -218,66 +218,66 @@ static void func_lock_isoch_mutex(TRANSFER_DATA* transfer_data) #endif -static int urbdrc_process_capability_request(URBDRC_CHANNEL_CALLBACK* callback, char* data, uint32 data_sizem, uint32 MessageId) +static int urbdrc_process_capability_request(URBDRC_CHANNEL_CALLBACK* callback, char* data, UINT32 data_sizem, UINT32 MessageId) { - uint32 InterfaceId; - uint32 Version; - uint32 out_size; + UINT32 InterfaceId; + UINT32 Version; + UINT32 out_size; char * out_data; LLOGLN(10, ("urbdrc_process_capability_request")); - data_read_uint32(data + 0, Version); + data_read_UINT32(data + 0, Version); InterfaceId = ((STREAM_ID_NONE<<30) | CAPABILITIES_NEGOTIATOR); out_size = 16; out_data = (char *) malloc(out_size); memset(out_data, 0, out_size); - data_write_uint32(out_data + 0, InterfaceId); /* interface id */ - data_write_uint32(out_data + 4, MessageId); /* message id */ - data_write_uint32(out_data + 8, Version); /* usb protocol version */ - data_write_uint32(out_data + 12, 0x00000000); /* HRESULT */ + data_write_UINT32(out_data + 0, InterfaceId); /* interface id */ + data_write_UINT32(out_data + 4, MessageId); /* message id */ + data_write_UINT32(out_data + 8, Version); /* usb protocol version */ + data_write_UINT32(out_data + 12, 0x00000000); /* HRESULT */ callback->channel->Write(callback->channel, out_size, (BYTE*) out_data, NULL); zfree(out_data); return 0; } -static int urbdrc_process_channel_create(URBDRC_CHANNEL_CALLBACK* callback, char* data, uint32 data_sizem, uint32 MessageId) +static int urbdrc_process_channel_create(URBDRC_CHANNEL_CALLBACK* callback, char* data, UINT32 data_sizem, UINT32 MessageId) { - uint32 InterfaceId; - uint32 out_size; - uint32 MajorVersion; - uint32 MinorVersion; - uint32 Capabilities; + UINT32 InterfaceId; + UINT32 out_size; + UINT32 MajorVersion; + UINT32 MinorVersion; + UINT32 Capabilities; char* out_data; LLOGLN(10, ("urbdrc_process_channel_create")); - data_read_uint32(data + 0, MajorVersion); - data_read_uint32(data + 4, MinorVersion); - data_read_uint32(data + 8, Capabilities); + data_read_UINT32(data + 0, MajorVersion); + data_read_UINT32(data + 4, MinorVersion); + data_read_UINT32(data + 8, Capabilities); InterfaceId = ((STREAM_ID_PROXY<<30) | CLIENT_CHANNEL_NOTIFICATION); out_size = 24; out_data = (char *) malloc(out_size); memset(out_data, 0, out_size); - data_write_uint32(out_data + 0, InterfaceId); /* interface id */ - data_write_uint32(out_data + 4, MessageId); /* message id */ - data_write_uint32(out_data + 8, CHANNEL_CREATED); /* function id */ - data_write_uint32(out_data + 12, MajorVersion); - data_write_uint32(out_data + 16, MinorVersion); - data_write_uint32(out_data + 20, Capabilities); /* capabilities version */ + data_write_UINT32(out_data + 0, InterfaceId); /* interface id */ + data_write_UINT32(out_data + 4, MessageId); /* message id */ + data_write_UINT32(out_data + 8, CHANNEL_CREATED); /* function id */ + data_write_UINT32(out_data + 12, MajorVersion); + data_write_UINT32(out_data + 16, MinorVersion); + data_write_UINT32(out_data + 20, Capabilities); /* capabilities version */ callback->channel->Write(callback->channel, out_size, (BYTE *)out_data, NULL); zfree(out_data); return 0; } -static int urdbrc_send_virtual_channel_add(IWTSVirtualChannel* channel, uint32 MessageId) +static int urdbrc_send_virtual_channel_add(IWTSVirtualChannel* channel, UINT32 MessageId) { - uint32 out_size; - uint32 InterfaceId; + UINT32 out_size; + UINT32 InterfaceId; char* out_data; LLOGLN(10, ("urdbrc_send_virtual_channel_add")); @@ -287,9 +287,9 @@ static int urdbrc_send_virtual_channel_add(IWTSVirtualChannel* channel, uint32 M out_size = 12; out_data = (char *) malloc(out_size); memset(out_data, 0, out_size); - data_write_uint32(out_data + 0, InterfaceId); /* interface */ - data_write_uint32(out_data + 4, MessageId); /* message id */ - data_write_uint32(out_data + 8, ADD_VIRTUAL_CHANNEL); /* function id */ + data_write_UINT32(out_data + 0, InterfaceId); /* interface */ + data_write_UINT32(out_data + 4, MessageId); /* message id */ + data_write_UINT32(out_data + 8, ADD_VIRTUAL_CHANNEL); /* function id */ channel->Write(channel, out_size, (BYTE*) out_data, NULL); zfree(out_data); @@ -300,7 +300,7 @@ static int urdbrc_send_virtual_channel_add(IWTSVirtualChannel* channel, uint32 M static int urdbrc_send_usb_device_add(URBDRC_CHANNEL_CALLBACK* callback, IUDEVICE* pdev) { char* out_data; - uint32 InterfaceId; + UINT32 InterfaceId; char HardwareIds[2][DEVICE_HARDWARE_ID_SIZE]; char CompatibilityIds[3][DEVICE_COMPATIBILITY_ID_SIZE]; char strContainerId[DEVICE_CONTAINER_STR_SIZE]; @@ -343,16 +343,16 @@ static int urdbrc_send_usb_device_add(URBDRC_CHANNEL_CALLBACK* callback, IUDEVIC out_data = (char*) malloc(size); memset(out_data, 0, size); - data_write_uint32(out_data + 0, InterfaceId); /* interface */ - data_write_uint32(out_data + 4, 0); /* message id */ - data_write_uint32(out_data + 8, ADD_DEVICE); /* function id */ - data_write_uint32(out_data + 12, 0x00000001); /* NumUsbDevice */ - data_write_uint32(out_data + 16, pdev->get_UsbDevice(pdev)); /* UsbDevice */ - data_write_uint32(out_data + 20, 0x00000025); /* cchDeviceInstanceId */ + data_write_UINT32(out_data + 0, InterfaceId); /* interface */ + data_write_UINT32(out_data + 4, 0); /* message id */ + data_write_UINT32(out_data + 8, ADD_DEVICE); /* function id */ + data_write_UINT32(out_data + 12, 0x00000001); /* NumUsbDevice */ + data_write_UINT32(out_data + 16, pdev->get_UsbDevice(pdev)); /* UsbDevice */ + data_write_UINT32(out_data + 20, 0x00000025); /* cchDeviceInstanceId */ out_offset = fun_device_string_send_set(out_data, out_offset, strInstanceId); - data_write_uint32(out_data + out_offset, 0x00000036); /* cchHwIds */ + data_write_UINT32(out_data + out_offset, 0x00000036); /* cchHwIds */ out_offset += 4; /* HardwareIds 1 */ out_offset = fun_device_string_send_set(out_data, out_offset, HardwareIds[0]); @@ -361,7 +361,7 @@ static int urdbrc_send_usb_device_add(URBDRC_CHANNEL_CALLBACK* callback, IUDEVIC data_write_UINT16(out_data + out_offset, 0x0000); /* add "\0" */ out_offset += 2; - data_write_uint32(out_data + out_offset, cchCompatIds); /* cchCompatIds */ + data_write_UINT32(out_data + out_offset, cchCompatIds); /* cchCompatIds */ out_offset += 4; /* CompatibilityIds 1 */ out_offset = fun_device_string_send_set(out_data, out_offset, CompatibilityIds[0]); @@ -376,27 +376,27 @@ static int urdbrc_send_usb_device_add(URBDRC_CHANNEL_CALLBACK* callback, IUDEVIC data_write_UINT16(out_data + out_offset, 0x0000); /* add "\0" */ out_offset += 2; - data_write_uint32(out_data + out_offset, 0x00000027); /* cchContainerId */ + data_write_UINT32(out_data + out_offset, 0x00000027); /* cchContainerId */ out_offset += 4; /* ContainerId */ out_offset = fun_device_string_send_set(out_data, out_offset, strContainerId); /* USB_DEVICE_CAPABILITIES 28 bytes */ - data_write_uint32(out_data + out_offset, 0x0000001c); /* CbSize */ - data_write_uint32(out_data + out_offset + 4, 2); /* UsbBusInterfaceVersion, 0 ,1 or 2 */ - data_write_uint32(out_data + out_offset + 8, 0x600); /* USBDI_Version, 0x500 or 0x600 */ + data_write_UINT32(out_data + out_offset, 0x0000001c); /* CbSize */ + data_write_UINT32(out_data + out_offset + 4, 2); /* UsbBusInterfaceVersion, 0 ,1 or 2 */ + data_write_UINT32(out_data + out_offset + 8, 0x600); /* USBDI_Version, 0x500 or 0x600 */ /* Supported_USB_Version, 0x110,0x110 or 0x200(usb2.0) */ bcdUSB = pdev->query_device_descriptor(pdev, BCD_USB); - data_write_uint32(out_data + out_offset + 12, bcdUSB); - data_write_uint32(out_data + out_offset + 16, 0x00000000); /* HcdCapabilities, MUST always be zero */ + data_write_UINT32(out_data + out_offset + 12, bcdUSB); + data_write_UINT32(out_data + out_offset + 16, 0x00000000); /* HcdCapabilities, MUST always be zero */ if (bcdUSB < 0x200) - data_write_uint32(out_data + out_offset + 20, 0x00000000); /* DeviceIsHighSpeed */ + data_write_UINT32(out_data + out_offset + 20, 0x00000000); /* DeviceIsHighSpeed */ else - data_write_uint32(out_data + out_offset + 20, 0x00000001); /* DeviceIsHighSpeed */ + data_write_UINT32(out_data + out_offset + 20, 0x00000001); /* DeviceIsHighSpeed */ - data_write_uint32(out_data + out_offset + 24, 0x50); /* NoAckIsochWriteJitterBufferSizeInMs, >=10 or <=512 */ + data_write_UINT32(out_data + out_offset + 24, 0x50); /* NoAckIsochWriteJitterBufferSizeInMs, >=10 or <=512 */ out_offset += 28; callback->channel->Write(callback->channel, out_offset, (BYTE *)out_data, NULL); @@ -405,15 +405,15 @@ static int urdbrc_send_usb_device_add(URBDRC_CHANNEL_CALLBACK* callback, IUDEVIC return 0; } -static int urbdrc_exchange_capabilities(URBDRC_CHANNEL_CALLBACK* callback, char* pBuffer, uint32 cbSize) +static int urbdrc_exchange_capabilities(URBDRC_CHANNEL_CALLBACK* callback, char* pBuffer, UINT32 cbSize) { - uint32 MessageId; - uint32 FunctionId; + UINT32 MessageId; + UINT32 FunctionId; int error = 0; - data_read_uint32(pBuffer + 0, MessageId); - data_read_uint32(pBuffer + 4, FunctionId); + data_read_UINT32(pBuffer + 0, MessageId); + data_read_UINT32(pBuffer + 4, FunctionId); switch (FunctionId) { @@ -661,16 +661,16 @@ void* urbdrc_new_device_create(void * arg) BYTE* pBuffer = transfer_data->pBuffer; IUDEVMAN* udevman = transfer_data->udevman; IUDEVICE* pdev = NULL; - uint32 ChannelId = 0; - uint32 MessageId; - uint32 FunctionId; + UINT32 ChannelId = 0; + UINT32 MessageId; + UINT32 FunctionId; int i = 0, found = 0; channel_mgr = urbdrc->listener_callback->channel_mgr; ChannelId = channel_mgr->GetChannelId(callback->channel); - data_read_uint32(pBuffer + 0, MessageId); - data_read_uint32(pBuffer + 4, FunctionId); + data_read_UINT32(pBuffer + 0, MessageId); + data_read_UINT32(pBuffer + 4, FunctionId); int error = 0; @@ -728,15 +728,15 @@ void* urbdrc_new_device_create(void * arg) return 0; } -static int urbdrc_process_channel_notification(URBDRC_CHANNEL_CALLBACK* callback, char* pBuffer, uint32 cbSize) +static int urbdrc_process_channel_notification(URBDRC_CHANNEL_CALLBACK* callback, char* pBuffer, UINT32 cbSize) { int i, error = 0; - uint32 MessageId; - uint32 FunctionId; + UINT32 MessageId; + UINT32 FunctionId; URBDRC_PLUGIN* urbdrc = (URBDRC_PLUGIN*) callback->plugin; - data_read_uint32(pBuffer + 0, MessageId); - data_read_uint32(pBuffer + 4, FunctionId); + data_read_UINT32(pBuffer + 0, MessageId); + data_read_UINT32(pBuffer + 4, FunctionId); switch (FunctionId) { @@ -775,14 +775,14 @@ static int urbdrc_process_channel_notification(URBDRC_CHANNEL_CALLBACK* callback return error; } -static int urbdrc_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, uint32 cbSize, BYTE* Buffer) +static int urbdrc_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, UINT32 cbSize, BYTE* Buffer) { URBDRC_CHANNEL_CALLBACK* callback = (URBDRC_CHANNEL_CALLBACK*) pChannelCallback; URBDRC_PLUGIN* urbdrc; IUDEVMAN* udevman; - uint32 InterfaceTemp; - uint32 InterfaceId; - uint32 Mask; + UINT32 InterfaceTemp; + UINT32 InterfaceId; + UINT32 Mask; int error = 0; char* pBuffer = (char*) Buffer; @@ -799,7 +799,7 @@ static int urbdrc_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, udevman = (IUDEVMAN*) urbdrc->udevman; - data_read_uint32(pBuffer + 0, InterfaceTemp); + data_read_UINT32(pBuffer + 0, InterfaceTemp); InterfaceId = (InterfaceTemp & 0x0fffffff); Mask = ((InterfaceTemp & 0xf0000000)>>30); LLOGLN(10, ("urbdrc_on_data_received: Size=%d InterfaceId=0x%X Mask=0x%X", cbSize, InterfaceId, Mask)); @@ -861,7 +861,7 @@ static int urbdrc_on_close(IWTSVirtualChannelCallback * pChannelCallback) IUDEVMAN* udevman = (IUDEVMAN*) urbdrc->udevman; USB_SEARCHMAN* searchman = (USB_SEARCHMAN*) urbdrc->searchman; IUDEVICE* pdev = NULL; - uint32 ChannelId = 0; + UINT32 ChannelId = 0; int found = 0; ChannelId = callback->channel_mgr->GetChannelId(callback->channel); diff --git a/channels/urbdrc/client/urbdrc_main.h b/channels/urbdrc/client/urbdrc_main.h index 2a339714f..5e85306e6 100644 --- a/channels/urbdrc/client/urbdrc_main.h +++ b/channels/urbdrc/client/urbdrc_main.h @@ -72,8 +72,8 @@ struct _URBDRC_PLUGIN IUDEVMAN* udevman; USB_SEARCHMAN* searchman; - uint32 first_channel_id; - uint32 vchannel_status; + UINT32 first_channel_id; + UINT32 vchannel_status; }; #define URBDRC_UDEVMAN_EXPORT_FUNC_NAME "FreeRDPUDEVMANEntry" @@ -99,75 +99,75 @@ struct _TRANSFER_DATA URBDRC_PLUGIN* urbdrc; IUDEVMAN* udevman; BYTE* pBuffer; - uint32 cbSize; - uint32 UsbDevice; + UINT32 cbSize; + UINT32 UsbDevice; }; struct _IUDEVICE { /* Transfer */ - int (*isoch_transfer) (IUDEVICE * idev, uint32 RequestId, - uint32 EndpointAddress, - uint32 TransferFlags, + int (*isoch_transfer) (IUDEVICE * idev, UINT32 RequestId, + UINT32 EndpointAddress, + UINT32 TransferFlags, int NoAck, - uint32 *ErrorCount, - uint32 *UrbdStatus, - uint32 *StartFrame, - uint32 NumberOfPackets, + UINT32 *ErrorCount, + UINT32 *UrbdStatus, + UINT32 *StartFrame, + UINT32 NumberOfPackets, BYTE *IsoPacket, - uint32 *BufferSize, + UINT32 *BufferSize, BYTE *Buffer, int Timeout); - int (*control_transfer) (IUDEVICE * idev, uint32 RequestId, - uint32 EndpointAddress, - uint32 TransferFlags, + int (*control_transfer) (IUDEVICE * idev, UINT32 RequestId, + UINT32 EndpointAddress, + UINT32 TransferFlags, BYTE bmRequestType, BYTE Request, UINT16 Value, UINT16 Index, - uint32 *UrbdStatus, - uint32 *BufferSize, + UINT32 *UrbdStatus, + UINT32 *BufferSize, BYTE *Buffer, - uint32 Timeout); + UINT32 Timeout); - int (*bulk_or_interrupt_transfer) (IUDEVICE * idev, uint32 RequestId, - uint32 EndpointAddress, - uint32 TransferFlags, - uint32 *UsbdStatus, - uint32 *BufferSize, + int (*bulk_or_interrupt_transfer) (IUDEVICE * idev, UINT32 RequestId, + UINT32 EndpointAddress, + UINT32 TransferFlags, + UINT32 *UsbdStatus, + UINT32 *BufferSize, BYTE *Buffer, - uint32 Timeout); + UINT32 Timeout); - int (*select_configuration) (IUDEVICE * idev, uint32 bConfigurationValue); + int (*select_configuration) (IUDEVICE * idev, UINT32 bConfigurationValue); int (*select_interface) (IUDEVICE * idev, BYTE InterfaceNumber, BYTE AlternateSetting); - int (*control_pipe_request) (IUDEVICE * idev, uint32 RequestId, - uint32 EndpointAddress, - uint32 *UsbdStatus, + int (*control_pipe_request) (IUDEVICE * idev, UINT32 RequestId, + UINT32 EndpointAddress, + UINT32 *UsbdStatus, int command); - int (*control_query_device_text) (IUDEVICE * idev, uint32 TextType, - uint32 LocaleId, - uint32 *BufferSize, + int (*control_query_device_text) (IUDEVICE * idev, UINT32 TextType, + UINT32 LocaleId, + UINT32 *BufferSize, BYTE * Buffer); - int (*os_feature_descriptor_request) (IUDEVICE * idev, uint32 RequestId, + int (*os_feature_descriptor_request) (IUDEVICE * idev, UINT32 RequestId, BYTE Recipient, BYTE InterfaceNumber, BYTE Ms_PageIndex, UINT16 Ms_featureDescIndex, - uint32 * UsbdStatus, - uint32 * BufferSize, + UINT32 * UsbdStatus, + UINT32 * BufferSize, BYTE* Buffer, int Timeout); void (*cancel_all_transfer_request) (IUDEVICE * idev); - int (*cancel_transfer_request) (IUDEVICE * idev, uint32 RequestId); + int (*cancel_transfer_request) (IUDEVICE * idev, UINT32 RequestId); int (*query_device_descriptor) (IUDEVICE * idev, int offset); @@ -189,8 +189,8 @@ struct _IUDEVICE void (*lock_fifo_isoch) (IUDEVICE * idev); void (*unlock_fifo_isoch) (IUDEVICE * idev); - int (*query_device_port_status) (IUDEVICE * idev, uint32 *UsbdStatus, - uint32 * BufferSize, + int (*query_device_port_status) (IUDEVICE * idev, UINT32 *UsbdStatus, + UINT32 * BufferSize, BYTE * Buffer); int (*request_queue_is_none) (IUDEVICE * idev); @@ -208,9 +208,9 @@ struct _IUDEVICE void (*setChannelClosed) (IUDEVICE * idev); char *(*getPath) (IUDEVICE * idev); - BASIC_DEV_STATE_DEFINED(channel_id, uint32); - BASIC_DEV_STATE_DEFINED(UsbDevice, uint32); - BASIC_DEV_STATE_DEFINED(ReqCompletion, uint32); + BASIC_DEV_STATE_DEFINED(channel_id, UINT32); + BASIC_DEV_STATE_DEFINED(UsbDevice, UINT32); + BASIC_DEV_STATE_DEFINED(ReqCompletion, UINT32); BASIC_DEV_STATE_DEFINED(bus_number, UINT16); BASIC_DEV_STATE_DEFINED(dev_number, UINT16); BASIC_DEV_STATE_DEFINED(port_number, int); @@ -242,15 +242,15 @@ struct _IUDEVMAN int flag); IUDEVICE *(*get_next) (IUDEVMAN *idevman); IUDEVICE *(*get_udevice_by_UsbDevice) (IUDEVMAN * idevman, - uint32 UsbDevice); + UINT32 UsbDevice); IUDEVICE *(*get_udevice_by_UsbDevice_try_again) (IUDEVMAN * idevman, - uint32 UsbDevice); + UINT32 UsbDevice); /* Extension */ int (*check_device_exist_by_id) (IUDEVMAN * idevman, UINT16 idVendor, UINT16 idProduct); int (*isAutoAdd) (IUDEVMAN * idevman); /* Basic state */ - BASIC_DEVMAN_STATE_DEFINED(defUsbDevice, uint32); + BASIC_DEVMAN_STATE_DEFINED(defUsbDevice, UINT32); BASIC_DEVMAN_STATE_DEFINED(device_num, int); BASIC_DEVMAN_STATE_DEFINED(sem_timeout, int); /* control semaphore or mutex lock */ diff --git a/channels/urbdrc/libusb/libusb_udevice.c b/channels/urbdrc/libusb/libusb_udevice.c index e0a2da03c..894cd5a2a 100644 --- a/channels/urbdrc/libusb/libusb_udevice.c +++ b/channels/urbdrc/libusb/libusb_udevice.c @@ -62,9 +62,9 @@ struct _ISO_USER_DATA BYTE * output_data; int iso_status; int completed; - uint32 error_count; + UINT32 error_count; int noack; - uint32 start_frame; + UINT32 start_frame; }; static int @@ -155,9 +155,9 @@ func_iso_callback(struct libusb_transfer *transfer) ISO_USER_DATA * iso_user_data = (ISO_USER_DATA *) transfer->user_data; BYTE * data = iso_user_data->IsoPacket; int * completed = &iso_user_data->completed; - uint32 offset = 0; - uint32 index = 0; - uint32 i, act_len; + UINT32 offset = 0; + UINT32 index = 0; + UINT32 i, act_len; BYTE *b; *completed = 1; @@ -170,9 +170,9 @@ func_iso_callback(struct libusb_transfer *transfer) for (i = 0; i < transfer->num_iso_packets; i++) { act_len = transfer->iso_packet_desc[i].actual_length; - data_write_uint32(data + offset, index); - data_write_uint32(data + offset + 4, act_len); - data_write_uint32(data + offset + 8, + data_write_UINT32(data + offset, index); + data_write_UINT32(data + offset + 4, act_len); + data_write_UINT32(data + offset + 8, transfer->iso_packet_desc[i].status); offset += 12; if (transfer->iso_packet_desc[i].status == USBD_STATUS_SUCCESS) @@ -215,7 +215,7 @@ func_iso_callback(struct libusb_transfer *transfer) static const LIBUSB_ENDPOINT_DESCEIPTOR* func_get_ep_desc(LIBUSB_CONFIG_DESCRIPTOR * LibusbConfig, MSUSB_CONFIG_DESCRIPTOR * MsConfig, - uint32 EndpointAddress) + UINT32 EndpointAddress) { MSUSB_INTERFACE_DESCRIPTOR ** MsInterfaces; const LIBUSB_INTERFACE * interface; @@ -255,7 +255,7 @@ func_bulk_transfer_cb(struct libusb_transfer *transfer) static int -func_set_usbd_status(UDEVICE* pdev, uint32* status, int err_result) +func_set_usbd_status(UDEVICE* pdev, UINT32* status, int err_result) { switch (err_result) { @@ -319,8 +319,8 @@ func_set_usbd_status(UDEVICE* pdev, uint32* status, int err_result) static void -func_iso_data_init(ISO_USER_DATA * iso_user_data, uint32 numPacket, uint32 buffsize, - uint32 noAck, BYTE * isoPacket, BYTE * buffer) +func_iso_data_init(ISO_USER_DATA * iso_user_data, UINT32 numPacket, UINT32 buffsize, + UINT32 noAck, BYTE * isoPacket, BYTE * buffer) { /* init struct iso_user_data */ iso_user_data->IsoPacket = isoPacket; @@ -334,7 +334,7 @@ func_iso_data_init(ISO_USER_DATA * iso_user_data, uint32 numPacket, uint32 buffs static int -func_config_release_all_interface(LIBUSB_DEVICE_HANDLE *libusb_handle, uint32_t NumInterfaces) +func_config_release_all_interface(LIBUSB_DEVICE_HANDLE *libusb_handle, UINT32_t NumInterfaces) { int i, ret; for (i = 0; i < NumInterfaces; i++) @@ -774,7 +774,7 @@ libusb_udev_complete_msconfig_setup(IUDEVICE * idev, MSUSB_CONFIG_DESCRIPTOR * M static int -libusb_udev_select_configuration(IUDEVICE * idev, uint32 bConfigurationValue) +libusb_udev_select_configuration(IUDEVICE * idev, UINT32 bConfigurationValue) { UDEVICE * pdev = (UDEVICE *) idev; MSUSB_CONFIG_DESCRIPTOR * MsConfig = pdev->MsConfig; @@ -815,9 +815,9 @@ libusb_udev_select_configuration(IUDEVICE * idev, uint32 bConfigurationValue) static int -libusb_udev_control_pipe_request(IUDEVICE * idev, uint32 RequestId, - uint32 EndpointAddress, - uint32 *UsbdStatus, +libusb_udev_control_pipe_request(IUDEVICE * idev, UINT32 RequestId, + UINT32 EndpointAddress, + UINT32 *UsbdStatus, int command) { UDEVICE * pdev = (UDEVICE *) idev; @@ -863,9 +863,9 @@ libusb_udev_control_pipe_request(IUDEVICE * idev, uint32 RequestId, static int -libusb_udev_control_query_device_text(IUDEVICE * idev, uint32 TextType, - uint32 LocaleId, - uint32 * BufferSize, +libusb_udev_control_query_device_text(IUDEVICE * idev, UINT32 TextType, + UINT32 LocaleId, + UINT32 * BufferSize, BYTE * Buffer) { UDEVICE * pdev = (UDEVICE *) idev; @@ -929,13 +929,13 @@ libusb_udev_control_query_device_text(IUDEVICE * idev, uint32 TextType, static int -libusb_udev_os_feature_descriptor_request(IUDEVICE * idev, uint32 RequestId, +libusb_udev_os_feature_descriptor_request(IUDEVICE * idev, UINT32 RequestId, BYTE Recipient, BYTE InterfaceNumber, BYTE Ms_PageIndex, UINT16 Ms_featureDescIndex, - uint32 * UsbdStatus, - uint32 * BufferSize, + UINT32 * UsbdStatus, + UINT32 * BufferSize, BYTE* Buffer, int Timeout) { @@ -1203,8 +1203,8 @@ libusb_udev_unlock_fifo_isoch(IUDEVICE * idev) static int -libusb_udev_query_device_port_status(IUDEVICE * idev, uint32 *UsbdStatus, - uint32 * BufferSize, +libusb_udev_query_device_port_status(IUDEVICE * idev, UINT32 *UsbdStatus, + UINT32 * BufferSize, BYTE * Buffer) { UDEVICE * pdev = (UDEVICE *) idev; @@ -1249,22 +1249,22 @@ libusb_udev_request_queue_is_none(IUDEVICE * idev) static int -libusb_udev_isoch_transfer(IUDEVICE * idev, uint32 RequestId, uint32 EndpointAddress, - uint32 TransferFlags, +libusb_udev_isoch_transfer(IUDEVICE * idev, UINT32 RequestId, UINT32 EndpointAddress, + UINT32 TransferFlags, int NoAck, - uint32 *ErrorCount, - uint32 *UrbdStatus, - uint32 *StartFrame, - uint32 NumberOfPackets, + UINT32 *ErrorCount, + UINT32 *UrbdStatus, + UINT32 *StartFrame, + UINT32 NumberOfPackets, BYTE *IsoPacket, - uint32 *BufferSize, + UINT32 *BufferSize, BYTE *Buffer, int Timeout) { UDEVICE * pdev = (UDEVICE *) idev; ISO_USER_DATA iso_user_data; struct libusb_transfer * iso_transfer = NULL; - uint32 iso_packet_size; + UINT32 iso_packet_size; int error = 0, ret = 0, submit = 0; @@ -1344,16 +1344,16 @@ libusb_udev_isoch_transfer(IUDEVICE * idev, uint32 RequestId, uint32 EndpointAdd static int -libusb_udev_control_transfer(IUDEVICE * idev, uint32 RequestId, uint32 EndpointAddress, - uint32 TransferFlags, +libusb_udev_control_transfer(IUDEVICE * idev, UINT32 RequestId, UINT32 EndpointAddress, + UINT32 TransferFlags, BYTE bmRequestType, BYTE Request, UINT16 Value, UINT16 Index, - uint32 *UrbdStatus, - uint32 *BufferSize, + UINT32 *UrbdStatus, + UINT32 *BufferSize, BYTE *Buffer, - uint32 Timeout) + UINT32 Timeout) { UDEVICE * pdev = (UDEVICE *) idev; int error = 0; @@ -1381,19 +1381,19 @@ libusb_udev_control_transfer(IUDEVICE * idev, uint32 RequestId, uint32 EndpointA static int -libusb_udev_bulk_or_interrupt_transfer(IUDEVICE * idev, uint32 RequestId, - uint32 EndpointAddress, - uint32 TransferFlags, - uint32 *UsbdStatus, - uint32 *BufferSize, +libusb_udev_bulk_or_interrupt_transfer(IUDEVICE * idev, UINT32 RequestId, + UINT32 EndpointAddress, + UINT32 TransferFlags, + UINT32 *UsbdStatus, + UINT32 *BufferSize, BYTE *Buffer, - uint32 Timeout) + UINT32 Timeout) { UDEVICE * pdev = (UDEVICE *) idev; const LIBUSB_ENDPOINT_DESCEIPTOR * ep_desc; struct libusb_transfer * transfer = NULL; TRANSFER_REQUEST * request = NULL; - uint32 transfer_type; + UINT32 transfer_type; int completed = 0, ret = 0, submit = 0; int transferDir = EndpointAddress & 0x80; @@ -1601,7 +1601,7 @@ func_cancel_xact_request(TRANSFER_REQUEST *request) static int -libusb_udev_cancel_transfer_request(IUDEVICE * idev, uint32 RequestId) +libusb_udev_cancel_transfer_request(IUDEVICE * idev, UINT32 RequestId) { UDEVICE * pdev = (UDEVICE *) idev; REQUEST_QUEUE * request_queue = pdev->request_queue; @@ -1644,9 +1644,9 @@ cancel_retry: return 0; } -BASIC_STATE_FUNC_DEFINED(channel_id, uint32) -BASIC_STATE_FUNC_DEFINED(UsbDevice, uint32) -BASIC_STATE_FUNC_DEFINED(ReqCompletion, uint32) +BASIC_STATE_FUNC_DEFINED(channel_id, UINT32) +BASIC_STATE_FUNC_DEFINED(UsbDevice, UINT32) +BASIC_STATE_FUNC_DEFINED(ReqCompletion, UINT32) BASIC_STATE_FUNC_DEFINED(bus_number, UINT16) BASIC_STATE_FUNC_DEFINED(dev_number, UINT16) BASIC_STATE_FUNC_DEFINED(port_number, int) diff --git a/channels/urbdrc/libusb/libusb_udevice.h b/channels/urbdrc/libusb/libusb_udevice.h index df667b1f8..5bf8ad529 100644 --- a/channels/urbdrc/libusb/libusb_udevice.h +++ b/channels/urbdrc/libusb/libusb_udevice.h @@ -49,9 +49,9 @@ struct _UDEVICE void * prev; void * next; - uint32 UsbDevice; /* An unique interface ID */ - uint32 ReqCompletion; /* An unique interface ID */ - uint32 channel_id; + UINT32 UsbDevice; /* An unique interface ID */ + UINT32 ReqCompletion; /* An unique interface ID */ + UINT32 channel_id; UINT16 status; UINT16 bus_number; UINT16 dev_number; diff --git a/channels/urbdrc/libusb/libusb_udevman.c b/channels/urbdrc/libusb/libusb_udevman.c index c3e8b631f..eafb72f43 100644 --- a/channels/urbdrc/libusb/libusb_udevman.c +++ b/channels/urbdrc/libusb/libusb_udevman.c @@ -55,7 +55,7 @@ struct _UDEVMAN IUDEVICE* head; /* head device in linked list */ IUDEVICE* tail; /* tail device in linked list */ - uint32 defUsbDevice; + UINT32 defUsbDevice; UINT16 flags; int device_num; int sem_timeout; @@ -342,7 +342,7 @@ udevman_is_auto_add(IUDEVMAN * idevman) static IUDEVICE* -udevman_get_udevice_by_UsbDevice_try_again(IUDEVMAN * idevman, uint32 UsbDevice) +udevman_get_udevice_by_UsbDevice_try_again(IUDEVMAN * idevman, UINT32 UsbDevice) { UDEVICE * pdev; idevman->loading_lock(idevman); @@ -361,7 +361,7 @@ udevman_get_udevice_by_UsbDevice_try_again(IUDEVMAN * idevman, uint32 UsbDevice) } static IUDEVICE* -udevman_get_udevice_by_UsbDevice(IUDEVMAN * idevman, uint32 UsbDevice) +udevman_get_udevice_by_UsbDevice(IUDEVMAN * idevman, UINT32 UsbDevice) { UDEVICE * pdev; idevman->loading_lock(idevman); @@ -420,7 +420,7 @@ udevman_push_urb(IUDEVMAN * idevman) } -BASIC_STATE_FUNC_DEFINED(defUsbDevice, uint32) +BASIC_STATE_FUNC_DEFINED(defUsbDevice, UINT32) BASIC_STATE_FUNC_DEFINED(device_num, int) BASIC_STATE_FUNC_DEFINED(sem_timeout, int) @@ -474,7 +474,7 @@ int FreeRDPUDEVMANEntry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints) { UDEVMAN* udevman; RDP_PLUGIN_DATA * plugin_data = pEntryPoints->plugin_data; - uint32 UsbDevice = BASE_USBDEVICE_NUM; + UINT32 UsbDevice = BASE_USBDEVICE_NUM; char * token; char * message = "id"; char hardware_id[16]; diff --git a/channels/urbdrc/libusb/request_queue.c b/channels/urbdrc/libusb/request_queue.c index de959133e..6a560156a 100644 --- a/channels/urbdrc/libusb/request_queue.c +++ b/channels/urbdrc/libusb/request_queue.c @@ -48,7 +48,7 @@ request_queue_has_next(REQUEST_QUEUE* queue) } TRANSFER_REQUEST* -request_queue_register_request(REQUEST_QUEUE* queue, uint32 RequestId, +request_queue_register_request(REQUEST_QUEUE* queue, UINT32 RequestId, struct libusb_transfer * transfer, BYTE endpoint) { @@ -110,7 +110,7 @@ request_queue_get_request_by_endpoint(REQUEST_QUEUE *queue, BYTE ep) } int -request_queue_unregister_request(REQUEST_QUEUE *queue, uint32 RequestId) +request_queue_unregister_request(REQUEST_QUEUE *queue, UINT32 RequestId) { TRANSFER_REQUEST *request, *request_temp; pthread_mutex_lock(&queue->request_loading); diff --git a/channels/urbdrc/libusb/request_queue.h b/channels/urbdrc/libusb/request_queue.h index fc7ae4636..74fcf1169 100644 --- a/channels/urbdrc/libusb/request_queue.h +++ b/channels/urbdrc/libusb/request_queue.h @@ -32,7 +32,7 @@ struct _TRANSFER_REQUEST void* prev; void* next; - uint32 RequestId; + UINT32 RequestId; BYTE endpoint; struct libusb_transfer *transfer; int submit; @@ -51,11 +51,11 @@ struct _REQUEST_QUEUE /* request queue manager service */ void (*rewind) (REQUEST_QUEUE *queue); int (*has_next) (REQUEST_QUEUE* queue); - int (*unregister_request) (REQUEST_QUEUE *queue, uint32 RequestId); + int (*unregister_request) (REQUEST_QUEUE *queue, UINT32 RequestId); TRANSFER_REQUEST *(*get_next) (REQUEST_QUEUE* queue); TRANSFER_REQUEST *(*get_request_by_ep) (REQUEST_QUEUE *queue, BYTE ep); TRANSFER_REQUEST *(*register_request) (REQUEST_QUEUE* queue, - uint32 RequestId, struct libusb_transfer * transfer, BYTE endpoint); + UINT32 RequestId, struct libusb_transfer * transfer, BYTE endpoint); }; diff --git a/client/DirectFB/df_event.c b/client/DirectFB/df_event.c index 5f43fdd56..68d8d72cd 100644 --- a/client/DirectFB/df_event.c +++ b/client/DirectFB/df_event.c @@ -154,7 +154,7 @@ void df_keyboard_init() } -void df_send_mouse_button_event(rdpInput* input, BOOL down, uint32 button, UINT16 x, UINT16 y) +void df_send_mouse_button_event(rdpInput* input, BOOL down, UINT32 button, UINT16 x, UINT16 y) { UINT16 flags; diff --git a/client/DirectFB/dfreerdp.h b/client/DirectFB/dfreerdp.h index 741dd52d8..6b14bf997 100644 --- a/client/DirectFB/dfreerdp.h +++ b/client/DirectFB/dfreerdp.h @@ -47,8 +47,8 @@ struct df_pointer { rdpPointer pointer; IDirectFBSurface* surface; - uint32 xhot; - uint32 yhot; + UINT32 xhot; + UINT32 yhot; }; typedef struct df_pointer dfPointer; diff --git a/client/Mac/MRDPView.h b/client/Mac/MRDPView.h index 0ef740467..8007c330e 100644 --- a/client/Mac/MRDPView.h +++ b/client/Mac/MRDPView.h @@ -116,7 +116,7 @@ int process_plugin_args(rdpSettings* settings, const char* name, RDP_PLUGIN_DATA int receive_channel_data(freerdp *inst, int chan_id, BYTE *data, int size, int flags, int total_size); void process_cliprdr_event(freerdp *inst, RDP_EVENT *event); void cliprdr_process_cb_format_list_event(freerdp *inst, RDP_CB_FORMAT_LIST_EVENT* event); -void cliprdr_send_data_request(freerdp *inst, uint32 format); +void cliprdr_send_data_request(freerdp *inst, UINT32 format); void cliprdr_process_cb_monitor_ready_event(freerdp* inst); void cliprdr_process_cb_data_response_event(freerdp *inst, RDP_CB_DATA_RESPONSE_EVENT *event); void cliprdr_process_text(freerdp *inst, BYTE *data, int len); diff --git a/client/Windows/wf_gdi.c b/client/Windows/wf_gdi.c index 4e85ace89..c555ac1d7 100644 --- a/client/Windows/wf_gdi.c +++ b/client/Windows/wf_gdi.c @@ -115,7 +115,7 @@ BYTE* wf_glyph_convert(wfInfo* wfi, int width, int height, BYTE* data) return cdata; } -HBRUSH wf_create_brush(wfInfo * wfi, rdpBrush* brush, uint32 color, int bpp) +HBRUSH wf_create_brush(wfInfo * wfi, rdpBrush* brush, UINT32 color, int bpp) { int i; HBRUSH br; @@ -235,8 +235,8 @@ void wf_gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt) HBRUSH brush; HBRUSH org_brush; int org_bkmode; - uint32 fgcolor; - uint32 bgcolor; + UINT32 fgcolor; + UINT32 bgcolor; COLORREF org_bkcolor; COLORREF org_textcolor; wfInfo* wfi = ((wfContext*) context)->wfi; @@ -280,7 +280,7 @@ void wf_gdi_opaque_rect(rdpContext* context, OPAQUE_RECT_ORDER* opaque_rect) { RECT rect; HBRUSH brush; - uint32 brush_color; + UINT32 brush_color; wfInfo* wfi = ((wfContext*) context)->wfi; brush_color = freerdp_color_convert_var_bgr(opaque_rect->color, wfi->srcBpp, wfi->dstBpp, wfi->clrconv); @@ -302,7 +302,7 @@ void wf_gdi_multi_opaque_rect(rdpContext* context, MULTI_OPAQUE_RECT_ORDER* mult int i; RECT rect; HBRUSH brush; - uint32 brush_color; + UINT32 brush_color; DELTA_RECT* rectangle; wfInfo* wfi = ((wfContext*) context)->wfi; @@ -333,7 +333,7 @@ void wf_gdi_line_to(rdpContext* context, LINE_TO_ORDER* line_to) HPEN pen; HPEN org_pen; int x, y, w, h; - uint32 pen_color; + UINT32 pen_color; wfInfo* wfi = ((wfContext*) context)->wfi; pen_color = freerdp_color_convert_bgr(line_to->penColor, wfi->srcBpp, wfi->dstBpp, wfi->clrconv); @@ -365,7 +365,7 @@ void wf_gdi_polyline(rdpContext* context, POLYLINE_ORDER* polyline) int org_rop2; HPEN hpen; HPEN org_hpen; - uint32 pen_color; + UINT32 pen_color; wfInfo* wfi = ((wfContext*) context)->wfi; pen_color = freerdp_color_convert_bgr(polyline->penColor, wfi->srcBpp, wfi->dstBpp, wfi->clrconv); diff --git a/client/Windows/wf_rail.c b/client/Windows/wf_rail.c index f9425a2fb..900be237c 100644 --- a/client/Windows/wf_rail.c +++ b/client/Windows/wf_rail.c @@ -29,7 +29,7 @@ #include "wf_window.h" #include "wf_rail.h" -void wf_rail_paint(wfInfo* wfi, rdpRail* rail, sint32 uleft, sint32 utop, uint32 uright, uint32 ubottom) +void wf_rail_paint(wfInfo* wfi, rdpRail* rail, INT32 uleft, INT32 utop, UINT32 uright, UINT32 ubottom) { } @@ -37,7 +37,7 @@ void wf_rail_register_callbacks(wfInfo* wfi, rdpRail* rail) { } -void wf_rail_send_client_system_command(wfInfo* wfi, uint32 windowId, UINT16 command) +void wf_rail_send_client_system_command(wfInfo* wfi, UINT32 windowId, UINT16 command) { } diff --git a/client/Windows/wf_rail.h b/client/Windows/wf_rail.h index 671525136..fbbdb0c08 100644 --- a/client/Windows/wf_rail.h +++ b/client/Windows/wf_rail.h @@ -21,9 +21,9 @@ #include "wfreerdp.h" -void wf_rail_paint(wfInfo* wfi, rdpRail* rail, sint32 uleft, sint32 utop, uint32 uright, uint32 ubottom); +void wf_rail_paint(wfInfo* wfi, rdpRail* rail, INT32 uleft, INT32 utop, UINT32 uright, UINT32 ubottom); void wf_rail_register_callbacks(wfInfo* wfi, rdpRail* rail); -void wf_rail_send_client_system_command(wfInfo* wfi, uint32 windowId, UINT16 command); +void wf_rail_send_client_system_command(wfInfo* wfi, UINT32 windowId, UINT16 command); void wf_rail_send_activate(wfInfo* wfi, HWND window, BOOL enabled); void wf_process_rail_event(wfInfo* wfi, rdpChannels* chanman, RDP_EVENT* event); void wf_rail_adjust_position(wfInfo* wfi, rdpWindow *window); diff --git a/client/Windows/wfreerdp.c b/client/Windows/wfreerdp.c index e48c7b729..d9c371447 100644 --- a/client/Windows/wfreerdp.c +++ b/client/Windows/wfreerdp.c @@ -96,8 +96,8 @@ void wf_sw_end_paint(rdpContext* context) int i; rdpGdi* gdi; wfInfo* wfi; - sint32 x, y; - uint32 w, h; + INT32 x, y; + UINT32 w, h; int ninvalid; RECT update_rect; HGDI_RGN cinvalid; @@ -247,9 +247,9 @@ void cpuid(unsigned info, unsigned *eax, unsigned *ebx, unsigned *ecx, unsigned #endif } -uint32 wfi_detect_cpu() +UINT32 wfi_detect_cpu() { - uint32 cpu_opt = 0; + UINT32 cpu_opt = 0; unsigned int eax, ebx, ecx, edx = 0; cpuid(1, &eax, &ebx, &ecx, &edx); diff --git a/client/X11/xf_cliprdr.c b/client/X11/xf_cliprdr.c index 4c7bd88f5..67641fece 100644 --- a/client/X11/xf_cliprdr.c +++ b/client/X11/xf_cliprdr.c @@ -36,7 +36,7 @@ typedef struct clipboard_format_mapping clipboardFormatMapping; struct clipboard_format_mapping { Atom target_format; - uint32 format_id; + UINT32 format_id; }; typedef struct clipboard_context clipboardContext; @@ -52,13 +52,13 @@ struct clipboard_context int num_format_mappings; /* server->client data */ - uint32* formats; + UINT32* formats; int num_formats; Atom targets[20]; int num_targets; BYTE* data; - uint32 data_format; - uint32 data_alt_format; + UINT32 data_format; + UINT32 data_alt_format; int data_length; XEvent* respond; @@ -77,7 +77,7 @@ struct clipboard_context void xf_cliprdr_init(xfInfo* xfi, rdpChannels* chanman) { int n; - uint32 id; + UINT32 id; clipboardContext* cb; cb = xnew(clipboardContext); @@ -233,8 +233,8 @@ static void be2le(BYTE* data, int size) static BOOL xf_cliprdr_is_self_owned(xfInfo* xfi) { Atom type; - uint32 id = 0; - uint32* pid = NULL; + UINT32 id = 0; + UINT32* pid = NULL; int format, result = 0; unsigned long length, bytes_left; clipboardContext* cb = (clipboardContext*) xfi->clipboard_context; @@ -263,7 +263,7 @@ static BOOL xf_cliprdr_is_self_owned(xfInfo* xfi) return (id ? TRUE : FALSE); } -static int xf_cliprdr_select_format_by_id(clipboardContext* cb, uint32 format_id) +static int xf_cliprdr_select_format_by_id(clipboardContext* cb, UINT32 format_id) { int i; @@ -355,7 +355,7 @@ static void xf_cliprdr_send_supported_format_list(xfInfo* xfi) event = (RDP_CB_FORMAT_LIST_EVENT*) freerdp_event_new(RDP_EVENT_CLASS_CLIPRDR, RDP_EVENT_TYPE_CB_FORMAT_LIST, NULL, NULL); - event->formats = (uint32*) malloc(sizeof(uint32) * cb->num_format_mappings); + event->formats = (UINT32*) malloc(sizeof(UINT32) * cb->num_format_mappings); event->num_formats = cb->num_format_mappings; for (i = 0; i < cb->num_format_mappings; i++) @@ -384,7 +384,7 @@ static void xf_cliprdr_send_format_list(xfInfo* xfi) } } -static void xf_cliprdr_send_data_request(xfInfo* xfi, uint32 format) +static void xf_cliprdr_send_data_request(xfInfo* xfi, UINT32 format) { RDP_CB_DATA_REQUEST_EVENT* event; clipboardContext* cb = (clipboardContext*) xfi->clipboard_context; @@ -485,7 +485,7 @@ static void xf_cliprdr_get_requested_targets(xfInfo* xfi) event = (RDP_CB_FORMAT_LIST_EVENT*) freerdp_event_new(RDP_EVENT_CLASS_CLIPRDR, RDP_EVENT_TYPE_CB_FORMAT_LIST, NULL, NULL); - event->formats = (uint32*) malloc(sizeof(uint32) * cb->num_format_mappings); + event->formats = (UINT32*) malloc(sizeof(UINT32) * cb->num_format_mappings); num = 0; for (i = 0; i < length; i++) { @@ -886,8 +886,8 @@ static void xf_cliprdr_process_dib(clipboardContext* cb, BYTE* data, int size) { STREAM* s; UINT16 bpp; - uint32 offset; - uint32 ncolors; + UINT32 offset; + UINT32 ncolors; /* size should be at least sizeof(BITMAPINFOHEADER) */ if (size < 40) @@ -900,7 +900,7 @@ static void xf_cliprdr_process_dib(clipboardContext* cb, BYTE* data, int size) stream_attach(s, data, size); stream_seek(s, 14); stream_read_UINT16(s, bpp); - stream_read_uint32(s, ncolors); + stream_read_UINT32(s, ncolors); offset = 14 + 40 + (bpp <= 8 ? (ncolors == 0 ? (1 << bpp) : ncolors) * 4 : 0); stream_detach(s); stream_free(s); @@ -910,9 +910,9 @@ static void xf_cliprdr_process_dib(clipboardContext* cb, BYTE* data, int size) s = stream_new(14 + size); stream_write_BYTE(s, 'B'); stream_write_BYTE(s, 'M'); - stream_write_uint32(s, 14 + size); - stream_write_uint32(s, 0); - stream_write_uint32(s, offset); + stream_write_UINT32(s, 14 + size); + stream_write_UINT32(s, 0); + stream_write_UINT32(s, offset); stream_write(s, data, size); cb->data = stream_get_head(s); @@ -1068,9 +1068,9 @@ BOOL xf_cliprdr_process_selection_request(xfInfo* xfi, XEvent* xevent) int i; int fmt; Atom type; - uint32 format; + UINT32 format; XEvent* respond; - uint32 alt_format; + UINT32 alt_format; BYTE* data = NULL; BOOL delay_respond; unsigned long length, bytes_left; diff --git a/client/X11/xf_event.c b/client/X11/xf_event.c index 8183ef283..a70d9d295 100644 --- a/client/X11/xf_event.c +++ b/client/X11/xf_event.c @@ -534,7 +534,7 @@ static BOOL xf_event_ConfigureNotify(xfInfo* xfi, XEvent* event, BOOL app) xfw->bottom = xfw->top + xfw->height - 1; DEBUG_X11_LMS("window=0x%X rc={l=%d t=%d r=%d b=%d} w=%u h=%u send_event=%d", - (uint32) xfw->handle, xfw->left, xfw->top, xfw->right, xfw->bottom, + (UINT32) xfw->handle, xfw->left, xfw->top, xfw->right, xfw->bottom, xfw->width, xfw->height, event->xconfigure.send_event); /* additonal checks for not in a local move and not ignoring configure to send @@ -723,7 +723,7 @@ static BOOL xf_event_PropertyNotify(xfInfo* xfi, XEvent* event, BOOL app) else { //If the window is in the iconic state - if (((uint32) *prop == 3)) + if (((UINT32) *prop == 3)) { minimized = TRUE; } @@ -872,7 +872,7 @@ BOOL xf_event_process(freerdp* instance, XEvent* event) } if (event->type != MotionNotify) - DEBUG_X11("%s Event(%d): wnd=0x%04X", X11_EVENT_STRINGS[event->type], event->type, (uint32) event->xany.window); + DEBUG_X11("%s Event(%d): wnd=0x%04X", X11_EVENT_STRINGS[event->type], event->type, (UINT32) event->xany.window); switch (event->type) { diff --git a/client/X11/xf_gdi.c b/client/X11/xf_gdi.c index 68a8ab16a..d36eb6f5c 100644 --- a/client/X11/xf_gdi.c +++ b/client/X11/xf_gdi.c @@ -331,8 +331,8 @@ void xf_gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt) { Pixmap pattern; rdpBrush* brush; - uint32 foreColor; - uint32 backColor; + UINT32 foreColor; + UINT32 backColor; xfContext* context_ = (xfContext*) context; xfInfo* xfi = context_->xfi; @@ -440,7 +440,7 @@ void xf_gdi_scrblt(rdpContext* context, SCRBLT_ORDER* scrblt) void xf_gdi_opaque_rect(rdpContext* context, OPAQUE_RECT_ORDER* opaque_rect) { - uint32 color; + UINT32 color; xfContext* context_ = (xfContext*) context; xfInfo* xfi = context_->xfi; @@ -470,7 +470,7 @@ void xf_gdi_opaque_rect(rdpContext* context, OPAQUE_RECT_ORDER* opaque_rect) void xf_gdi_multi_opaque_rect(rdpContext* context, MULTI_OPAQUE_RECT_ORDER* multi_opaque_rect) { int i; - uint32 color; + UINT32 color; DELTA_RECT* rectangle; xfContext* context_ = (xfContext*) context; xfInfo* xfi = context_->xfi; @@ -509,7 +509,7 @@ void xf_gdi_draw_nine_grid(rdpContext* context, DRAW_NINE_GRID_ORDER* draw_nine_ void xf_gdi_line_to(rdpContext* context, LINE_TO_ORDER* line_to) { - uint32 color; + UINT32 color; xfContext* context_ = (xfContext*) context; xfInfo* xfi = context_->xfi; @@ -555,7 +555,7 @@ void xf_gdi_polyline(rdpContext* context, POLYLINE_ORDER* polyline) int x1, y1; int x2, y2; int npoints; - uint32 color; + UINT32 color; XPoint* points; int width, height; xfContext* context_ = (xfContext*) context; @@ -642,8 +642,8 @@ void xf_gdi_mem3blt(rdpContext* context, MEM3BLT_ORDER* mem3blt) { rdpBrush* brush; xfBitmap* bitmap; - uint32 foreColor; - uint32 backColor; + UINT32 foreColor; + UINT32 backColor; Pixmap pattern = 0; xfContext* context_ = (xfContext*) context; xfInfo* xfi = context_->xfi; @@ -717,7 +717,7 @@ void xf_gdi_polygon_sc(rdpContext* context, POLYGON_SC_ORDER* polygon_sc) { int i, npoints; XPoint* points; - uint32 brush_color; + UINT32 brush_color; xfInfo* xfi = ((xfContext*) context)->xfi; xf_set_rop2(xfi, polygon_sc->bRop2); @@ -772,8 +772,8 @@ void xf_gdi_polygon_cb(rdpContext* context, POLYGON_CB_ORDER* polygon_cb) XPoint* points; Pixmap pattern; rdpBrush* brush; - uint32 foreColor; - uint32 backColor; + UINT32 foreColor; + UINT32 backColor; xfInfo* xfi = ((xfContext*) context)->xfi; brush = &(polygon_cb->brush); diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c index 1ca83456c..f39aea11e 100644 --- a/client/X11/xf_graphics.c +++ b/client/X11/xf_graphics.c @@ -320,7 +320,7 @@ void xf_Glyph_Draw(rdpContext* context, rdpGlyph* glyph, int x, int y) XSetStipple(xfi->display, xfi->gc, xfi->bitmap_mono); } -void xf_Glyph_BeginDraw(rdpContext* context, int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor) +void xf_Glyph_BeginDraw(rdpContext* context, int x, int y, int width, int height, UINT32 bgcolor, UINT32 fgcolor) { xfContext* context_ = (xfContext*) context; xfInfo* xfi = context_->xfi; @@ -343,7 +343,7 @@ void xf_Glyph_BeginDraw(rdpContext* context, int x, int y, int width, int height XSetFillStyle(xfi->display, xfi->gc, FillStippled); } -void xf_Glyph_EndDraw(rdpContext* context, int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor) +void xf_Glyph_EndDraw(rdpContext* context, int x, int y, int width, int height, UINT32 bgcolor, UINT32 fgcolor) { xfInfo* xfi = ((xfContext*) context)->xfi; diff --git a/client/X11/xf_keyboard.c b/client/X11/xf_keyboard.c index 0463c57a4..ccd927b63 100644 --- a/client/X11/xf_keyboard.c +++ b/client/X11/xf_keyboard.c @@ -111,7 +111,7 @@ void xf_kbd_send_key(xfInfo* xfi, BOOL down, BYTE keycode) if ((rdp_scancode == RDP_SCANCODE_CAPSLOCK) && (down == FALSE)) { - uint32 syncFlags; + UINT32 syncFlags; syncFlags = xf_kbd_get_toggle_keys_state(xfi); input->SynchronizeEvent(input, syncFlags); } @@ -122,7 +122,7 @@ int xf_kbd_read_keyboard_state(xfInfo* xfi) { int dummy; Window wdummy; - uint32 state = 0; + UINT32 state = 0; if (xfi->remote_app != TRUE) { @@ -182,7 +182,7 @@ int xf_kbd_get_toggle_keys_state(xfInfo* xfi) void xf_kbd_focus_in(xfInfo* xfi) { rdpInput* input; - uint32 syncFlags; + UINT32 syncFlags; input = xfi->instance->input; diff --git a/client/X11/xf_rail.c b/client/X11/xf_rail.c index 2f64532f7..636d2f959 100644 --- a/client/X11/xf_rail.c +++ b/client/X11/xf_rail.c @@ -52,16 +52,16 @@ void xf_rail_disable_remoteapp_mode(xfInfo* xfi) } } -void xf_rail_paint(xfInfo* xfi, rdpRail* rail, sint32 uleft, sint32 utop, uint32 uright, uint32 ubottom) +void xf_rail_paint(xfInfo* xfi, rdpRail* rail, INT32 uleft, INT32 utop, UINT32 uright, UINT32 ubottom) { xfWindow* xfw; rdpWindow* window; BOOL intersect; - uint32 iwidth, iheight; - sint32 ileft, itop; - uint32 iright, ibottom; - sint32 wleft, wtop; - uint32 wright, wbottom; + UINT32 iwidth, iheight; + INT32 ileft, itop; + UINT32 iright, ibottom; + INT32 wleft, wtop; + UINT32 wright, wbottom; window_list_rewind(rail->list); @@ -284,7 +284,7 @@ void xf_rail_send_activate(xfInfo* xfi, Window xwindow, BOOL enabled) xf_send_rail_client_event(channels, RDP_EVENT_TYPE_RAIL_CLIENT_ACTIVATE, &activate); } -void xf_rail_send_client_system_command(xfInfo* xfi, uint32 windowId, UINT16 command) +void xf_rail_send_client_system_command(xfInfo* xfi, UINT32 windowId, UINT16 command) { rdpChannels* channels; RAIL_SYSCOMMAND_ORDER syscommand; @@ -325,8 +325,8 @@ void xf_rail_adjust_position(xfInfo* xfi, rdpWindow *window) //Although the rail server can give negative window coordinates when updating windowOffsetX and windowOffsetY, //we can only send unsigned integers to the rail server. Therefore, we always bring negative coordinates up to 0 when //attempting to adjust the rail window. - uint32 offsetX = 0; - uint32 offsetY = 0; + UINT32 offsetX = 0; + UINT32 offsetY = 0; if (window->windowOffsetX < 0) offsetX = offsetX - window->windowOffsetX; @@ -348,7 +348,7 @@ void xf_rail_adjust_position(xfInfo* xfi, rdpWindow *window) DEBUG_X11_LMS("window=0x%X rc={l=%d t=%d r=%d b=%d} w=%u h=%u" " RDP=0x%X rc={l=%d t=%d} w=%d h=%d", - (uint32) xfw->handle, window_move.left, window_move.top, + (UINT32) xfw->handle, window_move.left, window_move.top, window_move.right, window_move.bottom, xfw->width, xfw->height, window->windowId, window->windowOffsetX, window->windowOffsetY, @@ -375,15 +375,15 @@ void xf_rail_end_local_move(xfInfo* xfi, rdpWindow *window) channels = xfi->_context->channels; DEBUG_X11_LMS("window=0x%X rc={l=%d t=%d r=%d b=%d} w=%d h=%d", - (uint32) xfw->handle, + (UINT32) xfw->handle, xfw->left, xfw->top, xfw->right, xfw->bottom, xfw->width, xfw->height); //Although the rail server can give negative window coordinates when updating windowOffsetX and windowOffsetY, //we can only send unsigned integers to the rail server. Therefore, we always bring negative coordinates up to 0 when //attempting to adjust the rail window. - uint32 offsetX = 0; - uint32 offsetY = 0; + UINT32 offsetX = 0; + UINT32 offsetY = 0; if (window->windowOffsetX < 0) offsetX = offsetX - window->windowOffsetX; diff --git a/client/X11/xf_rail.h b/client/X11/xf_rail.h index d4cddc0b4..67c24791c 100644 --- a/client/X11/xf_rail.h +++ b/client/X11/xf_rail.h @@ -22,9 +22,9 @@ #include "xfreerdp.h" -void xf_rail_paint(xfInfo* xfi, rdpRail* rail, sint32 uleft, sint32 utop, uint32 uright, uint32 ubottom); +void xf_rail_paint(xfInfo* xfi, rdpRail* rail, INT32 uleft, INT32 utop, UINT32 uright, UINT32 ubottom); void xf_rail_register_callbacks(xfInfo* xfi, rdpRail* rail); -void xf_rail_send_client_system_command(xfInfo* xfi, uint32 windowId, UINT16 command); +void xf_rail_send_client_system_command(xfInfo* xfi, UINT32 windowId, UINT16 command); void xf_rail_send_activate(xfInfo* xfi, Window xwindow, BOOL enabled); void xf_process_rail_event(xfInfo* xfi, rdpChannels* chanman, RDP_EVENT* event); void xf_rail_adjust_position(xfInfo* xfi, rdpWindow *window); diff --git a/client/X11/xf_tsmf.c b/client/X11/xf_tsmf.c index d22da8552..5e59dda5b 100644 --- a/client/X11/xf_tsmf.c +++ b/client/X11/xf_tsmf.c @@ -53,7 +53,7 @@ struct xf_xv_context int xv_image_size; int xv_shmid; char* xv_shmaddr; - uint32* xv_pixfmts; + UINT32* xv_pixfmts; }; #ifdef WITH_DEBUG_XV @@ -142,7 +142,7 @@ void xf_tsmf_init(xfInfo* xfi, long xv_port) fo = XvListImageFormats(xfi->display, xv->xv_port, &ret); if (ret > 0) { - xv->xv_pixfmts = (uint32*) xzalloc((ret + 1) * sizeof(uint32)); + xv->xv_pixfmts = (UINT32*) xzalloc((ret + 1) * sizeof(UINT32)); for (i = 0; i < ret; i++) { xv->xv_pixfmts[i] = fo[i].id; @@ -181,7 +181,7 @@ void xf_tsmf_uninit(xfInfo* xfi) } static BOOL -xf_tsmf_is_format_supported(xfXvContext* xv, uint32 pixfmt) +xf_tsmf_is_format_supported(xfXvContext* xv, UINT32 pixfmt) { int i; @@ -202,8 +202,8 @@ static void xf_process_tsmf_video_frame_event(xfInfo* xfi, RDP_VIDEO_FRAME_EVENT int i; BYTE* data1; BYTE* data2; - uint32 pixfmt; - uint32 xvpixfmt; + UINT32 pixfmt; + UINT32 xvpixfmt; BOOL converti420yv12 = FALSE; XvImage * image; int colorkey = 0; diff --git a/client/X11/xf_window.c b/client/X11/xf_window.c index a2e489bbf..aa6070045 100644 --- a/client/X11/xf_window.c +++ b/client/X11/xf_window.c @@ -238,7 +238,7 @@ void xf_SetWindowUnlisted(xfInfo* xfi, xfWindow* window) XA_ATOM, 32, PropModeReplace, (BYTE*) &window_state, 2); } -void xf_SetWindowStyle(xfInfo* xfi, xfWindow* window, uint32 style, uint32 ex_style) +void xf_SetWindowStyle(xfInfo* xfi, xfWindow* window, UINT32 style, UINT32 ex_style) { Atom window_type; @@ -463,7 +463,7 @@ void xf_FixWindowCoordinates(xfInfo* xfi, int* x, int* y, int* width, int* heigh char rail_window_class[] = "RAIL:00000000"; -xfWindow* xf_CreateWindow(xfInfo* xfi, rdpWindow* wnd, int x, int y, int width, int height, uint32 id) +xfWindow* xf_CreateWindow(xfInfo* xfi, rdpWindow* wnd, int x, int y, int width, int height, UINT32 id) { XGCValues gcv; int input_mask; @@ -500,7 +500,7 @@ xfWindow* xf_CreateWindow(xfInfo* xfi, rdpWindow* wnd, int x, int y, int width, CWBorderPixel | CWWinGravity | CWBitGravity, &xfi->attribs); DEBUG_X11_LMS("Create window=0x%X rc={l=%d t=%d r=%d b=%d} w=%d h=%d rdp=0x%X", - (uint32) window->handle, window->left, window->top, window->right, window->bottom, + (UINT32) window->handle, window->left, window->top, window->right, window->bottom, window->width, window->height, wnd->windowId); memset(&gcv, 0, sizeof(gcv)); @@ -587,7 +587,7 @@ void xf_StartLocalMoveSize(xfInfo* xfi, xfWindow* window, int direction, int x, DEBUG_X11_LMS("direction=%d window=0x%X rc={l=%d t=%d r=%d b=%d} w=%d h=%d " "RDP=0x%X rc={l=%d t=%d} w=%d h=%d mouse_x=%d mouse_y=%d", - direction, (uint32) window->handle, + direction, (UINT32) window->handle, window->left, window->top, window->right, window->bottom, window->width, window->height, window->window->windowId, window->window->windowOffsetX, window->window->windowOffsetY, @@ -620,7 +620,7 @@ void xf_EndLocalMoveSize(xfInfo *xfi, xfWindow *window) DEBUG_X11_LMS("state=%d window=0x%X rc={l=%d t=%d r=%d b=%d} w=%d h=%d " "RDP=0x%X rc={l=%d t=%d} w=%d h=%d", window->local_move.state, - (uint32) window->handle, window->left, window->top, window->right, window->bottom, + (UINT32) window->handle, window->left, window->top, window->right, window->bottom, window->width, window->height, window->window->windowId, window->window->windowOffsetX, window->window->windowOffsetY, window->window->windowWidth, window->window->windowHeight); @@ -666,7 +666,7 @@ void xf_MoveWindow(xfInfo* xfi, xfWindow* window, int x, int y, int width, int h DEBUG_X11_LMS("window=0x%X rc={l=%d t=%d r=%d b=%d} w=%u h=%u " "new rc={l=%d t=%d r=%d b=%d} w=%u h=%u" " RDP=0x%X rc={l=%d t=%d} w=%d h=%d", - (uint32) window->handle, window->left, window->top, + (UINT32) window->handle, window->left, window->top, window->right, window->bottom, window->width, window->height, x, y, x + width -1, y + height -1, width, height, window->window->windowId, @@ -754,7 +754,7 @@ void xf_SetWindowIcon(xfInfo* xfi, xfWindow* window, rdpIcon* icon) int propsize; long* propdata; long* dstp; - uint32* srcp; + UINT32* srcp; if (icon->big != TRUE) return; @@ -766,7 +766,7 @@ void xf_SetWindowIcon(xfInfo* xfi, xfWindow* window, rdpIcon* icon) propdata[0] = icon->entry->width; propdata[1] = icon->entry->height; dstp = &(propdata[2]); - srcp = (uint32*) icon->extra; + srcp = (UINT32*) icon->extra; for (y = 0; y < icon->entry->height; y++) { diff --git a/client/X11/xf_window.h b/client/X11/xf_window.h index 4748b71c5..385c02cb7 100644 --- a/client/X11/xf_window.h +++ b/client/X11/xf_window.h @@ -93,14 +93,14 @@ void xf_SetWindowUnlisted(xfInfo* xfi, xfWindow* window); xfWindow* xf_CreateDesktopWindow(xfInfo* xfi, char* name, int width, int height, BOOL decorations); void xf_ResizeDesktopWindow(xfInfo* xfi, xfWindow* window, int width, int height); -xfWindow* xf_CreateWindow(xfInfo* xfi, rdpWindow* wnd, int x, int y, int width, int height, uint32 id); +xfWindow* xf_CreateWindow(xfInfo* xfi, rdpWindow* wnd, int x, int y, int width, int height, UINT32 id); void xf_SetWindowText(xfInfo *xfi, xfWindow* window, char *name); void xf_MoveWindow(xfInfo* xfi, xfWindow* window, int x, int y, int width, int height); void xf_ShowWindow(xfInfo* xfi, xfWindow* window, BYTE state); void xf_SetWindowIcon(xfInfo* xfi, xfWindow* window, rdpIcon* icon); void xf_SetWindowRects(xfInfo* xfi, xfWindow* window, RECTANGLE_16* rects, int nrects); void xf_SetWindowVisibilityRects(xfInfo* xfi, xfWindow* window, RECTANGLE_16* rects, int nrects); -void xf_SetWindowStyle(xfInfo* xfi, xfWindow* window, uint32 style, uint32 ex_style); +void xf_SetWindowStyle(xfInfo* xfi, xfWindow* window, UINT32 style, UINT32 ex_style); void xf_UpdateWindowArea(xfInfo* xfi, xfWindow* window, int x, int y, int width, int height); BOOL xf_IsWindowBorder(xfInfo* xfi, xfWindow* xfw, int x, int y); void xf_DestroyWindow(xfInfo* xfi, xfWindow* window); diff --git a/client/X11/xfreerdp.c b/client/X11/xfreerdp.c index f3251e872..2785fe9ac 100644 --- a/client/X11/xfreerdp.c +++ b/client/X11/xfreerdp.c @@ -109,8 +109,8 @@ void xf_sw_end_paint(rdpContext* context) { rdpGdi* gdi; xfInfo* xfi; - sint32 x, y; - uint32 w, h; + INT32 x, y; + UINT32 w, h; xfi = ((xfContext*) context)->xfi; gdi = context->gdi; @@ -204,8 +204,8 @@ void xf_hw_begin_paint(rdpContext* context) void xf_hw_end_paint(rdpContext* context) { xfInfo* xfi; - sint32 x, y; - uint32 w, h; + INT32 x, y; + UINT32 w, h; xfi = ((xfContext*) context)->xfi; @@ -646,10 +646,10 @@ void cpuid(unsigned info, unsigned *eax, unsigned *ebx, unsigned *ecx, unsigned #endif } -uint32 xf_detect_cpu() +UINT32 xf_detect_cpu() { unsigned int eax, ebx, ecx, edx = 0; - uint32 cpu_opt = 0; + UINT32 cpu_opt = 0; cpuid(1, &eax, &ebx, &ecx, &edx); @@ -670,7 +670,7 @@ uint32 xf_detect_cpu() BOOL xf_post_connect(freerdp* instance) { #ifdef WITH_SSE2 - uint32 cpu; + UINT32 cpu; #endif xfInfo* xfi; XGCValues gcv; @@ -691,7 +691,7 @@ BOOL xf_post_connect(freerdp* instance) if (xfi->sw_gdi) { rdpGdi* gdi; - uint32 flags; + UINT32 flags; flags = CLRCONV_ALPHA; @@ -1272,7 +1272,7 @@ void* thread_func(void* param) pthread_exit(NULL); } -static BYTE exit_code_from_disconnect_reason(uint32 reason) +static BYTE exit_code_from_disconnect_reason(UINT32 reason) { if (reason == 0 || (reason >= XF_EXIT_PARSE_ARGUMENTS && reason <= XF_EXIT_CONN_FAILED)) diff --git a/client/X11/xfreerdp.h b/client/X11/xfreerdp.h index 30d75e16c..19b739932 100644 --- a/client/X11/xfreerdp.h +++ b/client/X11/xfreerdp.h @@ -39,10 +39,10 @@ typedef struct xf_info xfInfo; struct xf_WorkArea { - uint32 x; - uint32 y; - uint32 width; - uint32 height; + UINT32 x; + UINT32 y; + UINT32 width; + UINT32 height; }; typedef struct xf_WorkArea xfWorkArea; @@ -130,7 +130,7 @@ struct xf_info BOOL mouse_motion; BOOL suppress_output; BOOL fullscreen_toggle; - uint32 keyboard_layout_id; + UINT32 keyboard_layout_id; BOOL pressed_keys[256]; XModifierKeymap* modifier_map; XSetWindowAttributes attribs; diff --git a/cunit/test_cliprdr.c b/cunit/test_cliprdr.c index 42b548aee..727d28681 100644 --- a/cunit/test_cliprdr.c +++ b/cunit/test_cliprdr.c @@ -143,7 +143,7 @@ void test_cliprdr(void) event = freerdp_event_new(RDP_EVENT_CLASS_CLIPRDR, RDP_EVENT_TYPE_CB_FORMAT_LIST, event_process_callback, NULL); format_list_event = (RDP_CB_FORMAT_LIST_EVENT*) event; format_list_event->num_formats = 2; - format_list_event->formats = (uint32*) malloc(sizeof(uint32) * 2); + format_list_event->formats = (UINT32*) malloc(sizeof(UINT32) * 2); format_list_event->formats[0] = CB_FORMAT_TEXT; format_list_event->formats[1] = CB_FORMAT_HTML; event_processed = 0; diff --git a/cunit/test_color.c b/cunit/test_color.c index 8d7a11f53..4a3a7978b 100644 --- a/cunit/test_color.c +++ b/cunit/test_color.c @@ -53,7 +53,7 @@ int add_color_suite(void) void test_color_GetRGB32(void) { int r, g, b; - uint32 rgb32 = 0x00AABBCC; + UINT32 rgb32 = 0x00AABBCC; GetRGB32(r, g, b, rgb32); CU_ASSERT(r == 0xAA); @@ -64,7 +64,7 @@ void test_color_GetRGB32(void) void test_color_GetBGR32(void) { int r, g, b; - uint32 bgr32 = 0x00CCBBAA; + UINT32 bgr32 = 0x00CCBBAA; GetBGR32(r, g, b, bgr32); CU_ASSERT(r == 0xAA); diff --git a/cunit/test_mppc.c b/cunit/test_mppc.c index 5912f951a..9c361c604 100644 --- a/cunit/test_mppc.c +++ b/cunit/test_mppc.c @@ -636,8 +636,8 @@ int add_mppc_suite(void) void test_mppc(void) { struct rdp_mppc_dec* rmppc; - uint32_t roff; - uint32_t rlen; + UINT32_t roff; + UINT32_t rlen; long int dur; struct timeval start_time; diff --git a/cunit/test_mppc_enc.c b/cunit/test_mppc_enc.c index bdafee7a1..fe49c0117 100644 --- a/cunit/test_mppc_enc.c +++ b/cunit/test_mppc_enc.c @@ -494,8 +494,8 @@ void test_mppc_enc(void) /* needed by decoder */ struct rdp_mppc_dec* rmppc; - uint32 roff; - uint32 rlen; + UINT32 roff; + UINT32 rlen; /* required for timing the test */ struct timeval start_time; diff --git a/cunit/test_pcap.c b/cunit/test_pcap.c index 51067a23d..1b2711ff5 100644 --- a/cunit/test_pcap.c +++ b/cunit/test_pcap.c @@ -58,7 +58,7 @@ BYTE test_packet_3[64] = typedef struct { void* data; - uint32 length; + UINT32 length; } test_packet; void test_pcap(void) diff --git a/cunit/test_rail.c b/cunit/test_rail.c index 8a4dab85d..f3fe4123f 100644 --- a/cunit/test_rail.c +++ b/cunit/test_rail.c @@ -411,7 +411,7 @@ typedef struct typedef struct { RAIL_ORDERS order_info; - uint32 event_type; + UINT32 event_type; } RAIL_EVENT; diff --git a/include/freerdp/altsec.h b/include/freerdp/altsec.h index f45821873..0eb67cbb5 100644 --- a/include/freerdp/altsec.h +++ b/include/freerdp/altsec.h @@ -38,129 +38,129 @@ struct _OFFSCREEN_DELETE_LIST { - uint32 sIndices; - uint32 cIndices; + UINT32 sIndices; + UINT32 cIndices; UINT16* indices; }; typedef struct _OFFSCREEN_DELETE_LIST OFFSCREEN_DELETE_LIST; struct _CREATE_OFFSCREEN_BITMAP_ORDER { - uint32 id; - uint32 cx; - uint32 cy; + UINT32 id; + UINT32 cx; + UINT32 cy; OFFSCREEN_DELETE_LIST deleteList; }; typedef struct _CREATE_OFFSCREEN_BITMAP_ORDER CREATE_OFFSCREEN_BITMAP_ORDER; struct _SWITCH_SURFACE_ORDER { - uint32 bitmapId; + UINT32 bitmapId; }; typedef struct _SWITCH_SURFACE_ORDER SWITCH_SURFACE_ORDER; struct _NINE_GRID_BITMAP_INFO { - uint32 flFlags; - uint32 ulLeftWidth; - uint32 ulRightWidth; - uint32 ulTopHeight; - uint32 ulBottomHeight; - uint32 crTransparent; + UINT32 flFlags; + UINT32 ulLeftWidth; + UINT32 ulRightWidth; + UINT32 ulTopHeight; + UINT32 ulBottomHeight; + UINT32 crTransparent; }; typedef struct _NINE_GRID_BITMAP_INFO NINE_GRID_BITMAP_INFO; struct _CREATE_NINE_GRID_BITMAP_ORDER { - uint32 bitmapBpp; - uint32 bitmapId; - uint32 cx; - uint32 cy; + 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; struct _FRAME_MARKER_ORDER { - uint32 action; + UINT32 action; }; typedef struct _FRAME_MARKER_ORDER FRAME_MARKER_ORDER; struct _STREAM_BITMAP_FIRST_ORDER { - uint32 bitmapFlags; - uint32 bitmapBpp; - uint32 bitmapType; - uint32 bitmapWidth; - uint32 bitmapHeight; - uint32 bitmapSize; - uint32 bitmapBlockSize; + UINT32 bitmapFlags; + UINT32 bitmapBpp; + UINT32 bitmapType; + UINT32 bitmapWidth; + UINT32 bitmapHeight; + UINT32 bitmapSize; + UINT32 bitmapBlockSize; BYTE* bitmapBlock; }; typedef struct _STREAM_BITMAP_FIRST_ORDER STREAM_BITMAP_FIRST_ORDER; struct _STREAM_BITMAP_NEXT_ORDER { - uint32 bitmapFlags; - uint32 bitmapType; - uint32 bitmapBlockSize; + UINT32 bitmapFlags; + UINT32 bitmapType; + UINT32 bitmapBlockSize; BYTE* bitmapBlock; }; typedef struct _STREAM_BITMAP_NEXT_ORDER STREAM_BITMAP_NEXT_ORDER; struct _DRAW_GDIPLUS_FIRST_ORDER { - uint32 cbSize; - uint32 cbTotalSize; - uint32 cbTotalEmfSize; + UINT32 cbSize; + UINT32 cbTotalSize; + UINT32 cbTotalEmfSize; BYTE* emfRecords; }; typedef struct _DRAW_GDIPLUS_FIRST_ORDER DRAW_GDIPLUS_FIRST_ORDER; struct _DRAW_GDIPLUS_NEXT_ORDER { - uint32 cbSize; + UINT32 cbSize; BYTE* emfRecords; }; typedef struct _DRAW_GDIPLUS_NEXT_ORDER DRAW_GDIPLUS_NEXT_ORDER; struct _DRAW_GDIPLUS_END_ORDER { - uint32 cbSize; - uint32 cbTotalSize; - uint32 cbTotalEmfSize; + UINT32 cbSize; + UINT32 cbTotalSize; + UINT32 cbTotalEmfSize; BYTE* emfRecords; }; typedef struct _DRAW_GDIPLUS_END_ORDER DRAW_GDIPLUS_END_ORDER; struct _DRAW_GDIPLUS_CACHE_FIRST_ORDER { - uint32 flags; - uint32 cacheType; - uint32 cacheIndex; - uint32 cbSize; - uint32 cbTotalSize; + UINT32 flags; + UINT32 cacheType; + UINT32 cacheIndex; + UINT32 cbSize; + UINT32 cbTotalSize; BYTE* emfRecords; }; typedef struct _DRAW_GDIPLUS_CACHE_FIRST_ORDER DRAW_GDIPLUS_CACHE_FIRST_ORDER; struct _DRAW_GDIPLUS_CACHE_NEXT_ORDER { - uint32 flags; - uint32 cacheType; - uint32 cacheIndex; - uint32 cbSize; + UINT32 flags; + UINT32 cacheType; + UINT32 cacheIndex; + UINT32 cbSize; BYTE* emfRecords; }; typedef struct _DRAW_GDIPLUS_CACHE_NEXT_ORDER DRAW_GDIPLUS_CACHE_NEXT_ORDER; struct _DRAW_GDIPLUS_CACHE_END_ORDER { - uint32 flags; - uint32 cacheType; - uint32 cacheIndex; - uint32 cbSize; - uint32 cbTotalSize; + UINT32 flags; + UINT32 cacheType; + UINT32 cacheIndex; + UINT32 cbSize; + UINT32 cbTotalSize; BYTE* emfRecords; }; typedef struct _DRAW_GDIPLUS_CACHE_END_ORDER DRAW_GDIPLUS_CACHE_END_ORDER; @@ -181,7 +181,7 @@ typedef void (*pDrawGdiPlusCacheEnd)(rdpContext* context, DRAW_GDIPLUS_CACHE_END struct rdp_altsec_update { rdpContext* context; /* 0 */ - uint32 paddingA[16 - 1]; /* 1 */ + UINT32 paddingA[16 - 1]; /* 1 */ pCreateOffscreenBitmap CreateOffscreenBitmap; /* 16 */ pSwitchSurface SwitchSurface; /* 17 */ @@ -195,7 +195,7 @@ struct rdp_altsec_update pDrawGdiPlusCacheFirst DrawGdiPlusCacheFirst; /* 25 */ pDrawGdiPlusCacheNext DrawGdiPlusCacheNext; /* 26 */ pDrawGdiPlusCacheEnd DrawGdiPlusCacheEnd; /* 27 */ - uint32 paddingB[32 - 28]; /* 28 */ + UINT32 paddingB[32 - 28]; /* 28 */ /* internal */ diff --git a/include/freerdp/cache/bitmap.h b/include/freerdp/cache/bitmap.h index 5d6ebe8f2..742184ab8 100644 --- a/include/freerdp/cache/bitmap.h +++ b/include/freerdp/cache/bitmap.h @@ -33,7 +33,7 @@ typedef struct rdp_bitmap_cache rdpBitmapCache; struct _BITMAP_V2_CELL { - uint32 number; + UINT32 number; rdpBitmap** entries; }; @@ -45,11 +45,11 @@ struct rdp_bitmap_cache pCacheBitmapV2 CacheBitmapV2; /* 3 */ pCacheBitmapV3 CacheBitmapV3; /* 4 */ pBitmapUpdate BitmapUpdate; /* 5 */ - uint32 paddingA[16 - 6]; /* 6 */ + UINT32 paddingA[16 - 6]; /* 6 */ - uint32 maxCells; /* 16 */ + UINT32 maxCells; /* 16 */ BITMAP_V2_CELL* cells; /* 17 */ - uint32 paddingB[32 - 18]; /* 18 */ + UINT32 paddingB[32 - 18]; /* 18 */ /* internal */ @@ -59,8 +59,8 @@ struct rdp_bitmap_cache rdpSettings* settings; }; -FREERDP_API rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmap_cache, uint32 id, uint32 index); -FREERDP_API void bitmap_cache_put(rdpBitmapCache* bitmap_cache, uint32 id, uint32 index, rdpBitmap* bitmap); +FREERDP_API rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmap_cache, UINT32 id, UINT32 index); +FREERDP_API void bitmap_cache_put(rdpBitmapCache* bitmap_cache, UINT32 id, UINT32 index, rdpBitmap* bitmap); FREERDP_API void bitmap_cache_register_callbacks(rdpUpdate* update); diff --git a/include/freerdp/cache/brush.h b/include/freerdp/cache/brush.h index 025f54a9f..046fce0e0 100644 --- a/include/freerdp/cache/brush.h +++ b/include/freerdp/cache/brush.h @@ -33,7 +33,7 @@ typedef struct rdp_brush_cache rdpBrushCache; struct _BRUSH_ENTRY { - uint32 bpp; + UINT32 bpp; void* entry; }; @@ -43,21 +43,21 @@ struct rdp_brush_cache pCacheBrush CacheBrush; /* 1 */ pPolygonSC PolygonSC; /* 2 */ pPolygonCB PolygonCB; /* 3 */ - uint32 paddingA[16 - 4]; /* 4 */ + UINT32 paddingA[16 - 4]; /* 4 */ - uint32 maxEntries; /* 16 */ - uint32 maxMonoEntries; /* 17 */ + UINT32 maxEntries; /* 16 */ + UINT32 maxMonoEntries; /* 17 */ BRUSH_ENTRY* entries; /* 18 */ BRUSH_ENTRY* monoEntries; /* 19 */ - uint32 paddingB[32 - 20]; /* 20 */ + UINT32 paddingB[32 - 20]; /* 20 */ /* internal */ rdpSettings* settings; }; -FREERDP_API void* brush_cache_get(rdpBrushCache* brush, uint32 index, uint32* bpp); -FREERDP_API void brush_cache_put(rdpBrushCache* brush, uint32 index, void* entry, uint32 bpp); +FREERDP_API void* brush_cache_get(rdpBrushCache* brush, UINT32 index, UINT32* bpp); +FREERDP_API void brush_cache_put(rdpBrushCache* brush, UINT32 index, void* entry, UINT32 bpp); FREERDP_API void brush_cache_register_callbacks(rdpUpdate* update); diff --git a/include/freerdp/cache/glyph.h b/include/freerdp/cache/glyph.h index 8cfaeab63..5468ea0d7 100644 --- a/include/freerdp/cache/glyph.h +++ b/include/freerdp/cache/glyph.h @@ -34,15 +34,15 @@ typedef struct rdp_glyph_cache rdpGlyphCache; struct _GLYPH_CACHE { - uint32 number; - uint32 maxCellSize; + UINT32 number; + UINT32 maxCellSize; rdpGlyph** entries; }; struct _FRAGMENT_CACHE_ENTRY { void* fragment; - uint32 size; + UINT32 size; }; struct _FRAGMENT_CACHE @@ -59,11 +59,11 @@ struct rdp_glyph_cache rdpSettings* settings; }; -FREERDP_API rdpGlyph* glyph_cache_get(rdpGlyphCache* glyph_cache, uint32 id, uint32 index); -FREERDP_API void glyph_cache_put(rdpGlyphCache* glyph_cache, uint32 id, uint32 index, rdpGlyph* entry); +FREERDP_API rdpGlyph* glyph_cache_get(rdpGlyphCache* glyph_cache, UINT32 id, UINT32 index); +FREERDP_API void glyph_cache_put(rdpGlyphCache* glyph_cache, UINT32 id, UINT32 index, rdpGlyph* entry); -FREERDP_API void* glyph_cache_fragment_get(rdpGlyphCache* glyph, uint32 index, uint32* count); -FREERDP_API void glyph_cache_fragment_put(rdpGlyphCache* glyph, uint32 index, uint32 count, void* entry); +FREERDP_API void* glyph_cache_fragment_get(rdpGlyphCache* glyph, UINT32 index, UINT32* count); +FREERDP_API void glyph_cache_fragment_put(rdpGlyphCache* glyph, UINT32 index, UINT32 count, void* entry); FREERDP_API void glyph_cache_register_callbacks(rdpUpdate* update); diff --git a/include/freerdp/cache/nine_grid.h b/include/freerdp/cache/nine_grid.h index 7786dd1cf..eab363c42 100644 --- a/include/freerdp/cache/nine_grid.h +++ b/include/freerdp/cache/nine_grid.h @@ -40,20 +40,20 @@ struct rdp_nine_grid_cache { pDrawNineGrid DrawNineGrid; /* 0 */ pMultiDrawNineGrid MultiDrawNineGrid; /* 1 */ - uint32 paddingA[16 - 2]; /* 2 */ + UINT32 paddingA[16 - 2]; /* 2 */ - uint32 maxEntries; /* 16 */ - uint32 maxSize; /* 17 */ + UINT32 maxEntries; /* 16 */ + UINT32 maxSize; /* 17 */ NINE_GRID_ENTRY* entries; /* 18 */ - uint32 paddingB[32 - 19]; /* 19 */ + UINT32 paddingB[32 - 19]; /* 19 */ /* internal */ rdpSettings* settings; }; -FREERDP_API void* nine_grid_cache_get(rdpNineGridCache* nine_grid, uint32 index); -FREERDP_API void nine_grid_cache_put(rdpNineGridCache* nine_grid, uint32 index, void* entry); +FREERDP_API void* nine_grid_cache_get(rdpNineGridCache* nine_grid, UINT32 index); +FREERDP_API void nine_grid_cache_put(rdpNineGridCache* nine_grid, UINT32 index, void* entry); FREERDP_API void nine_grid_cache_register_callbacks(rdpUpdate* update); diff --git a/include/freerdp/cache/offscreen.h b/include/freerdp/cache/offscreen.h index 12db818b4..046b93a5d 100644 --- a/include/freerdp/cache/offscreen.h +++ b/include/freerdp/cache/offscreen.h @@ -32,10 +32,10 @@ typedef struct rdp_offscreen_cache rdpOffscreenCache; struct rdp_offscreen_cache { - uint32 maxSize; /* 0 */ - uint32 maxEntries; /* 1 */ + UINT32 maxSize; /* 0 */ + UINT32 maxEntries; /* 1 */ rdpBitmap** entries; /* 2 */ - uint32 currentSurface; /* 3 */ + UINT32 currentSurface; /* 3 */ /* internal */ @@ -43,9 +43,9 @@ struct rdp_offscreen_cache rdpSettings* settings; }; -FREERDP_API rdpBitmap* offscreen_cache_get(rdpOffscreenCache* offscreen_cache, uint32 index); -FREERDP_API void offscreen_cache_put(rdpOffscreenCache* offscreen_cache, uint32 index, rdpBitmap* bitmap); -FREERDP_API void offscreen_cache_delete(rdpOffscreenCache* offscreen, uint32 index); +FREERDP_API rdpBitmap* offscreen_cache_get(rdpOffscreenCache* offscreen_cache, UINT32 index); +FREERDP_API void offscreen_cache_put(rdpOffscreenCache* offscreen_cache, UINT32 index, rdpBitmap* bitmap); +FREERDP_API void offscreen_cache_delete(rdpOffscreenCache* offscreen, UINT32 index); FREERDP_API void offscreen_cache_register_callbacks(rdpUpdate* update); diff --git a/include/freerdp/cache/palette.h b/include/freerdp/cache/palette.h index 8068b3c62..25779d59a 100644 --- a/include/freerdp/cache/palette.h +++ b/include/freerdp/cache/palette.h @@ -38,7 +38,7 @@ struct _PALETTE_TABLE_ENTRY struct rdp_palette_cache { - uint32 maxEntries; /* 0 */ + UINT32 maxEntries; /* 0 */ PALETTE_TABLE_ENTRY* entries; /* 1 */ /* internal */ @@ -46,8 +46,8 @@ struct rdp_palette_cache rdpSettings* settings; }; -FREERDP_API void* palette_cache_get(rdpPaletteCache* palette, uint32 index); -FREERDP_API void palette_cache_put(rdpPaletteCache* palette, uint32 index, void* entry); +FREERDP_API void* palette_cache_get(rdpPaletteCache* palette, UINT32 index); +FREERDP_API void palette_cache_put(rdpPaletteCache* palette, UINT32 index, void* entry); FREERDP_API void palette_cache_register_callbacks(rdpUpdate* update); diff --git a/include/freerdp/cache/pointer.h b/include/freerdp/cache/pointer.h index b25650d68..2813b0f7e 100644 --- a/include/freerdp/cache/pointer.h +++ b/include/freerdp/cache/pointer.h @@ -33,7 +33,7 @@ typedef struct rdp_pointer_cache rdpPointerCache; struct rdp_pointer_cache { - uint32 cacheSize; /* 0 */ + UINT32 cacheSize; /* 0 */ rdpPointer** entries; /* 1 */ /* internal */ @@ -42,8 +42,8 @@ struct rdp_pointer_cache rdpSettings* settings; }; -FREERDP_API rdpPointer* pointer_cache_get(rdpPointerCache* pointer_cache, uint32 index); -FREERDP_API void pointer_cache_put(rdpPointerCache* pointer_cache, uint32 index, rdpPointer* pointer); +FREERDP_API rdpPointer* pointer_cache_get(rdpPointerCache* pointer_cache, UINT32 index); +FREERDP_API void pointer_cache_put(rdpPointerCache* pointer_cache, UINT32 index, rdpPointer* pointer); FREERDP_API void pointer_cache_register_callbacks(rdpUpdate* update); diff --git a/include/freerdp/channels/rdpdr.h b/include/freerdp/channels/rdpdr.h index 956595a04..01de5f07e 100644 --- a/include/freerdp/channels/rdpdr.h +++ b/include/freerdp/channels/rdpdr.h @@ -474,9 +474,9 @@ typedef void (*pcFreeDevice)(DEVICE* device); struct _DEVICE { - uint32 id; + UINT32 id; - uint32 type; + UINT32 type; char* name; STREAM* data; @@ -492,13 +492,13 @@ struct _IRP DEVICE* device; DEVMAN* devman; - uint32 FileId; - uint32 CompletionId; - uint32 MajorFunction; - uint32 MinorFunction; + UINT32 FileId; + UINT32 CompletionId; + UINT32 MajorFunction; + UINT32 MinorFunction; STREAM* input; - uint32 IoStatus; + UINT32 IoStatus; STREAM* output; pcIRPResponse Complete; @@ -508,7 +508,7 @@ struct _IRP struct _DEVMAN { rdpSvcPlugin* plugin; - uint32 id_sequence; + UINT32 id_sequence; LIST* devices; }; diff --git a/include/freerdp/channels/rdpsnd.h b/include/freerdp/channels/rdpsnd.h index 4545077a8..da59c5e07 100644 --- a/include/freerdp/channels/rdpsnd.h +++ b/include/freerdp/channels/rdpsnd.h @@ -29,7 +29,7 @@ struct rdpsnd_format { UINT16 wFormatTag; UINT16 nChannels; - uint32 nSamplesPerSec; + UINT32 nSamplesPerSec; UINT16 nBlockAlign; UINT16 wBitsPerSample; UINT16 cbSize; diff --git a/include/freerdp/channels/wtsvc.h b/include/freerdp/channels/wtsvc.h index 8cb90135b..4af365f48 100644 --- a/include/freerdp/channels/wtsvc.h +++ b/include/freerdp/channels/wtsvc.h @@ -68,7 +68,7 @@ FREERDP_API BOOL WTSVirtualChannelManagerCheckFileDescriptor(WTSVirtualChannelMa FREERDP_API void* WTSVirtualChannelOpenEx( /* __in */ WTSVirtualChannelManager* vcm, /* __in */ const char* pVirtualName, - /* __in */ uint32 flags); + /* __in */ UINT32 flags); /** * Returns information about a specified virtual channel. @@ -80,7 +80,7 @@ FREERDP_API BOOL WTSVirtualChannelQuery( /* __in */ void* hChannelHandle, /* __in */ WTS_VIRTUAL_CLASS WtsVirtualClass, /* __out */ void** ppBuffer, - /* __out */ uint32* pBytesReturned); + /* __out */ UINT32* pBytesReturned); /** * Frees memory allocated by WTSVirtualChannelQuery @@ -107,10 +107,10 @@ FREERDP_API void WTSFreeMemory( */ FREERDP_API BOOL WTSVirtualChannelRead( /* __in */ void* hChannelHandle, - /* __in */ uint32 TimeOut, + /* __in */ UINT32 TimeOut, /* __out */ BYTE* Buffer, - /* __in */ uint32 BufferSize, - /* __out */ uint32* pBytesRead); + /* __in */ UINT32 BufferSize, + /* __out */ UINT32* pBytesRead); /** * Writes data to the server end of a virtual channel. @@ -118,8 +118,8 @@ FREERDP_API BOOL WTSVirtualChannelRead( FREERDP_API BOOL WTSVirtualChannelWrite( /* __in */ void* hChannelHandle, /* __in */ BYTE* Buffer, - /* __in */ uint32 Length, - /* __out */ uint32* pBytesWritten); + /* __in */ UINT32 Length, + /* __out */ UINT32* pBytesWritten); /** * Closes an open virtual channel handle. diff --git a/include/freerdp/client/cliprdr.h b/include/freerdp/client/cliprdr.h index 9940b00dd..5896029df 100644 --- a/include/freerdp/client/cliprdr.h +++ b/include/freerdp/client/cliprdr.h @@ -49,17 +49,17 @@ typedef RDP_EVENT RDP_CB_MONITOR_READY_EVENT; struct _RDP_CB_FORMAT_LIST_EVENT { RDP_EVENT event; - uint32* formats; + UINT32* formats; UINT16 num_formats; BYTE* raw_format_data; - uint32 raw_format_data_size; + UINT32 raw_format_data_size; }; typedef struct _RDP_CB_FORMAT_LIST_EVENT RDP_CB_FORMAT_LIST_EVENT; struct _RDP_CB_DATA_REQUEST_EVENT { RDP_EVENT event; - uint32 format; + UINT32 format; }; typedef struct _RDP_CB_DATA_REQUEST_EVENT RDP_CB_DATA_REQUEST_EVENT; @@ -67,7 +67,7 @@ struct _RDP_CB_DATA_RESPONSE_EVENT { RDP_EVENT event; BYTE* data; - uint32 size; + UINT32 size; }; typedef struct _RDP_CB_DATA_RESPONSE_EVENT RDP_CB_DATA_RESPONSE_EVENT; diff --git a/include/freerdp/client/tsmf.h b/include/freerdp/client/tsmf.h index 7f1163846..56775b483 100644 --- a/include/freerdp/client/tsmf.h +++ b/include/freerdp/client/tsmf.h @@ -33,8 +33,8 @@ struct _RDP_VIDEO_FRAME_EVENT { RDP_EVENT event; BYTE* frame_data; - uint32 frame_size; - uint32 frame_pixfmt; + UINT32 frame_size; + UINT32 frame_pixfmt; INT16 frame_width; INT16 frame_height; INT16 x; diff --git a/include/freerdp/codec/color.h b/include/freerdp/codec/color.h index 1ce222441..0a0ef90bf 100644 --- a/include/freerdp/codec/color.h +++ b/include/freerdp/codec/color.h @@ -242,19 +242,19 @@ FREERDP_API BYTE* freerdp_glyph_convert(int width, int height, BYTE* data); FREERDP_API void freerdp_bitmap_flip(BYTE * src, BYTE * dst, int scanLineSz, int height); FREERDP_API BYTE* freerdp_image_flip(BYTE* srcData, BYTE* dstData, int width, int height, int bpp); FREERDP_API BYTE* freerdp_icon_convert(BYTE* srcData, BYTE* dstData, BYTE* mask, int width, int height, int bpp, HCLRCONV clrconv); -FREERDP_API BYTE* freerdp_mono_image_convert(BYTE* srcData, int width, int height, int srcBpp, int dstBpp, uint32 bgcolor, uint32 fgcolor, HCLRCONV clrconv); +FREERDP_API BYTE* freerdp_mono_image_convert(BYTE* srcData, int width, int height, int srcBpp, int dstBpp, UINT32 bgcolor, UINT32 fgcolor, HCLRCONV clrconv); FREERDP_API void freerdp_alpha_cursor_convert(BYTE* alphaData, BYTE* xorMask, BYTE* andMask, int width, int height, int bpp, HCLRCONV clrconv); FREERDP_API void freerdp_image_swap_color_order(BYTE* data, int width, int height); -FREERDP_API uint32 freerdp_color_convert_var(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv); -FREERDP_API uint32 freerdp_color_convert_rgb(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv); -FREERDP_API uint32 freerdp_color_convert_bgr(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv); -FREERDP_API uint32 freerdp_color_convert_rgb_bgr(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv); -FREERDP_API uint32 freerdp_color_convert_bgr_rgb(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv); -FREERDP_API uint32 freerdp_color_convert_var_rgb(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv); -FREERDP_API uint32 freerdp_color_convert_var_bgr(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv); +FREERDP_API UINT32 freerdp_color_convert_var(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv); +FREERDP_API UINT32 freerdp_color_convert_rgb(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv); +FREERDP_API UINT32 freerdp_color_convert_bgr(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv); +FREERDP_API UINT32 freerdp_color_convert_rgb_bgr(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv); +FREERDP_API UINT32 freerdp_color_convert_bgr_rgb(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv); +FREERDP_API UINT32 freerdp_color_convert_var_rgb(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv); +FREERDP_API UINT32 freerdp_color_convert_var_bgr(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv); -FREERDP_API HCLRCONV freerdp_clrconv_new(uint32 flags); +FREERDP_API HCLRCONV freerdp_clrconv_new(UINT32 flags); FREERDP_API void freerdp_clrconv_free(HCLRCONV clrconv); #ifdef __cplusplus diff --git a/include/freerdp/codec/mppc_dec.h b/include/freerdp/codec/mppc_dec.h index 32e00fa32..aab792638 100644 --- a/include/freerdp/codec/mppc_dec.h +++ b/include/freerdp/codec/mppc_dec.h @@ -45,11 +45,11 @@ struct rdp_mppc_dec BYTE* history_ptr; }; -FREERDP_API int decompress_rdp(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, uint32* roff, uint32* rlen); -FREERDP_API int decompress_rdp_4(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, uint32* roff, uint32* rlen); -FREERDP_API int decompress_rdp_5(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, uint32* roff, uint32* rlen); -FREERDP_API int decompress_rdp_6(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, uint32* roff, uint32* rlen); -FREERDP_API int decompress_rdp_61(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, uint32* roff, uint32* rlen); +FREERDP_API int decompress_rdp(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, UINT32* roff, UINT32* rlen); +FREERDP_API int decompress_rdp_4(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, UINT32* roff, UINT32* rlen); +FREERDP_API int decompress_rdp_5(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, UINT32* roff, UINT32* rlen); +FREERDP_API int decompress_rdp_6(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, UINT32* roff, UINT32* rlen); +FREERDP_API int decompress_rdp_61(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, UINT32* roff, UINT32* rlen); FREERDP_API struct rdp_mppc_dec* mppc_dec_new(void); FREERDP_API void mppc_dec_free(struct rdp_mppc_dec* dec); diff --git a/include/freerdp/codec/nsc.h b/include/freerdp/codec/nsc.h index 5e55fb3e8..ef22d3649 100644 --- a/include/freerdp/codec/nsc.h +++ b/include/freerdp/codec/nsc.h @@ -33,7 +33,7 @@ extern "C" { /* NSCODEC_BITMAP_STREAM */ struct _NSC_STREAM { - uint32 PlaneByteCount[4]; + UINT32 PlaneByteCount[4]; BYTE ColorLossLevel; BYTE ChromaSubSamplingLevel; UINT16 Reserved; @@ -46,13 +46,13 @@ typedef struct _NSC_CONTEXT_PRIV NSC_CONTEXT_PRIV; typedef struct _NSC_CONTEXT NSC_CONTEXT; struct _NSC_CONTEXT { - uint32 OrgByteCount[4]; /* original byte length of luma, chroma orange, chroma green, alpha variable in order */ + UINT32 OrgByteCount[4]; /* original byte length of luma, chroma orange, chroma green, alpha variable in order */ NSC_STREAM nsc_stream; UINT16 bpp; UINT16 width; UINT16 height; BYTE* bmpdata; /* final argb values in little endian order */ - uint32 bmpdata_length; /* the maximum length of the buffer that bmpdata points to */ + UINT32 bmpdata_length; /* the maximum length of the buffer that bmpdata points to */ RDP_PIXEL_FORMAT pixel_format; /* color palette allocated by the application */ @@ -65,10 +65,10 @@ struct _NSC_CONTEXT }; FREERDP_API NSC_CONTEXT* nsc_context_new(void); -FREERDP_API void nsc_context_set_cpu_opt(NSC_CONTEXT* context, uint32 cpu_opt); +FREERDP_API void nsc_context_set_cpu_opt(NSC_CONTEXT* context, UINT32 cpu_opt); FREERDP_API void nsc_context_set_pixel_format(NSC_CONTEXT* context, RDP_PIXEL_FORMAT pixel_format); FREERDP_API void nsc_process_message(NSC_CONTEXT* context, UINT16 bpp, - UINT16 width, UINT16 height, BYTE* data, uint32 length); + UINT16 width, UINT16 height, BYTE* data, UINT32 length); FREERDP_API void nsc_compose_message(NSC_CONTEXT* context, STREAM* s, BYTE* bmpdata, int width, int height, int rowstride); FREERDP_API void nsc_context_free(NSC_CONTEXT* context); diff --git a/include/freerdp/codec/rfx.h b/include/freerdp/codec/rfx.h index 8b2c7915b..1c5a4bcc0 100644 --- a/include/freerdp/codec/rfx.h +++ b/include/freerdp/codec/rfx.h @@ -82,9 +82,9 @@ struct _RFX_CONTEXT UINT16 width; UINT16 height; RLGR_MODE mode; - uint32 version; - uint32 codec_id; - uint32 codec_version; + UINT32 version; + UINT32 codec_id; + UINT32 codec_version; RDP_PIXEL_FORMAT pixel_format; BYTE bits_per_pixel; @@ -92,10 +92,10 @@ struct _RFX_CONTEXT const BYTE* palette; /* temporary data within a frame */ - uint32 frame_idx; + UINT32 frame_idx; BOOL header_processed; BYTE num_quants; - uint32* quants; + UINT32* quants; BYTE quant_idx_y; BYTE quant_idx_cb; BYTE quant_idx_cr; @@ -103,8 +103,8 @@ struct _RFX_CONTEXT /* routines */ void (*decode_ycbcr_to_rgb)(INT16* y_r_buf, INT16* cb_g_buf, INT16* cr_b_buf); void (*encode_rgb_to_ycbcr)(INT16* y_r_buf, INT16* cb_g_buf, INT16* cr_b_buf); - void (*quantization_decode)(INT16* buffer, const uint32* quantization_values); - void (*quantization_encode)(INT16* buffer, const uint32* quantization_values); + void (*quantization_decode)(INT16* buffer, const UINT32* quantization_values); + void (*quantization_encode)(INT16* buffer, const UINT32* quantization_values); void (*dwt_2d_decode)(INT16* buffer, INT16* dwt_buffer); void (*dwt_2d_encode)(INT16* buffer, INT16* dwt_buffer); @@ -115,11 +115,11 @@ typedef struct _RFX_CONTEXT RFX_CONTEXT; FREERDP_API RFX_CONTEXT* rfx_context_new(void); FREERDP_API void rfx_context_free(RFX_CONTEXT* context); -FREERDP_API void rfx_context_set_cpu_opt(RFX_CONTEXT* context, uint32 cpu_opt); +FREERDP_API void rfx_context_set_cpu_opt(RFX_CONTEXT* context, UINT32 cpu_opt); FREERDP_API void rfx_context_set_pixel_format(RFX_CONTEXT* context, RDP_PIXEL_FORMAT pixel_format); FREERDP_API void rfx_context_reset(RFX_CONTEXT* context); -FREERDP_API RFX_MESSAGE* rfx_process_message(RFX_CONTEXT* context, BYTE* data, uint32 length); +FREERDP_API RFX_MESSAGE* rfx_process_message(RFX_CONTEXT* context, BYTE* data, UINT32 length); FREERDP_API UINT16 rfx_message_get_tile_count(RFX_MESSAGE* message); FREERDP_API RFX_TILE* rfx_message_get_tile(RFX_MESSAGE* message, int index); FREERDP_API UINT16 rfx_message_get_rect_count(RFX_MESSAGE* message); diff --git a/include/freerdp/crypto/ber.h b/include/freerdp/crypto/ber.h index 1835c0c25..ab028c3db 100644 --- a/include/freerdp/crypto/ber.h +++ b/include/freerdp/crypto/ber.h @@ -76,9 +76,9 @@ FREERDP_API int ber_write_octet_string_tag(STREAM* s, int length); FREERDP_API int ber_skip_octet_string(int length); FREERDP_API BOOL ber_read_BOOL(STREAM* s, BOOL* value); FREERDP_API void ber_write_BOOL(STREAM* s, BOOL value); -FREERDP_API BOOL ber_read_integer(STREAM* s, uint32* value); -FREERDP_API int ber_write_integer(STREAM* s, uint32 value); +FREERDP_API BOOL ber_read_integer(STREAM* s, UINT32* value); +FREERDP_API int ber_write_integer(STREAM* s, UINT32 value); FREERDP_API BOOL ber_read_integer_length(STREAM* s, int* length); -FREERDP_API int ber_skip_integer(uint32 value); +FREERDP_API int ber_skip_integer(UINT32 value); #endif /* FREERDP_CRYPTO_BER_H */ diff --git a/include/freerdp/crypto/crypto.h b/include/freerdp/crypto/crypto.h index c06fe7ed8..91e0eae33 100644 --- a/include/freerdp/crypto/crypto.h +++ b/include/freerdp/crypto/crypto.h @@ -80,43 +80,43 @@ struct crypto_cert_struct typedef struct crypto_sha1_struct* CryptoSha1; FREERDP_API CryptoSha1 crypto_sha1_init(void); -FREERDP_API void crypto_sha1_update(CryptoSha1 sha1, const BYTE* data, uint32 length); +FREERDP_API void crypto_sha1_update(CryptoSha1 sha1, const BYTE* data, UINT32 length); FREERDP_API void crypto_sha1_final(CryptoSha1 sha1, BYTE* out_data); #define CRYPTO_MD5_DIGEST_LENGTH MD5_DIGEST_LENGTH typedef struct crypto_md5_struct* CryptoMd5; FREERDP_API CryptoMd5 crypto_md5_init(void); -FREERDP_API void crypto_md5_update(CryptoMd5 md5, const BYTE* data, uint32 length); +FREERDP_API void crypto_md5_update(CryptoMd5 md5, const BYTE* data, UINT32 length); FREERDP_API void crypto_md5_final(CryptoMd5 md5, BYTE* out_data); typedef struct crypto_rc4_struct* CryptoRc4; -FREERDP_API CryptoRc4 crypto_rc4_init(const BYTE* key, uint32 length); -FREERDP_API void crypto_rc4(CryptoRc4 rc4, uint32 length, const BYTE* in_data, BYTE* out_data); +FREERDP_API CryptoRc4 crypto_rc4_init(const BYTE* key, UINT32 length); +FREERDP_API void crypto_rc4(CryptoRc4 rc4, UINT32 length, const BYTE* in_data, BYTE* out_data); FREERDP_API void crypto_rc4_free(CryptoRc4 rc4); typedef struct crypto_des3_struct* CryptoDes3; FREERDP_API CryptoDes3 crypto_des3_encrypt_init(const BYTE* key, const BYTE* ivec); FREERDP_API CryptoDes3 crypto_des3_decrypt_init(const BYTE* key, const BYTE* ivec); -FREERDP_API void crypto_des3_encrypt(CryptoDes3 des3, uint32 length, const BYTE *in_data, BYTE *out_data); -FREERDP_API void crypto_des3_decrypt(CryptoDes3 des3, uint32 length, const BYTE *in_data, BYTE* out_data); +FREERDP_API void crypto_des3_encrypt(CryptoDes3 des3, UINT32 length, const BYTE *in_data, BYTE *out_data); +FREERDP_API void crypto_des3_decrypt(CryptoDes3 des3, UINT32 length, const BYTE *in_data, BYTE* out_data); FREERDP_API void crypto_des3_free(CryptoDes3 des3); typedef struct crypto_hmac_struct* CryptoHmac; FREERDP_API CryptoHmac crypto_hmac_new(void); -FREERDP_API void crypto_hmac_sha1_init(CryptoHmac hmac, const BYTE *data, uint32 length); -FREERDP_API void crypto_hmac_update(CryptoHmac hmac, const BYTE *data, uint32 length); -FREERDP_API void crypto_hmac_final(CryptoHmac hmac, BYTE *out_data, uint32 length); +FREERDP_API void crypto_hmac_sha1_init(CryptoHmac hmac, const BYTE *data, UINT32 length); +FREERDP_API void crypto_hmac_update(CryptoHmac hmac, const BYTE *data, UINT32 length); +FREERDP_API void crypto_hmac_final(CryptoHmac hmac, BYTE *out_data, UINT32 length); FREERDP_API void crypto_hmac_free(CryptoHmac hmac); typedef struct crypto_cert_struct* CryptoCert; #include -FREERDP_API CryptoCert crypto_cert_read(BYTE* data, uint32 length); +FREERDP_API CryptoCert crypto_cert_read(BYTE* data, UINT32 length); FREERDP_API char* crypto_cert_fingerprint(X509* xcert); FREERDP_API char* crypto_cert_subject(X509* xcert); FREERDP_API char* crypto_cert_subject_common_name(X509* xcert, int* length); @@ -134,10 +134,10 @@ extern const BYTE tssk_modulus[]; extern const BYTE tssk_privateExponent[]; extern const BYTE tssk_exponent[]; -FREERDP_API void crypto_rsa_public_encrypt(const BYTE* input, int length, uint32 key_length, const BYTE* modulus, const BYTE* exponent, BYTE* output); -FREERDP_API void crypto_rsa_public_decrypt(const BYTE* input, int length, uint32 key_length, const BYTE* modulus, const BYTE* exponent, BYTE* output); -FREERDP_API void crypto_rsa_private_encrypt(const BYTE* input, int length, uint32 key_length, const BYTE* modulus, const BYTE* private_exponent, BYTE* output); -FREERDP_API void crypto_rsa_private_decrypt(const BYTE* input, int length, uint32 key_length, const BYTE* modulus, const BYTE* private_exponent, BYTE* output); +FREERDP_API void crypto_rsa_public_encrypt(const BYTE* input, int length, UINT32 key_length, const BYTE* modulus, const BYTE* exponent, BYTE* output); +FREERDP_API void crypto_rsa_public_decrypt(const BYTE* input, int length, UINT32 key_length, const BYTE* modulus, const BYTE* exponent, BYTE* output); +FREERDP_API void crypto_rsa_private_encrypt(const BYTE* input, int length, UINT32 key_length, const BYTE* modulus, const BYTE* private_exponent, BYTE* output); +FREERDP_API void crypto_rsa_private_decrypt(const BYTE* input, int length, UINT32 key_length, const BYTE* modulus, const BYTE* private_exponent, BYTE* output); FREERDP_API void crypto_reverse(BYTE* data, int length); FREERDP_API void crypto_nonce(BYTE* nonce, int size); diff --git a/include/freerdp/crypto/er.h b/include/freerdp/crypto/er.h index 4174ea985..bbbcc83b8 100644 --- a/include/freerdp/crypto/er.h +++ b/include/freerdp/crypto/er.h @@ -73,16 +73,16 @@ FREERDP_API int er_write_sequence_tag(STREAM* s, int length, BOOL flag); FREERDP_API int er_skip_sequence(int length); FREERDP_API int er_skip_sequence_tag(int length); FREERDP_API BOOL er_read_bit_string(STREAM* s, int* length, BYTE* padding); -FREERDP_API BOOL er_write_bit_string_tag(STREAM* s, uint32 length, BYTE padding, BOOL flag); +FREERDP_API BOOL er_write_bit_string_tag(STREAM* s, UINT32 length, BYTE padding, BOOL flag); FREERDP_API BOOL er_read_octet_string(STREAM* s, int* length); FREERDP_API void er_write_octet_string(STREAM* s, BYTE* oct_str, int length, BOOL flag); FREERDP_API int er_write_octet_string_tag(STREAM* s, int length, BOOL flag); FREERDP_API int er_skip_octet_string(int length); FREERDP_API BOOL er_read_BOOL(STREAM* s, BOOL* value); FREERDP_API void er_write_BOOL(STREAM* s, BOOL value); -FREERDP_API BOOL er_read_integer(STREAM* s, uint32* value); -FREERDP_API int er_write_integer(STREAM* s, sint32 value); +FREERDP_API BOOL er_read_integer(STREAM* s, UINT32* value); +FREERDP_API int er_write_integer(STREAM* s, INT32 value); FREERDP_API BOOL er_read_integer_length(STREAM* s, int* length); -FREERDP_API int er_skip_integer(sint32 value); +FREERDP_API int er_skip_integer(INT32 value); #endif /* FREERDP_CRYPTO_ER_H */ diff --git a/include/freerdp/crypto/per.h b/include/freerdp/crypto/per.h index 54db219a4..479784c2d 100644 --- a/include/freerdp/crypto/per.h +++ b/include/freerdp/crypto/per.h @@ -33,9 +33,9 @@ FREERDP_API BOOL per_read_number_of_sets(STREAM* s, BYTE* number); FREERDP_API void per_write_number_of_sets(STREAM* s, BYTE number); FREERDP_API BOOL per_read_padding(STREAM* s, int length); FREERDP_API void per_write_padding(STREAM* s, int length); -FREERDP_API BOOL per_read_integer(STREAM* s, uint32* integer); +FREERDP_API BOOL per_read_integer(STREAM* s, UINT32* integer); FREERDP_API BOOL per_read_integer16(STREAM* s, UINT16* integer, UINT16 min); -FREERDP_API void per_write_integer(STREAM* s, uint32 integer); +FREERDP_API void per_write_integer(STREAM* s, UINT32 integer); FREERDP_API void per_write_integer16(STREAM* s, UINT16 integer, UINT16 min); FREERDP_API BOOL per_read_enumerated(STREAM* s, BYTE* enumerated, BYTE count); FREERDP_API void per_write_enumerated(STREAM* s, BYTE enumerated, BYTE count); diff --git a/include/freerdp/dvc.h b/include/freerdp/dvc.h index 5c83776bc..1835e4928 100644 --- a/include/freerdp/dvc.h +++ b/include/freerdp/dvc.h @@ -72,7 +72,7 @@ struct _IWTSVirtualChannel { /* Starts a write request on the channel. */ int (*Write) (IWTSVirtualChannel* pChannel, - uint32 cbSize, + UINT32 cbSize, BYTE* pBuffer, void* pReserved); /* Closes the channel. */ @@ -85,7 +85,7 @@ struct _IWTSVirtualChannelManager endpoint, or creates a static channel. */ int (*CreateListener) (IWTSVirtualChannelManager* pChannelMgr, const char* pszChannelName, - uint32 ulFlags, + UINT32 ulFlags, IWTSListenerCallback* pListenerCallback, IWTSListener** ppListener); /* Push a virtual channel event. @@ -93,9 +93,9 @@ struct _IWTSVirtualChannelManager int (*PushEvent) (IWTSVirtualChannelManager* pChannelMgr, RDP_EVENT* pEvent); /* Find the channel or ID to send data to a specific endpoint. */ - uint32 (*GetChannelId) (IWTSVirtualChannel * channel); + UINT32 (*GetChannelId) (IWTSVirtualChannel * channel); IWTSVirtualChannel* (*FindChannelById) (IWTSVirtualChannelManager* pChannelMgr, - uint32 ChannelId); + UINT32 ChannelId); }; struct _IWTSPlugin @@ -110,7 +110,7 @@ struct _IWTSPlugin /* Notifies the plug-in that the Remote Desktop Connection (RDC) client has disconnected from the RD Session Host server. */ int (*Disconnected) (IWTSPlugin* pPlugin, - uint32 dwDisconnectCode); + UINT32 dwDisconnectCode); /* Notifies the plug-in that the Remote Desktop Connection (RDC) client has terminated. */ int (*Terminated) (IWTSPlugin* pPlugin); @@ -131,7 +131,7 @@ struct _IWTSVirtualChannelCallback { /* Notifies the user about data that is being received. */ int (*OnDataReceived) (IWTSVirtualChannelCallback* pChannelCallback, - uint32 cbSize, + UINT32 cbSize, BYTE* pBuffer); /* Notifies the user that the channel has been closed. */ int (*OnClose) (IWTSVirtualChannelCallback* pChannelCallback); diff --git a/include/freerdp/extension.h b/include/freerdp/extension.h index bf740b222..382273d50 100644 --- a/include/freerdp/extension.h +++ b/include/freerdp/extension.h @@ -35,11 +35,11 @@ struct rdp_ext_plugin int (*uninit) (rdpExtPlugin* plugin, freerdp* instance); }; -typedef uint32 (FREERDP_CC* PFREERDP_EXTENSION_HOOK)(rdpExtPlugin* plugin, freerdp* instance); +typedef UINT32 (FREERDP_CC* PFREERDP_EXTENSION_HOOK)(rdpExtPlugin* plugin, freerdp* instance); -typedef uint32 (FREERDP_CC* PREGISTEREXTENSION)(rdpExtPlugin* plugin); -typedef uint32 (FREERDP_CC* PREGISTERPRECONNECTHOOK)(rdpExtPlugin* plugin, PFREERDP_EXTENSION_HOOK hook); -typedef uint32 (FREERDP_CC* PREGISTERPOSTCONNECTHOOK)(rdpExtPlugin* plugin, PFREERDP_EXTENSION_HOOK hook); +typedef UINT32 (FREERDP_CC* PREGISTEREXTENSION)(rdpExtPlugin* plugin); +typedef UINT32 (FREERDP_CC* PREGISTERPRECONNECTHOOK)(rdpExtPlugin* plugin, PFREERDP_EXTENSION_HOOK hook); +typedef UINT32 (FREERDP_CC* PREGISTERPOSTCONNECTHOOK)(rdpExtPlugin* plugin, PFREERDP_EXTENSION_HOOK hook); struct _FREERDP_EXTENSION_ENTRY_POINTS { diff --git a/include/freerdp/freerdp.h b/include/freerdp/freerdp.h index 62b525451..2397ecc00 100644 --- a/include/freerdp/freerdp.h +++ b/include/freerdp/freerdp.h @@ -72,7 +72,7 @@ struct rdp_context Pointer to the client peer. This is set by a call to freerdp_peer_context_new() during peer initialization. This field is used only on the server side. */ - uint32 paddingA[16 - 2]; /* 2 */ + UINT32 paddingA[16 - 2]; /* 2 */ int argc; /**< (offset 16) Number of arguments given to the program at launch time. @@ -82,7 +82,7 @@ struct rdp_context List of arguments given to the program at launch time. Used to keep this data available and used later on, typically just before connection initialization. @see freerdp_parse_args() */ - uint32 paddingB[32 - 18]; /* 18 */ + UINT32 paddingB[32 - 18]; /* 18 */ rdpRdp* rdp; /**< (offset 32) Pointer to a rdp_rdp structure used to keep the connection's parameters. @@ -96,7 +96,7 @@ struct rdp_context rdpCache* cache; /* 35 */ rdpChannels* channels; /* 36 */ rdpGraphics* graphics; /* 37 */ - uint32 paddingC[64 - 38]; /* 38 */ + UINT32 paddingC[64 - 38]; /* 38 */ }; /** Defines the options for a given instance of RDP connection. @@ -115,7 +115,7 @@ struct rdp_freerdp rdpContext field first, and any additional content following it. Can be allocated by a call to freerdp_context_new(). Must be dealocated by a call to freerdp_context_free() before deallocating the current instance. */ - uint32 paddingA[16 - 1]; /* 1 */ + UINT32 paddingA[16 - 1]; /* 1 */ rdpInput* input; /* (offset 16) Input handle for the connection. @@ -126,7 +126,7 @@ struct rdp_freerdp rdpSettings* settings; /**< (offset 18) Pointer to a rdpSettings structure. Will be used to maintain the required RDP settings. Will be initialized by a call to freerdp_context_new() */ - uint32 paddingB[32 - 19]; /* 19 */ + UINT32 paddingB[32 - 19]; /* 19 */ size_t context_size; /* (offset 32) Specifies the size of the 'context' field. freerdp_context_new() will use this size to allocate the context buffer. @@ -146,7 +146,7 @@ struct rdp_freerdp Callback for context deallocation Can be set before calling freerdp_context_free() to have it executed before deallocation. Must be set to NULL if not needed. */ - uint32 paddingC[48 - 35]; /* 35 */ + UINT32 paddingC[48 - 35]; /* 35 */ pPreConnect PreConnect; /**< (offset 48) Callback for pre-connect operations. @@ -168,7 +168,7 @@ struct rdp_freerdp Callback for changed certificate validation. Used when a certificate differs from stored fingerprint. If returns TRUE, the new fingerprint will be trusted and old thrown out. */ - uint32 paddingD[64 - 51]; /* 51 */ + UINT32 paddingD[64 - 51]; /* 51 */ pSendChannelData SendChannelData; /* (offset 64) Callback for sending data to a channel. @@ -178,7 +178,7 @@ struct rdp_freerdp Callback for receiving data from a channel. This is called by freerdp_channel_process() (if not NULL). Clients will typically use a function that calls freerdp_channels_data() to perform the needed tasks. */ - uint32 paddingE[80 - 66]; /* 66 */ + UINT32 paddingE[80 - 66]; /* 66 */ }; FREERDP_API void freerdp_context_new(freerdp* instance); @@ -191,7 +191,7 @@ FREERDP_API BOOL freerdp_disconnect(freerdp* instance); FREERDP_API BOOL freerdp_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds, int* wcount); FREERDP_API BOOL freerdp_check_fds(freerdp* instance); -FREERDP_API uint32 freerdp_error_info(freerdp* instance); +FREERDP_API UINT32 freerdp_error_info(freerdp* instance); FREERDP_API void freerdp_get_version(int* major, int* minor, int* revision); diff --git a/include/freerdp/gdi/32bpp.h b/include/freerdp/gdi/32bpp.h index 4b9eb2c8d..cacc05346 100644 --- a/include/freerdp/gdi/32bpp.h +++ b/include/freerdp/gdi/32bpp.h @@ -23,7 +23,7 @@ typedef int (*pLineTo_32bpp)(HGDI_DC hdc, int nXEnd, int nYEnd); -FREERDP_API uint32 gdi_get_color_32bpp(HGDI_DC hdc, GDI_COLOR color); +FREERDP_API UINT32 gdi_get_color_32bpp(HGDI_DC hdc, GDI_COLOR color); 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); diff --git a/include/freerdp/gdi/bitmap.h b/include/freerdp/gdi/bitmap.h index df79e6ea1..4422e820c 100644 --- a/include/freerdp/gdi/bitmap.h +++ b/include/freerdp/gdi/bitmap.h @@ -27,13 +27,13 @@ FREERDP_API GDI_COLOR gdi_GetPixel(HGDI_DC hdc, int nXPos, int nYPos); FREERDP_API GDI_COLOR gdi_SetPixel(HGDI_DC hdc, int X, int Y, GDI_COLOR crColor); FREERDP_API BYTE gdi_GetPixel_8bpp(HGDI_BITMAP hBmp, int X, int Y); FREERDP_API UINT16 gdi_GetPixel_16bpp(HGDI_BITMAP hBmp, int X, int Y); -FREERDP_API uint32 gdi_GetPixel_32bpp(HGDI_BITMAP hBmp, int X, int Y); +FREERDP_API UINT32 gdi_GetPixel_32bpp(HGDI_BITMAP hBmp, int X, int Y); FREERDP_API BYTE* gdi_GetPointer_8bpp(HGDI_BITMAP hBmp, int X, int Y); FREERDP_API UINT16* gdi_GetPointer_16bpp(HGDI_BITMAP hBmp, int X, int Y); -FREERDP_API uint32* gdi_GetPointer_32bpp(HGDI_BITMAP hBmp, int X, int Y); +FREERDP_API UINT32* gdi_GetPointer_32bpp(HGDI_BITMAP hBmp, int X, int Y); FREERDP_API void gdi_SetPixel_8bpp(HGDI_BITMAP hBmp, int X, int Y, BYTE pixel); FREERDP_API void gdi_SetPixel_16bpp(HGDI_BITMAP hBmp, int X, int Y, UINT16 pixel); -FREERDP_API void gdi_SetPixel_32bpp(HGDI_BITMAP hBmp, int X, int Y, uint32 pixel); +FREERDP_API void gdi_SetPixel_32bpp(HGDI_BITMAP hBmp, int X, int Y, UINT32 pixel); FREERDP_API HGDI_BITMAP gdi_CreateBitmap(int nWidth, int nHeight, int cBitsPerPixel, BYTE* data); FREERDP_API HGDI_BITMAP gdi_CreateCompatibleBitmap(HGDI_DC hdc, int nWidth, int nHeight); FREERDP_API int gdi_BitBlt(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc, int rop); diff --git a/include/freerdp/gdi/gdi.h b/include/freerdp/gdi/gdi.h index c419eddb3..84f2da0cd 100644 --- a/include/freerdp/gdi/gdi.h +++ b/include/freerdp/gdi/gdi.h @@ -281,13 +281,13 @@ struct rdp_gdi gdiBitmap* image; }; -FREERDP_API uint32 gdi_rop3_code(BYTE code); +FREERDP_API UINT32 gdi_rop3_code(BYTE code); FREERDP_API BYTE* gdi_get_bitmap_pointer(HGDI_DC hdcBmp, int x, int y); FREERDP_API BYTE* gdi_get_brush_pointer(HGDI_DC hdcBrush, int x, int y); FREERDP_API int gdi_is_mono_pixel_set(BYTE* data, int x, int y, int width); FREERDP_API void gdi_resize(rdpGdi* gdi, int width, int height); -FREERDP_API int gdi_init(freerdp* instance, uint32 flags, BYTE* buffer); +FREERDP_API int gdi_init(freerdp* instance, UINT32 flags, BYTE* buffer); FREERDP_API void gdi_free(freerdp* instance); #ifdef WITH_DEBUG_GDI diff --git a/include/freerdp/gdi/pen.h b/include/freerdp/gdi/pen.h index 1872c71a4..20e7030ca 100644 --- a/include/freerdp/gdi/pen.h +++ b/include/freerdp/gdi/pen.h @@ -26,6 +26,6 @@ FREERDP_API HGDI_PEN gdi_CreatePen(int fnPenStyle, int nWidth, int crColor); 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); +FREERDP_API UINT32 gdi_GetPenColor_32bpp(HGDI_PEN pen); #endif /* __GDI_PEN_H */ diff --git a/include/freerdp/graphics.h b/include/freerdp/graphics.h index ef689aaf0..cba782343 100644 --- a/include/freerdp/graphics.h +++ b/include/freerdp/graphics.h @@ -47,23 +47,23 @@ struct rdp_bitmap pBitmap_Paint Paint; /* 3 */ pBitmap_Decompress Decompress; /* 4 */ pBitmap_SetSurface SetSurface; /* 5 */ - uint32 paddingA[16 - 6]; /* 6 */ + UINT32 paddingA[16 - 6]; /* 6 */ - uint32 left; /* 16 */ - uint32 top; /* 17 */ - uint32 right; /* 18 */ - uint32 bottom; /* 19 */ - uint32 width; /* 20 */ - uint32 height; /* 21 */ - uint32 bpp; /* 22 */ - uint32 flags; /* 23 */ - uint32 length; /* 24 */ + UINT32 left; /* 16 */ + UINT32 top; /* 17 */ + UINT32 right; /* 18 */ + UINT32 bottom; /* 19 */ + UINT32 width; /* 20 */ + UINT32 height; /* 21 */ + UINT32 bpp; /* 22 */ + UINT32 flags; /* 23 */ + UINT32 length; /* 24 */ BYTE* data; /* 25 */ - uint32 paddingB[32 - 26]; /* 26 */ + UINT32 paddingB[32 - 26]; /* 26 */ BOOL compressed; /* 32 */ BOOL ephemeral; /* 33 */ - uint32 paddingC[64 - 34]; /* 34 */ + UINT32 paddingC[64 - 34]; /* 34 */ }; FREERDP_API rdpBitmap* Bitmap_Alloc(rdpContext* context); @@ -93,18 +93,18 @@ struct rdp_pointer pPointer_Set Set; /* 3 */ pPointer_SetNull SetNull; /* 4*/ pPointer_SetDefault SetDefault; /* 5 */ - uint32 paddingA[16 - 6]; /* 6 */ + UINT32 paddingA[16 - 6]; /* 6 */ - uint32 xPos; /* 16 */ - uint32 yPos; /* 17 */ - uint32 width; /* 18 */ - uint32 height; /* 19 */ - uint32 xorBpp; /* 20 */ - uint32 lengthAndMask; /* 21 */ - uint32 lengthXorMask; /* 22 */ + UINT32 xPos; /* 16 */ + UINT32 yPos; /* 17 */ + UINT32 width; /* 18 */ + UINT32 height; /* 19 */ + UINT32 xorBpp; /* 20 */ + UINT32 lengthAndMask; /* 21 */ + UINT32 lengthXorMask; /* 22 */ BYTE* xorMaskData; /* 23 */ BYTE* andMaskData; /* 24 */ - uint32 paddingB[32 - 25]; /* 25 */ + UINT32 paddingB[32 - 25]; /* 25 */ }; FREERDP_API rdpPointer* Pointer_Alloc(rdpContext* context); @@ -119,8 +119,8 @@ FREERDP_API void Pointer_SetDefault(rdpContext* context); typedef void (*pGlyph_New)(rdpContext* context, rdpGlyph* glyph); typedef void (*pGlyph_Free)(rdpContext* context, rdpGlyph* glyph); typedef void (*pGlyph_Draw)(rdpContext* context, rdpGlyph* glyph, int x, int y); -typedef void (*pGlyph_BeginDraw)(rdpContext* context, int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor); -typedef void (*pGlyph_EndDraw)(rdpContext* context, int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor); +typedef void (*pGlyph_BeginDraw)(rdpContext* context, int x, int y, int width, int height, UINT32 bgcolor, UINT32 fgcolor); +typedef void (*pGlyph_EndDraw)(rdpContext* context, int x, int y, int width, int height, UINT32 bgcolor, UINT32 fgcolor); struct rdp_glyph { @@ -130,23 +130,23 @@ struct rdp_glyph pGlyph_Draw Draw; /* 3 */ pGlyph_BeginDraw BeginDraw; /* 4 */ pGlyph_EndDraw EndDraw; /* 5 */ - uint32 paddingA[16 - 6]; /* 6 */ + UINT32 paddingA[16 - 6]; /* 6 */ - sint32 x; /* 16 */ - sint32 y; /* 17 */ - uint32 cx; /* 18 */ - uint32 cy; /* 19 */ - uint32 cb; /* 20 */ + INT32 x; /* 16 */ + INT32 y; /* 17 */ + UINT32 cx; /* 18 */ + UINT32 cy; /* 19 */ + UINT32 cb; /* 20 */ BYTE* aj; /* 21 */ - uint32 paddingB[32 - 22]; /* 22 */ + UINT32 paddingB[32 - 22]; /* 22 */ }; FREERDP_API rdpGlyph* Glyph_Alloc(rdpContext* context); FREERDP_API void Glyph_New(rdpContext* context, rdpGlyph* glyph); FREERDP_API void Glyph_Free(rdpContext* context, rdpGlyph* glyph); FREERDP_API void Glyph_Draw(rdpContext* context, rdpGlyph* glyph, int x, int y); -FREERDP_API void Glyph_BeginDraw(rdpContext* context, int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor); -FREERDP_API void Glyph_EndDraw(rdpContext* context, int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor); +FREERDP_API void Glyph_BeginDraw(rdpContext* context, int x, int y, int width, int height, UINT32 bgcolor, UINT32 fgcolor); +FREERDP_API void Glyph_EndDraw(rdpContext* context, int x, int y, int width, int height, UINT32 bgcolor, UINT32 fgcolor); /* Graphics Module */ @@ -156,7 +156,7 @@ struct rdp_graphics rdpBitmap* Bitmap_Prototype; /* 1 */ rdpPointer* Pointer_Prototype; /* 2 */ rdpGlyph* Glyph_Prototype; /* 3 */ - uint32 paddingA[16 - 4]; /* 4 */ + UINT32 paddingA[16 - 4]; /* 4 */ }; FREERDP_API void graphics_register_bitmap(rdpGraphics* graphics, rdpBitmap* bitmap); diff --git a/include/freerdp/input.h b/include/freerdp/input.h index ec3f0126d..09f75da72 100644 --- a/include/freerdp/input.h +++ b/include/freerdp/input.h @@ -54,7 +54,7 @@ typedef struct rdp_input rdpInput; #define RDP_CLIENT_INPUT_PDU_HEADER_LENGTH 4 -typedef void (*pSynchronizeEvent)(rdpInput* input, uint32 flags); +typedef void (*pSynchronizeEvent)(rdpInput* input, UINT32 flags); typedef void (*pKeyboardEvent)(rdpInput* input, UINT16 flags, UINT16 code); typedef void (*pUnicodeKeyboardEvent)(rdpInput* input, UINT16 flags, UINT16 code); typedef void (*pMouseEvent)(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y); @@ -64,19 +64,19 @@ struct rdp_input { rdpContext* context; /* 0 */ void* param1; /* 1 */ - uint32 paddingA[16 - 2]; /* 2 */ + UINT32 paddingA[16 - 2]; /* 2 */ pSynchronizeEvent SynchronizeEvent; /* 16 */ pKeyboardEvent KeyboardEvent; /* 17 */ pUnicodeKeyboardEvent UnicodeKeyboardEvent; /* 18 */ pMouseEvent MouseEvent; /* 19 */ pExtendedMouseEvent ExtendedMouseEvent; /* 20 */ - uint32 paddingB[32 - 21]; /* 21 */ + UINT32 paddingB[32 - 21]; /* 21 */ }; -FREERDP_API void freerdp_input_send_synchronize_event(rdpInput* input, uint32 flags); +FREERDP_API void freerdp_input_send_synchronize_event(rdpInput* input, UINT32 flags); FREERDP_API void freerdp_input_send_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code); -FREERDP_API void freerdp_input_send_keyboard_event_ex(rdpInput* input, BOOL down, uint32 rdp_scancode); +FREERDP_API void freerdp_input_send_keyboard_event_ex(rdpInput* input, BOOL down, UINT32 rdp_scancode); FREERDP_API void freerdp_input_send_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code); 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); diff --git a/include/freerdp/locale/keyboard.h b/include/freerdp/locale/keyboard.h index 7a83e2155..5cbc12070 100644 --- a/include/freerdp/locale/keyboard.h +++ b/include/freerdp/locale/keyboard.h @@ -31,7 +31,7 @@ struct _RDP_KEYBOARD_LAYOUT { - uint32 code; /* Keyboard layout code */ + UINT32 code; /* Keyboard layout code */ char* name; /* Keyboard layout name */ }; typedef struct _RDP_KEYBOARD_LAYOUT RDP_KEYBOARD_LAYOUT; @@ -198,11 +198,11 @@ typedef struct _RDP_KEYBOARD_LAYOUT RDP_KEYBOARD_LAYOUT; #define KBD_TYPE_NOKIA_9140 0x00000006 /* Nokia 9140 and similar keyboards */ #define KBD_TYPE_JAPANESE 0x00000007 /* Japanese keyboard */ -FREERDP_API uint32 freerdp_keyboard_init(uint32 keyboardLayoutId); -FREERDP_API RDP_KEYBOARD_LAYOUT* freerdp_keyboard_get_layouts(uint32 types); -FREERDP_API const char* freerdp_keyboard_get_layout_name_from_id(uint32 keyboardLayoutId); -FREERDP_API RDP_SCANCODE freerdp_keyboard_get_rdp_scancode_from_x11_keycode(uint32 keycode); -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); +FREERDP_API UINT32 freerdp_keyboard_init(UINT32 keyboardLayoutId); +FREERDP_API RDP_KEYBOARD_LAYOUT* freerdp_keyboard_get_layouts(UINT32 types); +FREERDP_API const char* freerdp_keyboard_get_layout_name_from_id(UINT32 keyboardLayoutId); +FREERDP_API RDP_SCANCODE freerdp_keyboard_get_rdp_scancode_from_x11_keycode(UINT32 keycode); +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 */ diff --git a/include/freerdp/locale/locale.h b/include/freerdp/locale/locale.h index 7853d2806..ed27d3b05 100644 --- a/include/freerdp/locale/locale.h +++ b/include/freerdp/locale/locale.h @@ -230,8 +230,8 @@ #define YORUBA 0x046A #define ZULU 0x0435 -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); +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 */ diff --git a/include/freerdp/locale/vkcodes.h b/include/freerdp/locale/vkcodes.h index 7e30cdfbb..9e1ae6679 100644 --- a/include/freerdp/locale/vkcodes.h +++ b/include/freerdp/locale/vkcodes.h @@ -303,7 +303,7 @@ #define VK_PA1 0xFD /* PA1 key */ #define VK_OEM_CLEAR 0xFE /* Clear key */ -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); +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 */ diff --git a/include/freerdp/peer.h b/include/freerdp/peer.h index 3139ab2fb..470df19d7 100644 --- a/include/freerdp/peer.h +++ b/include/freerdp/peer.h @@ -72,7 +72,7 @@ struct rdp_freerdp_peer psPeerSendChannelData SendChannelData; psPeerReceiveChannelData ReceiveChannelData; - uint32 ack_frame_id; + UINT32 ack_frame_id; BOOL local; BOOL connected; BOOL activated; diff --git a/include/freerdp/pointer.h b/include/freerdp/pointer.h index 50c23fc46..d1688bd96 100644 --- a/include/freerdp/pointer.h +++ b/include/freerdp/pointer.h @@ -33,26 +33,26 @@ struct _POINTER_POSITION_UPDATE { - uint32 xPos; - uint32 yPos; + UINT32 xPos; + UINT32 yPos; }; typedef struct _POINTER_POSITION_UPDATE POINTER_POSITION_UPDATE; struct _POINTER_SYSTEM_UPDATE { - uint32 type; + UINT32 type; }; typedef struct _POINTER_SYSTEM_UPDATE POINTER_SYSTEM_UPDATE; struct _POINTER_COLOR_UPDATE { - uint32 cacheIndex; - uint32 xPos; - uint32 yPos; - uint32 width; - uint32 height; - uint32 lengthAndMask; - uint32 lengthXorMask; + UINT32 cacheIndex; + UINT32 xPos; + UINT32 yPos; + UINT32 width; + UINT32 height; + UINT32 lengthAndMask; + UINT32 lengthXorMask; BYTE* xorMaskData; BYTE* andMaskData; }; @@ -60,14 +60,14 @@ typedef struct _POINTER_COLOR_UPDATE POINTER_COLOR_UPDATE; struct _POINTER_NEW_UPDATE { - uint32 xorBpp; + UINT32 xorBpp; POINTER_COLOR_UPDATE colorPtrAttr; }; typedef struct _POINTER_NEW_UPDATE POINTER_NEW_UPDATE; struct _POINTER_CACHED_UPDATE { - uint32 cacheIndex; + UINT32 cacheIndex; }; typedef struct _POINTER_CACHED_UPDATE POINTER_CACHED_UPDATE; @@ -80,14 +80,14 @@ typedef void (*pPointerCached)(rdpContext* context, POINTER_CACHED_UPDATE* point struct rdp_pointer_update { rdpContext* context; /* 0 */ - uint32 paddingA[16 - 1]; /* 1 */ + UINT32 paddingA[16 - 1]; /* 1 */ pPointerPosition PointerPosition; /* 16 */ pPointerSystem PointerSystem; /* 17 */ pPointerColor PointerColor; /* 18 */ pPointerNew PointerNew; /* 19 */ pPointerCached PointerCached; /* 20 */ - uint32 paddingB[32 - 21]; /* 21 */ + UINT32 paddingB[32 - 21]; /* 21 */ /* internal */ diff --git a/include/freerdp/primary.h b/include/freerdp/primary.h index 346138cfe..ee3f71ab8 100644 --- a/include/freerdp/primary.h +++ b/include/freerdp/primary.h @@ -27,21 +27,21 @@ struct rdp_bounds { - sint32 left; - sint32 top; - sint32 right; - sint32 bottom; + INT32 left; + INT32 top; + INT32 right; + INT32 bottom; }; typedef struct rdp_bounds rdpBounds; struct rdp_brush { - uint32 x; - uint32 y; - uint32 bpp; - uint32 style; - uint32 hatch; - uint32 index; + UINT32 x; + UINT32 y; + UINT32 bpp; + UINT32 style; + UINT32 hatch; + UINT32 index; BYTE* data; BYTE p8x8[8]; }; @@ -49,313 +49,313 @@ typedef struct rdp_brush rdpBrush; struct _ORDER_INFO { - uint32 orderType; - uint32 fieldFlags; + UINT32 orderType; + UINT32 fieldFlags; rdpBounds bounds; - sint32 deltaBoundLeft; - sint32 deltaBoundTop; - sint32 deltaBoundRight; - sint32 deltaBoundBottom; + INT32 deltaBoundLeft; + INT32 deltaBoundTop; + INT32 deltaBoundRight; + INT32 deltaBoundBottom; BOOL deltaCoordinates; }; typedef struct _ORDER_INFO ORDER_INFO; struct _DSTBLT_ORDER { - sint32 nLeftRect; - sint32 nTopRect; - sint32 nWidth; - sint32 nHeight; - uint32 bRop; + INT32 nLeftRect; + INT32 nTopRect; + INT32 nWidth; + INT32 nHeight; + UINT32 bRop; }; typedef struct _DSTBLT_ORDER DSTBLT_ORDER; struct _PATBLT_ORDER { - sint32 nLeftRect; - sint32 nTopRect; - sint32 nWidth; - sint32 nHeight; - uint32 bRop; - uint32 backColor; - uint32 foreColor; + INT32 nLeftRect; + INT32 nTopRect; + INT32 nWidth; + INT32 nHeight; + UINT32 bRop; + UINT32 backColor; + UINT32 foreColor; rdpBrush brush; }; typedef struct _PATBLT_ORDER PATBLT_ORDER; struct _SCRBLT_ORDER { - sint32 nLeftRect; - sint32 nTopRect; - sint32 nWidth; - sint32 nHeight; - uint32 bRop; - sint32 nXSrc; - sint32 nYSrc; + INT32 nLeftRect; + INT32 nTopRect; + INT32 nWidth; + INT32 nHeight; + UINT32 bRop; + INT32 nXSrc; + INT32 nYSrc; }; typedef struct _SCRBLT_ORDER SCRBLT_ORDER; struct _OPAQUE_RECT_ORDER { - sint32 nLeftRect; - sint32 nTopRect; - sint32 nWidth; - sint32 nHeight; - uint32 color; + INT32 nLeftRect; + INT32 nTopRect; + INT32 nWidth; + INT32 nHeight; + UINT32 color; }; typedef struct _OPAQUE_RECT_ORDER OPAQUE_RECT_ORDER; struct _DRAW_NINE_GRID_ORDER { - sint32 srcLeft; - sint32 srcTop; - sint32 srcRight; - sint32 srcBottom; - uint32 bitmapId; + INT32 srcLeft; + INT32 srcTop; + INT32 srcRight; + INT32 srcBottom; + UINT32 bitmapId; }; typedef struct _DRAW_NINE_GRID_ORDER DRAW_NINE_GRID_ORDER; struct _DELTA_RECT { - sint32 left; - sint32 top; - sint32 width; - sint32 height; + INT32 left; + INT32 top; + INT32 width; + INT32 height; }; typedef struct _DELTA_RECT DELTA_RECT; struct _MULTI_DSTBLT_ORDER { - sint32 nLeftRect; - sint32 nTopRect; - sint32 nWidth; - sint32 nHeight; - uint32 bRop; - uint32 numRectangles; - uint32 cbData; + INT32 nLeftRect; + INT32 nTopRect; + INT32 nWidth; + INT32 nHeight; + UINT32 bRop; + UINT32 numRectangles; + UINT32 cbData; DELTA_RECT rectangles[45]; }; typedef struct _MULTI_DSTBLT_ORDER MULTI_DSTBLT_ORDER; struct _MULTI_PATBLT_ORDER { - sint32 nLeftRect; - sint32 nTopRect; - sint32 nWidth; - sint32 nHeight; - uint32 bRop; - uint32 backColor; - uint32 foreColor; + INT32 nLeftRect; + INT32 nTopRect; + INT32 nWidth; + INT32 nHeight; + UINT32 bRop; + UINT32 backColor; + UINT32 foreColor; rdpBrush brush; - uint32 numRectangles; - uint32 cbData; + UINT32 numRectangles; + UINT32 cbData; DELTA_RECT rectangles[45]; }; typedef struct _MULTI_PATBLT_ORDER MULTI_PATBLT_ORDER; struct _MULTI_SCRBLT_ORDER { - sint32 nLeftRect; - sint32 nTopRect; - sint32 nWidth; - sint32 nHeight; - uint32 bRop; - sint32 nXSrc; - sint32 nYSrc; - uint32 numRectangles; - uint32 cbData; + INT32 nLeftRect; + INT32 nTopRect; + INT32 nWidth; + INT32 nHeight; + UINT32 bRop; + INT32 nXSrc; + INT32 nYSrc; + UINT32 numRectangles; + UINT32 cbData; DELTA_RECT rectangles[45]; }; typedef struct _MULTI_SCRBLT_ORDER MULTI_SCRBLT_ORDER; struct _MULTI_OPAQUE_RECT_ORDER { - sint32 nLeftRect; - sint32 nTopRect; - sint32 nWidth; - sint32 nHeight; - uint32 color; - uint32 numRectangles; - uint32 cbData; + INT32 nLeftRect; + INT32 nTopRect; + INT32 nWidth; + INT32 nHeight; + UINT32 color; + UINT32 numRectangles; + UINT32 cbData; DELTA_RECT rectangles[45]; }; typedef struct _MULTI_OPAQUE_RECT_ORDER MULTI_OPAQUE_RECT_ORDER; struct _MULTI_DRAW_NINE_GRID_ORDER { - sint32 srcLeft; - sint32 srcTop; - sint32 srcRight; - sint32 srcBottom; - uint32 bitmapId; - uint32 nDeltaEntries; - uint32 cbData; + INT32 srcLeft; + INT32 srcTop; + INT32 srcRight; + INT32 srcBottom; + UINT32 bitmapId; + UINT32 nDeltaEntries; + UINT32 cbData; BYTE* codeDeltaList; }; typedef struct _MULTI_DRAW_NINE_GRID_ORDER MULTI_DRAW_NINE_GRID_ORDER; struct _LINE_TO_ORDER { - uint32 backMode; - sint32 nXStart; - sint32 nYStart; - sint32 nXEnd; - sint32 nYEnd; - uint32 backColor; - uint32 bRop2; - uint32 penStyle; - uint32 penWidth; - uint32 penColor; + UINT32 backMode; + INT32 nXStart; + INT32 nYStart; + INT32 nXEnd; + INT32 nYEnd; + UINT32 backColor; + UINT32 bRop2; + UINT32 penStyle; + UINT32 penWidth; + UINT32 penColor; }; typedef struct _LINE_TO_ORDER LINE_TO_ORDER; struct _DELTA_POINT { - sint32 x; - sint32 y; + INT32 x; + INT32 y; }; typedef struct _DELTA_POINT DELTA_POINT; struct _POLYLINE_ORDER { - sint32 xStart; - sint32 yStart; - uint32 bRop2; - uint32 penColor; - uint32 numPoints; - uint32 cbData; + INT32 xStart; + INT32 yStart; + UINT32 bRop2; + UINT32 penColor; + UINT32 numPoints; + UINT32 cbData; DELTA_POINT* points; }; typedef struct _POLYLINE_ORDER POLYLINE_ORDER; struct _MEMBLT_ORDER { - uint32 cacheId; - uint32 colorIndex; - sint32 nLeftRect; - sint32 nTopRect; - sint32 nWidth; - sint32 nHeight; - uint32 bRop; - sint32 nXSrc; - sint32 nYSrc; - uint32 cacheIndex; + UINT32 cacheId; + UINT32 colorIndex; + INT32 nLeftRect; + INT32 nTopRect; + INT32 nWidth; + INT32 nHeight; + UINT32 bRop; + INT32 nXSrc; + INT32 nYSrc; + UINT32 cacheIndex; rdpBitmap* bitmap; }; typedef struct _MEMBLT_ORDER MEMBLT_ORDER; struct _MEM3BLT_ORDER { - uint32 cacheId; - uint32 colorIndex; - sint32 nLeftRect; - sint32 nTopRect; - sint32 nWidth; - sint32 nHeight; - uint32 bRop; - sint32 nXSrc; - sint32 nYSrc; - uint32 backColor; - uint32 foreColor; + UINT32 cacheId; + UINT32 colorIndex; + INT32 nLeftRect; + INT32 nTopRect; + INT32 nWidth; + INT32 nHeight; + UINT32 bRop; + INT32 nXSrc; + INT32 nYSrc; + UINT32 backColor; + UINT32 foreColor; rdpBrush brush; - uint32 cacheIndex; + UINT32 cacheIndex; rdpBitmap* bitmap; }; typedef struct _MEM3BLT_ORDER MEM3BLT_ORDER; struct _SAVE_BITMAP_ORDER { - uint32 savedBitmapPosition; - sint32 nLeftRect; - sint32 nTopRect; - sint32 nRightRect; - sint32 nBottomRect; - uint32 operation; + UINT32 savedBitmapPosition; + INT32 nLeftRect; + INT32 nTopRect; + INT32 nRightRect; + INT32 nBottomRect; + UINT32 operation; }; typedef struct _SAVE_BITMAP_ORDER SAVE_BITMAP_ORDER; struct _GLYPH_FRAGMENT_INDEX { - uint32 index; - uint32 delta; + UINT32 index; + UINT32 delta; }; typedef struct _GLYPH_FRAGMENT_INDEX GLYPH_FRAGMENT_INDEX; struct _GLYPH_FRAGMENT { - uint32 operation; - uint32 index; - uint32 size; - uint32 nindices; + UINT32 operation; + UINT32 index; + UINT32 size; + UINT32 nindices; GLYPH_FRAGMENT_INDEX* indices; }; typedef struct _GLYPH_FRAGMENT GLYPH_FRAGMENT; struct _GLYPH_INDEX_ORDER { - uint32 cacheId; - uint32 flAccel; - uint32 ulCharInc; - uint32 fOpRedundant; - uint32 backColor; - uint32 foreColor; - sint32 bkLeft; - sint32 bkTop; - sint32 bkRight; - sint32 bkBottom; - sint32 opLeft; - sint32 opTop; - sint32 opRight; - sint32 opBottom; + UINT32 cacheId; + UINT32 flAccel; + UINT32 ulCharInc; + UINT32 fOpRedundant; + UINT32 backColor; + UINT32 foreColor; + INT32 bkLeft; + INT32 bkTop; + INT32 bkRight; + INT32 bkBottom; + INT32 opLeft; + INT32 opTop; + INT32 opRight; + INT32 opBottom; rdpBrush brush; - sint32 x; - sint32 y; - uint32 cbData; + INT32 x; + INT32 y; + UINT32 cbData; BYTE data[256]; }; typedef struct _GLYPH_INDEX_ORDER GLYPH_INDEX_ORDER; struct _FAST_INDEX_ORDER { - uint32 cacheId; - uint32 flAccel; - uint32 ulCharInc; - uint32 backColor; - uint32 foreColor; - sint32 bkLeft; - sint32 bkTop; - sint32 bkRight; - sint32 bkBottom; - sint32 opLeft; - sint32 opTop; - sint32 opRight; - sint32 opBottom; + UINT32 cacheId; + UINT32 flAccel; + UINT32 ulCharInc; + UINT32 backColor; + UINT32 foreColor; + INT32 bkLeft; + INT32 bkTop; + INT32 bkRight; + INT32 bkBottom; + INT32 opLeft; + INT32 opTop; + INT32 opRight; + INT32 opBottom; BOOL opaqueRect; - sint32 x; - sint32 y; - uint32 cbData; + INT32 x; + INT32 y; + UINT32 cbData; BYTE data[256]; }; typedef struct _FAST_INDEX_ORDER FAST_INDEX_ORDER; struct _FAST_GLYPH_ORDER { - uint32 cacheId; - uint32 flAccel; - uint32 ulCharInc; - uint32 backColor; - uint32 foreColor; - sint32 bkLeft; - sint32 bkTop; - sint32 bkRight; - sint32 bkBottom; - sint32 opLeft; - sint32 opTop; - sint32 opRight; - sint32 opBottom; - sint32 x; - sint32 y; - uint32 cbData; + UINT32 cacheId; + UINT32 flAccel; + UINT32 ulCharInc; + UINT32 backColor; + UINT32 foreColor; + INT32 bkLeft; + INT32 bkTop; + INT32 bkRight; + INT32 bkBottom; + INT32 opLeft; + INT32 opTop; + INT32 opRight; + INT32 opBottom; + INT32 x; + INT32 y; + UINT32 cbData; BYTE data[256]; void* glyph_data; }; @@ -363,55 +363,55 @@ typedef struct _FAST_GLYPH_ORDER FAST_GLYPH_ORDER; struct _POLYGON_SC_ORDER { - sint32 xStart; - sint32 yStart; - uint32 bRop2; - uint32 fillMode; - uint32 brushColor; - uint32 numPoints; - uint32 cbData; + INT32 xStart; + INT32 yStart; + UINT32 bRop2; + UINT32 fillMode; + UINT32 brushColor; + UINT32 numPoints; + UINT32 cbData; DELTA_POINT* points; }; typedef struct _POLYGON_SC_ORDER POLYGON_SC_ORDER; struct _POLYGON_CB_ORDER { - sint32 xStart; - sint32 yStart; - uint32 bRop2; - uint32 backMode; - uint32 fillMode; - uint32 backColor; - uint32 foreColor; + INT32 xStart; + INT32 yStart; + UINT32 bRop2; + UINT32 backMode; + UINT32 fillMode; + UINT32 backColor; + UINT32 foreColor; rdpBrush brush; - uint32 numPoints; - uint32 cbData; + UINT32 numPoints; + UINT32 cbData; DELTA_POINT* points; }; typedef struct _POLYGON_CB_ORDER POLYGON_CB_ORDER; struct _ELLIPSE_SC_ORDER { - sint32 leftRect; - sint32 topRect; - sint32 rightRect; - sint32 bottomRect; - uint32 bRop2; - uint32 fillMode; - uint32 color; + INT32 leftRect; + INT32 topRect; + INT32 rightRect; + INT32 bottomRect; + UINT32 bRop2; + UINT32 fillMode; + UINT32 color; }; typedef struct _ELLIPSE_SC_ORDER ELLIPSE_SC_ORDER; struct _ELLIPSE_CB_ORDER { - sint32 leftRect; - sint32 topRect; - sint32 rightRect; - sint32 bottomRect; - uint32 bRop2; - uint32 fillMode; - uint32 backColor; - uint32 foreColor; + INT32 leftRect; + INT32 topRect; + INT32 rightRect; + INT32 bottomRect; + UINT32 bRop2; + UINT32 fillMode; + UINT32 backColor; + UINT32 foreColor; rdpBrush brush; }; typedef struct _ELLIPSE_CB_ORDER ELLIPSE_CB_ORDER; @@ -442,7 +442,7 @@ typedef void (*pEllipseCB)(rdpContext* context, ELLIPSE_CB_ORDER* ellipse_cb); struct rdp_primary_update { rdpContext* context; /* 0 */ - uint32 paddingA[16 - 1]; /* 1 */ + UINT32 paddingA[16 - 1]; /* 1 */ pDstBlt DstBlt; /* 16 */ pPatBlt PatBlt; /* 17 */ @@ -466,7 +466,7 @@ struct rdp_primary_update pPolygonCB PolygonCB; /* 35 */ pEllipseSC EllipseSC; /* 36 */ pEllipseCB EllipseCB; /* 37 */ - uint32 paddingB[48 - 38]; /* 38 */ + UINT32 paddingB[48 - 38]; /* 38 */ /* internal */ diff --git a/include/freerdp/rail.h b/include/freerdp/rail.h index 40b4ea783..19876a828 100644 --- a/include/freerdp/rail.h +++ b/include/freerdp/rail.h @@ -159,8 +159,8 @@ typedef struct _RAIL_UNICODE_STRING RAIL_UNICODE_STRING; struct _HIGH_CONTRAST { - uint32 flags; - uint32 colorSchemeLength; + UINT32 flags; + UINT32 colorSchemeLength; RAIL_UNICODE_STRING colorScheme; }; typedef struct _HIGH_CONTRAST HIGH_CONTRAST; @@ -169,13 +169,13 @@ typedef struct _HIGH_CONTRAST HIGH_CONTRAST; struct _RAIL_HANDSHAKE_ORDER { - uint32 buildNumber; + UINT32 buildNumber; }; typedef struct _RAIL_HANDSHAKE_ORDER RAIL_HANDSHAKE_ORDER; struct _RAIL_CLIENT_STATUS_ORDER { - uint32 flags; + UINT32 flags; }; typedef struct _RAIL_CLIENT_STATUS_ORDER RAIL_CLIENT_STATUS_ORDER; @@ -192,15 +192,15 @@ struct _RAIL_EXEC_RESULT_ORDER { UINT16 flags; UINT16 execResult; - uint32 rawResult; + UINT32 rawResult; RAIL_UNICODE_STRING exeOrFile; }; typedef struct _RAIL_EXEC_RESULT_ORDER RAIL_EXEC_RESULT_ORDER; struct _RAIL_SYSPARAM_ORDER { - uint32 param; - uint32 params; + UINT32 param; + UINT32 params; BOOL dragFullWindows; BOOL keyboardCues; BOOL keyboardPref; @@ -216,14 +216,14 @@ typedef struct _RAIL_SYSPARAM_ORDER RAIL_SYSPARAM_ORDER; struct _RAIL_ACTIVATE_ORDER { - uint32 windowId; + UINT32 windowId; BOOL enabled; }; typedef struct _RAIL_ACTIVATE_ORDER RAIL_ACTIVATE_ORDER; struct _RAIL_SYSMENU_ORDER { - uint32 windowId; + UINT32 windowId; UINT16 left; UINT16 top; }; @@ -231,22 +231,22 @@ typedef struct _RAIL_SYSMENU_ORDER RAIL_SYSMENU_ORDER; struct _RAIL_SYSCOMMAND_ORDER { - uint32 windowId; + UINT32 windowId; UINT16 command; }; typedef struct _RAIL_SYSCOMMAND_ORDER RAIL_SYSCOMMAND_ORDER; struct _RAIL_NOTIFY_EVENT_ORDER { - uint32 windowId; - uint32 notifyIconId; - uint32 message; + UINT32 windowId; + UINT32 notifyIconId; + UINT32 message; }; typedef struct _RAIL_NOTIFY_EVENT_ORDER RAIL_NOTIFY_EVENT_ORDER; struct _RAIL_MINMAXINFO_ORDER { - uint32 windowId; + UINT32 windowId; UINT16 maxWidth; UINT16 maxHeight; UINT16 maxPosX; @@ -260,7 +260,7 @@ typedef struct _RAIL_MINMAXINFO_ORDER RAIL_MINMAXINFO_ORDER; struct _RAIL_LOCALMOVESIZE_ORDER { - uint32 windowId; + UINT32 windowId; BOOL isMoveSizeStart; UINT16 moveSizeType; UINT16 posX; @@ -270,7 +270,7 @@ typedef struct _RAIL_LOCALMOVESIZE_ORDER RAIL_LOCALMOVESIZE_ORDER; struct _RAIL_WINDOWMOVE_ORDER { - uint32 windowId; + UINT32 windowId; UINT16 left; UINT16 top; UINT16 right; @@ -280,13 +280,13 @@ typedef struct _RAIL_WINDOWMOVE_ORDER RAIL_WINDOW_MOVE_ORDER; struct _RAIL_GET_APPID_REQ_ORDER { - uint32 windowId; + UINT32 windowId; }; typedef struct _RAIL_GET_APPID_REQ_ORDER RAIL_GET_APPID_REQ_ORDER; struct _RAIL_GET_APPID_RESP_ORDER { - uint32 windowId; + UINT32 windowId; RAIL_UNICODE_STRING applicationId; BYTE applicationIdBuffer[512]; }; @@ -294,7 +294,7 @@ typedef struct _RAIL_GET_APPID_RESP_ORDER RAIL_GET_APPID_RESP_ORDER; struct _RAIL_LANGBARINFO_ORDER { - uint32 languageBarStatus; + UINT32 languageBarStatus; }; typedef struct _RAIL_LANGBARINFO_ORDER RAIL_LANGBAR_INFO_ORDER; diff --git a/include/freerdp/rail/window.h b/include/freerdp/rail/window.h index 78d681699..21a3befb5 100644 --- a/include/freerdp/rail/window.h +++ b/include/freerdp/rail/window.h @@ -38,31 +38,31 @@ struct rdp_window char* title; rdpIcon* bigIcon; rdpIcon* smallIcon; - uint32 fieldFlags; + UINT32 fieldFlags; rdpWindow* prev; rdpWindow* next; - uint32 windowId; - uint32 ownerWindowId; - uint32 style; - uint32 extendedStyle; + UINT32 windowId; + UINT32 ownerWindowId; + UINT32 style; + UINT32 extendedStyle; BYTE showState; RAIL_UNICODE_STRING titleInfo; - uint32 clientOffsetX; - uint32 clientOffsetY; - uint32 clientAreaWidth; - uint32 clientAreaHeight; + UINT32 clientOffsetX; + UINT32 clientOffsetY; + UINT32 clientAreaWidth; + UINT32 clientAreaHeight; BYTE RPContent; - uint32 rootParentHandle; - sint32 windowOffsetX; - sint32 windowOffsetY; - uint32 windowClientDeltaX; - uint32 windowClientDeltaY; - uint32 windowWidth; - uint32 windowHeight; + UINT32 rootParentHandle; + INT32 windowOffsetX; + INT32 windowOffsetY; + UINT32 windowClientDeltaX; + UINT32 windowClientDeltaY; + UINT32 windowWidth; + UINT32 windowHeight; UINT16 numWindowRects; RECTANGLE_16* windowRects; - uint32 visibleOffsetX; - uint32 visibleOffsetY; + UINT32 visibleOffsetX; + UINT32 visibleOffsetY; UINT16 numVisibilityRects; RECTANGLE_16* visibilityRects; }; diff --git a/include/freerdp/rail/window_list.h b/include/freerdp/rail/window_list.h index a9e6ba13b..89b89016c 100644 --- a/include/freerdp/rail/window_list.h +++ b/include/freerdp/rail/window_list.h @@ -42,7 +42,7 @@ FREERDP_API void window_list_rewind(rdpWindowList* list); FREERDP_API BOOL window_list_has_next(rdpWindowList* list); FREERDP_API rdpWindow* window_list_get_next(rdpWindowList* list); -FREERDP_API rdpWindow* window_list_get_by_id(rdpWindowList* list, uint32 windowId); +FREERDP_API rdpWindow* window_list_get_by_id(rdpWindowList* list, UINT32 windowId); FREERDP_API rdpWindow* window_list_get_by_extra_id(rdpWindowList* list, void* extraId); FREERDP_API void window_list_create(rdpWindowList* list, WINDOW_ORDER_INFO* orderInfo, WINDOW_STATE_ORDER* window_state); diff --git a/include/freerdp/scancode.h b/include/freerdp/scancode.h index 98e2623fe..2cad570ed 100644 --- a/include/freerdp/scancode.h +++ b/include/freerdp/scancode.h @@ -27,7 +27,7 @@ * The extended flag is for all practical an important 9th bit with a strange encoding - not just a modifier. */ -typedef uint32 RDP_SCANCODE; /* Our own representation of a RDP protocol scancode */ +typedef UINT32 RDP_SCANCODE; /* Our own representation of a RDP protocol scancode */ #define RDP_SCANCODE_CODE(_rdp_scancode) ((BYTE)(_rdp_scancode & 0xFF)) #define RDP_SCANCODE_EXTENDED(_rdp_scancode) (((_rdp_scancode) & 0x100) ? TRUE : FALSE) #define MAKE_RDP_SCANCODE(_code, _extended) (((_code) & 0xFF) | ((_extended) ? 0x100 : 0)) diff --git a/include/freerdp/secondary.h b/include/freerdp/secondary.h index 0213743eb..5f64bbb30 100644 --- a/include/freerdp/secondary.h +++ b/include/freerdp/secondary.h @@ -68,12 +68,12 @@ struct _CACHE_BITMAP_ORDER { - uint32 cacheId; - uint32 bitmapBpp; - uint32 bitmapWidth; - uint32 bitmapHeight; - uint32 bitmapLength; - uint32 cacheIndex; + UINT32 cacheId; + UINT32 bitmapBpp; + UINT32 bitmapWidth; + UINT32 bitmapHeight; + UINT32 bitmapLength; + UINT32 cacheIndex; BOOL compressed; BYTE bitmapComprHdr[8]; BYTE* bitmapDataStream; @@ -82,71 +82,71 @@ typedef struct _CACHE_BITMAP_ORDER CACHE_BITMAP_ORDER; struct _CACHE_BITMAP_V2_ORDER { - uint32 cacheId; - uint32 flags; - uint32 key1; - uint32 key2; - uint32 bitmapBpp; - uint32 bitmapWidth; - uint32 bitmapHeight; - uint32 bitmapLength; - uint32 cacheIndex; + UINT32 cacheId; + UINT32 flags; + UINT32 key1; + UINT32 key2; + UINT32 bitmapBpp; + UINT32 bitmapWidth; + UINT32 bitmapHeight; + UINT32 bitmapLength; + UINT32 cacheIndex; BOOL compressed; - uint32 cbCompFirstRowSize; - uint32 cbCompMainBodySize; - uint32 cbScanWidth; - uint32 cbUncompressedSize; + UINT32 cbCompFirstRowSize; + UINT32 cbCompMainBodySize; + UINT32 cbScanWidth; + UINT32 cbUncompressedSize; BYTE* bitmapDataStream; }; typedef struct _CACHE_BITMAP_V2_ORDER CACHE_BITMAP_V2_ORDER; struct _BITMAP_DATA_EX { - uint32 bpp; - uint32 codecID; - uint32 width; - uint32 height; - uint32 length; + UINT32 bpp; + UINT32 codecID; + UINT32 width; + UINT32 height; + UINT32 length; BYTE* data; }; typedef struct _BITMAP_DATA_EX BITMAP_DATA_EX; struct _CACHE_BITMAP_V3_ORDER { - uint32 cacheId; - uint32 bpp; - uint32 flags; - uint32 cacheIndex; - uint32 key1; - uint32 key2; + UINT32 cacheId; + UINT32 bpp; + UINT32 flags; + UINT32 cacheIndex; + UINT32 key1; + UINT32 key2; BITMAP_DATA_EX bitmapData; }; typedef struct _CACHE_BITMAP_V3_ORDER CACHE_BITMAP_V3_ORDER; struct _CACHE_COLOR_TABLE_ORDER { - uint32 cacheIndex; - uint32 numberColors; - uint32* colorTable; + UINT32 cacheIndex; + UINT32 numberColors; + UINT32* colorTable; }; typedef struct _CACHE_COLOR_TABLE_ORDER CACHE_COLOR_TABLE_ORDER; struct _GLYPH_DATA { - uint32 cacheIndex; - sint32 x; - sint32 y; - uint32 cx; - uint32 cy; - uint32 cb; + UINT32 cacheIndex; + INT32 x; + INT32 y; + UINT32 cx; + UINT32 cy; + UINT32 cb; BYTE* aj; }; typedef struct _GLYPH_DATA GLYPH_DATA; struct _CACHE_GLYPH_ORDER { - uint32 cacheId; - uint32 cGlyphs; + UINT32 cacheId; + UINT32 cGlyphs; GLYPH_DATA* glyphData[255]; BYTE* unicodeCharacters; }; @@ -154,21 +154,21 @@ typedef struct _CACHE_GLYPH_ORDER CACHE_GLYPH_ORDER; struct _GLYPH_DATA_V2 { - uint32 cacheIndex; - sint32 x; - sint32 y; - uint32 cx; - uint32 cy; - uint32 cb; + UINT32 cacheIndex; + INT32 x; + INT32 y; + UINT32 cx; + UINT32 cy; + UINT32 cb; BYTE* aj; }; typedef struct _GLYPH_DATA_V2 GLYPH_DATA_V2; struct _CACHE_GLYPH_V2_ORDER { - uint32 cacheId; - uint32 flags; - uint32 cGlyphs; + UINT32 cacheId; + UINT32 flags; + UINT32 cGlyphs; GLYPH_DATA_V2* glyphData[255]; BYTE* unicodeCharacters; }; @@ -176,12 +176,12 @@ typedef struct _CACHE_GLYPH_V2_ORDER CACHE_GLYPH_V2_ORDER; struct _CACHE_BRUSH_ORDER { - uint32 index; - uint32 bpp; - uint32 cx; - uint32 cy; - uint32 style; - uint32 length; + UINT32 index; + UINT32 bpp; + UINT32 cx; + UINT32 cy; + UINT32 style; + UINT32 length; BYTE* data; }; typedef struct _CACHE_BRUSH_ORDER CACHE_BRUSH_ORDER; @@ -197,7 +197,7 @@ typedef void (*pCacheBrush)(rdpContext* context, CACHE_BRUSH_ORDER* cache_brush_ struct rdp_secondary_update { rdpContext* context; /* 0 */ - uint32 paddingA[16 - 1]; /* 1 */ + UINT32 paddingA[16 - 1]; /* 1 */ pCacheBitmap CacheBitmap; /* 16 */ pCacheBitmapV2 CacheBitmapV2; /* 17 */ @@ -206,7 +206,7 @@ struct rdp_secondary_update pCacheGlyph CacheGlyph; /* 20 */ pCacheGlyphV2 CacheGlyphV2; /* 21 */ pCacheBrush CacheBrush; /* 22 */ - uint32 paddingE[32 - 23]; /* 23 */ + UINT32 paddingE[32 - 23]; /* 23 */ /* internal */ diff --git a/include/freerdp/server/audin.h b/include/freerdp/server/audin.h index 2d32b3f56..758e9ca05 100644 --- a/include/freerdp/server/audin.h +++ b/include/freerdp/server/audin.h @@ -30,7 +30,7 @@ typedef BOOL (*psAudinServerOpen)(audin_server_context* context); typedef BOOL (*psAudinServerClose)(audin_server_context* context); typedef void (*psAudinServerOpening)(audin_server_context* context); -typedef void (*psAudinServerOpenResult)(audin_server_context* context, uint32 result); +typedef void (*psAudinServerOpenResult)(audin_server_context* context, UINT32 result); typedef void (*psAudinServerReceiveSamples)(audin_server_context* context, const void* buf, int nframes); struct _audin_server_context diff --git a/include/freerdp/settings.h b/include/freerdp/settings.h index f44aadec8..710522398 100644 --- a/include/freerdp/settings.h +++ b/include/freerdp/settings.h @@ -112,31 +112,31 @@ typedef struct /* TIME_ZONE_INFORMATION */ struct _TIME_ZONE_INFO { - uint32 bias; + UINT32 bias; char standardName[32]; SYSTEM_TIME standardDate; - uint32 standardBias; + UINT32 standardBias; char daylightName[32]; SYSTEM_TIME daylightDate; - uint32 daylightBias; + UINT32 daylightBias; }; typedef struct _TIME_ZONE_INFO TIME_ZONE_INFO; /* ARC_CS_PRIVATE_PACKET */ typedef struct { - uint32 cbLen; - uint32 version; - uint32 logonId; + UINT32 cbLen; + UINT32 version; + UINT32 logonId; BYTE securityVerifier[16]; } ARC_CS_PRIVATE_PACKET; /* ARC_SC_PRIVATE_PACKET */ typedef struct { - uint32 cbLen; - uint32 version; - uint32 logonId; + UINT32 cbLen; + UINT32 version; + UINT32 logonId; BYTE arcRandomBits[16]; } ARC_SC_PRIVATE_PACKET; @@ -144,14 +144,14 @@ typedef struct struct rdp_CertBlob { - uint32 length; + UINT32 length; BYTE* data; }; typedef struct rdp_CertBlob rdpCertBlob; struct rdp_X509CertChain { - uint32 count; + UINT32 count; rdpCertBlob* array; }; typedef struct rdp_X509CertChain rdpX509CertChain; @@ -212,7 +212,7 @@ typedef struct _BITMAP_CACHE_CELL_INFO BITMAP_CACHE_CELL_INFO; struct _BITMAP_CACHE_V2_CELL_INFO { - uint32 numEntries; + UINT32 numEntries; BOOL persistent; }; typedef struct _BITMAP_CACHE_V2_CELL_INFO BITMAP_CACHE_V2_CELL_INFO; @@ -252,29 +252,29 @@ struct rdp_monitor struct rdp_settings { ALIGN64 void* instance; /* 0 */ - uint64 paddingA[16 - 1]; /* 1 */ + UINT64 paddingA[16 - 1]; /* 1 */ /* Core Protocol Parameters */ - ALIGN64 uint32 width; /* 16 */ - ALIGN64 uint32 height; /* 17 */ - ALIGN64 uint32 rdp_version; /* 18 */ - ALIGN64 uint32 color_depth; /* 19 */ - ALIGN64 uint32 kbd_layout; /* 20 */ - ALIGN64 uint32 kbd_type; /* 21 */ - ALIGN64 uint32 kbd_subtype; /* 22 */ - ALIGN64 uint32 kbd_fn_keys; /* 23 */ - ALIGN64 uint32 client_build; /* 24 */ - ALIGN64 uint32 requested_protocols; /* 25 */ - ALIGN64 uint32 selected_protocol; /* 26 */ - ALIGN64 uint32 encryption_method; /* 27 */ - ALIGN64 uint32 encryption_level; /* 28 */ + ALIGN64 UINT32 width; /* 16 */ + ALIGN64 UINT32 height; /* 17 */ + ALIGN64 UINT32 rdp_version; /* 18 */ + ALIGN64 UINT32 color_depth; /* 19 */ + ALIGN64 UINT32 kbd_layout; /* 20 */ + ALIGN64 UINT32 kbd_type; /* 21 */ + ALIGN64 UINT32 kbd_subtype; /* 22 */ + ALIGN64 UINT32 kbd_fn_keys; /* 23 */ + ALIGN64 UINT32 client_build; /* 24 */ + ALIGN64 UINT32 requested_protocols; /* 25 */ + ALIGN64 UINT32 selected_protocol; /* 26 */ + ALIGN64 UINT32 encryption_method; /* 27 */ + ALIGN64 UINT32 encryption_level; /* 28 */ ALIGN64 BOOL authentication; /* 29 */ - ALIGN64 uint32 negotiationFlags; /* 30 */ + ALIGN64 UINT32 negotiationFlags; /* 30 */ ALIGN64 BOOL security_layer_negotiation; /* 31 */ - uint64 paddingB[48 - 32]; /* 32 */ + UINT64 paddingB[48 - 32]; /* 32 */ /* Connection Settings */ - ALIGN64 uint32 port; /* 48 */ + ALIGN64 UINT32 port; /* 48 */ ALIGN64 BOOL ipv6; /* 49 */ ALIGN64 char* hostname; /* 50 */ ALIGN64 char* username; /* 51 */ @@ -286,7 +286,7 @@ struct rdp_settings ALIGN64 char* client_dir; /* 57 */ ALIGN64 BOOL autologon; /* 58 */ ALIGN64 BOOL compression; /* 59 */ - ALIGN64 uint32 performance_flags; /* 60 */ + ALIGN64 UINT32 performance_flags; /* 60 */ ALIGN64 BYTE* password_cookie; /* 61 */ ALIGN64 DWORD password_cookie_length; /* 62 */ ALIGN64 char* kerberos_kdc; /* 63 */ @@ -299,9 +299,9 @@ struct rdp_settings ALIGN64 BOOL authentication_only; /* 70 */ ALIGN64 BOOL from_stdin; /* 71 */ ALIGN64 BOOL send_preconnection_pdu; /* 72 */ - ALIGN64 uint32 preconnection_id; /* 73 */ + ALIGN64 UINT32 preconnection_id; /* 73 */ ALIGN64 char* preconnection_blob; /* 74 */ - uint64 paddingC[80 - 75]; /* 75 */ + UINT64 paddingC[80 - 75]; /* 75 */ /* User Interface Parameters */ ALIGN64 BOOL sw_gdi; /* 80 */ @@ -309,61 +309,61 @@ struct rdp_settings ALIGN64 BOOL fullscreen; /* 82 */ ALIGN64 BOOL grab_keyboard; /* 83 */ ALIGN64 BOOL decorations; /* 84 */ - ALIGN64 uint32 percent_screen; /* 85 */ + ALIGN64 UINT32 percent_screen; /* 85 */ ALIGN64 BOOL mouse_motion; /* 86 */ ALIGN64 char* window_title; /* 87 */ - ALIGN64 uint64 parent_window_xid; /* 88 */ - uint64 paddingD[112 - 89]; /* 89 */ + ALIGN64 UINT64 parent_window_xid; /* 88 */ + UINT64 paddingD[112 - 89]; /* 89 */ /* Internal Parameters */ ALIGN64 char* home_path; /* 112 */ - ALIGN64 uint32 share_id; /* 113 */ - ALIGN64 uint32 pdu_source; /* 114 */ + ALIGN64 UINT32 share_id; /* 113 */ + ALIGN64 UINT32 pdu_source; /* 114 */ ALIGN64 void* unused115; /* 115 */ ALIGN64 BOOL server_mode; /* 116 */ ALIGN64 char* config_path; /* 117 */ ALIGN64 char* current_path; /* 118 */ ALIGN64 char* development_path; /* 119 */ ALIGN64 BOOL development_mode; /* 120 */ - uint64 paddingE[144 - 121]; /* 121 */ + UINT64 paddingE[144 - 121]; /* 121 */ /* Security */ ALIGN64 BOOL encryption; /* 144 */ ALIGN64 BOOL tls_security; /* 145 */ ALIGN64 BOOL nla_security; /* 146 */ ALIGN64 BOOL rdp_security; /* 147 */ - ALIGN64 uint32 ntlm_version; /* 148 */ + ALIGN64 UINT32 ntlm_version; /* 148 */ ALIGN64 BOOL salted_checksum; /* 149 */ - uint64 paddingF[160 - 150]; /* 150 */ + UINT64 paddingF[160 - 150]; /* 150 */ /* Session */ ALIGN64 BOOL console_audio; /* 160 */ ALIGN64 BOOL console_session; /* 161 */ - ALIGN64 uint32 redirected_session_id; /* 162 */ + ALIGN64 UINT32 redirected_session_id; /* 162 */ ALIGN64 BOOL audio_playback; /* 163 */ ALIGN64 BOOL audio_capture; /* 164 */ - uint64 paddingG[176 - 165]; /* 165 */ + UINT64 paddingG[176 - 165]; /* 165 */ /* Output Control */ ALIGN64 BOOL refresh_rect; /* 176 */ ALIGN64 BOOL suppress_output; /* 177 */ ALIGN64 BOOL desktop_resize; /* 178 */ - uint64 paddingH[192 - 179]; /* 179 */ + UINT64 paddingH[192 - 179]; /* 179 */ /* Reconnection */ ALIGN64 BOOL auto_reconnection; /* 192 */ ALIGN64 ARC_CS_PRIVATE_PACKET* client_auto_reconnect_cookie; /* 193 */ ALIGN64 ARC_SC_PRIVATE_PACKET* server_auto_reconnect_cookie; /* 194 */ - uint64 paddingI[208 - 195]; /* 195 */ + UINT64 paddingI[208 - 195]; /* 195 */ /* Time Zone */ ALIGN64 TIME_ZONE_INFO* client_time_zone; /* 208 */ - uint64 paddingJ[216 - 209]; /* 209 */ + UINT64 paddingJ[216 - 209]; /* 209 */ /* Capabilities */ - ALIGN64 uint32 os_major_type; /* 216 */ - ALIGN64 uint32 os_minor_type; /* 217 */ - ALIGN64 uint32 vc_chunk_size; /* 218 */ + ALIGN64 UINT32 os_major_type; /* 216 */ + ALIGN64 UINT32 os_minor_type; /* 217 */ + ALIGN64 UINT32 vc_chunk_size; /* 218 */ ALIGN64 BOOL sound_beeps; /* 219 */ ALIGN64 BOOL smooth_fonts; /* 220 */ ALIGN64 BOOL frame_marker; /* 221 */ @@ -376,9 +376,9 @@ struct rdp_settings ALIGN64 BOOL disable_full_window_drag; /* 228 */ ALIGN64 BOOL disable_menu_animations; /* 229 */ ALIGN64 BOOL disable_theming; /* 230 */ - ALIGN64 uint32 connection_type; /* 231 */ - ALIGN64 uint32 multifrag_max_request_size; /* 232 */ - uint64 paddingK[248 - 233]; /* 233 */ + ALIGN64 UINT32 connection_type; /* 231 */ + ALIGN64 UINT32 multifrag_max_request_size; /* 232 */ + UINT64 paddingK[248 - 233]; /* 233 */ /* Certificate */ ALIGN64 char* cert_file; /* 248 */ @@ -394,77 +394,77 @@ struct rdp_settings ALIGN64 char* rdp_key_file; /* 258 */ ALIGN64 rdpKey* server_key; /* 259 */ ALIGN64 char* certificate_name; /* 260 */ - uint64 paddingL[280 - 261]; /* 261 */ + UINT64 paddingL[280 - 261]; /* 261 */ /* Codecs */ ALIGN64 BOOL rfx_codec; /* 280 */ ALIGN64 BOOL ns_codec; /* 281 */ - ALIGN64 uint32 rfx_codec_id; /* 282 */ - ALIGN64 uint32 ns_codec_id; /* 283 */ - ALIGN64 uint32 rfx_codec_mode; /* 284 */ + ALIGN64 UINT32 rfx_codec_id; /* 282 */ + ALIGN64 UINT32 ns_codec_id; /* 283 */ + ALIGN64 UINT32 rfx_codec_mode; /* 284 */ ALIGN64 BOOL frame_acknowledge; /* 285 */ ALIGN64 BOOL jpeg_codec; /* 286 */ - ALIGN64 uint32 jpeg_codec_id; /* 287 */ - ALIGN64 uint32 jpeg_quality; /* 288 */ - ALIGN64 uint32 v3_codec_id; /* 289 */ + ALIGN64 UINT32 jpeg_codec_id; /* 287 */ + ALIGN64 UINT32 jpeg_quality; /* 288 */ + ALIGN64 UINT32 v3_codec_id; /* 289 */ ALIGN64 BOOL rfx_codec_only; /* 290 */ - uint64 paddingM[296 - 291]; /* 291 */ + UINT64 paddingM[296 - 291]; /* 291 */ /* Recording */ ALIGN64 BOOL dump_rfx; /* 296 */ ALIGN64 BOOL play_rfx; /* 297 */ ALIGN64 char* dump_rfx_file; /* 298 */ ALIGN64 char* play_rfx_file; /* 299 */ - uint64 paddingN[312 - 300]; /* 300 */ + UINT64 paddingN[312 - 300]; /* 300 */ /* RemoteApp */ ALIGN64 BOOL remote_app; /* 312 */ - ALIGN64 uint32 num_icon_caches; /* 313 */ - ALIGN64 uint32 num_icon_cache_entries; /* 314 */ + ALIGN64 UINT32 num_icon_caches; /* 313 */ + ALIGN64 UINT32 num_icon_cache_entries; /* 314 */ ALIGN64 BOOL rail_langbar_supported; /* 315 */ - uint64 paddingO[320 - 316]; /* 316 */ + UINT64 paddingO[320 - 316]; /* 316 */ /* Pointer */ ALIGN64 BOOL large_pointer; /* 320 */ ALIGN64 BOOL color_pointer; /* 321 */ - ALIGN64 uint32 pointer_cache_size; /* 322 */ - uint64 paddingP[328 - 323]; /* 323 */ + ALIGN64 UINT32 pointer_cache_size; /* 322 */ + UINT64 paddingP[328 - 323]; /* 323 */ /* Bitmap Cache */ ALIGN64 BOOL bitmap_cache; /* 328 */ ALIGN64 BOOL bitmap_cache_v3; /* 329 */ ALIGN64 BOOL persistent_bitmap_cache; /* 330 */ - ALIGN64 uint32 bitmapCacheV2NumCells; /* 331 */ + ALIGN64 UINT32 bitmapCacheV2NumCells; /* 331 */ ALIGN64 BITMAP_CACHE_V2_CELL_INFO* bitmapCacheV2CellInfo; /* 332 */ - uint64 paddingQ[344 - 333]; /* 333 */ + UINT64 paddingQ[344 - 333]; /* 333 */ /* Offscreen Bitmap Cache */ ALIGN64 BOOL offscreen_bitmap_cache; /* 344 */ - ALIGN64 uint32 offscreen_bitmap_cache_size; /* 345 */ - ALIGN64 uint32 offscreen_bitmap_cache_entries; /* 346 */ - uint64 paddingR[352 - 347]; /* 347 */ + ALIGN64 UINT32 offscreen_bitmap_cache_size; /* 345 */ + ALIGN64 UINT32 offscreen_bitmap_cache_entries; /* 346 */ + UINT64 paddingR[352 - 347]; /* 347 */ /* Glyph Cache */ ALIGN64 BOOL glyph_cache; /* 352 */ - ALIGN64 uint32 glyphSupportLevel; /* 353 */ + ALIGN64 UINT32 glyphSupportLevel; /* 353 */ ALIGN64 GLYPH_CACHE_DEFINITION* glyphCache; /* 354 */ ALIGN64 GLYPH_CACHE_DEFINITION* fragCache; /* 355 */ - uint64 paddingS[360 - 356]; /* 356 */ + UINT64 paddingS[360 - 356]; /* 356 */ /* Draw Nine Grid */ ALIGN64 BOOL draw_nine_grid; /* 360 */ - ALIGN64 uint32 draw_nine_grid_cache_size; /* 361 */ - ALIGN64 uint32 draw_nine_grid_cache_entries; /* 362 */ - uint64 paddingT[368 - 363]; /* 363 */ + ALIGN64 UINT32 draw_nine_grid_cache_size; /* 361 */ + ALIGN64 UINT32 draw_nine_grid_cache_entries; /* 362 */ + UINT64 paddingT[368 - 363]; /* 363 */ /* Draw GDI+ */ ALIGN64 BOOL draw_gdi_plus; /* 368 */ ALIGN64 BOOL draw_gdi_plus_cache; /* 369 */ - uint64 paddingU[376 - 370]; /* 370 */ + UINT64 paddingU[376 - 370]; /* 370 */ /* Desktop Composition */ ALIGN64 BOOL desktop_composition; /* 376 */ - uint64 paddingV[384 - 377]; /* 377 */ + UINT64 paddingV[384 - 377]; /* 377 */ /* Channels */ ALIGN64 int num_channels; diff --git a/include/freerdp/svc.h b/include/freerdp/svc.h index c0b10458b..3f16412a4 100644 --- a/include/freerdp/svc.h +++ b/include/freerdp/svc.h @@ -36,19 +36,19 @@ struct _CHANNEL_DEF { char name[CHANNEL_NAME_LEN + 1]; - uint32 options; + UINT32 options; }; typedef struct _CHANNEL_DEF CHANNEL_DEF; typedef CHANNEL_DEF* PCHANNEL_DEF; typedef CHANNEL_DEF** PPCHANNEL_DEF; typedef void (FREERDP_CC * PCHANNEL_INIT_EVENT_FN)(void* pInitHandle, - uint32 event, void* pData, uint32 dataLength); + UINT32 event, void* pData, UINT32 dataLength); -typedef void (FREERDP_CC * PCHANNEL_OPEN_EVENT_FN)(uint32 openHandle, - uint32 event, void* pData, uint32 dataLength, - uint32 totalLength, uint32 dataFlags); +typedef void (FREERDP_CC * PCHANNEL_OPEN_EVENT_FN)(UINT32 openHandle, + UINT32 event, void* pData, UINT32 dataLength, + UINT32 totalLength, UINT32 dataFlags); #define CHANNEL_RC_OK 0 #define CHANNEL_RC_ALREADY_INITIALIZED 1 @@ -71,24 +71,24 @@ typedef void (FREERDP_CC * PCHANNEL_OPEN_EVENT_FN)(uint32 openHandle, #define VIRTUAL_CHANNEL_VERSION_WIN2000 1 -typedef uint32 (FREERDP_CC * PVIRTUALCHANNELINIT)(void** ppInitHandle, - PCHANNEL_DEF pChannel, int channelCount, uint32 versionRequested, +typedef UINT32 (FREERDP_CC * PVIRTUALCHANNELINIT)(void** ppInitHandle, + PCHANNEL_DEF pChannel, int channelCount, UINT32 versionRequested, PCHANNEL_INIT_EVENT_FN pChannelInitEventProc); -typedef uint32 (FREERDP_CC * PVIRTUALCHANNELOPEN)(void* pInitHandle, - uint32* pOpenHandle, char* pChannelName, +typedef UINT32 (FREERDP_CC * PVIRTUALCHANNELOPEN)(void* pInitHandle, + UINT32* pOpenHandle, char* pChannelName, PCHANNEL_OPEN_EVENT_FN pChannelOpenEventProc); -typedef uint32 (FREERDP_CC * PVIRTUALCHANNELCLOSE)(uint32 openHandle); +typedef UINT32 (FREERDP_CC * PVIRTUALCHANNELCLOSE)(UINT32 openHandle); -typedef uint32 (FREERDP_CC * PVIRTUALCHANNELWRITE)(uint32 openHandle, - void* pData, uint32 dataLength, void* pUserData); +typedef UINT32 (FREERDP_CC * PVIRTUALCHANNELWRITE)(UINT32 openHandle, + void* pData, UINT32 dataLength, void* pUserData); -typedef uint32 (FREERDP_CC * PVIRTUALCHANNELEVENTPUSH)(uint32 openHandle, +typedef UINT32 (FREERDP_CC * PVIRTUALCHANNELEVENTPUSH)(UINT32 openHandle, RDP_EVENT* event); struct _CHANNEL_ENTRY_POINTS { - uint32 cbSize; - uint32 protocolVersion; + UINT32 cbSize; + UINT32 protocolVersion; PVIRTUALCHANNELINIT pVirtualChannelInit; PVIRTUALCHANNELOPEN pVirtualChannelOpen; PVIRTUALCHANNELCLOSE pVirtualChannelClose; @@ -101,8 +101,8 @@ typedef int (FREERDP_CC * PVIRTUALCHANNELENTRY)(PCHANNEL_ENTRY_POINTS pEntryPoin struct _CHANNEL_ENTRY_POINTS_EX { - uint32 cbSize; - uint32 protocolVersion; + UINT32 cbSize; + UINT32 protocolVersion; PVIRTUALCHANNELINIT pVirtualChannelInit; PVIRTUALCHANNELOPEN pVirtualChannelOpen; PVIRTUALCHANNELCLOSE pVirtualChannelClose; diff --git a/include/freerdp/types.h b/include/freerdp/types.h index b17278135..a685993be 100644 --- a/include/freerdp/types.h +++ b/include/freerdp/types.h @@ -25,40 +25,6 @@ #include -#ifdef _WIN32 -#include -#endif - -#ifdef FREERDP_HAVE_LIMITS_H -#include -#endif - -#ifdef FREERDP_HAVE_STDINT_H -#include -#endif - -#ifdef FREERDP_HAVE_INTTYPES_H - -#include -typedef uint32_t uint32; -typedef int32_t sint32; -typedef uint64_t uint64; -typedef int64_t sint64; - -#else - -typedef unsigned int uint32; -typedef signed int sint32; -#ifdef _WIN32 -typedef unsigned __int64 uint64; -typedef signed __int64 sint64; -#else -typedef unsigned long long uint64; -typedef signed long long sint64; -#endif - -#endif /* HAVE_INTTYPES_H */ - #ifndef MIN #define MIN(x,y) (((x) < (y)) ? (x) : (y)) #endif @@ -71,7 +37,7 @@ typedef signed long long sint64; typedef struct { - uint32 time_low; + UINT32 time_low; UINT16 time_mid; UINT16 time_hi_and_version; BYTE clock_seq_hi_and_reserved; diff --git a/include/freerdp/update.h b/include/freerdp/update.h index 24c17a964..f4a0eaed6 100644 --- a/include/freerdp/update.h +++ b/include/freerdp/update.h @@ -39,19 +39,19 @@ typedef struct rdp_update rdpUpdate; struct _BITMAP_DATA { - uint32 destLeft; - uint32 destTop; - uint32 destRight; - uint32 destBottom; - uint32 width; - uint32 height; - uint32 bitsPerPixel; - uint32 flags; - uint32 bitmapLength; - uint32 cbCompFirstRowSize; - uint32 cbCompMainBodySize; - uint32 cbScanWidth; - uint32 cbUncompressedSize; + UINT32 destLeft; + UINT32 destTop; + UINT32 destRight; + UINT32 destBottom; + UINT32 width; + UINT32 height; + UINT32 bitsPerPixel; + UINT32 flags; + UINT32 bitmapLength; + UINT32 cbCompFirstRowSize; + UINT32 cbCompMainBodySize; + UINT32 cbScanWidth; + UINT32 cbUncompressedSize; BYTE* bitmapDataStream; BOOL compressed; }; @@ -59,8 +59,8 @@ typedef struct _BITMAP_DATA BITMAP_DATA; struct _BITMAP_UPDATE { - uint32 count; - uint32 number; + UINT32 count; + UINT32 number; BITMAP_DATA* rectangles; }; typedef struct _BITMAP_UPDATE BITMAP_UPDATE; @@ -77,14 +77,14 @@ typedef struct _PALETTE_ENTRY PALETTE_ENTRY; struct _PALETTE_UPDATE { - uint32 number; + UINT32 number; PALETTE_ENTRY entries[256]; }; typedef struct _PALETTE_UPDATE PALETTE_UPDATE; struct rdp_palette { - uint32 count; + UINT32 count; PALETTE_ENTRY* entries; }; typedef struct rdp_palette rdpPalette; @@ -93,8 +93,8 @@ typedef struct rdp_palette rdpPalette; struct _PLAY_SOUND_UPDATE { - uint32 duration; - uint32 frequency; + UINT32 duration; + UINT32 frequency; }; typedef struct _PLAY_SOUND_UPDATE PLAY_SOUND_UPDATE; @@ -102,24 +102,24 @@ typedef struct _PLAY_SOUND_UPDATE PLAY_SOUND_UPDATE; struct _SURFACE_BITS_COMMAND { - uint32 cmdType; - uint32 destLeft; - uint32 destTop; - uint32 destRight; - uint32 destBottom; - uint32 bpp; - uint32 codecID; - uint32 width; - uint32 height; - uint32 bitmapDataLength; + UINT32 cmdType; + UINT32 destLeft; + UINT32 destTop; + UINT32 destRight; + UINT32 destBottom; + UINT32 bpp; + UINT32 codecID; + UINT32 width; + UINT32 height; + UINT32 bitmapDataLength; BYTE* bitmapData; }; typedef struct _SURFACE_BITS_COMMAND SURFACE_BITS_COMMAND; struct _SURFACE_FRAME_MARKER { - uint32 frameAction; - uint32 frameId; + UINT32 frameAction; + UINT32 frameId; }; typedef struct _SURFACE_FRAME_MARKER SURFACE_FRAME_MARKER; @@ -151,7 +151,7 @@ typedef void (*pSurfaceFrameMarker)(rdpContext* context, SURFACE_FRAME_MARKER* s struct rdp_update { rdpContext* context; /* 0 */ - uint32 paddingA[16 - 1]; /* 1 */ + UINT32 paddingA[16 - 1]; /* 1 */ pBeginPaint BeginPaint; /* 16 */ pEndPaint EndPaint; /* 17 */ @@ -161,23 +161,23 @@ struct rdp_update pBitmapUpdate BitmapUpdate; /* 21 */ pPalette Palette; /* 22 */ pPlaySound PlaySound; /* 23 */ - uint32 paddingB[32 - 24]; /* 24 */ + UINT32 paddingB[32 - 24]; /* 24 */ rdpPointerUpdate* pointer; /* 32 */ rdpPrimaryUpdate* primary; /* 33 */ rdpSecondaryUpdate* secondary; /* 34 */ rdpAltSecUpdate* altsec; /* 35 */ rdpWindowUpdate* window; /* 36 */ - uint32 paddingC[48 - 37]; /* 37 */ + UINT32 paddingC[48 - 37]; /* 37 */ pRefreshRect RefreshRect; /* 48 */ pSuppressOutput SuppressOutput; /* 49 */ - uint32 paddingD[64 - 50]; /* 50 */ + UINT32 paddingD[64 - 50]; /* 50 */ pSurfaceCommand SurfaceCommand; /* 64 */ pSurfaceBits SurfaceBits; /* 65 */ pSurfaceFrameMarker SurfaceFrameMarker; /* 66 */ - uint32 paddingE[80 - 67]; /* 67 */ + UINT32 paddingE[80 - 67]; /* 67 */ /* internal */ diff --git a/include/freerdp/utils/dsp.h b/include/freerdp/utils/dsp.h index a87babe1a..dc7eca162 100644 --- a/include/freerdp/utils/dsp.h +++ b/include/freerdp/utils/dsp.h @@ -32,9 +32,9 @@ union _ADPCM struct { BYTE predictor[2]; - sint32 delta[2]; - sint32 sample1[2]; - sint32 sample2[2]; + INT32 delta[2]; + INT32 sample1[2]; + INT32 sample2[2]; } ms; }; typedef union _ADPCM ADPCM; @@ -43,20 +43,20 @@ typedef struct _FREERDP_DSP_CONTEXT FREERDP_DSP_CONTEXT; struct _FREERDP_DSP_CONTEXT { BYTE* resampled_buffer; - uint32 resampled_size; - uint32 resampled_frames; - uint32 resampled_maxlength; + UINT32 resampled_size; + UINT32 resampled_frames; + UINT32 resampled_maxlength; BYTE* adpcm_buffer; - uint32 adpcm_size; - uint32 adpcm_maxlength; + UINT32 adpcm_size; + UINT32 adpcm_maxlength; ADPCM adpcm; void (*resample)(FREERDP_DSP_CONTEXT* context, const BYTE* src, int bytes_per_sample, - uint32 schan, uint32 srate, int sframes, - uint32 rchan, uint32 rrate); + UINT32 schan, UINT32 srate, int sframes, + UINT32 rchan, UINT32 rrate); void (*decode_ima_adpcm)(FREERDP_DSP_CONTEXT* context, const BYTE* src, int size, int channels, int block_size); diff --git a/include/freerdp/utils/msusb.h b/include/freerdp/utils/msusb.h index 36ac8becf..7df24bd95 100644 --- a/include/freerdp/utils/msusb.h +++ b/include/freerdp/utils/msusb.h @@ -36,21 +36,21 @@ ((UINT16) (*((BYTE *) (_p)))) + \ ((UINT16) (*(((BYTE *) (_p)) + 1)) << 8); \ } while (0) -#define data_read_uint32(_p, _v) do { _v = \ - (uint32) (*((BYTE *) (_p))) + \ - ((uint32) (*(((BYTE *) (_p)) + 1)) << 8) + \ - ((uint32) (*(((BYTE *) (_p)) + 2)) << 16) + \ - ((uint32) (*(((BYTE *) (_p)) + 3)) << 24); \ +#define data_read_UINT32(_p, _v) do { _v = \ + (UINT32) (*((BYTE *) (_p))) + \ + ((UINT32) (*(((BYTE *) (_p)) + 1)) << 8) + \ + ((UINT32) (*(((BYTE *) (_p)) + 2)) << 16) + \ + ((UINT32) (*(((BYTE *) (_p)) + 3)) << 24); \ } while (0) -#define data_read_uint64(_p, _v) do { _v = \ - (uint64) (*((BYTE *) (_p))) + \ - ((uint64) (*(((BYTE *) (_p)) + 1)) << 8) + \ - ((uint64) (*(((BYTE *) (_p)) + 2)) << 16) + \ - ((uint64) (*(((BYTE *) (_p)) + 3)) << 24) + \ - ((uint64) (*(((BYTE *) (_p)) + 4)) << 32) + \ - ((uint64) (*(((BYTE *) (_p)) + 5)) << 40) + \ - ((uint64) (*(((BYTE *) (_p)) + 6)) << 48) + \ - ((uint64) (*(((BYTE *) (_p)) + 7)) << 56); \ +#define data_read_UINT64(_p, _v) do { _v = \ + (UINT64) (*((BYTE *) (_p))) + \ + ((UINT64) (*(((BYTE *) (_p)) + 1)) << 8) + \ + ((UINT64) (*(((BYTE *) (_p)) + 2)) << 16) + \ + ((UINT64) (*(((BYTE *) (_p)) + 3)) << 24) + \ + ((UINT64) (*(((BYTE *) (_p)) + 4)) << 32) + \ + ((UINT64) (*(((BYTE *) (_p)) + 5)) << 40) + \ + ((UINT64) (*(((BYTE *) (_p)) + 6)) << 48) + \ + ((UINT64) (*(((BYTE *) (_p)) + 7)) << 56); \ } while (0) #define data_write_BYTE(_p, _v) do { \ @@ -60,21 +60,21 @@ *((BYTE *) _p) = (BYTE) (((UINT16) (_v)) & 0xff); \ *(((BYTE *) _p) + 1) = (BYTE) ((((UINT16) (_v)) >> 8) & 0xff); \ } while (0) -#define data_write_uint32(_p, _v) do { \ - *((BYTE *) _p) = (BYTE) (((uint32) (_v)) & 0xff); \ - *(((BYTE *) _p) + 1) = (BYTE) ((((uint32) (_v)) >> 8) & 0xff); \ - *(((BYTE *) _p) + 2) = (BYTE) ((((uint32) (_v)) >> 16) & 0xff); \ - *(((BYTE *) _p) + 3) = (BYTE) ((((uint32) (_v)) >> 24) & 0xff); \ +#define data_write_UINT32(_p, _v) do { \ + *((BYTE *) _p) = (BYTE) (((UINT32) (_v)) & 0xff); \ + *(((BYTE *) _p) + 1) = (BYTE) ((((UINT32) (_v)) >> 8) & 0xff); \ + *(((BYTE *) _p) + 2) = (BYTE) ((((UINT32) (_v)) >> 16) & 0xff); \ + *(((BYTE *) _p) + 3) = (BYTE) ((((UINT32) (_v)) >> 24) & 0xff); \ } while (0) -#define data_write_uint64(_p, _v) do { \ - *((BYTE *) _p) = (BYTE) (((uint64) (_v)) & 0xff); \ - *(((BYTE *) _p) + 1) = (BYTE) ((((uint64) (_v)) >> 8) & 0xff); \ - *(((BYTE *) _p) + 2) = (BYTE) ((((uint64) (_v)) >> 16) & 0xff); \ - *(((BYTE *) _p) + 3) = (BYTE) ((((uint64) (_v)) >> 24) & 0xff); \ - *(((BYTE *) _p) + 4) = (BYTE) ((((uint64) (_v)) >> 32) & 0xff); \ - *(((BYTE *) _p) + 5) = (BYTE) ((((uint64) (_v)) >> 40) & 0xff); \ - *(((BYTE *) _p) + 6) = (BYTE) ((((uint64) (_v)) >> 48) & 0xff); \ - *(((BYTE *) _p) + 7) = (BYTE) ((((uint64) (_v)) >> 56) & 0xff); \ +#define data_write_UINT64(_p, _v) do { \ + *((BYTE *) _p) = (BYTE) (((UINT64) (_v)) & 0xff); \ + *(((BYTE *) _p) + 1) = (BYTE) ((((UINT64) (_v)) >> 8) & 0xff); \ + *(((BYTE *) _p) + 2) = (BYTE) ((((UINT64) (_v)) >> 16) & 0xff); \ + *(((BYTE *) _p) + 3) = (BYTE) ((((UINT64) (_v)) >> 24) & 0xff); \ + *(((BYTE *) _p) + 4) = (BYTE) ((((UINT64) (_v)) >> 32) & 0xff); \ + *(((BYTE *) _p) + 5) = (BYTE) ((((UINT64) (_v)) >> 40) & 0xff); \ + *(((BYTE *) _p) + 6) = (BYTE) ((((UINT64) (_v)) >> 48) & 0xff); \ + *(((BYTE *) _p) + 7) = (BYTE) ((((UINT64) (_v)) >> 56) & 0xff); \ } while (0) typedef struct _MSUSB_INTERFACE_DESCRIPTOR MSUSB_INTERFACE_DESCRIPTOR; @@ -84,9 +84,9 @@ typedef struct _MSUSB_CONFIG_DESCRIPTOR MSUSB_CONFIG_DESCRIPTOR; struct _MSUSB_PIPE_DESCRIPTOR { UINT16 MaximumPacketSize; - uint32 MaximumTransferSize; - uint32 PipeFlags; - uint32 PipeHandle; + UINT32 MaximumTransferSize; + UINT32 PipeFlags; + UINT32 PipeHandle; BYTE bEndpointAddress; BYTE bInterval; BYTE PipeType; @@ -99,8 +99,8 @@ struct _MSUSB_INTERFACE_DESCRIPTOR UINT16 NumberOfPipesExpected; BYTE InterfaceNumber; BYTE AlternateSetting; - uint32 NumberOfPipes; - uint32 InterfaceHandle; + UINT32 NumberOfPipes; + UINT32 InterfaceHandle; BYTE bInterfaceClass; BYTE bInterfaceSubClass; BYTE bInterfaceProtocol; @@ -112,25 +112,25 @@ struct _MSUSB_CONFIG_DESCRIPTOR { UINT16 wTotalLength; BYTE bConfigurationValue; - uint32 ConfigurationHandle; - uint32 NumInterfaces; + UINT32 ConfigurationHandle; + UINT32 NumInterfaces; MSUSB_INTERFACE_DESCRIPTOR ** MsInterfaces; int InitCompleted; int MsOutSize; } __attribute__((packed)); /* MSUSB_PIPE exported functions */ -void msusb_mspipes_replace(MSUSB_INTERFACE_DESCRIPTOR* MsInterface, MSUSB_PIPE_DESCRIPTOR** NewMsPipes, uint32 NewNumberOfPipes); +void msusb_mspipes_replace(MSUSB_INTERFACE_DESCRIPTOR* MsInterface, MSUSB_PIPE_DESCRIPTOR** NewMsPipes, UINT32 NewNumberOfPipes); /* MSUSB_INTERFACE exported functions */ void msusb_msinterface_replace(MSUSB_CONFIG_DESCRIPTOR* MsConfig, BYTE InterfaceNumber, MSUSB_INTERFACE_DESCRIPTOR* NewMsInterface); -MSUSB_INTERFACE_DESCRIPTOR* msusb_msinterface_read(BYTE* data, uint32 data_size, int* offset); +MSUSB_INTERFACE_DESCRIPTOR* msusb_msinterface_read(BYTE* data, UINT32 data_size, int* offset); int msusb_msinterface_write(MSUSB_INTERFACE_DESCRIPTOR* MsInterface, BYTE* data, int* offset); /* MSUSB_CONFIG exported functions */ MSUSB_CONFIG_DESCRIPTOR* msusb_msconfig_new(); void msusb_msconfig_free(MSUSB_CONFIG_DESCRIPTOR* MsConfig); -MSUSB_CONFIG_DESCRIPTOR* msusb_msconfig_read(BYTE* data, uint32 data_size, uint32 NumInterfaces); +MSUSB_CONFIG_DESCRIPTOR* msusb_msconfig_read(BYTE* data, UINT32 data_size, UINT32 NumInterfaces); int msusb_msconfig_write(MSUSB_CONFIG_DESCRIPTOR* MsConfg, BYTE* data, int * offset); void msusb_msconfig_dump(MSUSB_CONFIG_DESCRIPTOR* MsConfg); diff --git a/include/freerdp/utils/pcap.h b/include/freerdp/utils/pcap.h index 75115c70c..ccc8c8cb9 100644 --- a/include/freerdp/utils/pcap.h +++ b/include/freerdp/utils/pcap.h @@ -25,22 +25,22 @@ struct _pcap_header { - uint32 magic_number; /* magic number */ + UINT32 magic_number; /* magic number */ UINT16 version_major; /* major version number */ UINT16 version_minor; /* minor version number */ - sint32 thiszone; /* GMT to local correction */ - uint32 sigfigs; /* accuracy of timestamps */ - uint32 snaplen; /* max length of captured packets, in octets */ - uint32 network; /* data link type */ + INT32 thiszone; /* GMT to local correction */ + UINT32 sigfigs; /* accuracy of timestamps */ + UINT32 snaplen; /* max length of captured packets, in octets */ + UINT32 network; /* data link type */ }; typedef struct _pcap_header pcap_header; struct _pcap_record_header { - uint32 ts_sec; /* timestamp seconds */ - uint32 ts_usec; /* timestamp microseconds */ - uint32 incl_len; /* number of octets of packet saved in file */ - uint32 orig_len; /* actual length of packet */ + UINT32 ts_sec; /* timestamp seconds */ + UINT32 ts_usec; /* timestamp microseconds */ + UINT32 incl_len; /* number of octets of packet saved in file */ + UINT32 orig_len; /* actual length of packet */ }; typedef struct _pcap_record_header pcap_record_header; @@ -50,7 +50,7 @@ struct _pcap_record { pcap_record_header header; void* data; - uint32 length; + UINT32 length; pcap_record* next; }; @@ -71,7 +71,7 @@ typedef struct rdp_pcap rdpPcap; FREERDP_API rdpPcap* pcap_open(char* name, BOOL write); FREERDP_API void pcap_close(rdpPcap* pcap); -FREERDP_API void pcap_add_record(rdpPcap* pcap, void* data, uint32 length); +FREERDP_API void pcap_add_record(rdpPcap* pcap, void* data, UINT32 length); FREERDP_API BOOL pcap_has_next_record(rdpPcap* pcap); FREERDP_API BOOL pcap_get_next_record(rdpPcap* pcap, pcap_record* record); FREERDP_API BOOL pcap_get_next_record_header(rdpPcap* pcap, pcap_record* record); diff --git a/include/freerdp/utils/rail.h b/include/freerdp/utils/rail.h index f50221b24..d37e3de35 100644 --- a/include/freerdp/utils/rail.h +++ b/include/freerdp/utils/rail.h @@ -29,7 +29,7 @@ FREERDP_API void rail_unicode_string_free(RAIL_UNICODE_STRING* unicode_string); FREERDP_API void rail_read_unicode_string(STREAM* s, RAIL_UNICODE_STRING* unicode_string); FREERDP_API void rail_write_unicode_string(STREAM* s, RAIL_UNICODE_STRING* unicode_string); FREERDP_API void rail_write_unicode_string_value(STREAM* s, RAIL_UNICODE_STRING* unicode_string); -FREERDP_API void* rail_clone_order(uint32 event_type, void* order); -FREERDP_API void rail_free_cloned_order(uint32 event_type, void* order); +FREERDP_API void* rail_clone_order(UINT32 event_type, void* order); +FREERDP_API void rail_free_cloned_order(UINT32 event_type, void* order); #endif /* __RAIL_UTILS_H */ diff --git a/include/freerdp/utils/sleep.h b/include/freerdp/utils/sleep.h index bb7a1fae3..807a9a2f2 100644 --- a/include/freerdp/utils/sleep.h +++ b/include/freerdp/utils/sleep.h @@ -23,7 +23,7 @@ #include #include -FREERDP_API void freerdp_sleep(uint32 seconds); -FREERDP_API void freerdp_usleep(uint32 useconds); +FREERDP_API void freerdp_sleep(UINT32 seconds); +FREERDP_API void freerdp_usleep(UINT32 useconds); #endif /* __SLEEP_UTILS_H */ diff --git a/include/freerdp/utils/stopwatch.h b/include/freerdp/utils/stopwatch.h index f3affedd1..1ee50471b 100644 --- a/include/freerdp/utils/stopwatch.h +++ b/include/freerdp/utils/stopwatch.h @@ -42,6 +42,6 @@ FREERDP_API void stopwatch_stop(STOPWATCH* stopwatch); FREERDP_API void stopwatch_reset(STOPWATCH* stopwatch); FREERDP_API double stopwatch_get_elapsed_time_in_seconds(STOPWATCH* stopwatch); -FREERDP_API void stopwatch_get_elapsed_time_in_useconds(STOPWATCH* stopwatch, uint32* sec, uint32* usec); +FREERDP_API void stopwatch_get_elapsed_time_in_useconds(STOPWATCH* stopwatch, UINT32* sec, UINT32* usec); #endif /* __UTILS_STOPWATCH_H */ diff --git a/include/freerdp/utils/stream.h b/include/freerdp/utils/stream.h index c9048377a..626ce3120 100644 --- a/include/freerdp/utils/stream.h +++ b/include/freerdp/utils/stream.h @@ -67,21 +67,21 @@ FREERDP_API void stream_extend(STREAM* stream, int request_size); (UINT16)(*_s->p) + \ (UINT16)(((UINT16)(*(_s->p + 1))) << 8); \ _s->p += 2; } while (0) -#define stream_read_uint32(_s, _v) do { _v = \ - (uint32)(*_s->p) + \ - (((uint32)(*(_s->p + 1))) << 8) + \ - (((uint32)(*(_s->p + 2))) << 16) + \ - (((uint32)(*(_s->p + 3))) << 24); \ +#define stream_read_UINT32(_s, _v) do { _v = \ + (UINT32)(*_s->p) + \ + (((UINT32)(*(_s->p + 1))) << 8) + \ + (((UINT32)(*(_s->p + 2))) << 16) + \ + (((UINT32)(*(_s->p + 3))) << 24); \ _s->p += 4; } while (0) -#define stream_read_uint64(_s, _v) do { _v = \ - (uint64)(*_s->p) + \ - (((uint64)(*(_s->p + 1))) << 8) + \ - (((uint64)(*(_s->p + 2))) << 16) + \ - (((uint64)(*(_s->p + 3))) << 24) + \ - (((uint64)(*(_s->p + 4))) << 32) + \ - (((uint64)(*(_s->p + 5))) << 40) + \ - (((uint64)(*(_s->p + 6))) << 48) + \ - (((uint64)(*(_s->p + 7))) << 56); \ +#define stream_read_UINT64(_s, _v) do { _v = \ + (UINT64)(*_s->p) + \ + (((UINT64)(*(_s->p + 1))) << 8) + \ + (((UINT64)(*(_s->p + 2))) << 16) + \ + (((UINT64)(*(_s->p + 3))) << 24) + \ + (((UINT64)(*(_s->p + 4))) << 32) + \ + (((UINT64)(*(_s->p + 5))) << 40) + \ + (((UINT64)(*(_s->p + 6))) << 48) + \ + (((UINT64)(*(_s->p + 7))) << 56); \ _s->p += 8; } while (0) #define stream_read(_s, _b, _n) do { \ memcpy(_b, (_s->p), (_n)); \ @@ -93,20 +93,20 @@ FREERDP_API void stream_extend(STREAM* stream, int request_size); #define stream_write_UINT16(_s, _v) do { \ *_s->p++ = (_v) & 0xFF; \ *_s->p++ = ((_v) >> 8) & 0xFF; } while (0) -#define stream_write_uint32(_s, _v) do { \ +#define stream_write_UINT32(_s, _v) do { \ *_s->p++ = (_v) & 0xFF; \ *_s->p++ = ((_v) >> 8) & 0xFF; \ *_s->p++ = ((_v) >> 16) & 0xFF; \ *_s->p++ = ((_v) >> 24) & 0xFF; } while (0) -#define stream_write_uint64(_s, _v) do { \ - *_s->p++ = (uint64)(_v) & 0xFF; \ - *_s->p++ = ((uint64)(_v) >> 8) & 0xFF; \ - *_s->p++ = ((uint64)(_v) >> 16) & 0xFF; \ - *_s->p++ = ((uint64)(_v) >> 24) & 0xFF; \ - *_s->p++ = ((uint64)(_v) >> 32) & 0xFF; \ - *_s->p++ = ((uint64)(_v) >> 40) & 0xFF; \ - *_s->p++ = ((uint64)(_v) >> 48) & 0xFF; \ - *_s->p++ = ((uint64)(_v) >> 56) & 0xFF; } while (0) +#define stream_write_UINT64(_s, _v) do { \ + *_s->p++ = (UINT64)(_v) & 0xFF; \ + *_s->p++ = ((UINT64)(_v) >> 8) & 0xFF; \ + *_s->p++ = ((UINT64)(_v) >> 16) & 0xFF; \ + *_s->p++ = ((UINT64)(_v) >> 24) & 0xFF; \ + *_s->p++ = ((UINT64)(_v) >> 32) & 0xFF; \ + *_s->p++ = ((UINT64)(_v) >> 40) & 0xFF; \ + *_s->p++ = ((UINT64)(_v) >> 48) & 0xFF; \ + *_s->p++ = ((UINT64)(_v) >> 56) & 0xFF; } while (0) #define stream_write(_s, _b, _n) do { \ memcpy(_s->p, (_b), (_n)); \ _s->p += (_n); \ @@ -125,43 +125,43 @@ FREERDP_API void stream_extend(STREAM* stream, int request_size); (UINT16)(*_s->p) + \ (((UINT16)(*(_s->p + 1))) << 8); \ } while (0) -#define stream_peek_uint32(_s, _v) do { _v = \ - (uint32)(*_s->p) + \ - (((uint32)(*(_s->p + 1))) << 8) + \ - (((uint32)(*(_s->p + 2))) << 16) + \ - (((uint32)(*(_s->p + 3))) << 24); \ +#define stream_peek_UINT32(_s, _v) do { _v = \ + (UINT32)(*_s->p) + \ + (((UINT32)(*(_s->p + 1))) << 8) + \ + (((UINT32)(*(_s->p + 2))) << 16) + \ + (((UINT32)(*(_s->p + 3))) << 24); \ } while (0) -#define stream_peek_uint64(_s, _v) do { _v = \ - (uint64)(*_s->p) + \ - (((uint64)(*(_s->p + 1))) << 8) + \ - (((uint64)(*(_s->p + 2))) << 16) + \ - (((uint64)(*(_s->p + 3))) << 24) + \ - (((uint64)(*(_s->p + 4))) << 32) + \ - (((uint64)(*(_s->p + 5))) << 40) + \ - (((uint64)(*(_s->p + 6))) << 48) + \ - (((uint64)(*(_s->p + 7))) << 56); \ +#define stream_peek_UINT64(_s, _v) do { _v = \ + (UINT64)(*_s->p) + \ + (((UINT64)(*(_s->p + 1))) << 8) + \ + (((UINT64)(*(_s->p + 2))) << 16) + \ + (((UINT64)(*(_s->p + 3))) << 24) + \ + (((UINT64)(*(_s->p + 4))) << 32) + \ + (((UINT64)(*(_s->p + 5))) << 40) + \ + (((UINT64)(*(_s->p + 6))) << 48) + \ + (((UINT64)(*(_s->p + 7))) << 56); \ } while (0) #define stream_seek_BYTE(_s) stream_seek(_s, 1) #define stream_seek_UINT16(_s) stream_seek(_s, 2) -#define stream_seek_uint32(_s) stream_seek(_s, 4) -#define stream_seek_uint64(_s) stream_seek(_s, 8) +#define stream_seek_UINT32(_s) stream_seek(_s, 4) +#define stream_seek_UINT64(_s) stream_seek(_s, 8) #define stream_read_UINT16_be(_s, _v) do { _v = \ (((UINT16)(*_s->p)) << 8) + \ (UINT16)(*(_s->p + 1)); \ _s->p += 2; } while (0) -#define stream_read_uint32_be(_s, _v) do { _v = \ - (((uint32)(*(_s->p))) << 24) + \ - (((uint32)(*(_s->p + 1))) << 16) + \ - (((uint32)(*(_s->p + 2))) << 8) + \ - (((uint32)(*(_s->p + 3)))); \ +#define stream_read_UINT32_be(_s, _v) do { _v = \ + (((UINT32)(*(_s->p))) << 24) + \ + (((UINT32)(*(_s->p + 1))) << 16) + \ + (((UINT32)(*(_s->p + 2))) << 8) + \ + (((UINT32)(*(_s->p + 3)))); \ _s->p += 4; } while (0) #define stream_write_UINT16_be(_s, _v) do { \ *_s->p++ = ((_v) >> 8) & 0xFF; \ *_s->p++ = (_v) & 0xFF; } while (0) -#define stream_write_uint32_be(_s, _v) do { \ +#define stream_write_UINT32_be(_s, _v) do { \ stream_write_UINT16_be(_s, ((_v) >> 16 & 0xFFFF)); \ stream_write_UINT16_be(_s, ((_v) & 0xFFFF)); \ } while (0) diff --git a/include/freerdp/utils/string.h b/include/freerdp/utils/string.h index 2228cc3a5..48b65d70a 100644 --- a/include/freerdp/utils/string.h +++ b/include/freerdp/utils/string.h @@ -28,7 +28,7 @@ struct rdp_string { char* ascii; char* unicode; - uint32 length; + UINT32 length; }; typedef struct rdp_string rdpString; diff --git a/include/freerdp/utils/time.h b/include/freerdp/utils/time.h index 32f49a113..99230ca1a 100644 --- a/include/freerdp/utils/time.h +++ b/include/freerdp/utils/time.h @@ -30,9 +30,9 @@ #include #include -FREERDP_API uint64 freerdp_windows_gmtime(); -FREERDP_API uint64 freerdp_get_windows_time_from_unix_time(time_t unix_time); -FREERDP_API time_t freerdp_get_unix_time_from_windows_time(uint64 windows_time); +FREERDP_API UINT64 freerdp_windows_gmtime(); +FREERDP_API UINT64 freerdp_get_windows_time_from_unix_time(time_t unix_time); +FREERDP_API time_t freerdp_get_unix_time_from_windows_time(UINT64 windows_time); FREERDP_API time_t freerdp_get_unix_time_from_generalized_time(const char* generalized_time); #endif /* FREERDP_TIME_UTILS_H */ diff --git a/include/freerdp/window.h b/include/freerdp/window.h index baa49efc4..c02d2febf 100644 --- a/include/freerdp/window.h +++ b/include/freerdp/window.h @@ -122,22 +122,22 @@ struct _WINDOW_ORDER_INFO { - uint32 windowId; - uint32 fieldFlags; - uint32 notifyIconId; + UINT32 windowId; + UINT32 fieldFlags; + UINT32 notifyIconId; }; typedef struct _WINDOW_ORDER_INFO WINDOW_ORDER_INFO; struct _ICON_INFO { - uint32 cacheEntry; - uint32 cacheId; - uint32 bpp; - uint32 width; - uint32 height; - uint32 cbColorTable; - uint32 cbBitsMask; - uint32 cbBitsColor; + UINT32 cacheEntry; + UINT32 cacheId; + UINT32 bpp; + UINT32 width; + UINT32 height; + UINT32 cbColorTable; + UINT32 cbBitsMask; + UINT32 cbBitsColor; BYTE* bitsMask; BYTE* colorTable; BYTE* bitsColor; @@ -146,15 +146,15 @@ typedef struct _ICON_INFO ICON_INFO; struct _CACHED_ICON_INFO { - uint32 cacheEntry; - uint32 cacheId; + UINT32 cacheEntry; + UINT32 cacheId; }; typedef struct _CACHED_ICON_INFO CACHED_ICON_INFO; struct _NOTIFY_ICON_INFOTIP { - uint32 timeout; - uint32 flags; + UINT32 timeout; + UINT32 flags; RAIL_UNICODE_STRING text; RAIL_UNICODE_STRING title; }; @@ -162,28 +162,28 @@ typedef struct _NOTIFY_ICON_INFOTIP NOTIFY_ICON_INFOTIP; struct _WINDOW_STATE_ORDER { - uint32 ownerWindowId; - uint32 style; - uint32 extendedStyle; - uint32 showState; + UINT32 ownerWindowId; + UINT32 style; + UINT32 extendedStyle; + UINT32 showState; RAIL_UNICODE_STRING titleInfo; - uint32 clientOffsetX; - uint32 clientOffsetY; - uint32 clientAreaWidth; - uint32 clientAreaHeight; - uint32 RPContent; - uint32 rootParentHandle; - uint32 windowOffsetX; - uint32 windowOffsetY; - uint32 windowClientDeltaX; - uint32 windowClientDeltaY; - uint32 windowWidth; - uint32 windowHeight; - uint32 numWindowRects; + UINT32 clientOffsetX; + UINT32 clientOffsetY; + UINT32 clientAreaWidth; + UINT32 clientAreaHeight; + UINT32 RPContent; + UINT32 rootParentHandle; + UINT32 windowOffsetX; + UINT32 windowOffsetY; + UINT32 windowClientDeltaX; + UINT32 windowClientDeltaY; + UINT32 windowWidth; + UINT32 windowHeight; + UINT32 numWindowRects; RECTANGLE_16* windowRects; - uint32 visibleOffsetX; - uint32 visibleOffsetY; - uint32 numVisibilityRects; + UINT32 visibleOffsetX; + UINT32 visibleOffsetY; + UINT32 numVisibilityRects; RECTANGLE_16* visibilityRects; }; typedef struct _WINDOW_STATE_ORDER WINDOW_STATE_ORDER; @@ -202,10 +202,10 @@ typedef struct _WINDOW_CACHED_ICON_ORDER WINDOW_CACHED_ICON_ORDER; struct _NOTIFY_ICON_STATE_ORDER { - uint32 version; + UINT32 version; RAIL_UNICODE_STRING toolTip; NOTIFY_ICON_INFOTIP infoTip; - uint32 state; + UINT32 state; ICON_INFO icon; CACHED_ICON_INFO cachedIcon; }; @@ -213,9 +213,9 @@ typedef struct _NOTIFY_ICON_STATE_ORDER NOTIFY_ICON_STATE_ORDER; struct _MONITORED_DESKTOP_ORDER { - uint32 activeWindowId; - uint32 numWindowIds; - uint32* windowIds; + UINT32 activeWindowId; + UINT32 numWindowIds; + UINT32* windowIds; }; typedef struct _MONITORED_DESKTOP_ORDER MONITORED_DESKTOP_ORDER; @@ -233,7 +233,7 @@ typedef void (*pNonMonitoredDesktop)(rdpContext* context, WINDOW_ORDER_INFO* ord struct rdp_window_update { rdpContext* context; /* 0 */ - uint32 paddingA[16 - 1]; /* 1 */ + UINT32 paddingA[16 - 1]; /* 1 */ pWindowCreate WindowCreate; /* 16 */ pWindowUpdate WindowUpdate; /* 17 */ @@ -245,7 +245,7 @@ struct rdp_window_update pNotifyIconDelete NotifyIconDelete; /* 23 */ pMonitoredDesktop MonitoredDesktop; /* 24 */ pNonMonitoredDesktop NonMonitoredDesktop; /* 25 */ - uint32 paddingB[32 - 26]; /* 26 */ + UINT32 paddingB[32 - 26]; /* 26 */ /* internal */ diff --git a/libfreerdp/cache/bitmap.c b/libfreerdp/cache/bitmap.c index 23d1655cc..708a316aa 100644 --- a/libfreerdp/cache/bitmap.c +++ b/libfreerdp/cache/bitmap.c @@ -204,7 +204,7 @@ void update_gdi_bitmap_update(rdpContext* context, BITMAP_UPDATE* bitmap_update) } } -rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmap_cache, uint32 id, uint32 index) +rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmap_cache, UINT32 id, UINT32 index) { rdpBitmap* bitmap; @@ -229,7 +229,7 @@ rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmap_cache, uint32 id, uint32 inde return bitmap; } -void bitmap_cache_put(rdpBitmapCache* bitmap_cache, uint32 id, uint32 index, rdpBitmap* bitmap) +void bitmap_cache_put(rdpBitmapCache* bitmap_cache, UINT32 id, UINT32 index, rdpBitmap* bitmap) { if (id > bitmap_cache->maxCells) { diff --git a/libfreerdp/cache/brush.c b/libfreerdp/cache/brush.c index e3da15353..f3fd4fbb2 100644 --- a/libfreerdp/cache/brush.c +++ b/libfreerdp/cache/brush.c @@ -78,7 +78,7 @@ void update_gdi_cache_brush(rdpContext* context, CACHE_BRUSH_ORDER* cache_brush) brush_cache_put(cache->brush, cache_brush->index, cache_brush->data, cache_brush->bpp); } -void* brush_cache_get(rdpBrushCache* brush, uint32 index, uint32* bpp) +void* brush_cache_get(rdpBrushCache* brush, UINT32 index, UINT32* bpp) { void* entry; @@ -114,7 +114,7 @@ void* brush_cache_get(rdpBrushCache* brush, uint32 index, uint32* bpp) return entry; } -void brush_cache_put(rdpBrushCache* brush, uint32 index, void* entry, uint32 bpp) +void brush_cache_put(rdpBrushCache* brush, UINT32 index, void* entry, UINT32 bpp) { void* prevEntry; diff --git a/libfreerdp/cache/glyph.c b/libfreerdp/cache/glyph.c index ea809c3bd..eff5573c8 100644 --- a/libfreerdp/cache/glyph.c +++ b/libfreerdp/cache/glyph.c @@ -30,11 +30,11 @@ #include void update_process_glyph(rdpContext* context, BYTE* data, int* index, - int* x, int* y, uint32 cacheId, uint32 ulCharInc, uint32 flAccel) + int* x, int* y, UINT32 cacheId, UINT32 ulCharInc, UINT32 flAccel) { int offset; rdpGlyph* glyph; - uint32 cacheIndex; + UINT32 cacheIndex; rdpGraphics* graphics; rdpGlyphCache* glyph_cache; @@ -72,13 +72,13 @@ void update_process_glyph(rdpContext* context, BYTE* data, int* index, } } -void update_process_glyph_fragments(rdpContext* context, BYTE* data, uint32 length, - uint32 cacheId, uint32 ulCharInc, uint32 flAccel, uint32 bgcolor, uint32 fgcolor, int x, int y, +void update_process_glyph_fragments(rdpContext* context, BYTE* data, UINT32 length, + UINT32 cacheId, UINT32 ulCharInc, UINT32 flAccel, UINT32 bgcolor, UINT32 fgcolor, int x, int y, int bkX, int bkY, int bkWidth, int bkHeight, int opX, int opY, int opWidth, int opHeight) { int n; - uint32 id; - uint32 size; + UINT32 id; + UINT32 size; int index = 0; BYTE* fragments; rdpGraphics* graphics; @@ -183,8 +183,8 @@ void update_gdi_glyph_index(rdpContext* context, GLYPH_INDEX_ORDER* glyph_index) void update_gdi_fast_index(rdpContext* context, FAST_INDEX_ORDER* fast_index) { - sint32 opLeft, opTop, opRight, opBottom; - sint32 x, y; + INT32 opLeft, opTop, opRight, opBottom; + INT32 x, y; rdpGlyphCache* glyph_cache; glyph_cache = context->cache->glyph; @@ -233,8 +233,8 @@ void update_gdi_fast_index(rdpContext* context, FAST_INDEX_ORDER* fast_index) void update_gdi_fast_glyph(rdpContext* context, FAST_GLYPH_ORDER* fast_glyph) { - sint32 opLeft, opTop, opRight, opBottom; - sint32 x, y; + INT32 opLeft, opTop, opRight, opBottom; + INT32 x, y; GLYPH_DATA_V2* glyph_data; rdpGlyph* glyph; rdpCache* cache = context->cache; @@ -358,7 +358,7 @@ void update_gdi_cache_glyph_v2(rdpContext* context, CACHE_GLYPH_V2_ORDER* cache_ } } -rdpGlyph* glyph_cache_get(rdpGlyphCache* glyph_cache, uint32 id, uint32 index) +rdpGlyph* glyph_cache_get(rdpGlyphCache* glyph_cache, UINT32 id, UINT32 index) { rdpGlyph* glyph; @@ -384,7 +384,7 @@ rdpGlyph* glyph_cache_get(rdpGlyphCache* glyph_cache, uint32 id, uint32 index) return glyph; } -void glyph_cache_put(rdpGlyphCache* glyph_cache, uint32 id, uint32 index, rdpGlyph* glyph) +void glyph_cache_put(rdpGlyphCache* glyph_cache, UINT32 id, UINT32 index, rdpGlyph* glyph) { rdpGlyph* prevGlyph; @@ -412,7 +412,7 @@ void glyph_cache_put(rdpGlyphCache* glyph_cache, uint32 id, uint32 index, rdpGly glyph_cache->glyphCache[id].entries[index] = glyph; } -void* glyph_cache_fragment_get(rdpGlyphCache* glyph_cache, uint32 index, uint32* size) +void* glyph_cache_fragment_get(rdpGlyphCache* glyph_cache, UINT32 index, UINT32* size) { void* fragment; @@ -427,7 +427,7 @@ void* glyph_cache_fragment_get(rdpGlyphCache* glyph_cache, uint32 index, uint32* return fragment; } -void glyph_cache_fragment_put(rdpGlyphCache* glyph_cache, uint32 index, uint32 size, void* fragment) +void glyph_cache_fragment_put(rdpGlyphCache* glyph_cache, UINT32 index, UINT32 size, void* fragment) { void* prevFragment; diff --git a/libfreerdp/cache/nine_grid.c b/libfreerdp/cache/nine_grid.c index 21c569085..17b225074 100644 --- a/libfreerdp/cache/nine_grid.c +++ b/libfreerdp/cache/nine_grid.c @@ -53,7 +53,7 @@ void nine_grid_cache_register_callbacks(rdpUpdate* update) update->primary->MultiDrawNineGrid = update_gdi_multi_draw_nine_grid; } -void* nine_grid_cache_get(rdpNineGridCache* nine_grid, uint32 index) +void* nine_grid_cache_get(rdpNineGridCache* nine_grid, UINT32 index) { void* entry; @@ -74,7 +74,7 @@ void* nine_grid_cache_get(rdpNineGridCache* nine_grid, uint32 index) return entry; } -void nine_grid_cache_put(rdpNineGridCache* nine_grid, uint32 index, void* entry) +void nine_grid_cache_put(rdpNineGridCache* nine_grid, UINT32 index, void* entry) { void* prevEntry; diff --git a/libfreerdp/cache/offscreen.c b/libfreerdp/cache/offscreen.c index 281082d0c..6a6ba494c 100644 --- a/libfreerdp/cache/offscreen.c +++ b/libfreerdp/cache/offscreen.c @@ -73,7 +73,7 @@ void update_gdi_switch_surface(rdpContext* context, SWITCH_SURFACE_ORDER* switch cache->offscreen->currentSurface = switch_surface->bitmapId; } -rdpBitmap* offscreen_cache_get(rdpOffscreenCache* offscreen_cache, uint32 index) +rdpBitmap* offscreen_cache_get(rdpOffscreenCache* offscreen_cache, UINT32 index) { rdpBitmap* bitmap; @@ -94,7 +94,7 @@ rdpBitmap* offscreen_cache_get(rdpOffscreenCache* offscreen_cache, uint32 index) return bitmap; } -void offscreen_cache_put(rdpOffscreenCache* offscreen, uint32 index, rdpBitmap* bitmap) +void offscreen_cache_put(rdpOffscreenCache* offscreen, UINT32 index, rdpBitmap* bitmap) { if (index >= offscreen->maxEntries) { @@ -106,7 +106,7 @@ void offscreen_cache_put(rdpOffscreenCache* offscreen, uint32 index, rdpBitmap* offscreen->entries[index] = bitmap; } -void offscreen_cache_delete(rdpOffscreenCache* offscreen, uint32 index) +void offscreen_cache_delete(rdpOffscreenCache* offscreen, UINT32 index) { rdpBitmap* prevBitmap; diff --git a/libfreerdp/cache/palette.c b/libfreerdp/cache/palette.c index 925ed0245..9d093bf26 100644 --- a/libfreerdp/cache/palette.c +++ b/libfreerdp/cache/palette.c @@ -34,7 +34,7 @@ void update_gdi_cache_color_table(rdpContext* context, CACHE_COLOR_TABLE_ORDER* palette_cache_put(cache->palette, cache_color_table->cacheIndex, (void*) cache_color_table->colorTable); } -void* palette_cache_get(rdpPaletteCache* palette_cache, uint32 index) +void* palette_cache_get(rdpPaletteCache* palette_cache, UINT32 index) { void* entry; @@ -55,7 +55,7 @@ void* palette_cache_get(rdpPaletteCache* palette_cache, uint32 index) return entry; } -void palette_cache_put(rdpPaletteCache* palette_cache, uint32 index, void* entry) +void palette_cache_put(rdpPaletteCache* palette_cache, UINT32 index, void* entry) { if (index >= palette_cache->maxEntries) { diff --git a/libfreerdp/cache/pointer.c b/libfreerdp/cache/pointer.c index dbc317606..7dcc84436 100644 --- a/libfreerdp/cache/pointer.c +++ b/libfreerdp/cache/pointer.c @@ -111,7 +111,7 @@ void update_pointer_cached(rdpContext* context, POINTER_CACHED_UPDATE* pointer_c Pointer_Set(context, pointer); } -rdpPointer* pointer_cache_get(rdpPointerCache* pointer_cache, uint32 index) +rdpPointer* pointer_cache_get(rdpPointerCache* pointer_cache, UINT32 index) { rdpPointer* pointer; @@ -126,7 +126,7 @@ rdpPointer* pointer_cache_get(rdpPointerCache* pointer_cache, uint32 index) return pointer; } -void pointer_cache_put(rdpPointerCache* pointer_cache, uint32 index, rdpPointer* pointer) +void pointer_cache_put(rdpPointerCache* pointer_cache, UINT32 index, rdpPointer* pointer) { rdpPointer* prevPointer; diff --git a/libfreerdp/channels/libchannels.c b/libfreerdp/channels/libchannels.c index 0b62a9103..a0bf51ccc 100644 --- a/libfreerdp/channels/libchannels.c +++ b/libfreerdp/channels/libchannels.c @@ -285,8 +285,8 @@ static rdpChannel* freerdp_channels_find_channel_by_name(rdpChannels* channels, * according to MS docs * only called from main thread */ -static uint32 FREERDP_CC MyVirtualChannelInit(void** ppInitHandle, PCHANNEL_DEF pChannel, - int channelCount, uint32 versionRequested, PCHANNEL_INIT_EVENT_FN pChannelInitEventProc) +static UINT32 FREERDP_CC MyVirtualChannelInit(void** ppInitHandle, PCHANNEL_DEF pChannel, + int channelCount, UINT32 versionRequested, PCHANNEL_INIT_EVENT_FN pChannelInitEventProc) { int index; rdpChannels* channels; @@ -388,7 +388,7 @@ static uint32 FREERDP_CC MyVirtualChannelInit(void** ppInitHandle, PCHANNEL_DEF * can be called from any thread * thread safe because no 2 threads can have the same channel name registered */ -static uint32 FREERDP_CC MyVirtualChannelOpen(void* pInitHandle, uint32* pOpenHandle, +static UINT32 FREERDP_CC MyVirtualChannelOpen(void* pInitHandle, UINT32* pOpenHandle, char* pChannelName, PCHANNEL_OPEN_EVENT_FN pChannelOpenEventProc) { int index; @@ -442,7 +442,7 @@ static uint32 FREERDP_CC MyVirtualChannelOpen(void* pInitHandle, uint32* pOpenHa * can be called from any thread * thread safe because no 2 threads can have the same openHandle */ -static uint32 FREERDP_CC MyVirtualChannelClose(uint32 openHandle) +static UINT32 FREERDP_CC MyVirtualChannelClose(UINT32 openHandle) { int index; rdpChannels* channels; @@ -472,7 +472,7 @@ static uint32 FREERDP_CC MyVirtualChannelClose(uint32 openHandle) } /* can be called from any thread */ -static uint32 FREERDP_CC MyVirtualChannelWrite(uint32 openHandle, void* pData, uint32 dataLength, void* pUserData) +static UINT32 FREERDP_CC MyVirtualChannelWrite(UINT32 openHandle, void* pData, UINT32 dataLength, void* pUserData) { int index; SYNC_DATA* item; @@ -533,7 +533,7 @@ static uint32 FREERDP_CC MyVirtualChannelWrite(uint32 openHandle, void* pData, u return CHANNEL_RC_OK; } -static uint32 FREERDP_CC MyVirtualChannelEventPush(uint32 openHandle, RDP_EVENT* event) +static UINT32 FREERDP_CC MyVirtualChannelEventPush(UINT32 openHandle, RDP_EVENT* event) { int index; rdpChannels* channels; diff --git a/libfreerdp/channels/wtsvc.c b/libfreerdp/channels/wtsvc.c index b5e587726..877a7d3fb 100644 --- a/libfreerdp/channels/wtsvc.c +++ b/libfreerdp/channels/wtsvc.c @@ -42,7 +42,7 @@ typedef struct wts_data_item { UINT16 channel_id; BYTE* buffer; - uint32 length; + UINT32 length; } wts_data_item; static void wts_data_item_free(wts_data_item* item) @@ -51,7 +51,7 @@ static void wts_data_item_free(wts_data_item* item) free(item); } -static rdpPeerChannel* wts_get_dvc_channel_by_id(WTSVirtualChannelManager* vcm, uint32 ChannelId) +static rdpPeerChannel* wts_get_dvc_channel_by_id(WTSVirtualChannelManager* vcm, UINT32 ChannelId) { LIST_ITEM* item; rdpPeerChannel* channel = NULL; @@ -67,7 +67,7 @@ static rdpPeerChannel* wts_get_dvc_channel_by_id(WTSVirtualChannelManager* vcm, return channel; } -static void wts_queue_receive_data(rdpPeerChannel* channel, const BYTE* buffer, uint32 length) +static void wts_queue_receive_data(rdpPeerChannel* channel, const BYTE* buffer, UINT32 length) { wts_data_item* item; @@ -98,7 +98,7 @@ static void wts_queue_send_item(rdpPeerChannel* channel, wts_data_item* item) wait_obj_set(vcm->send_event); } -static int wts_read_variable_uint(STREAM* s, int cbLen, uint32 *val) +static int wts_read_variable_uint(STREAM* s, int cbLen, UINT32 *val) { switch (cbLen) { @@ -115,12 +115,12 @@ static int wts_read_variable_uint(STREAM* s, int cbLen, uint32 *val) default: if (stream_get_left(s) < 4) return 0; - stream_read_uint32(s, *val); + stream_read_UINT32(s, *val); return 4; } } -static void wts_read_drdynvc_capabilities_response(rdpPeerChannel* channel, uint32 length) +static void wts_read_drdynvc_capabilities_response(rdpPeerChannel* channel, UINT32 length) { UINT16 Version; @@ -135,18 +135,18 @@ static void wts_read_drdynvc_capabilities_response(rdpPeerChannel* channel, uint channel->vcm->drdynvc_state = DRDYNVC_STATE_READY; } -static void wts_read_drdynvc_create_response(rdpPeerChannel* channel, STREAM* s, uint32 length) +static void wts_read_drdynvc_create_response(rdpPeerChannel* channel, STREAM* s, UINT32 length) { - uint32 CreationStatus; + UINT32 CreationStatus; if (length < 4) return; - stream_read_uint32(s, CreationStatus); + stream_read_UINT32(s, CreationStatus); - if ((sint32) CreationStatus < 0) + if ((INT32) CreationStatus < 0) { - DEBUG_DVC("ChannelId %d creation failed (%d)", channel->channel_id, (sint32)CreationStatus); + DEBUG_DVC("ChannelId %d creation failed (%d)", channel->channel_id, (INT32)CreationStatus); channel->dvc_open_state = DVC_OPEN_STATE_FAILED; } else @@ -157,7 +157,7 @@ static void wts_read_drdynvc_create_response(rdpPeerChannel* channel, STREAM* s, wait_obj_set(channel->receive_event); } -static void wts_read_drdynvc_data_first(rdpPeerChannel* channel, STREAM* s, int cbLen, uint32 length) +static void wts_read_drdynvc_data_first(rdpPeerChannel* channel, STREAM* s, int cbLen, UINT32 length) { int value; @@ -176,7 +176,7 @@ static void wts_read_drdynvc_data_first(rdpPeerChannel* channel, STREAM* s, int stream_write(channel->receive_data, stream_get_tail(s), length); } -static void wts_read_drdynvc_data(rdpPeerChannel* channel, STREAM* s, uint32 length) +static void wts_read_drdynvc_data(rdpPeerChannel* channel, STREAM* s, UINT32 length) { if (channel->dvc_total_length > 0) { @@ -209,12 +209,12 @@ static void wts_read_drdynvc_close_response(rdpPeerChannel* channel) static void wts_read_drdynvc_pdu(rdpPeerChannel* channel) { - uint32 length; + UINT32 length; int value; int Cmd; int Sp; int cbChId; - uint32 ChannelId; + UINT32 ChannelId; rdpPeerChannel* dvc; length = stream_get_pos(channel->receive_data); @@ -282,7 +282,7 @@ static void wts_read_drdynvc_pdu(rdpPeerChannel* channel) } } -static int wts_write_variable_uint(STREAM* stream, uint32 val) +static int wts_write_variable_uint(STREAM* stream, UINT32 val) { int cb; @@ -299,13 +299,13 @@ static int wts_write_variable_uint(STREAM* stream, uint32 val) else { cb = 3; - stream_write_uint32(stream, val); + stream_write_UINT32(stream, val); } return cb; } -static void wts_write_drdynvc_header(STREAM *s, BYTE Cmd, uint32 ChannelId) +static void wts_write_drdynvc_header(STREAM *s, BYTE Cmd, UINT32 ChannelId) { BYTE* bm; int cbChId; @@ -316,9 +316,9 @@ static void wts_write_drdynvc_header(STREAM *s, BYTE Cmd, uint32 ChannelId) *bm = ((Cmd & 0x0F) << 4) | cbChId; } -static void wts_write_drdynvc_create_request(STREAM *s, uint32 ChannelId, const char *ChannelName) +static void wts_write_drdynvc_create_request(STREAM *s, UINT32 ChannelId, const char *ChannelName) { - uint32 len; + UINT32 len; wts_write_drdynvc_header(s, CREATE_REQUEST_PDU, ChannelId); len = strlen(ChannelName) + 1; @@ -449,7 +449,7 @@ BOOL WTSVirtualChannelManagerCheckFileDescriptor(WTSVirtualChannelManager* vcm) BOOL result = TRUE; wts_data_item* item; rdpPeerChannel* channel; - uint32 dynvc_caps; + UINT32 dynvc_caps; if (vcm->drdynvc_state == DRDYNVC_STATE_NONE && vcm->client->activated) { @@ -491,7 +491,7 @@ BOOL WTSVirtualChannelManagerCheckFileDescriptor(WTSVirtualChannelManager* vcm) void* WTSVirtualChannelOpenEx( /* __in */ WTSVirtualChannelManager* vcm, /* __in */ const char* pVirtualName, - /* __in */ uint32 flags) + /* __in */ UINT32 flags) { int i; int len; @@ -573,7 +573,7 @@ BOOL WTSVirtualChannelQuery( /* __in */ void* hChannelHandle, /* __in */ WTS_VIRTUAL_CLASS WtsVirtualClass, /* __out */ void** ppBuffer, - /* __out */ uint32* pBytesReturned) + /* __out */ UINT32* pBytesReturned) { BOOL bval; void* fds[10]; @@ -634,10 +634,10 @@ void WTSFreeMemory( BOOL WTSVirtualChannelRead( /* __in */ void* hChannelHandle, - /* __in */ uint32 TimeOut, + /* __in */ UINT32 TimeOut, /* __out */ BYTE* Buffer, - /* __in */ uint32 BufferSize, - /* __out */ uint32* pBytesRead) + /* __in */ UINT32 BufferSize, + /* __out */ UINT32* pBytesRead) { wts_data_item* item; rdpPeerChannel* channel = (rdpPeerChannel*) hChannelHandle; @@ -674,8 +674,8 @@ BOOL WTSVirtualChannelRead( BOOL WTSVirtualChannelWrite( /* __in */ void* hChannelHandle, /* __in */ BYTE* Buffer, - /* __in */ uint32 Length, - /* __out */ uint32* pBytesWritten) + /* __in */ UINT32 Length, + /* __out */ UINT32* pBytesWritten) { rdpPeerChannel* channel = (rdpPeerChannel*) hChannelHandle; wts_data_item* item; @@ -683,7 +683,7 @@ BOOL WTSVirtualChannelWrite( int cbLen; int cbChId; int first; - uint32 written; + UINT32 written; if (channel == NULL) return FALSE; @@ -716,7 +716,7 @@ BOOL WTSVirtualChannelWrite( stream_seek_BYTE(s); cbChId = wts_write_variable_uint(s, channel->channel_id); - if (first && (Length > (uint32) stream_get_left(s))) + if (first && (Length > (UINT32) stream_get_left(s))) { cbLen = wts_write_variable_uint(s, Length); item->buffer[0] = (DATA_FIRST_PDU << 4) | (cbLen << 2) | cbChId; diff --git a/libfreerdp/channels/wtsvc.h b/libfreerdp/channels/wtsvc.h index e58b7e49c..b452a6ee8 100644 --- a/libfreerdp/channels/wtsvc.h +++ b/libfreerdp/channels/wtsvc.h @@ -61,7 +61,7 @@ struct rdp_peer_channel { WTSVirtualChannelManager* vcm; freerdp_peer* client; - uint32 channel_id; + UINT32 channel_id; UINT16 channel_type; UINT16 index; @@ -71,7 +71,7 @@ struct rdp_peer_channel HANDLE mutex; BYTE dvc_open_state; - uint32 dvc_total_length; + UINT32 dvc_total_length; }; struct WTSVirtualChannelManager @@ -83,7 +83,7 @@ struct WTSVirtualChannelManager rdpPeerChannel* drdynvc_channel; BYTE drdynvc_state; - uint32 dvc_channel_id_seq; + UINT32 dvc_channel_id_seq; LIST* dvc_channel_list; }; diff --git a/libfreerdp/codec/bitmap.c b/libfreerdp/codec/bitmap.c index c859bf527..0a7b91b20 100644 --- a/libfreerdp/codec/bitmap.c +++ b/libfreerdp/codec/bitmap.c @@ -58,7 +58,7 @@ #define BLACK_PIXEL 0x000000 #define WHITE_PIXEL 0xFFFFFF -typedef uint32 PIXEL; +typedef UINT32 PIXEL; static const BYTE g_MaskBit0 = 0x01; /* Least significant bit */ static const BYTE g_MaskBit1 = 0x02; @@ -79,7 +79,7 @@ static const BYTE g_MaskLiteRunLength = 0x0F; * Reads the supplied order header and extracts the compression * order code ID. */ -static uint32 ExtractCodeId(BYTE bOrderHdr) +static UINT32 ExtractCodeId(BYTE bOrderHdr) { int code; @@ -115,10 +115,10 @@ static uint32 ExtractCodeId(BYTE bOrderHdr) /** * Extract the run length of a compression order. */ -static uint32 ExtractRunLength(uint32 code, BYTE* pbOrderHdr, uint32* advance) +static UINT32 ExtractRunLength(UINT32 code, BYTE* pbOrderHdr, UINT32* advance) { - uint32 runLength; - uint32 ladvance; + UINT32 runLength; + UINT32 ladvance; ladvance = 1; runLength = 0; diff --git a/libfreerdp/codec/color.c b/libfreerdp/codec/color.c index 63637b895..42aa4e5e7 100644 --- a/libfreerdp/codec/color.c +++ b/libfreerdp/codec/color.c @@ -35,7 +35,7 @@ int freerdp_get_pixel(BYTE * data, int x, int y, int width, int height, int bpp) int start; int shift; UINT16 *src16; - uint32 *src32; + UINT32 *src32; int red, green, blue; switch (bpp) @@ -59,7 +59,7 @@ int freerdp_get_pixel(BYTE * data, int x, int y, int width, int height, int bpp) blue = data[2]; return RGB24(red, green, blue); case 32: - src32 = (uint32*) data; + src32 = (UINT32*) data; return src32[y * width + x]; default: break; @@ -91,7 +91,7 @@ void freerdp_set_pixel(BYTE* data, int x, int y, int width, int height, int bpp, } } -static INLINE void freerdp_color_split_rgb(uint32* color, int bpp, BYTE* red, BYTE* green, BYTE* blue, BYTE* alpha, HCLRCONV clrconv) +static INLINE void freerdp_color_split_rgb(UINT32* color, int bpp, BYTE* red, BYTE* green, BYTE* blue, BYTE* alpha, HCLRCONV clrconv) { *red = *green = *blue = 0; *alpha = (clrconv->alpha) ? 0xFF : 0x00; @@ -142,7 +142,7 @@ static INLINE void freerdp_color_split_rgb(uint32* color, int bpp, BYTE* red, BY } } -static INLINE void freerdp_color_split_bgr(uint32* color, int bpp, BYTE* red, BYTE* green, BYTE* blue, BYTE* alpha, HCLRCONV clrconv) +static INLINE void freerdp_color_split_bgr(UINT32* color, int bpp, BYTE* red, BYTE* green, BYTE* blue, BYTE* alpha, HCLRCONV clrconv) { *red = *green = *blue = 0; *alpha = (clrconv->alpha) ? 0xFF : 0x00; @@ -193,7 +193,7 @@ static INLINE void freerdp_color_split_bgr(uint32* color, int bpp, BYTE* red, BY } } -static INLINE void freerdp_color_make_rgb(uint32* color, int bpp, BYTE* red, BYTE* green, BYTE* blue, BYTE* alpha, HCLRCONV clrconv) +static INLINE void freerdp_color_make_rgb(UINT32* color, int bpp, BYTE* red, BYTE* green, BYTE* blue, BYTE* alpha, HCLRCONV clrconv) { switch (bpp) { @@ -234,7 +234,7 @@ static INLINE void freerdp_color_make_rgb(uint32* color, int bpp, BYTE* red, BYT } } -static INLINE void freerdp_color_make_bgr(uint32* color, int bpp, BYTE* red, BYTE* green, BYTE* blue, BYTE* alpha, HCLRCONV clrconv) +static INLINE void freerdp_color_make_bgr(UINT32* color, int bpp, BYTE* red, BYTE* green, BYTE* blue, BYTE* alpha, HCLRCONV clrconv) { switch (bpp) { @@ -275,13 +275,13 @@ static INLINE void freerdp_color_make_bgr(uint32* color, int bpp, BYTE* red, BYT } } -uint32 freerdp_color_convert_rgb(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv) +UINT32 freerdp_color_convert_rgb(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv) { BYTE red = 0; BYTE green = 0; BYTE blue = 0; BYTE alpha = 0xFF; - uint32 dstColor = 0; + UINT32 dstColor = 0; freerdp_color_split_rgb(&srcColor, srcBpp, &red, &green, &blue, &alpha, clrconv); freerdp_color_make_rgb(&dstColor, dstBpp, &red, &green, &blue, &alpha, clrconv); @@ -289,13 +289,13 @@ uint32 freerdp_color_convert_rgb(uint32 srcColor, int srcBpp, int dstBpp, HCLRCO return dstColor; } -uint32 freerdp_color_convert_bgr(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv) +UINT32 freerdp_color_convert_bgr(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv) { BYTE red = 0; BYTE green = 0; BYTE blue = 0; BYTE alpha = 0xFF; - uint32 dstColor = 0; + UINT32 dstColor = 0; freerdp_color_split_bgr(&srcColor, srcBpp, &red, &green, &blue, &alpha, clrconv); freerdp_color_make_bgr(&dstColor, dstBpp, &red, &green, &blue, &alpha, clrconv); @@ -303,13 +303,13 @@ uint32 freerdp_color_convert_bgr(uint32 srcColor, int srcBpp, int dstBpp, HCLRCO return dstColor; } -uint32 freerdp_color_convert_rgb_bgr(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv) +UINT32 freerdp_color_convert_rgb_bgr(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv) { BYTE red = 0; BYTE green = 0; BYTE blue = 0; BYTE alpha = 0xFF; - uint32 dstColor = 0; + UINT32 dstColor = 0; freerdp_color_split_rgb(&srcColor, srcBpp, &red, &green, &blue, &alpha, clrconv); freerdp_color_make_bgr(&dstColor, dstBpp, &red, &green, &blue, &alpha, clrconv); @@ -317,13 +317,13 @@ uint32 freerdp_color_convert_rgb_bgr(uint32 srcColor, int srcBpp, int dstBpp, HC return dstColor; } -uint32 freerdp_color_convert_bgr_rgb(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv) +UINT32 freerdp_color_convert_bgr_rgb(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv) { BYTE red = 0; BYTE green = 0; BYTE blue = 0; BYTE alpha = 0xFF; - uint32 dstColor = 0; + UINT32 dstColor = 0; freerdp_color_split_bgr(&srcColor, srcBpp, &red, &green, &blue, &alpha, clrconv); freerdp_color_make_rgb(&dstColor, dstBpp, &red, &green, &blue, &alpha, clrconv); @@ -331,7 +331,7 @@ uint32 freerdp_color_convert_bgr_rgb(uint32 srcColor, int srcBpp, int dstBpp, HC return dstColor; } -uint32 freerdp_color_convert_var(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv) +UINT32 freerdp_color_convert_var(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv) { if (clrconv->invert) return freerdp_color_convert_var_bgr(srcColor, srcBpp, dstBpp, clrconv); @@ -339,7 +339,7 @@ uint32 freerdp_color_convert_var(uint32 srcColor, int srcBpp, int dstBpp, HCLRCO return freerdp_color_convert_var_rgb(srcColor, srcBpp, dstBpp, clrconv); } -uint32 freerdp_color_convert_var_rgb(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv) +UINT32 freerdp_color_convert_var_rgb(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv) { if (srcBpp > 16) return freerdp_color_convert_bgr_rgb(srcColor, srcBpp, dstBpp, clrconv); @@ -347,7 +347,7 @@ uint32 freerdp_color_convert_var_rgb(uint32 srcColor, int srcBpp, int dstBpp, HC return freerdp_color_convert_rgb(srcColor, srcBpp, dstBpp, clrconv); } -uint32 freerdp_color_convert_var_bgr(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv) +UINT32 freerdp_color_convert_var_bgr(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv) { if (srcBpp > 16) return freerdp_color_convert_bgr(srcColor, srcBpp, dstBpp, clrconv); @@ -361,10 +361,10 @@ BYTE* freerdp_image_convert_8bpp(BYTE* srcData, BYTE* dstData, int width, int he BYTE red; BYTE green; BYTE blue; - uint32 pixel; + UINT32 pixel; BYTE *src8; UINT16 *dst16; - uint32 *dst32; + UINT32 *dst32; if (dstBpp == 8) { @@ -418,7 +418,7 @@ BYTE* freerdp_image_convert_8bpp(BYTE* srcData, BYTE* dstData, int width, int he dstData = (BYTE*) malloc(width * height * 4); src8 = (BYTE*) srcData; - dst32 = (uint32*) dstData; + dst32 = (UINT32*) dstData; for (i = width * height; i > 0; i--) { pixel = *src8; @@ -442,10 +442,10 @@ BYTE* freerdp_image_convert_15bpp(BYTE* srcData, BYTE* dstData, int width, int h BYTE red; BYTE green; BYTE blue; - uint32 pixel; + UINT32 pixel; UINT16 *src16; UINT16 *dst16; - uint32 *dst32; + UINT32 *dst32; if (dstBpp == 15 || (dstBpp == 16 && clrconv->rgb555)) { @@ -462,7 +462,7 @@ BYTE* freerdp_image_convert_15bpp(BYTE* srcData, BYTE* dstData, int width, int h dstData = (BYTE*) malloc(width * height * 4); src16 = (UINT16 *) srcData; - dst32 = (uint32 *) dstData; + dst32 = (UINT32 *) dstData; for (i = width * height; i > 0; i--) { pixel = *src16; @@ -566,16 +566,16 @@ BYTE* freerdp_image_convert_16bpp(BYTE* srcData, BYTE* dstData, int width, int h else if (dstBpp == 32) { int i; - uint32 pixel; + UINT32 pixel; UINT16* src16; - uint32* dst32; + UINT32* dst32; BYTE red, green, blue; if (dstData == NULL) dstData = (BYTE*) malloc(width * height * 4); src16 = (UINT16*) srcData; - dst32 = (uint32*) dstData; + dst32 = (UINT32*) dstData; for (i = width * height; i > 0; i--) { @@ -622,14 +622,14 @@ BYTE* freerdp_image_convert_32bpp(BYTE* srcData, BYTE* dstData, int width, int h { int index; UINT16 *dst16; - uint32 *src32; + UINT32 *src32; BYTE red, green, blue; if (dstData == NULL) dstData = (BYTE*) malloc(width * height * 2); dst16 = (UINT16*) dstData; - src32 = (uint32*) srcData; + src32 = (UINT32*) srcData; for (index = 0; index < width * height; index++) { @@ -798,7 +798,7 @@ BYTE* freerdp_icon_convert(BYTE* srcData, BYTE* dstData, BYTE* mask, int width, { BYTE* data; BYTE bmask; - uint32* icon; + UINT32* icon; int x, y, bit; int maskIndex; @@ -816,7 +816,7 @@ BYTE* freerdp_icon_convert(BYTE* srcData, BYTE* dstData, BYTE* mask, int width, if (bpp < 32) { maskIndex = 0; - icon = (uint32*) dstData; + icon = (UINT32*) dstData; for (y = 0; y < height; y++) { @@ -884,11 +884,11 @@ BYTE* freerdp_glyph_convert(int width, int height, BYTE* data) return dstData; } -BYTE* freerdp_mono_image_convert(BYTE* srcData, int width, int height, int srcBpp, int dstBpp, uint32 bgcolor, uint32 fgcolor, HCLRCONV clrconv) +BYTE* freerdp_mono_image_convert(BYTE* srcData, int width, int height, int srcBpp, int dstBpp, UINT32 bgcolor, UINT32 fgcolor, HCLRCONV clrconv) { int index; UINT16* dst16; - uint32* dst32; + UINT32* dst32; BYTE* dstData; BYTE bitMask; int bitIndex; @@ -972,7 +972,7 @@ BYTE* freerdp_mono_image_convert(BYTE* srcData, int width, int height, int srcBp else if (dstBpp == 32) { dstData = (BYTE*) malloc(width * height * 4); - dst32 = (uint32*) dstData; + dst32 = (UINT32*) dstData; for (index = height; index > 0; index--) { @@ -1037,10 +1037,10 @@ void freerdp_alpha_cursor_convert(BYTE* alphaData, BYTE* xorMask, BYTE* andMask, void freerdp_image_swap_color_order(BYTE* data, int width, int height) { int x, y; - uint32* pixel; + UINT32* pixel; BYTE a, r, g, b; - pixel = (uint32*) data; + pixel = (UINT32*) data; for (y = 0; y < height; y++) { @@ -1053,7 +1053,7 @@ void freerdp_image_swap_color_order(BYTE* data, int width, int height) } } -HCLRCONV freerdp_clrconv_new(uint32 flags) +HCLRCONV freerdp_clrconv_new(UINT32 flags) { HCLRCONV clrconv = xnew(CLRCONV); diff --git a/libfreerdp/codec/include/bitmap.c b/libfreerdp/codec/include/bitmap.c index 0d56483cc..8e923f151 100644 --- a/libfreerdp/codec/include/bitmap.c +++ b/libfreerdp/codec/include/bitmap.c @@ -22,8 +22,8 @@ /** * Write a foreground/background image to a destination buffer. */ -static BYTE* WRITEFGBGIMAGE(BYTE* pbDest, uint32 rowDelta, - BYTE bitmask, PIXEL fgPel, uint32 cBits) +static BYTE* WRITEFGBGIMAGE(BYTE* pbDest, UINT32 rowDelta, + BYTE bitmask, PIXEL fgPel, UINT32 cBits) { PIXEL xorPixel; @@ -143,7 +143,7 @@ static BYTE* WRITEFGBGIMAGE(BYTE* pbDest, uint32 rowDelta, * for the first line of compressed data. */ static BYTE* WRITEFIRSTLINEFGBGIMAGE(BYTE* pbDest, BYTE bitmask, - PIXEL fgPel, uint32 cBits) + PIXEL fgPel, UINT32 cBits) { if (bitmask & g_MaskBit0) { @@ -251,8 +251,8 @@ static BYTE* WRITEFIRSTLINEFGBGIMAGE(BYTE* pbDest, BYTE bitmask, /** * Decompress an RLE compressed bitmap. */ -void RLEDECOMPRESS(BYTE* pbSrcBuffer, uint32 cbSrcBuffer, BYTE* pbDestBuffer, - uint32 rowDelta, uint32 width, uint32 height) +void RLEDECOMPRESS(BYTE* pbSrcBuffer, UINT32 cbSrcBuffer, BYTE* pbDestBuffer, + UINT32 rowDelta, UINT32 width, UINT32 height) { BYTE* pbSrc = pbSrcBuffer; BYTE* pbEnd = pbSrcBuffer + cbSrcBuffer; @@ -266,10 +266,10 @@ void RLEDECOMPRESS(BYTE* pbSrcBuffer, uint32 cbSrcBuffer, BYTE* pbDestBuffer, BYTE bitmask; PIXEL pixelA, pixelB; - uint32 runLength; - uint32 code; + UINT32 runLength; + UINT32 code; - uint32 advance; + UINT32 advance; RLEEXTRA @@ -278,7 +278,7 @@ void RLEDECOMPRESS(BYTE* pbSrcBuffer, uint32 cbSrcBuffer, BYTE* pbDestBuffer, /* Watch out for the end of the first scanline. */ if (fFirstLine) { - if ((uint32)(pbDest - pbDestBuffer) >= rowDelta) + if ((UINT32)(pbDest - pbDestBuffer) >= rowDelta) { fFirstLine = FALSE; fInsertFgPel = FALSE; diff --git a/libfreerdp/codec/mppc_dec.c b/libfreerdp/codec/mppc_dec.c index 02b75c0c7..e02862526 100644 --- a/libfreerdp/codec/mppc_dec.c +++ b/libfreerdp/codec/mppc_dec.c @@ -49,7 +49,7 @@ static BYTE LOMHTab[] = {0, 4, 10, 19}; static BYTE CopyOffsetBitsLUT[] = { 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15 }; -static uint32 CopyOffsetBaseLUT[] = { +static UINT32 CopyOffsetBaseLUT[] = { 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577, 32769, 49153, 65537 }; static BYTE LOMBitsLUT[] = { @@ -104,7 +104,7 @@ UINT16 getLOMindex(UINT16 huff) return HuffIndexLOM[LOMHTab[miniLOMhash(huff)]]; } -uint32 transposebits(uint32 x) +UINT32 transposebits(UINT32 x) { x = ((x & 0x55555555) << 1) | ((x >> 1) & 0x55555555); x = ((x & 0x33333333) << 2) | ((x >> 2) & 0x33333333); @@ -119,16 +119,16 @@ uint32 transposebits(uint32 x) } #define cache_add(_s, _x) do { \ - *((uint32*)((_s)+2)) <<= 16; \ - *((uint32*)((_s)+2)) |= (*((uint32*)(_s)) >> 16); \ - *((uint32*)(_s)) = (*((uint32*)(_s)) << 16) | (_x); } while(0) + *((UINT32*)((_s)+2)) <<= 16; \ + *((UINT32*)((_s)+2)) |= (*((UINT32*)(_s)) >> 16); \ + *((UINT32*)(_s)) = (*((UINT32*)(_s)) << 16) | (_x); } while(0) #define cache_swap(_s, _i) do { \ UINT16 t = *(_s); \ *(_s) = *((_s) + (_i)); \ *((_s) + (_i)) = t; } while(0) -int decompress_rdp(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, uint32* roff, uint32* rlen) +int decompress_rdp(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, UINT32* roff, UINT32* rlen) { int type = ctype & 0x0f; @@ -169,11 +169,11 @@ int decompress_rdp(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, uin * @return True on success, False on failure */ -int decompress_rdp_4(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, uint32* roff, uint32* rlen) +int decompress_rdp_4(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, UINT32* roff, UINT32* rlen) { BYTE* history_buf; /* uncompressed data goes here */ BYTE* history_ptr; /* points to next free slot in history_buf */ - uint32 d32; /* we process 4 compressed bytes at a time */ + UINT32 d32; /* we process 4 compressed bytes at a time */ UINT16 copy_offset; /* location to copy data from */ UINT16 lom; /* length of match */ BYTE* src_ptr; /* used while copying compressed data */ @@ -182,7 +182,7 @@ int decompress_rdp_4(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, u int bits_left; /* bits left in d34 for processing */ int cur_bits_left; /* bits left in cur_byte for processing */ int tmp; - uint32 i32; + UINT32 i32; printf("decompress_rdp_4:\n"); @@ -599,11 +599,11 @@ int decompress_rdp_4(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, u * @return True on success, False on failure */ -int decompress_rdp_5(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, uint32* roff, uint32* rlen) +int decompress_rdp_5(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, UINT32* roff, UINT32* rlen) { BYTE* history_buf; /* uncompressed data goes here */ BYTE* history_ptr; /* points to next free slot in bistory_buf */ - uint32 d32; /* we process 4 compressed bytes at a time */ + UINT32 d32; /* we process 4 compressed bytes at a time */ UINT16 copy_offset; /* location to copy data from */ UINT16 lom; /* length of match */ BYTE* src_ptr; /* used while copying compressed data */ @@ -612,7 +612,7 @@ int decompress_rdp_5(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, u int bits_left; /* bits left in d32 for processing */ int cur_bits_left; /* bits left in cur_byte for processing */ int tmp; - uint32 i32; + UINT32 i32; if ((dec == NULL) || (dec->history_buf == NULL)) { @@ -1063,12 +1063,12 @@ int decompress_rdp_5(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, u * @return True on success, False on failure */ -int decompress_rdp_6(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, uint32* roff, uint32* rlen) +int decompress_rdp_6(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, UINT32* roff, UINT32* rlen) { BYTE* history_buf; /* uncompressed data goes here */ UINT16* offset_cache; /* Copy Offset cache */ BYTE* history_ptr; /* points to next free slot in bistory_buf */ - uint32 d32; /* we process 4 compressed bytes at a time */ + UINT32 d32; /* we process 4 compressed bytes at a time */ UINT16 copy_offset; /* location to copy data from */ UINT16 lom; /* length of match */ UINT16 LUTIndex; /* LookUp table Index */ @@ -1078,7 +1078,7 @@ int decompress_rdp_6(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, u int bits_left; /* bits left in d32 for processing */ int cur_bits_left; /* bits left in cur_byte for processing */ int tmp, i; - uint32 i32; + UINT32 i32; if ((dec == NULL) || (dec->history_buf == NULL)) { @@ -1398,7 +1398,7 @@ int decompress_rdp_6(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, u * @return True on success, False on failure */ -int decompress_rdp_61(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, uint32* roff, uint32* rlen) +int decompress_rdp_61(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, UINT32* roff, UINT32* rlen) { return FALSE; } diff --git a/libfreerdp/codec/mppc_enc.c b/libfreerdp/codec/mppc_enc.c index 14f94e065..8e6238afc 100644 --- a/libfreerdp/codec/mppc_enc.c +++ b/libfreerdp/codec/mppc_enc.c @@ -551,22 +551,22 @@ BOOL compress_rdp_5(struct rdp_mppc_enc* enc, BYTE* srcData, int len) char* cptr2; int opb_index; /* index into outputBuffer */ int bits_left; /* unused bits in current byte in outputBuffer */ - uint32 copy_offset; /* pattern match starts here... */ - uint32 lom; /* ...and matches this many bytes */ + UINT32 copy_offset; /* pattern match starts here... */ + UINT32 lom; /* ...and matches this many bytes */ int last_crc_index; /* don't compute CRC beyond this index */ UINT16 *hash_table; /* hash table for pattern matching */ - uint32 i; - uint32 j; - uint32 k; - uint32 x; + UINT32 i; + UINT32 j; + UINT32 k; + UINT32 x; BYTE data; UINT16 data16; - uint32 historyOffset; + UINT32 historyOffset; UINT16 crc; - uint32 ctr; - uint32 saved_ctr; - uint32 data_end; + UINT32 ctr; + UINT32 saved_ctr; + UINT32 data_end; BYTE byte_val; crc = 0; diff --git a/libfreerdp/codec/nsc.c b/libfreerdp/codec/nsc.c index 1c319b266..c76e2a20a 100644 --- a/libfreerdp/codec/nsc.c +++ b/libfreerdp/codec/nsc.c @@ -100,10 +100,10 @@ static void nsc_decode(NSC_CONTEXT* context) } } -static void nsc_rle_decode(BYTE* in, BYTE* out, uint32 origsz) +static void nsc_rle_decode(BYTE* in, BYTE* out, UINT32 origsz) { - uint32 len; - uint32 left; + UINT32 len; + UINT32 left; BYTE value; left = origsz; @@ -121,13 +121,13 @@ static void nsc_rle_decode(BYTE* in, BYTE* out, uint32 origsz) in++; if (*in < 0xFF) { - len = (uint32) *in++; + len = (UINT32) *in++; len += 2; } else { in++; - len = *((uint32*) in); + len = *((UINT32*) in); in += 4; } memset(out, value, len); @@ -141,15 +141,15 @@ static void nsc_rle_decode(BYTE* in, BYTE* out, uint32 origsz) } } - *((uint32*)out) = *((uint32*)in); + *((UINT32*)out) = *((UINT32*)in); } static void nsc_rle_decompress_data(NSC_CONTEXT* context) { UINT16 i; BYTE* rle; - uint32 origsize; - uint32 planesize; + UINT32 origsize; + UINT32 planesize; rle = context->nsc_stream.Planes; @@ -174,7 +174,7 @@ static void nsc_stream_initialize(NSC_CONTEXT* context, STREAM* s) int i; for (i = 0; i < 4; i++) - stream_read_uint32(s, context->nsc_stream.PlaneByteCount[i]); + stream_read_UINT32(s, context->nsc_stream.PlaneByteCount[i]); stream_read_BYTE(s, context->nsc_stream.ColorLossLevel); stream_read_BYTE(s, context->nsc_stream.ChromaSubSamplingLevel); @@ -186,9 +186,9 @@ static void nsc_stream_initialize(NSC_CONTEXT* context, STREAM* s) static void nsc_context_initialize(NSC_CONTEXT* context, STREAM* s) { int i; - uint32 length; - uint32 tempWidth; - uint32 tempHeight; + UINT32 length; + UINT32 tempWidth; + UINT32 tempHeight; nsc_stream_initialize(context, s); length = context->width * context->height * 4; @@ -281,7 +281,7 @@ NSC_CONTEXT* nsc_context_new(void) return nsc_context; } -void nsc_context_set_cpu_opt(NSC_CONTEXT* context, uint32 cpu_opt) +void nsc_context_set_cpu_opt(NSC_CONTEXT* context, UINT32 cpu_opt) { if (cpu_opt) NSC_INIT_SIMD(context); @@ -317,7 +317,7 @@ void nsc_context_set_pixel_format(NSC_CONTEXT* context, RDP_PIXEL_FORMAT pixel_f } void nsc_process_message(NSC_CONTEXT* context, UINT16 bpp, - UINT16 width, UINT16 height, BYTE* data, uint32 length) + UINT16 width, UINT16 height, BYTE* data, UINT32 length) { STREAM* s; diff --git a/libfreerdp/codec/nsc_encode.c b/libfreerdp/codec/nsc_encode.c index 5e8957f2b..68f5f4c39 100644 --- a/libfreerdp/codec/nsc_encode.c +++ b/libfreerdp/codec/nsc_encode.c @@ -37,9 +37,9 @@ static void nsc_context_initialize_encode(NSC_CONTEXT* context) { int i; - uint32 length; - uint32 tempWidth; - uint32 tempHeight; + UINT32 length; + UINT32 tempWidth; + UINT32 tempHeight; tempWidth = ROUND_UP_TO(context->width, 8); tempHeight = ROUND_UP_TO(context->height, 2); @@ -83,8 +83,8 @@ static void nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, BYTE* bmpdata, int r INT16 g_val; INT16 b_val; BYTE a_val; - uint32 tempWidth; - uint32 tempHeight; + UINT32 tempWidth; + UINT32 tempHeight; tempWidth = ROUND_UP_TO(context->width, 8); tempHeight = ROUND_UP_TO(context->height, 2); @@ -209,8 +209,8 @@ static void nsc_encode_subsampling(NSC_CONTEXT* context) INT8* co_src1; INT8* cg_src0; INT8* cg_src1; - uint32 tempWidth; - uint32 tempHeight; + UINT32 tempWidth; + UINT32 tempHeight; tempWidth = ROUND_UP_TO(context->width, 8); tempHeight = ROUND_UP_TO(context->height, 2); @@ -246,11 +246,11 @@ void nsc_encode(NSC_CONTEXT* context, BYTE* bmpdata, int rowstride) } } -static uint32 nsc_rle_encode(BYTE* in, BYTE* out, uint32 origsz) +static UINT32 nsc_rle_encode(BYTE* in, BYTE* out, UINT32 origsz) { - uint32 left; - uint32 runlength = 1; - uint32 planesize = 0; + UINT32 left; + UINT32 runlength = 1; + UINT32 planesize = 0; left = origsz; /** @@ -304,8 +304,8 @@ static void nsc_rle_compress_data(NSC_CONTEXT* context) { UINT16 i; BYTE* rle; - uint32 origsize; - uint32 planesize; + UINT32 origsize; + UINT32 planesize; rle = context->nsc_stream.Planes; @@ -351,10 +351,10 @@ void nsc_compose_message(NSC_CONTEXT* context, STREAM* s, /* Assemble the NSCodec message into stream */ stream_check_size(s, 20); - stream_write_uint32(s, context->nsc_stream.PlaneByteCount[0]); /* LumaPlaneByteCount (4 bytes) */ - stream_write_uint32(s, context->nsc_stream.PlaneByteCount[1]); /* OrangeChromaPlaneByteCount (4 bytes) */ - stream_write_uint32(s, context->nsc_stream.PlaneByteCount[2]); /* GreenChromaPlaneByteCount (4 bytes) */ - stream_write_uint32(s, context->nsc_stream.PlaneByteCount[3]); /* AlphaPlaneByteCount (4 bytes) */ + stream_write_UINT32(s, context->nsc_stream.PlaneByteCount[0]); /* LumaPlaneByteCount (4 bytes) */ + stream_write_UINT32(s, context->nsc_stream.PlaneByteCount[1]); /* OrangeChromaPlaneByteCount (4 bytes) */ + stream_write_UINT32(s, context->nsc_stream.PlaneByteCount[2]); /* GreenChromaPlaneByteCount (4 bytes) */ + stream_write_UINT32(s, context->nsc_stream.PlaneByteCount[3]); /* AlphaPlaneByteCount (4 bytes) */ stream_write_BYTE(s, context->nsc_stream.ColorLossLevel); /* ColorLossLevel (1 byte) */ stream_write_BYTE(s, context->nsc_stream.ChromaSubSamplingLevel); /* ChromaSubsamplingLevel (1 byte) */ stream_write_UINT16(s, 0); /* Reserved (2 bytes) */ diff --git a/libfreerdp/codec/nsc_sse2.c b/libfreerdp/codec/nsc_sse2.c index f84c1b2d7..f1a033fc4 100644 --- a/libfreerdp/codec/nsc_sse2.c +++ b/libfreerdp/codec/nsc_sse2.c @@ -49,8 +49,8 @@ static void nsc_encode_argb_to_aycocg_sse2(NSC_CONTEXT* context, BYTE* bmpdata, __m128i y_val; __m128i co_val; __m128i cg_val; - uint32 tempWidth; - uint32 tempHeight; + UINT32 tempWidth; + UINT32 tempHeight; tempWidth = ROUND_UP_TO(context->width, 8); tempHeight = ROUND_UP_TO(context->height, 2); @@ -291,8 +291,8 @@ static void nsc_encode_subsampling_sse2(NSC_CONTEXT* context) INT8* co_src1; INT8* cg_src0; INT8* cg_src1; - uint32 tempWidth; - uint32 tempHeight; + UINT32 tempWidth; + UINT32 tempHeight; __m128i t; __m128i val; __m128i mask = _mm_set1_epi16(0xFF); diff --git a/libfreerdp/codec/nsc_types.h b/libfreerdp/codec/nsc_types.h index 14bc1f873..060b89daa 100644 --- a/libfreerdp/codec/nsc_types.h +++ b/libfreerdp/codec/nsc_types.h @@ -34,7 +34,7 @@ struct _NSC_CONTEXT_PRIV { BYTE* plane_buf[5]; /* Decompressed Plane Buffers in the respective order */ - uint32 plane_buf_length; /* Lengths of each plane buffer */ + UINT32 plane_buf_length; /* Lengths of each plane buffer */ /* profilers */ PROFILER_DEFINE(prof_nsc_rle_decompress_data); diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c index 7d63a2ed6..a1d4af335 100644 --- a/libfreerdp/codec/rfx.c +++ b/libfreerdp/codec/rfx.c @@ -64,7 +64,7 @@ * The order of the values are: * LL3, LH3, HL3, HH3, LH2, HL2, HH2, LH1, HL1, HH1 */ -static const uint32 rfx_default_quantization_values[] = +static const UINT32 rfx_default_quantization_values[] = { 6, 6, 6, 6, 7, 7, 8, 8, 8, 9 }; @@ -168,7 +168,7 @@ RFX_CONTEXT* rfx_context_new(void) return context; } -void rfx_context_set_cpu_opt(RFX_CONTEXT* context, uint32 cpu_opt) +void rfx_context_set_cpu_opt(RFX_CONTEXT* context, UINT32 cpu_opt) { /* enable SIMD CPU acceleration if detected */ if (cpu_opt & CPU_SSE2) @@ -225,10 +225,10 @@ void rfx_context_reset(RFX_CONTEXT* context) static void rfx_process_message_sync(RFX_CONTEXT* context, STREAM* s) { - uint32 magic; + UINT32 magic; /* RFX_SYNC */ - stream_read_uint32(s, magic); /* magic (4 bytes), 0xCACCACCA */ + stream_read_UINT32(s, magic); /* magic (4 bytes), 0xCACCACCA */ if (magic != WF_MAGIC) { @@ -334,10 +334,10 @@ static void rfx_process_message_context(RFX_CONTEXT* context, STREAM* s) static void rfx_process_message_frame_begin(RFX_CONTEXT* context, RFX_MESSAGE* message, STREAM* s) { - uint32 frameIdx; + UINT32 frameIdx; UINT16 numRegions; - stream_read_uint32(s, frameIdx); /* frameIdx (4 bytes), if codec is in video mode, must be ignored */ + stream_read_UINT32(s, frameIdx); /* frameIdx (4 bytes), if codec is in video mode, must be ignored */ stream_read_UINT16(s, numRegions); /* numRegions (2 bytes) */ DEBUG_RFX("RFX_FRAME_BEGIN: frameIdx:%d numRegions:%d", frameIdx, numRegions); @@ -415,10 +415,10 @@ static void rfx_process_message_tileset(RFX_CONTEXT* context, RFX_MESSAGE* messa { int i; UINT16 subtype; - uint32 blockLen; - uint32 blockType; - uint32 tilesDataSize; - uint32* quants; + UINT32 blockLen; + UINT32 blockType; + UINT32 tilesDataSize; + UINT32* quants; BYTE quant; int pos; @@ -450,12 +450,12 @@ static void rfx_process_message_tileset(RFX_CONTEXT* context, RFX_MESSAGE* messa return; } - stream_read_uint32(s, tilesDataSize); /* tilesDataSize (4 bytes) */ + stream_read_UINT32(s, tilesDataSize); /* tilesDataSize (4 bytes) */ if (context->quants != NULL) - context->quants = (uint32*) realloc((void*) context->quants, context->num_quants * 10 * sizeof(uint32)); + context->quants = (UINT32*) realloc((void*) context->quants, context->num_quants * 10 * sizeof(UINT32)); else - context->quants = (uint32*) malloc(context->num_quants * 10 * sizeof(uint32)); + context->quants = (UINT32*) malloc(context->num_quants * 10 * sizeof(UINT32)); quants = context->quants; /* quantVals */ @@ -493,7 +493,7 @@ static void rfx_process_message_tileset(RFX_CONTEXT* context, RFX_MESSAGE* messa { /* RFX_TILE */ stream_read_UINT16(s, blockType); /* blockType (2 bytes), must be set to CBT_TILE (0xCAC3) */ - stream_read_uint32(s, blockLen); /* blockLen (4 bytes) */ + stream_read_UINT32(s, blockLen); /* blockLen (4 bytes) */ pos = stream_get_pos(s) - 6 + blockLen; @@ -509,12 +509,12 @@ static void rfx_process_message_tileset(RFX_CONTEXT* context, RFX_MESSAGE* messa } } -RFX_MESSAGE* rfx_process_message(RFX_CONTEXT* context, BYTE* data, uint32 length) +RFX_MESSAGE* rfx_process_message(RFX_CONTEXT* context, BYTE* data, UINT32 length) { int pos; STREAM* s; - uint32 blockLen; - uint32 blockType; + UINT32 blockLen; + UINT32 blockType; RFX_MESSAGE* message; s = stream_new(0); @@ -525,7 +525,7 @@ RFX_MESSAGE* rfx_process_message(RFX_CONTEXT* context, BYTE* data, uint32 length { /* RFX_BLOCKT */ stream_read_UINT16(s, blockType); /* blockType (2 bytes) */ - stream_read_uint32(s, blockLen); /* blockLen (4 bytes) */ + stream_read_UINT32(s, blockLen); /* blockLen (4 bytes) */ DEBUG_RFX("blockType 0x%X blockLen %d", blockType, blockLen); @@ -632,15 +632,15 @@ void rfx_message_free(RFX_CONTEXT* context, RFX_MESSAGE* message) static void rfx_compose_message_sync(RFX_CONTEXT* context, STREAM* s) { stream_write_UINT16(s, WBT_SYNC); /* BlockT.blockType */ - stream_write_uint32(s, 12); /* BlockT.blockLen */ - stream_write_uint32(s, WF_MAGIC); /* magic */ + stream_write_UINT32(s, 12); /* BlockT.blockLen */ + stream_write_UINT32(s, WF_MAGIC); /* magic */ stream_write_UINT16(s, WF_VERSION_1_0); /* version */ } static void rfx_compose_message_codec_versions(RFX_CONTEXT* context, STREAM* s) { stream_write_UINT16(s, WBT_CODEC_VERSIONS); /* BlockT.blockType */ - stream_write_uint32(s, 10); /* BlockT.blockLen */ + stream_write_UINT32(s, 10); /* BlockT.blockLen */ stream_write_BYTE(s, 1); /* numCodecs */ stream_write_BYTE(s, 1); /* codecs.codecId */ stream_write_UINT16(s, WF_VERSION_1_0); /* codecs.version */ @@ -649,7 +649,7 @@ static void rfx_compose_message_codec_versions(RFX_CONTEXT* context, STREAM* s) static void rfx_compose_message_channels(RFX_CONTEXT* context, STREAM* s) { stream_write_UINT16(s, WBT_CHANNELS); /* BlockT.blockType */ - stream_write_uint32(s, 12); /* BlockT.blockLen */ + stream_write_UINT32(s, 12); /* BlockT.blockLen */ stream_write_BYTE(s, 1); /* numChannels */ stream_write_BYTE(s, 0); /* Channel.channelId */ stream_write_UINT16(s, context->width); /* Channel.width */ @@ -661,7 +661,7 @@ static void rfx_compose_message_context(RFX_CONTEXT* context, STREAM* s) UINT16 properties; stream_write_UINT16(s, WBT_CONTEXT); /* CodecChannelT.blockType */ - stream_write_uint32(s, 13); /* CodecChannelT.blockLen */ + stream_write_UINT32(s, 13); /* CodecChannelT.blockLen */ stream_write_BYTE(s, 1); /* CodecChannelT.codecId */ stream_write_BYTE(s, 0); /* CodecChannelT.channelId */ stream_write_BYTE(s, 0); /* ctxId */ @@ -702,10 +702,10 @@ static void rfx_compose_message_frame_begin(RFX_CONTEXT* context, STREAM* s) stream_check_size(s, 14); stream_write_UINT16(s, WBT_FRAME_BEGIN); /* CodecChannelT.blockType */ - stream_write_uint32(s, 14); /* CodecChannelT.blockLen */ + stream_write_UINT32(s, 14); /* CodecChannelT.blockLen */ stream_write_BYTE(s, 1); /* CodecChannelT.codecId */ stream_write_BYTE(s, 0); /* CodecChannelT.channelId */ - stream_write_uint32(s, context->frame_idx); /* frameIdx */ + stream_write_UINT32(s, context->frame_idx); /* frameIdx */ stream_write_UINT16(s, 1); /* numRegions */ context->frame_idx++; @@ -721,7 +721,7 @@ static void rfx_compose_message_region(RFX_CONTEXT* context, STREAM* s, stream_check_size(s, size); stream_write_UINT16(s, WBT_REGION); /* CodecChannelT.blockType */ - stream_write_uint32(s, size); /* set CodecChannelT.blockLen later */ + stream_write_UINT32(s, size); /* set CodecChannelT.blockLen later */ stream_write_BYTE(s, 1); /* CodecChannelT.codecId */ stream_write_BYTE(s, 0); /* CodecChannelT.channelId */ stream_write_BYTE(s, 1); /* regionFlags */ @@ -741,7 +741,7 @@ static void rfx_compose_message_region(RFX_CONTEXT* context, STREAM* s, static void rfx_compose_message_tile(RFX_CONTEXT* context, STREAM* s, BYTE* tile_data, int tile_width, int tile_height, int rowstride, - const uint32* quantVals, int quantIdxY, int quantIdxCb, int quantIdxCr, + const UINT32* quantVals, int quantIdxY, int quantIdxCb, int quantIdxCr, int xIdx, int yIdx) { int YLen = 0; @@ -753,7 +753,7 @@ static void rfx_compose_message_tile(RFX_CONTEXT* context, STREAM* s, start_pos = stream_get_pos(s); stream_write_UINT16(s, CBT_TILE); /* BlockT.blockType */ - stream_seek_uint32(s); /* set BlockT.blockLen later */ + stream_seek_UINT32(s); /* set BlockT.blockLen later */ stream_write_BYTE(s, quantIdxY); stream_write_BYTE(s, quantIdxCb); stream_write_BYTE(s, quantIdxCr); @@ -772,7 +772,7 @@ static void rfx_compose_message_tile(RFX_CONTEXT* context, STREAM* s, end_pos = stream_get_pos(s); stream_set_pos(s, start_pos + 2); - stream_write_uint32(s, 19 + YLen + CbLen + CrLen); /* BlockT.blockLen */ + stream_write_UINT32(s, 19 + YLen + CbLen + CrLen); /* BlockT.blockLen */ stream_set_pos(s, start_pos + 13); stream_write_UINT16(s, YLen); stream_write_UINT16(s, CbLen); @@ -788,8 +788,8 @@ static void rfx_compose_message_tileset(RFX_CONTEXT* context, STREAM* s, int start_pos, end_pos; int i; int numQuants; - const uint32* quantVals; - const uint32* quantValsPtr; + const UINT32* quantVals; + const UINT32* quantValsPtr; int quantIdxY; int quantIdxCb; int quantIdxCr; @@ -826,7 +826,7 @@ static void rfx_compose_message_tileset(RFX_CONTEXT* context, STREAM* s, start_pos = stream_get_pos(s); stream_write_UINT16(s, WBT_EXTENSION); /* CodecChannelT.blockType */ - stream_seek_uint32(s); /* set CodecChannelT.blockLen later */ + stream_seek_UINT32(s); /* set CodecChannelT.blockLen later */ stream_write_BYTE(s, 1); /* CodecChannelT.codecId */ stream_write_BYTE(s, 0); /* CodecChannelT.channelId */ stream_write_UINT16(s, CBT_TILESET); /* subtype */ @@ -835,7 +835,7 @@ static void rfx_compose_message_tileset(RFX_CONTEXT* context, STREAM* s, stream_write_BYTE(s, numQuants); /* numQuants */ stream_write_BYTE(s, 0x40); /* tileSize */ stream_write_UINT16(s, numTiles); /* numTiles */ - stream_seek_uint32(s); /* set tilesDataSize later */ + stream_seek_UINT32(s); /* set tilesDataSize later */ quantValsPtr = quantVals; for (i = 0; i < numQuants * 5; i++) @@ -863,9 +863,9 @@ static void rfx_compose_message_tileset(RFX_CONTEXT* context, STREAM* s, end_pos = stream_get_pos(s); stream_set_pos(s, start_pos + 2); - stream_write_uint32(s, size); /* CodecChannelT.blockLen */ + stream_write_UINT32(s, size); /* CodecChannelT.blockLen */ stream_set_pos(s, start_pos + 18); - stream_write_uint32(s, tilesDataSize); + stream_write_UINT32(s, tilesDataSize); stream_set_pos(s, end_pos); } @@ -875,7 +875,7 @@ static void rfx_compose_message_frame_end(RFX_CONTEXT* context, STREAM* s) stream_check_size(s, 8); stream_write_UINT16(s, WBT_FRAME_END); /* CodecChannelT.blockType */ - stream_write_uint32(s, 8); /* CodecChannelT.blockLen */ + stream_write_UINT32(s, 8); /* CodecChannelT.blockLen */ stream_write_BYTE(s, 1); /* CodecChannelT.codecId */ stream_write_BYTE(s, 0); /* CodecChannelT.channelId */ } diff --git a/libfreerdp/codec/rfx_decode.c b/libfreerdp/codec/rfx_decode.c index cc61b8bfc..2d7774590 100644 --- a/libfreerdp/codec/rfx_decode.c +++ b/libfreerdp/codec/rfx_decode.c @@ -90,9 +90,9 @@ static void rfx_decode_format_rgb(INT16* r_buf, INT16* g_buf, INT16* b_buf, void rfx_decode_ycbcr_to_rgb(INT16* y_r_buf, INT16* cb_g_buf, INT16* cr_b_buf) { - /* sint32 is used intentionally because we calculate with shifted factors! */ - sint32 y, cb, cr; - sint32 r, g, b; + /* INT32 is used intentionally because we calculate with shifted factors! */ + INT32 y, cb, cr; + INT32 r, g, b; int i; /** @@ -149,7 +149,7 @@ void rfx_decode_ycbcr_to_rgb(INT16* y_r_buf, INT16* cb_g_buf, INT16* cr_b_buf) } } -static void rfx_decode_component(RFX_CONTEXT* context, const uint32* quantization_values, +static void rfx_decode_component(RFX_CONTEXT* context, const UINT32* quantization_values, const BYTE* data, int size, INT16* buffer) { PROFILER_ENTER(context->priv->prof_rfx_decode_component); @@ -174,9 +174,9 @@ static void rfx_decode_component(RFX_CONTEXT* context, const uint32* quantizatio } void rfx_decode_rgb(RFX_CONTEXT* context, STREAM* data_in, - int y_size, const uint32 * y_quants, - int cb_size, const uint32 * cb_quants, - int cr_size, const uint32 * cr_quants, BYTE* rgb_buffer) + int y_size, const UINT32 * y_quants, + int cb_size, const UINT32 * cb_quants, + int cr_size, const UINT32 * cr_quants, BYTE* rgb_buffer) { PROFILER_ENTER(context->priv->prof_rfx_decode_rgb); diff --git a/libfreerdp/codec/rfx_decode.h b/libfreerdp/codec/rfx_decode.h index f11e358d1..7a19b7bb2 100644 --- a/libfreerdp/codec/rfx_decode.h +++ b/libfreerdp/codec/rfx_decode.h @@ -25,9 +25,9 @@ void rfx_decode_ycbcr_to_rgb(INT16* y_r_buf, INT16* cb_g_buf, INT16* cr_b_buf); void rfx_decode_rgb(RFX_CONTEXT* context, STREAM* data_in, - int y_size, const uint32 * y_quants, - int cb_size, const uint32 * cb_quants, - int cr_size, const uint32 * cr_quants, BYTE* rgb_buffer); + int y_size, const UINT32 * y_quants, + int cb_size, const UINT32 * cb_quants, + int cr_size, const UINT32 * cr_quants, BYTE* rgb_buffer); #endif /* __RFX_DECODE_H */ diff --git a/libfreerdp/codec/rfx_encode.c b/libfreerdp/codec/rfx_encode.c index a95a5d93c..8e511eac0 100644 --- a/libfreerdp/codec/rfx_encode.c +++ b/libfreerdp/codec/rfx_encode.c @@ -182,10 +182,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i void rfx_encode_rgb_to_ycbcr(INT16* y_r_buf, INT16* cb_g_buf, INT16* cr_b_buf) { - /* sint32 is used intentionally because we calculate with shifted factors! */ + /* INT32 is used intentionally because we calculate with shifted factors! */ int i; - sint32 r, g, b; - sint32 y, cb, cr; + INT32 r, g, b; + INT32 y, cb, cr; /** * The encoded YCbCr coefficients are represented as 11.5 fixed-point numbers: @@ -222,7 +222,7 @@ void rfx_encode_rgb_to_ycbcr(INT16* y_r_buf, INT16* cb_g_buf, INT16* cr_b_buf) } } -static void rfx_encode_component(RFX_CONTEXT* context, const uint32* quantization_values, +static void rfx_encode_component(RFX_CONTEXT* context, const UINT32* quantization_values, INT16* data, BYTE* buffer, int buffer_size, int* size) { PROFILER_ENTER(context->priv->prof_rfx_encode_component); @@ -247,7 +247,7 @@ static void rfx_encode_component(RFX_CONTEXT* context, const uint32* quantizatio } void rfx_encode_rgb(RFX_CONTEXT* context, const BYTE* rgb_data, int width, int height, int rowstride, - const uint32* y_quants, const uint32* cb_quants, const uint32* cr_quants, + const UINT32* y_quants, const UINT32* cb_quants, const UINT32* cr_quants, STREAM* data_out, int* y_size, int* cb_size, int* cr_size) { INT16* y_r_buffer = context->priv->y_r_buffer; diff --git a/libfreerdp/codec/rfx_encode.h b/libfreerdp/codec/rfx_encode.h index 0203b4f55..56220e838 100644 --- a/libfreerdp/codec/rfx_encode.h +++ b/libfreerdp/codec/rfx_encode.h @@ -25,7 +25,7 @@ void rfx_encode_rgb_to_ycbcr(INT16* y_r_buf, INT16* cb_g_buf, INT16* cr_b_buf); void rfx_encode_rgb(RFX_CONTEXT* context, const BYTE* rgb_data, int width, int height, int rowstride, - const uint32* y_quants, const uint32* cb_quants, const uint32* cr_quants, + const UINT32* y_quants, const UINT32* cb_quants, const UINT32* cr_quants, STREAM* data_out, int* y_size, int* cb_size, int* cr_size); #endif diff --git a/libfreerdp/codec/rfx_neon.c b/libfreerdp/codec/rfx_neon.c index ab313cb3d..fc84440c4 100644 --- a/libfreerdp/codec/rfx_neon.c +++ b/libfreerdp/codec/rfx_neon.c @@ -88,7 +88,7 @@ void rfx_decode_YCbCr_to_RGB_NEON(INT16 * y_r_buffer, INT16 * cb_g_buffer, INT16 } static __inline void __attribute__((__gnu_inline__, __always_inline__, __artificial__)) -rfx_quantization_decode_block_NEON(INT16 * buffer, const int buffer_size, const uint32 factor) +rfx_quantization_decode_block_NEON(INT16 * buffer, const int buffer_size, const UINT32 factor) { if (factor <= 6) return; @@ -107,7 +107,7 @@ rfx_quantization_decode_block_NEON(INT16 * buffer, const int buffer_size, const } void -rfx_quantization_decode_NEON(INT16 * buffer, const uint32 * quantization_values) +rfx_quantization_decode_NEON(INT16 * buffer, const UINT32 * quantization_values) { rfx_quantization_decode_block_NEON(buffer, 1024, quantization_values[8]); /* HL1 */ rfx_quantization_decode_block_NEON(buffer + 1024, 1024, quantization_values[7]); /* LH1 */ @@ -314,7 +314,7 @@ int isNeonSupported() return 0; } - uint64_t features = android_getCpuFeatures(); + UINT64_t features = android_getCpuFeatures(); if ((features & ANDROID_CPU_ARM_FEATURE_ARMv7)) { if (features & ANDROID_CPU_ARM_FEATURE_NEON) diff --git a/libfreerdp/codec/rfx_quantization.c b/libfreerdp/codec/rfx_quantization.c index f2edfd2ce..a25a8dabe 100644 --- a/libfreerdp/codec/rfx_quantization.c +++ b/libfreerdp/codec/rfx_quantization.c @@ -23,7 +23,7 @@ #include "rfx_quantization.h" -static void rfx_quantization_decode_block(INT16* buffer, int buffer_size, uint32 factor) +static void rfx_quantization_decode_block(INT16* buffer, int buffer_size, UINT32 factor) { INT16* dst; @@ -36,7 +36,7 @@ static void rfx_quantization_decode_block(INT16* buffer, int buffer_size, uint32 } } -void rfx_quantization_decode(INT16* buffer, const uint32* quantization_values) +void rfx_quantization_decode(INT16* buffer, const UINT32* quantization_values) { /* Scale the values so that they are represented as 11.5 fixed-point number */ rfx_quantization_decode_block(buffer, 4096, 5); @@ -53,7 +53,7 @@ void rfx_quantization_decode(INT16* buffer, const uint32* quantization_values) rfx_quantization_decode_block(buffer + 4032, 64, quantization_values[0] - 6); /* LL3 */ } -static void rfx_quantization_encode_block(INT16* buffer, int buffer_size, uint32 factor) +static void rfx_quantization_encode_block(INT16* buffer, int buffer_size, UINT32 factor) { INT16* dst; INT16 half; @@ -68,7 +68,7 @@ static void rfx_quantization_encode_block(INT16* buffer, int buffer_size, uint32 } } -void rfx_quantization_encode(INT16* buffer, const uint32* quantization_values) +void rfx_quantization_encode(INT16* buffer, const UINT32* quantization_values) { rfx_quantization_encode_block(buffer, 1024, quantization_values[8] - 6); /* HL1 */ rfx_quantization_encode_block(buffer + 1024, 1024, quantization_values[7] - 6); /* LH1 */ diff --git a/libfreerdp/codec/rfx_quantization.h b/libfreerdp/codec/rfx_quantization.h index c6731b126..b10aa729f 100644 --- a/libfreerdp/codec/rfx_quantization.h +++ b/libfreerdp/codec/rfx_quantization.h @@ -22,7 +22,7 @@ #include -void rfx_quantization_decode(INT16* buffer, const uint32* quantization_values); -void rfx_quantization_encode(INT16* buffer, const uint32* quantization_values); +void rfx_quantization_decode(INT16* buffer, const UINT32* quantization_values); +void rfx_quantization_encode(INT16* buffer, const UINT32* quantization_values); #endif /* __RFX_QUANTIZATION_H */ diff --git a/libfreerdp/codec/rfx_rlgr.c b/libfreerdp/codec/rfx_rlgr.c index 84d4100c1..c2ef38765 100644 --- a/libfreerdp/codec/rfx_rlgr.c +++ b/libfreerdp/codec/rfx_rlgr.c @@ -72,7 +72,7 @@ /* Returns the least number of bits required to represent a given value */ #define GetMinBits(_val, _nbits) \ { \ - uint32 _v = _val; \ + UINT32 _v = _val; \ _nbits = 0; \ while (_v) \ { \ @@ -150,7 +150,7 @@ int rfx_rlgr_decode(RLGR_MODE mode, const BYTE* data, int data_size, INT16* buff if (k) { int mag; - uint32 sign; + UINT32 sign; /* RL MODE */ while (!rfx_bitstream_eos(bs)) @@ -179,14 +179,14 @@ int rfx_rlgr_decode(RLGR_MODE mode, const BYTE* data, int data_size, INT16* buff } else { - uint32 mag; - uint32 nIdx; - uint32 val1; - uint32 val2; + UINT32 mag; + UINT32 nIdx; + UINT32 val1; + UINT32 val2; /* GR (GOLOMB-RICE) MODE */ GetGRCode(&krp, &kr, vk, mag16) /* values coded are 2 * magnitude - sign */ - mag = (uint32) mag16; + mag = (UINT32) mag16; if (mode == RLGR1) { @@ -271,13 +271,13 @@ int rfx_rlgr_decode(RLGR_MODE mode, const BYTE* data, int data_size, INT16* buff /* Outputs the Golomb/Rice encoding of a non-negative integer */ #define CodeGR(krp, val) rfx_rlgr_code_gr(bs, krp, val) -static void rfx_rlgr_code_gr(RFX_BITSTREAM* bs, int* krp, uint32 val) +static void rfx_rlgr_code_gr(RFX_BITSTREAM* bs, int* krp, UINT32 val) { int kr = *krp >> LSGR; /* unary part of GR code */ - uint32 vk = (val) >> kr; + UINT32 vk = (val) >> kr; OutputBit(vk, 1); OutputBit(1, 0); @@ -371,7 +371,7 @@ int rfx_rlgr_encode(RLGR_MODE mode, const INT16* data, int data_size, BYTE* buff if (mode == RLGR1) { - uint32 twoMs; + UINT32 twoMs; /* RLGR1 variant */ @@ -394,10 +394,10 @@ int rfx_rlgr_encode(RLGR_MODE mode, const INT16* data, int data_size, BYTE* buff } else /* mode == RLGR3 */ { - uint32 twoMs1; - uint32 twoMs2; - uint32 sum2Ms; - uint32 nIdx; + UINT32 twoMs1; + UINT32 twoMs2; + UINT32 sum2Ms; + UINT32 nIdx; /* RLGR3 variant */ diff --git a/libfreerdp/codec/rfx_sse2.c b/libfreerdp/codec/rfx_sse2.c index 608c5318e..ac2376d28 100644 --- a/libfreerdp/codec/rfx_sse2.c +++ b/libfreerdp/codec/rfx_sse2.c @@ -225,7 +225,7 @@ static void rfx_encode_rgb_to_ycbcr_sse2(INT16* y_r_buffer, INT16* cb_g_buffer, } static __inline void __attribute__((__gnu_inline__, __always_inline__, __artificial__)) -rfx_quantization_decode_block_sse2(INT16* buffer, const int buffer_size, const uint32 factor) +rfx_quantization_decode_block_sse2(INT16* buffer, const int buffer_size, const UINT32 factor) { __m128i a; __m128i * ptr = (__m128i*) buffer; @@ -244,7 +244,7 @@ rfx_quantization_decode_block_sse2(INT16* buffer, const int buffer_size, const u } while(ptr < buf_end); } -static void rfx_quantization_decode_sse2(INT16* buffer, const uint32* quantization_values) +static void rfx_quantization_decode_sse2(INT16* buffer, const UINT32* quantization_values) { _mm_prefetch_buffer((char*) buffer, 4096 * sizeof(INT16)); @@ -263,7 +263,7 @@ static void rfx_quantization_decode_sse2(INT16* buffer, const uint32* quantizati } static __inline void __attribute__((__gnu_inline__, __always_inline__, __artificial__)) -rfx_quantization_encode_block_sse2(INT16* buffer, const int buffer_size, const uint32 factor) +rfx_quantization_encode_block_sse2(INT16* buffer, const int buffer_size, const UINT32 factor) { __m128i a; __m128i* ptr = (__m128i*) buffer; @@ -285,7 +285,7 @@ rfx_quantization_encode_block_sse2(INT16* buffer, const int buffer_size, const u } while(ptr < buf_end); } -static void rfx_quantization_encode_sse2(INT16* buffer, const uint32* quantization_values) +static void rfx_quantization_encode_sse2(INT16* buffer, const UINT32* quantization_values) { _mm_prefetch_buffer((char*) buffer, 4096 * sizeof(INT16)); diff --git a/libfreerdp/core/activation.c b/libfreerdp/core/activation.c index db54dc147..2213d2491 100644 --- a/libfreerdp/core/activation.c +++ b/libfreerdp/core/activation.c @@ -104,7 +104,7 @@ BOOL rdp_recv_control_pdu(STREAM* s, UINT16* action) stream_read_UINT16(s, *action); /* action (2 bytes) */ stream_seek_UINT16(s); /* grantId (2 bytes) */ - stream_seek_uint32(s); /* controlId (4 bytes) */ + stream_seek_UINT32(s); /* controlId (4 bytes) */ return TRUE; } @@ -113,7 +113,7 @@ void rdp_write_client_control_pdu(STREAM* s, UINT16 action) { stream_write_UINT16(s, action); /* action (2 bytes) */ stream_write_UINT16(s, 0); /* grantId (2 bytes) */ - stream_write_uint32(s, 0); /* controlId (4 bytes) */ + stream_write_UINT32(s, 0); /* controlId (4 bytes) */ } BOOL rdp_recv_server_control_pdu(rdpRdp* rdp, STREAM* s) @@ -144,7 +144,7 @@ BOOL rdp_send_server_control_cooperate_pdu(rdpRdp* rdp) stream_write_UINT16(s, CTRLACTION_COOPERATE); /* action (2 bytes) */ stream_write_UINT16(s, 0); /* grantId (2 bytes) */ - stream_write_uint32(s, 0); /* controlId (4 bytes) */ + stream_write_UINT32(s, 0); /* controlId (4 bytes) */ rdp_send_data_pdu(rdp, s, DATA_PDU_TYPE_CONTROL, rdp->mcs->user_id); @@ -159,7 +159,7 @@ BOOL rdp_send_server_control_granted_pdu(rdpRdp* rdp) stream_write_UINT16(s, CTRLACTION_GRANTED_CONTROL); /* action (2 bytes) */ stream_write_UINT16(s, rdp->mcs->user_id); /* grantId (2 bytes) */ - stream_write_uint32(s, 0x03EA); /* controlId (4 bytes) */ + stream_write_UINT32(s, 0x03EA); /* controlId (4 bytes) */ rdp_send_data_pdu(rdp, s, DATA_PDU_TYPE_CONTROL, rdp->mcs->user_id); @@ -176,10 +176,10 @@ BOOL rdp_send_client_control_pdu(rdpRdp* rdp, UINT16 action) return rdp_send_data_pdu(rdp, s, DATA_PDU_TYPE_CONTROL, rdp->mcs->user_id); } -void rdp_write_persistent_list_entry(STREAM* s, uint32 key1, uint32 key2) +void rdp_write_persistent_list_entry(STREAM* s, UINT32 key1, UINT32 key2) { - stream_write_uint32(s, key1); /* key1 (4 bytes) */ - stream_write_uint32(s, key2); /* key2 (4 bytes) */ + stream_write_UINT32(s, key1); /* key1 (4 bytes) */ + stream_write_UINT32(s, key2); /* key2 (4 bytes) */ } void rdp_write_client_persistent_key_list_pdu(STREAM* s, rdpSettings* settings) @@ -287,7 +287,7 @@ BOOL rdp_recv_deactivate_all(rdpRdp* rdp, STREAM* s) */ if (stream_get_left(s) > 0) { - stream_read_uint32(s, rdp->settings->share_id); /* shareId (4 bytes) */ + stream_read_UINT32(s, rdp->settings->share_id); /* shareId (4 bytes) */ stream_read_UINT16(s, lengthSourceDescriptor); /* lengthSourceDescriptor (2 bytes) */ stream_seek(s, lengthSourceDescriptor); /* sourceDescriptor (should be 0x00) */ } @@ -311,7 +311,7 @@ BOOL rdp_send_deactivate_all(rdpRdp* rdp) s = rdp_pdu_init(rdp); - stream_write_uint32(s, rdp->settings->share_id); /* shareId (4 bytes) */ + stream_write_UINT32(s, rdp->settings->share_id); /* shareId (4 bytes) */ stream_write_UINT16(s, 1); /* lengthSourceDescriptor (2 bytes) */ stream_write_BYTE(s, 0); /* sourceDescriptor (should be 0x00) */ diff --git a/libfreerdp/core/capabilities.c b/libfreerdp/core/capabilities.c index 1bc4c900d..9da8c7de4 100644 --- a/libfreerdp/core/capabilities.c +++ b/libfreerdp/core/capabilities.c @@ -290,7 +290,7 @@ void rdp_read_order_capability_set(STREAM* s, UINT16 length, rdpSettings* settin UINT16 orderSupportExFlags; stream_seek(s, 16); /* terminalDescriptor (16 bytes) */ - stream_seek_uint32(s); /* pad4OctetsA (4 bytes) */ + stream_seek_UINT32(s); /* pad4OctetsA (4 bytes) */ stream_seek_UINT16(s); /* desktopSaveXGranularity (2 bytes) */ stream_seek_UINT16(s); /* desktopSaveYGranularity (2 bytes) */ stream_seek_UINT16(s); /* pad2OctetsA (2 bytes) */ @@ -300,8 +300,8 @@ void rdp_read_order_capability_set(STREAM* s, UINT16 length, rdpSettings* settin stream_read(s, orderSupport, 32); /* orderSupport (32 bytes) */ stream_seek_UINT16(s); /* textFlags (2 bytes) */ stream_read_UINT16(s, orderSupportExFlags); /* orderSupportExFlags (2 bytes) */ - stream_seek_uint32(s); /* pad4OctetsB (4 bytes) */ - stream_seek_uint32(s); /* desktopSaveSize (4 bytes) */ + stream_seek_UINT32(s); /* pad4OctetsB (4 bytes) */ + stream_seek_UINT32(s); /* desktopSaveSize (4 bytes) */ stream_seek_UINT16(s); /* pad2OctetsC (2 bytes) */ stream_seek_UINT16(s); /* pad2OctetsD (2 bytes) */ stream_seek_UINT16(s); /* textANSICodePage (2 bytes) */ @@ -349,7 +349,7 @@ void rdp_write_order_capability_set(STREAM* s, rdpSettings* settings) } stream_write_zero(s, 16); /* terminalDescriptor (16 bytes) */ - stream_write_uint32(s, 0); /* pad4OctetsA (4 bytes) */ + stream_write_UINT32(s, 0); /* pad4OctetsA (4 bytes) */ stream_write_UINT16(s, 1); /* desktopSaveXGranularity (2 bytes) */ stream_write_UINT16(s, 20); /* desktopSaveYGranularity (2 bytes) */ stream_write_UINT16(s, 0); /* pad2OctetsA (2 bytes) */ @@ -359,8 +359,8 @@ void rdp_write_order_capability_set(STREAM* s, rdpSettings* settings) stream_write(s, settings->order_support, 32); /* orderSupport (32 bytes) */ stream_write_UINT16(s, 0); /* textFlags (2 bytes) */ stream_write_UINT16(s, orderSupportExFlags); /* orderSupportExFlags (2 bytes) */ - stream_write_uint32(s, 0); /* pad4OctetsB (4 bytes) */ - stream_write_uint32(s, 230400); /* desktopSaveSize (4 bytes) */ + stream_write_UINT32(s, 0); /* pad4OctetsB (4 bytes) */ + stream_write_UINT32(s, 230400); /* desktopSaveSize (4 bytes) */ stream_write_UINT16(s, 0); /* pad2OctetsC (2 bytes) */ stream_write_UINT16(s, 0); /* pad2OctetsD (2 bytes) */ stream_write_UINT16(s, 0); /* textANSICodePage (2 bytes) */ @@ -378,12 +378,12 @@ void rdp_write_order_capability_set(STREAM* s, rdpSettings* settings) void rdp_read_bitmap_cache_capability_set(STREAM* s, UINT16 length, rdpSettings* settings) { - stream_seek_uint32(s); /* pad1 (4 bytes) */ - stream_seek_uint32(s); /* pad2 (4 bytes) */ - stream_seek_uint32(s); /* pad3 (4 bytes) */ - stream_seek_uint32(s); /* pad4 (4 bytes) */ - stream_seek_uint32(s); /* pad5 (4 bytes) */ - stream_seek_uint32(s); /* pad6 (4 bytes) */ + stream_seek_UINT32(s); /* pad1 (4 bytes) */ + stream_seek_UINT32(s); /* pad2 (4 bytes) */ + stream_seek_UINT32(s); /* pad3 (4 bytes) */ + stream_seek_UINT32(s); /* pad4 (4 bytes) */ + stream_seek_UINT32(s); /* pad5 (4 bytes) */ + stream_seek_UINT32(s); /* pad6 (4 bytes) */ stream_seek_UINT16(s); /* Cache0Entries (2 bytes) */ stream_seek_UINT16(s); /* Cache0MaximumCellSize (2 bytes) */ stream_seek_UINT16(s); /* Cache1Entries (2 bytes) */ @@ -409,12 +409,12 @@ void rdp_write_bitmap_cache_capability_set(STREAM* s, rdpSettings* settings) bpp = (settings->color_depth + 7) / 8; - stream_write_uint32(s, 0); /* pad1 (4 bytes) */ - stream_write_uint32(s, 0); /* pad2 (4 bytes) */ - stream_write_uint32(s, 0); /* pad3 (4 bytes) */ - stream_write_uint32(s, 0); /* pad4 (4 bytes) */ - stream_write_uint32(s, 0); /* pad5 (4 bytes) */ - stream_write_uint32(s, 0); /* pad6 (4 bytes) */ + stream_write_UINT32(s, 0); /* pad1 (4 bytes) */ + stream_write_UINT32(s, 0); /* pad2 (4 bytes) */ + stream_write_UINT32(s, 0); /* pad3 (4 bytes) */ + stream_write_UINT32(s, 0); /* pad4 (4 bytes) */ + stream_write_UINT32(s, 0); /* pad5 (4 bytes) */ + stream_write_UINT32(s, 0); /* pad6 (4 bytes) */ size = bpp * 256; stream_write_UINT16(s, 200); /* Cache0Entries (2 bytes) */ @@ -678,17 +678,17 @@ void rdp_read_input_capability_set(STREAM* s, UINT16 length, rdpSettings* settin if (settings->server_mode) { - stream_read_uint32(s, settings->kbd_layout); /* keyboardLayout (4 bytes) */ - stream_read_uint32(s, settings->kbd_type); /* keyboardType (4 bytes) */ - stream_read_uint32(s, settings->kbd_subtype); /* keyboardSubType (4 bytes) */ - stream_read_uint32(s, settings->kbd_fn_keys); /* keyboardFunctionKeys (4 bytes) */ + stream_read_UINT32(s, settings->kbd_layout); /* keyboardLayout (4 bytes) */ + stream_read_UINT32(s, settings->kbd_type); /* keyboardType (4 bytes) */ + stream_read_UINT32(s, settings->kbd_subtype); /* keyboardSubType (4 bytes) */ + stream_read_UINT32(s, settings->kbd_fn_keys); /* keyboardFunctionKeys (4 bytes) */ } else { - stream_seek_uint32(s); /* keyboardLayout (4 bytes) */ - stream_seek_uint32(s); /* keyboardType (4 bytes) */ - stream_seek_uint32(s); /* keyboardSubType (4 bytes) */ - stream_seek_uint32(s); /* keyboardFunctionKeys (4 bytes) */ + stream_seek_UINT32(s); /* keyboardLayout (4 bytes) */ + stream_seek_UINT32(s); /* keyboardType (4 bytes) */ + stream_seek_UINT32(s); /* keyboardSubType (4 bytes) */ + stream_seek_UINT32(s); /* keyboardFunctionKeys (4 bytes) */ } stream_seek(s, 64); /* imeFileName (64 bytes) */ @@ -735,10 +735,10 @@ void rdp_write_input_capability_set(STREAM* s, rdpSettings* settings) stream_write_UINT16(s, inputFlags); /* inputFlags (2 bytes) */ stream_write_UINT16(s, 0); /* pad2OctetsA (2 bytes) */ - stream_write_uint32(s, settings->kbd_layout); /* keyboardLayout (4 bytes) */ - stream_write_uint32(s, settings->kbd_type); /* keyboardType (4 bytes) */ - stream_write_uint32(s, settings->kbd_subtype); /* keyboardSubType (4 bytes) */ - stream_write_uint32(s, settings->kbd_fn_keys); /* keyboardFunctionKeys (4 bytes) */ + stream_write_UINT32(s, settings->kbd_layout); /* keyboardLayout (4 bytes) */ + stream_write_UINT32(s, settings->kbd_type); /* keyboardType (4 bytes) */ + stream_write_UINT32(s, settings->kbd_subtype); /* keyboardSubType (4 bytes) */ + stream_write_UINT32(s, settings->kbd_fn_keys); /* keyboardFunctionKeys (4 bytes) */ stream_write_zero(s, 64); /* imeFileName (64 bytes) */ rdp_capability_set_finish(s, header, CAPSET_TYPE_INPUT); @@ -788,7 +788,7 @@ void rdp_write_font_capability_set(STREAM* s, rdpSettings* settings) void rdp_read_brush_capability_set(STREAM* s, UINT16 length, rdpSettings* settings) { - stream_seek_uint32(s); /* brushSupportLevel (4 bytes) */ + stream_seek_UINT32(s); /* brushSupportLevel (4 bytes) */ } /** @@ -804,7 +804,7 @@ void rdp_write_brush_capability_set(STREAM* s, rdpSettings* settings) header = rdp_capability_set_start(s); - stream_write_uint32(s, BRUSH_COLOR_FULL); /* brushSupportLevel (4 bytes) */ + stream_write_UINT32(s, BRUSH_COLOR_FULL); /* brushSupportLevel (4 bytes) */ rdp_capability_set_finish(s, header, CAPSET_TYPE_BRUSH); } @@ -843,7 +843,7 @@ void rdp_read_glyph_cache_capability_set(STREAM* s, UINT16 length, rdpSettings* UINT16 glyphSupportLevel; stream_seek(s, 40); /* glyphCache (40 bytes) */ - stream_seek_uint32(s); /* fragCache (4 bytes) */ + stream_seek_UINT32(s); /* fragCache (4 bytes) */ stream_read_UINT16(s, glyphSupportLevel); /* glyphSupportLevel (2 bytes) */ stream_seek_UINT16(s); /* pad2Octets (2 bytes) */ @@ -893,9 +893,9 @@ void rdp_write_glyph_cache_capability_set(STREAM* s, rdpSettings* settings) void rdp_read_offscreen_bitmap_cache_capability_set(STREAM* s, UINT16 length, rdpSettings* settings) { - uint32 offscreenSupportLevel; + UINT32 offscreenSupportLevel; - stream_read_uint32(s, offscreenSupportLevel); /* offscreenSupportLevel (4 bytes) */ + stream_read_UINT32(s, offscreenSupportLevel); /* offscreenSupportLevel (4 bytes) */ stream_read_UINT16(s, settings->offscreen_bitmap_cache_size); /* offscreenCacheSize (2 bytes) */ stream_read_UINT16(s, settings->offscreen_bitmap_cache_entries); /* offscreenCacheEntries (2 bytes) */ @@ -913,14 +913,14 @@ void rdp_read_offscreen_bitmap_cache_capability_set(STREAM* s, UINT16 length, rd void rdp_write_offscreen_bitmap_cache_capability_set(STREAM* s, rdpSettings* settings) { BYTE* header; - uint32 offscreenSupportLevel = FALSE; + UINT32 offscreenSupportLevel = FALSE; header = rdp_capability_set_start(s); if (settings->offscreen_bitmap_cache) offscreenSupportLevel = TRUE; - stream_write_uint32(s, offscreenSupportLevel); /* offscreenSupportLevel (4 bytes) */ + stream_write_UINT32(s, offscreenSupportLevel); /* offscreenSupportLevel (4 bytes) */ stream_write_UINT16(s, settings->offscreen_bitmap_cache_size); /* offscreenCacheSize (2 bytes) */ stream_write_UINT16(s, settings->offscreen_bitmap_cache_entries); /* offscreenCacheEntries (2 bytes) */ @@ -968,7 +968,7 @@ void rdp_write_bitmap_cache_host_support_capability_set(STREAM* s, rdpSettings* void rdp_write_bitmap_cache_cell_info(STREAM* s, BITMAP_CACHE_V2_CELL_INFO* cellInfo) { - uint32 info; + UINT32 info; /** * numEntries is in the first 31 bits, while the last bit (k) @@ -976,7 +976,7 @@ void rdp_write_bitmap_cache_cell_info(STREAM* s, BITMAP_CACHE_V2_CELL_INFO* cell */ info = (cellInfo->numEntries | (cellInfo->persistent << 31)); - stream_write_uint32(s, info); + stream_write_UINT32(s, info); } /** @@ -1040,13 +1040,13 @@ void rdp_write_bitmap_cache_v2_capability_set(STREAM* s, rdpSettings* settings) void rdp_read_virtual_channel_capability_set(STREAM* s, UINT16 length, rdpSettings* settings) { - uint32 flags; - uint32 VCChunkSize; + UINT32 flags; + UINT32 VCChunkSize; - stream_read_uint32(s, flags); /* flags (4 bytes) */ + stream_read_UINT32(s, flags); /* flags (4 bytes) */ if (length > 8) - stream_read_uint32(s, VCChunkSize); /* VCChunkSize (4 bytes) */ + stream_read_UINT32(s, VCChunkSize); /* VCChunkSize (4 bytes) */ else VCChunkSize = 1600; @@ -1064,14 +1064,14 @@ void rdp_read_virtual_channel_capability_set(STREAM* s, UINT16 length, rdpSettin void rdp_write_virtual_channel_capability_set(STREAM* s, rdpSettings* settings) { BYTE* header; - uint32 flags; + UINT32 flags; header = rdp_capability_set_start(s); flags = VCCAPS_NO_COMPR; - stream_write_uint32(s, flags); /* flags (4 bytes) */ - stream_write_uint32(s, settings->vc_chunk_size); /* VCChunkSize (4 bytes) */ + stream_write_UINT32(s, flags); /* flags (4 bytes) */ + stream_write_UINT32(s, settings->vc_chunk_size); /* VCChunkSize (4 bytes) */ rdp_capability_set_finish(s, header, CAPSET_TYPE_VIRTUAL_CHANNEL); } @@ -1085,9 +1085,9 @@ void rdp_write_virtual_channel_capability_set(STREAM* s, rdpSettings* settings) void rdp_read_draw_nine_grid_cache_capability_set(STREAM* s, UINT16 length, rdpSettings* settings) { - uint32 drawNineGridSupportLevel; + UINT32 drawNineGridSupportLevel; - stream_read_uint32(s, drawNineGridSupportLevel); /* drawNineGridSupportLevel (4 bytes) */ + stream_read_UINT32(s, drawNineGridSupportLevel); /* drawNineGridSupportLevel (4 bytes) */ stream_read_UINT16(s, settings->draw_nine_grid_cache_size); /* drawNineGridCacheSize (2 bytes) */ stream_read_UINT16(s, settings->draw_nine_grid_cache_entries); /* drawNineGridCacheEntries (2 bytes) */ @@ -1106,13 +1106,13 @@ void rdp_read_draw_nine_grid_cache_capability_set(STREAM* s, UINT16 length, rdpS void rdp_write_draw_nine_grid_cache_capability_set(STREAM* s, rdpSettings* settings) { BYTE* header; - uint32 drawNineGridSupportLevel; + UINT32 drawNineGridSupportLevel; header = rdp_capability_set_start(s); drawNineGridSupportLevel = (settings->draw_nine_grid) ? DRAW_NINEGRID_SUPPORTED_V2 : DRAW_NINEGRID_NO_SUPPORT; - stream_write_uint32(s, drawNineGridSupportLevel); /* drawNineGridSupportLevel (4 bytes) */ + stream_write_UINT32(s, drawNineGridSupportLevel); /* drawNineGridSupportLevel (4 bytes) */ stream_write_UINT16(s, settings->draw_nine_grid_cache_size); /* drawNineGridCacheSize (2 bytes) */ stream_write_UINT16(s, settings->draw_nine_grid_cache_entries); /* drawNineGridCacheEntries (2 bytes) */ @@ -1152,12 +1152,12 @@ void rdp_write_gdiplus_image_cache_properties(STREAM* s, UINT16 oiccs, UINT16 oi void rdp_read_draw_gdiplus_cache_capability_set(STREAM* s, UINT16 length, rdpSettings* settings) { - uint32 drawGDIPlusSupportLevel; - uint32 drawGdiplusCacheLevel; + UINT32 drawGDIPlusSupportLevel; + UINT32 drawGdiplusCacheLevel; - stream_read_uint32(s, drawGDIPlusSupportLevel); /* drawGDIPlusSupportLevel (4 bytes) */ - stream_seek_uint32(s); /* GdipVersion (4 bytes) */ - stream_read_uint32(s, drawGdiplusCacheLevel); /* drawGdiplusCacheLevel (4 bytes) */ + stream_read_UINT32(s, drawGDIPlusSupportLevel); /* drawGDIPlusSupportLevel (4 bytes) */ + stream_seek_UINT32(s); /* GdipVersion (4 bytes) */ + stream_read_UINT32(s, drawGdiplusCacheLevel); /* drawGdiplusCacheLevel (4 bytes) */ stream_seek(s, 10); /* GdipCacheEntries (10 bytes) */ stream_seek(s, 8); /* GdipCacheChunkSize (8 bytes) */ stream_seek(s, 6); /* GdipImageCacheProperties (6 bytes) */ @@ -1179,17 +1179,17 @@ void rdp_read_draw_gdiplus_cache_capability_set(STREAM* s, UINT16 length, rdpSet void rdp_write_draw_gdiplus_cache_capability_set(STREAM* s, rdpSettings* settings) { BYTE* header; - uint32 drawGDIPlusSupportLevel; - uint32 drawGdiplusCacheLevel; + UINT32 drawGDIPlusSupportLevel; + UINT32 drawGdiplusCacheLevel; header = rdp_capability_set_start(s); drawGDIPlusSupportLevel = (settings->draw_gdi_plus) ? DRAW_GDIPLUS_SUPPORTED : DRAW_GDIPLUS_DEFAULT; drawGdiplusCacheLevel = (settings->draw_gdi_plus) ? DRAW_GDIPLUS_CACHE_LEVEL_ONE : DRAW_GDIPLUS_CACHE_LEVEL_DEFAULT; - stream_write_uint32(s, drawGDIPlusSupportLevel); /* drawGDIPlusSupportLevel (4 bytes) */ - stream_write_uint32(s, 0); /* GdipVersion (4 bytes) */ - stream_write_uint32(s, drawGdiplusCacheLevel); /* drawGdiplusCacheLevel (4 bytes) */ + stream_write_UINT32(s, drawGDIPlusSupportLevel); /* drawGDIPlusSupportLevel (4 bytes) */ + stream_write_UINT32(s, 0); /* GdipVersion (4 bytes) */ + stream_write_UINT32(s, drawGdiplusCacheLevel); /* drawGdiplusCacheLevel (4 bytes) */ rdp_write_gdiplus_cache_entries(s, 10, 5, 5, 10, 2); /* GdipCacheEntries (10 bytes) */ rdp_write_gdiplus_cache_chunk_size(s, 512, 2048, 1024, 64); /* GdipCacheChunkSize (8 bytes) */ rdp_write_gdiplus_image_cache_properties(s, 4096, 256, 128); /* GdipImageCacheProperties (6 bytes) */ @@ -1206,9 +1206,9 @@ void rdp_write_draw_gdiplus_cache_capability_set(STREAM* s, rdpSettings* setting void rdp_read_remote_programs_capability_set(STREAM* s, UINT16 length, rdpSettings* settings) { - uint32 railSupportLevel; + UINT32 railSupportLevel; - stream_read_uint32(s, railSupportLevel); /* railSupportLevel (4 bytes) */ + stream_read_UINT32(s, railSupportLevel); /* railSupportLevel (4 bytes) */ if ((railSupportLevel & RAIL_LEVEL_SUPPORTED) == 0) { @@ -1230,7 +1230,7 @@ void rdp_read_remote_programs_capability_set(STREAM* s, UINT16 length, rdpSettin void rdp_write_remote_programs_capability_set(STREAM* s, rdpSettings* settings) { BYTE* header; - uint32 railSupportLevel; + UINT32 railSupportLevel; header = rdp_capability_set_start(s); @@ -1239,7 +1239,7 @@ void rdp_write_remote_programs_capability_set(STREAM* s, rdpSettings* settings) if (settings->rail_langbar_supported) railSupportLevel |= RAIL_LEVEL_DOCKED_LANGBAR_SUPPORTED; - stream_write_uint32(s, railSupportLevel); /* railSupportLevel (4 bytes) */ + stream_write_UINT32(s, railSupportLevel); /* railSupportLevel (4 bytes) */ rdp_capability_set_finish(s, header, CAPSET_TYPE_RAIL); } @@ -1253,7 +1253,7 @@ void rdp_write_remote_programs_capability_set(STREAM* s, rdpSettings* settings) void rdp_read_window_list_capability_set(STREAM* s, UINT16 length, rdpSettings* settings) { - stream_seek_uint32(s); /* wndSupportLevel (4 bytes) */ + stream_seek_UINT32(s); /* wndSupportLevel (4 bytes) */ stream_seek_BYTE(s); /* numIconCaches (1 byte) */ stream_seek_UINT16(s); /* numIconCacheEntries (2 bytes) */ } @@ -1268,13 +1268,13 @@ void rdp_read_window_list_capability_set(STREAM* s, UINT16 length, rdpSettings* void rdp_write_window_list_capability_set(STREAM* s, rdpSettings* settings) { BYTE* header; - uint32 wndSupportLevel; + UINT32 wndSupportLevel; header = rdp_capability_set_start(s); wndSupportLevel = WINDOW_LEVEL_SUPPORTED_EX; - stream_write_uint32(s, wndSupportLevel); /* wndSupportLevel (4 bytes) */ + stream_write_UINT32(s, wndSupportLevel); /* wndSupportLevel (4 bytes) */ stream_write_BYTE(s, settings->num_icon_caches); /* numIconCaches (1 byte) */ stream_write_UINT16(s, settings->num_icon_cache_entries); /* numIconCacheEntries (2 bytes) */ @@ -1323,7 +1323,7 @@ void rdp_write_desktop_composition_capability_set(STREAM* s, rdpSettings* settin void rdp_read_multifragment_update_capability_set(STREAM* s, UINT16 length, rdpSettings* settings) { - stream_read_uint32(s, settings->multifrag_max_request_size); /* MaxRequestSize (4 bytes) */ + stream_read_UINT32(s, settings->multifrag_max_request_size); /* MaxRequestSize (4 bytes) */ } /** @@ -1339,7 +1339,7 @@ void rdp_write_multifragment_update_capability_set(STREAM* s, rdpSettings* setti header = rdp_capability_set_start(s); - stream_write_uint32(s, settings->multifrag_max_request_size); /* MaxRequestSize (4 bytes) */ + stream_write_UINT32(s, settings->multifrag_max_request_size); /* MaxRequestSize (4 bytes) */ rdp_capability_set_finish(s, header, CAPSET_TYPE_MULTI_FRAGMENT_UPDATE); } @@ -1386,8 +1386,8 @@ void rdp_write_large_pointer_capability_set(STREAM* s, rdpSettings* settings) void rdp_read_surface_commands_capability_set(STREAM* s, UINT16 length, rdpSettings* settings) { - stream_seek_uint32(s); /* cmdFlags (4 bytes) */ - stream_seek_uint32(s); /* reserved (4 bytes) */ + stream_seek_UINT32(s); /* cmdFlags (4 bytes) */ + stream_seek_UINT32(s); /* reserved (4 bytes) */ settings->surface_commands = TRUE; } @@ -1402,7 +1402,7 @@ void rdp_read_surface_commands_capability_set(STREAM* s, UINT16 length, rdpSetti void rdp_write_surface_commands_capability_set(STREAM* s, rdpSettings* settings) { BYTE* header; - uint32 cmdFlags; + UINT32 cmdFlags; header = rdp_capability_set_start(s); @@ -1410,8 +1410,8 @@ void rdp_write_surface_commands_capability_set(STREAM* s, rdpSettings* settings) SURFCMDS_SET_SURFACE_BITS | SURFCMDS_STREAM_SURFACE_BITS; - stream_write_uint32(s, cmdFlags); /* cmdFlags (4 bytes) */ - stream_write_uint32(s, 0); /* reserved (4 bytes) */ + stream_write_UINT32(s, cmdFlags); /* cmdFlags (4 bytes) */ + stream_write_UINT32(s, 0); /* reserved (4 bytes) */ rdp_capability_set_finish(s, header, CAPSET_TYPE_SURFACE_COMMANDS); } @@ -1471,7 +1471,7 @@ void rdp_read_bitmap_codecs_capability_set(STREAM* s, UINT16 length, rdpSettings */ void rdp_write_rfx_client_capability_container(STREAM* s, rdpSettings* settings) { - uint32 captureFlags; + UINT32 captureFlags; BYTE codecMode; captureFlags = settings->rfx_codec_only ? CARDP_CAPS_CAPTURE_NON_CAC : 0; @@ -1480,18 +1480,18 @@ void rdp_write_rfx_client_capability_container(STREAM* s, rdpSettings* settings) stream_write_UINT16(s, 49); /* codecPropertiesLength */ /* TS_RFX_CLNT_CAPS_CONTAINER */ - stream_write_uint32(s, 49); /* length */ - stream_write_uint32(s, captureFlags); /* captureFlags */ - stream_write_uint32(s, 37); /* capsLength */ + stream_write_UINT32(s, 49); /* length */ + stream_write_UINT32(s, captureFlags); /* captureFlags */ + stream_write_UINT32(s, 37); /* capsLength */ /* TS_RFX_CAPS */ stream_write_UINT16(s, CBY_CAPS); /* blockType */ - stream_write_uint32(s, 8); /* blockLen */ + stream_write_UINT32(s, 8); /* blockLen */ stream_write_UINT16(s, 1); /* numCapsets */ /* TS_RFX_CAPSET */ stream_write_UINT16(s, CBY_CAPSET); /* blockType */ - stream_write_uint32(s, 29); /* blockLen */ + stream_write_UINT32(s, 29); /* blockLen */ stream_write_BYTE(s, 0x01); /* codecId (MUST be set to 0x01) */ stream_write_UINT16(s, CLY_CAPSET); /* capsetType */ stream_write_UINT16(s, 2); /* numIcaps */ @@ -1543,7 +1543,7 @@ void rdp_write_jpeg_client_capability_container(STREAM* s, rdpSettings* settings void rdp_write_rfx_server_capability_container(STREAM* s, rdpSettings* settings) { stream_write_UINT16(s, 4); /* codecPropertiesLength */ - stream_write_uint32(s, 0); /* reserved */ + stream_write_UINT32(s, 0); /* reserved */ } void rdp_write_jpeg_server_capability_container(STREAM* s, rdpSettings* settings) @@ -1560,7 +1560,7 @@ void rdp_write_jpeg_server_capability_container(STREAM* s, rdpSettings* settings void rdp_write_nsc_server_capability_container(STREAM* s, rdpSettings* settings) { stream_write_UINT16(s, 4); /* codecPropertiesLength */ - stream_write_uint32(s, 0); /* reserved */ + stream_write_UINT32(s, 0); /* reserved */ } /** @@ -1644,11 +1644,11 @@ void rdp_read_frame_acknowledge_capability_set(STREAM* s, UINT16 length, rdpSett { if (settings->server_mode) { - stream_read_uint32(s, settings->frame_acknowledge); /* (4 bytes) */ + stream_read_UINT32(s, settings->frame_acknowledge); /* (4 bytes) */ } else { - stream_seek_uint32(s); /* (4 bytes) */ + stream_seek_UINT32(s); /* (4 bytes) */ } } @@ -1676,12 +1676,12 @@ void rdp_write_bitmap_cache_v3_codec_id_capability_set(STREAM* s, rdpSettings* s void rdp_write_frame_acknowledge_capability_set(STREAM* s, rdpSettings* settings) { BYTE* header; - uint32 frame_acknowledge; + UINT32 frame_acknowledge; header = rdp_capability_set_start(s); frame_acknowledge = settings->frame_acknowledge; - stream_write_uint32(s, frame_acknowledge); /* (4 bytes) */ + stream_write_UINT32(s, frame_acknowledge); /* (4 bytes) */ rdp_capability_set_finish(s, header, CAPSET_TYPE_FRAME_ACKNOWLEDGE); } @@ -1894,7 +1894,7 @@ BOOL rdp_recv_demand_active(rdpRdp* rdp, STREAM* s) return FALSE; } - stream_read_uint32(s, rdp->settings->share_id); /* shareId (4 bytes) */ + stream_read_UINT32(s, rdp->settings->share_id); /* shareId (4 bytes) */ stream_read_UINT16(s, lengthSourceDescriptor); /* lengthSourceDescriptor (2 bytes) */ stream_read_UINT16(s, lengthCombinedCapabilities); /* lengthCombinedCapabilities (2 bytes) */ stream_seek(s, lengthSourceDescriptor); /* sourceDescriptor */ @@ -1919,7 +1919,7 @@ void rdp_write_demand_active(STREAM* s, rdpSettings* settings) UINT16 numberCapabilities; UINT16 lengthCombinedCapabilities; - stream_write_uint32(s, settings->share_id); /* shareId (4 bytes) */ + stream_write_UINT32(s, settings->share_id); /* shareId (4 bytes) */ stream_write_UINT16(s, 4); /* lengthSourceDescriptor (2 bytes) */ stream_get_mark(s, lm); @@ -1963,7 +1963,7 @@ void rdp_write_demand_active(STREAM* s, rdpSettings* settings) stream_set_mark(s, em); - stream_write_uint32(s, 0); /* sessionId */ + stream_write_UINT32(s, 0); /* sessionId */ } BOOL rdp_send_demand_active(rdpRdp* rdp) @@ -2020,7 +2020,7 @@ BOOL rdp_recv_confirm_active(rdpRdp* rdp, STREAM* s) if (pduType != PDU_TYPE_CONFIRM_ACTIVE) return FALSE; - stream_seek_uint32(s); /* shareId (4 bytes) */ + stream_seek_UINT32(s); /* shareId (4 bytes) */ stream_seek_UINT16(s); /* originatorId (2 bytes) */ stream_read_UINT16(s, lengthSourceDescriptor); /* lengthSourceDescriptor (2 bytes) */ stream_read_UINT16(s, lengthCombinedCapabilities); /* lengthCombinedCapabilities (2 bytes) */ @@ -2043,7 +2043,7 @@ void rdp_write_confirm_active(STREAM* s, rdpSettings* settings) lengthSourceDescriptor = sizeof(SOURCE_DESCRIPTOR); - stream_write_uint32(s, settings->share_id); /* shareId (4 bytes) */ + stream_write_UINT32(s, settings->share_id); /* shareId (4 bytes) */ stream_write_UINT16(s, 0x03EA); /* originatorId (2 bytes) */ stream_write_UINT16(s, lengthSourceDescriptor);/* lengthSourceDescriptor (2 bytes) */ diff --git a/libfreerdp/core/certificate.c b/libfreerdp/core/certificate.c index 5f893a9a0..5f65790f7 100644 --- a/libfreerdp/core/certificate.c +++ b/libfreerdp/core/certificate.c @@ -132,7 +132,7 @@ void certificate_read_x509_certificate(rdpCertBlob* cert, rdpCertInfo* info) STREAM* s; int length; BYTE padding; - uint32 version; + UINT32 version; int modulus_length; int exponent_length; @@ -214,7 +214,7 @@ void certificate_read_x509_certificate(rdpCertBlob* cert, rdpCertInfo* info) * @return new X.509 certificate chain */ -rdpX509CertChain* certificate_new_x509_certificate_chain(uint32 count) +rdpX509CertChain* certificate_new_x509_certificate_chain(UINT32 count) { rdpX509CertChain* x509_cert_chain; @@ -248,13 +248,13 @@ void certificate_free_x509_certificate_chain(rdpX509CertChain* x509_cert_chain) } } -static BOOL certificate_process_server_public_key(rdpCertificate* certificate, STREAM* s, uint32 length) +static BOOL certificate_process_server_public_key(rdpCertificate* certificate, STREAM* s, UINT32 length) { BYTE magic[4]; - uint32 keylen; - uint32 bitlen; - uint32 datalen; - uint32 modlen; + UINT32 keylen; + UINT32 bitlen; + UINT32 datalen; + UINT32 modlen; stream_read(s, magic, 4); @@ -264,9 +264,9 @@ static BOOL certificate_process_server_public_key(rdpCertificate* certificate, S return FALSE; } - stream_read_uint32(s, keylen); - stream_read_uint32(s, bitlen); - stream_read_uint32(s, datalen); + stream_read_UINT32(s, keylen); + stream_read_UINT32(s, bitlen); + stream_read_UINT32(s, datalen); stream_read(s, certificate->cert_info.exponent, 4); modlen = keylen - 8; @@ -279,7 +279,7 @@ static BOOL certificate_process_server_public_key(rdpCertificate* certificate, S return TRUE; } -static BOOL certificate_process_server_public_signature(rdpCertificate* certificate, BYTE* sigdata, int sigdatalen, STREAM* s, uint32 siglen) +static BOOL certificate_process_server_public_signature(rdpCertificate* certificate, BYTE* sigdata, int sigdatalen, STREAM* s, UINT32 siglen) { int i, sum; CryptoMd5 md5ctx; @@ -342,19 +342,19 @@ static BOOL certificate_process_server_public_signature(rdpCertificate* certific BOOL certificate_read_server_proprietary_certificate(rdpCertificate* certificate, STREAM* s) { - uint32 dwSigAlgId; - uint32 dwKeyAlgId; - uint32 wPublicKeyBlobType; - uint32 wPublicKeyBlobLen; - uint32 wSignatureBlobType; - uint32 wSignatureBlobLen; + UINT32 dwSigAlgId; + UINT32 dwKeyAlgId; + UINT32 wPublicKeyBlobType; + UINT32 wPublicKeyBlobLen; + UINT32 wSignatureBlobType; + UINT32 wSignatureBlobLen; BYTE* sigdata; int sigdatalen; /* -4, because we need to include dwVersion */ sigdata = stream_get_tail(s) - 4; - stream_read_uint32(s, dwSigAlgId); - stream_read_uint32(s, dwKeyAlgId); + stream_read_UINT32(s, dwSigAlgId); + stream_read_UINT32(s, dwKeyAlgId); if (!(dwSigAlgId == SIGNATURE_ALG_RSA && dwKeyAlgId == KEY_EXCHANGE_ALG_RSA)) { @@ -413,18 +413,18 @@ BOOL certificate_read_server_proprietary_certificate(rdpCertificate* certificate BOOL certificate_read_server_x509_certificate_chain(rdpCertificate* certificate, STREAM* s) { int i; - uint32 certLength; - uint32 numCertBlobs; + UINT32 certLength; + UINT32 numCertBlobs; DEBUG_CERTIFICATE("Server X.509 Certificate Chain"); - stream_read_uint32(s, numCertBlobs); /* numCertBlobs */ + stream_read_UINT32(s, numCertBlobs); /* numCertBlobs */ certificate->x509_cert_chain = certificate_new_x509_certificate_chain(numCertBlobs); for (i = 0; i < (int) numCertBlobs; i++) { - stream_read_uint32(s, certLength); + stream_read_UINT32(s, certLength); DEBUG_CERTIFICATE("\nX.509 Certificate #%d, length:%d", i + 1, certLength); @@ -461,7 +461,7 @@ BOOL certificate_read_server_x509_certificate_chain(rdpCertificate* certificate, BOOL certificate_read_server_certificate(rdpCertificate* certificate, BYTE* server_cert, int length) { STREAM* s; - uint32 dwVersion; + UINT32 dwVersion; if (length < 1) { @@ -472,7 +472,7 @@ BOOL certificate_read_server_certificate(rdpCertificate* certificate, BYTE* serv s = stream_new(0); stream_attach(s, server_cert, length); - stream_read_uint32(s, dwVersion); /* dwVersion (4 bytes) */ + stream_read_UINT32(s, dwVersion); /* dwVersion (4 bytes) */ switch (dwVersion & CERT_CHAIN_VERSION_MASK) { diff --git a/libfreerdp/core/certificate.h b/libfreerdp/core/certificate.h index e1349dcfe..00bbf6e0f 100644 --- a/libfreerdp/core/certificate.h +++ b/libfreerdp/core/certificate.h @@ -44,7 +44,7 @@ void certificate_read_x509_certificate(rdpCertBlob* cert, rdpCertInfo* info); -rdpX509CertChain* certificate_new_x509_certificate_chain(uint32 count); +rdpX509CertChain* certificate_new_x509_certificate_chain(UINT32 count); void certificate_free_x509_certificate_chain(rdpX509CertChain* x509_cert_chain); BOOL certificate_read_server_proprietary_certificate(rdpCertificate* certificate, STREAM* s); diff --git a/libfreerdp/core/channel.c b/libfreerdp/core/channel.c index a93bca6af..9feb0225d 100644 --- a/libfreerdp/core/channel.c +++ b/libfreerdp/core/channel.c @@ -37,7 +37,7 @@ BOOL freerdp_channel_send(rdpRdp* rdp, UINT16 channel_id, BYTE* data, int size) { STREAM* s; - uint32 flags; + UINT32 flags; int i, left; int chunk_size; rdpChannel* channel = NULL; @@ -77,8 +77,8 @@ BOOL freerdp_channel_send(rdpRdp* rdp, UINT16 channel_id, BYTE* data, int size) flags |= CHANNEL_FLAG_SHOW_PROTOCOL; } - stream_write_uint32(s, size); - stream_write_uint32(s, flags); + stream_write_UINT32(s, size); + stream_write_UINT32(s, flags); stream_check_size(s, chunk_size); stream_write(s, data, chunk_size); @@ -94,12 +94,12 @@ BOOL freerdp_channel_send(rdpRdp* rdp, UINT16 channel_id, BYTE* data, int size) void freerdp_channel_process(freerdp* instance, STREAM* s, UINT16 channel_id) { - uint32 length; - uint32 flags; + UINT32 length; + UINT32 flags; int chunk_length; - stream_read_uint32(s, length); - stream_read_uint32(s, flags); + stream_read_UINT32(s, length); + stream_read_UINT32(s, flags); chunk_length = stream_get_left(s); IFCALL(instance->ReceiveChannelData, instance, @@ -108,12 +108,12 @@ void freerdp_channel_process(freerdp* instance, STREAM* s, UINT16 channel_id) void freerdp_channel_peer_process(freerdp_peer* client, STREAM* s, UINT16 channel_id) { - uint32 length; - uint32 flags; + UINT32 length; + UINT32 flags; int chunk_length; - stream_read_uint32(s, length); - stream_read_uint32(s, flags); + stream_read_UINT32(s, length); + stream_read_UINT32(s, flags); chunk_length = stream_get_left(s); IFCALL(client->ReceiveChannelData, client, diff --git a/libfreerdp/core/connection.c b/libfreerdp/core/connection.c index 90c623119..afe472ab3 100644 --- a/libfreerdp/core/connection.c +++ b/libfreerdp/core/connection.c @@ -206,10 +206,10 @@ static BOOL rdp_client_establish_keys(rdpRdp* rdp) { BYTE client_random[CLIENT_RANDOM_LENGTH]; BYTE crypt_client_random[256 + 8]; - uint32 key_len; + UINT32 key_len; BYTE* mod; BYTE* exp; - uint32 length; + UINT32 length; STREAM* s; if (rdp->settings->encryption == FALSE) @@ -232,7 +232,7 @@ static BOOL rdp_client_establish_keys(rdpRdp* rdp) rdp_write_header(rdp, s, length, MCS_GLOBAL_CHANNEL_ID); rdp_write_security_header(s, SEC_EXCHANGE_PKT); length = key_len + 8; - stream_write_uint32(s, length); + stream_write_UINT32(s, length); stream_write(s, crypt_client_random, length); if (transport_write(rdp->mcs->transport, s) < 0) { @@ -269,7 +269,7 @@ static BOOL rdp_server_establish_keys(rdpRdp* rdp, STREAM* s) { BYTE client_random[64]; /* Should be only 32 after successful decryption, but on failure might take up to 64 bytes. */ BYTE crypt_client_random[256 + 8]; - uint32 rand_len, key_len; + UINT32 rand_len, key_len; UINT16 channel_id, length, sec_flags; BYTE* mod; BYTE* priv_exp; @@ -294,7 +294,7 @@ static BOOL rdp_server_establish_keys(rdpRdp* rdp, STREAM* s) return FALSE; } - stream_read_uint32(s, rand_len); + stream_read_UINT32(s, rand_len); key_len = rdp->settings->server_key->ModulusLength; if (rand_len != key_len + 8) diff --git a/libfreerdp/core/errinfo.c b/libfreerdp/core/errinfo.c index 9464f8c68..c835f7476 100644 --- a/libfreerdp/core/errinfo.c +++ b/libfreerdp/core/errinfo.c @@ -439,7 +439,7 @@ static const ERRINFO ERRINFO_CODES[] = ERRINFO_DEFINE(NONE) }; -void rdp_print_errinfo(uint32 code) +void rdp_print_errinfo(UINT32 code) { const ERRINFO* errInfo; diff --git a/libfreerdp/core/errinfo.h b/libfreerdp/core/errinfo.h index bd8702258..755ea7c0d 100644 --- a/libfreerdp/core/errinfo.h +++ b/libfreerdp/core/errinfo.h @@ -123,7 +123,7 @@ struct _ERRINFO { - uint32 code; + UINT32 code; char* name; char* info; }; @@ -131,6 +131,6 @@ typedef struct _ERRINFO ERRINFO; #define ERRINFO_DEFINE(_code) { ERRINFO_##_code , "ERRINFO_" #_code , ERRINFO_##_code##_STRING } -void rdp_print_errinfo(uint32 code); +void rdp_print_errinfo(UINT32 code); #endif diff --git a/libfreerdp/core/extension.c b/libfreerdp/core/extension.c index 2ddae36a4..293b845d5 100644 --- a/libfreerdp/core/extension.c +++ b/libfreerdp/core/extension.c @@ -53,7 +53,7 @@ #endif -static uint32 FREERDP_CC extension_register_plugin(rdpExtPlugin* plugin) +static UINT32 FREERDP_CC extension_register_plugin(rdpExtPlugin* plugin) { rdpExtension* ext = (rdpExtension*) plugin->ext; @@ -67,7 +67,7 @@ static uint32 FREERDP_CC extension_register_plugin(rdpExtPlugin* plugin) return 0; } -static uint32 FREERDP_CC extension_register_pre_connect_hook(rdpExtPlugin* plugin, PFREERDP_EXTENSION_HOOK hook) +static UINT32 FREERDP_CC extension_register_pre_connect_hook(rdpExtPlugin* plugin, PFREERDP_EXTENSION_HOOK hook) { rdpExtension* ext = (rdpExtension*) plugin->ext; @@ -83,7 +83,7 @@ static uint32 FREERDP_CC extension_register_pre_connect_hook(rdpExtPlugin* plugi return 0; } -static uint32 FREERDP_CC extension_register_post_connect_hook(rdpExtPlugin* plugin, PFREERDP_EXTENSION_HOOK hook) +static UINT32 FREERDP_CC extension_register_post_connect_hook(rdpExtPlugin* plugin, PFREERDP_EXTENSION_HOOK hook) { rdpExtension* ext = (rdpExtension*) plugin->ext; diff --git a/libfreerdp/core/fastpath.c b/libfreerdp/core/fastpath.c index b799e375e..930e16516 100644 --- a/libfreerdp/core/fastpath.c +++ b/libfreerdp/core/fastpath.c @@ -187,7 +187,7 @@ static void fastpath_recv_update_synchronize(rdpFastPath* fastpath, STREAM* s) stream_seek_UINT16(s); /* size (2 bytes), must be set to zero */ } -static BOOL fastpath_recv_update(rdpFastPath* fastpath, BYTE updateCode, uint32 size, STREAM* s) +static BOOL fastpath_recv_update(rdpFastPath* fastpath, BYTE updateCode, UINT32 size, STREAM* s) { rdpUpdate* update = fastpath->rdp->update; rdpContext* context = fastpath->rdp->update->context; @@ -261,7 +261,7 @@ static BOOL fastpath_recv_update_data(rdpFastPath* fastpath, STREAM* s) { UINT16 size; int next_pos; - uint32 totalSize; + UINT32 totalSize; BYTE updateCode; BYTE fragmentation; BYTE compression; @@ -269,8 +269,8 @@ static BOOL fastpath_recv_update_data(rdpFastPath* fastpath, STREAM* s) STREAM* update_stream; STREAM* comp_stream; rdpRdp *rdp; - uint32 roff; - uint32 rlen; + UINT32 roff; + UINT32 rlen; rdp = fastpath->rdp; @@ -530,9 +530,9 @@ BOOL fastpath_recv_inputs(rdpFastPath* fastpath, STREAM* s) return TRUE; } -static uint32 fastpath_get_sec_bytes(rdpRdp* rdp) +static UINT32 fastpath_get_sec_bytes(rdpRdp* rdp) { - uint32 sec_bytes; + UINT32 sec_bytes; if (rdp->do_crypt) { @@ -650,7 +650,7 @@ BOOL fastpath_send_update_pdu(rdpFastPath* fastpath, BYTE updateCode, STREAM* s) BOOL result; UINT16 pduLength; UINT16 maxLength; - uint32 totalLength; + UINT32 totalLength; BYTE fragmentation; BYTE header; STREAM* update; diff --git a/libfreerdp/core/fastpath.h b/libfreerdp/core/fastpath.h index 4870205d6..12999398c 100644 --- a/libfreerdp/core/fastpath.h +++ b/libfreerdp/core/fastpath.h @@ -114,7 +114,7 @@ BOOL fastpath_send_input_pdu(rdpFastPath* fastpath, STREAM* s); STREAM* fastpath_update_pdu_init(rdpFastPath* fastpath); BOOL fastpath_send_update_pdu(rdpFastPath* fastpath, BYTE updateCode, STREAM* s); -BOOL fastpath_send_surfcmd_frame_marker(rdpFastPath* fastpath, UINT16 frameAction, uint32 frameId); +BOOL fastpath_send_surfcmd_frame_marker(rdpFastPath* fastpath, UINT16 frameAction, UINT32 frameId); rdpFastPath* fastpath_new(rdpRdp* rdp); void fastpath_free(rdpFastPath* fastpath); diff --git a/libfreerdp/core/freerdp.c b/libfreerdp/core/freerdp.c index b1c3d443d..53e0f926c 100644 --- a/libfreerdp/core/freerdp.c +++ b/libfreerdp/core/freerdp.c @@ -273,7 +273,7 @@ void freerdp_context_free(freerdp* instance) instance->context = NULL; } -uint32 freerdp_error_info(freerdp* instance) +UINT32 freerdp_error_info(freerdp* instance) { return instance->context->rdp->errorInfo; } diff --git a/libfreerdp/core/gcc.c b/libfreerdp/core/gcc.c index 85d4d0857..561b55dfb 100644 --- a/libfreerdp/core/gcc.c +++ b/libfreerdp/core/gcc.c @@ -226,7 +226,7 @@ void gcc_write_conference_create_request(STREAM* s, STREAM* user_data) BOOL gcc_read_conference_create_response(STREAM* s, rdpSettings* settings) { UINT16 length; - uint32 tag; + UINT32 tag; UINT16 nodeID; BYTE result; BYTE choice; @@ -467,28 +467,28 @@ void gcc_write_user_data_header(STREAM* s, UINT16 type, UINT16 length) BOOL gcc_read_client_core_data(STREAM* s, rdpSettings* settings, UINT16 blockLength) { char* str; - uint32 version; - uint32 color_depth; + UINT32 version; + UINT32 color_depth; UINT16 colorDepth = 0; UINT16 postBeta2ColorDepth = 0; UINT16 highColorDepth = 0; UINT16 supportedColorDepths = 0; UINT16 earlyCapabilityFlags = 0; - uint32 serverSelectedProtocol = 0; + UINT32 serverSelectedProtocol = 0; /* Length of all required fields, until imeFileName */ if (blockLength < 128) return FALSE; - stream_read_uint32(s, version); /* version */ + stream_read_UINT32(s, version); /* version */ settings->rdp_version = (version == RDP_VERSION_4 ? 4 : 7); stream_read_UINT16(s, settings->width); /* desktopWidth */ stream_read_UINT16(s, settings->height); /* desktopHeight */ stream_read_UINT16(s, colorDepth); /* colorDepth */ stream_seek_UINT16(s); /* SASSequence (Secure Access Sequence) */ - stream_read_uint32(s, settings->kbd_layout); /* keyboardLayout */ - stream_read_uint32(s, settings->client_build); /* clientBuild */ + stream_read_UINT32(s, settings->kbd_layout); /* keyboardLayout */ + stream_read_UINT32(s, settings->client_build); /* clientBuild */ /* clientName (32 bytes, null-terminated unicode, truncated to 15 characters) */ freerdp_UnicodeToAsciiAlloc((WCHAR*) stream_get_tail(s), &str, 32 / 2); @@ -497,9 +497,9 @@ BOOL gcc_read_client_core_data(STREAM* s, rdpSettings* settings, UINT16 blockLen settings->client_hostname[31] = 0; free(str); - stream_read_uint32(s, settings->kbd_type); /* keyboardType */ - stream_read_uint32(s, settings->kbd_subtype); /* keyboardSubType */ - stream_read_uint32(s, settings->kbd_fn_keys); /* keyboardFunctionKey */ + stream_read_UINT32(s, settings->kbd_type); /* keyboardType */ + stream_read_UINT32(s, settings->kbd_subtype); /* keyboardSubType */ + stream_read_UINT32(s, settings->kbd_fn_keys); /* keyboardFunctionKey */ stream_seek(s, 64); /* imeFileName */ @@ -526,7 +526,7 @@ BOOL gcc_read_client_core_data(STREAM* s, rdpSettings* settings, UINT16 blockLen if (blockLength < 4) break; - stream_seek_uint32(s); /* serialNumber */ + stream_seek_UINT32(s); /* serialNumber */ blockLength -= 4; if (blockLength < 2) @@ -565,7 +565,7 @@ BOOL gcc_read_client_core_data(STREAM* s, rdpSettings* settings, UINT16 blockLen if (blockLength < 4) break; - stream_read_uint32(s, serverSelectedProtocol); /* serverSelectedProtocol */ + stream_read_UINT32(s, serverSelectedProtocol); /* serverSelectedProtocol */ blockLength -= 4; if (settings->selected_protocol != serverSelectedProtocol) @@ -631,7 +631,7 @@ BOOL gcc_read_client_core_data(STREAM* s, rdpSettings* settings, UINT16 blockLen void gcc_write_client_core_data(STREAM* s, rdpSettings* settings) { - uint32 version; + UINT32 version; WCHAR* clientName; int clientNameLength; BYTE connectionType; @@ -648,13 +648,13 @@ void gcc_write_client_core_data(STREAM* s, rdpSettings* settings) clientNameLength = freerdp_AsciiToUnicodeAlloc(settings->client_hostname, &clientName, 0); clientDigProductIdLength = freerdp_AsciiToUnicodeAlloc(settings->client_product_id, &clientDigProductId, 0); - stream_write_uint32(s, version); /* version */ + stream_write_UINT32(s, version); /* version */ stream_write_UINT16(s, settings->width); /* desktopWidth */ stream_write_UINT16(s, settings->height); /* desktopHeight */ stream_write_UINT16(s, RNS_UD_COLOR_8BPP); /* colorDepth, ignored because of postBeta2ColorDepth */ stream_write_UINT16(s, RNS_UD_SAS_DEL); /* SASSequence (Secure Access Sequence) */ - stream_write_uint32(s, settings->kbd_layout); /* keyboardLayout */ - stream_write_uint32(s, settings->client_build); /* clientBuild */ + stream_write_UINT32(s, settings->kbd_layout); /* keyboardLayout */ + stream_write_UINT32(s, settings->client_build); /* clientBuild */ /* clientName (32 bytes, null-terminated unicode, truncated to 15 characters) */ @@ -668,15 +668,15 @@ void gcc_write_client_core_data(STREAM* s, rdpSettings* settings) stream_write_zero(s, 32 - ((clientNameLength + 1) * 2)); free(clientName); - stream_write_uint32(s, settings->kbd_type); /* keyboardType */ - stream_write_uint32(s, settings->kbd_subtype); /* keyboardSubType */ - stream_write_uint32(s, settings->kbd_fn_keys); /* keyboardFunctionKey */ + stream_write_UINT32(s, settings->kbd_type); /* keyboardType */ + stream_write_UINT32(s, settings->kbd_subtype); /* keyboardSubType */ + stream_write_UINT32(s, settings->kbd_fn_keys); /* keyboardFunctionKey */ stream_write_zero(s, 64); /* imeFileName */ stream_write_UINT16(s, RNS_UD_COLOR_8BPP); /* postBeta2ColorDepth */ stream_write_UINT16(s, 1); /* clientProductID */ - stream_write_uint32(s, 0); /* serialNumber (should be initialized to 0) */ + stream_write_UINT32(s, 0); /* serialNumber (should be initialized to 0) */ highColorDepth = MIN(settings->color_depth, 24); @@ -719,16 +719,16 @@ void gcc_write_client_core_data(STREAM* s, rdpSettings* settings) stream_write_BYTE(s, connectionType); /* connectionType */ stream_write_BYTE(s, 0); /* pad1octet */ - stream_write_uint32(s, settings->selected_protocol); /* serverSelectedProtocol */ + stream_write_UINT32(s, settings->selected_protocol); /* serverSelectedProtocol */ } BOOL gcc_read_server_core_data(STREAM* s, rdpSettings* settings) { - uint32 version; - uint32 clientRequestedProtocols; + UINT32 version; + UINT32 clientRequestedProtocols; - stream_read_uint32(s, version); /* version */ - stream_read_uint32(s, clientRequestedProtocols); /* clientRequestedProtocols */ + stream_read_UINT32(s, version); /* version */ + stream_read_UINT32(s, clientRequestedProtocols); /* clientRequestedProtocols */ if (version == RDP_VERSION_4 && settings->rdp_version > 4) settings->rdp_version = 4; @@ -742,8 +742,8 @@ void gcc_write_server_core_data(STREAM* s, rdpSettings* settings) { gcc_write_user_data_header(s, SC_CORE, 12); - stream_write_uint32(s, settings->rdp_version == 4 ? RDP_VERSION_4 : RDP_VERSION_5_PLUS); - stream_write_uint32(s, settings->requested_protocols); /* clientRequestedProtocols */ + stream_write_UINT32(s, settings->rdp_version == 4 ? RDP_VERSION_4 : RDP_VERSION_5_PLUS); + stream_write_UINT32(s, settings->requested_protocols); /* clientRequestedProtocols */ } /** @@ -760,9 +760,9 @@ BOOL gcc_read_client_security_data(STREAM* s, rdpSettings* settings, UINT16 bloc if (settings->encryption) { - stream_read_uint32(s, settings->encryption_method); /* encryptionMethods */ + stream_read_UINT32(s, settings->encryption_method); /* encryptionMethods */ if (settings->encryption_method == 0) - stream_read_uint32(s, settings->encryption_method); /* extEncryptionMethods */ + stream_read_UINT32(s, settings->encryption_method); /* extEncryptionMethods */ } else { @@ -784,24 +784,24 @@ void gcc_write_client_security_data(STREAM* s, rdpSettings* settings) if (settings->encryption) { - stream_write_uint32(s, settings->encryption_method); /* encryptionMethods */ - stream_write_uint32(s, 0); /* extEncryptionMethods */ + stream_write_UINT32(s, settings->encryption_method); /* encryptionMethods */ + stream_write_UINT32(s, 0); /* extEncryptionMethods */ } else { /* French locale, disable encryption */ - stream_write_uint32(s, 0); /* encryptionMethods */ - stream_write_uint32(s, settings->encryption_method); /* extEncryptionMethods */ + stream_write_UINT32(s, 0); /* encryptionMethods */ + stream_write_UINT32(s, settings->encryption_method); /* extEncryptionMethods */ } } BOOL gcc_read_server_security_data(STREAM* s, rdpSettings* settings) { BYTE* data; - uint32 length; + UINT32 length; - stream_read_uint32(s, settings->encryption_method); /* encryptionMethod */ - stream_read_uint32(s, settings->encryption_level); /* encryptionLevel */ + stream_read_UINT32(s, settings->encryption_method); /* encryptionMethod */ + stream_read_UINT32(s, settings->encryption_level); /* encryptionLevel */ if (settings->encryption_method == 0 && settings->encryption_level == 0) { @@ -812,8 +812,8 @@ BOOL gcc_read_server_security_data(STREAM* s, rdpSettings* settings) return TRUE; } - stream_read_uint32(s, settings->server_random_length); /* serverRandomLen */ - stream_read_uint32(s, settings->server_certificate_length); /* serverCertLen */ + stream_read_UINT32(s, settings->server_random_length); /* serverRandomLen */ + stream_read_UINT32(s, settings->server_certificate_length); /* serverCertLen */ if (settings->server_random_length > 0) { @@ -901,7 +901,7 @@ void gcc_write_server_security_data(STREAM* s, rdpSettings* settings) int expLen, keyLen, sigDataLen; BYTE encryptedSignature[TSSK_KEY_LENGTH]; BYTE signature[sizeof(initial_signature)]; - uint32 headerLen, serverRandomLen, serverCertLen, wPublicKeyBlobLen; + UINT32 headerLen, serverRandomLen, serverCertLen, wPublicKeyBlobLen; if (!settings->encryption) { @@ -964,8 +964,8 @@ void gcc_write_server_security_data(STREAM* s, rdpSettings* settings) gcc_write_user_data_header(s, SC_SECURITY, headerLen); - stream_write_uint32(s, settings->encryption_method); /* encryptionMethod */ - stream_write_uint32(s, settings->encryption_level); /* encryptionLevel */ + stream_write_UINT32(s, settings->encryption_method); /* encryptionMethod */ + stream_write_UINT32(s, settings->encryption_level); /* encryptionLevel */ if (settings->encryption_method == ENCRYPTION_METHOD_NONE && settings->encryption_level == ENCRYPTION_LEVEL_NONE) @@ -973,8 +973,8 @@ void gcc_write_server_security_data(STREAM* s, rdpSettings* settings) return; } - stream_write_uint32(s, serverRandomLen); /* serverRandomLen */ - stream_write_uint32(s, serverCertLen); /* serverCertLen */ + stream_write_UINT32(s, serverRandomLen); /* serverRandomLen */ + stream_write_UINT32(s, serverCertLen); /* serverCertLen */ settings->server_random_length = serverRandomLen; settings->server_random = (BYTE*) malloc(serverRandomLen); @@ -983,16 +983,16 @@ void gcc_write_server_security_data(STREAM* s, rdpSettings* settings) sigData = stream_get_tail(s); - stream_write_uint32(s, CERT_CHAIN_VERSION_1); /* dwVersion (4 bytes) */ - stream_write_uint32(s, SIGNATURE_ALG_RSA); /* dwSigAlgId */ - stream_write_uint32(s, KEY_EXCHANGE_ALG_RSA); /* dwKeyAlgId */ + stream_write_UINT32(s, CERT_CHAIN_VERSION_1); /* dwVersion (4 bytes) */ + stream_write_UINT32(s, SIGNATURE_ALG_RSA); /* dwSigAlgId */ + stream_write_UINT32(s, KEY_EXCHANGE_ALG_RSA); /* dwKeyAlgId */ stream_write_UINT16(s, BB_RSA_KEY_BLOB); /* wPublicKeyBlobType */ stream_write_UINT16(s, wPublicKeyBlobLen); /* wPublicKeyBlobLen */ stream_write(s, "RSA1", 4); /* magic */ - stream_write_uint32(s, keyLen + 8); /* keylen */ - stream_write_uint32(s, keyLen * 8); /* bitlen */ - stream_write_uint32(s, keyLen - 1); /* datalen */ + stream_write_UINT32(s, keyLen + 8); /* keylen */ + stream_write_UINT32(s, keyLen * 8); /* bitlen */ + stream_write_UINT32(s, keyLen - 1); /* datalen */ stream_write(s, settings->server_key->exponent, expLen); stream_write(s, settings->server_key->Modulus, keyLen); @@ -1030,7 +1030,7 @@ BOOL gcc_read_client_network_data(STREAM* s, rdpSettings* settings, UINT16 block if (blockLength < 4) return FALSE; - stream_read_uint32(s, settings->num_channels); /* channelCount */ + stream_read_UINT32(s, settings->num_channels); /* channelCount */ if (blockLength < 4 + settings->num_channels * 12) return FALSE; if (settings->num_channels > 16) @@ -1041,7 +1041,7 @@ BOOL gcc_read_client_network_data(STREAM* s, rdpSettings* settings, UINT16 block { /* CHANNEL_DEF */ stream_read(s, settings->channels[i].name, 8); /* name (8 bytes) */ - stream_read_uint32(s, settings->channels[i].options); /* options (4 bytes) */ + stream_read_UINT32(s, settings->channels[i].options); /* options (4 bytes) */ settings->channels[i].channel_id = MCS_GLOBAL_CHANNEL_ID + 1 + i; } @@ -1065,14 +1065,14 @@ void gcc_write_client_network_data(STREAM* s, rdpSettings* settings) length = settings->num_channels * 12 + 8; gcc_write_user_data_header(s, CS_NET, length); - stream_write_uint32(s, settings->num_channels); /* channelCount */ + stream_write_UINT32(s, settings->num_channels); /* channelCount */ /* channelDefArray */ for (i = 0; i < settings->num_channels; i++) { /* CHANNEL_DEF */ stream_write(s, settings->channels[i].name, 8); /* name (8 bytes) */ - stream_write_uint32(s, settings->channels[i].options); /* options (4 bytes) */ + stream_write_UINT32(s, settings->channels[i].options); /* options (4 bytes) */ } } } @@ -1132,15 +1132,15 @@ void gcc_write_server_network_data(STREAM* s, rdpSettings* settings) BOOL gcc_read_client_cluster_data(STREAM* s, rdpSettings* settings, UINT16 blockLength) { - uint32 flags; + UINT32 flags; if (blockLength < 8) return FALSE; - stream_read_uint32(s, flags); /* flags */ + stream_read_UINT32(s, flags); /* flags */ if ((flags & REDIRECTED_SESSIONID_FIELD_VALID)) - stream_read_uint32(s, settings->redirected_session_id); /* redirectedSessionID */ + stream_read_UINT32(s, settings->redirected_session_id); /* redirectedSessionID */ return TRUE; } @@ -1154,7 +1154,7 @@ BOOL gcc_read_client_cluster_data(STREAM* s, rdpSettings* settings, UINT16 block void gcc_write_client_cluster_data(STREAM* s, rdpSettings* settings) { - uint32 flags; + UINT32 flags; gcc_write_user_data_header(s, CS_CLUSTER, 12); @@ -1163,8 +1163,8 @@ void gcc_write_client_cluster_data(STREAM* s, rdpSettings* settings) if (settings->console_session || settings->redirected_session_id) flags |= REDIRECTED_SESSIONID_FIELD_VALID; - stream_write_uint32(s, flags); /* flags */ - stream_write_uint32(s, settings->redirected_session_id); /* redirectedSessionID */ + stream_write_UINT32(s, flags); /* flags */ + stream_write_UINT32(s, settings->redirected_session_id); /* redirectedSessionID */ } /** @@ -1191,15 +1191,15 @@ void gcc_write_client_monitor_data(STREAM* s, rdpSettings* settings) { int i; UINT16 length; - uint32 left, top, right, bottom, flags; + UINT32 left, top, right, bottom, flags; if (settings->num_monitors > 1) { length = (20 * settings->num_monitors) + 12; gcc_write_user_data_header(s, CS_MONITOR, length); - stream_write_uint32(s, 0); /* flags */ - stream_write_uint32(s, settings->num_monitors); /* monitorCount */ + stream_write_UINT32(s, 0); /* flags */ + stream_write_UINT32(s, settings->num_monitors); /* monitorCount */ for (i = 0; i < settings->num_monitors; i++) { @@ -1209,11 +1209,11 @@ void gcc_write_client_monitor_data(STREAM* s, rdpSettings* settings) bottom = settings->monitors[i].y + settings->monitors[i].height - 1; flags = settings->monitors[i].is_primary ? MONITOR_PRIMARY : 0; - stream_write_uint32(s, left); /* left */ - stream_write_uint32(s, top); /* top */ - stream_write_uint32(s, right); /* right */ - stream_write_uint32(s, bottom); /* bottom */ - stream_write_uint32(s, flags); /* flags */ + stream_write_UINT32(s, left); /* left */ + stream_write_UINT32(s, top); /* top */ + stream_write_UINT32(s, right); /* right */ + stream_write_UINT32(s, bottom); /* bottom */ + stream_write_UINT32(s, flags); /* flags */ } } } diff --git a/libfreerdp/core/graphics.c b/libfreerdp/core/graphics.c index 05bf2e58f..f3707e4dc 100644 --- a/libfreerdp/core/graphics.c +++ b/libfreerdp/core/graphics.c @@ -180,12 +180,12 @@ void Glyph_Draw(rdpContext* context, rdpGlyph* glyph, int x, int y) context->graphics->Glyph_Prototype->Draw(context, glyph, x, y); } -void Glyph_BeginDraw(rdpContext* context, int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor) +void Glyph_BeginDraw(rdpContext* context, int x, int y, int width, int height, UINT32 bgcolor, UINT32 fgcolor) { context->graphics->Glyph_Prototype->BeginDraw(context, x, y, width, height, bgcolor, fgcolor); } -void Glyph_EndDraw(rdpContext* context, int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor) +void Glyph_EndDraw(rdpContext* context, int x, int y, int width, int height, UINT32 bgcolor, UINT32 fgcolor) { context->graphics->Glyph_Prototype->EndDraw(context, x, y, width, height, bgcolor, fgcolor); } diff --git a/libfreerdp/core/info.c b/libfreerdp/core/info.c index cf43e181e..fc9780b53 100644 --- a/libfreerdp/core/info.c +++ b/libfreerdp/core/info.c @@ -54,9 +54,9 @@ void rdp_read_server_auto_reconnect_cookie(STREAM* s, rdpSettings* settings) ARC_SC_PRIVATE_PACKET* autoReconnectCookie; autoReconnectCookie = settings->server_auto_reconnect_cookie; - stream_read_uint32(s, autoReconnectCookie->cbLen); /* cbLen (4 bytes) */ - stream_read_uint32(s, autoReconnectCookie->version); /* version (4 bytes) */ - stream_read_uint32(s, autoReconnectCookie->logonId); /* LogonId (4 bytes) */ + stream_read_UINT32(s, autoReconnectCookie->cbLen); /* cbLen (4 bytes) */ + stream_read_UINT32(s, autoReconnectCookie->version); /* version (4 bytes) */ + stream_read_UINT32(s, autoReconnectCookie->logonId); /* LogonId (4 bytes) */ stream_read(s, autoReconnectCookie->arcRandomBits, 16); /* arcRandomBits (16 bytes) */ } @@ -75,9 +75,9 @@ BOOL rdp_read_client_auto_reconnect_cookie(STREAM* s, rdpSettings* settings) if (stream_get_left(s) < 28) return FALSE; - stream_read_uint32(s, autoReconnectCookie->cbLen); /* cbLen (4 bytes) */ - stream_read_uint32(s, autoReconnectCookie->version); /* version (4 bytes) */ - stream_read_uint32(s, autoReconnectCookie->logonId); /* LogonId (4 bytes) */ + stream_read_UINT32(s, autoReconnectCookie->cbLen); /* cbLen (4 bytes) */ + stream_read_UINT32(s, autoReconnectCookie->version); /* version (4 bytes) */ + stream_read_UINT32(s, autoReconnectCookie->logonId); /* LogonId (4 bytes) */ stream_read(s, autoReconnectCookie->securityVerifier, 16); /* SecurityVerifier */ return TRUE; @@ -95,9 +95,9 @@ void rdp_write_client_auto_reconnect_cookie(STREAM* s, rdpSettings* settings) ARC_CS_PRIVATE_PACKET* autoReconnectCookie; autoReconnectCookie = settings->client_auto_reconnect_cookie; - stream_write_uint32(s, autoReconnectCookie->cbLen); /* cbLen (4 bytes) */ - stream_write_uint32(s, autoReconnectCookie->version); /* version (4 bytes) */ - stream_write_uint32(s, autoReconnectCookie->logonId); /* LogonId (4 bytes) */ + stream_write_UINT32(s, autoReconnectCookie->cbLen); /* cbLen (4 bytes) */ + stream_write_UINT32(s, autoReconnectCookie->version); /* version (4 bytes) */ + stream_write_UINT32(s, autoReconnectCookie->logonId); /* LogonId (4 bytes) */ stream_write(s, autoReconnectCookie->securityVerifier, 16); /* SecurityVerifier */ } @@ -140,8 +140,8 @@ BOOL rdp_read_extended_info_packet(STREAM* s, rdpSettings* settings) if (!rdp_read_client_time_zone(s, settings)) return FALSE; - stream_seek_uint32(s); /* clientSessionId, should be set to 0 */ - stream_read_uint32(s, settings->performance_flags); /* performanceFlags */ + stream_seek_UINT32(s); /* clientSessionId, should be set to 0 */ + stream_read_UINT32(s, settings->performance_flags); /* performanceFlags */ stream_read_UINT16(s, cbAutoReconnectLen); /* cbAutoReconnectLen */ @@ -194,8 +194,8 @@ void rdp_write_extended_info_packet(STREAM* s, rdpSettings* settings) rdp_write_client_time_zone(s, settings); /* clientTimeZone */ - stream_write_uint32(s, 0); /* clientSessionId, should be set to 0 */ - stream_write_uint32(s, settings->performance_flags); /* performanceFlags */ + stream_write_UINT32(s, 0); /* clientSessionId, should be set to 0 */ + stream_write_UINT32(s, settings->performance_flags); /* performanceFlags */ stream_write_UINT16(s, cbAutoReconnectLen); /* cbAutoReconnectLen */ @@ -218,15 +218,15 @@ void rdp_write_extended_info_packet(STREAM* s, rdpSettings* settings) BOOL rdp_read_info_packet(STREAM* s, rdpSettings* settings) { - uint32 flags; + UINT32 flags; UINT16 cbDomain; UINT16 cbUserName; UINT16 cbPassword; UINT16 cbAlternateShell; UINT16 cbWorkingDir; - stream_seek_uint32(s); /* CodePage */ - stream_read_uint32(s, flags); /* flags */ + stream_seek_UINT32(s); /* CodePage */ + stream_read_UINT32(s, flags); /* flags */ settings->autologon = ((flags & INFO_AUTOLOGON) ? TRUE : FALSE); settings->remote_app = ((flags & INFO_RAIL) ? TRUE : FALSE); @@ -304,7 +304,7 @@ BOOL rdp_read_info_packet(STREAM* s, rdpSettings* settings) void rdp_write_info_packet(STREAM* s, rdpSettings* settings) { - uint32 flags; + UINT32 flags; WCHAR* domain; int cbDomain; WCHAR* userName; @@ -370,8 +370,8 @@ void rdp_write_info_packet(STREAM* s, rdpSettings* settings) cbWorkingDir = freerdp_AsciiToUnicodeAlloc(settings->directory, &workingDir, 0) * 2; - stream_write_uint32(s, 0); /* CodePage */ - stream_write_uint32(s, flags); /* flags */ + stream_write_UINT32(s, 0); /* CodePage */ + stream_write_UINT32(s, flags); /* flags */ stream_write_UINT16(s, cbDomain); /* cbDomain */ stream_write_UINT16(s, cbUserName); /* cbUserName */ @@ -470,26 +470,26 @@ BOOL rdp_send_client_info(rdpRdp* rdp) void rdp_recv_logon_info_v1(rdpRdp* rdp, STREAM* s) { - uint32 cbDomain; - uint32 cbUserName; + UINT32 cbDomain; + UINT32 cbUserName; - stream_read_uint32(s, cbDomain); /* cbDomain (4 bytes) */ + stream_read_UINT32(s, cbDomain); /* cbDomain (4 bytes) */ stream_seek(s, 52); /* domain (52 bytes) */ - stream_read_uint32(s, cbUserName); /* cbUserName (4 bytes) */ + stream_read_UINT32(s, cbUserName); /* cbUserName (4 bytes) */ stream_seek(s, 512); /* userName (512 bytes) */ - stream_seek_uint32(s); /* sessionId (4 bytes) */ + stream_seek_UINT32(s); /* sessionId (4 bytes) */ } void rdp_recv_logon_info_v2(rdpRdp* rdp, STREAM* s) { - uint32 cbDomain; - uint32 cbUserName; + UINT32 cbDomain; + UINT32 cbUserName; stream_seek_UINT16(s); /* version (2 bytes) */ - stream_seek_uint32(s); /* size (4 bytes) */ - stream_seek_uint32(s); /* sessionId (4 bytes) */ - stream_read_uint32(s, cbDomain); /* cbDomain (4 bytes) */ - stream_read_uint32(s, cbUserName); /* cbUserName (4 bytes) */ + stream_seek_UINT32(s); /* size (4 bytes) */ + stream_seek_UINT32(s); /* sessionId (4 bytes) */ + stream_read_UINT32(s, cbDomain); /* cbDomain (4 bytes) */ + stream_read_UINT32(s, cbUserName); /* cbUserName (4 bytes) */ stream_seek(s, 558); /* pad */ stream_seek(s, cbDomain); /* domain */ stream_seek(s, cbUserName); /* userName */ @@ -502,33 +502,33 @@ void rdp_recv_logon_plain_notify(rdpRdp* rdp, STREAM* s) void rdp_recv_logon_error_info(rdpRdp* rdp, STREAM* s) { - uint32 errorNotificationType; - uint32 errorNotificationData; + UINT32 errorNotificationType; + UINT32 errorNotificationData; - stream_read_uint32(s, errorNotificationType); /* errorNotificationType (4 bytes) */ - stream_read_uint32(s, errorNotificationData); /* errorNotificationData (4 bytes) */ + stream_read_UINT32(s, errorNotificationType); /* errorNotificationType (4 bytes) */ + stream_read_UINT32(s, errorNotificationData); /* errorNotificationData (4 bytes) */ } void rdp_recv_logon_info_extended(rdpRdp* rdp, STREAM* s) { - uint32 cbFieldData; - uint32 fieldsPresent; + UINT32 cbFieldData; + UINT32 fieldsPresent; UINT16 Length; stream_read_UINT16(s, Length); /* The total size in bytes of this structure */ - stream_read_uint32(s, fieldsPresent); /* fieldsPresent (4 bytes) */ + stream_read_UINT32(s, fieldsPresent); /* fieldsPresent (4 bytes) */ /* logonFields */ if (fieldsPresent & LOGON_EX_AUTORECONNECTCOOKIE) { - stream_read_uint32(s, cbFieldData); /* cbFieldData (4 bytes) */ + stream_read_UINT32(s, cbFieldData); /* cbFieldData (4 bytes) */ rdp_read_server_auto_reconnect_cookie(s, rdp->settings); } if (fieldsPresent & LOGON_EX_LOGONERRORS) { - stream_read_uint32(s, cbFieldData); /* cbFieldData (4 bytes) */ + stream_read_UINT32(s, cbFieldData); /* cbFieldData (4 bytes) */ rdp_recv_logon_error_info(rdp, s); } @@ -537,9 +537,9 @@ void rdp_recv_logon_info_extended(rdpRdp* rdp, STREAM* s) BOOL rdp_recv_save_session_info(rdpRdp* rdp, STREAM* s) { - uint32 infoType; + UINT32 infoType; - stream_read_uint32(s, infoType); /* infoType (4 bytes) */ + stream_read_UINT32(s, infoType); /* infoType (4 bytes) */ //printf("%s\n", INFO_TYPE_LOGON_STRINGS[infoType]); diff --git a/libfreerdp/core/input.c b/libfreerdp/core/input.c index 61f77662b..99e92b37f 100644 --- a/libfreerdp/core/input.c +++ b/libfreerdp/core/input.c @@ -31,9 +31,9 @@ void rdp_write_client_input_pdu_header(STREAM* s, UINT16 number) stream_write_UINT16(s, 0); /* pad2Octets (2 bytes) */ } -void rdp_write_input_event_header(STREAM* s, uint32 time, UINT16 type) +void rdp_write_input_event_header(STREAM* s, UINT32 time, UINT16 type) { - stream_write_uint32(s, time); /* eventTime (4 bytes) */ + stream_write_UINT32(s, time); /* eventTime (4 bytes) */ stream_write_UINT16(s, type); /* messageType (2 bytes) */ } @@ -51,13 +51,13 @@ void rdp_send_client_input_pdu(rdpRdp* rdp, STREAM* s) rdp_send_data_pdu(rdp, s, DATA_PDU_TYPE_INPUT, rdp->mcs->user_id); } -void input_write_synchronize_event(STREAM* s, uint32 flags) +void input_write_synchronize_event(STREAM* s, UINT32 flags) { stream_write_UINT16(s, 0); /* pad2Octets (2 bytes) */ - stream_write_uint32(s, flags); /* toggleFlags (4 bytes) */ + stream_write_UINT32(s, flags); /* toggleFlags (4 bytes) */ } -void input_send_synchronize_event(rdpInput* input, uint32 flags) +void input_send_synchronize_event(rdpInput* input, UINT32 flags) { STREAM* s; rdpRdp* rdp = input->context->rdp; @@ -147,7 +147,7 @@ void input_send_extended_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UI rdp_send_client_input_pdu(rdp, s); } -void input_send_fastpath_synchronize_event(rdpInput* input, uint32 flags) +void input_send_fastpath_synchronize_event(rdpInput* input, UINT32 flags) { STREAM* s; rdpRdp* rdp = input->context->rdp; @@ -204,13 +204,13 @@ void input_send_fastpath_extended_mouse_event(rdpInput* input, UINT16 flags, UIN static BOOL input_recv_sync_event(rdpInput* input, STREAM* s) { - uint32 toggleFlags; + UINT32 toggleFlags; if (stream_get_left(s) < 6) return FALSE; stream_seek(s, 2); /* pad2Octets (2 bytes) */ - stream_read_uint32(s, toggleFlags); /* toggleFlags (4 bytes) */ + stream_read_UINT32(s, toggleFlags); /* toggleFlags (4 bytes) */ IFCALL(input->SynchronizeEvent, input, toggleFlags); @@ -386,7 +386,7 @@ void input_register_client_callbacks(rdpInput* input) } } -void freerdp_input_send_synchronize_event(rdpInput* input, uint32 flags) +void freerdp_input_send_synchronize_event(rdpInput* input, UINT32 flags) { IFCALL(input->SynchronizeEvent, input, flags); } @@ -396,7 +396,7 @@ void freerdp_input_send_keyboard_event(rdpInput* input, UINT16 flags, UINT16 cod IFCALL(input->KeyboardEvent, input, flags, code); } -void freerdp_input_send_keyboard_event_ex(rdpInput* input, BOOL down, uint32 rdp_scancode) +void freerdp_input_send_keyboard_event_ex(rdpInput* input, BOOL down, UINT32 rdp_scancode) { freerdp_input_send_keyboard_event(input, (RDP_SCANCODE_EXTENDED(rdp_scancode) ? KBD_FLAGS_EXTENDED : 0) | diff --git a/libfreerdp/core/input.h b/libfreerdp/core/input.h index 804eb3f16..291763e42 100644 --- a/libfreerdp/core/input.h +++ b/libfreerdp/core/input.h @@ -37,13 +37,13 @@ #define RDP_CLIENT_INPUT_PDU_HEADER_LENGTH 4 -void input_send_synchronize_event(rdpInput* input, uint32 flags); +void input_send_synchronize_event(rdpInput* input, UINT32 flags); void input_send_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code); void input_send_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code); void input_send_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y); void input_send_extended_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y); -void input_send_fastpath_synchronize_event(rdpInput* input, uint32 flags); +void input_send_fastpath_synchronize_event(rdpInput* input, UINT32 flags); void input_send_fastpath_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code); void input_send_fastpath_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code); void input_send_fastpath_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y); diff --git a/libfreerdp/core/license.c b/libfreerdp/core/license.c index 3b0d3fbbe..97aea5464 100644 --- a/libfreerdp/core/license.c +++ b/libfreerdp/core/license.c @@ -386,14 +386,14 @@ void license_decrypt_platform_challenge(rdpLicense* license) void license_read_product_info(STREAM* s, PRODUCT_INFO* productInfo) { - stream_read_uint32(s, productInfo->dwVersion); /* dwVersion (4 bytes) */ + stream_read_UINT32(s, productInfo->dwVersion); /* dwVersion (4 bytes) */ - stream_read_uint32(s, productInfo->cbCompanyName); /* cbCompanyName (4 bytes) */ + stream_read_UINT32(s, productInfo->cbCompanyName); /* cbCompanyName (4 bytes) */ productInfo->pbCompanyName = (BYTE*) malloc(productInfo->cbCompanyName); stream_read(s, productInfo->pbCompanyName, productInfo->cbCompanyName); - stream_read_uint32(s, productInfo->cbProductId); /* cbProductId (4 bytes) */ + stream_read_UINT32(s, productInfo->cbProductId); /* cbProductId (4 bytes) */ productInfo->pbProductId = (BYTE*) malloc(productInfo->cbProductId); stream_read(s, productInfo->pbProductId, productInfo->cbProductId); @@ -540,10 +540,10 @@ void license_free_binary_blob(LICENSE_BLOB* blob) void license_read_scope_list(STREAM* s, SCOPE_LIST* scopeList) { - uint32 i; - uint32 scopeCount; + UINT32 i; + UINT32 scopeCount; - stream_read_uint32(s, scopeCount); /* ScopeCount (4 bytes) */ + stream_read_UINT32(s, scopeCount); /* ScopeCount (4 bytes) */ scopeList->count = scopeCount; scopeList->array = (LICENSE_BLOB*) malloc(sizeof(LICENSE_BLOB) * scopeCount); @@ -581,7 +581,7 @@ SCOPE_LIST* license_new_scope_list() void license_free_scope_list(SCOPE_LIST* scopeList) { - uint32 i; + UINT32 i; /* * We must NOT call license_free_binary_blob() on each scopelist->array[i] element, @@ -691,11 +691,11 @@ void license_read_upgrade_license_packet(rdpLicense* license, STREAM* s) void license_read_error_alert_packet(rdpLicense* license, STREAM* s) { - uint32 dwErrorCode; - uint32 dwStateTransition; + UINT32 dwErrorCode; + UINT32 dwStateTransition; - stream_read_uint32(s, dwErrorCode); /* dwErrorCode (4 bytes) */ - stream_read_uint32(s, dwStateTransition); /* dwStateTransition (4 bytes) */ + stream_read_UINT32(s, dwErrorCode); /* dwErrorCode (4 bytes) */ + stream_read_UINT32(s, dwStateTransition); /* dwStateTransition (4 bytes) */ license_read_binary_blob(s, license->error_info); /* bbErrorInfo */ #ifdef WITH_DEBUG_LICENSE @@ -754,7 +754,7 @@ void license_write_platform_id(rdpLicense* license, STREAM* s) void license_write_new_license_request_packet(rdpLicense* license, STREAM* s) { - stream_write_uint32(s, KEY_EXCHANGE_ALG_RSA); /* PreferredKeyExchangeAlg (4 bytes) */ + stream_write_UINT32(s, KEY_EXCHANGE_ALG_RSA); /* PreferredKeyExchangeAlg (4 bytes) */ license_write_platform_id(license, s); /* PlatformId (4 bytes) */ stream_write(s, license->client_random, 32); /* ClientRandom (32 bytes) */ license_write_padded_binary_blob(s, license->encrypted_premaster_secret); /* EncryptedPremasterSecret */ @@ -879,8 +879,8 @@ BOOL license_send_valid_client_error_packet(rdpLicense* license) s = license_send_stream_init(license); - stream_write_uint32(s, STATUS_VALID_CLIENT); /* dwErrorCode */ - stream_write_uint32(s, ST_NO_TRANSITION); /* dwStateTransition */ + stream_write_UINT32(s, STATUS_VALID_CLIENT); /* dwErrorCode */ + stream_write_UINT32(s, ST_NO_TRANSITION); /* dwStateTransition */ license_write_binary_blob(s, license->error_info); diff --git a/libfreerdp/core/license.h b/libfreerdp/core/license.h index 4eb1bf863..2ce31a93a 100644 --- a/libfreerdp/core/license.h +++ b/libfreerdp/core/license.h @@ -100,10 +100,10 @@ typedef struct rdp_license rdpLicense; typedef struct { - uint32 dwVersion; - uint32 cbCompanyName; + UINT32 dwVersion; + UINT32 cbCompanyName; BYTE* pbCompanyName; - uint32 cbProductId; + UINT32 cbProductId; BYTE* pbProductId; } PRODUCT_INFO; @@ -116,7 +116,7 @@ typedef struct typedef struct { - uint32 count; + UINT32 count; LICENSE_BLOB* array; } SCOPE_LIST; diff --git a/libfreerdp/core/mcs.c b/libfreerdp/core/mcs.c index bdeb6f4df..6f9d549c1 100644 --- a/libfreerdp/core/mcs.c +++ b/libfreerdp/core/mcs.c @@ -233,7 +233,7 @@ void mcs_write_domain_mcspdu_header(STREAM* s, enum DomainMCSPDU domainMCSPDU, U */ static void mcs_init_domain_parameters(DomainParameters* domainParameters, - uint32 maxChannelIds, uint32 maxUserIds, uint32 maxTokenIds, uint32 maxMCSPDUsize) + UINT32 maxChannelIds, UINT32 maxUserIds, UINT32 maxTokenIds, UINT32 maxMCSPDUsize) { domainParameters->maxChannelIds = maxChannelIds; domainParameters->maxUserIds = maxUserIds; @@ -489,7 +489,7 @@ BOOL mcs_recv_connect_response(rdpMcs* mcs, STREAM* s) { int length; BYTE result; - uint32 calledConnectId; + UINT32 calledConnectId; tpkt_read_header(s); diff --git a/libfreerdp/core/mcs.h b/libfreerdp/core/mcs.h index 7276eda8c..93a34aceb 100644 --- a/libfreerdp/core/mcs.h +++ b/libfreerdp/core/mcs.h @@ -100,14 +100,14 @@ enum DomainMCSPDU typedef struct { - uint32 maxChannelIds; - uint32 maxUserIds; - uint32 maxTokenIds; - uint32 numPriorities; - uint32 minThroughput; - uint32 maxHeight; - uint32 maxMCSPDUsize; - uint32 protocolVersion; + UINT32 maxChannelIds; + UINT32 maxUserIds; + UINT32 maxTokenIds; + UINT32 numPriorities; + UINT32 minThroughput; + UINT32 maxHeight; + UINT32 maxMCSPDUsize; + UINT32 protocolVersion; } DomainParameters; struct rdp_mcs diff --git a/libfreerdp/core/nego.c b/libfreerdp/core/nego.c index 86cb44409..d5ef12106 100644 --- a/libfreerdp/core/nego.c +++ b/libfreerdp/core/nego.c @@ -234,7 +234,7 @@ int nego_transport_disconnect(rdpNego* nego) BOOL nego_send_preconnection_pdu(rdpNego* nego) { STREAM* s; - uint32 cbSize; + UINT32 cbSize; UINT16 cchPCB = 0; WCHAR* wszPCB = NULL; @@ -257,10 +257,10 @@ BOOL nego_send_preconnection_pdu(rdpNego* nego) } s = transport_send_stream_init(nego->transport, cbSize); - stream_write_uint32(s, cbSize); /* cbSize */ - stream_write_uint32(s, 0); /* Flags */ - stream_write_uint32(s, PRECONNECTION_PDU_V2); /* Version */ - stream_write_uint32(s, nego->preconnection_id); /* Id */ + stream_write_UINT32(s, cbSize); /* cbSize */ + stream_write_UINT32(s, 0); /* Flags */ + stream_write_UINT32(s, PRECONNECTION_PDU_V2); /* Version */ + stream_write_UINT32(s, nego->preconnection_id); /* Id */ stream_write_UINT16(s, cchPCB); /* cchPCB */ if (wszPCB) @@ -591,7 +591,7 @@ BOOL nego_send_negotiation_request(rdpNego* nego) stream_write_BYTE(s, TYPE_RDP_NEG_REQ); stream_write_BYTE(s, 0); /* flags, must be set to zero */ stream_write_UINT16(s, 8); /* RDP_NEG_DATA length (8) */ - stream_write_uint32(s, nego->requested_protocols); /* requestedProtocols */ + stream_write_UINT32(s, nego->requested_protocols); /* requestedProtocols */ length += 8; } @@ -622,7 +622,7 @@ void nego_process_negotiation_request(rdpNego* nego, STREAM* s) stream_read_BYTE(s, flags); stream_read_UINT16(s, length); - stream_read_uint32(s, nego->requested_protocols); + stream_read_UINT32(s, nego->requested_protocols); DEBUG_NEGO("requested_protocols: %d", nego->requested_protocols); @@ -643,7 +643,7 @@ void nego_process_negotiation_response(rdpNego* nego, STREAM* s) stream_read_BYTE(s, nego->flags); stream_read_UINT16(s, length); - stream_read_uint32(s, nego->selected_protocol); + stream_read_UINT32(s, nego->selected_protocol); nego->state = NEGO_STATE_FINAL; } @@ -658,13 +658,13 @@ void nego_process_negotiation_failure(rdpNego* nego, STREAM* s) { BYTE flags; UINT16 length; - uint32 failureCode; + UINT32 failureCode; DEBUG_NEGO("RDP_NEG_FAILURE"); stream_read_BYTE(s, flags); stream_read_UINT16(s, length); - stream_read_uint32(s, failureCode); + stream_read_UINT32(s, failureCode); switch (failureCode) { @@ -719,7 +719,7 @@ BOOL nego_send_negotiation_response(rdpNego* nego) stream_write_BYTE(s, TYPE_RDP_NEG_RSP); stream_write_BYTE(s, EXTENDED_CLIENT_DATA_SUPPORTED); /* flags */ stream_write_UINT16(s, 8); /* RDP_NEG_DATA length (8) */ - stream_write_uint32(s, nego->selected_protocol); /* selectedProtocol */ + stream_write_UINT32(s, nego->selected_protocol); /* selectedProtocol */ length += 8; } else if (!settings->rdp_security) @@ -732,7 +732,7 @@ BOOL nego_send_negotiation_response(rdpNego* nego) * like SSL_NOT_ALLOWED_BY_SERVER. */ printf("nego_send_negotiation_response: client supports only Standard RDP Security\n"); - stream_write_uint32(s, SSL_REQUIRED_BY_SERVER); + stream_write_UINT32(s, SSL_REQUIRED_BY_SERVER); length += 8; status = FALSE; } @@ -936,7 +936,7 @@ void nego_set_send_preconnection_pdu(rdpNego* nego, BOOL send_pcpdu) * @param id */ -void nego_set_preconnection_id(rdpNego* nego, uint32 id) +void nego_set_preconnection_id(rdpNego* nego, UINT32 id) { nego->preconnection_id = id; } diff --git a/libfreerdp/core/nego.h b/libfreerdp/core/nego.h index 1416af018..a0b046270 100644 --- a/libfreerdp/core/nego.h +++ b/libfreerdp/core/nego.h @@ -76,21 +76,21 @@ enum RDP_NEG_MSG struct rdp_nego { int port; - uint32 flags; + UINT32 flags; char* hostname; char* cookie; BYTE* RoutingToken; DWORD RoutingTokenLength; BOOL send_preconnection_pdu; - uint32 preconnection_id; + UINT32 preconnection_id; char* preconnection_blob; NEGO_STATE state; BOOL tcp_connected; BOOL security_connected; - uint32 selected_protocol; - uint32 requested_protocols; + UINT32 selected_protocol; + UINT32 requested_protocols; BOOL security_layer_negotiation_enabled; BYTE enabled_protocols[3]; @@ -129,7 +129,7 @@ void nego_enable_tls(rdpNego* nego, BOOL enable_tls); void nego_set_routing_token(rdpNego* nego, BYTE* RoutingToken, DWORD RoutingTokenLength); void nego_set_cookie(rdpNego* nego, char* cookie); void nego_set_send_preconnection_pdu(rdpNego* nego, BOOL send_pcpdu); -void nego_set_preconnection_id(rdpNego* nego, uint32 id); +void nego_set_preconnection_id(rdpNego* nego, UINT32 id); void nego_set_preconnection_blob(rdpNego* nego, char* blob); #ifdef WITH_DEBUG_NEGO diff --git a/libfreerdp/core/orders.c b/libfreerdp/core/orders.c index f28ca1ea9..aa6ab9ceb 100644 --- a/libfreerdp/core/orders.c +++ b/libfreerdp/core/orders.c @@ -142,7 +142,7 @@ static const BYTE BMF_BPP[] = 0, 1, 0, 8, 16, 24, 32 }; -static INLINE void update_read_coord(STREAM* s, sint32* coord, BOOL delta) +static INLINE void update_read_coord(STREAM* s, INT32* coord, BOOL delta) { INT8 lsi8; INT16 lsi16; @@ -159,7 +159,7 @@ static INLINE void update_read_coord(STREAM* s, sint32* coord, BOOL delta) } } -static INLINE void update_read_color(STREAM* s, uint32* color) +static INLINE void update_read_color(STREAM* s, UINT32* color) { BYTE byte; @@ -171,7 +171,7 @@ static INLINE void update_read_color(STREAM* s, uint32* color) *color |= (byte << 16); } -static INLINE void update_read_colorref(STREAM* s, uint32* color) +static INLINE void update_read_colorref(STREAM* s, UINT32* color) { BYTE byte; @@ -184,7 +184,7 @@ static INLINE void update_read_colorref(STREAM* s, uint32* color) stream_seek_BYTE(s); } -static INLINE void update_read_color_quad(STREAM* s, uint32* color) +static INLINE void update_read_color_quad(STREAM* s, UINT32* color) { BYTE byte; @@ -197,7 +197,7 @@ static INLINE void update_read_color_quad(STREAM* s, uint32* color) stream_seek_BYTE(s); } -static INLINE void update_read_2byte_unsigned(STREAM* s, uint32* value) +static INLINE void update_read_2byte_unsigned(STREAM* s, UINT32* value) { BYTE byte; @@ -215,7 +215,7 @@ static INLINE void update_read_2byte_unsigned(STREAM* s, uint32* value) } } -static INLINE void update_read_2byte_signed(STREAM* s, sint32* value) +static INLINE void update_read_2byte_signed(STREAM* s, INT32* value) { BYTE byte; BOOL negative; @@ -236,7 +236,7 @@ static INLINE void update_read_2byte_signed(STREAM* s, sint32* value) *value *= -1; } -static INLINE void update_read_4byte_unsigned(STREAM* s, uint32* value) +static INLINE void update_read_4byte_unsigned(STREAM* s, UINT32* value) { BYTE byte; BYTE count; @@ -280,7 +280,7 @@ static INLINE void update_read_4byte_unsigned(STREAM* s, uint32* value) } } -static INLINE void update_read_delta(STREAM* s, sint32* value) +static INLINE void update_read_delta(STREAM* s, INT32* value) { BYTE byte; @@ -864,7 +864,7 @@ void update_read_mem3blt_order(STREAM* s, ORDER_INFO* orderInfo, MEM3BLT_ORDER* void update_read_save_bitmap_order(STREAM* s, ORDER_INFO* orderInfo, SAVE_BITMAP_ORDER* save_bitmap) { if (orderInfo->fieldFlags & ORDER_FIELD_01) - stream_read_uint32(s, save_bitmap->savedBitmapPosition); + stream_read_UINT32(s, save_bitmap->savedBitmapPosition); if (orderInfo->fieldFlags & ORDER_FIELD_02) update_read_coord(s, &save_bitmap->nLeftRect, orderInfo->deltaCoordinates); @@ -1242,8 +1242,8 @@ void update_read_cache_bitmap_v2_order(STREAM* s, CACHE_BITMAP_V2_ORDER* cache_b if (cache_bitmap_v2_order->flags & CBR2_PERSISTENT_KEY_PRESENT) { - stream_read_uint32(s, cache_bitmap_v2_order->key1); /* key1 (4 bytes) */ - stream_read_uint32(s, cache_bitmap_v2_order->key2); /* key2 (4 bytes) */ + stream_read_UINT32(s, cache_bitmap_v2_order->key1); /* key1 (4 bytes) */ + stream_read_UINT32(s, cache_bitmap_v2_order->key2); /* key2 (4 bytes) */ } if (cache_bitmap_v2_order->flags & CBR2_HEIGHT_SAME_AS_WIDTH) @@ -1297,8 +1297,8 @@ void update_read_cache_bitmap_v3_order(STREAM* s, CACHE_BITMAP_V3_ORDER* cache_b cache_bitmap_v3_order->bpp = CBR23_BPP[bitsPerPixelId]; stream_read_UINT16(s, cache_bitmap_v3_order->cacheIndex); /* cacheIndex (2 bytes) */ - stream_read_uint32(s, cache_bitmap_v3_order->key1); /* key1 (4 bytes) */ - stream_read_uint32(s, cache_bitmap_v3_order->key2); /* key2 (4 bytes) */ + stream_read_UINT32(s, cache_bitmap_v3_order->key1); /* key1 (4 bytes) */ + stream_read_UINT32(s, cache_bitmap_v3_order->key2); /* key2 (4 bytes) */ bitmapData = &cache_bitmap_v3_order->bitmapData; @@ -1308,7 +1308,7 @@ void update_read_cache_bitmap_v3_order(STREAM* s, CACHE_BITMAP_V3_ORDER* cache_b stream_read_BYTE(s, bitmapData->codecID); /* codecID (1 byte) */ stream_read_UINT16(s, bitmapData->width); /* width (2 bytes) */ stream_read_UINT16(s, bitmapData->height); /* height (2 bytes) */ - stream_read_uint32(s, bitmapData->length); /* length (4 bytes) */ + stream_read_UINT32(s, bitmapData->length); /* length (4 bytes) */ if (bitmapData->data == NULL) bitmapData->data = (BYTE*) malloc(bitmapData->length); @@ -1321,7 +1321,7 @@ void update_read_cache_bitmap_v3_order(STREAM* s, CACHE_BITMAP_V3_ORDER* cache_b void update_read_cache_color_table_order(STREAM* s, CACHE_COLOR_TABLE_ORDER* cache_color_table_order, UINT16 flags) { int i; - uint32* colorTable; + UINT32* colorTable; stream_read_BYTE(s, cache_color_table_order->cacheIndex); /* cacheIndex (1 byte) */ stream_read_BYTE(s, cache_color_table_order->numberColors); /* numberColors (2 bytes) */ @@ -1329,9 +1329,9 @@ void update_read_cache_color_table_order(STREAM* s, CACHE_COLOR_TABLE_ORDER* cac colorTable = cache_color_table_order->colorTable; if (colorTable == NULL) - colorTable = (uint32*) malloc(cache_color_table_order->numberColors * 4); + colorTable = (UINT32*) malloc(cache_color_table_order->numberColors * 4); else - colorTable = (uint32*) realloc(colorTable, cache_color_table_order->numberColors * 4); + colorTable = (UINT32*) realloc(colorTable, cache_color_table_order->numberColors * 4); for (i = 0; i < (int) cache_color_table_order->numberColors; i++) { @@ -1559,7 +1559,7 @@ void update_read_create_nine_grid_bitmap_order(STREAM* s, CREATE_NINE_GRID_BITMA stream_read_UINT16(s, create_nine_grid_bitmap->bitmapId); /* bitmapId (2 bytes) */ nineGridInfo = &(create_nine_grid_bitmap->nineGridInfo); - stream_read_uint32(s, nineGridInfo->flFlags); /* flFlags (4 bytes) */ + stream_read_UINT32(s, nineGridInfo->flFlags); /* flFlags (4 bytes) */ stream_read_UINT16(s, nineGridInfo->ulLeftWidth); /* ulLeftWidth (2 bytes) */ stream_read_UINT16(s, nineGridInfo->ulRightWidth); /* ulRightWidth (2 bytes) */ stream_read_UINT16(s, nineGridInfo->ulTopHeight); /* ulTopHeight (2 bytes) */ @@ -1569,7 +1569,7 @@ void update_read_create_nine_grid_bitmap_order(STREAM* s, CREATE_NINE_GRID_BITMA void update_read_frame_marker_order(STREAM* s, FRAME_MARKER_ORDER* frame_marker) { - stream_read_uint32(s, frame_marker->action); /* action (4 bytes) */ + stream_read_UINT32(s, frame_marker->action); /* action (4 bytes) */ } void update_read_stream_bitmap_first_order(STREAM* s, STREAM_BITMAP_FIRST_ORDER* stream_bitmap_first) @@ -1581,7 +1581,7 @@ void update_read_stream_bitmap_first_order(STREAM* s, STREAM_BITMAP_FIRST_ORDER* stream_read_UINT16(s, stream_bitmap_first->bitmapHeight); /* bitmapHeigth (2 bytes) */ if (stream_bitmap_first->bitmapFlags & STREAM_BITMAP_V2) - stream_read_uint32(s, stream_bitmap_first->bitmapSize); /* bitmapSize (4 bytes) */ + stream_read_UINT32(s, stream_bitmap_first->bitmapSize); /* bitmapSize (4 bytes) */ else stream_read_UINT16(s, stream_bitmap_first->bitmapSize); /* bitmapSize (2 bytes) */ @@ -1601,8 +1601,8 @@ void update_read_draw_gdiplus_first_order(STREAM* s, DRAW_GDIPLUS_FIRST_ORDER* d { stream_seek_BYTE(s); /* pad1Octet (1 byte) */ stream_read_UINT16(s, draw_gdiplus_first->cbSize); /* cbSize (2 bytes) */ - stream_read_uint32(s, draw_gdiplus_first->cbTotalSize); /* cbTotalSize (4 bytes) */ - stream_read_uint32(s, draw_gdiplus_first->cbTotalEmfSize); /* cbTotalEmfSize (4 bytes) */ + stream_read_UINT32(s, draw_gdiplus_first->cbTotalSize); /* cbTotalSize (4 bytes) */ + stream_read_UINT32(s, draw_gdiplus_first->cbTotalEmfSize); /* cbTotalEmfSize (4 bytes) */ stream_seek(s, draw_gdiplus_first->cbSize); /* emfRecords */ } @@ -1617,8 +1617,8 @@ void update_read_draw_gdiplus_end_order(STREAM* s, DRAW_GDIPLUS_END_ORDER* draw_ { stream_seek_BYTE(s); /* pad1Octet (1 byte) */ stream_read_UINT16(s, draw_gdiplus_end->cbSize); /* cbSize (2 bytes) */ - stream_read_uint32(s, draw_gdiplus_end->cbTotalSize); /* cbTotalSize (4 bytes) */ - stream_read_uint32(s, draw_gdiplus_end->cbTotalEmfSize); /* cbTotalEmfSize (4 bytes) */ + stream_read_UINT32(s, draw_gdiplus_end->cbTotalSize); /* cbTotalSize (4 bytes) */ + stream_read_UINT32(s, draw_gdiplus_end->cbTotalEmfSize); /* cbTotalEmfSize (4 bytes) */ stream_seek(s, draw_gdiplus_end->cbSize); /* emfRecords */ } @@ -1628,7 +1628,7 @@ void update_read_draw_gdiplus_cache_first_order(STREAM* s, DRAW_GDIPLUS_CACHE_FI stream_read_UINT16(s, draw_gdiplus_cache_first->cacheType); /* cacheType (2 bytes) */ stream_read_UINT16(s, draw_gdiplus_cache_first->cacheIndex); /* cacheIndex (2 bytes) */ stream_read_UINT16(s, draw_gdiplus_cache_first->cbSize); /* cbSize (2 bytes) */ - stream_read_uint32(s, draw_gdiplus_cache_first->cbTotalSize); /* cbTotalSize (4 bytes) */ + stream_read_UINT32(s, draw_gdiplus_cache_first->cbTotalSize); /* cbTotalSize (4 bytes) */ stream_seek(s, draw_gdiplus_cache_first->cbSize); /* emfRecords */ } @@ -1647,11 +1647,11 @@ void update_read_draw_gdiplus_cache_end_order(STREAM* s, DRAW_GDIPLUS_CACHE_END_ stream_read_UINT16(s, draw_gdiplus_cache_end->cacheType); /* cacheType (2 bytes) */ stream_read_UINT16(s, draw_gdiplus_cache_end->cacheIndex); /* cacheIndex (2 bytes) */ stream_read_UINT16(s, draw_gdiplus_cache_end->cbSize); /* cbSize (2 bytes) */ - stream_read_uint32(s, draw_gdiplus_cache_end->cbTotalSize); /* cbTotalSize (4 bytes) */ + stream_read_UINT32(s, draw_gdiplus_cache_end->cbTotalSize); /* cbTotalSize (4 bytes) */ stream_seek(s, draw_gdiplus_cache_end->cbSize); /* emfRecords */ } -void update_read_field_flags(STREAM* s, uint32* fieldFlags, BYTE flags, BYTE fieldBytes) +void update_read_field_flags(STREAM* s, UINT32* fieldFlags, BYTE flags, BYTE fieldBytes) { int i; BYTE byte; diff --git a/libfreerdp/core/peer.c b/libfreerdp/core/peer.c index ed8f9a5e3..482983a9d 100644 --- a/libfreerdp/core/peer.c +++ b/libfreerdp/core/peer.c @@ -69,7 +69,7 @@ static BOOL peer_recv_data_pdu(freerdp_peer* client, STREAM* s) { BYTE type; UINT16 length; - uint32 share_id; + UINT32 share_id; BYTE compressed_type; UINT16 compressed_len; @@ -132,7 +132,7 @@ static BOOL peer_recv_data_pdu(freerdp_peer* client, STREAM* s) return FALSE; case DATA_PDU_TYPE_FRAME_ACKNOWLEDGE: - stream_read_uint32(s, client->ack_frame_id); + stream_read_UINT32(s, client->ack_frame_id); break; case DATA_PDU_TYPE_REFRESH_RECT: diff --git a/libfreerdp/core/rdp.c b/libfreerdp/core/rdp.c index 4b16778eb..32f432f85 100644 --- a/libfreerdp/core/rdp.c +++ b/libfreerdp/core/rdp.c @@ -125,14 +125,14 @@ void rdp_write_share_control_header(STREAM* s, UINT16 length, UINT16 type, UINT1 stream_write_UINT16(s, channel_id); /* pduSource */ } -BOOL rdp_read_share_data_header(STREAM* s, UINT16* length, BYTE* type, uint32* share_id, +BOOL rdp_read_share_data_header(STREAM* s, UINT16* length, BYTE* type, UINT32* share_id, BYTE *compressed_type, UINT16 *compressed_len) { if (stream_get_left(s) < 12) return FALSE; /* Share Data Header */ - stream_read_uint32(s, *share_id); /* shareId (4 bytes) */ + stream_read_UINT32(s, *share_id); /* shareId (4 bytes) */ stream_seek_BYTE(s); /* pad1 (1 byte) */ stream_seek_BYTE(s); /* streamId (1 byte) */ stream_read_UINT16(s, *length); /* uncompressedLength (2 bytes) */ @@ -142,14 +142,14 @@ BOOL rdp_read_share_data_header(STREAM* s, UINT16* length, BYTE* type, uint32* s return TRUE; } -void rdp_write_share_data_header(STREAM* s, UINT16 length, BYTE type, uint32 share_id) +void rdp_write_share_data_header(STREAM* s, UINT16 length, BYTE type, UINT32 share_id) { length -= RDP_PACKET_HEADER_MAX_LENGTH; length -= RDP_SHARE_CONTROL_HEADER_LENGTH; length -= RDP_SHARE_DATA_HEADER_LENGTH; /* Share Data Header */ - stream_write_uint32(s, share_id); /* shareId (4 bytes) */ + stream_write_UINT32(s, share_id); /* shareId (4 bytes) */ stream_write_BYTE(s, 0); /* pad1 (1 byte) */ stream_write_BYTE(s, STREAM_LOW); /* streamId (1 byte) */ stream_write_UINT16(s, length); /* uncompressedLength (2 bytes) */ @@ -300,11 +300,11 @@ void rdp_write_header(rdpRdp* rdp, STREAM* s, UINT16 length, UINT16 channel_id) stream_write_UINT16_be(s, length); /* userData (OCTET_STRING) */ } -static uint32 rdp_security_stream_out(rdpRdp* rdp, STREAM* s, int length) +static UINT32 rdp_security_stream_out(rdpRdp* rdp, STREAM* s, int length) { BYTE* data; - uint32 sec_flags; - uint32 pad = 0; + UINT32 sec_flags; + UINT32 pad = 0; sec_flags = rdp->sec_flags; @@ -355,9 +355,9 @@ static uint32 rdp_security_stream_out(rdpRdp* rdp, STREAM* s, int length) return pad; } -static uint32 rdp_get_sec_bytes(rdpRdp* rdp) +static UINT32 rdp_get_sec_bytes(rdpRdp* rdp) { - uint32 sec_bytes; + UINT32 sec_bytes; if (rdp->sec_flags & SEC_ENCRYPT) { @@ -388,7 +388,7 @@ static uint32 rdp_get_sec_bytes(rdpRdp* rdp) BOOL rdp_send(rdpRdp* rdp, STREAM* s, UINT16 channel_id) { UINT16 length; - uint32 sec_bytes; + UINT32 sec_bytes; BYTE* sec_hold; length = stream_get_length(s); @@ -413,7 +413,7 @@ BOOL rdp_send(rdpRdp* rdp, STREAM* s, UINT16 channel_id) BOOL rdp_send_pdu(rdpRdp* rdp, STREAM* s, UINT16 type, UINT16 channel_id) { UINT16 length; - uint32 sec_bytes; + UINT32 sec_bytes; BYTE* sec_hold; length = stream_get_length(s); @@ -440,7 +440,7 @@ BOOL rdp_send_pdu(rdpRdp* rdp, STREAM* s, UINT16 type, UINT16 channel_id) BOOL rdp_send_data_pdu(rdpRdp* rdp, STREAM* s, BYTE type, UINT16 channel_id) { UINT16 length; - uint32 sec_bytes; + UINT32 sec_bytes; BYTE* sec_hold; length = stream_get_length(s); @@ -467,7 +467,7 @@ BOOL rdp_send_data_pdu(rdpRdp* rdp, STREAM* s, BYTE type, UINT16 channel_id) void rdp_recv_set_error_info_data_pdu(rdpRdp* rdp, STREAM* s) { - stream_read_uint32(s, rdp->errorInfo); /* errorInfo (4 bytes) */ + stream_read_UINT32(s, rdp->errorInfo); /* errorInfo (4 bytes) */ if (rdp->errorInfo != ERRINFO_SUCCESS) rdp_print_errinfo(rdp->errorInfo); @@ -477,11 +477,11 @@ BOOL rdp_recv_data_pdu(rdpRdp* rdp, STREAM* s) { BYTE type; UINT16 length; - uint32 share_id; + UINT32 share_id; BYTE compressed_type; UINT16 compressed_len; - uint32 roff; - uint32 rlen; + UINT32 roff; + UINT32 rlen; STREAM* comp_stream; rdp_read_share_data_header(s, &length, &type, &share_id, &compressed_type, &compressed_len); diff --git a/libfreerdp/core/rdp.h b/libfreerdp/core/rdp.h index 35a73fab9..dc1a3a79d 100644 --- a/libfreerdp/core/rdp.h +++ b/libfreerdp/core/rdp.h @@ -140,7 +140,7 @@ struct rdp_rdp struct crypto_des3_struct* fips_encrypt; struct crypto_des3_struct* fips_decrypt; struct crypto_hmac_struct* fips_hmac; - uint32 sec_flags; + UINT32 sec_flags; BOOL do_crypt; BOOL do_secure_checksum; BYTE sign_key[16]; @@ -152,8 +152,8 @@ struct rdp_rdp BYTE fips_sign_key[20]; BYTE fips_encrypt_key[24]; BYTE fips_decrypt_key[24]; - uint32 errorInfo; - uint32 finalize_sc_pdus; + UINT32 errorInfo; + UINT32 finalize_sc_pdus; BOOL disconnect; }; @@ -163,10 +163,10 @@ void rdp_write_security_header(STREAM* s, UINT16 flags); BOOL rdp_read_share_control_header(STREAM* s, UINT16* length, UINT16* type, UINT16* channel_id); void rdp_write_share_control_header(STREAM* s, UINT16 length, UINT16 type, UINT16 channel_id); -BOOL rdp_read_share_data_header(STREAM* s, UINT16* length, BYTE* type, uint32* share_id, +BOOL rdp_read_share_data_header(STREAM* s, UINT16* length, BYTE* type, UINT32* share_id, BYTE *compressed_type, UINT16 *compressed_len); -void rdp_write_share_data_header(STREAM* s, UINT16 length, BYTE type, uint32 share_id); +void rdp_write_share_data_header(STREAM* s, UINT16 length, BYTE type, UINT32 share_id); STREAM* rdp_send_stream_init(rdpRdp* rdp); diff --git a/libfreerdp/core/redirection.c b/libfreerdp/core/redirection.c index 64699d82c..46f982a25 100644 --- a/libfreerdp/core/redirection.c +++ b/libfreerdp/core/redirection.c @@ -25,7 +25,7 @@ #include "redirection.h" -void rdp_print_redirection_flags(uint32 flags) +void rdp_print_redirection_flags(UINT32 flags) { printf("redirectionFlags = {\n"); @@ -67,8 +67,8 @@ BOOL rdp_recv_server_redirection_pdu(rdpRdp* rdp, STREAM* s) stream_read_UINT16(s, flags); /* flags (2 bytes) */ stream_read_UINT16(s, length); /* length (2 bytes) */ - stream_read_uint32(s, redirection->sessionID); /* sessionID (4 bytes) */ - stream_read_uint32(s, redirection->flags); /* redirFlags (4 bytes) */ + stream_read_UINT32(s, redirection->sessionID); /* sessionID (4 bytes) */ + stream_read_UINT32(s, redirection->flags); /* redirFlags (4 bytes) */ DEBUG_REDIR("flags: 0x%04X, length:%d, sessionID:0x%08X", flags, length, redirection->sessionID); @@ -84,7 +84,7 @@ BOOL rdp_recv_server_redirection_pdu(rdpRdp* rdp, STREAM* s) if (redirection->flags & LB_LOAD_BALANCE_INFO) { - stream_read_uint32(s, redirection->LoadBalanceInfoLength); + stream_read_UINT32(s, redirection->LoadBalanceInfoLength); redirection->LoadBalanceInfo = (BYTE*) malloc(redirection->LoadBalanceInfoLength); stream_read(s, redirection->LoadBalanceInfo, redirection->LoadBalanceInfoLength); #ifdef WITH_DEBUG_REDIR @@ -108,7 +108,7 @@ BOOL rdp_recv_server_redirection_pdu(rdpRdp* rdp, STREAM* s) if (redirection->flags & LB_PASSWORD) { /* Note: length (hopefully) includes double zero termination */ - stream_read_uint32(s, redirection->PasswordCookieLength); + stream_read_UINT32(s, redirection->PasswordCookieLength); redirection->PasswordCookie = (BYTE*) malloc(redirection->PasswordCookieLength); stream_read(s, redirection->PasswordCookie, redirection->PasswordCookieLength); @@ -139,12 +139,12 @@ BOOL rdp_recv_server_redirection_pdu(rdpRdp* rdp, STREAM* s) if (redirection->flags & LB_TARGET_NET_ADDRESSES) { int i; - uint32 count; - uint32 targetNetAddressesLength; + UINT32 count; + UINT32 targetNetAddressesLength; - stream_read_uint32(s, targetNetAddressesLength); + stream_read_UINT32(s, targetNetAddressesLength); - stream_read_uint32(s, redirection->targetNetAddressesCount); + stream_read_UINT32(s, redirection->targetNetAddressesCount); count = redirection->targetNetAddressesCount; redirection->targetNetAddresses = (rdpString*) xzalloc(count * sizeof(rdpString)); diff --git a/libfreerdp/core/redirection.h b/libfreerdp/core/redirection.h index d57b6980d..cf9e91df3 100644 --- a/libfreerdp/core/redirection.h +++ b/libfreerdp/core/redirection.h @@ -44,8 +44,8 @@ struct rdp_redirection { - uint32 flags; - uint32 sessionID; + UINT32 flags; + UINT32 sessionID; rdpString tsvUrl; rdpString username; rdpString domain; @@ -56,7 +56,7 @@ struct rdp_redirection DWORD LoadBalanceInfoLength; rdpString targetNetBiosName; rdpString targetNetAddress; - uint32 targetNetAddressesCount; + UINT32 targetNetAddressesCount; rdpString* targetNetAddresses; }; typedef struct rdp_redirection rdpRedirection; diff --git a/libfreerdp/core/rpc.c b/libfreerdp/core/rpc.c index 07e5427c0..98709f725 100644 --- a/libfreerdp/core/rpc.c +++ b/libfreerdp/core/rpc.c @@ -321,7 +321,7 @@ void rpc_pdu_header_read(STREAM* s, RPC_PDU_HEADER* header) stream_read_BYTE(s, header->packed_drep[3]); /* packet_drep[3] (1 byte) */ stream_read_UINT16(s, header->frag_length); /* frag_length (2 bytes) */ stream_read_UINT16(s, header->auth_length); /* auth_length (2 bytes) */ - stream_read_uint32(s, header->call_id); /* call_id (4 bytes) */ + stream_read_UINT32(s, header->call_id); /* call_id (4 bytes) */ } int rpc_out_write(rdpRpc* rpc, BYTE* data, int length) @@ -781,7 +781,7 @@ int rpc_read(rdpRpc* rpc, BYTE* data, int length) UINT16 frag_length; UINT16 auth_length; BYTE auth_pad_length; - uint32 call_id = -1; + UINT32 call_id = -1; int rpc_length = length + 0xFF; BYTE* rpc_data = malloc(rpc_length); @@ -793,7 +793,7 @@ int rpc_read(rdpRpc* rpc, BYTE* data, int length) if (rpc->read_buffer_len > 0) { - if (rpc->read_buffer_len > (uint32) length) + if (rpc->read_buffer_len > (UINT32) length) { printf("rpc_read error: receiving buffer is not large enough\n"); free(rpc_data); @@ -827,8 +827,8 @@ int rpc_read(rdpRpc* rpc, BYTE* data, int length) frag_length = *(UINT16*)(rpc_data + 8); auth_length = *(UINT16*)(rpc_data + 10); - call_id = *(uint32*)(rpc_data + 12); - status = *(uint32*)(rpc_data + 16); /* alloc_hint */ + call_id = *(UINT32*)(rpc_data + 12); + status = *(UINT32*)(rpc_data + 16); /* alloc_hint */ auth_pad_length = *(rpc_data + frag_length - auth_length - 6); /* -6 = -8 + 2 (sec_trailer + 2) */ /* data_length must be calculated because alloc_hint carries size of more than one pdu */ diff --git a/libfreerdp/core/rpc.h b/libfreerdp/core/rpc.h index 0f9926f95..619ac8119 100644 --- a/libfreerdp/core/rpc.h +++ b/libfreerdp/core/rpc.h @@ -51,7 +51,7 @@ struct _rpc_pdu_header BYTE packed_drep[4]; UINT16 frag_length; UINT16 auth_length; - uint32 call_id; + UINT32 call_id; }; typedef struct _rpc_pdu_header RPC_PDU_HEADER; @@ -59,7 +59,7 @@ typedef UINT16 p_context_id_t; typedef struct { uuid if_uuid; - uint32 if_version; + UINT32 if_version; } p_syntax_id_t; typedef struct { @@ -139,7 +139,7 @@ typedef struct { BYTE rpc_vers_minor; BYTE reserved[2];/* must be zero */ BYTE packed_drep[4]; - uint32 reject_status; + UINT32 reject_status; BYTE reserved2[4]; } rpcrt_optional_data_t; @@ -161,7 +161,7 @@ typedef struct{ BYTE auth_level; /* :01 which level within service */ BYTE auth_pad_length; /* :01 */ BYTE auth_reserved; /* :01 reserved, m.b.z. */ - uint32 auth_context_id; /* :04 */ + UINT32 auth_context_id; /* :04 */ BYTE* auth_value; /* credentials; size_is(auth_length) */ } auth_verifier_co_t; @@ -178,13 +178,13 @@ typedef struct { BYTE packed_drep[4]; /* 04:04 NDR data rep format label*/ UINT16 frag_length; /* 08:02 total length of fragment */ UINT16 auth_length; /* 10:02 length of auth_value */ - uint32 call_id; /* 12:04 call identifier */ + UINT32 call_id; /* 12:04 call identifier */ /* end common fields */ UINT16 max_xmit_frag; /* ignored */ UINT16 max_recv_frag; /* ignored */ - uint32 assoc_group_id; /* ignored */ + UINT32 assoc_group_id; /* ignored */ /* presentation context list */ @@ -209,13 +209,13 @@ typedef struct { BYTE packed_drep[4]; /* 04:04 NDR data rep format label*/ UINT16 frag_length; /* 08:02 total length of fragment */ UINT16 auth_length; /* 10:02 length of auth_value */ - uint32 call_id; /* 12:04 call identifier */ + UINT32 call_id; /* 12:04 call identifier */ /* end common fields */ UINT16 max_xmit_frag; /* ignored */ UINT16 max_recv_frag; /* ignored */ - uint32 assoc_group_id; /* ignored */ + UINT32 assoc_group_id; /* ignored */ port_any_t sec_addr; /* ignored */ /* restore 4-octet alignment */ @@ -244,13 +244,13 @@ typedef struct { BYTE packed_drep[4]; /* 04:04 NDR data rep format label*/ UINT16 frag_length; /* 08:02 total length of fragment */ UINT16 auth_length; /* 10:02 length of auth_value */ - uint32 call_id; /* 12:04 call identifier */ + UINT32 call_id; /* 12:04 call identifier */ /* end common fields */ UINT16 max_xmit_frag; /* 16:02 max transmit frag size, bytes */ UINT16 max_recv_frag; /* 18:02 max receive frag size, bytes */ - uint32 assoc_group_id; /* 20:04 incarnation of client-server + UINT32 assoc_group_id; /* 20:04 incarnation of client-server * assoc group */ /* presentation context list */ @@ -273,13 +273,13 @@ typedef struct { BYTE packed_drep[4]; /* 04:04 NDR data rep format label*/ UINT16 frag_length; /* 08:02 total length of fragment */ UINT16 auth_length; /* 10:02 length of auth_value */ - uint32 call_id; /* 12:04 call identifier */ + UINT32 call_id; /* 12:04 call identifier */ /* end common fields */ UINT16 max_xmit_frag; /* 16:02 max transmit frag size */ UINT16 max_recv_frag; /* 18:02 max receive frag size */ - uint32 assoc_group_id; /* 20:04 returned assoc_group_id */ + UINT32 assoc_group_id; /* 20:04 returned assoc_group_id */ port_any_t sec_addr; /* 24:yy optional secondary address * for process incarnation; local port * part of address only */ @@ -308,7 +308,7 @@ typedef struct { BYTE packed_drep[4]; /* 04:04 NDR data rep format label*/ UINT16 frag_length; /* 08:02 total length of fragment */ UINT16 auth_length; /* 10:02 length of auth_value */ - uint32 call_id; /* 12:04 call identifier */ + UINT32 call_id; /* 12:04 call identifier */ /* end common fields */ @@ -332,7 +332,7 @@ typedef struct { BYTE packed_drep[4]; /* 04:04 NDR data rep format label*/ UINT16 frag_length; /* 08:02 total length of fragment */ UINT16 auth_length; /* 10:02 length of auth_value */ - uint32 call_id; /* 12:04 call identifier */ + UINT32 call_id; /* 12:04 call identifier */ /* end common fields */ @@ -355,7 +355,7 @@ typedef struct { BYTE packed_drep[4]; /* 04:04 NDR data rep format label*/ UINT16 frag_length; /* 08:02 total length of fragment */ UINT16 auth_length; /* 10:02 length of auth_value */ - uint32 call_id; /* 12:04 call identifier */ + UINT32 call_id; /* 12:04 call identifier */ /* end common fields */ @@ -377,13 +377,13 @@ typedef struct { BYTE packed_drep[4]; /* 04:04 NDR data rep format label*/ UINT16 frag_length; /* 08:02 total length of fragment */ UINT16 auth_length; /* 10:02 length of auth_value */ - uint32 call_id; /* 12:04 call identifier */ + UINT32 call_id; /* 12:04 call identifier */ /* end common fields */ /* needed for request, response, fault */ - uint32 alloc_hint; /* 16:04 allocation hint */ + UINT32 alloc_hint; /* 16:04 allocation hint */ p_context_id_t p_cont_id; /* 20:02 pres context, i.e. data rep */ /* needed for response or fault */ @@ -393,7 +393,7 @@ typedef struct { /* fault code */ - uint32 status; /* 24:04 run-time fault code or zero */ + UINT32 status; /* 24:04 run-time fault code or zero */ /* always pad to next 8-octet boundary */ @@ -423,7 +423,7 @@ typedef struct { BYTE packed_drep[4]; /* 04:04 NDR data rep format label*/ UINT16 frag_length; /* 08:02 total length of fragment */ UINT16 auth_length; /* 10:02 length of auth_value */ - uint32 call_id; /* 12:04 call identifier */ + UINT32 call_id; /* 12:04 call identifier */ /* end common fields */ @@ -445,13 +445,13 @@ typedef struct { BYTE packed_drep[4]; /* 04:04 NDR data rep format label*/ UINT16 frag_length; /* 08:02 total length of fragment */ UINT16 auth_length; /* 10:02 length of auth_value */ - uint32 call_id; /* 12:04 call identifier */ + UINT32 call_id; /* 12:04 call identifier */ /* end common fields */ /* needed on request, response, fault */ - uint32 alloc_hint; /* 16:04 allocation hint */ + UINT32 alloc_hint; /* 16:04 allocation hint */ p_context_id_t p_cont_id; /* 20:02 pres context, i.e. data rep */ UINT16 opnum; /* 22:02 operation # * within the interface */ @@ -484,13 +484,13 @@ typedef struct { BYTE packed_drep[4]; /* 04:04 NDR data rep format label*/ UINT16 frag_length; /* 08:02 total length of fragment */ UINT16 auth_length; /* 10:02 length of auth_value */ - uint32 call_id; /* 12:04 call identifier */ + UINT32 call_id; /* 12:04 call identifier */ /* end common fields */ /* needed for request, response, fault */ - uint32 alloc_hint; /* 16:04 allocation hint */ + UINT32 alloc_hint; /* 16:04 allocation hint */ p_context_id_t p_cont_id; /* 20:02 pres context, i.e. * data rep */ @@ -523,7 +523,7 @@ typedef struct { BYTE packed_drep[4]; /* 04:04 NDR data rep format label*/ UINT16 frag_length; /* 08:02 total length of fragment */ UINT16 auth_length; /* 10:02 */ - uint32 call_id; /* 12:04 call identifier */ + UINT32 call_id; /* 12:04 call identifier */ /* end common fields */ } rpcconn_shutdown_hdr_t; @@ -568,9 +568,9 @@ struct rdp_ntlm_http struct rpc_ping_originator { - uint32 ConnectionTimeout; - uint32 LastPacketSentTimestamp; - uint32 KeepAliveInterval; + UINT32 ConnectionTimeout; + UINT32 LastPacketSentTimestamp; + UINT32 KeepAliveInterval; }; typedef struct rpc_ping_originator RpcPingOriginator; @@ -580,11 +580,11 @@ struct rpc_in_channel { /* Sending Channel */ - uint32 PlugState; + UINT32 PlugState; void* SendQueue; - uint32 BytesSent; - uint32 SenderAvailableWindow; - uint32 PeerReceiveWindow; + UINT32 BytesSent; + UINT32 SenderAvailableWindow; + UINT32 PeerReceiveWindow; /* Ping Originator */ @@ -598,11 +598,11 @@ struct rpc_out_channel { /* Receiving Channel */ - uint32 ReceiveWindow; - uint32 ReceiveWindowSize; - uint32 ReceiverAvailableWindow; - uint32 BytesReceived; - uint32 AvailableWindowAdvertised; + UINT32 ReceiveWindow; + UINT32 ReceiveWindowSize; + UINT32 ReceiverAvailableWindow; + UINT32 BytesReceived; + UINT32 AvailableWindowAdvertised; }; typedef struct rpc_out_channel RpcOutChannel; @@ -650,14 +650,14 @@ struct rdp_rpc rdpTransport* transport; BYTE* write_buffer; - uint32 write_buffer_len; + UINT32 write_buffer_len; BYTE* read_buffer; - uint32 read_buffer_len; + UINT32 read_buffer_len; - uint32 call_id; - uint32 pipe_call_id; + UINT32 call_id; + UINT32 pipe_call_id; - uint32 ReceiveWindow; + UINT32 ReceiveWindow; RpcVirtualConnection* VirtualConnection; }; diff --git a/libfreerdp/core/rts.c b/libfreerdp/core/rts.c index d3e2af35c..04d99bc70 100644 --- a/libfreerdp/core/rts.c +++ b/libfreerdp/core/rts.c @@ -134,7 +134,7 @@ void rts_pdu_header_read(STREAM* s, RTS_PDU_HEADER* header) stream_read_BYTE(s, header->packed_drep[3]); /* packet_drep[3] (1 byte) */ stream_read_UINT16(s, header->frag_length); /* frag_length (2 bytes) */ stream_read_UINT16(s, header->auth_length); /* auth_length (2 bytes) */ - stream_read_uint32(s, header->call_id); /* call_id (4 bytes) */ + stream_read_UINT32(s, header->call_id); /* call_id (4 bytes) */ stream_read_UINT16(s, header->flags); /* flags (2 bytes) */ stream_read_UINT16(s, header->numberOfCommands); /* numberOfCommands (2 bytes) */ } @@ -151,49 +151,49 @@ void rts_pdu_header_write(STREAM* s, RTS_PDU_HEADER* header) stream_write_BYTE(s, header->packed_drep[3]); /* packet_drep[3] (1 byte) */ stream_write_UINT16(s, header->frag_length); /* frag_length (2 bytes) */ stream_write_UINT16(s, header->auth_length); /* auth_length (2 bytes) */ - stream_write_uint32(s, header->call_id); /* call_id (4 bytes) */ + stream_write_UINT32(s, header->call_id); /* call_id (4 bytes) */ stream_write_UINT16(s, header->flags); /* flags (2 bytes) */ stream_write_UINT16(s, header->numberOfCommands); /* numberOfCommands (2 bytes) */ } void rts_receive_window_size_command_read(rdpRpc* rpc, STREAM* s) { - stream_seek_uint32(s); /* ReceiveWindowSize (4 bytes) */ + stream_seek_UINT32(s); /* ReceiveWindowSize (4 bytes) */ } -void rts_receive_window_size_command_write(STREAM* s, uint32 ReceiveWindowSize) +void rts_receive_window_size_command_write(STREAM* s, UINT32 ReceiveWindowSize) { - stream_write_uint32(s, RTS_CMD_RECEIVE_WINDOW_SIZE); /* CommandType (4 bytes) */ - stream_write_uint32(s, ReceiveWindowSize); /* ReceiveWindowSize (4 bytes) */ + stream_write_UINT32(s, RTS_CMD_RECEIVE_WINDOW_SIZE); /* CommandType (4 bytes) */ + stream_write_UINT32(s, ReceiveWindowSize); /* ReceiveWindowSize (4 bytes) */ } void rts_flow_control_ack_command_read(rdpRpc* rpc, STREAM* s) { /* Ack (24 bytes) */ - stream_seek_uint32(s); /* BytesReceived (4 bytes) */ - stream_seek_uint32(s); /* AvailableWindow (4 bytes) */ + stream_seek_UINT32(s); /* BytesReceived (4 bytes) */ + stream_seek_UINT32(s); /* AvailableWindow (4 bytes) */ stream_seek(s, 16); /* ChannelCookie (16 bytes) */ } -void rts_flow_control_ack_command_write(STREAM* s, uint32 BytesReceived, uint32 AvailableWindow, BYTE* ChannelCookie) +void rts_flow_control_ack_command_write(STREAM* s, UINT32 BytesReceived, UINT32 AvailableWindow, BYTE* ChannelCookie) { - stream_write_uint32(s, RTS_CMD_FLOW_CONTROL_ACK); /* CommandType (4 bytes) */ + stream_write_UINT32(s, RTS_CMD_FLOW_CONTROL_ACK); /* CommandType (4 bytes) */ /* Ack (24 bytes) */ - stream_write_uint32(s, BytesReceived); /* BytesReceived (4 bytes) */ - stream_write_uint32(s, AvailableWindow); /* AvailableWindow (4 bytes) */ + stream_write_UINT32(s, BytesReceived); /* BytesReceived (4 bytes) */ + stream_write_UINT32(s, AvailableWindow); /* AvailableWindow (4 bytes) */ stream_write(s, ChannelCookie, 16); /* ChannelCookie (16 bytes) */ } void rts_connection_timeout_command_read(rdpRpc* rpc, STREAM* s) { - stream_seek_uint32(s); /* ConnectionTimeout (4 bytes) */ + stream_seek_UINT32(s); /* ConnectionTimeout (4 bytes) */ } -void rts_connection_timeout_command_write(STREAM* s, uint32 ConnectionTimeout) +void rts_connection_timeout_command_write(STREAM* s, UINT32 ConnectionTimeout) { - stream_write_uint32(s, RTS_CMD_CONNECTION_TIMEOUT); /* CommandType (4 bytes) */ - stream_write_uint32(s, ConnectionTimeout); /* ConnectionTimeout (4 bytes) */ + stream_write_UINT32(s, RTS_CMD_CONNECTION_TIMEOUT); /* CommandType (4 bytes) */ + stream_write_UINT32(s, ConnectionTimeout); /* ConnectionTimeout (4 bytes) */ } void rts_cookie_command_read(rdpRpc* rpc, STREAM* s) @@ -203,41 +203,41 @@ void rts_cookie_command_read(rdpRpc* rpc, STREAM* s) void rts_cookie_command_write(STREAM* s, BYTE* Cookie) { - stream_write_uint32(s, RTS_CMD_COOKIE); /* CommandType (4 bytes) */ + stream_write_UINT32(s, RTS_CMD_COOKIE); /* CommandType (4 bytes) */ stream_write(s, Cookie, 16); /* Cookie (16 bytes) */ } void rts_channel_lifetime_command_read(rdpRpc* rpc, STREAM* s) { - stream_seek_uint32(s); /* ChannelLifetime (4 bytes) */ + stream_seek_UINT32(s); /* ChannelLifetime (4 bytes) */ } -void rts_channel_lifetime_command_write(STREAM* s, uint32 ChannelLifetime) +void rts_channel_lifetime_command_write(STREAM* s, UINT32 ChannelLifetime) { - stream_write_uint32(s, RTS_CMD_CHANNEL_LIFETIME); /* CommandType (4 bytes) */ - stream_write_uint32(s, ChannelLifetime); /* ChannelLifetime (4 bytes) */ + stream_write_UINT32(s, RTS_CMD_CHANNEL_LIFETIME); /* CommandType (4 bytes) */ + stream_write_UINT32(s, ChannelLifetime); /* ChannelLifetime (4 bytes) */ } void rts_client_keepalive_command_read(rdpRpc* rpc, STREAM* s) { - stream_seek_uint32(s); /* ClientKeepalive (4 bytes) */ + stream_seek_UINT32(s); /* ClientKeepalive (4 bytes) */ } -void rts_client_keepalive_command_write(STREAM* s, uint32 ClientKeepalive) +void rts_client_keepalive_command_write(STREAM* s, UINT32 ClientKeepalive) { - stream_write_uint32(s, RTS_CMD_CLIENT_KEEPALIVE); /* CommandType (4 bytes) */ - stream_write_uint32(s, ClientKeepalive); /* ClientKeepalive (4 bytes) */ + stream_write_UINT32(s, RTS_CMD_CLIENT_KEEPALIVE); /* CommandType (4 bytes) */ + stream_write_UINT32(s, ClientKeepalive); /* ClientKeepalive (4 bytes) */ } void rts_version_command_read(rdpRpc* rpc, STREAM* s) { - stream_seek_uint32(s); /* Version (4 bytes) */ + stream_seek_UINT32(s); /* Version (4 bytes) */ } void rts_version_command_write(STREAM* s) { - stream_write_uint32(s, RTS_CMD_VERSION); /* CommandType (4 bytes) */ - stream_write_uint32(s, 1); /* Version (4 bytes) */ + stream_write_UINT32(s, RTS_CMD_VERSION); /* CommandType (4 bytes) */ + stream_write_UINT32(s, 1); /* Version (4 bytes) */ } void rts_empty_command_read(rdpRpc* rpc, STREAM* s) @@ -247,20 +247,20 @@ void rts_empty_command_read(rdpRpc* rpc, STREAM* s) void rts_empty_command_write(STREAM* s) { - stream_write_uint32(s, RTS_CMD_EMPTY); /* CommandType (4 bytes) */ + stream_write_UINT32(s, RTS_CMD_EMPTY); /* CommandType (4 bytes) */ } void rts_padding_command_read(rdpRpc* rpc, STREAM* s) { - uint32 ConformanceCount; + UINT32 ConformanceCount; - stream_read_uint32(s, ConformanceCount); /* ConformanceCount (4 bytes) */ + stream_read_UINT32(s, ConformanceCount); /* ConformanceCount (4 bytes) */ stream_seek(s, ConformanceCount); /* Padding (variable) */ } -void rts_padding_command_write(STREAM* s, uint32 ConformanceCount) +void rts_padding_command_write(STREAM* s, UINT32 ConformanceCount) { - stream_write_uint32(s, ConformanceCount); /* ConformanceCount (4 bytes) */ + stream_write_UINT32(s, ConformanceCount); /* ConformanceCount (4 bytes) */ stream_write_zero(s, ConformanceCount); /* Padding (variable) */ } @@ -271,7 +271,7 @@ void rts_negative_ance_command_read(rdpRpc* rpc, STREAM* s) void rts_negative_ance_command_write(STREAM* s) { - stream_write_uint32(s, RTS_CMD_NEGATIVE_ANCE); /* CommandType (4 bytes) */ + stream_write_UINT32(s, RTS_CMD_NEGATIVE_ANCE); /* CommandType (4 bytes) */ } void rts_ance_command_read(rdpRpc* rpc, STREAM* s) @@ -281,14 +281,14 @@ void rts_ance_command_read(rdpRpc* rpc, STREAM* s) void rts_ance_command_write(STREAM* s) { - stream_write_uint32(s, RTS_CMD_ANCE); /* CommandType (4 bytes) */ + stream_write_UINT32(s, RTS_CMD_ANCE); /* CommandType (4 bytes) */ } void rts_client_address_command_read(rdpRpc* rpc, STREAM* s) { - uint32 AddressType; + UINT32 AddressType; - stream_read_uint32(s, AddressType); /* AddressType (4 bytes) */ + stream_read_UINT32(s, AddressType); /* AddressType (4 bytes) */ if (AddressType == 0) { @@ -302,10 +302,10 @@ void rts_client_address_command_read(rdpRpc* rpc, STREAM* s) stream_seek(s, 12); /* padding (12 bytes) */ } -void rts_client_address_command_write(STREAM* s, uint32 AddressType, BYTE* ClientAddress) +void rts_client_address_command_write(STREAM* s, UINT32 AddressType, BYTE* ClientAddress) { - stream_write_uint32(s, RTS_CMD_CLIENT_ADDRESS); /* CommandType (4 bytes) */ - stream_write_uint32(s, AddressType); /* AddressType (4 bytes) */ + stream_write_UINT32(s, RTS_CMD_CLIENT_ADDRESS); /* CommandType (4 bytes) */ + stream_write_UINT32(s, AddressType); /* AddressType (4 bytes) */ if (AddressType == 0) { @@ -326,30 +326,30 @@ void rts_association_group_id_command_read(rdpRpc* rpc, STREAM* s) void rts_association_group_id_command_write(STREAM* s, BYTE* associationGroupId) { - stream_write_uint32(s, RTS_CMD_ASSOCIATION_GROUP_ID); /* CommandType (4 bytes) */ + stream_write_UINT32(s, RTS_CMD_ASSOCIATION_GROUP_ID); /* CommandType (4 bytes) */ stream_write(s, associationGroupId, 16); /* AssociationGroupId (16 bytes) */ } void rts_destination_command_read(rdpRpc* rpc, STREAM* s) { - stream_seek_uint32(s); /* Destination (4 bytes) */ + stream_seek_UINT32(s); /* Destination (4 bytes) */ } -void rts_destination_command_write(STREAM* s, uint32 Destination) +void rts_destination_command_write(STREAM* s, UINT32 Destination) { - stream_write_uint32(s, RTS_CMD_DESTINATION); /* CommandType (4 bytes) */ - stream_write_uint32(s, Destination); /* Destination (4 bytes) */ + stream_write_UINT32(s, RTS_CMD_DESTINATION); /* CommandType (4 bytes) */ + stream_write_UINT32(s, Destination); /* Destination (4 bytes) */ } void rts_ping_traffic_sent_notify_command_read(rdpRpc* rpc, STREAM* s) { - stream_seek_uint32(s); /* PingTrafficSent (4 bytes) */ + stream_seek_UINT32(s); /* PingTrafficSent (4 bytes) */ } -void rts_ping_traffic_sent_notify_command_write(STREAM* s, uint32 PingTrafficSent) +void rts_ping_traffic_sent_notify_command_write(STREAM* s, UINT32 PingTrafficSent) { - stream_write_uint32(s, RTS_CMD_PING_TRAFFIC_SENT_NOTIFY); /* CommandType (4 bytes) */ - stream_write_uint32(s, PingTrafficSent); /* PingTrafficSent (4 bytes) */ + stream_write_UINT32(s, RTS_CMD_PING_TRAFFIC_SENT_NOTIFY); /* CommandType (4 bytes) */ + stream_write_UINT32(s, PingTrafficSent); /* PingTrafficSent (4 bytes) */ } void rpc_generate_cookie(BYTE* cookie) @@ -361,7 +361,7 @@ BOOL rts_send_CONN_A1_pdu(rdpRpc* rpc) { STREAM* s; RTS_PDU_HEADER header; - uint32 ReceiveWindowSize; + UINT32 ReceiveWindowSize; BYTE* OUTChannelCookie; BYTE* VirtualConnectionCookie; @@ -490,8 +490,8 @@ BOOL rts_send_flow_control_ack_pdu(rdpRpc* rpc) { STREAM* s; RTS_PDU_HEADER header; - uint32 BytesReceived; - uint32 AvailableWindow; + UINT32 BytesReceived; + UINT32 AvailableWindow; BYTE* ChannelCookie; header.rpc_vers = 5; @@ -566,7 +566,7 @@ int rts_recv_pdu_commands(rdpRpc* rpc, RTS_PDU* rts_pdu) { int i; STREAM* s; - uint32 CommandType; + UINT32 CommandType; DEBUG_RTS("numberOfCommands:%d", rts_pdu->header.numberOfCommands); @@ -581,7 +581,7 @@ int rts_recv_pdu_commands(rdpRpc* rpc, RTS_PDU* rts_pdu) for (i = 0; i < rts_pdu->header.numberOfCommands; i++) { - stream_read_uint32(s, CommandType); /* CommandType (4 bytes) */ + stream_read_UINT32(s, CommandType); /* CommandType (4 bytes) */ DEBUG_RTS("CommandType: %s (0x%08X)", RTS_CMD_STRINGS[CommandType % 14], CommandType); diff --git a/libfreerdp/core/rts.h b/libfreerdp/core/rts.h index 8b2df4880..7cab90011 100644 --- a/libfreerdp/core/rts.h +++ b/libfreerdp/core/rts.h @@ -100,7 +100,7 @@ struct _rts_pdu_header BYTE packed_drep[4]; UINT16 frag_length; UINT16 auth_length; - uint32 call_id; + UINT32 call_id; UINT16 flags; UINT16 numberOfCommands; }; @@ -119,35 +119,35 @@ void rts_pdu_header_read(STREAM* s, RTS_PDU_HEADER* header); void rts_pdu_header_write(STREAM* s, RTS_PDU_HEADER* header); void rts_receive_window_size_command_read(rdpRpc* rpc, STREAM* s); -void rts_receive_window_size_command_write(STREAM* s, uint32 ReceiveWindowSize); +void rts_receive_window_size_command_write(STREAM* s, UINT32 ReceiveWindowSize); void rts_flow_control_ack_command_read(rdpRpc* rpc, STREAM* s); -void rts_flow_control_ack_command_write(STREAM* s, uint32 BytesReceived, uint32 AvailableWindow, BYTE* ChannelCookie); +void rts_flow_control_ack_command_write(STREAM* s, UINT32 BytesReceived, UINT32 AvailableWindow, BYTE* ChannelCookie); void rts_connection_timeout_command_read(rdpRpc* rpc, STREAM* s); -void rts_connection_timeout_command_write(STREAM* s, uint32 ConnectionTimeout); +void rts_connection_timeout_command_write(STREAM* s, UINT32 ConnectionTimeout); void rts_cookie_command_read(rdpRpc* rpc, STREAM* s); void rts_cookie_command_write(STREAM* s, BYTE* Cookie); void rts_channel_lifetime_command_read(rdpRpc* rpc, STREAM* s); -void rts_channel_lifetime_command_write(STREAM* s, uint32 ChannelLifetime); +void rts_channel_lifetime_command_write(STREAM* s, UINT32 ChannelLifetime); void rts_client_keepalive_command_read(rdpRpc* rpc, STREAM* s); -void rts_client_keepalive_command_write(STREAM* s, uint32 ClientKeepalive); +void rts_client_keepalive_command_write(STREAM* s, UINT32 ClientKeepalive); void rts_version_command_read(rdpRpc* rpc, STREAM* s); void rts_version_command_write(STREAM* s); void rts_empty_command_read(rdpRpc* rpc, STREAM* s); void rts_empty_command_write(STREAM* s); void rts_padding_command_read(rdpRpc* rpc, STREAM* s); -void rts_padding_command_write(STREAM* s, uint32 ConformanceCount); +void rts_padding_command_write(STREAM* s, UINT32 ConformanceCount); void rts_negative_ance_command_read(rdpRpc* rpc, STREAM* s); void rts_negative_ance_command_write(STREAM* s); void rts_ance_command_read(rdpRpc* rpc, STREAM* s); void rts_ance_command_write(STREAM* s); void rts_client_address_command_read(rdpRpc* rpc, STREAM* s); -void rts_client_address_command_write(STREAM* s, uint32 AddressType, BYTE* ClientAddress); +void rts_client_address_command_write(STREAM* s, UINT32 AddressType, BYTE* ClientAddress); void rts_association_group_id_command_read(rdpRpc* rpc, STREAM* s); void rts_association_group_id_command_write(STREAM* s, BYTE* AssociationGroupId); void rts_destination_command_read(rdpRpc* rpc, STREAM* s); -void rts_destination_command_write(STREAM* s, uint32 Destination); +void rts_destination_command_write(STREAM* s, UINT32 Destination); void rts_ping_traffic_sent_notify_command_read(rdpRpc* rpc, STREAM* s); -void rts_ping_traffic_sent_notify_command_write(STREAM* s, uint32 PingTrafficSent); +void rts_ping_traffic_sent_notify_command_write(STREAM* s, UINT32 PingTrafficSent); BOOL rts_send_CONN_A1_pdu(rdpRpc* rpc); BOOL rts_send_CONN_B1_pdu(rdpRpc* rpc); diff --git a/libfreerdp/core/security.c b/libfreerdp/core/security.c index 7e810aac8..29c50cdfd 100644 --- a/libfreerdp/core/security.c +++ b/libfreerdp/core/security.c @@ -192,7 +192,7 @@ void security_licensing_encryption_key(BYTE* session_key_blob, BYTE* client_rand security_md5_16_32_32(&session_key_blob[16], client_random, server_random, output); } -void security_uint32_le(BYTE* output, uint32 value) +void security_UINT32_le(BYTE* output, UINT32 value) { output[0] = (value) & 0xFF; output[1] = (value >> 8) & 0xFF; @@ -200,7 +200,7 @@ void security_uint32_le(BYTE* output, uint32 value) output[3] = (value >> 24) & 0xFF; } -void security_mac_data(BYTE* mac_salt_key, BYTE* data, uint32 length, BYTE* output) +void security_mac_data(BYTE* mac_salt_key, BYTE* data, UINT32 length, BYTE* output) { CryptoMd5 md5; CryptoSha1 sha1; @@ -209,7 +209,7 @@ void security_mac_data(BYTE* mac_salt_key, BYTE* data, uint32 length, BYTE* outp /* MacData = MD5(MacSaltKey + pad2 + SHA1(MacSaltKey + pad1 + length + data)) */ - security_uint32_le(length_le, length); /* length must be little-endian */ + security_UINT32_le(length_le, length); /* length must be little-endian */ /* SHA1_Digest = SHA1(MacSaltKey + pad1 + length + data) */ sha1 = crypto_sha1_init(); @@ -227,7 +227,7 @@ void security_mac_data(BYTE* mac_salt_key, BYTE* data, uint32 length, BYTE* outp crypto_md5_final(md5, output); } -void security_mac_signature(rdpRdp *rdp, BYTE* data, uint32 length, BYTE* output) +void security_mac_signature(rdpRdp *rdp, BYTE* data, UINT32 length, BYTE* output) { CryptoMd5 md5; CryptoSha1 sha1; @@ -235,7 +235,7 @@ void security_mac_signature(rdpRdp *rdp, BYTE* data, uint32 length, BYTE* output BYTE md5_digest[CRYPTO_MD5_DIGEST_LENGTH]; BYTE sha1_digest[CRYPTO_SHA1_DIGEST_LENGTH]; - security_uint32_le(length_le, length); /* length must be little-endian */ + security_UINT32_le(length_le, length); /* length must be little-endian */ /* SHA1_Digest = SHA1(MACKeyN + pad1 + length + data) */ sha1 = crypto_sha1_init(); @@ -255,7 +255,7 @@ void security_mac_signature(rdpRdp *rdp, BYTE* data, uint32 length, BYTE* output memcpy(output, md5_digest, 8); } -void security_salted_mac_signature(rdpRdp *rdp, BYTE* data, uint32 length, BOOL encryption, BYTE* output) +void security_salted_mac_signature(rdpRdp *rdp, BYTE* data, UINT32 length, BOOL encryption, BYTE* output) { CryptoMd5 md5; CryptoSha1 sha1; @@ -264,10 +264,10 @@ void security_salted_mac_signature(rdpRdp *rdp, BYTE* data, uint32 length, BOOL BYTE md5_digest[CRYPTO_MD5_DIGEST_LENGTH]; BYTE sha1_digest[CRYPTO_SHA1_DIGEST_LENGTH]; - security_uint32_le(length_le, length); /* length must be little-endian */ + security_UINT32_le(length_le, length); /* length must be little-endian */ if (encryption) { - security_uint32_le(use_count_le, rdp->encrypt_checksum_use_count); + security_UINT32_le(use_count_le, rdp->encrypt_checksum_use_count); } else { @@ -276,7 +276,7 @@ void security_salted_mac_signature(rdpRdp *rdp, BYTE* data, uint32 length, BOOL * decrypt it, which means decrypt_checksum_use_count is * off by one. */ - security_uint32_le(use_count_le, rdp->decrypt_checksum_use_count - 1); + security_UINT32_le(use_count_le, rdp->decrypt_checksum_use_count - 1); } /* SHA1_Digest = SHA1(MACKeyN + pad1 + length + data) */ @@ -500,7 +500,7 @@ void security_hmac_signature(BYTE* data, int length, BYTE* output, rdpRdp* rdp) BYTE buf[20]; BYTE use_count_le[4]; - security_uint32_le(use_count_le, rdp->encrypt_use_count); + security_UINT32_le(use_count_le, rdp->encrypt_use_count); crypto_hmac_sha1_init(rdp->fips_hmac, rdp->fips_sign_key, 20); crypto_hmac_update(rdp->fips_hmac, data, length); @@ -528,7 +528,7 @@ BOOL security_fips_check_signature(BYTE* data, int length, BYTE* sig, rdpRdp* rd BYTE buf[20]; BYTE use_count_le[4]; - security_uint32_le(use_count_le, rdp->decrypt_use_count); + security_UINT32_le(use_count_le, rdp->decrypt_use_count); crypto_hmac_sha1_init(rdp->fips_hmac, rdp->fips_sign_key, 20); crypto_hmac_update(rdp->fips_hmac, data, length); diff --git a/libfreerdp/core/security.h b/libfreerdp/core/security.h index cca4fa784..c493921f1 100644 --- a/libfreerdp/core/security.h +++ b/libfreerdp/core/security.h @@ -30,10 +30,10 @@ void security_master_secret(BYTE* premaster_secret, BYTE* client_random, BYTE* s void security_session_key_blob(BYTE* master_secret, BYTE* client_random, BYTE* server_random, BYTE* output); void security_mac_salt_key(BYTE* session_key_blob, BYTE* client_random, BYTE* server_random, BYTE* output); void security_licensing_encryption_key(BYTE* session_key_blob, BYTE* client_random, BYTE* server_random, BYTE* output); -void security_mac_data(BYTE* mac_salt_key, BYTE* data, uint32 length, BYTE* output); +void security_mac_data(BYTE* mac_salt_key, BYTE* data, UINT32 length, BYTE* output); -void security_mac_signature(rdpRdp *rdp, BYTE* data, uint32 length, BYTE* output); -void security_salted_mac_signature(rdpRdp *rdp, BYTE* data, uint32 length, BOOL encryption, BYTE* output); +void security_mac_signature(rdpRdp *rdp, BYTE* data, UINT32 length, BYTE* output); +void security_salted_mac_signature(rdpRdp *rdp, BYTE* data, UINT32 length, BOOL encryption, BYTE* output); BOOL security_establish_keys(BYTE* client_random, rdpRdp* rdp); BOOL security_encrypt(BYTE* data, int length, rdpRdp* rdp); diff --git a/libfreerdp/core/surface.c b/libfreerdp/core/surface.c index fe81d875f..59a15102f 100644 --- a/libfreerdp/core/surface.c +++ b/libfreerdp/core/surface.c @@ -39,7 +39,7 @@ static int update_recv_surfcmd_surface_bits(rdpUpdate* update, STREAM* s) stream_read_BYTE(s, cmd->codecID); stream_read_UINT16(s, cmd->width); stream_read_UINT16(s, cmd->height); - stream_read_uint32(s, cmd->bitmapDataLength); + stream_read_UINT32(s, cmd->bitmapDataLength); pos = stream_get_pos(s) + cmd->bitmapDataLength; cmd->bitmapData = stream_get_tail(s); @@ -50,12 +50,12 @@ static int update_recv_surfcmd_surface_bits(rdpUpdate* update, STREAM* s) return 20 + cmd->bitmapDataLength; } -static void update_send_frame_acknowledge(rdpRdp* rdp, uint32 frameId) +static void update_send_frame_acknowledge(rdpRdp* rdp, UINT32 frameId) { STREAM* s; s = rdp_data_pdu_init(rdp); - stream_write_uint32(s, frameId); + stream_write_UINT32(s, frameId); rdp_send_data_pdu(rdp, s, DATA_PDU_TYPE_FRAME_ACKNOWLEDGE, rdp->mcs->user_id); } @@ -64,7 +64,7 @@ static int update_recv_surfcmd_frame_marker(rdpUpdate* update, STREAM* s) SURFACE_FRAME_MARKER* marker = &update->surface_frame_marker; stream_read_UINT16(s, marker->frameAction); - stream_read_uint32(s, marker->frameId); + stream_read_UINT32(s, marker->frameId); IFCALL(update->SurfaceFrameMarker, update->context, marker); @@ -76,11 +76,11 @@ static int update_recv_surfcmd_frame_marker(rdpUpdate* update, STREAM* s) return 6; } -BOOL update_recv_surfcmds(rdpUpdate* update, uint32 size, STREAM* s) +BOOL update_recv_surfcmds(rdpUpdate* update, UINT32 size, STREAM* s) { BYTE* mark; UINT16 cmdType; - uint32 cmdLength; + UINT32 cmdLength; while (size > 2) { @@ -131,16 +131,16 @@ void update_write_surfcmd_surface_bits_header(STREAM* s, SURFACE_BITS_COMMAND* c stream_write_BYTE(s, cmd->codecID); stream_write_UINT16(s, cmd->width); stream_write_UINT16(s, cmd->height); - stream_write_uint32(s, cmd->bitmapDataLength); + stream_write_UINT32(s, cmd->bitmapDataLength); } -void update_write_surfcmd_frame_marker(STREAM* s, UINT16 frameAction, uint32 frameId) +void update_write_surfcmd_frame_marker(STREAM* s, UINT16 frameAction, UINT32 frameId) { stream_check_size(s, SURFCMD_FRAME_MARKER_LENGTH); stream_write_UINT16(s, CMDTYPE_FRAME_MARKER); stream_write_UINT16(s, frameAction); - stream_write_uint32(s, frameId); + stream_write_UINT32(s, frameId); } diff --git a/libfreerdp/core/surface.h b/libfreerdp/core/surface.h index 3890e0fd1..82dda2491 100644 --- a/libfreerdp/core/surface.h +++ b/libfreerdp/core/surface.h @@ -33,10 +33,10 @@ enum SURFCMD_CMDTYPE CMDTYPE_STREAM_SURFACE_BITS = 0x0006 }; -BOOL update_recv_surfcmds(rdpUpdate* update, uint32 size, STREAM* s); +BOOL update_recv_surfcmds(rdpUpdate* update, UINT32 size, STREAM* s); void update_write_surfcmd_surface_bits_header(STREAM* s, SURFACE_BITS_COMMAND* cmd); -void update_write_surfcmd_frame_marker(STREAM* s, UINT16 frameAction, uint32 frameId); +void update_write_surfcmd_frame_marker(STREAM* s, UINT16 frameAction, UINT32 frameId); #endif /* __SURFACE */ diff --git a/libfreerdp/core/tcp.c b/libfreerdp/core/tcp.c index 9be5cde90..59bad4622 100644 --- a/libfreerdp/core/tcp.c +++ b/libfreerdp/core/tcp.c @@ -119,7 +119,7 @@ void tcp_get_mac_address(rdpTcp * tcp) BOOL tcp_connect(rdpTcp* tcp, const char* hostname, UINT16 port) { - uint32 option_value; + UINT32 option_value; socklen_t option_len; if (hostname[0] == '/') @@ -213,7 +213,7 @@ BOOL tcp_set_blocking_mode(rdpTcp* tcp, BOOL blocking) BOOL tcp_set_keep_alive_mode(rdpTcp* tcp) { #ifndef _WIN32 - uint32 option_value; + UINT32 option_value; socklen_t option_len; option_value = 1; diff --git a/libfreerdp/core/timezone.c b/libfreerdp/core/timezone.c index 5042ff42e..b9f311a14 100644 --- a/libfreerdp/core/timezone.c +++ b/libfreerdp/core/timezone.c @@ -84,7 +84,7 @@ BOOL rdp_read_client_time_zone(STREAM* s, rdpSettings* settings) clientTimeZone = settings->client_time_zone; - stream_read_uint32(s, clientTimeZone->bias); /* Bias */ + stream_read_UINT32(s, clientTimeZone->bias); /* Bias */ /* standardName (64 bytes) */ freerdp_UnicodeToAsciiAlloc((WCHAR*) stream_get_tail(s), &str, 64 / 2); @@ -93,7 +93,7 @@ BOOL rdp_read_client_time_zone(STREAM* s, rdpSettings* settings) free(str); rdp_read_system_time(s, &clientTimeZone->standardDate); /* StandardDate */ - stream_read_uint32(s, clientTimeZone->standardBias); /* StandardBias */ + stream_read_UINT32(s, clientTimeZone->standardBias); /* StandardBias */ /* daylightName (64 bytes) */ freerdp_UnicodeToAsciiAlloc((WCHAR*) stream_get_tail(s), &str, 64 / 2); @@ -102,7 +102,7 @@ BOOL rdp_read_client_time_zone(STREAM* s, rdpSettings* settings) free(str); rdp_read_system_time(s, &clientTimeZone->daylightDate); /* DaylightDate */ - stream_read_uint32(s, clientTimeZone->daylightBias); /* DaylightBias */ + stream_read_UINT32(s, clientTimeZone->daylightBias); /* DaylightBias */ return TRUE; } @@ -116,9 +116,9 @@ BOOL rdp_read_client_time_zone(STREAM* s, rdpSettings* settings) void rdp_write_client_time_zone(STREAM* s, rdpSettings* settings) { - uint32 bias; - sint32 sbias; - uint32 bias2c; + UINT32 bias; + INT32 sbias; + UINT32 bias2c; WCHAR* standardName; WCHAR* daylightName; int standardNameLength; @@ -150,7 +150,7 @@ void rdp_write_client_time_zone(STREAM* s, rdpSettings* settings) else bias = 1440 - clientTimeZone->bias; - stream_write_uint32(s, bias); /* Bias */ + stream_write_UINT32(s, bias); /* Bias */ /* standardName (64 bytes) */ stream_write(s, standardName, standardNameLength); @@ -164,12 +164,12 @@ void rdp_write_client_time_zone(STREAM* s, rdpSettings* settings) sbias = clientTimeZone->standardBias - clientTimeZone->bias; if (sbias < 0) - bias2c = (uint32) sbias; + bias2c = (UINT32) sbias; else - bias2c = ~((uint32) sbias) + 1; + bias2c = ~((UINT32) sbias) + 1; /* Note that StandardBias is ignored if no valid standardDate is provided. */ - stream_write_uint32(s, bias2c); /* StandardBias */ + stream_write_UINT32(s, bias2c); /* StandardBias */ DEBUG_TIMEZONE("StandardBias=%d", bias2c); /* daylightName (64 bytes) */ @@ -181,12 +181,12 @@ void rdp_write_client_time_zone(STREAM* s, rdpSettings* settings) sbias = clientTimeZone->daylightBias - clientTimeZone->bias; if (sbias < 0) - bias2c = (uint32) sbias; + bias2c = (UINT32) sbias; else - bias2c = ~((uint32) sbias) + 1; + bias2c = ~((UINT32) sbias) + 1; /* Note that DaylightBias is ignored if no valid daylightDate is provided. */ - stream_write_uint32(s, bias2c); /* DaylightBias */ + stream_write_UINT32(s, bias2c); /* DaylightBias */ DEBUG_TIMEZONE("DaylightBias=%d", bias2c); free(standardName); diff --git a/libfreerdp/core/transport.h b/libfreerdp/core/transport.h index 40d8d7b07..453613558 100644 --- a/libfreerdp/core/transport.h +++ b/libfreerdp/core/transport.h @@ -59,7 +59,7 @@ struct rdp_transport struct rdp_tls* tls_out; struct rdp_credssp* credssp; struct rdp_settings* settings; - uint32 usleep_interval; + UINT32 usleep_interval; void* recv_extra; STREAM* recv_buffer; TransportRecv recv_callback; diff --git a/libfreerdp/core/tsg.c b/libfreerdp/core/tsg.c index 353689bb7..3847a5313 100644 --- a/libfreerdp/core/tsg.c +++ b/libfreerdp/core/tsg.c @@ -372,7 +372,7 @@ BYTE tsg_packet5[20] = 0x00, 0x00, 0x00, 0x00 }; -DWORD TsProxySendToServer(handle_t IDL_handle, byte pRpcMessage[], uint32 count, uint32* lengths) +DWORD TsProxySendToServer(handle_t IDL_handle, byte pRpcMessage[], UINT32 count, UINT32* lengths) { STREAM* s; int status; @@ -381,11 +381,11 @@ DWORD TsProxySendToServer(handle_t IDL_handle, byte pRpcMessage[], uint32 count, byte* buffer1 = NULL ; byte* buffer2 = NULL ; byte* buffer3 = NULL ; - uint32 buffer1Length; - uint32 buffer2Length; - uint32 buffer3Length; - uint32 numBuffers = 0; - uint32 totalDataBytes = 0; + UINT32 buffer1Length; + UINT32 buffer2Length; + UINT32 buffer3Length; + UINT32 numBuffers = 0; + UINT32 totalDataBytes = 0; tsg = (rdpTsg*) IDL_handle; buffer1Length = buffer2Length = buffer3Length = 0; @@ -417,18 +417,18 @@ DWORD TsProxySendToServer(handle_t IDL_handle, byte pRpcMessage[], uint32 count, s = stream_new(28 + totalDataBytes); /* PCHANNEL_CONTEXT_HANDLE_NOSERIALIZE_NR (20 bytes) */ - stream_write_uint32(s, 0); /* ContextType (4 bytes) */ + stream_write_UINT32(s, 0); /* ContextType (4 bytes) */ stream_write(s, tsg->ChannelContext, 16); /* ContextUuid (4 bytes) */ - stream_write_uint32_be(s, totalDataBytes); /* totalDataBytes (4 bytes) */ - stream_write_uint32_be(s, numBuffers); /* numBuffers (4 bytes) */ + stream_write_UINT32_be(s, totalDataBytes); /* totalDataBytes (4 bytes) */ + stream_write_UINT32_be(s, numBuffers); /* numBuffers (4 bytes) */ if (buffer1Length > 0) - stream_write_uint32_be(s, buffer1Length); /* buffer1Length (4 bytes) */ + stream_write_UINT32_be(s, buffer1Length); /* buffer1Length (4 bytes) */ if (buffer2Length > 0) - stream_write_uint32_be(s, buffer2Length); /* buffer2Length (4 bytes) */ + stream_write_UINT32_be(s, buffer2Length); /* buffer2Length (4 bytes) */ if (buffer3Length > 0) - stream_write_uint32_be(s, buffer3Length); /* buffer3Length (4 bytes) */ + stream_write_UINT32_be(s, buffer3Length); /* buffer3Length (4 bytes) */ if (buffer1Length > 0) stream_write(s, buffer1, buffer1Length); /* buffer1 (variable) */ @@ -456,7 +456,7 @@ DWORD TsProxySendToServer(handle_t IDL_handle, byte pRpcMessage[], uint32 count, BOOL tsg_connect(rdpTsg* tsg, const char* hostname, UINT16 port) { BYTE* data; - uint32 length; + UINT32 length; STREAM* s_p4; int status = -1; rdpRpc* rpc = tsg->rpc; @@ -578,9 +578,9 @@ BOOL tsg_connect(rdpTsg* tsg, const char* hostname, UINT16 port) s_p4 = stream_new(60 + dest_addr_unic_len + 2); stream_write(s_p4, tsg_packet4, 48); - stream_write_uint32(s_p4, (dest_addr_unic_len / 2) + 1); /* MaximumCount */ - stream_write_uint32(s_p4, 0x00000000); /* Offset */ - stream_write_uint32(s_p4, (dest_addr_unic_len / 2) + 1); /* ActualCount */ + stream_write_UINT32(s_p4, (dest_addr_unic_len / 2) + 1); /* MaximumCount */ + stream_write_UINT32(s_p4, 0x00000000); /* Offset */ + stream_write_UINT32(s_p4, (dest_addr_unic_len / 2) + 1); /* ActualCount */ stream_write(s_p4, dest_addr_unic, dest_addr_unic_len); stream_write_UINT16(s_p4, 0x0000); /* unicode zero to terminate hostname string */ @@ -653,7 +653,7 @@ BOOL tsg_connect(rdpTsg* tsg, const char* hostname, UINT16 port) return TRUE; } -int tsg_read(rdpTsg* tsg, BYTE* data, uint32 length) +int tsg_read(rdpTsg* tsg, BYTE* data, UINT32 length) { int status; @@ -662,7 +662,7 @@ int tsg_read(rdpTsg* tsg, BYTE* data, uint32 length) return status; } -int tsg_write(rdpTsg* tsg, BYTE* data, uint32 length) +int tsg_write(rdpTsg* tsg, BYTE* data, UINT32 length) { return TsProxySendToServer((handle_t) tsg, data, 1, &length); } diff --git a/libfreerdp/core/tsg.h b/libfreerdp/core/tsg.h index 03d0c3120..57ceac26b 100644 --- a/libfreerdp/core/tsg.h +++ b/libfreerdp/core/tsg.h @@ -239,12 +239,12 @@ typedef struct _TSG_PACKET TSG_PACKET_TYPE_UNION tsgPacket; } TSG_PACKET, *PTSG_PACKET; -DWORD TsProxySendToServer(handle_t IDL_handle, byte pRpcMessage[], uint32 count, uint32* lengths); +DWORD TsProxySendToServer(handle_t IDL_handle, byte pRpcMessage[], UINT32 count, UINT32* lengths); BOOL tsg_connect(rdpTsg* tsg, const char* hostname, UINT16 port); -int tsg_write(rdpTsg* tsg, BYTE* data, uint32 length); -int tsg_read(rdpTsg* tsg, BYTE* data, uint32 length); +int tsg_write(rdpTsg* tsg, BYTE* data, UINT32 length); +int tsg_read(rdpTsg* tsg, BYTE* data, UINT32 length); rdpTsg* tsg_new(rdpTransport* transport); void tsg_free(rdpTsg* tsg); diff --git a/libfreerdp/core/update.c b/libfreerdp/core/update.c index 1490c44ce..60cc2ba2c 100644 --- a/libfreerdp/core/update.c +++ b/libfreerdp/core/update.c @@ -123,7 +123,7 @@ void update_read_palette(rdpUpdate* update, STREAM* s, PALETTE_UPDATE* palette_u PALETTE_ENTRY* entry; stream_seek_UINT16(s); /* pad2Octets (2 bytes) */ - stream_read_uint32(s, palette_update->number); /* numberColors (4 bytes), must be set to 256 */ + stream_read_UINT32(s, palette_update->number); /* numberColors (4 bytes), must be set to 256 */ if (palette_update->number > 256) palette_update->number = 256; @@ -151,8 +151,8 @@ void update_read_synchronize(rdpUpdate* update, STREAM* s) void update_read_play_sound(STREAM* s, PLAY_SOUND_UPDATE* play_sound) { - stream_read_uint32(s, play_sound->duration); /* duration (4 bytes) */ - stream_read_uint32(s, play_sound->frequency); /* frequency (4 bytes) */ + stream_read_UINT32(s, play_sound->duration); /* duration (4 bytes) */ + stream_read_UINT32(s, play_sound->frequency); /* frequency (4 bytes) */ } void update_recv_play_sound(rdpUpdate* update, STREAM* s) @@ -169,7 +169,7 @@ void update_read_pointer_position(STREAM* s, POINTER_POSITION_UPDATE* pointer_po void update_read_pointer_system(STREAM* s, POINTER_SYSTEM_UPDATE* pointer_system) { - stream_read_uint32(s, pointer_system->type); /* systemPointerType (4 bytes) */ + stream_read_UINT32(s, pointer_system->type); /* systemPointerType (4 bytes) */ } void update_read_pointer_color(STREAM* s, POINTER_COLOR_UPDATE* pointer_color) diff --git a/libfreerdp/core/window.c b/libfreerdp/core/window.c index 075f3baec..57127021e 100644 --- a/libfreerdp/core/window.c +++ b/libfreerdp/core/window.c @@ -74,8 +74,8 @@ void update_read_cached_icon_info(STREAM* s, CACHED_ICON_INFO* cached_icon_info) void update_read_notify_icon_infotip(STREAM* s, NOTIFY_ICON_INFOTIP* notify_icon_infotip) { - stream_read_uint32(s, notify_icon_infotip->timeout); /* timeout (4 bytes) */ - stream_read_uint32(s, notify_icon_infotip->flags); /* infoFlags (4 bytes) */ + stream_read_UINT32(s, notify_icon_infotip->timeout); /* timeout (4 bytes) */ + stream_read_UINT32(s, notify_icon_infotip->flags); /* infoFlags (4 bytes) */ rail_read_unicode_string(s, ¬ify_icon_infotip->text); /* infoTipText */ rail_read_unicode_string(s, ¬ify_icon_infotip->title); /* title */ } @@ -86,12 +86,12 @@ void update_read_window_state_order(STREAM* s, WINDOW_ORDER_INFO* orderInfo, WIN int size; if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_OWNER) - stream_read_uint32(s, window_state->ownerWindowId); /* ownerWindowId (4 bytes) */ + stream_read_UINT32(s, window_state->ownerWindowId); /* ownerWindowId (4 bytes) */ if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_STYLE) { - stream_read_uint32(s, window_state->style); /* style (4 bytes) */ - stream_read_uint32(s, window_state->extendedStyle); /* extendedStyle (4 bytes) */ + stream_read_UINT32(s, window_state->style); /* style (4 bytes) */ + stream_read_UINT32(s, window_state->extendedStyle); /* extendedStyle (4 bytes) */ } if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_SHOW) @@ -102,38 +102,38 @@ void update_read_window_state_order(STREAM* s, WINDOW_ORDER_INFO* orderInfo, WIN if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_CLIENT_AREA_OFFSET) { - stream_read_uint32(s, window_state->clientOffsetX); /* clientOffsetX (4 bytes) */ - stream_read_uint32(s, window_state->clientOffsetY); /* clientOffsetY (4 bytes) */ + stream_read_UINT32(s, window_state->clientOffsetX); /* clientOffsetX (4 bytes) */ + stream_read_UINT32(s, window_state->clientOffsetY); /* clientOffsetY (4 bytes) */ } if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_CLIENT_AREA_SIZE) { - stream_read_uint32(s, window_state->clientAreaWidth); /* clientAreaWidth (4 bytes) */ - stream_read_uint32(s, window_state->clientAreaHeight); /* clientAreaHeight (4 bytes) */ + stream_read_UINT32(s, window_state->clientAreaWidth); /* clientAreaWidth (4 bytes) */ + stream_read_UINT32(s, window_state->clientAreaHeight); /* clientAreaHeight (4 bytes) */ } if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_RP_CONTENT) stream_read_BYTE(s, window_state->RPContent); /* RPContent (1 byte) */ if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_ROOT_PARENT) - stream_read_uint32(s, window_state->rootParentHandle);/* rootParentHandle (4 bytes) */ + stream_read_UINT32(s, window_state->rootParentHandle);/* rootParentHandle (4 bytes) */ if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_WND_OFFSET) { - stream_read_uint32(s, window_state->windowOffsetX); /* windowOffsetX (4 bytes) */ - stream_read_uint32(s, window_state->windowOffsetY); /* windowOffsetY (4 bytes) */ + stream_read_UINT32(s, window_state->windowOffsetX); /* windowOffsetX (4 bytes) */ + stream_read_UINT32(s, window_state->windowOffsetY); /* windowOffsetY (4 bytes) */ } if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_WND_CLIENT_DELTA) { - stream_read_uint32(s, window_state->windowClientDeltaX); /* windowClientDeltaX (4 bytes) */ - stream_read_uint32(s, window_state->windowClientDeltaY); /* windowClientDeltaY (4 bytes) */ + stream_read_UINT32(s, window_state->windowClientDeltaX); /* windowClientDeltaX (4 bytes) */ + stream_read_UINT32(s, window_state->windowClientDeltaY); /* windowClientDeltaY (4 bytes) */ } if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_WND_SIZE) { - stream_read_uint32(s, window_state->windowWidth); /* windowWidth (4 bytes) */ - stream_read_uint32(s, window_state->windowHeight); /* windowHeight (4 bytes) */ + stream_read_UINT32(s, window_state->windowWidth); /* windowWidth (4 bytes) */ + stream_read_UINT32(s, window_state->windowHeight); /* windowHeight (4 bytes) */ } if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_WND_RECTS) @@ -155,8 +155,8 @@ void update_read_window_state_order(STREAM* s, WINDOW_ORDER_INFO* orderInfo, WIN if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_VIS_OFFSET) { - stream_read_uint32(s, window_state->visibleOffsetX); /* visibleOffsetX (4 bytes) */ - stream_read_uint32(s, window_state->visibleOffsetY); /* visibleOffsetY (4 bytes) */ + stream_read_UINT32(s, window_state->visibleOffsetX); /* visibleOffsetX (4 bytes) */ + stream_read_UINT32(s, window_state->visibleOffsetY); /* visibleOffsetY (4 bytes) */ } if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_VISIBILITY) @@ -198,7 +198,7 @@ void update_recv_window_info_order(rdpUpdate* update, STREAM* s, WINDOW_ORDER_IN rdpContext* context = update->context; rdpWindowUpdate* window = update->window; - stream_read_uint32(s, orderInfo->windowId); /* windowId (4 bytes) */ + stream_read_UINT32(s, orderInfo->windowId); /* windowId (4 bytes) */ if (orderInfo->fieldFlags & WINDOW_ORDER_ICON) { @@ -233,7 +233,7 @@ void update_recv_window_info_order(rdpUpdate* update, STREAM* s, WINDOW_ORDER_IN void update_read_notification_icon_state_order(STREAM* s, WINDOW_ORDER_INFO* orderInfo, NOTIFY_ICON_STATE_ORDER* notify_icon_state) { if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_NOTIFY_VERSION) - stream_read_uint32(s, notify_icon_state->version); /* version (4 bytes) */ + stream_read_UINT32(s, notify_icon_state->version); /* version (4 bytes) */ if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_NOTIFY_TIP) rail_read_unicode_string(s, ¬ify_icon_state->toolTip); /* toolTip (UNICODE_STRING) */ @@ -242,7 +242,7 @@ void update_read_notification_icon_state_order(STREAM* s, WINDOW_ORDER_INFO* ord update_read_notify_icon_infotip(s, ¬ify_icon_state->infoTip); /* infoTip (NOTIFY_ICON_INFOTIP) */ if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_NOTIFY_STATE) - stream_read_uint32(s, notify_icon_state->state); /* state (4 bytes) */ + stream_read_UINT32(s, notify_icon_state->state); /* state (4 bytes) */ if (orderInfo->fieldFlags & WINDOW_ORDER_ICON) update_read_icon_info(s, ¬ify_icon_state->icon); /* icon (ICON_INFO) */ @@ -261,8 +261,8 @@ void update_recv_notification_icon_info_order(rdpUpdate* update, STREAM* s, WIND rdpContext* context = update->context; rdpWindowUpdate* window = update->window; - stream_read_uint32(s, orderInfo->windowId); /* windowId (4 bytes) */ - stream_read_uint32(s, orderInfo->notifyIconId); /* notifyIconId (4 bytes) */ + stream_read_UINT32(s, orderInfo->windowId); /* windowId (4 bytes) */ + stream_read_UINT32(s, orderInfo->notifyIconId); /* notifyIconId (4 bytes) */ if (orderInfo->fieldFlags & WINDOW_ORDER_STATE_DELETED) { @@ -288,23 +288,23 @@ void update_read_desktop_actively_monitored_order(STREAM* s, WINDOW_ORDER_INFO* int size; if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_DESKTOP_ACTIVE_WND) - stream_read_uint32(s, monitored_desktop->activeWindowId); /* activeWindowId (4 bytes) */ + stream_read_UINT32(s, monitored_desktop->activeWindowId); /* activeWindowId (4 bytes) */ if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_DESKTOP_ZORDER) { stream_read_BYTE(s, monitored_desktop->numWindowIds); /* numWindowIds (1 byte) */ - size = sizeof(uint32) * monitored_desktop->numWindowIds; + size = sizeof(UINT32) * monitored_desktop->numWindowIds; if (monitored_desktop->windowIds == NULL) - monitored_desktop->windowIds = (uint32*) malloc(size); + monitored_desktop->windowIds = (UINT32*) malloc(size); else - monitored_desktop->windowIds = (uint32*) realloc(monitored_desktop->windowIds, size); + monitored_desktop->windowIds = (UINT32*) realloc(monitored_desktop->windowIds, size); /* windowIds */ for (i = 0; i < (int) monitored_desktop->numWindowIds; i++) { - stream_read_uint32(s, monitored_desktop->windowIds[i]); + stream_read_UINT32(s, monitored_desktop->windowIds[i]); } } } @@ -339,7 +339,7 @@ void update_recv_altsec_window_order(rdpUpdate* update, STREAM* s) rdpWindowUpdate* window = update->window; stream_read_UINT16(s, orderSize); /* orderSize (2 bytes) */ - stream_read_uint32(s, window->orderInfo.fieldFlags); /* FieldsPresentFlags (4 bytes) */ + stream_read_UINT32(s, window->orderInfo.fieldFlags); /* FieldsPresentFlags (4 bytes) */ if (window->orderInfo.fieldFlags & WINDOW_ORDER_TYPE_WINDOW) update_recv_window_info_order(update, s, &window->orderInfo); diff --git a/libfreerdp/crypto/ber.c b/libfreerdp/crypto/ber.c index bab56f888..4c6383c5a 100644 --- a/libfreerdp/crypto/ber.c +++ b/libfreerdp/crypto/ber.c @@ -338,7 +338,7 @@ void ber_write_BOOL(STREAM* s, BOOL value) stream_write_BYTE(s, (value == TRUE) ? 0xFF : 0); } -BOOL ber_read_integer(STREAM* s, uint32* value) +BOOL ber_read_integer(STREAM* s, UINT32* value) { int length; @@ -363,7 +363,7 @@ BOOL ber_read_integer(STREAM* s, uint32* value) *value += (byte << 16); } else if (length == 4) - stream_read_uint32_be(s, *value); + stream_read_UINT32_be(s, *value); else return FALSE; @@ -376,7 +376,7 @@ BOOL ber_read_integer(STREAM* s, uint32* value) * @param value */ -int ber_write_integer(STREAM* s, uint32 value) +int ber_write_integer(STREAM* s, UINT32 value) { ber_write_universal_tag(s, BER_TAG_INTEGER, FALSE); @@ -402,14 +402,14 @@ int ber_write_integer(STREAM* s, uint32 value) else if (value <= 0xFFFFFFFF) { ber_write_length(s, 4); - stream_write_uint32_be(s, value); + stream_write_UINT32_be(s, value); return 5; } return 0; } -int ber_skip_integer(uint32 value) +int ber_skip_integer(UINT32 value) { if (value <= 0xFF) { diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c index f0bd6ae9d..509637b16 100644 --- a/libfreerdp/crypto/crypto.c +++ b/libfreerdp/crypto/crypto.c @@ -30,7 +30,7 @@ CryptoSha1 crypto_sha1_init(void) return sha1; } -void crypto_sha1_update(CryptoSha1 sha1, const BYTE* data, uint32 length) +void crypto_sha1_update(CryptoSha1 sha1, const BYTE* data, UINT32 length) { SHA1_Update(&sha1->sha_ctx, data, length); } @@ -48,7 +48,7 @@ CryptoMd5 crypto_md5_init(void) return md5; } -void crypto_md5_update(CryptoMd5 md5, const BYTE* data, uint32 length) +void crypto_md5_update(CryptoMd5 md5, const BYTE* data, UINT32 length) { MD5_Update(&md5->md5_ctx, data, length); } @@ -59,14 +59,14 @@ void crypto_md5_final(CryptoMd5 md5, BYTE* out_data) free(md5); } -CryptoRc4 crypto_rc4_init(const BYTE* key, uint32 length) +CryptoRc4 crypto_rc4_init(const BYTE* key, UINT32 length) { CryptoRc4 rc4 = malloc(sizeof(*rc4)); RC4_set_key(&rc4->rc4_key, length, key); return rc4; } -void crypto_rc4(CryptoRc4 rc4, uint32 length, const BYTE* in_data, BYTE* out_data) +void crypto_rc4(CryptoRc4 rc4, UINT32 length, const BYTE* in_data, BYTE* out_data) { RC4(&rc4->rc4_key, length, in_data, out_data); } @@ -95,13 +95,13 @@ CryptoDes3 crypto_des3_decrypt_init(const BYTE* key, const BYTE* ivec) return des3; } -void crypto_des3_encrypt(CryptoDes3 des3, uint32 length, const BYTE* in_data, BYTE* out_data) +void crypto_des3_encrypt(CryptoDes3 des3, UINT32 length, const BYTE* in_data, BYTE* out_data) { int len; EVP_EncryptUpdate(&des3->des3_ctx, out_data, &len, in_data, length); } -void crypto_des3_decrypt(CryptoDes3 des3, uint32 length, const BYTE* in_data, BYTE* out_data) +void crypto_des3_decrypt(CryptoDes3 des3, UINT32 length, const BYTE* in_data, BYTE* out_data) { int len; EVP_DecryptUpdate(&des3->des3_ctx, out_data, &len, in_data, length); @@ -125,17 +125,17 @@ CryptoHmac crypto_hmac_new(void) return hmac; } -void crypto_hmac_sha1_init(CryptoHmac hmac, const BYTE* data, uint32 length) +void crypto_hmac_sha1_init(CryptoHmac hmac, const BYTE* data, UINT32 length) { HMAC_Init_ex(&hmac->hmac_ctx, data, length, EVP_sha1(), NULL); } -void crypto_hmac_update(CryptoHmac hmac, const BYTE* data, uint32 length) +void crypto_hmac_update(CryptoHmac hmac, const BYTE* data, UINT32 length) { HMAC_Update(&hmac->hmac_ctx, data, length); } -void crypto_hmac_final(CryptoHmac hmac, BYTE* out_data, uint32 length) +void crypto_hmac_final(CryptoHmac hmac, BYTE* out_data, UINT32 length) { HMAC_Final(&hmac->hmac_ctx, out_data, &length); } @@ -148,7 +148,7 @@ void crypto_hmac_free(CryptoHmac hmac) free(hmac); } -CryptoCert crypto_cert_read(BYTE* data, uint32 length) +CryptoCert crypto_cert_read(BYTE* data, UINT32 length) { CryptoCert cert = malloc(sizeof(*cert)); /* this will move the data pointer but we don't care, we don't use it again */ @@ -204,7 +204,7 @@ exit: return status; } -static void crypto_rsa_common(const BYTE* input, int length, uint32 key_length, const BYTE* modulus, const BYTE* exponent, int exponent_size, BYTE* output) +static void crypto_rsa_common(const BYTE* input, int length, UINT32 key_length, const BYTE* modulus, const BYTE* exponent, int exponent_size, BYTE* output) { BN_CTX* ctx; int output_length; @@ -249,42 +249,42 @@ static void crypto_rsa_common(const BYTE* input, int length, uint32 key_length, free(input_reverse); } -static void crypto_rsa_public(const BYTE* input, int length, uint32 key_length, const BYTE* modulus, const BYTE* exponent, BYTE* output) +static void crypto_rsa_public(const BYTE* input, int length, UINT32 key_length, const BYTE* modulus, const BYTE* exponent, BYTE* output) { crypto_rsa_common(input, length, key_length, modulus, exponent, EXPONENT_MAX_SIZE, output); } -static void crypto_rsa_private(const BYTE* input, int length, uint32 key_length, const BYTE* modulus, const BYTE* private_exponent, BYTE* output) +static void crypto_rsa_private(const BYTE* input, int length, UINT32 key_length, const BYTE* modulus, const BYTE* private_exponent, BYTE* output) { crypto_rsa_common(input, length, key_length, modulus, private_exponent, key_length, output); } -void crypto_rsa_public_encrypt(const BYTE* input, int length, uint32 key_length, const BYTE* modulus, const BYTE* exponent, BYTE* output) +void crypto_rsa_public_encrypt(const BYTE* input, int length, UINT32 key_length, const BYTE* modulus, const BYTE* exponent, BYTE* output) { crypto_rsa_public(input, length, key_length, modulus, exponent, output); } -void crypto_rsa_public_decrypt(const BYTE* input, int length, uint32 key_length, const BYTE* modulus, const BYTE* exponent, BYTE* output) +void crypto_rsa_public_decrypt(const BYTE* input, int length, UINT32 key_length, const BYTE* modulus, const BYTE* exponent, BYTE* output) { crypto_rsa_public(input, length, key_length, modulus, exponent, output); } -void crypto_rsa_private_encrypt(const BYTE* input, int length, uint32 key_length, const BYTE* modulus, const BYTE* private_exponent, BYTE* output) +void crypto_rsa_private_encrypt(const BYTE* input, int length, UINT32 key_length, const BYTE* modulus, const BYTE* private_exponent, BYTE* output) { crypto_rsa_private(input, length, key_length, modulus, private_exponent, output); } -void crypto_rsa_private_decrypt(const BYTE* input, int length, uint32 key_length, const BYTE* modulus, const BYTE* private_exponent, BYTE* output) +void crypto_rsa_private_decrypt(const BYTE* input, int length, UINT32 key_length, const BYTE* modulus, const BYTE* private_exponent, BYTE* output) { crypto_rsa_private(input, length, key_length, modulus, private_exponent, output); } -void crypto_rsa_decrypt(const BYTE* input, int length, uint32 key_length, const BYTE* modulus, const BYTE* private_exponent, BYTE* output) +void crypto_rsa_decrypt(const BYTE* input, int length, UINT32 key_length, const BYTE* modulus, const BYTE* private_exponent, BYTE* output) { crypto_rsa_common(input, length, key_length, modulus, private_exponent, key_length, output); @@ -313,7 +313,7 @@ char* crypto_cert_fingerprint(X509* xcert) int i = 0; char* p; char* fp_buffer; - uint32 fp_len; + UINT32 fp_len; BYTE fp[EVP_MAX_MD_SIZE]; X509_digest(xcert, EVP_sha1(), fp, &fp_len); diff --git a/libfreerdp/crypto/er.c b/libfreerdp/crypto/er.c index c2415f7a1..e8109bba4 100644 --- a/libfreerdp/crypto/er.c +++ b/libfreerdp/crypto/er.c @@ -267,7 +267,7 @@ BOOL er_read_bit_string(STREAM* s, int* length, BYTE* padding) return TRUE; } -BOOL er_write_bit_string_tag(STREAM* s, uint32 length, BYTE padding, BOOL flag) +BOOL er_write_bit_string_tag(STREAM* s, UINT32 length, BYTE padding, BOOL flag) { er_write_universal_tag(s, ER_TAG_BIT_STRING, FALSE); er_write_length(s, length, flag); @@ -344,7 +344,7 @@ void er_write_BOOL(STREAM* s, BOOL value) stream_write_BYTE(s, (value == TRUE) ? 0xFF : 0); } -BOOL er_read_integer(STREAM* s, uint32* value) +BOOL er_read_integer(STREAM* s, UINT32* value) { int length; @@ -369,7 +369,7 @@ BOOL er_read_integer(STREAM* s, uint32* value) *value += (byte << 16); } else if (length == 4) - stream_read_uint32_be(s, *value); + stream_read_UINT32_be(s, *value); else return FALSE; @@ -382,7 +382,7 @@ BOOL er_read_integer(STREAM* s, uint32* value) * @param value */ -int er_write_integer(STREAM* s, sint32 value) +int er_write_integer(STREAM* s, INT32 value) { er_write_universal_tag(s, ER_TAG_INTEGER, FALSE); @@ -401,14 +401,14 @@ int er_write_integer(STREAM* s, sint32 value) else { er_write_length(s, 4, FALSE); - stream_write_uint32_be(s, value); + stream_write_UINT32_be(s, value); return 5; } return 0; } -int er_skip_integer(sint32 value) +int er_skip_integer(INT32 value) { if (value <= 127 && value >= -128) { diff --git a/libfreerdp/crypto/per.c b/libfreerdp/crypto/per.c index 741451ed3..1665c0502 100644 --- a/libfreerdp/crypto/per.c +++ b/libfreerdp/crypto/per.c @@ -188,7 +188,7 @@ void per_write_padding(STREAM* s, int length) * @return */ -BOOL per_read_integer(STREAM* s, uint32* integer) +BOOL per_read_integer(STREAM* s, UINT32* integer) { UINT16 length; @@ -214,7 +214,7 @@ BOOL per_read_integer(STREAM* s, uint32* integer) * @param integer integer */ -void per_write_integer(STREAM* s, uint32 integer) +void per_write_integer(STREAM* s, UINT32 integer) { if (integer <= 0xFF) { @@ -229,7 +229,7 @@ void per_write_integer(STREAM* s, uint32 integer) else if (integer <= 0xFFFFFFFF) { per_write_length(s, 4); - stream_write_uint32_be(s, integer); + stream_write_UINT32_be(s, integer); } } diff --git a/libfreerdp/gdi/32bpp.c b/libfreerdp/gdi/32bpp.c index a3e4b17c0..c604c9ed1 100644 --- a/libfreerdp/gdi/32bpp.c +++ b/libfreerdp/gdi/32bpp.c @@ -38,9 +38,9 @@ #include -uint32 gdi_get_color_32bpp(HGDI_DC hdc, GDI_COLOR color) +UINT32 gdi_get_color_32bpp(HGDI_DC hdc, GDI_COLOR color) { - uint32 color32; + UINT32 color32; BYTE a, r, g, b; a = 0xFF; @@ -61,8 +61,8 @@ uint32 gdi_get_color_32bpp(HGDI_DC hdc, GDI_COLOR color) int FillRect_32bpp(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr) { int x, y; - uint32 *dstp; - uint32 color32; + UINT32 *dstp; + UINT32 color32; int nXDest, nYDest; int nWidth, nHeight; @@ -75,7 +75,7 @@ int FillRect_32bpp(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr) for (y = 0; y < nHeight; y++) { - dstp = (uint32*) gdi_get_bitmap_pointer(hdc, nXDest, nYDest + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdc, nXDest, nYDest + y); if (dstp != 0) { @@ -218,13 +218,13 @@ static int BitBlt_SRCCOPY_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWi static int BitBlt_NOTSRCCOPY_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc) { int x, y; - uint32* srcp; - uint32* dstp; + UINT32* srcp; + UINT32* dstp; for (y = 0; y < nHeight; y++) { - srcp = (uint32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + srcp = (UINT32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { @@ -243,11 +243,11 @@ static int BitBlt_NOTSRCCOPY_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int static int BitBlt_DSTINVERT_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight) { int x, y; - uint32* dstp; + UINT32* dstp; for (y = 0; y < nHeight; y++) { - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { @@ -265,13 +265,13 @@ static int BitBlt_DSTINVERT_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int n static int BitBlt_SRCERASE_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc) { int x, y; - uint32* srcp; - uint32* dstp; + UINT32* srcp; + UINT32* dstp; for (y = 0; y < nHeight; y++) { - srcp = (uint32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + srcp = (UINT32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { @@ -290,13 +290,13 @@ static int BitBlt_SRCERASE_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nW static int BitBlt_NOTSRCERASE_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc) { int x, y; - uint32* srcp; - uint32* dstp; + UINT32* srcp; + UINT32* dstp; for (y = 0; y < nHeight; y++) { - srcp = (uint32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + srcp = (UINT32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { @@ -315,13 +315,13 @@ static int BitBlt_NOTSRCERASE_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int static int BitBlt_SRCINVERT_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc) { int x, y; - uint32* srcp; - uint32* dstp; + UINT32* srcp; + UINT32* dstp; for (y = 0; y < nHeight; y++) { - srcp = (uint32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + srcp = (UINT32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { @@ -340,13 +340,13 @@ static int BitBlt_SRCINVERT_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int n static int BitBlt_SRCAND_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc) { int x, y; - uint32* srcp; - uint32* dstp; + UINT32* srcp; + UINT32* dstp; for (y = 0; y < nHeight; y++) { - srcp = (uint32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + srcp = (UINT32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { @@ -365,13 +365,13 @@ static int BitBlt_SRCAND_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWid static int BitBlt_SRCPAINT_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc) { int x, y; - uint32* srcp; - uint32* dstp; + UINT32* srcp; + UINT32* dstp; for (y = 0; y < nHeight; y++) { - srcp = (uint32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + srcp = (UINT32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { @@ -390,31 +390,31 @@ static int BitBlt_SRCPAINT_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nW static int BitBlt_DSPDxax_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc) { int x, y; - uint32* srcp; - uint32* dstp; - uint32* patp; + UINT32* srcp; + UINT32* dstp; + UINT32* patp; BYTE* srcp8; - uint32 src32; - uint32 color32; + UINT32 src32; + UINT32 color32; HGDI_BITMAP hSrcBmp; /* D = (S & P) | (~S & D) */ color32 = gdi_get_color_32bpp(hdcDest, hdcDest->textColor); - patp = (uint32*) &color32; + patp = (UINT32*) &color32; hSrcBmp = (HGDI_BITMAP) hdcSrc->selectedObject; if (hdcSrc->bytesPerPixel == 1) { /* DSPDxax, used to draw glyphs */ - srcp = (uint32*) & src32; + srcp = (UINT32*) & src32; for (y = 0; y < nHeight; y++) { srcp8 = (BYTE*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { @@ -434,8 +434,8 @@ static int BitBlt_DSPDxax_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWi { for (y = 0; y < nHeight; y++) { - srcp = (uint32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + srcp = (UINT32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { @@ -455,22 +455,22 @@ static int BitBlt_DSPDxax_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWi static int BitBlt_PSDPxax_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc) { int x, y; - uint32* srcp; - uint32* dstp; - uint32* patp; - uint32 color32; + UINT32* srcp; + UINT32* dstp; + UINT32* patp; + UINT32 color32; /* D = (S & D) | (~S & P) */ if (hdcDest->brush->style == GDI_BS_SOLID) { color32 = gdi_get_color_32bpp(hdcDest, hdcDest->brush->color); - patp = (uint32*) &color32; + patp = (UINT32*) &color32; for (y = 0; y < nHeight; y++) { - srcp = (uint32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + srcp = (UINT32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { @@ -487,14 +487,14 @@ static int BitBlt_PSDPxax_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWi { for (y = 0; y < nHeight; y++) { - srcp = (uint32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + srcp = (UINT32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { for (x = 0; x < nWidth; x++) { - patp = (uint32*) gdi_get_brush_pointer(hdcDest, x, y); + patp = (UINT32*) gdi_get_brush_pointer(hdcDest, x, y); *dstp = (*srcp & *dstp) | (~(*srcp) & *patp); srcp++; dstp++; @@ -509,20 +509,20 @@ static int BitBlt_PSDPxax_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWi static int BitBlt_SPna_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc) { int x, y; - uint32* srcp; - uint32* dstp; - uint32* patp; + UINT32* srcp; + UINT32* dstp; + UINT32* patp; for (y = 0; y < nHeight; y++) { - srcp = (uint32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + srcp = (UINT32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { for (x = 0; x < nWidth; x++) { - patp = (uint32*) gdi_get_brush_pointer(hdcDest, x, y); + patp = (UINT32*) gdi_get_brush_pointer(hdcDest, x, y); *dstp = *srcp & ~(*patp); srcp++; @@ -537,13 +537,13 @@ static int BitBlt_SPna_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth static int BitBlt_DSna_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc) { int x, y; - uint32* srcp; - uint32* dstp; + UINT32* srcp; + UINT32* dstp; for (y = 0; y < nHeight; y++) { - srcp = (uint32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + srcp = (UINT32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { @@ -562,18 +562,18 @@ static int BitBlt_DSna_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth static int BitBlt_DPa_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight) { int x, y; - uint32* dstp; - uint32* patp; + UINT32* dstp; + UINT32* patp; for (y = 0; y < nHeight; y++) { - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { for (x = 0; x < nWidth; x++) { - patp = (uint32*) gdi_get_brush_pointer(hdcDest, x, y); + patp = (UINT32*) gdi_get_brush_pointer(hdcDest, x, y); *dstp = *dstp & *patp; dstp++; @@ -587,18 +587,18 @@ static int BitBlt_DPa_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, static int BitBlt_PDxn_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight) { int x, y; - uint32* dstp; - uint32* patp; + UINT32* dstp; + UINT32* patp; for (y = 0; y < nHeight; y++) { - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { for (x = 0; x < nWidth; x++) { - patp = (uint32*) gdi_get_brush_pointer(hdcDest, x, y); + patp = (UINT32*) gdi_get_brush_pointer(hdcDest, x, y); *dstp = *dstp ^ ~(*patp); dstp++; @@ -612,20 +612,20 @@ static int BitBlt_PDxn_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth static int BitBlt_MERGECOPY_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc) { int x, y; - uint32* srcp; - uint32* dstp; - uint32* patp; + UINT32* srcp; + UINT32* dstp; + UINT32* patp; for (y = 0; y < nHeight; y++) { - srcp = (uint32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + srcp = (UINT32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { for (x = 0; x < nWidth; x++) { - patp = (uint32*) gdi_get_brush_pointer(hdcDest, x, y); + patp = (UINT32*) gdi_get_brush_pointer(hdcDest, x, y); *dstp = *srcp & *patp; srcp++; @@ -640,13 +640,13 @@ static int BitBlt_MERGECOPY_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int n static int BitBlt_MERGEPAINT_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc) { int x, y; - uint32* srcp; - uint32* dstp; + UINT32* srcp; + UINT32* dstp; for (y = 0; y < nHeight; y++) { - srcp = (uint32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + srcp = (UINT32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { @@ -665,9 +665,9 @@ static int BitBlt_MERGEPAINT_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int static int BitBlt_PATCOPY_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight) { int x, y; - uint32* dstp; - uint32* patp; - uint32 color32; + UINT32* dstp; + UINT32* patp; + UINT32 color32; if (hdcDest->brush->style == GDI_BS_SOLID) { @@ -675,7 +675,7 @@ static int BitBlt_PATCOPY_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWi for (y = 0; y < nHeight; y++) { - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { @@ -691,13 +691,13 @@ static int BitBlt_PATCOPY_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWi { for (y = 0; y < nHeight; y++) { - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { for (x = 0; x < nWidth; x++) { - patp = (uint32*) gdi_get_brush_pointer(hdcDest, x, y); + patp = (UINT32*) gdi_get_brush_pointer(hdcDest, x, y); *dstp = *patp; dstp++; } @@ -711,9 +711,9 @@ static int BitBlt_PATCOPY_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWi static int BitBlt_PATINVERT_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight) { int x, y; - uint32* dstp; - uint32* patp; - uint32 color32; + UINT32* dstp; + UINT32* patp; + UINT32 color32; if (hdcDest->brush->style == GDI_BS_SOLID) { @@ -721,7 +721,7 @@ static int BitBlt_PATINVERT_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int n for (y = 0; y < nHeight; y++) { - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { @@ -737,13 +737,13 @@ static int BitBlt_PATINVERT_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int n { for (y = 0; y < nHeight; y++) { - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { for (x = 0; x < nWidth; x++) { - patp = (uint32*) gdi_get_brush_pointer(hdcDest, x, y); + patp = (UINT32*) gdi_get_brush_pointer(hdcDest, x, y); *dstp = *patp ^ *dstp; dstp++; } @@ -757,20 +757,20 @@ static int BitBlt_PATINVERT_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int n static int BitBlt_PATPAINT_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc) { int x, y; - uint32* srcp; - uint32* dstp; - uint32* patp; + UINT32* srcp; + UINT32* dstp; + UINT32* patp; for (y = 0; y < nHeight; y++) { - srcp = (uint32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); - dstp = (uint32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); + srcp = (UINT32*) gdi_get_bitmap_pointer(hdcSrc, nXSrc, nYSrc + y); + dstp = (UINT32*) gdi_get_bitmap_pointer(hdcDest, nXDest, nYDest + y); if (dstp != 0) { for (x = 0; x < nWidth; x++) { - patp = (uint32*) gdi_get_brush_pointer(hdcDest, x, y); + patp = (UINT32*) gdi_get_brush_pointer(hdcDest, x, y); *dstp = *dstp | (*patp | ~(*srcp)); srcp++; dstp++; @@ -925,102 +925,102 @@ int PatBlt_32bpp(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, i return 1; } -static INLINE void SetPixel_BLACK_32bpp(uint32* pixel, uint32* pen) +static INLINE void SetPixel_BLACK_32bpp(UINT32* pixel, UINT32* pen) { /* D = 0 */ *pixel = 0; } -static INLINE void SetPixel_NOTMERGEPEN_32bpp(uint32* pixel, uint32* pen) +static INLINE void SetPixel_NOTMERGEPEN_32bpp(UINT32* pixel, UINT32* pen) { /* D = ~(D | P) */ *pixel = ~(*pixel | *pen); } -static INLINE void SetPixel_MASKNOTPEN_32bpp(uint32* pixel, uint32* pen) +static INLINE void SetPixel_MASKNOTPEN_32bpp(UINT32* pixel, UINT32* pen) { /* D = D & ~P */ *pixel &= ~(*pen); } -static INLINE void SetPixel_NOTCOPYPEN_32bpp(uint32* pixel, uint32* pen) +static INLINE void SetPixel_NOTCOPYPEN_32bpp(UINT32* pixel, UINT32* pen) { /* D = ~P */ *pixel = ~(*pen); } -static INLINE void SetPixel_MASKPENNOT_32bpp(uint32* pixel, uint32* pen) +static INLINE void SetPixel_MASKPENNOT_32bpp(UINT32* pixel, UINT32* pen) { /* D = P & ~D */ *pixel = *pen & ~*pixel; } -static INLINE void SetPixel_NOT_32bpp(uint32* pixel, uint32* pen) +static INLINE void SetPixel_NOT_32bpp(UINT32* pixel, UINT32* pen) { /* D = ~D */ *pixel = ~(*pixel); } -static INLINE void SetPixel_XORPEN_32bpp(uint32* pixel, uint32* pen) +static INLINE void SetPixel_XORPEN_32bpp(UINT32* pixel, UINT32* pen) { /* D = D ^ P */ *pixel = *pixel ^ *pen; } -static INLINE void SetPixel_NOTMASKPEN_32bpp(uint32* pixel, uint32* pen) +static INLINE void SetPixel_NOTMASKPEN_32bpp(UINT32* pixel, UINT32* pen) { /* D = ~(D & P) */ *pixel = ~(*pixel & *pen); } -static INLINE void SetPixel_MASKPEN_32bpp(uint32* pixel, uint32* pen) +static INLINE void SetPixel_MASKPEN_32bpp(UINT32* pixel, UINT32* pen) { /* D = D & P */ *pixel &= *pen; } -static INLINE void SetPixel_NOTXORPEN_32bpp(uint32* pixel, uint32* pen) +static INLINE void SetPixel_NOTXORPEN_32bpp(UINT32* pixel, UINT32* pen) { /* D = ~(D ^ P) */ *pixel = ~(*pixel ^ *pen); } -static INLINE void SetPixel_NOP_32bpp(uint32* pixel, uint32* pen) +static INLINE void SetPixel_NOP_32bpp(UINT32* pixel, UINT32* pen) { /* D = D */ } -static INLINE void SetPixel_MERGENOTPEN_32bpp(uint32* pixel, uint32* pen) +static INLINE void SetPixel_MERGENOTPEN_32bpp(UINT32* pixel, UINT32* pen) { /* D = D | ~P */ *pixel |= ~(*pen); } -static INLINE void SetPixel_COPYPEN_32bpp(uint32* pixel, uint32* pen) +static INLINE void SetPixel_COPYPEN_32bpp(UINT32* pixel, UINT32* pen) { /* D = P */ *pixel = *pen; } -static INLINE void SetPixel_MERGEPENNOT_32bpp(uint32* pixel, uint32* pen) +static INLINE void SetPixel_MERGEPENNOT_32bpp(UINT32* pixel, UINT32* pen) { /* D = P | ~D */ *pixel = *pen | ~(*pixel); } -static INLINE void SetPixel_MERGEPEN_32bpp(uint32* pixel, uint32* pen) +static INLINE void SetPixel_MERGEPEN_32bpp(UINT32* pixel, UINT32* pen) { /* D = P | D */ *pixel |= *pen; } -static INLINE void SetPixel_WHITE_32bpp(uint32* pixel, uint32* pen) +static INLINE void SetPixel_WHITE_32bpp(UINT32* pixel, UINT32* pen) { /* D = 1 */ *pixel = 0xFFFFFF; } -#define PIXEL_TYPE uint32 +#define PIXEL_TYPE UINT32 #define GDI_GET_POINTER gdi_GetPointer_32bpp #define GDI_GET_PEN_COLOR gdi_GetPenColor_32bpp diff --git a/libfreerdp/gdi/bitmap.c b/libfreerdp/gdi/bitmap.c index cd0ee68ee..2b9a916c2 100644 --- a/libfreerdp/gdi/bitmap.c +++ b/libfreerdp/gdi/bitmap.c @@ -72,9 +72,9 @@ INLINE UINT16 gdi_GetPixel_16bpp(HGDI_BITMAP hBmp, int X, int Y) return *((UINT16*)&(hBmp->data[(Y * hBmp->width * 2) + X * 2])); } -INLINE uint32 gdi_GetPixel_32bpp(HGDI_BITMAP hBmp, int X, int Y) +INLINE UINT32 gdi_GetPixel_32bpp(HGDI_BITMAP hBmp, int X, int Y) { - return *((uint32*)&(hBmp->data[(Y * hBmp->width * 4) + X * 4])); + return *((UINT32*)&(hBmp->data[(Y * hBmp->width * 4) + X * 4])); } INLINE BYTE* gdi_GetPointer_8bpp(HGDI_BITMAP hBmp, int X, int Y) @@ -87,9 +87,9 @@ INLINE UINT16* gdi_GetPointer_16bpp(HGDI_BITMAP hBmp, int X, int Y) return ((UINT16*)&(hBmp->data[(Y * hBmp->width * 2) + X * 2])); } -INLINE uint32* gdi_GetPointer_32bpp(HGDI_BITMAP hBmp, int X, int Y) +INLINE UINT32* gdi_GetPointer_32bpp(HGDI_BITMAP hBmp, int X, int Y) { - return ((uint32*)&(hBmp->data[(Y * hBmp->width * 4) + X * 4])); + return ((UINT32*)&(hBmp->data[(Y * hBmp->width * 4) + X * 4])); } /** @@ -119,9 +119,9 @@ INLINE void gdi_SetPixel_16bpp(HGDI_BITMAP hBmp, int X, int Y, UINT16 pixel) *((UINT16*)&(hBmp->data[(Y * hBmp->width * 2) + X * 2])) = pixel; } -INLINE void gdi_SetPixel_32bpp(HGDI_BITMAP hBmp, int X, int Y, uint32 pixel) +INLINE void gdi_SetPixel_32bpp(HGDI_BITMAP hBmp, int X, int Y, UINT32 pixel) { - *((uint32*)&(hBmp->data[(Y * hBmp->width * 4) + X * 4])) = pixel; + *((UINT32*)&(hBmp->data[(Y * hBmp->width * 4) + X * 4])) = pixel; } /** diff --git a/libfreerdp/gdi/gdi.c b/libfreerdp/gdi/gdi.c index c5d85ed63..53a840a20 100644 --- a/libfreerdp/gdi/gdi.c +++ b/libfreerdp/gdi/gdi.c @@ -51,7 +51,7 @@ #include "gdi.h" /* Ternary Raster Operation Table */ -static const uint32 rop3_code_table[] = +static const UINT32 rop3_code_table[] = { 0x00000042, /* 0 */ 0x00010289, /* DPSoon */ @@ -313,7 +313,7 @@ static const uint32 rop3_code_table[] = /* GDI Helper Functions */ -INLINE uint32 gdi_rop3_code(BYTE code) +INLINE UINT32 gdi_rop3_code(BYTE code) { return rop3_code_table[code]; } @@ -476,7 +476,7 @@ void gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt) if (brush->style == GDI_BS_SOLID) { - uint32 color; + UINT32 color; originalBrush = gdi->drawing->hdc->brush; color = freerdp_color_convert_rgb(patblt->foreColor, gdi->srcBpp, 32, gdi->clrconv); @@ -532,7 +532,7 @@ void gdi_opaque_rect(rdpContext* context, OPAQUE_RECT_ORDER* opaque_rect) { GDI_RECT rect; HGDI_BRUSH hBrush; - uint32 brush_color; + UINT32 brush_color; rdpGdi *gdi = context->gdi; gdi_CRgnToRect(opaque_rect->nLeftRect, opaque_rect->nTopRect, @@ -551,7 +551,7 @@ void gdi_multi_opaque_rect(rdpContext* context, MULTI_OPAQUE_RECT_ORDER* multi_o int i; GDI_RECT rect; HGDI_BRUSH hBrush; - uint32 brush_color; + UINT32 brush_color; DELTA_RECT* rectangle; rdpGdi *gdi = context->gdi; @@ -573,7 +573,7 @@ void gdi_multi_opaque_rect(rdpContext* context, MULTI_OPAQUE_RECT_ORDER* multi_o void gdi_line_to(rdpContext* context, LINE_TO_ORDER* line_to) { - uint32 color; + UINT32 color; HGDI_PEN hPen; rdpGdi *gdi = context->gdi; @@ -591,12 +591,12 @@ void gdi_line_to(rdpContext* context, LINE_TO_ORDER* line_to) void gdi_polyline(rdpContext* context, POLYLINE_ORDER* polyline) { int i; - uint32 color; + UINT32 color; HGDI_PEN hPen; DELTA_POINT* points; rdpGdi* gdi = context->gdi; - sint32 x; - sint32 y; + INT32 x; + INT32 y; color = freerdp_color_convert_rgb(polyline->penColor, gdi->srcBpp, 32, gdi->clrconv); hPen = gdi_CreatePen(GDI_PS_SOLID, 1, (GDI_COLOR) color); @@ -634,8 +634,8 @@ void gdi_memblt(rdpContext* context, MEMBLT_ORDER* memblt) void gdi_mem3blt(rdpContext* context, MEM3BLT_ORDER* mem3blt) { rdpBrush* brush; - uint32 foreColor; - uint32 backColor; + UINT32 foreColor; + UINT32 backColor; gdiBitmap* bitmap; HGDI_BRUSH originalBrush; rdpGdi* gdi = context->gdi; @@ -875,7 +875,7 @@ void gdi_resize(rdpGdi* gdi, int width, int height) * @return */ -int gdi_init(freerdp* instance, uint32 flags, BYTE* buffer) +int gdi_init(freerdp* instance, UINT32 flags, BYTE* buffer) { rdpGdi* gdi; rdpCache* cache; diff --git a/libfreerdp/gdi/graphics.c b/libfreerdp/gdi/graphics.c index f214e2236..f49b4e70b 100644 --- a/libfreerdp/gdi/graphics.c +++ b/libfreerdp/gdi/graphics.c @@ -231,7 +231,7 @@ void gdi_Glyph_Draw(rdpContext* context, rdpGlyph* glyph, int x, int y) gdi_glyph->bitmap->height, gdi_glyph->hdc, 0, 0, GDI_DSPDxax); } -void gdi_Glyph_BeginDraw(rdpContext* context, int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor) +void gdi_Glyph_BeginDraw(rdpContext* context, int x, int y, int width, int height, UINT32 bgcolor, UINT32 fgcolor) { GDI_RECT rect; HGDI_BRUSH brush; @@ -249,7 +249,7 @@ void gdi_Glyph_BeginDraw(rdpContext* context, int x, int y, int width, int heigh gdi->textColor = gdi_SetTextColor(gdi->drawing->hdc, bgcolor); } -void gdi_Glyph_EndDraw(rdpContext* context, int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor) +void gdi_Glyph_EndDraw(rdpContext* context, int x, int y, int width, int height, UINT32 bgcolor, UINT32 fgcolor) { rdpGdi* gdi = context->gdi; diff --git a/libfreerdp/gdi/pen.c b/libfreerdp/gdi/pen.c index b65c5355d..db98ceac6 100644 --- a/libfreerdp/gdi/pen.c +++ b/libfreerdp/gdi/pen.c @@ -69,7 +69,7 @@ INLINE UINT16 gdi_GetPenColor_16bpp(HGDI_PEN pen) return p; } -INLINE uint32 gdi_GetPenColor_32bpp(HGDI_PEN pen) +INLINE UINT32 gdi_GetPenColor_32bpp(HGDI_PEN pen) { return pen->color; } diff --git a/libfreerdp/gdi/shape.c b/libfreerdp/gdi/shape.c index 6e86c3036..840c68771 100644 --- a/libfreerdp/gdi/shape.c +++ b/libfreerdp/gdi/shape.c @@ -54,7 +54,7 @@ static void Ellipse_Bresenham(HGDI_DC hdc, int x1, int y1, int x2, int y2) HGDI_BITMAP bmp; BYTE pixel8; UINT16 pixel16; - uint32 pixel32; + UINT32 pixel32; int bpp = hdc->bitsPerPixel; a = (x1 < x2) ? x2 - x1 : x1 - x2; diff --git a/libfreerdp/locale/keyboard.c b/libfreerdp/locale/keyboard.c index 91252f45b..0a5764476 100644 --- a/libfreerdp/locale/keyboard.c +++ b/libfreerdp/locale/keyboard.c @@ -41,12 +41,12 @@ #endif -uint32 RDP_SCANCODE_TO_X11_KEYCODE[256][2]; +UINT32 RDP_SCANCODE_TO_X11_KEYCODE[256][2]; RDP_SCANCODE X11_KEYCODE_TO_RDP_SCANCODE[256]; extern const RDP_SCANCODE VIRTUAL_KEY_CODE_TO_DEFAULT_RDP_SCANCODE_TABLE[256]; -uint32 freerdp_detect_keyboard(uint32 keyboardLayoutID) +UINT32 freerdp_detect_keyboard(UINT32 keyboardLayoutID) { if (keyboardLayoutID != 0) DEBUG_KBD("keyboard layout configuration: %X", keyboardLayoutID); @@ -66,9 +66,9 @@ uint32 freerdp_detect_keyboard(uint32 keyboardLayoutID) return keyboardLayoutID; } -uint32 freerdp_keyboard_init(uint32 keyboardLayoutId) +UINT32 freerdp_keyboard_init(UINT32 keyboardLayoutId) { - uint32 keycode; + UINT32 keycode; #ifdef WITH_X11 @@ -90,7 +90,7 @@ uint32 freerdp_keyboard_init(uint32 keyboardLayoutId) return keyboardLayoutId; } -RDP_SCANCODE freerdp_keyboard_get_rdp_scancode_from_x11_keycode(uint32 keycode) +RDP_SCANCODE freerdp_keyboard_get_rdp_scancode_from_x11_keycode(UINT32 keycode) { DEBUG_KBD("x11 keycode: %02X -> rdp code: %02X%s", keycode, RDP_SCANCODE_CODE(X11_KEYCODE_TO_RDP_SCANCODE[keycode]), @@ -99,7 +99,7 @@ RDP_SCANCODE freerdp_keyboard_get_rdp_scancode_from_x11_keycode(uint32 keycode) return X11_KEYCODE_TO_RDP_SCANCODE[keycode]; } -uint32 freerdp_keyboard_get_x11_keycode_from_rdp_scancode(uint32 scancode, BOOL extended) +UINT32 freerdp_keyboard_get_x11_keycode_from_rdp_scancode(UINT32 scancode, BOOL extended) { if (extended) return RDP_SCANCODE_TO_X11_KEYCODE[scancode][1]; @@ -107,7 +107,7 @@ uint32 freerdp_keyboard_get_x11_keycode_from_rdp_scancode(uint32 scancode, BOOL return RDP_SCANCODE_TO_X11_KEYCODE[scancode][0]; } -RDP_SCANCODE freerdp_keyboard_get_rdp_scancode_from_virtual_key_code(uint32 vkcode) +RDP_SCANCODE freerdp_keyboard_get_rdp_scancode_from_virtual_key_code(UINT32 vkcode) { return VIRTUAL_KEY_CODE_TO_DEFAULT_RDP_SCANCODE_TABLE[vkcode]; } diff --git a/libfreerdp/locale/keyboard_keymap.c b/libfreerdp/locale/keyboard_keymap.c index 079463b85..e4eb06b9e 100644 --- a/libfreerdp/locale/keyboard_keymap.c +++ b/libfreerdp/locale/keyboard_keymap.c @@ -35,16 +35,16 @@ extern const RDP_SCANCODE VIRTUAL_KEY_CODE_TO_DEFAULT_RDP_SCANCODE_TABLE[256]; -int freerdp_keyboard_load_map(uint32 keycode_to_vkcode[256], char* name) +int freerdp_keyboard_load_map(UINT32 keycode_to_vkcode[256], char* name) { FILE* fp; char* pch; char* beg; char* end; - uint32 vkcode; + UINT32 vkcode; int kbd_found = 0; char* keymap_path; - uint32 keycode = 0; + UINT32 keycode = 0; char buffer[1024] = ""; char keymap_name[256] = ""; char keymap_include[256] = ""; @@ -177,7 +177,7 @@ int freerdp_keyboard_load_map(uint32 keycode_to_vkcode[256], char* name) return 1; } -void freerdp_keyboard_load_maps(uint32 keycode_to_vkcode[256], char* names) +void freerdp_keyboard_load_maps(UINT32 keycode_to_vkcode[256], char* names) { char* kbd; char* names_end; diff --git a/libfreerdp/locale/keyboard_keymap.h b/libfreerdp/locale/keyboard_keymap.h index 3ae3b76ec..d64aae207 100644 --- a/libfreerdp/locale/keyboard_keymap.h +++ b/libfreerdp/locale/keyboard_keymap.h @@ -22,7 +22,7 @@ #include -int freerdp_keyboard_load_map(uint32 keycode_to_vkcode[256], char* name); -void freerdp_keyboard_load_maps(uint32 keycode_to_vkcode[256], char* names); +int freerdp_keyboard_load_map(UINT32 keycode_to_vkcode[256], char* name); +void freerdp_keyboard_load_maps(UINT32 keycode_to_vkcode[256], char* names); #endif /* __KEYBOARD_KEYMAP_H */ diff --git a/libfreerdp/locale/keyboard_layout.c b/libfreerdp/locale/keyboard_layout.c index 422d113f9..cca91c7b9 100644 --- a/libfreerdp/locale/keyboard_layout.c +++ b/libfreerdp/locale/keyboard_layout.c @@ -129,8 +129,8 @@ static const RDP_KEYBOARD_LAYOUT RDP_KEYBOARD_LAYOUT_TABLE[] = struct _RDP_KEYBOARD_LAYOUT_VARIANT { - uint32 code; /* Keyboard layout code */ - uint32 id; /* Keyboard variant ID */ + UINT32 code; /* Keyboard layout code */ + UINT32 id; /* Keyboard variant ID */ const char* name; /* Keyboard layout variant name */ }; typedef struct _RDP_KEYBOARD_LAYOUT_VARIANT RDP_KEYBOARD_LAYOUT_VARIANT; @@ -186,7 +186,7 @@ static const RDP_KEYBOARD_LAYOUT_VARIANT RDP_KEYBOARD_LAYOUT_VARIANT_TABLE[] = struct _RDP_KEYBOARD_IME { - uint32 code; /* Keyboard layout code */ + UINT32 code; /* Keyboard layout code */ const char* file; /* IME file */ const char* name; /* Keyboard layout name */ }; @@ -478,7 +478,7 @@ const RDP_SCANCODE VIRTUAL_KEY_CODE_TO_DEFAULT_RDP_SCANCODE_TABLE[256] = RDP_SCANCODE_UNKNOWN }; -RDP_KEYBOARD_LAYOUT* freerdp_keyboard_get_layouts(uint32 types) +RDP_KEYBOARD_LAYOUT* freerdp_keyboard_get_layouts(UINT32 types) { int num, length, i; RDP_KEYBOARD_LAYOUT* layouts; @@ -525,7 +525,7 @@ RDP_KEYBOARD_LAYOUT* freerdp_keyboard_get_layouts(uint32 types) return layouts; } -const char* freerdp_keyboard_get_layout_name_from_id(uint32 keyboardLayoutID) +const char* freerdp_keyboard_get_layout_name_from_id(UINT32 keyboardLayoutID) { int i; diff --git a/libfreerdp/locale/keyboard_sun.c b/libfreerdp/locale/keyboard_sun.c index aa41e1cf6..92a783785 100644 --- a/libfreerdp/locale/keyboard_sun.c +++ b/libfreerdp/locale/keyboard_sun.c @@ -54,10 +54,10 @@ struct _SOLARIS_KEYBOARD { - uint32 type; /* Solaris keyboard type */ - uint32 layout; /* Layout */ + UINT32 type; /* Solaris keyboard type */ + UINT32 layout; /* Layout */ char* xkbType; /* XKB keyboard */ - uint32 keyboardLayoutId; /* XKB keyboard layout */ + UINT32 keyboardLayoutId; /* XKB keyboard layout */ }; typedef struct _SOLARIS_KEYBOARD SOLARIS_KEYBOARD; @@ -202,7 +202,7 @@ static const SOLARIS_KEYBOARD SOLARIS_KEYBOARD_TABLE[] = { 6, 272, "sun(type6)", KBD_PORTUGUESE_BRAZILIAN_ABNT } /* Brazil6_usb */ }; -uint32 freerdp_detect_keyboard_type_and_layout_solaris(char* keyboard_type, int length) +UINT32 freerdp_detect_keyboard_type_and_layout_solaris(char* keyboard_type, int length) { FILE* kbd; diff --git a/libfreerdp/locale/keyboard_sun.h b/libfreerdp/locale/keyboard_sun.h index 2404723fe..985e1e3ac 100644 --- a/libfreerdp/locale/keyboard_sun.h +++ b/libfreerdp/locale/keyboard_sun.h @@ -20,6 +20,6 @@ #ifndef __LOCALE_KEYBOARD_SUN_H #define __LOCALE_KEYBOARD_SUN_H -uint32 freerdp_detect_keyboard_type_and_layout_solaris(char* keyboard_type, int length); +UINT32 freerdp_detect_keyboard_type_and_layout_solaris(char* keyboard_type, int length); #endif /* __LOCALE_KEYBOARD_SUN_H */ diff --git a/libfreerdp/locale/keyboard_x11.c b/libfreerdp/locale/keyboard_x11.c index d974de55e..639414a44 100644 --- a/libfreerdp/locale/keyboard_x11.c +++ b/libfreerdp/locale/keyboard_x11.c @@ -45,7 +45,7 @@ extern const RDP_SCANCODE VIRTUAL_KEY_CODE_TO_DEFAULT_RDP_SCANCODE_TABLE[256]; -uint32 freerdp_detect_keyboard_layout_from_xkb(char** xkb_layout, char** xkb_variant) +UINT32 freerdp_detect_keyboard_layout_from_xkb(char** xkb_layout, char** xkb_variant) { char* pch; char* beg; @@ -54,7 +54,7 @@ uint32 freerdp_detect_keyboard_layout_from_xkb(char** xkb_layout, char** xkb_var char buffer[1024]; char* layout = NULL; char* variant = NULL; - uint32 keyboardLayoutId = 0; + UINT32 keyboardLayoutId = 0; /* We start by looking for _XKB_RULES_NAMES_BACKUP which appears to be used by libxklavier */ @@ -211,11 +211,11 @@ char* freerdp_detect_keymap_from_xkb() return keymap; } -uint32 freerdp_keyboard_init_x11(uint32 keyboardLayoutId, RDP_SCANCODE x11_keycode_to_rdp_scancode[256]) +UINT32 freerdp_keyboard_init_x11(UINT32 keyboardLayoutId, RDP_SCANCODE x11_keycode_to_rdp_scancode[256]) { - uint32 vkcode; - uint32 keycode; - uint32 keycode_to_vkcode[256]; + UINT32 vkcode; + UINT32 keycode; + UINT32 keycode_to_vkcode[256]; memset(keycode_to_vkcode, 0, sizeof(keycode_to_vkcode)); memset(x11_keycode_to_rdp_scancode, 0, sizeof(x11_keycode_to_rdp_scancode)); diff --git a/libfreerdp/locale/keyboard_x11.h b/libfreerdp/locale/keyboard_x11.h index ccd875579..77dece1c9 100644 --- a/libfreerdp/locale/keyboard_x11.h +++ b/libfreerdp/locale/keyboard_x11.h @@ -20,6 +20,6 @@ #ifndef __LOCALE_KEYBOARD_X11_H #define __LOCALE_KEYBOARD_X11_H -uint32 freerdp_keyboard_init_x11(uint32 keyboardLayoutId, RDP_SCANCODE x11_keycode_to_rdp_scancode[256]); +UINT32 freerdp_keyboard_init_x11(UINT32 keyboardLayoutId, RDP_SCANCODE x11_keycode_to_rdp_scancode[256]); #endif /* __LOCALE_KEYBOARD_X11_H */ diff --git a/libfreerdp/locale/keyboard_xkbfile.c b/libfreerdp/locale/keyboard_xkbfile.c index d2a02bf66..49b06a9d3 100644 --- a/libfreerdp/locale/keyboard_xkbfile.c +++ b/libfreerdp/locale/keyboard_xkbfile.c @@ -179,7 +179,7 @@ void* freerdp_keyboard_xkb_init() return (void*) display; } -uint32 freerdp_keyboard_init_xkbfile(uint32 keyboardLayoutId, RDP_SCANCODE x11_keycode_to_rdp_scancode[256]) +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)); @@ -227,12 +227,12 @@ static char* comma_substring(char* s, int n) return s; } -uint32 detect_keyboard_layout_from_xkbfile(void* display) +UINT32 detect_keyboard_layout_from_xkbfile(void* display) { char* layout; char* variant; - uint32 group = 0; - uint32 keyboard_layout = 0; + UINT32 group = 0; + UINT32 keyboard_layout = 0; XkbRF_VarDefsRec rules_names; XKeyboardState coreKbdState; XkbStateRec state; diff --git a/libfreerdp/locale/keyboard_xkbfile.h b/libfreerdp/locale/keyboard_xkbfile.h index a6be05e42..9205bd13d 100644 --- a/libfreerdp/locale/keyboard_xkbfile.h +++ b/libfreerdp/locale/keyboard_xkbfile.h @@ -23,8 +23,8 @@ #include #include -uint32 freerdp_keyboard_init_xkbfile(uint32 keyboardLayoutId, RDP_SCANCODE x11_keycode_to_rdp_scancode[256]); -uint32 detect_keyboard_layout_from_xkbfile(void* display); +UINT32 freerdp_keyboard_init_xkbfile(UINT32 keyboardLayoutId, RDP_SCANCODE x11_keycode_to_rdp_scancode[256]); +UINT32 detect_keyboard_layout_from_xkbfile(void* display); int freerdp_keyboard_load_map_from_xkbfile(void* display, RDP_SCANCODE x11_keycode_to_rdp_scancode[256]); #endif /* __LOCALE_KEYBOARD_XKB_H */ diff --git a/libfreerdp/locale/locale.c b/libfreerdp/locale/locale.c index ee1f0bfc9..8f72b2171 100644 --- a/libfreerdp/locale/locale.c +++ b/libfreerdp/locale/locale.c @@ -34,7 +34,7 @@ struct _SYSTEM_LOCALE { char language[4]; /* Two or three letter language code */ char country[10]; /* Two or three letter country code (Sometimes with Cyrl_ prefix) */ - uint32 code; /* 32-bit unsigned integer corresponding to the locale */ + UINT32 code; /* 32-bit unsigned integer corresponding to the locale */ }; typedef struct _SYSTEM_LOCALE SYSTEM_LOCALE; @@ -248,7 +248,7 @@ static const SYSTEM_LOCALE SYSTEM_LOCALE_TABLE[] = struct _LOCALE_NAME { - uint32 localeId; + UINT32 localeId; const char* name; }; typedef struct _LOCALE_NAME LOCALE_NAME; @@ -458,8 +458,8 @@ static const LOCALE_NAME LOCALE_NAME_TABLE[] = struct _LOCALE_KEYBOARD_LAYOUTS { - uint32 locale; /* Locale ID */ - uint32 keyboardLayouts[5]; /* array of associated keyboard layouts */ + UINT32 locale; /* Locale ID */ + UINT32 keyboardLayouts[5]; /* array of associated keyboard layouts */ }; typedef struct _LOCALE_KEYBOARD_LAYOUTS LOCALE_KEYBOARD_LAYOUTS; @@ -691,7 +691,7 @@ SYSTEM_LOCALE* freerdp_detect_system_locale() return locale; } -uint32 freerdp_get_system_locale_id() +UINT32 freerdp_get_system_locale_id() { SYSTEM_LOCALE* locale; @@ -703,7 +703,7 @@ uint32 freerdp_get_system_locale_id() return 0; } -const char* freerdp_get_system_locale_name_from_id(uint32 localeId) +const char* freerdp_get_system_locale_name_from_id(UINT32 localeId) { int index; @@ -716,7 +716,7 @@ const char* freerdp_get_system_locale_name_from_id(uint32 localeId) return NULL; } -uint32 freerdp_detect_keyboard_layout_from_system_locale() +UINT32 freerdp_detect_keyboard_layout_from_system_locale() { int i, j; char language[4]; diff --git a/libfreerdp/locale/timezone.c b/libfreerdp/locale/timezone.c index 665e31cd0..f46a5fcb5 100644 --- a/libfreerdp/locale/timezone.c +++ b/libfreerdp/locale/timezone.c @@ -53,9 +53,9 @@ typedef struct _SYSTEM_TIME_ENTRY SYSTEM_TIME_ENTRY; struct _TIME_ZONE_RULE_ENTRY { - uint64 TicksStart; - uint64 TicksEnd; - sint32 DaylightDelta; + UINT64 TicksStart; + UINT64 TicksEnd; + INT32 DaylightDelta; SYSTEM_TIME_ENTRY StandardDate; SYSTEM_TIME_ENTRY DaylightDate; }; @@ -64,13 +64,13 @@ typedef struct _TIME_ZONE_RULE_ENTRY TIME_ZONE_RULE_ENTRY; struct _TIME_ZONE_ENTRY { const char* Id; - uint32 Bias; + UINT32 Bias; BOOL SupportsDST; const char* DisplayName; const char* StandardName; const char* DaylightName; TIME_ZONE_RULE_ENTRY* RuleTable; - uint32 RuleTableCount; + UINT32 RuleTableCount; }; typedef struct _TIME_ZONE_ENTRY TIME_ZONE_ENTRY; @@ -1598,7 +1598,7 @@ BOOL freerdp_match_unix_timezone_identifier_with_list(const char* tzid, const ch return FALSE; } -TIME_ZONE_ENTRY* freerdp_detect_windows_time_zone(uint32 bias) +TIME_ZONE_ENTRY* freerdp_detect_windows_time_zone(UINT32 bias) { int i, j; char* tzid; @@ -1632,10 +1632,10 @@ TIME_ZONE_ENTRY* freerdp_detect_windows_time_zone(uint32 bias) return NULL; } -TIME_ZONE_RULE_ENTRY* freerdp_get_current_time_zone_rule(TIME_ZONE_RULE_ENTRY* rules, uint32 count) +TIME_ZONE_RULE_ENTRY* freerdp_get_current_time_zone_rule(TIME_ZONE_RULE_ENTRY* rules, UINT32 count) { int i; - uint64 windows_time; + UINT64 windows_time; windows_time = freerdp_windows_gmtime(); @@ -1663,14 +1663,14 @@ void freerdp_time_zone_detect(TIME_ZONE_INFO* clientTimeZone) #ifdef HAVE_TM_GMTOFF if (local_time->tm_gmtoff >= 0) - clientTimeZone->bias = (uint32) (local_time->tm_gmtoff / 60); + clientTimeZone->bias = (UINT32) (local_time->tm_gmtoff / 60); else - clientTimeZone->bias = (uint32) (1440 + (sint32) (local_time->tm_gmtoff / 60)); + clientTimeZone->bias = (UINT32) (1440 + (INT32) (local_time->tm_gmtoff / 60)); #elif sun if (local_time->tm_isdst > 0) - clientTimeZone->bias = (uint32) (altzone / 3600); + clientTimeZone->bias = (UINT32) (altzone / 3600); else - clientTimeZone->bias = (uint32) (timezone / 3600); + clientTimeZone->bias = (UINT32) (timezone / 3600); #else clientTimeZone->bias = 0; #endif diff --git a/libfreerdp/locale/virtual_key_codes.c b/libfreerdp/locale/virtual_key_codes.c index bd2d9cc81..af93af025 100644 --- a/libfreerdp/locale/virtual_key_codes.c +++ b/libfreerdp/locale/virtual_key_codes.c @@ -31,7 +31,7 @@ struct _VIRTUAL_KEY_CODE { - uint32 code; /* Windows Virtual Key Code */ + UINT32 code; /* Windows Virtual Key Code */ const char* name; /* Virtual Key Code Name */ }; typedef struct _VIRTUAL_KEY_CODE VIRTUAL_KEY_CODE; @@ -296,12 +296,12 @@ static const VIRTUAL_KEY_CODE VIRTUAL_KEY_CODE_TABLE[256] = { 0, "" } }; -const char* freerdp_keyboard_get_virtual_key_code_name(uint32 vkcode) +const char* freerdp_keyboard_get_virtual_key_code_name(UINT32 vkcode) { return VIRTUAL_KEY_CODE_TABLE[vkcode].name; } -uint32 freerdp_keyboard_get_virtual_key_code_from_name(const char* vkcode_name) +UINT32 freerdp_keyboard_get_virtual_key_code_from_name(const char* vkcode_name) { int i = 0; for (i = 0; i < ARRAY_SIZE(VIRTUAL_KEY_CODE_TABLE); i++) diff --git a/libfreerdp/locale/xkb_layout_ids.c b/libfreerdp/locale/xkb_layout_ids.c index 1037351fa..623b86db3 100644 --- a/libfreerdp/locale/xkb_layout_ids.c +++ b/libfreerdp/locale/xkb_layout_ids.c @@ -33,14 +33,14 @@ struct _XKB_VARIANT { const char* variant; /* XKB Keyboard layout variant */ - uint32 keyboardLayoutID; /* Keyboard Layout ID */ + UINT32 keyboardLayoutID; /* Keyboard Layout ID */ }; typedef struct _XKB_VARIANT XKB_VARIANT; struct _XKB_LAYOUT { const char* layout; /* XKB Keyboard layout */ - uint32 keyboardLayoutID; /* Keyboard Layout ID */ + UINT32 keyboardLayoutID; /* Keyboard Layout ID */ const XKB_VARIANT* variants; }; typedef struct _XKB_LAYOUT XKB_LAYOUT; @@ -895,7 +895,7 @@ static const XKB_LAYOUT xkbLayouts[] = { "tm", KBD_TURKISH_Q, tm_variants }, /* Turkmenistan */ }; -uint32 find_keyboard_layout_in_xorg_rules(char* layout, char* variant) +UINT32 find_keyboard_layout_in_xorg_rules(char* layout, char* variant) { int i, j; diff --git a/libfreerdp/locale/xkb_layout_ids.h b/libfreerdp/locale/xkb_layout_ids.h index bfd379c5b..6e0c6469b 100644 --- a/libfreerdp/locale/xkb_layout_ids.h +++ b/libfreerdp/locale/xkb_layout_ids.h @@ -22,6 +22,6 @@ #include -uint32 find_keyboard_layout_in_xorg_rules(char* layout, char* variant); +UINT32 find_keyboard_layout_in_xorg_rules(char* layout, char* variant); #endif /* __FREERDP_XKB_LAYOUT_IDS_H */ diff --git a/libfreerdp/rail/window.c b/libfreerdp/rail/window.c index 5bfc9c722..792bd6b62 100644 --- a/libfreerdp/rail/window.c +++ b/libfreerdp/rail/window.c @@ -34,7 +34,7 @@ struct _WINDOW_STYLE { - uint32 style; + UINT32 style; const char* name; BOOL multi; }; @@ -97,7 +97,7 @@ static const WINDOW_STYLE EXTENDED_WINDOW_STYLES[] = { WS_EX_WINDOWEDGE, "WS_EX_WINDOWEDGE", FALSE } }; -void print_window_styles(uint32 style) +void print_window_styles(UINT32 style) { int i; @@ -118,7 +118,7 @@ void print_window_styles(uint32 style) printf("}\n"); } -void print_extended_window_styles(uint32 style) +void print_extended_window_styles(UINT32 style) { int i; diff --git a/libfreerdp/rail/window_list.c b/libfreerdp/rail/window_list.c index f225b5cb1..dc42f1d01 100644 --- a/libfreerdp/rail/window_list.c +++ b/libfreerdp/rail/window_list.c @@ -77,7 +77,7 @@ rdpWindow* window_list_get_by_extra_id(rdpWindowList* list, void* extraId) return NULL; } -rdpWindow* window_list_get_by_id(rdpWindowList* list, uint32 windowId) +rdpWindow* window_list_get_by_id(rdpWindowList* list, UINT32 windowId) { rdpWindow* window; diff --git a/libfreerdp/utils/bitmap.c b/libfreerdp/utils/bitmap.c index 9fb07a5a1..65004c2a7 100644 --- a/libfreerdp/utils/bitmap.c +++ b/libfreerdp/utils/bitmap.c @@ -35,25 +35,25 @@ typedef struct typedef struct { - uint32 filesz; + UINT32 filesz; UINT16 creator1; UINT16 creator2; - uint32 bmp_offset; + UINT32 bmp_offset; } BITMAP_CORE_HEADER; typedef struct { - uint32 header_sz; - sint32 width; - sint32 height; + UINT32 header_sz; + INT32 width; + INT32 height; UINT16 nplanes; UINT16 bitspp; - uint32 compress_type; - uint32 bmp_bytesz; - sint32 hres; - sint32 vres; - uint32 ncolors; - uint32 nimpcolors; + UINT32 compress_type; + UINT32 bmp_bytesz; + INT32 hres; + INT32 vres; + UINT32 ncolors; + UINT32 nimpcolors; } BITMAP_INFO_HEADER; void freerdp_bitmap_write(char* filename, void* data, int width, int height, int bpp) diff --git a/libfreerdp/utils/dsp.c b/libfreerdp/utils/dsp.c index 503901fd4..189efc510 100644 --- a/libfreerdp/utils/dsp.c +++ b/libfreerdp/utils/dsp.c @@ -31,8 +31,8 @@ static void freerdp_dsp_resample(FREERDP_DSP_CONTEXT* context, const BYTE* src, int bytes_per_sample, - uint32 schan, uint32 srate, int sframes, - uint32 rchan, uint32 rrate) + UINT32 schan, UINT32 srate, int sframes, + UINT32 rchan, UINT32 rrate) { BYTE* dst; BYTE* p; @@ -103,8 +103,8 @@ static const INT16 ima_step_size_table[] = static UINT16 dsp_decode_ima_adpcm_sample(ADPCM* adpcm, int channel, BYTE sample) { - sint32 ss; - sint32 d; + INT32 ss; + INT32 d; ss = ima_step_size_table[adpcm->ima.last_step[channel]]; d = (ss >> 3); @@ -140,7 +140,7 @@ static void freerdp_dsp_decode_ima_adpcm(FREERDP_DSP_CONTEXT* context, BYTE* dst; BYTE sample; UINT16 decoded; - uint32 out_size; + UINT32 out_size; int channel; int i; @@ -240,11 +240,11 @@ static const struct static BYTE dsp_encode_ima_adpcm_sample(ADPCM* adpcm, int channel, INT16 sample) { - sint32 e; - sint32 d; - sint32 ss; + INT32 e; + INT32 d; + INT32 ss; BYTE enc; - sint32 diff; + INT32 diff; ss = ima_step_size_table[adpcm->ima.last_step[channel]]; d = e = sample - adpcm->ima.last_sample[channel]; @@ -300,7 +300,7 @@ static void freerdp_dsp_encode_ima_adpcm(FREERDP_DSP_CONTEXT* context, BYTE* dst; INT16 sample; BYTE encoded; - uint32 out_size; + UINT32 out_size; int i; out_size = size / 2; @@ -381,7 +381,7 @@ static const INT16 ms_adpcm_coeff2_table[] = static INT16 freerdp_dsp_decode_ms_adpcm_sample(ADPCM* adpcm, BYTE sample, int channel) { INT8 nibble; - sint32 presample; + INT32 presample; nibble = (sample & 0x08 ? (INT8)sample - 16 : sample); presample = ((adpcm->ms.sample1[channel] * ms_adpcm_coeff1_table[adpcm->ms.predictor[channel]]) + @@ -404,7 +404,7 @@ static void freerdp_dsp_decode_ms_adpcm(FREERDP_DSP_CONTEXT* context, { BYTE* dst; BYTE sample; - uint32 out_size; + UINT32 out_size; out_size = size * 4; if (out_size > context->adpcm_maxlength) @@ -492,10 +492,10 @@ static void freerdp_dsp_decode_ms_adpcm(FREERDP_DSP_CONTEXT* context, context->adpcm_size = dst - context->adpcm_buffer; } -static BYTE freerdp_dsp_encode_ms_adpcm_sample(ADPCM* adpcm, sint32 sample, int channel) +static BYTE freerdp_dsp_encode_ms_adpcm_sample(ADPCM* adpcm, INT32 sample, int channel) { - sint32 presample; - sint32 errordelta; + INT32 presample; + INT32 errordelta; presample = ((adpcm->ms.sample1[channel] * ms_adpcm_coeff1_table[adpcm->ms.predictor[channel]]) + (adpcm->ms.sample2[channel] * ms_adpcm_coeff2_table[adpcm->ms.predictor[channel]])) / 256; @@ -523,8 +523,8 @@ static void freerdp_dsp_encode_ms_adpcm(FREERDP_DSP_CONTEXT* context, const BYTE* src, int size, int channels, int block_size) { BYTE* dst; - sint32 sample; - uint32 out_size; + INT32 sample; + UINT32 out_size; out_size = size / 2; if (out_size > context->adpcm_maxlength) diff --git a/libfreerdp/utils/msusb.c b/libfreerdp/utils/msusb.c index 3ec293bd7..b143e28ee 100644 --- a/libfreerdp/utils/msusb.c +++ b/libfreerdp/utils/msusb.c @@ -35,7 +35,7 @@ msusb_mspipe_new() } static void -msusb_mspipes_free(MSUSB_PIPE_DESCRIPTOR ** MsPipes, uint32 NumberOfPipes) +msusb_mspipes_free(MSUSB_PIPE_DESCRIPTOR ** MsPipes, UINT32 NumberOfPipes) { int pnum = 0; if (MsPipes) @@ -49,7 +49,7 @@ msusb_mspipes_free(MSUSB_PIPE_DESCRIPTOR ** MsPipes, uint32 NumberOfPipes) } void -msusb_mspipes_replace(MSUSB_INTERFACE_DESCRIPTOR * MsInterface, MSUSB_PIPE_DESCRIPTOR ** NewMsPipes, uint32 NewNumberOfPipes) +msusb_mspipes_replace(MSUSB_INTERFACE_DESCRIPTOR * MsInterface, MSUSB_PIPE_DESCRIPTOR ** NewMsPipes, UINT32 NewNumberOfPipes) { /* free orignal MsPipes */ msusb_mspipes_free(MsInterface->MsPipes, MsInterface->NumberOfPipes); @@ -60,7 +60,7 @@ msusb_mspipes_replace(MSUSB_INTERFACE_DESCRIPTOR * MsInterface, MSUSB_PIPE_DESCR } static MSUSB_PIPE_DESCRIPTOR ** -msusb_mspipes_read(BYTE * data, uint32 data_size, uint32 NumberOfPipes, int * offset) +msusb_mspipes_read(BYTE * data, UINT32 data_size, UINT32 NumberOfPipes, int * offset) { MSUSB_PIPE_DESCRIPTOR ** MsPipes; int pnum, move = 0; @@ -73,8 +73,8 @@ msusb_mspipes_read(BYTE * data, uint32 data_size, uint32 NumberOfPipes, int * of MSUSB_PIPE_DESCRIPTOR * MsPipe = msusb_mspipe_new(); data_read_UINT16(data + move, MsPipe->MaximumPacketSize); - data_read_uint32(data + move + 4, MsPipe->MaximumTransferSize); - data_read_uint32(data + move + 8, MsPipe->PipeFlags); + data_read_UINT32(data + move + 4, MsPipe->MaximumTransferSize); + data_read_UINT32(data + move + 8, MsPipe->PipeFlags); move += 12; /* Already set to zero by memset MsPipe->PipeHandle = 0; @@ -111,7 +111,7 @@ msusb_msinterface_free(MSUSB_INTERFACE_DESCRIPTOR * MsInterface) } static void -msusb_msinterface_free_list(MSUSB_INTERFACE_DESCRIPTOR ** MsInterfaces, uint32 NumInterfaces) +msusb_msinterface_free_list(MSUSB_INTERFACE_DESCRIPTOR ** MsInterfaces, UINT32 NumInterfaces) { int inum = 0; @@ -133,7 +133,7 @@ msusb_msinterface_replace(MSUSB_CONFIG_DESCRIPTOR * MsConfig, BYTE InterfaceNumb } MSUSB_INTERFACE_DESCRIPTOR * -msusb_msinterface_read(BYTE * data, uint32 data_size, int * offset) +msusb_msinterface_read(BYTE * data, UINT32 data_size, int * offset) { MSUSB_INTERFACE_DESCRIPTOR * MsInterface; @@ -143,7 +143,7 @@ msusb_msinterface_read(BYTE * data, uint32 data_size, int * offset) data_read_UINT16(data + 2, MsInterface->NumberOfPipesExpected); data_read_BYTE(data + 4, MsInterface->InterfaceNumber); data_read_BYTE(data + 5, MsInterface->AlternateSetting); - data_read_uint32(data + 8, MsInterface->NumberOfPipes); + data_read_UINT32(data + 8, MsInterface->NumberOfPipes); *offset += 12; MsInterface->InterfaceHandle = 0; @@ -184,9 +184,9 @@ msusb_msinterface_write(MSUSB_INTERFACE_DESCRIPTOR * MsInterface, BYTE * data, i /* Padding */ data_write_BYTE(data + 7, 0); /* InterfaceHandle */ - data_write_uint32(data + 8, MsInterface->InterfaceHandle); + data_write_UINT32(data + 8, MsInterface->InterfaceHandle); /* NumberOfPipes */ - data_write_uint32(data + 12, MsInterface->NumberOfPipes); + data_write_UINT32(data + 12, MsInterface->NumberOfPipes); move += 16; /* Pipes */ MsPipes = MsInterface->MsPipes; @@ -200,13 +200,13 @@ msusb_msinterface_write(MSUSB_INTERFACE_DESCRIPTOR * MsInterface, BYTE * data, i /* Interval */ data_write_BYTE(data + move + 3, MsPipe->bInterval); /* PipeType */ - data_write_uint32(data + move + 4, MsPipe->PipeType); + data_write_UINT32(data + move + 4, MsPipe->PipeType); /* PipeHandle */ - data_write_uint32(data + move + 8, MsPipe->PipeHandle); + data_write_UINT32(data + move + 8, MsPipe->PipeHandle); /* MaximumTransferSize */ - data_write_uint32(data + move + 12, MsPipe->MaximumTransferSize); + data_write_UINT32(data + move + 12, MsPipe->MaximumTransferSize); /* PipeFlags */ - data_write_uint32(data + move + 16, MsPipe->PipeFlags); + data_write_UINT32(data + move + 16, MsPipe->PipeFlags); move += 20; } @@ -217,7 +217,7 @@ msusb_msinterface_write(MSUSB_INTERFACE_DESCRIPTOR * MsInterface, BYTE * data, i } static MSUSB_INTERFACE_DESCRIPTOR ** -msusb_msinterface_read_list(BYTE * data, uint32 data_size, uint32 NumInterfaces) +msusb_msinterface_read_list(BYTE * data, UINT32 data_size, UINT32 NumInterfaces) { MSUSB_INTERFACE_DESCRIPTOR ** MsInterfaces; int inum, offset = 0; @@ -242,9 +242,9 @@ msusb_msconfig_write(MSUSB_CONFIG_DESCRIPTOR * MsConfg, BYTE * data, int * offse int inum = 0; /* ConfigurationHandle*/ - data_write_uint32(data + *offset, MsConfg->ConfigurationHandle); + data_write_UINT32(data + *offset, MsConfg->ConfigurationHandle); /* NumInterfaces*/ - data_write_uint32(data + *offset + 4, MsConfg->NumInterfaces); + data_write_UINT32(data + *offset + 4, MsConfg->NumInterfaces); *offset += 8; /* Interfaces */ MsInterfaces = MsConfg->MsInterfaces; @@ -279,7 +279,7 @@ msusb_msconfig_free(MSUSB_CONFIG_DESCRIPTOR * MsConfig) } MSUSB_CONFIG_DESCRIPTOR * -msusb_msconfig_read(BYTE * data, uint32 data_size, uint32 NumInterfaces) +msusb_msconfig_read(BYTE * data, UINT32 data_size, UINT32 NumInterfaces) { MSUSB_CONFIG_DESCRIPTOR * MsConfig; BYTE lenConfiguration, typeConfiguration; diff --git a/libfreerdp/utils/pcap.c b/libfreerdp/utils/pcap.c index 3984c96b4..8e88b0d90 100644 --- a/libfreerdp/utils/pcap.c +++ b/libfreerdp/utils/pcap.c @@ -83,7 +83,7 @@ void pcap_write_record(rdpPcap* pcap, pcap_record* record) fwrite(record->data, record->length, 1, pcap->fp); } -void pcap_add_record(rdpPcap* pcap, void* data, uint32 length) +void pcap_add_record(rdpPcap* pcap, void* data, UINT32 length) { pcap_record* record; struct timeval tp; diff --git a/libfreerdp/utils/rail.c b/libfreerdp/utils/rail.c index 90b65487d..6ab19ec02 100644 --- a/libfreerdp/utils/rail.c +++ b/libfreerdp/utils/rail.c @@ -90,12 +90,12 @@ void rail_write_rectangle_16(STREAM* s, RECTANGLE_16* rectangle_16) stream_write_UINT16(s, rectangle_16->bottom); /* bottom (2 bytes) */ } -void* rail_clone_order(uint32 event_type, void* order) +void* rail_clone_order(UINT32 event_type, void* order) { struct { - uint32 type; - uint32 size; + UINT32 type; + UINT32 size; } ordersize_table[] = { {RDP_EVENT_TYPE_RAIL_CHANNEL_GET_SYSPARAMS, sizeof(RAIL_SYSPARAM_ORDER)}, @@ -174,7 +174,7 @@ void* rail_clone_order(uint32 event_type, void* order) return new_order; } -void rail_free_cloned_order(uint32 event_type, void* order) +void rail_free_cloned_order(UINT32 event_type, void* order) { //printf("rail_free_cloned_order: type=%d order=%p\n", event_type, order); if ((event_type == RDP_EVENT_TYPE_RAIL_CHANNEL_GET_SYSPARAMS) || diff --git a/libfreerdp/utils/sleep.c b/libfreerdp/utils/sleep.c index ae24add6b..1a74eaad6 100644 --- a/libfreerdp/utils/sleep.c +++ b/libfreerdp/utils/sleep.c @@ -32,7 +32,7 @@ #include #endif -void freerdp_sleep(uint32 seconds) +void freerdp_sleep(UINT32 seconds) { #ifndef _WIN32 sleep(seconds); @@ -41,14 +41,14 @@ void freerdp_sleep(uint32 seconds) #endif } -void freerdp_usleep(uint32 useconds) +void freerdp_usleep(UINT32 useconds) { #ifndef _WIN32 usleep(useconds); #else - uint64 t1; - uint64 t2; - uint64 freq; + UINT64 t1; + UINT64 t2; + UINT64 freq; QueryPerformanceCounter((LARGE_INTEGER*) &t1); QueryPerformanceCounter((LARGE_INTEGER*) &freq); diff --git a/libfreerdp/utils/stopwatch.c b/libfreerdp/utils/stopwatch.c index c1f3f4d8e..a9ffd6bb6 100644 --- a/libfreerdp/utils/stopwatch.c +++ b/libfreerdp/utils/stopwatch.c @@ -66,18 +66,18 @@ double stopwatch_get_elapsed_time_in_seconds(STOPWATCH* stopwatch) return ((double) stopwatch->elapsed) / CLOCKS_PER_SEC; } -void stopwatch_get_elapsed_time_in_useconds(STOPWATCH* stopwatch, uint32* sec, uint32* usec) +void stopwatch_get_elapsed_time_in_useconds(STOPWATCH* stopwatch, UINT32* sec, UINT32* usec) { double uelapsed; double clocks_per_usec; - *sec = ((uint32) stopwatch->elapsed) / CLOCKS_PER_SEC; + *sec = ((UINT32) stopwatch->elapsed) / CLOCKS_PER_SEC; uelapsed = stopwatch->elapsed - ((double)(*sec) * CLOCKS_PER_SEC); clocks_per_usec = (CLOCKS_PER_SEC / 1000000); if (clocks_per_usec > 0.0) - *usec = (uint32)(uelapsed / clocks_per_usec); + *usec = (UINT32)(uelapsed / clocks_per_usec); else *usec = 0; } diff --git a/libfreerdp/utils/string.c b/libfreerdp/utils/string.c index e79c926b9..92f900f71 100644 --- a/libfreerdp/utils/string.c +++ b/libfreerdp/utils/string.c @@ -31,7 +31,7 @@ void freerdp_string_read_length32(STREAM* s, rdpString* string) { - stream_read_uint32(s, string->length); + stream_read_UINT32(s, string->length); string->unicode = (char*) malloc(string->length); stream_read(s, string->unicode, string->length); freerdp_UnicodeToAsciiAlloc((WCHAR*) string->unicode, &string->ascii, string->length / 2); diff --git a/libfreerdp/utils/svc_plugin.c b/libfreerdp/utils/svc_plugin.c index 4824f6e90..1d8f31fea 100644 --- a/libfreerdp/utils/svc_plugin.c +++ b/libfreerdp/utils/svc_plugin.c @@ -75,7 +75,7 @@ static void svc_data_in_item_free(svc_data_in_item* item) struct rdp_svc_plugin_private { void* init_handle; - uint32 open_handle; + UINT32 open_handle; STREAM* data_in; LIST* data_in_list; @@ -105,7 +105,7 @@ static rdpSvcPlugin* svc_plugin_find_by_init_handle(void* init_handle) return NULL; } -static rdpSvcPlugin* svc_plugin_find_by_open_handle(uint32 open_handle) +static rdpSvcPlugin* svc_plugin_find_by_open_handle(UINT32 open_handle) { rdpSvcPluginList * list; rdpSvcPlugin * plugin; @@ -150,8 +150,8 @@ static void svc_plugin_remove(rdpSvcPlugin* plugin) ReleaseMutex(g_mutex); } -static void svc_plugin_process_received(rdpSvcPlugin* plugin, void* pData, uint32 dataLength, - uint32 totalLength, uint32 dataFlags) +static void svc_plugin_process_received(rdpSvcPlugin* plugin, void* pData, UINT32 dataLength, + UINT32 totalLength, UINT32 dataFlags) { STREAM* data_in; svc_data_in_item* item; @@ -211,8 +211,8 @@ static void svc_plugin_process_event(rdpSvcPlugin* plugin, RDP_EVENT* event_in) freerdp_thread_signal(plugin->priv->thread); } -static void svc_plugin_open_event(uint32 openHandle, uint32 event, void* pData, uint32 dataLength, - uint32 totalLength, uint32 dataFlags) +static void svc_plugin_open_event(UINT32 openHandle, UINT32 event, void* pData, UINT32 dataLength, + UINT32 totalLength, UINT32 dataFlags) { rdpSvcPlugin* plugin; @@ -303,9 +303,9 @@ static void* svc_plugin_thread_func(void* arg) return 0; } -static void svc_plugin_process_connected(rdpSvcPlugin* plugin, void* pData, uint32 dataLength) +static void svc_plugin_process_connected(rdpSvcPlugin* plugin, void* pData, UINT32 dataLength) { - uint32 error; + UINT32 error; error = plugin->channel_entry_points.pVirtualChannelOpen(plugin->priv->init_handle, &plugin->priv->open_handle, plugin->channel_def.name, svc_plugin_open_event); @@ -349,7 +349,7 @@ static void svc_plugin_process_terminated(rdpSvcPlugin* plugin) IFCALL(plugin->terminate_callback, plugin); } -static void svc_plugin_init_event(void* pInitHandle, uint32 event, void* pData, uint32 dataLength) +static void svc_plugin_init_event(void* pInitHandle, UINT32 event, void* pData, UINT32 dataLength) { rdpSvcPlugin* plugin; @@ -408,7 +408,7 @@ void svc_plugin_init(rdpSvcPlugin* plugin, CHANNEL_ENTRY_POINTS* pEntryPoints) int svc_plugin_send(rdpSvcPlugin* plugin, STREAM* data_out) { - uint32 error = 0; + UINT32 error = 0; DEBUG_SVC("length %d", (int) stream_get_length(data_out)); @@ -429,7 +429,7 @@ int svc_plugin_send(rdpSvcPlugin* plugin, STREAM* data_out) int svc_plugin_send_event(rdpSvcPlugin* plugin, RDP_EVENT* event) { - uint32 error = 0; + UINT32 error = 0; DEBUG_SVC("event_type %d", event->event_type); diff --git a/libfreerdp/utils/tcp.c b/libfreerdp/utils/tcp.c index 44f862b37..ffd3ac6a0 100644 --- a/libfreerdp/utils/tcp.c +++ b/libfreerdp/utils/tcp.c @@ -185,7 +185,7 @@ int freerdp_tcp_disconnect(int sockfd) int freerdp_tcp_set_no_delay(int sockfd, BOOL no_delay) { - uint32 option_value; + UINT32 option_value; socklen_t option_len; option_value = no_delay; diff --git a/libfreerdp/utils/time.c b/libfreerdp/utils/time.c index 09f678b73..6e7885b0e 100644 --- a/libfreerdp/utils/time.c +++ b/libfreerdp/utils/time.c @@ -29,10 +29,10 @@ #include -uint64 freerdp_windows_gmtime() +UINT64 freerdp_windows_gmtime() { time_t unix_time; - uint64 windows_time; + UINT64 windows_time; gmtime(&unix_time); windows_time = freerdp_get_windows_time_from_unix_time(unix_time); @@ -40,14 +40,14 @@ uint64 freerdp_windows_gmtime() return windows_time; } -uint64 freerdp_get_windows_time_from_unix_time(time_t unix_time) +UINT64 freerdp_get_windows_time_from_unix_time(time_t unix_time) { - uint64 windows_time; + UINT64 windows_time; windows_time = (unix_time * 10000000) + 621355968000000000ULL; return windows_time; } -time_t freerdp_get_unix_time_from_windows_time(uint64 windows_time) +time_t freerdp_get_unix_time_from_windows_time(UINT64 windows_time) { time_t unix_time; unix_time = (windows_time - 621355968000000000ULL) / 10000000; diff --git a/server/Sample/sf_audin.c b/server/Sample/sf_audin.c index 807af2a4e..9c19aaa7a 100644 --- a/server/Sample/sf_audin.c +++ b/server/Sample/sf_audin.c @@ -46,7 +46,7 @@ static void sf_peer_audin_opening(audin_server_context* context) context->SelectFormat(context, 0); } -static void sf_peer_audin_open_result(audin_server_context* context, uint32 result) +static void sf_peer_audin_open_result(audin_server_context* context, UINT32 result) { printf("AUDIN open result %d.\n", result); } diff --git a/server/Sample/sfreerdp.c b/server/Sample/sfreerdp.c index 08941af9b..9c4cf489f 100644 --- a/server/Sample/sfreerdp.c +++ b/server/Sample/sfreerdp.c @@ -321,9 +321,9 @@ static void test_peer_draw_icon(freerdp_peer* client, int x, int y) test_peer_end_frame(client); } -static BOOL test_sleep_tsdiff(uint32 *old_sec, uint32 *old_usec, uint32 new_sec, uint32 new_usec) +static BOOL test_sleep_tsdiff(UINT32 *old_sec, UINT32 *old_usec, UINT32 new_sec, UINT32 new_usec) { - sint32 sec, usec; + INT32 sec, usec; if (*old_sec==0 && *old_usec==0) { @@ -362,8 +362,8 @@ static BOOL test_sleep_tsdiff(uint32 *old_sec, uint32 *old_usec, uint32 new_sec, void tf_peer_dump_rfx(freerdp_peer* client) { STREAM* s; - uint32 prev_seconds; - uint32 prev_useconds; + UINT32 prev_seconds; + UINT32 prev_useconds; rdpUpdate* update; rdpPcap* pcap_rfx; pcap_record record; @@ -401,7 +401,7 @@ static void* tf_debug_channel_thread_func(void* arg) void* fd; STREAM* s; void* buffer; - uint32 bytes_returned = 0; + UINT32 bytes_returned = 0; testPeerContext* context = (testPeerContext*) arg; freerdp_thread* thread = context->debug_channel_thread; @@ -537,7 +537,7 @@ BOOL tf_peer_activate(freerdp_peer* client) return TRUE; } -void tf_peer_synchronize_event(rdpInput* input, uint32 flags) +void tf_peer_synchronize_event(rdpInput* input, UINT32 flags) { printf("Client sent a synchronize event (flags:0x%X)\n", flags); } diff --git a/server/Sample/sfreerdp.h b/server/Sample/sfreerdp.h index 616899ca1..a0b497627 100644 --- a/server/Sample/sfreerdp.h +++ b/server/Sample/sfreerdp.h @@ -48,7 +48,7 @@ struct test_peer_context freerdp_thread* debug_channel_thread; audin_server_context* audin; BOOL audin_open; - uint32 frame_id; + UINT32 frame_id; rdpsnd_server_context* rdpsnd; }; typedef struct test_peer_context testPeerContext; diff --git a/server/Windows/wf_peer.c b/server/Windows/wf_peer.c index df134f5eb..74e454911 100644 --- a/server/Windows/wf_peer.c +++ b/server/Windows/wf_peer.c @@ -115,7 +115,7 @@ BOOL wf_peer_logon(freerdp_peer* client, SEC_WINNT_AUTH_IDENTITY* identity, BOOL return TRUE; } -void wf_peer_synchronize_event(rdpInput* input, uint32 flags) +void wf_peer_synchronize_event(rdpInput* input, UINT32 flags) { } diff --git a/server/Windows/wf_peer.h b/server/Windows/wf_peer.h index fb8a74c16..0aa76f82a 100644 --- a/server/Windows/wf_peer.h +++ b/server/Windows/wf_peer.h @@ -37,7 +37,7 @@ void wf_rfx_encode(freerdp_peer* client); BOOL wf_peer_post_connect(freerdp_peer* client); BOOL wf_peer_activate(freerdp_peer* client); -void wf_peer_synchronize_event(rdpInput* input, uint32 flags); +void wf_peer_synchronize_event(rdpInput* input, UINT32 flags); void wf_peer_send_changes(freerdp_peer* client); diff --git a/server/X11/xf_encode.c b/server/X11/xf_encode.c index afa70ed4b..94ba317c9 100644 --- a/server/X11/xf_encode.c +++ b/server/X11/xf_encode.c @@ -81,7 +81,7 @@ void* xf_frame_rate_thread(void* param) xfEvent* event; xfPeerContext* xfp; freerdp_peer* client; - uint32 wait_interval; + UINT32 wait_interval; client = (freerdp_peer*) param; xfp = (xfPeerContext*) client->context; @@ -110,7 +110,7 @@ void* xf_monitor_updates(void* param) int pending_events; xfPeerContext* xfp; freerdp_peer* client; - uint32 wait_interval; + UINT32 wait_interval; struct timeval timeout; int x, y, width, height; XDamageNotifyEvent* notify; diff --git a/server/X11/xf_input.c b/server/X11/xf_input.c index a646b58eb..a8acf68b4 100644 --- a/server/X11/xf_input.c +++ b/server/X11/xf_input.c @@ -27,7 +27,7 @@ #include "xf_input.h" -void xf_input_synchronize_event(rdpInput* input, uint32 flags) +void xf_input_synchronize_event(rdpInput* input, UINT32 flags) { printf("Client sent a synchronize event (flags:0x%X)\n", flags); } diff --git a/server/X11/xf_input.h b/server/X11/xf_input.h index b53b27db5..201b21b53 100644 --- a/server/X11/xf_input.h +++ b/server/X11/xf_input.h @@ -24,7 +24,7 @@ #include "xfreerdp.h" -void xf_input_synchronize_event(rdpInput* input, uint32 flags); +void xf_input_synchronize_event(rdpInput* input, UINT32 flags); void xf_input_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code); void xf_input_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code); void xf_input_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y); diff --git a/server/X11/xf_peer.c b/server/X11/xf_peer.c index 2fcb19b89..d0cf6fc94 100644 --- a/server/X11/xf_peer.c +++ b/server/X11/xf_peer.c @@ -320,9 +320,9 @@ void xf_peer_live_rfx(freerdp_peer* client) pthread_create(&(xfp->thread), 0, xf_monitor_updates, (void*) client); } -static BOOL xf_peer_sleep_tsdiff(uint32 *old_sec, uint32 *old_usec, uint32 new_sec, uint32 new_usec) +static BOOL xf_peer_sleep_tsdiff(UINT32 *old_sec, UINT32 *old_usec, UINT32 new_sec, UINT32 new_usec) { - sint32 sec, usec; + INT32 sec, usec; if (*old_sec == 0 && *old_usec == 0) { @@ -361,8 +361,8 @@ static BOOL xf_peer_sleep_tsdiff(uint32 *old_sec, uint32 *old_usec, uint32 new_s void xf_peer_dump_rfx(freerdp_peer* client) { STREAM* s; - uint32 prev_seconds; - uint32 prev_useconds; + UINT32 prev_seconds; + UINT32 prev_useconds; rdpUpdate* update; rdpPcap* pcap_rfx; pcap_record record;