From bc8b4ade1c57ecd746540ed6d0a85d19f3dc2fb2 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Thu, 23 Jun 2022 07:57:38 +0200 Subject: [PATCH] reformatted --- channels/ainput/client/ainput_main.c | 1 - channels/audin/client/audin_main.c | 3 +- channels/audin/client/ios/audin_ios.m | 532 +++++++++--------- channels/audin/client/mac/audin_mac.m | 34 +- channels/audin/client/winmm/audin_winmm.c | 4 +- channels/cliprdr/client/cliprdr_main.c | 1 - channels/disp/client/disp_main.c | 9 +- channels/drive/client/drive_file.c | 14 +- channels/geometry/client/geometry_main.c | 6 +- channels/printer/client/printer_main.c | 9 +- channels/rail/client/rail_main.c | 1 - channels/rdpdr/client/devman.c | 3 +- channels/rdpdr/client/rdpdr_capabilities.c | 6 +- channels/rdpdr/server/rdpdr_main.c | 30 +- channels/rdpei/client/rdpei_main.c | 13 +- channels/rdpgfx/client/rdpgfx_main.c | 81 +-- channels/rdpgfx/rdpgfx_common.c | 2 +- channels/rdpsnd/client/ios/rdpsnd_ios.c | 6 +- channels/rdpsnd/client/mac/rdpsnd_mac.m | 69 ++- .../rdpsnd/client/opensles/rdpsnd_opensles.c | 3 +- channels/rdpsnd/client/rdpsnd_main.c | 14 +- channels/sshagent/client/sshagent_main.c | 4 +- channels/urbdrc/client/data_transfer.c | 11 +- .../urbdrc/client/libusb/libusb_udevice.c | 3 +- .../urbdrc/client/libusb/libusb_udevman.c | 5 +- channels/urbdrc/client/urbdrc_main.c | 6 +- channels/urbdrc/client/urbdrc_main.h | 5 +- channels/video/client/video_main.c | 10 +- .../src/main/cpp/android_freerdp.c | 72 ++- client/Mac/MRDPView.m | 31 +- client/Mac/cli/AppDelegate.m | 5 +- client/Wayland/wlfreerdp.c | 5 +- client/Windows/wf_client.c | 9 +- client/Windows/wf_event.c | 4 +- client/Windows/wf_graphics.c | 3 +- client/X11/xf_client.c | 166 +++--- client/X11/xf_event.c | 12 +- client/X11/xf_graphics.c | 2 +- client/X11/xf_input.c | 6 +- client/X11/xf_rail.c | 8 +- client/X11/xf_window.c | 2 +- client/X11/xf_window.h | 2 +- client/common/cmdline.c | 6 - include/freerdp/channels/rdpgfx.h | 12 +- include/freerdp/client.h | 4 +- include/freerdp/client/channels.h | 20 +- include/freerdp/codec/color.h | 6 +- include/freerdp/freerdp.h | 4 +- include/freerdp/listener.h | 2 +- include/freerdp/server/proxy/proxy_context.h | 24 +- .../freerdp/server/proxy/proxy_modules_api.h | 10 +- include/freerdp/settings.h | 42 +- include/freerdp/utils/pod_arrays.h | 209 ++++--- libfreerdp/cache/bitmap.c | 3 +- libfreerdp/cache/persistent.c | 34 +- libfreerdp/codec/clear.c | 8 +- libfreerdp/codec/color.c | 2 +- libfreerdp/codec/h264.c | 3 +- libfreerdp/codec/mppc.c | 2 +- libfreerdp/codec/nsc.c | 3 +- libfreerdp/codec/nsc_encode.c | 4 +- libfreerdp/codec/nsc_sse2.c | 4 +- libfreerdp/codec/planar.c | 4 +- libfreerdp/codec/rfx.c | 63 ++- libfreerdp/codec/yuv.c | 22 +- libfreerdp/common/addin.c | 17 +- libfreerdp/common/settings.c | 8 +- libfreerdp/core/activation.c | 12 +- libfreerdp/core/activation.h | 1 - libfreerdp/core/autodetect.c | 16 +- libfreerdp/core/capabilities.c | 86 +-- libfreerdp/core/certificate.c | 2 +- libfreerdp/core/client.c | 3 +- libfreerdp/core/connection.c | 20 +- libfreerdp/core/display.c | 10 +- libfreerdp/core/freerdp.c | 6 +- libfreerdp/core/gateway/tsg.c | 4 +- libfreerdp/core/gcc.c | 4 +- libfreerdp/core/info.c | 17 +- libfreerdp/core/input.c | 2 +- libfreerdp/core/orders.c | 6 +- libfreerdp/core/rdp.c | 10 +- libfreerdp/core/redirection.c | 1 - libfreerdp/core/server.c | 17 +- libfreerdp/core/server.h | 2 +- libfreerdp/core/tcp.c | 104 ++-- libfreerdp/core/test/TestConnect.c | 2 +- libfreerdp/core/tscredentials.h | 79 ++- libfreerdp/gdi/bitmap.c | 4 +- libfreerdp/gdi/gfx.c | 12 +- libfreerdp/gdi/graphics.c | 7 +- libfreerdp/utils/cliprdr_utils.c | 2 +- libfreerdp/utils/stopwatch.c | 2 +- libfreerdp/utils/test/TestPodArrays.c | 11 +- server/proxy/channels/pf_channel_drdynvc.c | 266 ++++----- server/proxy/channels/pf_channel_drdynvc.h | 1 - server/proxy/channels/pf_channel_rdpdr.c | 6 +- server/proxy/cli/freerdp_proxy.c | 2 +- server/proxy/modules/capture/cap_protocol.c | 10 +- server/proxy/pf_channel.c | 145 ++--- server/proxy/pf_channel.h | 21 +- server/proxy/pf_client.c | 15 +- server/proxy/pf_config.c | 1 - server/proxy/pf_context.c | 5 +- server/proxy/pf_modules.c | 6 +- server/proxy/pf_server.c | 34 +- server/proxy/pf_server.h | 2 +- server/shadow/shadow_encoder.c | 14 +- server/shadow/shadow_subsystem.c | 8 +- uwac/include/uwac/uwac.h | 3 +- uwac/libuwac/uwac-window.c | 20 +- winpr/include/winpr/crt.h | 27 +- winpr/include/winpr/ncrypt.h | 4 +- winpr/include/winpr/sspi.h | 8 +- winpr/include/winpr/stream.h | 64 +-- winpr/libwinpr/crt/alignment.c | 4 +- .../libwinpr/crt/test/TestUnicodeConversion.c | 2 +- winpr/libwinpr/crypto/cipher.c | 4 +- winpr/libwinpr/environment/environment.c | 4 +- .../interlocked/test/TestInterlockedDList.c | 10 +- .../interlocked/test/TestInterlockedSList.c | 2 +- winpr/libwinpr/ncrypt/ncrypt.c | 1 - winpr/libwinpr/ncrypt/ncrypt_pkcs11.c | 221 ++++---- .../ncrypt/test/TestNCryptSmartcard.c | 33 +- winpr/libwinpr/registry/registry_reg.c | 30 +- winpr/libwinpr/smartcard/smartcard_pcsc.c | 16 +- winpr/libwinpr/sspi/Kerberos/kerberos.c | 37 +- winpr/libwinpr/sspi/NTLM/ntlm.c | 26 +- winpr/libwinpr/sspi/NTLM/ntlm_compute.c | 14 +- winpr/libwinpr/sspi/NTLM/ntlm_message.c | 12 +- winpr/libwinpr/sspi/Negotiate/negotiate.c | 40 +- winpr/libwinpr/sspi/Negotiate/negotiate.h | 2 +- winpr/libwinpr/sspi/sspi_gss.c | 15 +- winpr/libwinpr/sspi/sspi_gss.h | 37 +- winpr/libwinpr/sspi/test/TestNTLM.c | 6 +- .../thread/test/TestThreadCreateProcess.c | 2 +- winpr/libwinpr/utils/collections/HashTable.c | 6 +- winpr/libwinpr/utils/corkscrew/debug.c | 1 - winpr/libwinpr/utils/lodepng/lodepng.c | 4 +- winpr/libwinpr/utils/wlog/wlog.c | 2 +- winpr/libwinpr/wtsapi/wtsapi.c | 4 +- 141 files changed, 1739 insertions(+), 1628 deletions(-) diff --git a/channels/ainput/client/ainput_main.c b/channels/ainput/client/ainput_main.c index a064af254..751e09880 100644 --- a/channels/ainput/client/ainput_main.c +++ b/channels/ainput/client/ainput_main.c @@ -38,7 +38,6 @@ #define TAG CHANNELS_TAG("ainput.client") - typedef struct AINPUT_PLUGIN_ AINPUT_PLUGIN; struct AINPUT_PLUGIN_ { diff --git a/channels/audin/client/audin_main.c b/channels/audin/client/audin_main.c index fecd4b805..aeb6d3416 100644 --- a/channels/audin/client/audin_main.c +++ b/channels/audin/client/audin_main.c @@ -678,7 +678,8 @@ static UINT audin_plugin_initialize(IWTSPlugin* pPlugin, IWTSVirtualChannelManag } WLog_Print(audin->log, WLOG_TRACE, "..."); - audin->listener_callback = (GENERIC_LISTENER_CALLBACK*)calloc(1, sizeof(GENERIC_LISTENER_CALLBACK)); + audin->listener_callback = + (GENERIC_LISTENER_CALLBACK*)calloc(1, sizeof(GENERIC_LISTENER_CALLBACK)); if (!audin->listener_callback) { diff --git a/channels/audin/client/ios/audin_ios.m b/channels/audin/client/ios/audin_ios.m index da1b93b04..76e93d77e 100644 --- a/channels/audin/client/ios/audin_ios.m +++ b/channels/audin/client/ios/audin_ios.m @@ -1,333 +1,335 @@ /** - * FreeRDP: A Remote Desktop Protocol Implementation - * Audio Input Redirection Virtual Channel - iOS implementation - * - * Copyright (c) 2015 Armin Novak - * Copyright 2015 Thincast Technologies GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + * FreeRDP: A Remote Desktop Protocol Implementation + * Audio Input Redirection Virtual Channel - iOS implementation + * + * Copyright (c) 2015 Armin Novak + * Copyright 2015 Thincast Technologies GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ - #include +#include - #include - #include - #include +#include +#include +#include - #include - #include - #include - #include - #include - #include +#include +#include +#include +#include +#include +#include - #import +#import - #define __COREFOUNDATION_CFPLUGINCOM__ 1 - #define IUNKNOWN_C_GUTS \ - void *_reserved; \ - void *QueryInterface; \ - void *AddRef; \ - void *Release +#define __COREFOUNDATION_CFPLUGINCOM__ 1 +#define IUNKNOWN_C_GUTS \ + void *_reserved; \ + void *QueryInterface; \ + void *AddRef; \ + void *Release - #include - #include - #include +#include +#include +#include - #include - #include +#include +#include - #include "audin_main.h" +#include "audin_main.h" - #define IOS_AUDIO_QUEUE_NUM_BUFFERS 100 +#define IOS_AUDIO_QUEUE_NUM_BUFFERS 100 typedef struct { IAudinDevice iface; AUDIO_FORMAT format; - UINT32 FramesPerPacket; - int dev_unit; + UINT32 FramesPerPacket; + int dev_unit; - AudinReceive receive; - void *user_data; + AudinReceive receive; + void *user_data; - rdpContext *rdpcontext; + rdpContext *rdpcontext; - bool isOpen; - AudioQueueRef audioQueue; - AudioStreamBasicDescription audioFormat; - AudioQueueBufferRef audioBuffers[IOS_AUDIO_QUEUE_NUM_BUFFERS]; + bool isOpen; + AudioQueueRef audioQueue; + AudioStreamBasicDescription audioFormat; + AudioQueueBufferRef audioBuffers[IOS_AUDIO_QUEUE_NUM_BUFFERS]; } AudinIosDevice; - static AudioFormatID audin_ios_get_format(const AUDIO_FORMAT *format) - { - switch (format->wFormatTag) - { - case WAVE_FORMAT_PCM: - return kAudioFormatLinearPCM; +static AudioFormatID audin_ios_get_format(const AUDIO_FORMAT *format) +{ + switch (format->wFormatTag) + { + case WAVE_FORMAT_PCM: + return kAudioFormatLinearPCM; - default: - return 0; - } - } + default: + return 0; + } +} - static AudioFormatFlags audin_ios_get_flags_for_format(const AUDIO_FORMAT *format) - { - switch (format->wFormatTag) - { - case WAVE_FORMAT_PCM: - return kAudioFormatFlagIsSignedInteger; +static AudioFormatFlags audin_ios_get_flags_for_format(const AUDIO_FORMAT *format) +{ + switch (format->wFormatTag) + { + case WAVE_FORMAT_PCM: + return kAudioFormatFlagIsSignedInteger; - default: - return 0; - } - } + default: + return 0; + } +} - static BOOL audin_ios_format_supported(IAudinDevice *device, const AUDIO_FORMAT *format) - { - AudinIosDevice *ios = (AudinIosDevice *)device; - AudioFormatID req_fmt = 0; +static BOOL audin_ios_format_supported(IAudinDevice *device, const AUDIO_FORMAT *format) +{ + AudinIosDevice *ios = (AudinIosDevice *)device; + AudioFormatID req_fmt = 0; - if (device == NULL || format == NULL) - return FALSE; + if (device == NULL || format == NULL) + return FALSE; - req_fmt = audin_ios_get_format(format); + req_fmt = audin_ios_get_format(format); - if (req_fmt == 0) - return FALSE; + if (req_fmt == 0) + return FALSE; - return TRUE; - } + return TRUE; +} - /** - * Function description - * - * @return 0 on success, otherwise a Win32 error code - */ - static UINT audin_ios_set_format(IAudinDevice *device, const AUDIO_FORMAT *format, - UINT32 FramesPerPacket) - { - AudinIosDevice *ios = (AudinIosDevice *)device; +/** + * Function description + * + * @return 0 on success, otherwise a Win32 error code + */ +static UINT audin_ios_set_format(IAudinDevice *device, const AUDIO_FORMAT *format, + UINT32 FramesPerPacket) +{ + AudinIosDevice *ios = (AudinIosDevice *)device; - if (device == NULL || format == NULL) - return ERROR_INVALID_PARAMETER; + if (device == NULL || format == NULL) + return ERROR_INVALID_PARAMETER; - ios->FramesPerPacket = FramesPerPacket; - ios->format = *format; - WLog_INFO(TAG, "Audio Format %s [channels=%d, samples=%d, bits=%d]", - audio_format_get_tag_string(format->wFormatTag), format->nChannels, - format->nSamplesPerSec, format->wBitsPerSample); - ios->audioFormat.mBitsPerChannel = format->wBitsPerSample; + ios->FramesPerPacket = FramesPerPacket; + ios->format = *format; + WLog_INFO(TAG, "Audio Format %s [channels=%d, samples=%d, bits=%d]", + audio_format_get_tag_string(format->wFormatTag), format->nChannels, + format->nSamplesPerSec, format->wBitsPerSample); + ios->audioFormat.mBitsPerChannel = format->wBitsPerSample; - if (format->wBitsPerSample == 0) - ios->audioFormat.mBitsPerChannel = 16; + if (format->wBitsPerSample == 0) + ios->audioFormat.mBitsPerChannel = 16; - ios->audioFormat.mChannelsPerFrame = ios->format.nChannels; - ios->audioFormat.mFramesPerPacket = 1; + ios->audioFormat.mChannelsPerFrame = ios->format.nChannels; + ios->audioFormat.mFramesPerPacket = 1; - ios->audioFormat.mBytesPerFrame = ios->audioFormat.mChannelsPerFrame * (ios->audioFormat.mBitsPerChannel / 8); - ios->audioFormat.mBytesPerPacket = ios->audioFormat.mBytesPerFrame * ios->audioFormat.mFramesPerPacket; + ios->audioFormat.mBytesPerFrame = + ios->audioFormat.mChannelsPerFrame * (ios->audioFormat.mBitsPerChannel / 8); + ios->audioFormat.mBytesPerPacket = + ios->audioFormat.mBytesPerFrame * ios->audioFormat.mFramesPerPacket; - ios->audioFormat.mFormatFlags = audin_ios_get_flags_for_format(format); - ios->audioFormat.mFormatID = audin_ios_get_format(format); - ios->audioFormat.mReserved = 0; - ios->audioFormat.mSampleRate = ios->format.nSamplesPerSec; - return CHANNEL_RC_OK; - } + ios->audioFormat.mFormatFlags = audin_ios_get_flags_for_format(format); + ios->audioFormat.mFormatID = audin_ios_get_format(format); + ios->audioFormat.mReserved = 0; + ios->audioFormat.mSampleRate = ios->format.nSamplesPerSec; + return CHANNEL_RC_OK; +} - static void ios_audio_queue_input_cb(void *aqData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffer, - const AudioTimeStamp *inStartTime, UInt32 inNumPackets, - const AudioStreamPacketDescription *inPacketDesc) - { - AudinIosDevice *ios = (AudinIosDevice *)aqData; - UINT error = CHANNEL_RC_OK; - const BYTE *buffer = inBuffer->mAudioData; - int buffer_size = inBuffer->mAudioDataByteSize; - (void)inAQ; - (void)inStartTime; - (void)inNumPackets; - (void)inPacketDesc; +static void ios_audio_queue_input_cb(void *aqData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffer, + const AudioTimeStamp *inStartTime, UInt32 inNumPackets, + const AudioStreamPacketDescription *inPacketDesc) +{ + AudinIosDevice *ios = (AudinIosDevice *)aqData; + UINT error = CHANNEL_RC_OK; + const BYTE *buffer = inBuffer->mAudioData; + int buffer_size = inBuffer->mAudioDataByteSize; + (void)inAQ; + (void)inStartTime; + (void)inNumPackets; + (void)inPacketDesc; - if (buffer_size > 0) - error = ios->receive(&ios->format, buffer, buffer_size, ios->user_data); + if (buffer_size > 0) + error = ios->receive(&ios->format, buffer, buffer_size, ios->user_data); - AudioQueueEnqueueBuffer(inAQ, inBuffer, 0, NULL); + AudioQueueEnqueueBuffer(inAQ, inBuffer, 0, NULL); - if (error) - { - WLog_ERR(TAG, "ios->receive failed with error %" PRIu32 "", error); - SetLastError(ERROR_INTERNAL_ERROR); - } - } + if (error) + { + WLog_ERR(TAG, "ios->receive failed with error %" PRIu32 "", error); + SetLastError(ERROR_INTERNAL_ERROR); + } +} - static UINT audin_ios_close(IAudinDevice *device) - { - UINT errCode = CHANNEL_RC_OK; - char errString[1024]; - OSStatus devStat; - AudinIosDevice *ios = (AudinIosDevice *)device; +static UINT audin_ios_close(IAudinDevice *device) +{ + UINT errCode = CHANNEL_RC_OK; + char errString[1024]; + OSStatus devStat; + AudinIosDevice *ios = (AudinIosDevice *)device; - if (device == NULL) - return ERROR_INVALID_PARAMETER; + if (device == NULL) + return ERROR_INVALID_PARAMETER; - if (ios->isOpen) - { - devStat = AudioQueueStop(ios->audioQueue, true); + if (ios->isOpen) + { + devStat = AudioQueueStop(ios->audioQueue, true); - if (devStat != 0) - { - errCode = GetLastError(); - WLog_ERR(TAG, "AudioQueueStop failed with %s [%" PRIu32 "]", - winpr_strerror(errCode, errString, sizeof(errString)), errCode); - } + if (devStat != 0) + { + errCode = GetLastError(); + WLog_ERR(TAG, "AudioQueueStop failed with %s [%" PRIu32 "]", + winpr_strerror(errCode, errString, sizeof(errString)), errCode); + } - ios->isOpen = false; - } + ios->isOpen = false; + } - if (ios->audioQueue) - { - devStat = AudioQueueDispose(ios->audioQueue, true); + if (ios->audioQueue) + { + devStat = AudioQueueDispose(ios->audioQueue, true); - if (devStat != 0) - { - errCode = GetLastError(); - WLog_ERR(TAG, "AudioQueueDispose failed with %s [%" PRIu32 "]", - winpr_strerror(errCode, errString, sizeof(errString)), errCode); - } + if (devStat != 0) + { + errCode = GetLastError(); + WLog_ERR(TAG, "AudioQueueDispose failed with %s [%" PRIu32 "]", + winpr_strerror(errCode, errString, sizeof(errString)), errCode); + } - ios->audioQueue = NULL; - } + ios->audioQueue = NULL; + } - ios->receive = NULL; - ios->user_data = NULL; - return errCode; - } + ios->receive = NULL; + ios->user_data = NULL; + return errCode; +} - static UINT audin_ios_open(IAudinDevice *device, AudinReceive receive, void *user_data) - { - AudinIosDevice *ios = (AudinIosDevice *)device; - DWORD errCode; - char errString[1024]; - OSStatus devStat; - size_t index; +static UINT audin_ios_open(IAudinDevice *device, AudinReceive receive, void *user_data) +{ + AudinIosDevice *ios = (AudinIosDevice *)device; + DWORD errCode; + char errString[1024]; + OSStatus devStat; + size_t index; - ios->receive = receive; - ios->user_data = user_data; - devStat = AudioQueueNewInput(&(ios->audioFormat), ios_audio_queue_input_cb, ios, NULL, - kCFRunLoopCommonModes, 0, &(ios->audioQueue)); + ios->receive = receive; + ios->user_data = user_data; + devStat = AudioQueueNewInput(&(ios->audioFormat), ios_audio_queue_input_cb, ios, NULL, + kCFRunLoopCommonModes, 0, &(ios->audioQueue)); - if (devStat != 0) - { - errCode = GetLastError(); - WLog_ERR(TAG, "AudioQueueNewInput failed with %s [%" PRIu32 "]", - winpr_strerror(errCode, errString, sizeof(errString)), errCode); - goto err_out; - } + if (devStat != 0) + { + errCode = GetLastError(); + WLog_ERR(TAG, "AudioQueueNewInput failed with %s [%" PRIu32 "]", + winpr_strerror(errCode, errString, sizeof(errString)), errCode); + goto err_out; + } - for (index = 0; index < IOS_AUDIO_QUEUE_NUM_BUFFERS; index++) - { - devStat = AudioQueueAllocateBuffer(ios->audioQueue, - ios->FramesPerPacket * 2 * ios->format.nChannels, - &ios->audioBuffers[index]); + for (index = 0; index < IOS_AUDIO_QUEUE_NUM_BUFFERS; index++) + { + devStat = AudioQueueAllocateBuffer(ios->audioQueue, + ios->FramesPerPacket * 2 * ios->format.nChannels, + &ios->audioBuffers[index]); - if (devStat != 0) - { - errCode = GetLastError(); - WLog_ERR(TAG, "AudioQueueAllocateBuffer failed with %s [%" PRIu32 "]", - winpr_strerror(errCode, errString, sizeof(errString)), errCode); - goto err_out; - } + if (devStat != 0) + { + errCode = GetLastError(); + WLog_ERR(TAG, "AudioQueueAllocateBuffer failed with %s [%" PRIu32 "]", + winpr_strerror(errCode, errString, sizeof(errString)), errCode); + goto err_out; + } - devStat = AudioQueueEnqueueBuffer(ios->audioQueue, ios->audioBuffers[index], 0, NULL); + devStat = AudioQueueEnqueueBuffer(ios->audioQueue, ios->audioBuffers[index], 0, NULL); - if (devStat != 0) - { - errCode = GetLastError(); - WLog_ERR(TAG, "AudioQueueEnqueueBuffer failed with %s [%" PRIu32 "]", - winpr_strerror(errCode, errString, sizeof(errString)), errCode); - goto err_out; - } - } + if (devStat != 0) + { + errCode = GetLastError(); + WLog_ERR(TAG, "AudioQueueEnqueueBuffer failed with %s [%" PRIu32 "]", + winpr_strerror(errCode, errString, sizeof(errString)), errCode); + goto err_out; + } + } - devStat = AudioQueueStart(ios->audioQueue, NULL); + devStat = AudioQueueStart(ios->audioQueue, NULL); - if (devStat != 0) - { - errCode = GetLastError(); - WLog_ERR(TAG, "AudioQueueStart failed with %s [%" PRIu32 "]", - winpr_strerror(errCode, errString, sizeof(errString)), errCode); - goto err_out; - } + if (devStat != 0) + { + errCode = GetLastError(); + WLog_ERR(TAG, "AudioQueueStart failed with %s [%" PRIu32 "]", + winpr_strerror(errCode, errString, sizeof(errString)), errCode); + goto err_out; + } - ios->isOpen = true; - return CHANNEL_RC_OK; - err_out: - audin_ios_close(device); - return CHANNEL_RC_INITIALIZATION_ERROR; - } + ios->isOpen = true; + return CHANNEL_RC_OK; +err_out: + audin_ios_close(device); + return CHANNEL_RC_INITIALIZATION_ERROR; +} - static UINT audin_ios_free(IAudinDevice *device) - { - AudinIosDevice *ios = (AudinIosDevice *)device; - int error; +static UINT audin_ios_free(IAudinDevice *device) +{ + AudinIosDevice *ios = (AudinIosDevice *)device; + int error; - if (device == NULL) - return ERROR_INVALID_PARAMETER; + if (device == NULL) + return ERROR_INVALID_PARAMETER; - if ((error = audin_ios_close(device))) - { - WLog_ERR(TAG, "audin_oss_close failed with error code %d!", error); - } + if ((error = audin_ios_close(device))) + { + WLog_ERR(TAG, "audin_oss_close failed with error code %d!", error); + } - free(ios); - return CHANNEL_RC_OK; - } + free(ios); + return CHANNEL_RC_OK; +} - UINT ios_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints) - { - DWORD errCode; - char errString[1024]; - const ADDIN_ARGV *args; - AudinIosDevice *ios; - UINT error; - ios = (AudinIosDevice *)calloc(1, sizeof(AudinIosDevice)); +UINT ios_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints) +{ + DWORD errCode; + char errString[1024]; + const ADDIN_ARGV *args; + AudinIosDevice *ios; + UINT error; + ios = (AudinIosDevice *)calloc(1, sizeof(AudinIosDevice)); - if (!ios) - { - errCode = GetLastError(); - WLog_ERR(TAG, "calloc failed with %s [%" PRIu32 "]", - winpr_strerror(errCode, errString, sizeof(errString)), errCode); - return CHANNEL_RC_NO_MEMORY; - } + if (!ios) + { + errCode = GetLastError(); + WLog_ERR(TAG, "calloc failed with %s [%" PRIu32 "]", + winpr_strerror(errCode, errString, sizeof(errString)), errCode); + return CHANNEL_RC_NO_MEMORY; + } - ios->iface.Open = audin_ios_open; - ios->iface.FormatSupported = audin_ios_format_supported; - ios->iface.SetFormat = audin_ios_set_format; - ios->iface.Close = audin_ios_close; - ios->iface.Free = audin_ios_free; - ios->rdpcontext = pEntryPoints->rdpcontext; - ios->dev_unit = -1; - args = pEntryPoints->args; + ios->iface.Open = audin_ios_open; + ios->iface.FormatSupported = audin_ios_format_supported; + ios->iface.SetFormat = audin_ios_set_format; + ios->iface.Close = audin_ios_close; + ios->iface.Free = audin_ios_free; + ios->rdpcontext = pEntryPoints->rdpcontext; + ios->dev_unit = -1; + args = pEntryPoints->args; - if ((error = pEntryPoints->pRegisterAudinDevice(pEntryPoints->plugin, (IAudinDevice *)ios))) - { - WLog_ERR(TAG, "RegisterAudinDevice failed with error %" PRIu32 "!", error); - goto error_out; - } + if ((error = pEntryPoints->pRegisterAudinDevice(pEntryPoints->plugin, (IAudinDevice *)ios))) + { + WLog_ERR(TAG, "RegisterAudinDevice failed with error %" PRIu32 "!", error); + goto error_out; + } - return CHANNEL_RC_OK; - error_out: - free(ios); - return error; - } + return CHANNEL_RC_OK; +error_out: + free(ios); + return error; +} diff --git a/channels/audin/client/mac/audin_mac.m b/channels/audin/client/mac/audin_mac.m index 8a0860b37..6986d697a 100644 --- a/channels/audin/client/mac/audin_mac.m +++ b/channels/audin/client/mac/audin_mac.m @@ -154,13 +154,15 @@ static UINT audin_mac_set_format(IAudinDevice *device, const AUDIO_FORMAT *forma if (format->wBitsPerSample == 0) mac->audioFormat.mBitsPerChannel = 16; - + mac->audioFormat.mChannelsPerFrame = mac->format.nChannels; mac->audioFormat.mFramesPerPacket = 1; - mac->audioFormat.mBytesPerFrame = mac->audioFormat.mChannelsPerFrame * (mac->audioFormat.mBitsPerChannel / 8); - mac->audioFormat.mBytesPerPacket = mac->audioFormat.mBytesPerFrame * mac->audioFormat.mFramesPerPacket; - + mac->audioFormat.mBytesPerFrame = + mac->audioFormat.mChannelsPerFrame * (mac->audioFormat.mBitsPerChannel / 8); + mac->audioFormat.mBytesPerPacket = + mac->audioFormat.mBytesPerFrame * mac->audioFormat.mFramesPerPacket; + mac->audioFormat.mFormatFlags = audin_mac_get_flags_for_format(format); mac->audioFormat.mFormatID = audin_mac_get_format(format); mac->audioFormat.mReserved = 0; @@ -420,24 +422,26 @@ UINT mac_freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS #if defined(MAC_OS_X_VERSION_10_14) if (@available(macOS 10.14, *)) { - @autoreleasepool { + @autoreleasepool + { AVAuthorizationStatus status = - [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeAudio]; + [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeAudio]; switch (status) { case AVAuthorizationStatusAuthorized: mac->isAuthorized = TRUE; break; case AVAuthorizationStatusNotDetermined: - [AVCaptureDevice requestAccessForMediaType:AVMediaTypeAudio - completionHandler:^(BOOL granted) { - if (granted == YES) - { - mac->isAuthorized = TRUE; - } - else - WLog_WARN(TAG, "Microphone access denied by user"); - }]; + [AVCaptureDevice + requestAccessForMediaType:AVMediaTypeAudio + completionHandler:^(BOOL granted) { + if (granted == YES) + { + mac->isAuthorized = TRUE; + } + else + WLog_WARN(TAG, "Microphone access denied by user"); + }]; break; case AVAuthorizationStatusRestricted: WLog_WARN(TAG, "Microphone access restricted by policy"); diff --git a/channels/audin/client/winmm/audin_winmm.c b/channels/audin/client/winmm/audin_winmm.c index cfa3159f7..3b559be94 100644 --- a/channels/audin/client/winmm/audin_winmm.c +++ b/channels/audin/client/winmm/audin_winmm.c @@ -37,7 +37,7 @@ /* fix missing definitions in mingw */ #ifndef WAVE_MAPPED_DEFAULT_COMMUNICATION_DEVICE -#define WAVE_MAPPED_DEFAULT_COMMUNICATION_DEVICE 0x0010 +#define WAVE_MAPPED_DEFAULT_COMMUNICATION_DEVICE 0x0010 #endif typedef struct @@ -202,7 +202,6 @@ static DWORD WINAPI audin_winmm_thread_func(LPVOID arg) if (!log_mmresult(winmm, "waveInPrepareHeader", rc)) { - } rc = waveInAddBuffer(winmm->hWaveIn, &waveHdr[i], sizeof(waveHdr[i])); @@ -241,7 +240,6 @@ static DWORD WINAPI audin_winmm_thread_func(LPVOID arg) if (!log_mmresult(winmm, "waveInUnprepareHeader", rc)) { - } free(waveHdr[i].lpData); diff --git a/channels/cliprdr/client/cliprdr_main.c b/channels/cliprdr/client/cliprdr_main.c index 1a5040030..242f06957 100644 --- a/channels/cliprdr/client/cliprdr_main.c +++ b/channels/cliprdr/client/cliprdr_main.c @@ -947,7 +947,6 @@ static VOID VCAPITYPE cliprdr_virtual_channel_open_event_ex(LPVOID lpUserParam, "cliprdr_virtual_channel_open_event_ex reported an error"); } - /** * Function description * diff --git a/channels/disp/client/disp_main.c b/channels/disp/client/disp_main.c index c4b7b2da4..d2eab97f5 100644 --- a/channels/disp/client/disp_main.c +++ b/channels/disp/client/disp_main.c @@ -230,7 +230,7 @@ static UINT disp_recv_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) */ static UINT disp_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, wStream* data) { - GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; + GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; return disp_recv_pdu(callback, data); } @@ -254,8 +254,8 @@ static UINT disp_on_new_channel_connection(IWTSListenerCallback* pListenerCallba IWTSVirtualChannel* pChannel, BYTE* Data, BOOL* pbAccept, IWTSVirtualChannelCallback** ppCallback) { - GENERIC_CHANNEL_CALLBACK* callback; - GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; + GENERIC_CHANNEL_CALLBACK* callback; + GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; WINPR_ASSERT(listener_callback); WINPR_ASSERT(pChannel); @@ -298,7 +298,8 @@ static UINT disp_plugin_initialize(IWTSPlugin* pPlugin, IWTSVirtualChannelManage WLog_ERR(TAG, "[%s] channel initialized twice, aborting", DISP_DVC_CHANNEL_NAME); return ERROR_INVALID_DATA; } - disp->listener_callback = (GENERIC_LISTENER_CALLBACK*)calloc(1, sizeof(GENERIC_LISTENER_CALLBACK)); + disp->listener_callback = + (GENERIC_LISTENER_CALLBACK*)calloc(1, sizeof(GENERIC_LISTENER_CALLBACK)); if (!disp->listener_callback) { diff --git a/channels/drive/client/drive_file.c b/channels/drive/client/drive_file.c index 0d5b54373..79cf3ed24 100644 --- a/channels/drive/client/drive_file.c +++ b/channels/drive/client/drive_file.c @@ -492,8 +492,8 @@ BOOL drive_file_query_information(DRIVE_FILE* file, UINT32 FsInformationClass, w fileInformation.ftCreationTime.dwLowDateTime); /* CreationTime */ Stream_Write_UINT32(output, fileInformation.ftCreationTime.dwHighDateTime); /* CreationTime */ - Stream_Write_UINT32(output, - fileInformation.ftLastAccessTime.dwLowDateTime); /* LastAccessTime */ + Stream_Write_UINT32( + output, fileInformation.ftLastAccessTime.dwLowDateTime); /* LastAccessTime */ Stream_Write_UINT32( output, fileInformation.ftLastAccessTime.dwHighDateTime); /* LastAccessTime */ Stream_Write_UINT32(output, @@ -504,7 +504,7 @@ BOOL drive_file_query_information(DRIVE_FILE* file, UINT32 FsInformationClass, w fileInformation.ftLastWriteTime.dwLowDateTime); /* ChangeTime */ Stream_Write_UINT32(output, fileInformation.ftLastWriteTime.dwHighDateTime); /* ChangeTime */ - Stream_Write_UINT32(output, fileInformation.dwFileAttributes); /* FileAttributes */ + Stream_Write_UINT32(output, fileInformation.dwFileAttributes); /* FileAttributes */ /* Reserved(4), MUST NOT be added! */ break; @@ -514,13 +514,13 @@ BOOL drive_file_query_information(DRIVE_FILE* file, UINT32 FsInformationClass, w if (!Stream_EnsureRemainingCapacity(output, 4 + 22)) goto out_fail; - Stream_Write_UINT32(output, 22); /* Length */ + Stream_Write_UINT32(output, 22); /* Length */ Stream_Write_UINT32(output, fileInformation.nFileSizeLow); /* AllocationSize */ Stream_Write_UINT32(output, fileInformation.nFileSizeHigh); /* AllocationSize */ Stream_Write_UINT32(output, fileInformation.nFileSizeLow); /* EndOfFile */ Stream_Write_UINT32(output, fileInformation.nFileSizeHigh); /* EndOfFile */ Stream_Write_UINT32(output, fileInformation.nNumberOfLinks); /* NumberOfLinks */ - Stream_Write_UINT8(output, file->delete_pending ? 1 : 0); /* DeletePending */ + Stream_Write_UINT8(output, file->delete_pending ? 1 : 0); /* DeletePending */ Stream_Write_UINT8(output, fileInformation.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? TRUE : FALSE); /* Directory */ @@ -533,9 +533,9 @@ BOOL drive_file_query_information(DRIVE_FILE* file, UINT32 FsInformationClass, w if (!Stream_EnsureRemainingCapacity(output, 4 + 8)) goto out_fail; - Stream_Write_UINT32(output, 8); /* Length */ + Stream_Write_UINT32(output, 8); /* Length */ Stream_Write_UINT32(output, fileInformation.dwFileAttributes); /* FileAttributes */ - Stream_Write_UINT32(output, 0); /* ReparseTag */ + Stream_Write_UINT32(output, 0); /* ReparseTag */ break; default: diff --git a/channels/geometry/client/geometry_main.c b/channels/geometry/client/geometry_main.c index f2cf231c3..ada890da6 100644 --- a/channels/geometry/client/geometry_main.c +++ b/channels/geometry/client/geometry_main.c @@ -298,7 +298,7 @@ static UINT geometry_recv_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) */ static UINT geometry_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, wStream* data) { - GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; + GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; return geometry_recv_pdu(callback, data); } @@ -323,8 +323,8 @@ static UINT geometry_on_new_channel_connection(IWTSListenerCallback* pListenerCa BOOL* pbAccept, IWTSVirtualChannelCallback** ppCallback) { - GENERIC_CHANNEL_CALLBACK* callback; - GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; + GENERIC_CHANNEL_CALLBACK* callback; + GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; WINPR_UNUSED(Data); WINPR_UNUSED(pbAccept); diff --git a/channels/printer/client/printer_main.c b/channels/printer/client/printer_main.c index 9167bfd74..80e89a643 100644 --- a/channels/printer/client/printer_main.c +++ b/channels/printer/client/printer_main.c @@ -888,7 +888,7 @@ static UINT printer_register(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, rdpPrint printer_dev->rdpcontext = pEntryPoints->rdpcontext; printer_dev->printer = printer; printer_dev->pIrpList = (WINPR_PSLIST_HEADER)winpr_aligned_malloc(sizeof(WINPR_SLIST_HEADER), - MEMORY_ALLOCATION_ALIGNMENT); + MEMORY_ALLOCATION_ALIGNMENT); if (!printer_dev->pIrpList) { @@ -940,7 +940,8 @@ error_out: static rdpPrinterDriver* printer_load_backend(const char* backend) { typedef rdpPrinterDriver* (*backend_load_t)(void); - union { + union + { PVIRTUALCHANNELENTRY entry; backend_load_t backend; } fktconv; @@ -957,9 +958,7 @@ static rdpPrinterDriver* printer_load_backend(const char* backend) * * @return 0 on success, otherwise a Win32 error code */ -UINT -printer_DeviceServiceEntry - (PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints) +UINT printer_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints) { int i; char* name; diff --git a/channels/rail/client/rail_main.c b/channels/rail/client/rail_main.c index 2f84e72e9..287101bdc 100644 --- a/channels/rail/client/rail_main.c +++ b/channels/rail/client/rail_main.c @@ -615,7 +615,6 @@ static UINT rail_virtual_channel_event_disconnected(railPlugin* rail) rail->OpenHandle = 0; - return CHANNEL_RC_OK; } diff --git a/channels/rdpdr/client/devman.c b/channels/rdpdr/client/devman.c index 57ed9afc8..5e592e433 100644 --- a/channels/rdpdr/client/devman.c +++ b/channels/rdpdr/client/devman.c @@ -181,7 +181,8 @@ UINT devman_load_device_service(DEVMAN* devman, const RDPDR_DEVICE* device, rdpC const char* ServiceName = NULL; DEVICE_SERVICE_ENTRY_POINTS ep; PDEVICE_SERVICE_ENTRY entry = NULL; - union { + union + { const RDPDR_DEVICE* cdp; RDPDR_DEVICE* dp; } devconv; diff --git a/channels/rdpdr/client/rdpdr_capabilities.c b/channels/rdpdr/client/rdpdr_capabilities.c index 6c93cd81e..571b3ce56 100644 --- a/channels/rdpdr/client/rdpdr_capabilities.c +++ b/channels/rdpdr/client/rdpdr_capabilities.c @@ -47,11 +47,11 @@ static void rdpdr_write_general_capset(rdpdrPlugin* rdpdr, wStream* s) { WINPR_UNUSED(rdpdr); rdpdr_write_capset_header(s, CAP_GENERAL_TYPE, 44, GENERAL_CAPABILITY_VERSION_02); - Stream_Write_UINT32(s, 0); /* osType, ignored on receipt */ - Stream_Write_UINT32(s, 0); /* osVersion, unused and must be set to zero */ + Stream_Write_UINT32(s, 0); /* osType, ignored on receipt */ + Stream_Write_UINT32(s, 0); /* osVersion, unused and must be set to zero */ Stream_Write_UINT16(s, rdpdr->versionMajor); /* protocolMajorVersion, must be set to 1 */ Stream_Write_UINT16(s, rdpdr->versionMinor); /* protocolMinorVersion */ - Stream_Write_UINT32(s, 0x0000FFFF); /* ioCode1 */ + Stream_Write_UINT32(s, 0x0000FFFF); /* ioCode1 */ Stream_Write_UINT32(s, 0); /* ioCode2, must be set to zero, reserved for future use */ Stream_Write_UINT32(s, RDPDR_DEVICE_REMOVE_PDUS | RDPDR_CLIENT_DISPLAY_NAME_PDU | RDPDR_USER_LOGGEDON_PDU); /* extendedPDU */ diff --git a/channels/rdpdr/server/rdpdr_main.c b/channels/rdpdr/server/rdpdr_main.c index 2c7801f1f..19a1e189e 100644 --- a/channels/rdpdr/server/rdpdr_main.c +++ b/channels/rdpdr/server/rdpdr_main.c @@ -1408,16 +1408,16 @@ static UINT rdpdr_server_read_file_directory_information(wStream* s, if (!Stream_CheckAndLogRequiredLength(TAG, s, 64)) return ERROR_INVALID_DATA; - Stream_Read_UINT32(s, fdi->NextEntryOffset); /* NextEntryOffset (4 bytes) */ - Stream_Read_UINT32(s, fdi->FileIndex); /* FileIndex (4 bytes) */ - Stream_Read_INT64(s, fdi->CreationTime.QuadPart); /* CreationTime (8 bytes) */ - Stream_Read_INT64(s, fdi->LastAccessTime.QuadPart); /* LastAccessTime (8 bytes) */ - Stream_Read_INT64(s, fdi->LastWriteTime.QuadPart); /* LastWriteTime (8 bytes) */ - Stream_Read_INT64(s, fdi->ChangeTime.QuadPart); /* ChangeTime (8 bytes) */ - Stream_Read_INT64(s, fdi->EndOfFile.QuadPart); /* EndOfFile (8 bytes) */ - Stream_Read_INT64(s, fdi->AllocationSize.QuadPart); /* AllocationSize (8 bytes) */ - Stream_Read_UINT32(s, fdi->FileAttributes); /* FileAttributes (4 bytes) */ - Stream_Read_UINT32(s, fileNameLength); /* FileNameLength (4 bytes) */ + Stream_Read_UINT32(s, fdi->NextEntryOffset); /* NextEntryOffset (4 bytes) */ + Stream_Read_UINT32(s, fdi->FileIndex); /* FileIndex (4 bytes) */ + Stream_Read_INT64(s, fdi->CreationTime.QuadPart); /* CreationTime (8 bytes) */ + Stream_Read_INT64(s, fdi->LastAccessTime.QuadPart); /* LastAccessTime (8 bytes) */ + Stream_Read_INT64(s, fdi->LastWriteTime.QuadPart); /* LastWriteTime (8 bytes) */ + Stream_Read_INT64(s, fdi->ChangeTime.QuadPart); /* ChangeTime (8 bytes) */ + Stream_Read_INT64(s, fdi->EndOfFile.QuadPart); /* EndOfFile (8 bytes) */ + Stream_Read_INT64(s, fdi->AllocationSize.QuadPart); /* AllocationSize (8 bytes) */ + Stream_Read_UINT32(s, fdi->FileAttributes); /* FileAttributes (4 bytes) */ + Stream_Read_UINT32(s, fileNameLength); /* FileNameLength (4 bytes) */ if (!Stream_CheckAndLogRequiredLength(TAG, s, fileNameLength)) return ERROR_INVALID_DATA; @@ -1599,8 +1599,8 @@ static UINT rdpdr_server_send_device_query_directory_request(RdpdrServerContext* Stream_Write_UINT32(s, FileDirectoryInformation); /* FsInformationClass (4 bytes) */ Stream_Write_UINT8(s, path ? 1 : 0); /* InitialQuery (1 byte) */ WINPR_ASSERT(pathLength <= UINT32_MAX); - Stream_Write_UINT32(s, (UINT32)pathLength); /* PathLength (4 bytes) */ - Stream_Zero(s, 23); /* Padding (23 bytes) */ + Stream_Write_UINT32(s, (UINT32)pathLength); /* PathLength (4 bytes) */ + Stream_Zero(s, 23); /* Padding (23 bytes) */ /* Convert the path to Unicode. */ if (pathLength > 0) @@ -1646,10 +1646,10 @@ static UINT rdpdr_server_send_device_file_rename_request(RdpdrServerContext* con Stream_Write_UINT32(s, FileRenameInformation); /* FsInformationClass (4 bytes) */ WINPR_ASSERT(pathLength <= UINT32_MAX - 6U); Stream_Write_UINT32(s, (UINT32)pathLength + 6U); /* Length (4 bytes) */ - Stream_Zero(s, 24); /* Padding (24 bytes) */ + Stream_Zero(s, 24); /* Padding (24 bytes) */ /* RDP_FILE_RENAME_INFORMATION */ - Stream_Write_UINT8(s, 0); /* ReplaceIfExists (1 byte) */ - Stream_Write_UINT8(s, 0); /* RootDirectory (1 byte) */ + Stream_Write_UINT8(s, 0); /* ReplaceIfExists (1 byte) */ + Stream_Write_UINT8(s, 0); /* RootDirectory (1 byte) */ Stream_Write_UINT32(s, (UINT32)pathLength); /* FileNameLength (4 bytes) */ /* Convert the path to Unicode. */ diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c index 495628ece..9209b0887 100644 --- a/channels/rdpei/client/rdpei_main.c +++ b/channels/rdpei/client/rdpei_main.c @@ -855,7 +855,7 @@ static UINT rdpei_recv_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) */ static UINT rdpei_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, wStream* data) { - GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; + GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; return rdpei_recv_pdu(callback, data); } @@ -866,7 +866,7 @@ static UINT rdpei_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, */ static UINT rdpei_on_close(IWTSVirtualChannelCallback* pChannelCallback) { - GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; + GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; if (callback) { RDPEI_PLUGIN* rdpei = (RDPEI_PLUGIN*)callback->plugin; @@ -889,8 +889,8 @@ static UINT rdpei_on_new_channel_connection(IWTSListenerCallback* pListenerCallb IWTSVirtualChannel* pChannel, BYTE* Data, BOOL* pbAccept, IWTSVirtualChannelCallback** ppCallback) { - GENERIC_CHANNEL_CALLBACK* callback; - GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; + GENERIC_CHANNEL_CALLBACK* callback; + GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; if (!listener_callback) return ERROR_INTERNAL_ERROR; callback = (GENERIC_CHANNEL_CALLBACK*)calloc(1, sizeof(GENERIC_CHANNEL_CALLBACK)); @@ -970,7 +970,8 @@ static UINT rdpei_plugin_initialize(IWTSPlugin* pPlugin, IWTSVirtualChannelManag WLog_ERR(TAG, "[%s] channel initialized twice, aborting", RDPEI_DVC_CHANNEL_NAME); return ERROR_INVALID_DATA; } - rdpei->listener_callback = (GENERIC_LISTENER_CALLBACK*)calloc(1, sizeof(GENERIC_LISTENER_CALLBACK)); + rdpei->listener_callback = + (GENERIC_LISTENER_CALLBACK*)calloc(1, sizeof(GENERIC_LISTENER_CALLBACK)); if (!rdpei->listener_callback) { @@ -1405,7 +1406,7 @@ static UINT rdpei_pen_end(RdpeiClientContext* context, INT32 externalId, UINT32 va_start(ap, y); error = rdpei_pen_process(context, externalId, RDPINPUT_CONTACT_FLAG_UP, fieldFlags, x, y, ap); - va_end(ap); + va_end(ap); } return error; } diff --git a/channels/rdpgfx/client/rdpgfx_main.c b/channels/rdpgfx/client/rdpgfx_main.c index 3ce6eb33f..56d302bdd 100644 --- a/channels/rdpgfx/client/rdpgfx_main.c +++ b/channels/rdpgfx/client/rdpgfx_main.c @@ -517,11 +517,11 @@ static UINT rdpgfx_recv_reset_graphics_pdu(GENERIC_CHANNEL_CALLBACK* callback, w for (index = 0; index < pdu.monitorCount; index++) { monitor = &(pdu.monitorDefArray[index]); - Stream_Read_INT32(s, monitor->left); /* left (4 bytes) */ - Stream_Read_INT32(s, monitor->top); /* top (4 bytes) */ - Stream_Read_INT32(s, monitor->right); /* right (4 bytes) */ - Stream_Read_INT32(s, monitor->bottom); /* bottom (4 bytes) */ - Stream_Read_UINT32(s, monitor->flags); /* flags (4 bytes) */ + Stream_Read_INT32(s, monitor->left); /* left (4 bytes) */ + Stream_Read_INT32(s, monitor->top); /* top (4 bytes) */ + Stream_Read_INT32(s, monitor->right); /* right (4 bytes) */ + Stream_Read_INT32(s, monitor->bottom); /* bottom (4 bytes) */ + Stream_Read_UINT32(s, monitor->flags); /* flags (4 bytes) */ } pad = 340 - (RDPGFX_HEADER_SIZE + 12 + (pdu.monitorCount * 20)); @@ -623,19 +623,22 @@ UINT rdpgfx_load_cache_import_offer(RDPGFX_PLUGIN* gfx, RDPGFX_CACHE_IMPORT_OFFE if (!persistent) return CHANNEL_RC_NO_MEMORY; - if (persistent_cache_open(persistent, settings->BitmapCachePersistFile, FALSE, 3) < 1) { + if (persistent_cache_open(persistent, settings->BitmapCachePersistFile, FALSE, 3) < 1) + { error = CHANNEL_RC_INITIALIZATION_ERROR; goto fail; } - if (persistent_cache_get_version(persistent) != 3) { + if (persistent_cache_get_version(persistent) != 3) + { error = ERROR_INVALID_DATA; goto fail; } count = persistent_cache_get_count(persistent); - if (count < 1) { + if (count < 1) + { error = ERROR_INVALID_DATA; goto fail; } @@ -650,7 +653,8 @@ UINT rdpgfx_load_cache_import_offer(RDPGFX_PLUGIN* gfx, RDPGFX_CACHE_IMPORT_OFFE for (idx = 0; idx < count; idx++) { - if (persistent_cache_read_entry(persistent, &entry) < 1) { + if (persistent_cache_read_entry(persistent, &entry) < 1) + { error = ERROR_INVALID_DATA; goto fail; } @@ -697,7 +701,8 @@ static UINT rdpgfx_save_persistent_cache(RDPGFX_PLUGIN* gfx) if (!persistent) return CHANNEL_RC_NO_MEMORY; - if (persistent_cache_open(persistent, settings->BitmapCachePersistFile, TRUE, 3) < 1) { + if (persistent_cache_open(persistent, settings->BitmapCachePersistFile, TRUE, 3) < 1) + { error = CHANNEL_RC_INITIALIZATION_ERROR; goto fail; } @@ -818,12 +823,14 @@ static UINT rdpgfx_send_cache_offer(RDPGFX_PLUGIN* gfx) if (!persistent) return CHANNEL_RC_NO_MEMORY; - if (persistent_cache_open(persistent, settings->BitmapCachePersistFile, FALSE, 3) < 1) { + if (persistent_cache_open(persistent, settings->BitmapCachePersistFile, FALSE, 3) < 1) + { error = CHANNEL_RC_INITIALIZATION_ERROR; goto fail; } - if (persistent_cache_get_version(persistent) != 3) { + if (persistent_cache_get_version(persistent) != 3) + { error = ERROR_INVALID_DATA; goto fail; } @@ -836,13 +843,14 @@ static UINT rdpgfx_send_cache_offer(RDPGFX_PLUGIN* gfx) if (count > gfx->MaxCacheSlots) count = gfx->MaxCacheSlots; - offer.cacheEntriesCount = (UINT16) count; + offer.cacheEntriesCount = (UINT16)count; WLog_DBG(TAG, "Sending Cache Import Offer: %d", count); for (idx = 0; idx < count; idx++) { - if (persistent_cache_read_entry(persistent, &entry) < 1) { + if (persistent_cache_read_entry(persistent, &entry) < 1) + { error = ERROR_INVALID_DATA; goto fail; } @@ -853,9 +861,11 @@ static UINT rdpgfx_send_cache_offer(RDPGFX_PLUGIN* gfx) persistent_cache_free(persistent); - if (offer.cacheEntriesCount > 0) { + if (offer.cacheEntriesCount > 0) + { error = rdpgfx_send_cache_import_offer_pdu(context, &offer); - if (error != CHANNEL_RC_OK) { + if (error != CHANNEL_RC_OK) + { WLog_Print(gfx->log, WLOG_ERROR, "Failed to send cache import offer PDU"); goto fail; } @@ -894,12 +904,14 @@ static UINT rdpgfx_load_cache_import_reply(RDPGFX_PLUGIN* gfx, RDPGFX_CACHE_IMPO if (!persistent) return CHANNEL_RC_NO_MEMORY; - if (persistent_cache_open(persistent, settings->BitmapCachePersistFile, FALSE, 3) < 1) { + if (persistent_cache_open(persistent, settings->BitmapCachePersistFile, FALSE, 3) < 1) + { error = CHANNEL_RC_INITIALIZATION_ERROR; goto fail; } - if (persistent_cache_get_version(persistent) != 3) { + if (persistent_cache_get_version(persistent) != 3) + { error = ERROR_INVALID_DATA; goto fail; } @@ -912,7 +924,8 @@ static UINT rdpgfx_load_cache_import_reply(RDPGFX_PLUGIN* gfx, RDPGFX_CACHE_IMPO for (idx = 0; idx < count; idx++) { - if (persistent_cache_read_entry(persistent, &entry) < 1) { + if (persistent_cache_read_entry(persistent, &entry) < 1) + { error = ERROR_INVALID_DATA; goto fail; } @@ -965,9 +978,10 @@ static UINT rdpgfx_recv_cache_import_reply_pdu(GENERIC_CHANNEL_CALLBACK* callbac error = rdpgfx_load_cache_import_reply(gfx, &pdu); - if (error) { + if (error) + { WLog_Print(gfx->log, WLOG_ERROR, - "rdpgfx_load_cache_import_reply failed with error %" PRIu32 "", error); + "rdpgfx_load_cache_import_reply failed with error %" PRIu32 "", error); return error; } @@ -1912,7 +1926,7 @@ static UINT rdpgfx_recv_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) if ((error = rdpgfx_send_cache_offer(gfx))) WLog_Print(gfx->log, WLOG_ERROR, "rdpgfx_send_cache_offer failed with error %" PRIu32 "!", error); - + break; case RDPGFX_CMDID_MAPSURFACETOWINDOW: @@ -1982,8 +1996,7 @@ static UINT rdpgfx_on_data_received(IWTSVirtualChannelCallback* pChannelCallback RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)callback->plugin; UINT error = CHANNEL_RC_OK; status = zgfx_decompress(gfx->zgfx, Stream_Pointer(data), - (UINT32) Stream_GetRemainingLength(data), - &pDstData, &DstSize, 0); + (UINT32)Stream_GetRemainingLength(data), &pDstData, &DstSize, 0); if (status < 0) { @@ -2020,7 +2033,7 @@ static UINT rdpgfx_on_data_received(IWTSVirtualChannelCallback* pChannelCallback */ static UINT rdpgfx_on_open(IWTSVirtualChannelCallback* pChannelCallback) { - GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; + GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)callback->plugin; RdpgfxClientContext* context = (RdpgfxClientContext*)gfx->iface.pInterface; UINT error = CHANNEL_RC_OK; @@ -2057,10 +2070,11 @@ static UINT rdpgfx_on_close(IWTSVirtualChannelCallback* pChannelCallback) DEBUG_RDPGFX(gfx->log, "OnClose"); error = rdpgfx_save_persistent_cache(gfx); - if (error) { + if (error) + { // print error, but don't consider this a hard failure - WLog_Print(gfx->log, WLOG_ERROR, "rdpgfx_save_persistent_cache failed with error %" PRIu32 "", - error); + WLog_Print(gfx->log, WLOG_ERROR, + "rdpgfx_save_persistent_cache failed with error %" PRIu32 "", error); } free_surfaces(context, gfx->SurfaceTable); @@ -2088,8 +2102,8 @@ static UINT rdpgfx_on_new_channel_connection(IWTSListenerCallback* pListenerCall BOOL* pbAccept, IWTSVirtualChannelCallback** ppCallback) { - GENERIC_CHANNEL_CALLBACK* callback; - GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; + GENERIC_CHANNEL_CALLBACK* callback; + GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; callback = (GENERIC_CHANNEL_CALLBACK*)calloc(1, sizeof(GENERIC_CHANNEL_CALLBACK)); if (!callback) @@ -2123,7 +2137,8 @@ static UINT rdpgfx_plugin_initialize(IWTSPlugin* pPlugin, IWTSVirtualChannelMana WLog_ERR(TAG, "[%s] channel initialized twice, aborting", RDPGFX_DVC_CHANNEL_NAME); return ERROR_INVALID_DATA; } - gfx->listener_callback = (GENERIC_LISTENER_CALLBACK*)calloc(1, sizeof(GENERIC_LISTENER_CALLBACK)); + gfx->listener_callback = + (GENERIC_LISTENER_CALLBACK*)calloc(1, sizeof(GENERIC_LISTENER_CALLBACK)); if (!gfx->listener_callback) { @@ -2217,7 +2232,7 @@ static UINT rdpgfx_get_surface_ids(RdpgfxClientContext* context, UINT16** ppSurf for (index = 0; index < count; index++) { - pSurfaceIds[index] = (UINT16) (pKeys[index] - 1); + pSurfaceIds[index] = (UINT16)(pKeys[index] - 1); } free(pKeys); @@ -2244,7 +2259,7 @@ static void* rdpgfx_get_surface_data(RdpgfxClientContext* context, UINT16 surfac static UINT rdpgfx_set_cache_slot_data(RdpgfxClientContext* context, UINT16 cacheSlot, void* pData) { RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)context->handle; - + /* Microsoft uses 1-based indexing for the egfx bitmap cache ! */ if (cacheSlot == 0 || cacheSlot > gfx->MaxCacheSlots) { diff --git a/channels/rdpgfx/rdpgfx_common.c b/channels/rdpgfx/rdpgfx_common.c index 7da26a45a..561d9e4f9 100644 --- a/channels/rdpgfx/rdpgfx_common.c +++ b/channels/rdpgfx/rdpgfx_common.c @@ -121,7 +121,7 @@ UINT rdpgfx_read_header(wStream* s, RDPGFX_HEADER* header) if (header->pduLength < 8) { - WLog_ERR(TAG, "header->pduLength %u less than 8!", header->pduLength); + WLog_ERR(TAG, "header->pduLength %u less than 8!", header->pduLength); return ERROR_INVALID_DATA; } if (!Stream_CheckAndLogRequiredLength(TAG, s, (header->pduLength - 8))) diff --git a/channels/rdpsnd/client/ios/rdpsnd_ios.c b/channels/rdpsnd/client/ios/rdpsnd_ios.c index b2722b8f8..872d9c6e7 100644 --- a/channels/rdpsnd/client/ios/rdpsnd_ios.c +++ b/channels/rdpsnd/client/ios/rdpsnd_ios.c @@ -83,7 +83,8 @@ static OSStatus rdpsnd_ios_render_cb(void* inRefCon, return noErr; } -static BOOL rdpsnd_ios_format_supported(rdpsndDevicePlugin* __unused device, const AUDIO_FORMAT* format) +static BOOL rdpsnd_ios_format_supported(rdpsndDevicePlugin* __unused device, + const AUDIO_FORMAT* format) { if (format->wFormatTag == WAVE_FORMAT_PCM) { @@ -144,7 +145,8 @@ static UINT rdpsnd_ios_play(rdpsndDevicePlugin* device, const BYTE* data, size_t return 10; /* TODO: Get real latencry in [ms] */ } -static BOOL rdpsnd_ios_open(rdpsndDevicePlugin* device, const AUDIO_FORMAT* format, int __unused latency) +static BOOL rdpsnd_ios_open(rdpsndDevicePlugin* device, const AUDIO_FORMAT* format, + int __unused latency) { rdpsndIOSPlugin* p = THIS(device); diff --git a/channels/rdpsnd/client/mac/rdpsnd_mac.m b/channels/rdpsnd/client/mac/rdpsnd_mac.m index 25f109989..59713571c 100644 --- a/channels/rdpsnd/client/mac/rdpsnd_mac.m +++ b/channels/rdpsnd/client/mac/rdpsnd_mac.m @@ -136,19 +136,21 @@ static void rdpsnd_mac_release(rdpsndMacPlugin *mac) static BOOL rdpsnd_mac_open(rdpsndDevicePlugin *device, const AUDIO_FORMAT *format, UINT32 latency) { - @autoreleasepool { + @autoreleasepool + { AudioDeviceID outputDeviceID; UInt32 propertySize; OSStatus err; NSError *error; rdpsndMacPlugin *mac = (rdpsndMacPlugin *)device; - AudioObjectPropertyAddress propertyAddress = { kAudioHardwarePropertyDefaultOutputDevice, - kAudioObjectPropertyScopeGlobal, - #if defined(MAC_OS_VERSION_12_0) - kAudioObjectPropertyElementMain - #else - kAudioObjectPropertyElementMaster - #endif + AudioObjectPropertyAddress propertyAddress = { + kAudioHardwarePropertyDefaultOutputDevice, + kAudioObjectPropertyScopeGlobal, +#if defined(MAC_OS_VERSION_12_0) + kAudioObjectPropertyElementMain +#else + kAudioObjectPropertyElementMaster +#endif }; if (mac->isOpen) @@ -159,7 +161,7 @@ static BOOL rdpsnd_mac_open(rdpsndDevicePlugin *device, const AUDIO_FORMAT *form propertySize = sizeof(outputDeviceID); err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, - &propertySize, &outputDeviceID); + &propertySize, &outputDeviceID); if (err) { WLog_ERR(TAG, "AudioHardwareGetProperty: %s", FormatError(err)); @@ -171,8 +173,8 @@ static BOOL rdpsnd_mac_open(rdpsndDevicePlugin *device, const AUDIO_FORMAT *form return FALSE; err = AudioUnitSetProperty(mac->engine.outputNode.audioUnit, - kAudioOutputUnitProperty_CurrentDevice, kAudioUnitScope_Global, 0, - &outputDeviceID, sizeof(outputDeviceID)); + kAudioOutputUnitProperty_CurrentDevice, kAudioUnitScope_Global, + 0, &outputDeviceID, sizeof(outputDeviceID)); if (err) { rdpsnd_mac_release(mac); @@ -197,7 +199,8 @@ static BOOL rdpsnd_mac_open(rdpsndDevicePlugin *device, const AUDIO_FORMAT *form if (![mac->engine startAndReturnError:&error]) { device->Close(device); - WLog_ERR(TAG, "Failed to start audio player %s", [error.localizedDescription UTF8String]); + WLog_ERR(TAG, "Failed to start audio player %s", + [error.localizedDescription UTF8String]); return FALSE; } @@ -208,7 +211,8 @@ static BOOL rdpsnd_mac_open(rdpsndDevicePlugin *device, const AUDIO_FORMAT *form static void rdpsnd_mac_close(rdpsndDevicePlugin *device) { - @autoreleasepool { + @autoreleasepool + { rdpsndMacPlugin *mac = (rdpsndMacPlugin *)device; if (mac->isPlaying) @@ -255,7 +259,8 @@ static BOOL rdpsnd_mac_format_supported(rdpsndDevicePlugin *device, const AUDIO_ static BOOL rdpsnd_mac_set_volume(rdpsndDevicePlugin *device, UINT32 value) { - @autoreleasepool { + @autoreleasepool + { Float32 fVolume; UINT16 volumeLeft; UINT16 volumeRight; @@ -276,7 +281,8 @@ static BOOL rdpsnd_mac_set_volume(rdpsndDevicePlugin *device, UINT32 value) static void rdpsnd_mac_start(rdpsndDevicePlugin *device) { - @autoreleasepool { + @autoreleasepool + { rdpsndMacPlugin *mac = (rdpsndMacPlugin *)device; if (!mac->isPlaying) @@ -289,7 +295,7 @@ static void rdpsnd_mac_start(rdpsndDevicePlugin *device) { device->Close(device); WLog_ERR(TAG, "Failed to start audio player %s", - [error.localizedDescription UTF8String]); + [error.localizedDescription UTF8String]); return; } } @@ -304,7 +310,8 @@ static void rdpsnd_mac_start(rdpsndDevicePlugin *device) static UINT rdpsnd_mac_play(rdpsndDevicePlugin *device, const BYTE *data, size_t size) { - @autoreleasepool { + @autoreleasepool + { rdpsndMacPlugin *mac = (rdpsndMacPlugin *)device; AVAudioPCMBuffer *buffer; AVAudioFormat *format; @@ -320,19 +327,19 @@ static UINT rdpsnd_mac_play(rdpsndDevicePlugin *device, const BYTE *data, size_t count = size / step; format = [[AVAudioFormat alloc] initWithCommonFormat:AVAudioPCMFormatFloat32 - sampleRate:mac->format.nSamplesPerSec - channels:mac->format.nChannels - interleaved:NO]; - + sampleRate:mac->format.nSamplesPerSec + channels:mac->format.nChannels + interleaved:NO]; + if (!format) { WLog_WARN(TAG, "AVAudioFormat::init() failed"); return 0; } - + buffer = [[AVAudioPCMBuffer alloc] initWithPCMFormat:format frameCapacity:count]; [format release]; - + if (!buffer) { WLog_WARN(TAG, "AVAudioPCMBuffer::init() failed"); @@ -356,16 +363,16 @@ static UINT rdpsnd_mac_play(rdpsndDevicePlugin *device, const BYTE *data, size_t rdpsnd_mac_start(device); [mac->player scheduleBuffer:buffer - completionHandler:^{ - UINT64 stop = GetTickCount64(); - if (start > stop) - mac->diff = 0; - else - mac->diff = stop - start; - }]; + completionHandler:^{ + UINT64 stop = GetTickCount64(); + if (start > stop) + mac->diff = 0; + else + mac->diff = stop - start; + }]; [buffer release]; - + return mac->diff > UINT_MAX ? UINT_MAX : mac->diff; } } diff --git a/channels/rdpsnd/client/opensles/rdpsnd_opensles.c b/channels/rdpsnd/client/opensles/rdpsnd_opensles.c index 065f58fb8..55359fe13 100644 --- a/channels/rdpsnd/client/opensles/rdpsnd_opensles.c +++ b/channels/rdpsnd/client/opensles/rdpsnd_opensles.c @@ -253,7 +253,8 @@ static BOOL rdpsnd_opensles_set_volume(rdpsndDevicePlugin* device, UINT32 value) static UINT rdpsnd_opensles_play(rdpsndDevicePlugin* device, const BYTE* data, size_t size) { - union { + union + { const BYTE* b; const short* s; } src; diff --git a/channels/rdpsnd/client/rdpsnd_main.c b/channels/rdpsnd/client/rdpsnd_main.c index 3387baa0b..08195b4a1 100644 --- a/channels/rdpsnd/client/rdpsnd_main.c +++ b/channels/rdpsnd/client/rdpsnd_main.c @@ -47,7 +47,6 @@ #include #include - #include "rdpsnd_common.h" #include "rdpsnd_main.h" @@ -273,9 +272,9 @@ static UINT rdpsnd_recv_server_audio_formats_pdu(rdpsndPlugin* rdpsnd, wStream* Stream_Seek_UINT32(s); /* dwPitch */ Stream_Seek_UINT16(s); /* wDGramPort */ Stream_Read_UINT16(s, wNumberOfFormats); - Stream_Read_UINT8(s, rdpsnd->cBlockNo); /* cLastBlockConfirmed */ + Stream_Read_UINT8(s, rdpsnd->cBlockNo); /* cLastBlockConfirmed */ Stream_Read_UINT16(s, rdpsnd->wVersion); /* wVersion */ - Stream_Seek_UINT8(s); /* bPad */ + Stream_Seek_UINT8(s); /* bPad */ rdpsnd->NumberOfServerFormats = wNumberOfFormats; if (!Stream_CheckAndLogRequiredLength(TAG, s, 14ull * wNumberOfFormats)) @@ -1290,7 +1289,6 @@ static UINT rdpsnd_virtual_channel_event_disconnected(rdpsndPlugin* rdpsnd) rdpsnd_is_dyn_str(rdpsnd->dynamic), WTSErrorToString(error), error); return error; } - } cleanup_internals(rdpsnd); @@ -1553,7 +1551,7 @@ BOOL VCAPITYPE rdpsnd_VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS pEntryPoints, static UINT rdpsnd_on_open(IWTSVirtualChannelCallback* pChannelCallback) { - GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; + GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; rdpsndPlugin* rdpsnd; WINPR_ASSERT(callback); @@ -1569,7 +1567,7 @@ static UINT rdpsnd_on_open(IWTSVirtualChannelCallback* pChannelCallback) static UINT rdpsnd_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, wStream* data) { - GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; + GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; rdpsndPlugin* plugin; wStream* copy; size_t len; @@ -1599,7 +1597,7 @@ static UINT rdpsnd_on_data_received(IWTSVirtualChannelCallback* pChannelCallback static UINT rdpsnd_on_close(IWTSVirtualChannelCallback* pChannelCallback) { - GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; + GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; rdpsndPlugin* rdpsnd; WINPR_ASSERT(callback); @@ -1628,7 +1626,7 @@ static UINT rdpsnd_on_new_channel_connection(IWTSListenerCallback* pListenerCall BOOL* pbAccept, IWTSVirtualChannelCallback** ppCallback) { - GENERIC_CHANNEL_CALLBACK* callback; + GENERIC_CHANNEL_CALLBACK* callback; GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; WINPR_ASSERT(listener_callback); WINPR_ASSERT(pChannel); diff --git a/channels/sshagent/client/sshagent_main.c b/channels/sshagent/client/sshagent_main.c index 12559990f..b4cc15acf 100644 --- a/channels/sshagent/client/sshagent_main.c +++ b/channels/sshagent/client/sshagent_main.c @@ -70,7 +70,7 @@ typedef struct typedef struct { - GENERIC_CHANNEL_CALLBACK generic; + GENERIC_CHANNEL_CALLBACK generic; rdpContext* rdpcontext; int agent_fd; @@ -156,7 +156,7 @@ static DWORD WINAPI sshagent_read_thread(LPVOID data) else { /* Something read: forward to virtual channel */ - IWTSVirtualChannel* channel = callback->generic.channel; + IWTSVirtualChannel* channel = callback->generic.channel; status = channel->Write(channel, bytes_read, buffer, NULL); if (status != CHANNEL_RC_OK) diff --git a/channels/urbdrc/client/data_transfer.c b/channels/urbdrc/client/data_transfer.c index d5da7e6a0..9373f410b 100644 --- a/channels/urbdrc/client/data_transfer.c +++ b/channels/urbdrc/client/data_transfer.c @@ -113,7 +113,7 @@ static wStream* urb_create_iocompletion(UINT32 InterfaceField, UINT32 MessageId, } static UINT urbdrc_process_register_request_callback(IUDEVICE* pdev, - GENERIC_CHANNEL_CALLBACK* callback, wStream* s, + GENERIC_CHANNEL_CALLBACK* callback, wStream* s, IUDEVMAN* udevman) { UINT32 NumRequestCompletion = 0; @@ -207,8 +207,8 @@ static UINT urbdrc_process_retract_device_request(IUDEVICE* pdev, wStream* s, IU return ERROR_SUCCESS; } -static UINT urbdrc_process_io_control(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* callback, wStream* s, - UINT32 MessageId, IUDEVMAN* udevman) +static UINT urbdrc_process_io_control(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* callback, + wStream* s, UINT32 MessageId, IUDEVMAN* udevman) { UINT32 InterfaceId; UINT32 IoControlCode; @@ -1267,8 +1267,9 @@ static UINT urb_get_current_frame_number(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBAC } /* Unused function for current server */ -static UINT urb_control_get_configuration_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* callback, - wStream* s, UINT32 RequestField, UINT32 MessageId, +static UINT urb_control_get_configuration_request(IUDEVICE* pdev, + GENERIC_CHANNEL_CALLBACK* callback, wStream* s, + UINT32 RequestField, UINT32 MessageId, IUDEVMAN* udevman, int transferDir) { size_t out_size; diff --git a/channels/urbdrc/client/libusb/libusb_udevice.c b/channels/urbdrc/client/libusb/libusb_udevice.c index 141482bb1..17fad110a 100644 --- a/channels/urbdrc/client/libusb/libusb_udevice.c +++ b/channels/urbdrc/client/libusb/libusb_udevice.c @@ -1290,7 +1290,8 @@ static BOOL libusb_udev_control_transfer(IUDEVICE* idev, UINT32 RequestId, UINT3 return TRUE; } -static int libusb_udev_bulk_or_interrupt_transfer(IUDEVICE* idev, GENERIC_CHANNEL_CALLBACK* callback, +static int libusb_udev_bulk_or_interrupt_transfer(IUDEVICE* idev, + GENERIC_CHANNEL_CALLBACK* callback, UINT32 MessageId, UINT32 RequestId, UINT32 EndpointAddress, UINT32 TransferFlags, BOOL NoAck, UINT32 BufferSize, const BYTE* data, diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c index 374cc6bc9..d269819ae 100644 --- a/channels/urbdrc/client/libusb/libusb_udevman.c +++ b/channels/urbdrc/client/libusb/libusb_udevman.c @@ -194,7 +194,8 @@ static size_t udevman_register_udevice(IUDEVMAN* idevman, BYTE bus_number, BYTE if (num == 0) { WLog_Print(urbdrc->log, WLOG_WARN, - "Could not find or redirect any usb devices by id %04x:%04x", idVendor, idProduct); + "Could not find or redirect any usb devices by id %04x:%04x", idVendor, + idProduct); } for (i = 0; i < num; i++) @@ -916,7 +917,7 @@ UINT libusb_freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_ udevman->next_device_id = BASE_USBDEVICE_NUM; udevman->iface.plugin = pEntryPoints->plugin; rc = libusb_init(&udevman->context); - + if (rc != LIBUSB_SUCCESS) goto fail; diff --git a/channels/urbdrc/client/urbdrc_main.c b/channels/urbdrc/client/urbdrc_main.c index bd8c7a753..9a5ffbd52 100644 --- a/channels/urbdrc/client/urbdrc_main.c +++ b/channels/urbdrc/client/urbdrc_main.c @@ -557,7 +557,7 @@ static UINT urbdrc_process_channel_notification(GENERIC_CHANNEL_CALLBACK* callba */ static UINT urbdrc_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, wStream* data) { - GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; + GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; URBDRC_PLUGIN* urbdrc; IUDEVMAN* udevman; UINT32 InterfaceId; @@ -610,7 +610,7 @@ static UINT urbdrc_on_data_received(IWTSVirtualChannelCallback* pChannelCallback */ static UINT urbdrc_on_close(IWTSVirtualChannelCallback* pChannelCallback) { - GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; + GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; if (callback) { URBDRC_PLUGIN* urbdrc = (URBDRC_PLUGIN*)callback->plugin; @@ -645,7 +645,7 @@ static UINT urbdrc_on_new_channel_connection(IWTSListenerCallback* pListenerCall BOOL* pbAccept, IWTSVirtualChannelCallback** ppCallback) { - GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; + GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; GENERIC_CHANNEL_CALLBACK* callback; if (!ppCallback) diff --git a/channels/urbdrc/client/urbdrc_main.h b/channels/urbdrc/client/urbdrc_main.h index d89318e2b..d13ed956b 100644 --- a/channels/urbdrc/client/urbdrc_main.h +++ b/channels/urbdrc/client/urbdrc_main.h @@ -51,7 +51,6 @@ typedef struct S_IUDEVMAN IUDEVMAN; _type (*get_##_arg)(IUDEVMAN * udevman); \ void (*set_##_arg)(IUDEVMAN * udevman, _type _arg) - typedef struct { IWTSPlugin iface; @@ -87,8 +86,8 @@ typedef struct wStream* s; } TRANSFER_DATA; -typedef void (*t_isoch_transfer_cb)(IUDEVICE* idev, GENERIC_CHANNEL_CALLBACK* callback, wStream* out, - UINT32 InterfaceId, BOOL noAck, UINT32 MessageId, +typedef void (*t_isoch_transfer_cb)(IUDEVICE* idev, GENERIC_CHANNEL_CALLBACK* callback, + wStream* out, UINT32 InterfaceId, BOOL noAck, UINT32 MessageId, UINT32 RequestId, UINT32 NumberOfPackets, UINT32 status, UINT32 StartFrame, UINT32 ErrorCount, UINT32 OutputBufferSize); diff --git a/channels/video/client/video_main.c b/channels/video/client/video_main.c index e37e8e3e8..373f9f839 100644 --- a/channels/video/client/video_main.c +++ b/channels/video/client/video_main.c @@ -553,7 +553,7 @@ static UINT video_read_tsmm_presentation_req(VideoClientContext* context, wStrea */ static UINT video_control_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, wStream* s) { - GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; + GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; VIDEO_PLUGIN* video; VideoClientContext* context; UINT ret = CHANNEL_RC_OK; @@ -993,8 +993,8 @@ static UINT video_control_on_new_channel_connection(IWTSListenerCallback* listen BOOL* pbAccept, IWTSVirtualChannelCallback** ppCallback) { - GENERIC_CHANNEL_CALLBACK* callback; - GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)listenerCallback; + GENERIC_CHANNEL_CALLBACK* callback; + GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)listenerCallback; WINPR_UNUSED(Data); WINPR_UNUSED(pbAccept); @@ -1023,8 +1023,8 @@ static UINT video_data_on_new_channel_connection(IWTSListenerCallback* pListener BOOL* pbAccept, IWTSVirtualChannelCallback** ppCallback) { - GENERIC_CHANNEL_CALLBACK* callback; - GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; + GENERIC_CHANNEL_CALLBACK* callback; + GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; WINPR_UNUSED(Data); WINPR_UNUSED(pbAccept); diff --git a/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c b/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c index 80c74226e..5e76e3677 100644 --- a/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c +++ b/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c @@ -433,7 +433,7 @@ static int android_freerdp_run(freerdp* instance) DWORD tmp; count = 0; - handles[count++] = inputEvent; + handles[count++] = inputEvent; tmp = freerdp_get_event_handles(context, &handles[count], 64 - count); @@ -467,12 +467,12 @@ static int android_freerdp_run(freerdp* instance) if (freerdp_shall_disconnect_context(instance->context)) break; - if (android_check_handle(instance) != TRUE) - { - WLog_ERR(TAG, "Failed to check android file descriptor"); - status = GetLastError(); - break; - } + if (android_check_handle(instance) != TRUE) + { + WLog_ERR(TAG, "Failed to check android file descriptor"); + status = GetLastError(); + break; + } } disconnect: @@ -567,8 +567,8 @@ static int RdpClientEntry(RDP_CLIENT_ENTRY_POINTS* pEntryPoints) return 0; } -JNIEXPORT jlong JNICALL -Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1new(JNIEnv* env, jclass cls, jobject context) +JNIEXPORT jlong JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1new( + JNIEnv* env, jclass cls, jobject context) { jclass contextClass; jclass fileClass; @@ -660,8 +660,8 @@ Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1new(JNIEnv* env, jclas return (jlong)ctx->instance; } -JNIEXPORT void JNICALL -Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1free(JNIEnv* env, jclass cls, jlong instance) +JNIEXPORT void JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1free( + JNIEnv* env, jclass cls, jlong instance) { freerdp* inst = (freerdp*)instance; @@ -674,7 +674,9 @@ Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1free(JNIEnv* env, jcla } JNIEXPORT jstring JNICALL -Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1get_1last_1error_1string(JNIEnv* env, jclass cls, jlong instance) +Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1get_1last_1error_1string(JNIEnv* env, + jclass cls, + jlong instance) { freerdp* inst = (freerdp*)instance; @@ -686,8 +688,9 @@ Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1get_1last_1error_1stri } JNIEXPORT jboolean JNICALL -Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1parse_1arguments(JNIEnv* env, jclass cls, jlong instance, - jobjectArray arguments) +Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1parse_1arguments(JNIEnv* env, jclass cls, + jlong instance, + jobjectArray arguments) { freerdp* inst = (freerdp*)instance; int i, count; @@ -721,8 +724,8 @@ Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1parse_1arguments(JNIEn return (status == 0) ? JNI_TRUE : JNI_FALSE; } -JNIEXPORT jboolean JNICALL -Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1connect(JNIEnv* env, jclass cls, jlong instance) +JNIEXPORT jboolean JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1connect( + JNIEnv* env, jclass cls, jlong instance) { freerdp* inst = (freerdp*)instance; androidContext* ctx; @@ -744,8 +747,8 @@ Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1connect(JNIEnv* env, j return JNI_TRUE; } -JNIEXPORT jboolean JNICALL -Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1disconnect(JNIEnv* env, jclass cls, jlong instance) +JNIEXPORT jboolean JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1disconnect( + JNIEnv* env, jclass cls, jlong instance) { freerdp* inst = (freerdp*)instance; androidContext* ctx; @@ -777,9 +780,11 @@ Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1disconnect(JNIEnv* env } JNIEXPORT jboolean JNICALL -Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1update_1graphics(JNIEnv* env, jclass cls, jlong instance, - jobject bitmap, jint x, jint y, jint width, - jint height) +Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1update_1graphics(JNIEnv* env, jclass cls, + jlong instance, + jobject bitmap, jint x, + jint y, jint width, + jint height) { UINT32 DstFormat; jboolean rc; @@ -847,8 +852,10 @@ Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1update_1graphics(JNIEn } JNIEXPORT jboolean JNICALL -Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1send_1key_1event(JNIEnv* env, jclass cls, jlong instance, - jint keycode, jboolean down) +Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1send_1key_1event(JNIEnv* env, jclass cls, + jlong instance, + jint keycode, + jboolean down) { DWORD scancode; ANDROID_EVENT* event; @@ -872,8 +879,8 @@ Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1send_1key_1event(JNIEn } JNIEXPORT jboolean JNICALL -Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1send_1unicodekey_1event(JNIEnv* env, jclass cls, jlong instance, - jint keycode, jboolean down) +Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1send_1unicodekey_1event( + JNIEnv* env, jclass cls, jlong instance, jint keycode, jboolean down) { ANDROID_EVENT* event; freerdp* inst = (freerdp*)instance; @@ -894,8 +901,8 @@ Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1send_1unicodekey_1even } JNIEXPORT jboolean JNICALL -Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1send_1cursor_1event(JNIEnv* env, jclass cls, jlong instance, - jint x, jint y, jint flags) +Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1send_1cursor_1event( + JNIEnv* env, jclass cls, jlong instance, jint x, jint y, jint flags) { ANDROID_EVENT* event; freerdp* inst = (freerdp*)instance; @@ -915,8 +922,10 @@ Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1send_1cursor_1event(JN } JNIEXPORT jboolean JNICALL -Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1send_1clipboard_1data(JNIEnv* env, jclass cls, jlong instance, - jstring jdata) +Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1send_1clipboard_1data(JNIEnv* env, + jclass cls, + jlong instance, + jstring jdata) { ANDROID_EVENT* event; freerdp* inst = (freerdp*)instance; @@ -967,13 +976,14 @@ Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1get_1version(JNIEnv* e } JNIEXPORT jstring JNICALL -Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1get_1build_1revision(JNIEnv* env, jclass cls) +Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1get_1build_1revision(JNIEnv* env, + jclass cls) { return (*env)->NewStringUTF(env, freerdp_get_build_revision()); } JNIEXPORT jstring JNICALL -Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1get_1build_1config(JNIEnv *env, +Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1get_1build_1config(JNIEnv* env, jclass cls) { return (*env)->NewStringUTF(env, freerdp_get_build_config()); diff --git a/client/Mac/MRDPView.m b/client/Mac/MRDPView.m index 3b00644cf..0a4f929ef 100644 --- a/client/Mac/MRDPView.m +++ b/client/Mac/MRDPView.m @@ -144,14 +144,14 @@ DWORD WINAPI mac_client_thread(void *param) nCount = 0; events[nCount++] = mfc->stopEvent; - if (!(inputEvent = freerdp_get_message_queue_event_handle(instance, - FREERDP_INPUT_MESSAGE_QUEUE))) - { - WLog_ERR(TAG, "failed to get input event handle"); - goto disconnect; - } + if (!(inputEvent = + freerdp_get_message_queue_event_handle(instance, FREERDP_INPUT_MESSAGE_QUEUE))) + { + WLog_ERR(TAG, "failed to get input event handle"); + goto disconnect; + } - events[nCount++] = inputEvent; + events[nCount++] = inputEvent; nCountBase = nCount; @@ -181,10 +181,10 @@ DWORD WINAPI mac_client_thread(void *param) break; } - if (WaitForSingleObject(inputEvent, 0) == WAIT_OBJECT_0) - { - input_activity_cb(instance); - } + if (WaitForSingleObject(inputEvent, 0) == WAIT_OBJECT_0) + { + input_activity_cb(instance); + } { if (!freerdp_check_event_handles(context)) @@ -599,7 +599,8 @@ DWORD fixKeyCode(DWORD keyCode, unichar keyChar, enum APPLE_KEYBOARD_TYPE type) if ((modFlags & NSEventModifierFlagCapsLock) && !(kbdModFlags & NSEventModifierFlagCapsLock)) freerdp_input_send_keyboard_event(input, keyFlags | KBD_FLAGS_DOWN, scancode); - else if (!(modFlags & NSEventModifierFlagCapsLock) && (kbdModFlags & NSEventModifierFlagCapsLock)) + else if (!(modFlags & NSEventModifierFlagCapsLock) && + (kbdModFlags & NSEventModifierFlagCapsLock)) freerdp_input_send_keyboard_event(input, keyFlags | KBD_FLAGS_RELEASE, scancode); if ((modFlags & NSEventModifierFlagShift) && !(kbdModFlags & NSEventModifierFlagShift)) @@ -622,9 +623,11 @@ DWORD fixKeyCode(DWORD keyCode, unichar keyChar, enum APPLE_KEYBOARD_TYPE type) else if (!(modFlags & NSEventModifierFlagCommand) && (kbdModFlags & NSEventModifierFlagCommand)) freerdp_input_send_keyboard_event(input, keyFlags | KBD_FLAGS_RELEASE, scancode); - if ((modFlags & NSEventModifierFlagNumericPad) && !(kbdModFlags & NSEventModifierFlagNumericPad)) + if ((modFlags & NSEventModifierFlagNumericPad) && + !(kbdModFlags & NSEventModifierFlagNumericPad)) freerdp_input_send_keyboard_event(input, keyFlags | KBD_FLAGS_DOWN, scancode); - else if (!(modFlags & NSEventModifierFlagNumericPad) && (kbdModFlags & NSEventModifierFlagNumericPad)) + else if (!(modFlags & NSEventModifierFlagNumericPad) && + (kbdModFlags & NSEventModifierFlagNumericPad)) freerdp_input_send_keyboard_event(input, keyFlags | KBD_FLAGS_RELEASE, scancode); if ((modFlags & NSEventModifierFlagHelp) && !(kbdModFlags & NSEventModifierFlagHelp)) diff --git a/client/Mac/cli/AppDelegate.m b/client/Mac/cli/AppDelegate.m index f130e4dcf..c87239ecc 100644 --- a/client/Mac/cli/AppDelegate.m +++ b/client/Mac/cli/AppDelegate.m @@ -67,7 +67,8 @@ void mac_set_view_size(rdpContext *context, MRDPView *view); if (settings->WindowTitle && settings->WindowTitle[0]) { - winTitle = [[NSString alloc] initWithCString:settings->WindowTitle encoding:NSUTF8StringEncoding]; + winTitle = [[NSString alloc] initWithCString:settings->WindowTitle + encoding:NSUTF8StringEncoding]; } else { @@ -75,7 +76,7 @@ void mac_set_view_size(rdpContext *context, MRDPView *view); initWithFormat:@"%@:%u", [NSString stringWithCString:settings->ServerHostname encoding:NSUTF8StringEncoding], - settings->ServerPort]; + settings -> ServerPort]; } [window setTitle:winTitle]; diff --git a/client/Wayland/wlfreerdp.c b/client/Wayland/wlfreerdp.c index 2a79cc996..58d097d35 100644 --- a/client/Wayland/wlfreerdp.c +++ b/client/Wayland/wlfreerdp.c @@ -134,7 +134,8 @@ static BOOL wl_end_paint(rdpContext* context) w = gdi->primary->hdc->hwnd->invalid->w; h = gdi->primary->hdc->hwnd->invalid->h; context_w = (wlfContext*)context; - if(!wl_update_buffer(context_w, x, y, w, h)){ + if (!wl_update_buffer(context_w, x, y, w, h)) + { return FALSE; } @@ -328,7 +329,7 @@ static BOOL handle_uwac_events(freerdp* instance, UwacDisplay* display) if (r != UWAC_SUCCESS) return FALSE; } - break; + break; case UWAC_EVENT_POINTER_ENTER: if (!wlf_handle_pointer_enter(instance, &event.mouse_enter_leave)) diff --git a/client/Windows/wf_client.c b/client/Windows/wf_client.c index cc012eee7..dc64b92ab 100644 --- a/client/Windows/wf_client.c +++ b/client/Windows/wf_client.c @@ -495,7 +495,7 @@ static BOOL wf_authenticate_raw(freerdp* instance, const char* title, char** use strncpy(Domain, *domain, CREDUI_MAX_DOMAIN_TARGET_LENGTH); } - if (!(*UserName && *Password)) + if (!(*UserName && *Password)) { if (!wfc->isConsole && wfc->common.context.settings->CredentialsFromStdin) WLog_ERR(TAG, "Flag for stdin read present but stdin is redirected; using GUI"); @@ -788,7 +788,8 @@ static DWORD wf_is_x509_certificate_trusted(const char* common_name, const char* goto CleanUp; } - WLog_INFO(TAG, "CertVerifyCertificateChainPolicy succeeded for %s (%s) issued by %s", common_name, subject, issuer); + WLog_INFO(TAG, "CertVerifyCertificateChainPolicy succeeded for %s (%s) issued by %s", + common_name, subject, issuer); hr = S_OK; CleanUp: @@ -800,7 +801,7 @@ CleanUp: wf_report_error(NULL, hr); } - free(derPubKey); + free(derPubKey); if (NULL != pChainContext) { @@ -1328,7 +1329,7 @@ static BOOL wfreerdp_client_new(freerdp* instance, rdpContext* context) instance->VerifyChangedCertificateEx = wf_verify_changed_certificate_ex; instance->PresentGatewayMessage = wf_present_gateway_message; } - + #ifdef WITH_PROGRESS_BAR CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); CoCreateInstance(&CLSID_TaskbarList, NULL, CLSCTX_ALL, &IID_ITaskbarList3, diff --git a/client/Windows/wf_event.c b/client/Windows/wf_event.c index 1498dd355..37ccf93e9 100644 --- a/client/Windows/wf_event.c +++ b/client/Windows/wf_event.c @@ -88,9 +88,9 @@ LRESULT CALLBACK wf_ll_kbd_proc(int nCode, WPARAM wParam, LPARAM lParam) if (gui_thread_info.hwndFocus != wfc->hWndParent) { g_focus_hWnd = NULL; - return CallNextHookEx(NULL, nCode, wParam, lParam); + return CallNextHookEx(NULL, nCode, wParam, lParam); } - + g_focus_hWnd = g_main_hWnd; } diff --git a/client/Windows/wf_graphics.c b/client/Windows/wf_graphics.c index 2e8b6e357..a719ebaef 100644 --- a/client/Windows/wf_graphics.c +++ b/client/Windows/wf_graphics.c @@ -210,7 +210,8 @@ static BOOL wf_Pointer_New(rdpContext* context, const rdpPointer* pointer) if ((pointer->lengthAndMask > 0) || (pointer->lengthXorMask > 0)) { - pdata = (BYTE*)winpr_aligned_malloc(pointer->lengthAndMask + pointer->lengthXorMask, 16); + pdata = + (BYTE*)winpr_aligned_malloc(pointer->lengthAndMask + pointer->lengthXorMask, 16); if (!pdata) goto fail; diff --git a/client/X11/xf_client.c b/client/X11/xf_client.c index f6fbad961..fdb759828 100644 --- a/client/X11/xf_client.c +++ b/client/X11/xf_client.c @@ -202,10 +202,10 @@ static void xf_draw_screen_scaled(xfContext* xfc, int x, int y, int w, int h) /* calculate and fix up scaled coordinates */ x2 = x + w; y2 = y + h; - x = (int)floor(x / xScalingFactor) - 1; - y = (int)floor(y / yScalingFactor) - 1; - w = (int)ceil(x2 / xScalingFactor) + 1 - x; - h = (int)ceil(y2 / yScalingFactor) + 1 - y; + x = (int)floor(x / xScalingFactor) - 1; + y = (int)floor(y / yScalingFactor) - 1; + w = (int)ceil(x2 / xScalingFactor) + 1 - x; + h = (int)ceil(y2 / yScalingFactor) + 1 - y; XRenderSetPictureTransform(xfc->display, primaryPicture, &transform); XRenderComposite(xfc->display, PictOpSrc, primaryPicture, 0, windowPicture, x, y, 0, 0, xfc->offset_x + x, xfc->offset_y + y, w, h); @@ -1433,20 +1433,20 @@ static int xf_logon_error_info(freerdp* instance, UINT32 data, UINT32 type) const char* str_data = freerdp_get_logon_error_info_data(data); const char* str_type = freerdp_get_logon_error_info_type(type); WLog_INFO(TAG, "Logon Error Info %s [%s]", str_data, str_type); - if(type != LOGON_MSG_SESSION_CONTINUE) + if (type != LOGON_MSG_SESSION_CONTINUE) { - xf_rail_disable_remoteapp_mode(xfc); + xf_rail_disable_remoteapp_mode(xfc); } return 1; } static BOOL handle_window_events(freerdp* instance) { - if (!xf_process_x_events(instance)) - { - WLog_DBG(TAG, "Closed from X11"); - return FALSE; - } + if (!xf_process_x_events(instance)) + { + WLog_DBG(TAG, "Closed from X11"); + return FALSE; + } return TRUE; } @@ -1495,84 +1495,69 @@ static DWORD WINAPI xf_client_thread(LPVOID param) else if (freerdp_get_last_error(instance->context) == FREERDP_ERROR_SECURITY_NEGO_CONNECT_FAILED) exit_code = XF_EXIT_NEGO_FAILURE; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_CONNECT_LOGON_FAILURE) - exit_code = XF_EXIT_LOGON_FAILURE; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_CONNECT_ACCOUNT_LOCKED_OUT) - exit_code = XF_EXIT_ACCOUNT_LOCKED_OUT; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_PRE_CONNECT_FAILED) - exit_code = XF_EXIT_PRE_CONNECT_FAILED; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_CONNECT_UNDEFINED) - exit_code = XF_EXIT_CONNECT_UNDEFINED; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_POST_CONNECT_FAILED) - exit_code = XF_EXIT_POST_CONNECT_FAILED; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_DNS_ERROR) - exit_code = XF_EXIT_DNS_ERROR; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_DNS_NAME_NOT_FOUND) - exit_code = XF_EXIT_DNS_NAME_NOT_FOUND; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_CONNECT_FAILED) - exit_code = XF_EXIT_CONNECT_FAILED; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_MCS_CONNECT_INITIAL_ERROR) - exit_code = XF_EXIT_MCS_CONNECT_INITIAL_ERROR; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_TLS_CONNECT_FAILED) - exit_code = XF_EXIT_TLS_CONNECT_FAILED; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_INSUFFICIENT_PRIVILEGES) - exit_code = XF_EXIT_INSUFFICIENT_PRIVILEGES; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_CONNECT_CANCELLED) - exit_code = XF_EXIT_CONNECT_CANCELLED; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_SECURITY_NEGO_CONNECT_FAILED) - exit_code = XF_EXIT_SECURITY_NEGO_CONNECT_FAILED; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_CONNECT_TRANSPORT_FAILED) - exit_code = XF_EXIT_CONNECT_TRANSPORT_FAILED; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_CONNECT_PASSWORD_EXPIRED) - exit_code = XF_EXIT_CONNECT_PASSWORD_EXPIRED; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_CONNECT_PASSWORD_MUST_CHANGE) - exit_code = XF_EXIT_CONNECT_PASSWORD_MUST_CHANGE; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_CONNECT_KDC_UNREACHABLE) - exit_code = XF_EXIT_CONNECT_KDC_UNREACHABLE; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_CONNECT_ACCOUNT_DISABLED) - exit_code = XF_EXIT_CONNECT_ACCOUNT_DISABLED; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_CONNECT_PASSWORD_CERTAINLY_EXPIRED) - exit_code = XF_EXIT_CONNECT_PASSWORD_CERTAINLY_EXPIRED; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_CONNECT_CLIENT_REVOKED) - exit_code = XF_EXIT_CONNECT_CLIENT_REVOKED; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_CONNECT_WRONG_PASSWORD) - exit_code = XF_EXIT_CONNECT_WRONG_PASSWORD; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_CONNECT_ACCESS_DENIED) - exit_code = XF_EXIT_CONNECT_ACCESS_DENIED; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_CONNECT_ACCOUNT_RESTRICTION) - exit_code = XF_EXIT_CONNECT_ACCOUNT_RESTRICTION; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_CONNECT_ACCOUNT_EXPIRED) - exit_code = XF_EXIT_CONNECT_ACCOUNT_EXPIRED; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_CONNECT_LOGON_TYPE_NOT_GRANTED) - exit_code = XF_EXIT_CONNECT_LOGON_TYPE_NOT_GRANTED; - else if (freerdp_get_last_error(instance->context) == - FREERDP_ERROR_CONNECT_NO_OR_MISSING_CREDENTIALS) - exit_code = XF_EXIT_CONNECT_NO_OR_MISSING_CREDENTIALS; + else if (freerdp_get_last_error(instance->context) == FREERDP_ERROR_CONNECT_LOGON_FAILURE) + exit_code = XF_EXIT_LOGON_FAILURE; + else if (freerdp_get_last_error(instance->context) == + FREERDP_ERROR_CONNECT_ACCOUNT_LOCKED_OUT) + exit_code = XF_EXIT_ACCOUNT_LOCKED_OUT; + else if (freerdp_get_last_error(instance->context) == FREERDP_ERROR_PRE_CONNECT_FAILED) + exit_code = XF_EXIT_PRE_CONNECT_FAILED; + else if (freerdp_get_last_error(instance->context) == FREERDP_ERROR_CONNECT_UNDEFINED) + exit_code = XF_EXIT_CONNECT_UNDEFINED; + else if (freerdp_get_last_error(instance->context) == FREERDP_ERROR_POST_CONNECT_FAILED) + exit_code = XF_EXIT_POST_CONNECT_FAILED; + else if (freerdp_get_last_error(instance->context) == FREERDP_ERROR_DNS_ERROR) + exit_code = XF_EXIT_DNS_ERROR; + else if (freerdp_get_last_error(instance->context) == FREERDP_ERROR_DNS_NAME_NOT_FOUND) + exit_code = XF_EXIT_DNS_NAME_NOT_FOUND; + else if (freerdp_get_last_error(instance->context) == FREERDP_ERROR_CONNECT_FAILED) + exit_code = XF_EXIT_CONNECT_FAILED; + else if (freerdp_get_last_error(instance->context) == + FREERDP_ERROR_MCS_CONNECT_INITIAL_ERROR) + exit_code = XF_EXIT_MCS_CONNECT_INITIAL_ERROR; + else if (freerdp_get_last_error(instance->context) == FREERDP_ERROR_TLS_CONNECT_FAILED) + exit_code = XF_EXIT_TLS_CONNECT_FAILED; + else if (freerdp_get_last_error(instance->context) == FREERDP_ERROR_INSUFFICIENT_PRIVILEGES) + exit_code = XF_EXIT_INSUFFICIENT_PRIVILEGES; + else if (freerdp_get_last_error(instance->context) == FREERDP_ERROR_CONNECT_CANCELLED) + exit_code = XF_EXIT_CONNECT_CANCELLED; + else if (freerdp_get_last_error(instance->context) == + FREERDP_ERROR_SECURITY_NEGO_CONNECT_FAILED) + exit_code = XF_EXIT_SECURITY_NEGO_CONNECT_FAILED; + else if (freerdp_get_last_error(instance->context) == + FREERDP_ERROR_CONNECT_TRANSPORT_FAILED) + exit_code = XF_EXIT_CONNECT_TRANSPORT_FAILED; + else if (freerdp_get_last_error(instance->context) == + FREERDP_ERROR_CONNECT_PASSWORD_EXPIRED) + exit_code = XF_EXIT_CONNECT_PASSWORD_EXPIRED; + else if (freerdp_get_last_error(instance->context) == + FREERDP_ERROR_CONNECT_PASSWORD_MUST_CHANGE) + exit_code = XF_EXIT_CONNECT_PASSWORD_MUST_CHANGE; + else if (freerdp_get_last_error(instance->context) == FREERDP_ERROR_CONNECT_KDC_UNREACHABLE) + exit_code = XF_EXIT_CONNECT_KDC_UNREACHABLE; + else if (freerdp_get_last_error(instance->context) == + FREERDP_ERROR_CONNECT_ACCOUNT_DISABLED) + exit_code = XF_EXIT_CONNECT_ACCOUNT_DISABLED; + else if (freerdp_get_last_error(instance->context) == + FREERDP_ERROR_CONNECT_PASSWORD_CERTAINLY_EXPIRED) + exit_code = XF_EXIT_CONNECT_PASSWORD_CERTAINLY_EXPIRED; + else if (freerdp_get_last_error(instance->context) == FREERDP_ERROR_CONNECT_CLIENT_REVOKED) + exit_code = XF_EXIT_CONNECT_CLIENT_REVOKED; + else if (freerdp_get_last_error(instance->context) == FREERDP_ERROR_CONNECT_WRONG_PASSWORD) + exit_code = XF_EXIT_CONNECT_WRONG_PASSWORD; + else if (freerdp_get_last_error(instance->context) == FREERDP_ERROR_CONNECT_ACCESS_DENIED) + exit_code = XF_EXIT_CONNECT_ACCESS_DENIED; + else if (freerdp_get_last_error(instance->context) == + FREERDP_ERROR_CONNECT_ACCOUNT_RESTRICTION) + exit_code = XF_EXIT_CONNECT_ACCOUNT_RESTRICTION; + else if (freerdp_get_last_error(instance->context) == FREERDP_ERROR_CONNECT_ACCOUNT_EXPIRED) + exit_code = XF_EXIT_CONNECT_ACCOUNT_EXPIRED; + else if (freerdp_get_last_error(instance->context) == + FREERDP_ERROR_CONNECT_LOGON_TYPE_NOT_GRANTED) + exit_code = XF_EXIT_CONNECT_LOGON_TYPE_NOT_GRANTED; + else if (freerdp_get_last_error(instance->context) == + FREERDP_ERROR_CONNECT_NO_OR_MISSING_CREDENTIALS) + exit_code = XF_EXIT_CONNECT_NO_OR_MISSING_CREDENTIALS; else exit_code = XF_EXIT_CONN_FAILED; } @@ -1715,7 +1700,8 @@ end: DWORD xf_exit_code_from_disconnect_reason(DWORD reason) { - if (reason == 0 || (reason >= XF_EXIT_PARSE_ARGUMENTS && reason <= XF_EXIT_CONNECT_NO_OR_MISSING_CREDENTIALS)) + if (reason == 0 || + (reason >= XF_EXIT_PARSE_ARGUMENTS && reason <= XF_EXIT_CONNECT_NO_OR_MISSING_CREDENTIALS)) return reason; /* License error set */ else if (reason >= 0x100 && reason <= 0x10A) diff --git a/client/X11/xf_event.c b/client/X11/xf_event.c index bf5c9b9d6..84ebfbf83 100644 --- a/client/X11/xf_event.c +++ b/client/X11/xf_event.c @@ -311,7 +311,6 @@ void xf_event_adjust_coordinates(xfContext* xfc, int* x, int* y) if (!xfc || !xfc->common.context.settings || !y || !x) return; - if (!xfc->remote_app) { #ifdef WITH_XRENDER @@ -962,15 +961,15 @@ static BOOL xf_event_PropertyNotify(xfContext* xfc, const XPropertyEvent* event, WINPR_ASSERT(appWindow); if (appWindow->maxVert && appWindow->maxHorz && !appWindow->minimized) { - if(appWindow->rail_state != WINDOW_SHOW_MAXIMIZED) + if (appWindow->rail_state != WINDOW_SHOW_MAXIMIZED) { - appWindow->rail_state = WINDOW_SHOW_MAXIMIZED; - xf_rail_send_client_system_command(xfc, appWindow->windowId, SC_MAXIMIZE); + appWindow->rail_state = WINDOW_SHOW_MAXIMIZED; + xf_rail_send_client_system_command(xfc, appWindow->windowId, SC_MAXIMIZE); } } else if (appWindow->minimized) { - if(appWindow->rail_state != WINDOW_SHOW_MINIMIZED) + if (appWindow->rail_state != WINDOW_SHOW_MINIMIZED) { appWindow->rail_state = WINDOW_SHOW_MINIMIZED; xf_rail_send_client_system_command(xfc, appWindow->windowId, SC_MINIMIZE); @@ -978,8 +977,7 @@ static BOOL xf_event_PropertyNotify(xfContext* xfc, const XPropertyEvent* event, } else { - if(appWindow->rail_state != WINDOW_SHOW && - appWindow->rail_state != WINDOW_HIDE) + if (appWindow->rail_state != WINDOW_SHOW && appWindow->rail_state != WINDOW_HIDE) { appWindow->rail_state = WINDOW_SHOW; xf_rail_send_client_system_command(xfc, appWindow->windowId, SC_RESTORE); diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c index 851a84dc5..ac7f2f0ca 100644 --- a/client/X11/xf_graphics.c +++ b/client/X11/xf_graphics.c @@ -320,7 +320,7 @@ static BOOL _xf_Pointer_GetCursorForCurrentScale(rdpContext* context, rdpPointer } ci.pixels = (XcursorPixel*)tmp; - if (xscale != 1 || yscale != 1) + if (xscale != 1 || yscale != 1) { if (!freerdp_image_scale((BYTE*)ci.pixels, CursorFormat, 0, 0, 0, ci.width, ci.height, (BYTE*)xpointer->cursorPixels, CursorFormat, 0, 0, 0, diff --git a/client/X11/xf_input.c b/client/X11/xf_input.c index 2dc302ac9..d029e9ae2 100644 --- a/client/X11/xf_input.c +++ b/client/X11/xf_input.c @@ -480,7 +480,8 @@ static void xf_input_touch_end(xfContext* xfc, const XIDeviceEvent* event) static int xf_input_handle_event_local(xfContext* xfc, const XEvent* event) { - union { + union + { const XGenericEventCookie* cc; XGenericEventCookie* vc; } cookie; @@ -700,7 +701,8 @@ int xf_input_event(xfContext* xfc, const XEvent* xevent, XIDeviceEvent* event, i static int xf_input_handle_event_remote(xfContext* xfc, const XEvent* event) { - union { + union + { const XGenericEventCookie* cc; XGenericEventCookie* vc; } cookie; diff --git a/client/X11/xf_rail.c b/client/X11/xf_rail.c index 77642c51b..6b6dd55a8 100644 --- a/client/X11/xf_rail.c +++ b/client/X11/xf_rail.c @@ -173,8 +173,8 @@ void xf_rail_end_local_move(xfContext* xfc, xfAppWindow* appWindow) windowMove.left = appWindow->x - appWindow->resizeMarginLeft; windowMove.top = appWindow->y - appWindow->resizeMarginTop; windowMove.right = - appWindow->x + - appWindow->width + appWindow->resizeMarginRight; /* In the update to RDP the position is one past the window */ + appWindow->x + appWindow->width + + appWindow->resizeMarginRight; /* In the update to RDP the position is one past the window */ windowMove.bottom = appWindow->y + appWindow->height + appWindow->resizeMarginBottom; xfc->rail->ClientWindowMove(xfc->rail, &windowMove); /* @@ -351,13 +351,13 @@ static BOOL xf_rail_window_common(rdpContext* context, const WINDOW_ORDER_INFO* appWindow->windowWidth = windowState->windowWidth; appWindow->windowHeight = windowState->windowHeight; } - + if (fieldFlags & WINDOW_ORDER_FIELD_RESIZE_MARGIN_X) { appWindow->resizeMarginLeft = windowState->resizeMarginLeft; appWindow->resizeMarginRight = windowState->resizeMarginRight; } - + if (fieldFlags & WINDOW_ORDER_FIELD_RESIZE_MARGIN_Y) { appWindow->resizeMarginTop = windowState->resizeMarginTop; diff --git a/client/X11/xf_window.c b/client/X11/xf_window.c index 34e670531..73fe8dc90 100644 --- a/client/X11/xf_window.c +++ b/client/X11/xf_window.c @@ -975,7 +975,7 @@ void xf_ShowWindow(xfContext* xfc, xfAppWindow* appWindow, BYTE state) break; case WINDOW_SHOW_MINIMIZED: - appWindow->minimized = TRUE; + appWindow->minimized = TRUE; XIconifyWindow(xfc->display, appWindow->handle, xfc->screen_number); break; diff --git a/client/X11/xf_window.h b/client/X11/xf_window.h index 839cdf314..b3fd86166 100644 --- a/client/X11/xf_window.h +++ b/client/X11/xf_window.h @@ -135,7 +135,7 @@ struct xf_app_window UINT32 localWindowOffsetCorrX; UINT32 localWindowOffsetCorrY; - + UINT32 resizeMarginLeft; UINT32 resizeMarginTop; UINT32 resizeMarginRight; diff --git a/client/common/cmdline.c b/client/common/cmdline.c index 4b8d167a5..598b7287f 100644 --- a/client/common/cmdline.c +++ b/client/common/cmdline.c @@ -777,7 +777,6 @@ fail: return rc; } - /** @brief suboption type */ typedef enum { @@ -840,7 +839,6 @@ static BOOL parseSubOptions(rdpSettings* settings, const CmdLineSubOptions* opts return found; } - static int freerdp_client_command_line_post_filter(void* context, COMMAND_LINE_ARGUMENT_A* arg) { rdpSettings* settings = (rdpSettings*)context; @@ -1606,10 +1604,6 @@ static BOOL prepare_default_settings(rdpSettings* settings, COMMAND_LINE_ARGUMEN return freerdp_set_connection_type(settings, CONNECTION_TYPE_AUTODETECT); } - - - - static BOOL setSmartcardEmulation(const char* value, rdpSettings* settings) { settings->SmartcardEmulation = TRUE; diff --git a/include/freerdp/channels/rdpgfx.h b/include/freerdp/channels/rdpgfx.h index cdad2a84d..4d7ef885d 100644 --- a/include/freerdp/channels/rdpgfx.h +++ b/include/freerdp/channels/rdpgfx.h @@ -103,7 +103,7 @@ typedef struct * the incorrect value in case some server actually uses it. \ */ #define RDPGFX_CAPVERSION_106_ERR 0x000A0601 -#define RDPGFX_CAPVERSION_107 0x000A0701 /** [MS-RDPEGFX] 2.2.3.10 */ +#define RDPGFX_CAPVERSION_107 0x000A0701 /** [MS-RDPEGFX] 2.2.3.10 */ #define RDPGFX_NUMBER_CAPSETS 11 #define RDPGFX_CAPSET_BASE_SIZE 8 @@ -115,11 +115,11 @@ typedef struct UINT32 flags; } RDPGFX_CAPSET; -#define RDPGFX_CAPS_FLAG_THINCLIENT 0x00000001U /* 8.0+ */ -#define RDPGFX_CAPS_FLAG_SMALL_CACHE 0x00000002U /* 8.0+ */ -#define RDPGFX_CAPS_FLAG_AVC420_ENABLED 0x00000010U /* 8.1+ */ -#define RDPGFX_CAPS_FLAG_AVC_DISABLED 0x00000020U /* 10.0+ */ -#define RDPGFX_CAPS_FLAG_AVC_THINCLIENT 0x00000040U /* 10.3+ */ +#define RDPGFX_CAPS_FLAG_THINCLIENT 0x00000001U /* 8.0+ */ +#define RDPGFX_CAPS_FLAG_SMALL_CACHE 0x00000002U /* 8.0+ */ +#define RDPGFX_CAPS_FLAG_AVC420_ENABLED 0x00000010U /* 8.1+ */ +#define RDPGFX_CAPS_FLAG_AVC_DISABLED 0x00000020U /* 10.0+ */ +#define RDPGFX_CAPS_FLAG_AVC_THINCLIENT 0x00000040U /* 10.3+ */ #define RDPGFX_CAPS_FLAG_SCALEDMAP_DISABLE 0x00000080U /* 10.7+ */ typedef struct diff --git a/include/freerdp/client.h b/include/freerdp/client.h index 0d098ce72..2620d088b 100644 --- a/include/freerdp/client.h +++ b/include/freerdp/client.h @@ -83,13 +83,13 @@ extern "C" #if defined(CHANNEL_AINPUT_CLIENT) ALIGN64 AInputClientContext* ainput; /**< (offset 1) */ #else - UINT64 reserved1; + UINT64 reserved1; #endif #if defined(CHANNEL_RDPEI_CLIENT) ALIGN64 RdpeiClientContext* rdpei; /**< (offset 2) */ #else - UINT64 reserved2; + UINT64 reserved2; #endif ALIGN64 INT32 lastX; /**< (offset 3) */ diff --git a/include/freerdp/client/channels.h b/include/freerdp/client/channels.h index ff46e9575..60293a8a8 100644 --- a/include/freerdp/client/channels.h +++ b/include/freerdp/client/channels.h @@ -24,25 +24,23 @@ #include #include - typedef struct { - IWTSVirtualChannelCallback iface; - IWTSPlugin* plugin; - IWTSVirtualChannelManager* channel_mgr; - IWTSVirtualChannel* channel; + IWTSVirtualChannelCallback iface; + IWTSPlugin* plugin; + IWTSVirtualChannelManager* channel_mgr; + IWTSVirtualChannel* channel; } GENERIC_CHANNEL_CALLBACK; typedef struct { - IWTSListenerCallback iface; - IWTSPlugin* plugin; - IWTSVirtualChannelManager* channel_mgr; - IWTSVirtualChannel* channel; - GENERIC_CHANNEL_CALLBACK* channel_callback; + IWTSListenerCallback iface; + IWTSPlugin* plugin; + IWTSVirtualChannelManager* channel_mgr; + IWTSVirtualChannel* channel; + GENERIC_CHANNEL_CALLBACK* channel_callback; } GENERIC_LISTENER_CALLBACK; - #ifdef __cplusplus extern "C" { diff --git a/include/freerdp/codec/color.h b/include/freerdp/codec/color.h index c662ae536..2635e5dfa 100644 --- a/include/freerdp/codec/color.h +++ b/include/freerdp/codec/color.h @@ -65,8 +65,10 @@ #define PIXEL_FORMAT_BGRX32 FREERDP_PIXEL_FORMAT(32, FREERDP_PIXEL_FORMAT_TYPE_BGRA, 0, 8, 8, 8) #define PIXEL_FORMAT_RGBA32 FREERDP_PIXEL_FORMAT(32, FREERDP_PIXEL_FORMAT_TYPE_RGBA, 8, 8, 8, 8) #define PIXEL_FORMAT_RGBX32 FREERDP_PIXEL_FORMAT(32, FREERDP_PIXEL_FORMAT_TYPE_RGBA, 0, 8, 8, 8) -#define PIXEL_FORMAT_BGRX32_DEPTH30 FREERDP_PIXEL_FORMAT(32, FREERDP_PIXEL_FORMAT_TYPE_BGRA, 0, 10, 10, 10) -#define PIXEL_FORMAT_RGBX32_DEPTH30 FREERDP_PIXEL_FORMAT(32, FREERDP_PIXEL_FORMAT_TYPE_RGBA, 0, 10, 10, 10) +#define PIXEL_FORMAT_BGRX32_DEPTH30 \ + FREERDP_PIXEL_FORMAT(32, FREERDP_PIXEL_FORMAT_TYPE_BGRA, 0, 10, 10, 10) +#define PIXEL_FORMAT_RGBX32_DEPTH30 \ + FREERDP_PIXEL_FORMAT(32, FREERDP_PIXEL_FORMAT_TYPE_RGBA, 0, 10, 10, 10) /* 24bpp formats */ #define PIXEL_FORMAT_RGB24 FREERDP_PIXEL_FORMAT(24, FREERDP_PIXEL_FORMAT_TYPE_ARGB, 0, 8, 8, 8) diff --git a/include/freerdp/freerdp.h b/include/freerdp/freerdp.h index 5dec619dd..f6cef7742 100644 --- a/include/freerdp/freerdp.h +++ b/include/freerdp/freerdp.h @@ -371,7 +371,7 @@ and settings. Will be initialized by a call to freerdp_context_new() owned b Will be initialized by a call to freerdp_context_new() owned by rdpRdp */ #else - UINT64 paddingX[4]; + UINT64 paddingX[4]; #endif ALIGN64 rdpHeartbeat* heartbeat; /* (offset 21) owned by rdpRdp*/ @@ -426,7 +426,7 @@ owned by rdpRdp */ ALIGN64 pVerifyChangedCertificate VerifyChangedCertificate;) /**< (offset 52) */ #else - ALIGN64 UINT64 reserved[2]; + ALIGN64 UINT64 reserved[2]; #endif ALIGN64 pVerifyX509Certificate VerifyX509Certificate; /**< (offset 53) Callback for X509 certificate verification diff --git a/include/freerdp/listener.h b/include/freerdp/listener.h index 1b6e59294..a9f3b020f 100644 --- a/include/freerdp/listener.h +++ b/include/freerdp/listener.h @@ -62,7 +62,7 @@ extern "C" WINPR_DEPRECATED_VAR("Use rdp_freerdp_listener::GetEventHandles instead", psListenerGetFileDescriptor GetFileDescriptor;) #else - void* reserved; + void* reserved; #endif psListenerGetEventHandles GetEventHandles; psListenerCheckFileDescriptor CheckFileDescriptor; diff --git a/include/freerdp/server/proxy/proxy_context.h b/include/freerdp/server/proxy/proxy_context.h index d0478519c..72deaf742 100644 --- a/include/freerdp/server/proxy/proxy_context.h +++ b/include/freerdp/server/proxy/proxy_context.h @@ -51,23 +51,24 @@ extern "C" typedef enum { PF_UTILS_CHANNEL_NOT_HANDLED, /*!< channel not handled */ - PF_UTILS_CHANNEL_BLOCK, /*!< block and drop traffic on this channel */ + PF_UTILS_CHANNEL_BLOCK, /*!< block and drop traffic on this channel */ PF_UTILS_CHANNEL_PASSTHROUGH, /*!< pass traffic from this channel */ - PF_UTILS_CHANNEL_INTERCEPT, /*!< inspect traffic from this channel */ + PF_UTILS_CHANNEL_INTERCEPT, /*!< inspect traffic from this channel */ } pf_utils_channel_mode; /** @brief result of a channel treatment */ typedef enum { - PF_CHANNEL_RESULT_PASS, /*!< pass the packet as is */ - PF_CHANNEL_RESULT_DROP, /*!< drop the packet */ - PF_CHANNEL_RESULT_ERROR /*!< error during packet treatment */ + PF_CHANNEL_RESULT_PASS, /*!< pass the packet as is */ + PF_CHANNEL_RESULT_DROP, /*!< drop the packet */ + PF_CHANNEL_RESULT_ERROR /*!< error during packet treatment */ } PfChannelResult; - typedef PfChannelResult (*proxyChannelDataFn)(proxyData* pdata, const pServerStaticChannelContext* channel, - const BYTE* xdata, size_t xsize, UINT32 flags, - size_t totalSizepServer); - typedef void (*proxyChannelContextDtor)(void *context); + typedef PfChannelResult (*proxyChannelDataFn)(proxyData* pdata, + const pServerStaticChannelContext* channel, + const BYTE* xdata, size_t xsize, UINT32 flags, + size_t totalSizepServer); + typedef void (*proxyChannelContextDtor)(void* context); /** @brief per channel configuration */ struct p_server_static_channel_context @@ -78,7 +79,7 @@ extern "C" proxyChannelDataFn onFrontData; proxyChannelDataFn onBackData; proxyChannelContextDtor contextDtor; - void *context; + void* context; }; void StaticChannelContext_free(pServerStaticChannelContext* ctx); @@ -100,7 +101,8 @@ extern "C" }; typedef struct p_server_context pServerContext; - pServerStaticChannelContext* StaticChannelContext_new(pServerContext* ps, const char* name, UINT32 id); + pServerStaticChannelContext* StaticChannelContext_new(pServerContext* ps, const char* name, + UINT32 id); /** * Wraps rdpContext and holds the state for the proxy's client. diff --git a/include/freerdp/server/proxy/proxy_modules_api.h b/include/freerdp/server/proxy/proxy_modules_api.h index ffa2e4820..90fa1a908 100644 --- a/include/freerdp/server/proxy/proxy_modules_api.h +++ b/include/freerdp/server/proxy/proxy_modules_api.h @@ -72,11 +72,11 @@ struct proxy_plugin proxyHookFn ClientLoadChannels; /* 75 custom=rdpContext* */ UINT64 reserved3[96 - 76]; /* 76-95 */ - proxyHookFn ServerPostConnect; /* 96 custom=freerdp_peer* */ - proxyHookFn ServerPeerActivate; /* 97 custom=freerdp_peer* */ - proxyHookFn ServerChannelsInit; /* 98 custom=freerdp_peer* */ - proxyHookFn ServerChannelsFree; /* 99 custom=freerdp_peer* */ - proxyHookFn ServerSessionEnd; /* 100 custom=freerdp_peer* */ + proxyHookFn ServerPostConnect; /* 96 custom=freerdp_peer* */ + proxyHookFn ServerPeerActivate; /* 97 custom=freerdp_peer* */ + proxyHookFn ServerChannelsInit; /* 98 custom=freerdp_peer* */ + proxyHookFn ServerChannelsFree; /* 99 custom=freerdp_peer* */ + proxyHookFn ServerSessionEnd; /* 100 custom=freerdp_peer* */ proxyHookFn ServerSessionInitialize; /* 101 custom=freerdp_peer* */ proxyHookFn ServerSessionStarted; /* 102 custom=freerdp_peer* */ diff --git a/include/freerdp/settings.h b/include/freerdp/settings.h index d5d05602c..aa789e9c9 100644 --- a/include/freerdp/settings.h +++ b/include/freerdp/settings.h @@ -190,14 +190,14 @@ typedef enum #define NEG_MEMBLT_INDEX 0x03 #define NEG_MEM3BLT_INDEX 0x04 #define NEG_ATEXTOUT_INDEX 0x05 -#define NEG_AEXTTEXTOUT_INDEX 0x06 /* Must be ignored */ +#define NEG_AEXTTEXTOUT_INDEX 0x06 /* Must be ignored */ #define NEG_DRAWNINEGRID_INDEX 0x07 /* Must be ignored */ #define NEG_LINETO_INDEX 0x08 #define NEG_MULTI_DRAWNINEGRID_INDEX 0x09 #define NEG_OPAQUE_RECT_INDEX 0x0A /* Must be ignored */ #define NEG_SAVEBITMAP_INDEX 0x0B -#define NEG_WTEXTOUT_INDEX 0x0C /* Must be ignored */ -#define NEG_MEMBLT_V2_INDEX 0x0D /* Must be ignored */ +#define NEG_WTEXTOUT_INDEX 0x0C /* Must be ignored */ +#define NEG_MEMBLT_V2_INDEX 0x0D /* Must be ignored */ #define NEG_MEM3BLT_V2_INDEX 0x0E /* Must be ignored */ #define NEG_MULTIDSTBLT_INDEX 0x0F #define NEG_MULTIPATBLT_INDEX 0x10 @@ -997,21 +997,21 @@ struct rdp_settings UINT64 padding0384[384 - 323]; /* 323 */ /* Client Monitor Data */ - ALIGN64 UINT32 MonitorCount; /* 384 */ - ALIGN64 UINT32 MonitorDefArraySize; /* 385 */ - ALIGN64 rdpMonitor* MonitorDefArray; /* 386 */ - ALIGN64 BOOL SpanMonitors; /* 387 */ - ALIGN64 BOOL UseMultimon; /* 388 */ - ALIGN64 BOOL ForceMultimon; /* 389 */ - ALIGN64 UINT32 DesktopPosX; /* 390 */ - ALIGN64 UINT32 DesktopPosY; /* 391 */ - ALIGN64 BOOL ListMonitors; /* 392 */ - ALIGN64 UINT32* MonitorIds; /* 393 */ - ALIGN64 UINT32 NumMonitorIds; /* 394 */ - ALIGN64 UINT32 MonitorLocalShiftX; /*395 */ - ALIGN64 UINT32 MonitorLocalShiftY; /* 396 */ - ALIGN64 BOOL HasMonitorAttributes; /* 397 */ - ALIGN64 UINT32 MonitorFlags; /* 398 */ + ALIGN64 UINT32 MonitorCount; /* 384 */ + ALIGN64 UINT32 MonitorDefArraySize; /* 385 */ + ALIGN64 rdpMonitor* MonitorDefArray; /* 386 */ + ALIGN64 BOOL SpanMonitors; /* 387 */ + ALIGN64 BOOL UseMultimon; /* 388 */ + ALIGN64 BOOL ForceMultimon; /* 389 */ + ALIGN64 UINT32 DesktopPosX; /* 390 */ + ALIGN64 UINT32 DesktopPosY; /* 391 */ + ALIGN64 BOOL ListMonitors; /* 392 */ + ALIGN64 UINT32* MonitorIds; /* 393 */ + ALIGN64 UINT32 NumMonitorIds; /* 394 */ + ALIGN64 UINT32 MonitorLocalShiftX; /*395 */ + ALIGN64 UINT32 MonitorLocalShiftY; /* 396 */ + ALIGN64 BOOL HasMonitorAttributes; /* 397 */ + ALIGN64 UINT32 MonitorFlags; /* 398 */ ALIGN64 UINT32 MonitorAttributeFlags; /* 399 */ UINT64 padding0448[448 - 400]; /* 400 */ @@ -1055,9 +1055,9 @@ struct rdp_settings UINT64 padding0768[768 - 722]; /* 722 */ /* Client Info (Extra) */ - ALIGN64 BOOL IPv6Enabled; /* 768 */ - ALIGN64 char* ClientAddress; /* 769 */ - ALIGN64 char* ClientDir; /* 770 */ + ALIGN64 BOOL IPv6Enabled; /* 768 */ + ALIGN64 char* ClientAddress; /* 769 */ + ALIGN64 char* ClientDir; /* 770 */ ALIGN64 UINT32 ClientSessionId; /* */ UINT64 padding0832[832 - 772]; /* 772 */ diff --git a/include/freerdp/utils/pod_arrays.h b/include/freerdp/utils/pod_arrays.h index 949f08939..5a0c5179b 100644 --- a/include/freerdp/utils/pod_arrays.h +++ b/include/freerdp/utils/pod_arrays.h @@ -22,120 +22,119 @@ #include #include -#define POD_ARRAYS_IMPL(T, TLOWER) \ - typedef struct \ - { \ - T* values; \ - size_t nvalues; \ - } Array##T; \ - typedef BOOL Array##T##Cb(T* v, void* data); \ - \ - static INLINE void array_##TLOWER##_init(Array##T* a) \ - { \ - WINPR_ASSERT(a); \ - a->values = NULL; \ - a->nvalues = 0; \ - } \ - \ - static INLINE size_t array_##TLOWER##_size(const Array##T* a) \ - { \ - WINPR_ASSERT(a); \ - return a->nvalues; \ - } \ - \ - static INLINE T* array_##TLOWER##_data(const Array##T* a) \ - { \ - WINPR_ASSERT(a); \ - return a->values; \ - } \ - \ - static INLINE const T* array_##TLOWER##_cdata(const Array##T* a) \ - { \ - WINPR_ASSERT(a); \ - return (const T*)a->values; \ - } \ - \ - static INLINE T array_##TLOWER##_get(const Array##T* a, size_t idx) \ - { \ - WINPR_ASSERT(a); \ - WINPR_ASSERT(a->nvalues > idx); \ - return a->values[idx]; \ - } \ - \ - static INLINE void array_##TLOWER##_set(Array##T* a, size_t idx, T v) \ - { \ - WINPR_ASSERT(a); \ - WINPR_ASSERT(a->nvalues > idx); \ - a->values[idx] = v; \ - } \ - \ - static INLINE BOOL array_##TLOWER##_append(Array##T* a, T v) \ - { \ - WINPR_ASSERT(a); \ - T* tmp = realloc(a->values, sizeof(T) * (a->nvalues + 1)); \ - if (!tmp) \ - return FALSE; \ - \ - tmp[a->nvalues] = v; \ - a->values = tmp; \ - a->nvalues++; \ - return TRUE; \ - } \ - \ - static INLINE BOOL array_##TLOWER##_contains(const Array##T* a, T v) \ - { \ - WINPR_ASSERT(a); \ - UINT32 i; \ - \ - for (i = 0; i < a->nvalues; i++) \ - { \ - if (memcmp(&a->values[i], &v, sizeof(T)) == 0) \ - return TRUE; \ - } \ - \ - return FALSE; \ - } \ - \ +#define POD_ARRAYS_IMPL(T, TLOWER) \ + typedef struct \ + { \ + T* values; \ + size_t nvalues; \ + } Array##T; \ + typedef BOOL Array##T##Cb(T* v, void* data); \ + \ + static INLINE void array_##TLOWER##_init(Array##T* a) \ + { \ + WINPR_ASSERT(a); \ + a->values = NULL; \ + a->nvalues = 0; \ + } \ + \ + static INLINE size_t array_##TLOWER##_size(const Array##T* a) \ + { \ + WINPR_ASSERT(a); \ + return a->nvalues; \ + } \ + \ + static INLINE T* array_##TLOWER##_data(const Array##T* a) \ + { \ + WINPR_ASSERT(a); \ + return a->values; \ + } \ + \ + static INLINE const T* array_##TLOWER##_cdata(const Array##T* a) \ + { \ + WINPR_ASSERT(a); \ + return (const T*)a->values; \ + } \ + \ + static INLINE T array_##TLOWER##_get(const Array##T* a, size_t idx) \ + { \ + WINPR_ASSERT(a); \ + WINPR_ASSERT(a->nvalues > idx); \ + return a->values[idx]; \ + } \ + \ + static INLINE void array_##TLOWER##_set(Array##T* a, size_t idx, T v) \ + { \ + WINPR_ASSERT(a); \ + WINPR_ASSERT(a->nvalues > idx); \ + a->values[idx] = v; \ + } \ + \ + static INLINE BOOL array_##TLOWER##_append(Array##T* a, T v) \ + { \ + WINPR_ASSERT(a); \ + T* tmp = realloc(a->values, sizeof(T) * (a->nvalues + 1)); \ + if (!tmp) \ + return FALSE; \ + \ + tmp[a->nvalues] = v; \ + a->values = tmp; \ + a->nvalues++; \ + return TRUE; \ + } \ + \ + static INLINE BOOL array_##TLOWER##_contains(const Array##T* a, T v) \ + { \ + WINPR_ASSERT(a); \ + UINT32 i; \ + \ + for (i = 0; i < a->nvalues; i++) \ + { \ + if (memcmp(&a->values[i], &v, sizeof(T)) == 0) \ + return TRUE; \ + } \ + \ + return FALSE; \ + } \ + \ static INLINE BOOL array_##TLOWER##_foreach(Array##T* a, Array##T##Cb cb, void* data) \ - { \ - WINPR_ASSERT(a); \ - size_t i; \ - for (i = 0; i < a->nvalues; i++) \ - { \ - if (!cb(&a->values[i], data)) \ - return FALSE; \ - } \ - \ - return TRUE; \ - } \ - \ - static INLINE void array_##TLOWER##_reset(Array##T* a) \ - { \ - WINPR_ASSERT(a); \ - a->nvalues = 0; \ - } \ - \ - static INLINE void array_##TLOWER##_uninit(Array##T* a) \ - { \ - WINPR_ASSERT(a); \ - free(a->values); \ - \ - a->values = NULL; \ - a->nvalues = 0; \ + { \ + WINPR_ASSERT(a); \ + size_t i; \ + for (i = 0; i < a->nvalues; i++) \ + { \ + if (!cb(&a->values[i], data)) \ + return FALSE; \ + } \ + \ + return TRUE; \ + } \ + \ + static INLINE void array_##TLOWER##_reset(Array##T* a) \ + { \ + WINPR_ASSERT(a); \ + a->nvalues = 0; \ + } \ + \ + static INLINE void array_##TLOWER##_uninit(Array##T* a) \ + { \ + WINPR_ASSERT(a); \ + free(a->values); \ + \ + a->values = NULL; \ + a->nvalues = 0; \ } #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif - -POD_ARRAYS_IMPL(UINT16, uint16); -POD_ARRAYS_IMPL(UINT32, uint32); -POD_ARRAYS_IMPL(UINT64, uint64); + POD_ARRAYS_IMPL(UINT16, uint16); + POD_ARRAYS_IMPL(UINT32, uint32); + POD_ARRAYS_IMPL(UINT64, uint64); #ifdef __cplusplus } #endif - #endif /* FREERDP_UTILS_POD_ARRAYS_H_ */ diff --git a/libfreerdp/cache/bitmap.c b/libfreerdp/cache/bitmap.c index 61c1f68f2..d3dc8463b 100644 --- a/libfreerdp/cache/bitmap.c +++ b/libfreerdp/cache/bitmap.c @@ -329,7 +329,8 @@ static int bitmap_cache_save_persistent(rdpBitmapCache* bitmapCache) cacheEntry.flags = 0; cacheEntry.data = bitmap->data; - if (persistent_cache_write_entry(persistent, &cacheEntry) < 1) { + if (persistent_cache_write_entry(persistent, &cacheEntry) < 1) + { status = -1; goto end; } diff --git a/libfreerdp/cache/persistent.c b/libfreerdp/cache/persistent.c index eb1913c07..a00e14ae6 100644 --- a/libfreerdp/cache/persistent.c +++ b/libfreerdp/cache/persistent.c @@ -56,7 +56,8 @@ static int persistent_cache_read_entry_v2(rdpPersistentCache* persistent, { PERSISTENT_CACHE_ENTRY_V2 entry2; - if (fread((void*)&entry2, 1, sizeof(PERSISTENT_CACHE_ENTRY_V2), persistent->fp) != sizeof(PERSISTENT_CACHE_ENTRY_V2)) + if (fread((void*)&entry2, 1, sizeof(PERSISTENT_CACHE_ENTRY_V2), persistent->fp) != + sizeof(PERSISTENT_CACHE_ENTRY_V2)) return -1; entry->key64 = entry2.key64; @@ -88,7 +89,8 @@ static int persistent_cache_write_entry_v2(rdpPersistentCache* persistent, if (!entry2.flags) entry2.flags = 0x00000011; - if (fwrite((void*)&entry2, 1, sizeof(PERSISTENT_CACHE_ENTRY_V2), persistent->fp) != sizeof(PERSISTENT_CACHE_ENTRY_V2)) + if (fwrite((void*)&entry2, 1, sizeof(PERSISTENT_CACHE_ENTRY_V2), persistent->fp) != + sizeof(PERSISTENT_CACHE_ENTRY_V2)) return -1; if (fwrite((void*)entry->data, 1, entry->size, persistent->fp) != entry->size) @@ -113,7 +115,8 @@ static int persistent_cache_read_v2(rdpPersistentCache* persistent) while (1) { - if (fread((void*)&entry, 1, sizeof(PERSISTENT_CACHE_ENTRY_V2), persistent->fp) != sizeof(PERSISTENT_CACHE_ENTRY_V2)) + if (fread((void*)&entry, 1, sizeof(PERSISTENT_CACHE_ENTRY_V2), persistent->fp) != + sizeof(PERSISTENT_CACHE_ENTRY_V2)) break; if (fseek(persistent->fp, 0x4000, SEEK_CUR) != 0) @@ -130,7 +133,8 @@ static int persistent_cache_read_entry_v3(rdpPersistentCache* persistent, { PERSISTENT_CACHE_ENTRY_V3 entry3; - if (fread((void*)&entry3, 1, sizeof(PERSISTENT_CACHE_ENTRY_V3), persistent->fp) != sizeof(PERSISTENT_CACHE_ENTRY_V3)) + if (fread((void*)&entry3, 1, sizeof(PERSISTENT_CACHE_ENTRY_V3), persistent->fp) != + sizeof(PERSISTENT_CACHE_ENTRY_V3)) return -1; entry->key64 = entry3.key64; @@ -144,7 +148,8 @@ static int persistent_cache_read_entry_v3(rdpPersistentCache* persistent, persistent->bmpSize = entry->size; BYTE* bmpData = (BYTE*)realloc(persistent->bmpData, persistent->bmpSize); - if (!bmpData) { + if (!bmpData) + { free(persistent->bmpData); persistent->bmpData = NULL; persistent->bmpSize = 0; @@ -171,7 +176,8 @@ static int persistent_cache_write_entry_v3(rdpPersistentCache* persistent, entry3.width = entry->width; entry3.height = entry->height; - if (fwrite((void*)&entry3, 1, sizeof(PERSISTENT_CACHE_ENTRY_V3), persistent->fp) != sizeof(PERSISTENT_CACHE_ENTRY_V3)) + if (fwrite((void*)&entry3, 1, sizeof(PERSISTENT_CACHE_ENTRY_V3), persistent->fp) != + sizeof(PERSISTENT_CACHE_ENTRY_V3)) return -1; if (fwrite((void*)entry->data, 1, entry->size, persistent->fp) != entry->size) @@ -188,7 +194,8 @@ static int persistent_cache_read_v3(rdpPersistentCache* persistent) while (1) { - if (fread((void*)&entry, 1, sizeof(PERSISTENT_CACHE_ENTRY_V3), persistent->fp) != sizeof(PERSISTENT_CACHE_ENTRY_V3)) + if (fread((void*)&entry, 1, sizeof(PERSISTENT_CACHE_ENTRY_V3), persistent->fp) != + sizeof(PERSISTENT_CACHE_ENTRY_V3)) break; if (fseek(persistent->fp, (entry.width * entry.height * 4), SEEK_CUR) != 0) @@ -210,7 +217,8 @@ int persistent_cache_read_entry(rdpPersistentCache* persistent, PERSISTENT_CACHE return -1; } -int persistent_cache_write_entry(rdpPersistentCache* persistent, const PERSISTENT_CACHE_ENTRY* entry) +int persistent_cache_write_entry(rdpPersistentCache* persistent, + const PERSISTENT_CACHE_ENTRY* entry) { if (persistent->version == 3) return persistent_cache_write_entry_v3(persistent, entry); @@ -234,7 +242,7 @@ static int persistent_cache_open_read(rdpPersistentCache* persistent) if (fread(sig, 1, 8, persistent->fp) != 8) return -1; - if (!strncmp((const char*) sig, "RDP8bmp", 8)) + if (!strncmp((const char*)sig, "RDP8bmp", 8)) persistent->version = 3; else persistent->version = 2; @@ -243,7 +251,8 @@ static int persistent_cache_open_read(rdpPersistentCache* persistent) if (persistent->version == 3) { - if (fread(&header, 1, sizeof(PERSISTENT_CACHE_HEADER_V3), persistent->fp) != sizeof(PERSISTENT_CACHE_HEADER_V3)) + if (fread(&header, 1, sizeof(PERSISTENT_CACHE_HEADER_V3), persistent->fp) != + sizeof(PERSISTENT_CACHE_HEADER_V3)) return -1; status = persistent_cache_read_v3(persistent); @@ -271,10 +280,11 @@ static int persistent_cache_open_write(rdpPersistentCache* persistent) if (persistent->version == 3) { - strncpy((char*) header.sig, "RDP8bmp", 8); + strncpy((char*)header.sig, "RDP8bmp", 8); header.flags = 0x00000006; - if (fwrite(&header, 1, sizeof(PERSISTENT_CACHE_HEADER_V3), persistent->fp) != sizeof(PERSISTENT_CACHE_HEADER_V3)) + if (fwrite(&header, 1, sizeof(PERSISTENT_CACHE_HEADER_V3), persistent->fp) != + sizeof(PERSISTENT_CACHE_HEADER_V3)) return -1; } diff --git a/libfreerdp/codec/clear.c b/libfreerdp/codec/clear.c index e7020e45a..3b1a0b76a 100644 --- a/libfreerdp/codec/clear.c +++ b/libfreerdp/codec/clear.c @@ -86,7 +86,8 @@ static void clear_reset_vbar_storage(CLEAR_CONTEXT* clear, BOOL zero) { int i; - if (zero) { + if (zero) + { for (i = 0; i < ARRAYSIZE(clear->VBarStorage); i++) free(clear->VBarStorage[i].pixels); @@ -95,7 +96,8 @@ static void clear_reset_vbar_storage(CLEAR_CONTEXT* clear, BOOL zero) clear->VBarStorageCursor = 0; - if (zero) { + if (zero) + { for (i = 0; i < ARRAYSIZE(clear->ShortVBarStorage); i++) free(clear->ShortVBarStorage[i].pixels); @@ -1125,7 +1127,7 @@ int clear_compress(CLEAR_CONTEXT* clear, const BYTE* pSrcData, UINT32 SrcSize, B BOOL clear_context_reset(CLEAR_CONTEXT* clear) { if (!clear) - return FALSE; + return FALSE; /** * The ClearCodec context is not bound to a particular surface, diff --git a/libfreerdp/codec/color.c b/libfreerdp/codec/color.c index ab46ec413..836a2d0a0 100644 --- a/libfreerdp/codec/color.c +++ b/libfreerdp/codec/color.c @@ -949,7 +949,7 @@ const char* FreeRDPGetColorFormatName(UINT32 format) } void FreeRDPSplitColor(UINT32 color, UINT32 format, BYTE* _r, BYTE* _g, BYTE* _b, BYTE* _a, - const gdiPalette* palette) + const gdiPalette* palette) { UINT32 tmp; diff --git a/libfreerdp/codec/h264.c b/libfreerdp/codec/h264.c index 731648017..e1dfaf40c 100644 --- a/libfreerdp/codec/h264.c +++ b/libfreerdp/codec/h264.c @@ -73,7 +73,8 @@ BOOL avc420_ensure_buffer(H264_CONTEXT* h264, UINT32 stride, UINT32 width, UINT3 for (x = 0; x < 3; x++) { BYTE* tmp1 = winpr_aligned_recalloc(h264->pYUVData[x], h264->iStride[x], pheight, 16); - BYTE* tmp2 = winpr_aligned_recalloc(h264->pOldYUVData[x], h264->iStride[x], pheight, 16); + BYTE* tmp2 = + winpr_aligned_recalloc(h264->pOldYUVData[x], h264->iStride[x], pheight, 16); if (tmp1) h264->pYUVData[x] = tmp1; if (tmp2) diff --git a/libfreerdp/codec/mppc.c b/libfreerdp/codec/mppc.c index 573890824..69b72e7d3 100644 --- a/libfreerdp/codec/mppc.c +++ b/libfreerdp/codec/mppc.c @@ -807,7 +807,7 @@ void mppc_context_reset(MPPC_CONTEXT* mppc, BOOL flush) else { mppc->HistoryOffset = 0; - mppc->HistoryPtr = &(mppc->HistoryBuffer[mppc->HistoryOffset]); + mppc->HistoryPtr = &(mppc->HistoryBuffer[mppc->HistoryOffset]); } } diff --git a/libfreerdp/codec/nsc.c b/libfreerdp/codec/nsc.c index 344ec7cd5..a94da77f2 100644 --- a/libfreerdp/codec/nsc.c +++ b/libfreerdp/codec/nsc.c @@ -303,7 +303,8 @@ static BOOL nsc_context_initialize(NSC_CONTEXT* context, wStream* s) return TRUE; } -static void nsc_profiler_print(NSC_CONTEXT_PRIV* priv){ +static void nsc_profiler_print(NSC_CONTEXT_PRIV* priv) +{ WINPR_UNUSED(priv); PROFILER_PRINT_HEADER diff --git a/libfreerdp/codec/nsc_encode.c b/libfreerdp/codec/nsc_encode.c index 2a428b1a1..11aefa265 100644 --- a/libfreerdp/codec/nsc_encode.c +++ b/libfreerdp/codec/nsc_encode.c @@ -286,7 +286,7 @@ static BOOL nsc_encode_subsampling(NSC_CONTEXT* context) if (tempWidth > context->priv->PlaneBuffersLength / tempHeight) return FALSE; - for (y = 0; y> 1; y++) + for (y = 0; y < tempHeight >> 1; y++) { UINT32 x; BYTE* co_dst = context->priv->PlaneBuffers[1] + y * (tempWidth >> 1); @@ -296,7 +296,7 @@ static BOOL nsc_encode_subsampling(NSC_CONTEXT* context) const INT8* cg_src0 = (INT8*)context->priv->PlaneBuffers[2] + (y << 1) * tempWidth; const INT8* cg_src1 = cg_src0 + tempWidth; - for (x = 0; x> 1; x++) + for (x = 0; x < tempWidth >> 1; x++) { *co_dst++ = (BYTE)(((INT16)*co_src0 + (INT16) * (co_src0 + 1) + (INT16)*co_src1 + (INT16) * (co_src1 + 1)) >> diff --git a/libfreerdp/codec/nsc_sse2.c b/libfreerdp/codec/nsc_sse2.c index 68484d1db..4c98c1653 100644 --- a/libfreerdp/codec/nsc_sse2.c +++ b/libfreerdp/codec/nsc_sse2.c @@ -333,7 +333,7 @@ static void nsc_encode_subsampling_sse2(NSC_CONTEXT* context) tempWidth = ROUND_UP_TO(context->width, 8); tempHeight = ROUND_UP_TO(context->height, 2); - for (y = 0; y> 1; y++) + for (y = 0; y < tempHeight >> 1; y++) { UINT32 x; co_dst = context->priv->PlaneBuffers[1] + y * (tempWidth >> 1); @@ -343,7 +343,7 @@ static void nsc_encode_subsampling_sse2(NSC_CONTEXT* context) cg_src0 = (INT8*)context->priv->PlaneBuffers[2] + (y << 1) * tempWidth; cg_src1 = cg_src0 + tempWidth; - for (x = 0; x> 1; x += 8) + for (x = 0; x < tempWidth >> 1; x += 8) { t = _mm_loadu_si128((__m128i*)co_src0); t = _mm_avg_epu8(t, _mm_loadu_si128((__m128i*)co_src1)); diff --git a/libfreerdp/codec/planar.c b/libfreerdp/codec/planar.c index abfd78f16..4062221f3 100644 --- a/libfreerdp/codec/planar.c +++ b/libfreerdp/codec/planar.c @@ -1034,7 +1034,7 @@ static INLINE BOOL freerdp_split_color_planes(BITMAP_PLANAR_CONTEXT* planar, con const UINT32 color = FreeRDPReadColor(pixel, format); pixel += FreeRDPGetBytesPerPixel(format); FreeRDPSplitColor(color, format, &planes[1][k], &planes[2][k], &planes[3][k], - &planes[0][k], NULL); + &planes[0][k], NULL); k++; } } @@ -1053,7 +1053,7 @@ static INLINE BOOL freerdp_split_color_planes(BITMAP_PLANAR_CONTEXT* planar, con const UINT32 color = FreeRDPReadColor(pixel, format); pixel += FreeRDPGetBytesPerPixel(format); FreeRDPSplitColor(color, format, &planes[1][k], &planes[2][k], &planes[3][k], - &planes[0][k], NULL); + &planes[0][k], NULL); k++; } } diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c index ca745d326..1073ba174 100644 --- a/libfreerdp/codec/rfx.c +++ b/libfreerdp/codec/rfx.c @@ -271,42 +271,42 @@ RFX_CONTEXT* rfx_context_new_ex(BOOL encoder, UINT32 ThreadingFlags) if (!(ThreadingFlags & THREADING_FLAGS_DISABLE_THREADS)) { #ifdef _WIN32 - { - BOOL isVistaOrLater; - OSVERSIONINFOA verinfo; - ZeroMemory(&verinfo, sizeof(OSVERSIONINFOA)); - verinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); - GetVersionExA(&verinfo); - isVistaOrLater = - ((verinfo.dwMajorVersion >= 6) && (verinfo.dwMinorVersion >= 0)) ? TRUE : FALSE; - priv->UseThreads = isVistaOrLater; - } + { + BOOL isVistaOrLater; + OSVERSIONINFOA verinfo; + ZeroMemory(&verinfo, sizeof(OSVERSIONINFOA)); + verinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); + GetVersionExA(&verinfo); + isVistaOrLater = + ((verinfo.dwMajorVersion >= 6) && (verinfo.dwMinorVersion >= 0)) ? TRUE : FALSE; + priv->UseThreads = isVistaOrLater; + } #else - priv->UseThreads = TRUE; + priv->UseThreads = TRUE; #endif - GetNativeSystemInfo(&sysinfo); - priv->MinThreadCount = sysinfo.dwNumberOfProcessors; - priv->MaxThreadCount = 0; - status = RegOpenKeyExA(HKEY_LOCAL_MACHINE, RFX_KEY, 0, KEY_READ | KEY_WOW64_64KEY, &hKey); + GetNativeSystemInfo(&sysinfo); + priv->MinThreadCount = sysinfo.dwNumberOfProcessors; + priv->MaxThreadCount = 0; + status = RegOpenKeyExA(HKEY_LOCAL_MACHINE, RFX_KEY, 0, KEY_READ | KEY_WOW64_64KEY, &hKey); - if (status == ERROR_SUCCESS) - { - dwSize = sizeof(dwValue); + if (status == ERROR_SUCCESS) + { + dwSize = sizeof(dwValue); - if (RegQueryValueEx(hKey, _T("UseThreads"), NULL, &dwType, (BYTE*)&dwValue, &dwSize) == - ERROR_SUCCESS) - priv->UseThreads = dwValue ? 1 : 0; + if (RegQueryValueEx(hKey, _T("UseThreads"), NULL, &dwType, (BYTE*)&dwValue, &dwSize) == + ERROR_SUCCESS) + priv->UseThreads = dwValue ? 1 : 0; - if (RegQueryValueEx(hKey, _T("MinThreadCount"), NULL, &dwType, (BYTE*)&dwValue, &dwSize) == - ERROR_SUCCESS) - priv->MinThreadCount = dwValue; + if (RegQueryValueEx(hKey, _T("MinThreadCount"), NULL, &dwType, (BYTE*)&dwValue, + &dwSize) == ERROR_SUCCESS) + priv->MinThreadCount = dwValue; - if (RegQueryValueEx(hKey, _T("MaxThreadCount"), NULL, &dwType, (BYTE*)&dwValue, &dwSize) == - ERROR_SUCCESS) - priv->MaxThreadCount = dwValue; + if (RegQueryValueEx(hKey, _T("MaxThreadCount"), NULL, &dwType, (BYTE*)&dwValue, + &dwSize) == ERROR_SUCCESS) + priv->MaxThreadCount = dwValue; - RegCloseKey(hKey); - } + RegCloseKey(hKey); + } } else { @@ -384,8 +384,9 @@ void rfx_context_free(RFX_CONTEXT* context) free(priv->workObjects); free(priv->tileWorkParams); #ifdef WITH_PROFILER - WLog_VRB(TAG, - "WARNING: Profiling results probably unusable with multithreaded RemoteFX codec!"); + WLog_VRB( + TAG, + "WARNING: Profiling results probably unusable with multithreaded RemoteFX codec!"); #endif } diff --git a/libfreerdp/codec/yuv.c b/libfreerdp/codec/yuv.c index 617722c49..62392468f 100644 --- a/libfreerdp/codec/yuv.c +++ b/libfreerdp/codec/yuv.c @@ -305,21 +305,21 @@ static BOOL submit_object(PTP_WORK* work_object, PTP_WORK_CALLBACK cb, const voi static void free_objects(PTP_WORK* work_objects, UINT32 waitCount) { - UINT32 i; + UINT32 i; - WINPR_ASSERT(work_objects || (waitCount == 0)); + WINPR_ASSERT(work_objects || (waitCount == 0)); - for (i = 0; i < waitCount; i++) - { - PTP_WORK cur = work_objects[i]; - work_objects[i] = NULL; + for (i = 0; i < waitCount; i++) + { + PTP_WORK cur = work_objects[i]; + work_objects[i] = NULL; - if (!cur) - continue; + if (!cur) + continue; - WaitForThreadpoolWorkCallbacks(cur, FALSE); - CloseThreadpoolWork(cur); - } + WaitForThreadpoolWorkCallbacks(cur, FALSE); + CloseThreadpoolWork(cur); + } } static BOOL intersects(UINT32 pos, const RECTANGLE_16* regionRects, UINT32 numRegionRects) diff --git a/libfreerdp/common/addin.c b/libfreerdp/common/addin.c index c55294e91..cf22ec9ec 100644 --- a/libfreerdp/common/addin.c +++ b/libfreerdp/common/addin.c @@ -104,7 +104,9 @@ LPSTR freerdp_get_dynamic_addin_install_path(void) needInstallPath = is_path_required(pszInstallPrefix, cchInstallPrefix); needLibPath = is_path_required(pszAddinPath, cchAddinPath); - WLog_DBG(TAG, "freerdp_get_dynamic_addin_install_path <- pszInstallPrefix: %s, pszAddinPath: %s", pszInstallPrefix, pszAddinPath); + WLog_DBG(TAG, + "freerdp_get_dynamic_addin_install_path <- pszInstallPrefix: %s, pszAddinPath: %s", + pszInstallPrefix, pszAddinPath); if (!needInstallPath && !needLibPath) return NULL; @@ -155,7 +157,8 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_addin(LPCSTR pszFileName, LPCSTR pszPa if (!pszFileName || !pszEntryName) goto fail; - WLog_DBG(TAG, "freerdp_load_dynamic_addin <- pszFileName: %s, pszPath: %s, pszEntryName: %s", pszFileName, pszPath, pszEntryName); + WLog_DBG(TAG, "freerdp_load_dynamic_addin <- pszFileName: %s, pszPath: %s, pszEntryName: %s", + pszFileName, pszPath, pszEntryName); cchFileName = strlen(pszFileName); @@ -261,15 +264,13 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LP if (pszName && pszSubsystem && pszType) { - cchFileName = - cchBaseFileName + nameLen + subsystemLen + typeLen; + cchFileName = cchBaseFileName + nameLen + subsystemLen + typeLen; pszFileName = (LPSTR)malloc(cchFileName); if (!pszFileName) return NULL; - sprintf_s(pszFileName, cchFileName, "%s-client-%s-%s", pszName, - pszSubsystem, pszType); + sprintf_s(pszFileName, cchFileName, "%s-client-%s-%s", pszName, pszSubsystem, pszType); } else if (pszName && pszSubsystem) { @@ -279,11 +280,11 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LP if (!pszFileName) return NULL; - sprintf_s(pszFileName, cchFileName, "%s-client-%s", pszName, pszSubsystem ); + sprintf_s(pszFileName, cchFileName, "%s-client-%s", pszName, pszSubsystem); } else if (pszName) { - cchFileName = cchBaseFileName + nameLen ; + cchFileName = cchBaseFileName + nameLen; pszFileName = (LPSTR)malloc(cchFileName); if (!pszFileName) diff --git a/libfreerdp/common/settings.c b/libfreerdp/common/settings.c index 359293a87..a378e3392 100644 --- a/libfreerdp/common/settings.c +++ b/libfreerdp/common/settings.c @@ -473,7 +473,7 @@ RDPDR_DEVICE* freerdp_device_clone(const RDPDR_DEVICE* device) args[1] = src.drive->Path; count = 2; } - break; + break; case RDPDR_DTYP_PRINT: if (src.printer->DriverName) @@ -481,7 +481,7 @@ RDPDR_DEVICE* freerdp_device_clone(const RDPDR_DEVICE* device) args[1] = src.printer->DriverName; count = 2; } - break; + break; case RDPDR_DTYP_SMARTCARD: break; @@ -504,7 +504,7 @@ RDPDR_DEVICE* freerdp_device_clone(const RDPDR_DEVICE* device) args[3] = src.serial->Permissive; count = 4; } - break; + break; case RDPDR_DTYP_PARALLEL: if (src.parallel->Path) @@ -512,7 +512,7 @@ RDPDR_DEVICE* freerdp_device_clone(const RDPDR_DEVICE* device) args[1] = src.parallel->Path; count = 2; } - break; + break; default: WLog_ERR(TAG, "unknown device type %" PRIu32 "", device->Type); break; diff --git a/libfreerdp/core/activation.c b/libfreerdp/core/activation.c index ba704a8ab..b21d05f5d 100644 --- a/libfreerdp/core/activation.c +++ b/libfreerdp/core/activation.c @@ -383,17 +383,19 @@ BOOL rdp_send_client_persistent_key_list_pdu(rdpRdp* rdp) WLog_DBG(TAG, "persistentKeyList count: %d", info.keyCount); - WLog_DBG(TAG, "numEntriesCache: 0: %d 1: %d 2: %d 3: %d 4: %d", - info.numEntriesCache0, info.numEntriesCache1, info.numEntriesCache2, info.numEntriesCache3, info.numEntriesCache4); + WLog_DBG(TAG, "numEntriesCache: 0: %d 1: %d 2: %d 3: %d 4: %d", info.numEntriesCache0, + info.numEntriesCache1, info.numEntriesCache2, info.numEntriesCache3, + info.numEntriesCache4); - WLog_DBG(TAG, "totalEntriesCache: 0: %d 1: %d 2: %d 3: %d 4: %d", - info.totalEntriesCache0, info.totalEntriesCache1, info.totalEntriesCache2, info.totalEntriesCache3, info.totalEntriesCache4); + WLog_DBG(TAG, "totalEntriesCache: 0: %d 1: %d 2: %d 3: %d 4: %d", info.totalEntriesCache0, + info.totalEntriesCache1, info.totalEntriesCache2, info.totalEntriesCache3, + info.totalEntriesCache4); wStream* s = rdp_data_pdu_init(rdp); if (!s) return FALSE; - + if (!rdp_write_client_persistent_key_list_pdu(s, &info)) { Stream_Free(s, TRUE); diff --git a/libfreerdp/core/activation.h b/libfreerdp/core/activation.h index 8aac1467f..c795819a2 100644 --- a/libfreerdp/core/activation.h +++ b/libfreerdp/core/activation.h @@ -50,7 +50,6 @@ struct _RDP_BITMAP_PERSISTENT_INFO }; typedef struct _RDP_BITMAP_PERSISTENT_INFO RDP_BITMAP_PERSISTENT_INFO; - #define PERSIST_FIRST_PDU 0x01 #define PERSIST_LAST_PDU 0x02 diff --git a/libfreerdp/core/autodetect.c b/libfreerdp/core/autodetect.c index bcb194c2c..8de4f5f34 100644 --- a/libfreerdp/core/autodetect.c +++ b/libfreerdp/core/autodetect.c @@ -141,7 +141,8 @@ static BOOL autodetect_send_rtt_measure_response(rdpRdp* rdp, UINT16 sequenceNum if (!s) return FALSE; - WLog_VRB(AUTODETECT_TAG, "sending RTT Measure Response PDU (seqNumber=0x%"PRIx16")", sequenceNumber); + WLog_VRB(AUTODETECT_TAG, "sending RTT Measure Response PDU (seqNumber=0x%" PRIx16 ")", + sequenceNumber); Stream_Write_UINT8(s, 0x06); /* headerLength (1 byte) */ Stream_Write_UINT8(s, TYPE_ID_AUTODETECT_RESPONSE); /* headerTypeId (1 byte) */ Stream_Write_UINT16(s, sequenceNumber); /* sequenceNumber (2 bytes) */ @@ -158,7 +159,8 @@ static BOOL autodetect_send_bandwidth_measure_start(rdpContext* context, UINT16 if (!s) return FALSE; - WLog_VRB(AUTODETECT_TAG, "sending Bandwidth Measure Start PDU(seqNumber=%"PRIu16")", sequenceNumber); + WLog_VRB(AUTODETECT_TAG, "sending Bandwidth Measure Start PDU(seqNumber=%" PRIu16 ")", + sequenceNumber); Stream_Write_UINT8(s, 0x06); /* headerLength (1 byte) */ Stream_Write_UINT8(s, TYPE_ID_AUTODETECT_REQUEST); /* headerTypeId (1 byte) */ Stream_Write_UINT16(s, sequenceNumber); /* sequenceNumber (2 bytes) */ @@ -308,11 +310,11 @@ static BOOL autodetect_send_bandwidth_measure_results(rdpRdp* rdp, UINT16 respon "", timeDelta, rdp->autodetect->bandwidthMeasureByteCount); - Stream_Write_UINT8(s, 0x0E); /* headerLength (1 byte) */ - Stream_Write_UINT8(s, TYPE_ID_AUTODETECT_RESPONSE); /* headerTypeId (1 byte) */ - Stream_Write_UINT16(s, sequenceNumber); /* sequenceNumber (2 bytes) */ - Stream_Write_UINT16(s, responseType); /* responseType (1 byte) */ - Stream_Write_UINT32(s, (UINT32)MIN(timeDelta, UINT32_MAX)); /* timeDelta (4 bytes) */ + Stream_Write_UINT8(s, 0x0E); /* headerLength (1 byte) */ + Stream_Write_UINT8(s, TYPE_ID_AUTODETECT_RESPONSE); /* headerTypeId (1 byte) */ + Stream_Write_UINT16(s, sequenceNumber); /* sequenceNumber (2 bytes) */ + Stream_Write_UINT16(s, responseType); /* responseType (1 byte) */ + Stream_Write_UINT32(s, (UINT32)MIN(timeDelta, UINT32_MAX)); /* timeDelta (4 bytes) */ Stream_Write_UINT32(s, rdp->autodetect->bandwidthMeasureByteCount); /* byteCount (4 bytes) */ IFCALLRET(rdp->autodetect->ClientBandwidthMeasureResult, success, rdp->context, rdp->autodetect); diff --git a/libfreerdp/core/capabilities.c b/libfreerdp/core/capabilities.c index 164a959af..0f1071bbe 100644 --- a/libfreerdp/core/capabilities.c +++ b/libfreerdp/core/capabilities.c @@ -257,15 +257,15 @@ static BOOL rdp_write_general_capability_set(wStream* s, const rdpSettings* sett settings->OsMajorType, settings->OsMinorType, UINT16_MAX); return FALSE; } - Stream_Write_UINT16(s, (UINT16)settings->OsMajorType); /* osMajorType (2 bytes) */ - Stream_Write_UINT16(s, (UINT16)settings->OsMinorType); /* osMinorType (2 bytes) */ - Stream_Write_UINT16(s, CAPS_PROTOCOL_VERSION); /* protocolVersion (2 bytes) */ - Stream_Write_UINT16(s, 0); /* pad2OctetsA (2 bytes) */ - Stream_Write_UINT16(s, 0); /* generalCompressionTypes (2 bytes) */ - Stream_Write_UINT16(s, extraFlags); /* extraFlags (2 bytes) */ - Stream_Write_UINT16(s, 0); /* updateCapabilityFlag (2 bytes) */ - Stream_Write_UINT16(s, 0); /* remoteUnshareFlag (2 bytes) */ - Stream_Write_UINT16(s, 0); /* generalCompressionLevel (2 bytes) */ + Stream_Write_UINT16(s, (UINT16)settings->OsMajorType); /* osMajorType (2 bytes) */ + Stream_Write_UINT16(s, (UINT16)settings->OsMinorType); /* osMinorType (2 bytes) */ + Stream_Write_UINT16(s, CAPS_PROTOCOL_VERSION); /* protocolVersion (2 bytes) */ + Stream_Write_UINT16(s, 0); /* pad2OctetsA (2 bytes) */ + Stream_Write_UINT16(s, 0); /* generalCompressionTypes (2 bytes) */ + Stream_Write_UINT16(s, extraFlags); /* extraFlags (2 bytes) */ + Stream_Write_UINT16(s, 0); /* updateCapabilityFlag (2 bytes) */ + Stream_Write_UINT16(s, 0); /* remoteUnshareFlag (2 bytes) */ + Stream_Write_UINT16(s, 0); /* generalCompressionLevel (2 bytes) */ Stream_Write_UINT8(s, settings->RefreshRect ? 1 : 0); /* refreshRectSupport (1 byte) */ Stream_Write_UINT8(s, settings->SuppressOutput ? 1 : 0); /* suppressOutputSupport (1 byte) */ return rdp_capability_set_finish(s, (UINT16)header, CAPSET_TYPE_GENERAL); @@ -426,19 +426,19 @@ static BOOL rdp_write_bitmap_capability_set(wStream* s, const rdpSettings* setti else preferredBitsPerPixel = 8; - Stream_Write_UINT16(s, preferredBitsPerPixel); /* preferredBitsPerPixel (2 bytes) */ - Stream_Write_UINT16(s, 1); /* receive1BitPerPixel (2 bytes) */ - Stream_Write_UINT16(s, 1); /* receive4BitsPerPixel (2 bytes) */ - Stream_Write_UINT16(s, 1); /* receive8BitsPerPixel (2 bytes) */ + Stream_Write_UINT16(s, preferredBitsPerPixel); /* preferredBitsPerPixel (2 bytes) */ + Stream_Write_UINT16(s, 1); /* receive1BitPerPixel (2 bytes) */ + Stream_Write_UINT16(s, 1); /* receive4BitsPerPixel (2 bytes) */ + Stream_Write_UINT16(s, 1); /* receive8BitsPerPixel (2 bytes) */ Stream_Write_UINT16(s, (UINT16)settings->DesktopWidth); /* desktopWidth (2 bytes) */ Stream_Write_UINT16(s, (UINT16)settings->DesktopHeight); /* desktopHeight (2 bytes) */ - Stream_Write_UINT16(s, 0); /* pad2Octets (2 bytes) */ + Stream_Write_UINT16(s, 0); /* pad2Octets (2 bytes) */ Stream_Write_UINT16(s, (UINT16)settings->DesktopResize); /* desktopResizeFlag (2 bytes) */ - Stream_Write_UINT16(s, 1); /* bitmapCompressionFlag (2 bytes) */ - Stream_Write_UINT8(s, 0); /* highColorFlags (1 byte) */ - Stream_Write_UINT8(s, drawingFlags); /* drawingFlags (1 byte) */ - Stream_Write_UINT16(s, 1); /* multipleRectangleSupport (2 bytes) */ - Stream_Write_UINT16(s, 0); /* pad2OctetsB (2 bytes) */ + Stream_Write_UINT16(s, 1); /* bitmapCompressionFlag (2 bytes) */ + Stream_Write_UINT8(s, 0); /* highColorFlags (1 byte) */ + Stream_Write_UINT8(s, drawingFlags); /* drawingFlags (1 byte) */ + Stream_Write_UINT16(s, 1); /* multipleRectangleSupport (2 bytes) */ + Stream_Write_UINT16(s, 0); /* pad2OctetsB (2 bytes) */ return rdp_capability_set_finish(s, (UINT16)header, CAPSET_TYPE_BITMAP); } @@ -771,17 +771,17 @@ static BOOL rdp_write_bitmap_cache_capability_set(wStream* s, const rdpSettings* size = bpp * 256; if (size > UINT16_MAX) return FALSE; - Stream_Write_UINT16(s, 200); /* Cache0Entries (2 bytes) */ + Stream_Write_UINT16(s, 200); /* Cache0Entries (2 bytes) */ Stream_Write_UINT16(s, (UINT16)size); /* Cache0MaximumCellSize (2 bytes) */ size = bpp * 1024; if (size > UINT16_MAX) return FALSE; - Stream_Write_UINT16(s, 600); /* Cache1Entries (2 bytes) */ + Stream_Write_UINT16(s, 600); /* Cache1Entries (2 bytes) */ Stream_Write_UINT16(s, (UINT16)size); /* Cache1MaximumCellSize (2 bytes) */ size = bpp * 4096; if (size > UINT16_MAX) return FALSE; - Stream_Write_UINT16(s, 1000); /* Cache2Entries (2 bytes) */ + Stream_Write_UINT16(s, 1000); /* Cache2Entries (2 bytes) */ Stream_Write_UINT16(s, (UINT16)size); /* Cache2MaximumCellSize (2 bytes) */ return rdp_capability_set_finish(s, (UINT16)header, CAPSET_TYPE_BITMAP_CACHE); } @@ -1030,7 +1030,7 @@ static BOOL rdp_write_pointer_capability_set(wStream* s, const rdpSettings* sett return FALSE; colorPointerFlag = (settings->ColorPointerFlag) ? 1 : 0; - Stream_Write_UINT16(s, colorPointerFlag); /* colorPointerFlag (2 bytes) */ + Stream_Write_UINT16(s, colorPointerFlag); /* colorPointerFlag (2 bytes) */ Stream_Write_UINT16(s, (UINT16)settings->PointerCacheSize); /* colorPointerCacheSize (2 bytes) */ @@ -1575,19 +1575,19 @@ static BOOL rdp_write_glyph_cache_capability_set(wStream* s, const rdpSettings* if (settings->GlyphSupportLevel > UINT16_MAX) return FALSE; /* glyphCache (40 bytes) */ - rdp_write_cache_definition(s, &(settings->GlyphCache[0])); /* glyphCache0 (4 bytes) */ - rdp_write_cache_definition(s, &(settings->GlyphCache[1])); /* glyphCache1 (4 bytes) */ - rdp_write_cache_definition(s, &(settings->GlyphCache[2])); /* glyphCache2 (4 bytes) */ - rdp_write_cache_definition(s, &(settings->GlyphCache[3])); /* glyphCache3 (4 bytes) */ - rdp_write_cache_definition(s, &(settings->GlyphCache[4])); /* glyphCache4 (4 bytes) */ - rdp_write_cache_definition(s, &(settings->GlyphCache[5])); /* glyphCache5 (4 bytes) */ - rdp_write_cache_definition(s, &(settings->GlyphCache[6])); /* glyphCache6 (4 bytes) */ - rdp_write_cache_definition(s, &(settings->GlyphCache[7])); /* glyphCache7 (4 bytes) */ - rdp_write_cache_definition(s, &(settings->GlyphCache[8])); /* glyphCache8 (4 bytes) */ - rdp_write_cache_definition(s, &(settings->GlyphCache[9])); /* glyphCache9 (4 bytes) */ - rdp_write_cache_definition(s, settings->FragCache); /* fragCache (4 bytes) */ + rdp_write_cache_definition(s, &(settings->GlyphCache[0])); /* glyphCache0 (4 bytes) */ + rdp_write_cache_definition(s, &(settings->GlyphCache[1])); /* glyphCache1 (4 bytes) */ + rdp_write_cache_definition(s, &(settings->GlyphCache[2])); /* glyphCache2 (4 bytes) */ + rdp_write_cache_definition(s, &(settings->GlyphCache[3])); /* glyphCache3 (4 bytes) */ + rdp_write_cache_definition(s, &(settings->GlyphCache[4])); /* glyphCache4 (4 bytes) */ + rdp_write_cache_definition(s, &(settings->GlyphCache[5])); /* glyphCache5 (4 bytes) */ + rdp_write_cache_definition(s, &(settings->GlyphCache[6])); /* glyphCache6 (4 bytes) */ + rdp_write_cache_definition(s, &(settings->GlyphCache[7])); /* glyphCache7 (4 bytes) */ + rdp_write_cache_definition(s, &(settings->GlyphCache[8])); /* glyphCache8 (4 bytes) */ + rdp_write_cache_definition(s, &(settings->GlyphCache[9])); /* glyphCache9 (4 bytes) */ + rdp_write_cache_definition(s, settings->FragCache); /* fragCache (4 bytes) */ Stream_Write_UINT16(s, (UINT16)settings->GlyphSupportLevel); /* glyphSupportLevel (2 bytes) */ - Stream_Write_UINT16(s, 0); /* pad2Octets (2 bytes) */ + Stream_Write_UINT16(s, 0); /* pad2Octets (2 bytes) */ return rdp_capability_set_finish(s, (UINT16)header, CAPSET_TYPE_GLYPH_CACHE); } @@ -3239,7 +3239,7 @@ static BOOL rdp_print_bitmap_codecs_capability_set(wStream* s) return FALSE; if (!Stream_CheckAndLogRequiredLength(TAG, s, 3)) return FALSE; - Stream_Read_UINT8(s, codecId); /* codecId (1 byte) */ + Stream_Read_UINT8(s, codecId); /* codecId (1 byte) */ WLog_VRB(TAG, "\tcodecGuid: 0x"); rdp_print_bitmap_codec_guid(&codecGuid); WLog_VRB(TAG, " (%s)", rdp_get_bitmap_codec_guid_name(&codecGuid)); @@ -4062,9 +4062,9 @@ static BOOL rdp_write_demand_active(wStream* s, rdpSettings* settings) if (lengthCombinedCapabilities > UINT16_MAX) return FALSE; Stream_Write_UINT16( - s, (UINT16)lengthCombinedCapabilities); /* lengthCombinedCapabilities (2 bytes) */ - Stream_SetPosition(s, bm); /* go back to numberCapabilities */ - Stream_Write_UINT16(s, numberCapabilities); /* numberCapabilities (2 bytes) */ + s, (UINT16)lengthCombinedCapabilities); /* lengthCombinedCapabilities (2 bytes) */ + Stream_SetPosition(s, bm); /* go back to numberCapabilities */ + Stream_Write_UINT16(s, numberCapabilities); /* numberCapabilities (2 bytes) */ #ifdef WITH_DEBUG_CAPABILITIES rdp_print_capability_sets(s, bm, FALSE); #endif @@ -4107,7 +4107,7 @@ BOOL rdp_recv_confirm_active(rdpRdp* rdp, wStream* s, UINT16 pduLength) if (!Stream_CheckAndLogRequiredLength(TAG, s, lengthSourceDescriptor + 4U)) return FALSE; - Stream_Seek(s, lengthSourceDescriptor); /* sourceDescriptor */ + Stream_Seek(s, lengthSourceDescriptor); /* sourceDescriptor */ if (!rdp_read_capability_sets(s, rdp->settings, lengthCombinedCapabilities)) return FALSE; @@ -4289,9 +4289,9 @@ static BOOL rdp_write_confirm_active(wStream* s, rdpSettings* settings) if (lengthCombinedCapabilities > UINT16_MAX) return FALSE; Stream_Write_UINT16( - s, (UINT16)lengthCombinedCapabilities); /* lengthCombinedCapabilities (2 bytes) */ - Stream_SetPosition(s, bm); /* go back to numberCapabilities */ - Stream_Write_UINT16(s, numberCapabilities); /* numberCapabilities (2 bytes) */ + s, (UINT16)lengthCombinedCapabilities); /* lengthCombinedCapabilities (2 bytes) */ + Stream_SetPosition(s, bm); /* go back to numberCapabilities */ + Stream_Write_UINT16(s, numberCapabilities); /* numberCapabilities (2 bytes) */ #ifdef WITH_DEBUG_CAPABILITIES rdp_print_capability_sets(s, bm, FALSE); #endif diff --git a/libfreerdp/core/certificate.c b/libfreerdp/core/certificate.c index f02078d81..23d909408 100644 --- a/libfreerdp/core/certificate.c +++ b/libfreerdp/core/certificate.c @@ -775,7 +775,7 @@ BOOL certificate_read_server_certificate(rdpCertificate* certificate, const BYTE size_t length) { BOOL ret; - wStream* s, sbuffer; + wStream *s, sbuffer; UINT32 dwVersion; if (length < 4) /* NULL certificate is not an error see #1795 */ diff --git a/libfreerdp/core/client.c b/libfreerdp/core/client.c index c3ca65ecb..02f44ac85 100644 --- a/libfreerdp/core/client.c +++ b/libfreerdp/core/client.c @@ -491,7 +491,8 @@ BOOL freerdp_channels_data(freerdp* instance, UINT16 channelId, const BYTE* cdat rdpChannels* channels; rdpMcsChannel* channel = NULL; CHANNEL_OPEN_DATA* pChannelOpenData; - union { + union + { const BYTE* pcb; BYTE* pb; } data; diff --git a/libfreerdp/core/connection.c b/libfreerdp/core/connection.c index 00bd1e947..f36b26521 100644 --- a/libfreerdp/core/connection.c +++ b/libfreerdp/core/connection.c @@ -213,12 +213,12 @@ static BOOL rdp_client_reset_codecs(rdpContext* context) * If no backend is available disable it before the channel is loaded. */ #if defined(WITH_GFX_H264) && defined(WITH_OPENH264_LOADING) - if (!context->codecs->h264) - { - settings->GfxH264 = FALSE; - settings->GfxAVC444 = FALSE; - settings->GfxAVC444v2 = FALSE; - } + if (!context->codecs->h264) + { + settings->GfxH264 = FALSE; + settings->GfxAVC444 = FALSE; + settings->GfxAVC444v2 = FALSE; + } #endif } @@ -1176,12 +1176,12 @@ int rdp_client_transition_to_state(rdpRdp* rdp, CONNECTION_STATE state) EventArgsInit(&activatedEvent, "libfreerdp"); activatedEvent.firstActivation = !rdp->deactivation_reactivation; PubSub_OnActivated(context->pubSub, context, &activatedEvent); - } + } + break; + + default: break; - - default: - break; } { diff --git a/libfreerdp/core/display.c b/libfreerdp/core/display.c index d9dfaefde..9e544dc37 100644 --- a/libfreerdp/core/display.c +++ b/libfreerdp/core/display.c @@ -33,11 +33,11 @@ static BOOL display_write_monitor_layout_pdu(wStream* s, UINT32 monitorCount, { const MONITOR_DEF* monitor = &monitorDefArray[index]; - Stream_Write_INT32(s, monitor->left); /* left (4 bytes) */ - Stream_Write_INT32(s, monitor->top); /* top (4 bytes) */ - Stream_Write_INT32(s, monitor->right); /* right (4 bytes) */ - Stream_Write_INT32(s, monitor->bottom); /* bottom (4 bytes) */ - Stream_Write_UINT32(s, monitor->flags); /* flags (4 bytes) */ + Stream_Write_INT32(s, monitor->left); /* left (4 bytes) */ + Stream_Write_INT32(s, monitor->top); /* top (4 bytes) */ + Stream_Write_INT32(s, monitor->right); /* right (4 bytes) */ + Stream_Write_INT32(s, monitor->bottom); /* bottom (4 bytes) */ + Stream_Write_UINT32(s, monitor->flags); /* flags (4 bytes) */ } return TRUE; diff --git a/libfreerdp/core/freerdp.c b/libfreerdp/core/freerdp.c index 26ffdcdd1..e862f73ea 100644 --- a/libfreerdp/core/freerdp.c +++ b/libfreerdp/core/freerdp.c @@ -777,9 +777,9 @@ void freerdp_context_free(freerdp* instance) free(ctx); instance->context = NULL; #if defined(WITH_FREERDP_DEPRECATED) - instance->input = NULL; /* owned by rdpRdp */ - instance->update = NULL; /* owned by rdpRdp */ - instance->settings = NULL; /* owned by rdpRdp */ + instance->input = NULL; /* owned by rdpRdp */ + instance->update = NULL; /* owned by rdpRdp */ + instance->settings = NULL; /* owned by rdpRdp */ instance->autodetect = NULL; /* owned by rdpRdp */ #endif instance->heartbeat = NULL; /* owned by rdpRdp */ diff --git a/libfreerdp/core/gateway/tsg.c b/libfreerdp/core/gateway/tsg.c index 41c7a2c2c..6eeaf476f 100644 --- a/libfreerdp/core/gateway/tsg.c +++ b/libfreerdp/core/gateway/tsg.c @@ -1505,8 +1505,8 @@ static BOOL TsProxyAuthorizeTunnelReadResponse(RPC_PDU* pdu) pdu->s, packetResponse->redirectionFlags .clipboardRedirectionDisabled); /* ClipboardRedirectionDisabled (4 bytes) */ Stream_Read_INT32(pdu->s, packetResponse->redirectionFlags - .pnpRedirectionDisabled); /* PnpRedirectionDisabled (4 bytes) */ - Stream_Read_UINT32(pdu->s, SizeValue); /* (4 bytes) */ + .pnpRedirectionDisabled); /* PnpRedirectionDisabled (4 bytes) */ + Stream_Read_UINT32(pdu->s, SizeValue); /* (4 bytes) */ if (SizeValue != packetResponse->responseDataLen) { diff --git a/libfreerdp/core/gcc.c b/libfreerdp/core/gcc.c index 11c267e19..f7b2581a7 100644 --- a/libfreerdp/core/gcc.c +++ b/libfreerdp/core/gcc.c @@ -1343,7 +1343,7 @@ BOOL gcc_read_server_security_data(wStream* s, rdpMcs* mcs) /* serverRandom */ if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ServerRandom, NULL, - settings->ServerRandomLength)) + settings->ServerRandomLength)) goto fail; Stream_Read(s, settings->ServerRandom, settings->ServerRandomLength); @@ -1353,7 +1353,7 @@ BOOL gcc_read_server_security_data(wStream* s, rdpMcs* mcs) /* serverCertificate */ if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ServerCertificate, NULL, - settings->ServerCertificateLength)) + settings->ServerCertificateLength)) goto fail; Stream_Read(s, settings->ServerCertificate, settings->ServerCertificateLength); diff --git a/libfreerdp/core/info.c b/libfreerdp/core/info.c index 356ede629..59751c3dd 100644 --- a/libfreerdp/core/info.c +++ b/libfreerdp/core/info.c @@ -524,7 +524,8 @@ fail: static BOOL rdp_read_info_string(UINT32 flags, wStream* s, size_t cbLenNonNull, CHAR** dst, size_t max) { - union { + union + { char c; WCHAR w; BYTE b[2]; @@ -773,7 +774,8 @@ static BOOL rdp_write_info_packet(rdpRdp* rdp, wStream* s) if (((flags & INFO_PASSWORD_IS_SC_PIN) == 0) && settings->RedirectionPassword && (settings->RedirectionPasswordLength > 0)) { - union { + union + { BYTE* bp; WCHAR* wp; } ptrconv; @@ -976,7 +978,8 @@ static BOOL rdp_recv_logon_info_v1(rdpRdp* rdp, wStream* s, logon_info* info) { UINT32 cbDomain; UINT32 cbUserName; - union { + union + { BYTE* bp; WCHAR* wp; } ptrconv; @@ -1074,7 +1077,7 @@ static BOOL rdp_recv_logon_info_v2(rdpRdp* rdp, wStream* s, logon_info* info) if (!Stream_CheckAndLogRequiredLength(TAG, s, logonInfoV2TotalSize)) return FALSE; - Stream_Read_UINT16(s, Version); /* Version (2 bytes) */ + Stream_Read_UINT16(s, Version); /* Version (2 bytes) */ if (Version != SAVE_SESSION_PDU_VERSION_ONE) { WLog_WARN(TAG, "LogonInfoV2::Version expected %" PRIu16 " bytes, got %" PRIu16, @@ -1105,9 +1108,9 @@ static BOOL rdp_recv_logon_info_v2(rdpRdp* rdp, wStream* s, logon_info* info) } } - Stream_Read_UINT32(s, info->sessionId); /* SessionId (4 bytes) */ - Stream_Read_UINT32(s, cbDomain); /* cbDomain (4 bytes) */ - Stream_Read_UINT32(s, cbUserName); /* cbUserName (4 bytes) */ + Stream_Read_UINT32(s, info->sessionId); /* SessionId (4 bytes) */ + Stream_Read_UINT32(s, cbDomain); /* cbDomain (4 bytes) */ + Stream_Read_UINT32(s, cbUserName); /* cbUserName (4 bytes) */ Stream_Seek(s, logonInfoV2ReservedSize); /* pad (558 bytes) */ /* cbDomain is the size in bytes of the Unicode character data in the Domain field. diff --git a/libfreerdp/core/input.c b/libfreerdp/core/input.c index ac862d75e..88ee4f3bf 100644 --- a/libfreerdp/core/input.c +++ b/libfreerdp/core/input.c @@ -45,7 +45,7 @@ static void rdp_write_client_input_pdu_header(wStream* s, UINT16 number) WINPR_ASSERT(s); WINPR_ASSERT(Stream_GetRemainingCapacity(s) >= 4); Stream_Write_UINT16(s, number); /* numberEvents (2 bytes) */ - Stream_Write_UINT16(s, 0); /* pad2Octets (2 bytes) */ + Stream_Write_UINT16(s, 0); /* pad2Octets (2 bytes) */ } static void rdp_write_input_event_header(wStream* s, UINT32 time, UINT16 type) diff --git a/libfreerdp/core/orders.c b/libfreerdp/core/orders.c index edf2fafa1..b5851cfed 100644 --- a/libfreerdp/core/orders.c +++ b/libfreerdp/core/orders.c @@ -3792,9 +3792,9 @@ static BOOL update_recv_secondary_order(rdpUpdate* update, wStream* s, BYTE flag if (!Stream_CheckAndLogRequiredLength(TAG, s, 5)) return FALSE; - Stream_Read_INT16(s, orderLength); /* orderLength (2 bytes signed) */ - Stream_Read_UINT16(s, extraFlags); /* extraFlags (2 bytes) */ - Stream_Read_UINT8(s, orderType); /* orderType (1 byte) */ + Stream_Read_INT16(s, orderLength); /* orderLength (2 bytes signed) */ + Stream_Read_UINT16(s, extraFlags); /* extraFlags (2 bytes) */ + Stream_Read_UINT8(s, orderType); /* orderType (1 byte) */ start = Stream_GetPosition(s); name = secondary_order_string(orderType); diff --git a/libfreerdp/core/rdp.c b/libfreerdp/core/rdp.c index e3c90b2bf..335446339 100644 --- a/libfreerdp/core/rdp.c +++ b/libfreerdp/core/rdp.c @@ -944,11 +944,11 @@ static BOOL rdp_recv_monitor_layout_pdu(rdpRdp* rdp, wStream* s) for (monitor = monitorDefArray, index = 0; index < monitorCount; index++, monitor++) { - Stream_Read_INT32(s, monitor->left); /* left (4 bytes) */ - Stream_Read_INT32(s, monitor->top); /* top (4 bytes) */ - Stream_Read_INT32(s, monitor->right); /* right (4 bytes) */ - Stream_Read_INT32(s, monitor->bottom); /* bottom (4 bytes) */ - Stream_Read_UINT32(s, monitor->flags); /* flags (4 bytes) */ + Stream_Read_INT32(s, monitor->left); /* left (4 bytes) */ + Stream_Read_INT32(s, monitor->top); /* top (4 bytes) */ + Stream_Read_INT32(s, monitor->right); /* right (4 bytes) */ + Stream_Read_INT32(s, monitor->bottom); /* bottom (4 bytes) */ + Stream_Read_UINT32(s, monitor->flags); /* flags (4 bytes) */ } IFCALLRET(rdp->update->RemoteMonitors, ret, rdp->context, monitorCount, monitorDefArray); diff --git a/libfreerdp/core/redirection.c b/libfreerdp/core/redirection.c index 2a39ac23b..c47d60a62 100644 --- a/libfreerdp/core/redirection.c +++ b/libfreerdp/core/redirection.c @@ -203,7 +203,6 @@ int rdp_redirection_apply_settings(rdpRdp* rdp) if (!freerdp_settings_set_pointer_len(settings, FreeRDP_RedirectionPassword, redirection->Password, redirection->PasswordLength)) return -1; - } if (settings->RedirectionFlags & LB_CLIENT_TSV_URL) diff --git a/libfreerdp/core/server.c b/libfreerdp/core/server.c index 410a936cb..e33bb5abf 100644 --- a/libfreerdp/core/server.c +++ b/libfreerdp/core/server.c @@ -300,13 +300,13 @@ static BOOL wts_read_drdynvc_pdu(rdpPeerChannel* channel) BOOL haveChannelId; switch (Cmd) { - case SOFT_SYNC_REQUEST_PDU: - case SOFT_SYNC_RESPONSE_PDU: - haveChannelId = FALSE; - break; - default: - haveChannelId = TRUE; - break; + case SOFT_SYNC_REQUEST_PDU: + case SOFT_SYNC_RESPONSE_PDU: + haveChannelId = FALSE; + break; + default: + haveChannelId = TRUE; + break; } if (haveChannelId) @@ -347,7 +347,8 @@ static BOOL wts_read_drdynvc_pdu(rdpPeerChannel* channel) break; case SOFT_SYNC_RESPONSE_PDU: - WLog_ERR(TAG, "SoftSync response not handled yet(and rather strange to receive that packet as our code doesn't send SoftSync requests"); + WLog_ERR(TAG, "SoftSync response not handled yet(and rather strange to receive " + "that packet as our code doesn't send SoftSync requests"); break; case SOFT_SYNC_REQUEST_PDU: diff --git a/libfreerdp/core/server.h b/libfreerdp/core/server.h index 821baed62..559ef78b5 100644 --- a/libfreerdp/core/server.h +++ b/libfreerdp/core/server.h @@ -80,7 +80,7 @@ struct WTSVirtualChannelManager BYTE drdynvc_state; LONG dvc_channel_id_seq; - psDVCCreationStatusCallback dvc_creation_status; + psDVCCreationStatusCallback dvc_creation_status; void* dvc_creation_status_userdata; wArrayList* dynamicVirtualChannels; diff --git a/libfreerdp/core/tcp.c b/libfreerdp/core/tcp.c index 14c8f5a5f..718b2a4ac 100644 --- a/libfreerdp/core/tcp.c +++ b/libfreerdp/core/tcp.c @@ -207,53 +207,53 @@ static long transport_bio_simple_ctrl(BIO* bio, int cmd, long arg1, void* arg2) case BIO_C_SET_NONBLOCK: { #ifndef _WIN32 - int flags; - flags = fcntl((int)ptr->socket, F_GETFL); + int flags; + flags = fcntl((int)ptr->socket, F_GETFL); - if (flags == -1) - return 0; + if (flags == -1) + return 0; - if (arg1) - fcntl((int)ptr->socket, F_SETFL, flags | O_NONBLOCK); - else - fcntl((int)ptr->socket, F_SETFL, flags & ~(O_NONBLOCK)); + if (arg1) + fcntl((int)ptr->socket, F_SETFL, flags | O_NONBLOCK); + else + fcntl((int)ptr->socket, F_SETFL, flags & ~(O_NONBLOCK)); #else - /* the internal socket is always non-blocking */ + /* the internal socket is always non-blocking */ #endif - return 1; + return 1; } case BIO_C_WAIT_READ: { int timeout = (int)arg1; int sockfd = (int)ptr->socket; #ifdef HAVE_POLL_H - struct pollfd pollset; - pollset.fd = sockfd; - pollset.events = POLLIN; - pollset.revents = 0; + struct pollfd pollset; + pollset.fd = sockfd; + pollset.events = POLLIN; + pollset.revents = 0; - do - { - status = poll(&pollset, 1, timeout); - } while ((status < 0) && (errno == EINTR)); + do + { + status = poll(&pollset, 1, timeout); + } while ((status < 0) && (errno == EINTR)); #else - fd_set rset; - struct timeval tv; - FD_ZERO(&rset); - FD_SET(sockfd, &rset); + fd_set rset; + struct timeval tv; + FD_ZERO(&rset); + FD_SET(sockfd, &rset); - if (timeout) - { - tv.tv_sec = timeout / 1000; - tv.tv_usec = (timeout % 1000) * 1000; - } + if (timeout) + { + tv.tv_sec = timeout / 1000; + tv.tv_usec = (timeout % 1000) * 1000; + } - do - { - status = select(sockfd + 1, &rset, NULL, NULL, timeout ? &tv : NULL); - } while ((status < 0) && (errno == EINTR)); + do + { + status = select(sockfd + 1, &rset, NULL, NULL, timeout ? &tv : NULL); + } while ((status < 0) && (errno == EINTR)); #endif } @@ -263,32 +263,32 @@ static long transport_bio_simple_ctrl(BIO* bio, int cmd, long arg1, void* arg2) int timeout = (int)arg1; int sockfd = (int)ptr->socket; #ifdef HAVE_POLL_H - struct pollfd pollset; - pollset.fd = sockfd; - pollset.events = POLLOUT; - pollset.revents = 0; + struct pollfd pollset; + pollset.fd = sockfd; + pollset.events = POLLOUT; + pollset.revents = 0; - do - { - status = poll(&pollset, 1, timeout); - } while ((status < 0) && (errno == EINTR)); + do + { + status = poll(&pollset, 1, timeout); + } while ((status < 0) && (errno == EINTR)); #else - fd_set rset; - struct timeval tv; - FD_ZERO(&rset); - FD_SET(sockfd, &rset); + fd_set rset; + struct timeval tv; + FD_ZERO(&rset); + FD_SET(sockfd, &rset); - if (timeout) - { - tv.tv_sec = timeout / 1000; - tv.tv_usec = (timeout % 1000) * 1000; - } + if (timeout) + { + tv.tv_sec = timeout / 1000; + tv.tv_usec = (timeout % 1000) * 1000; + } - do - { - status = select(sockfd + 1, NULL, &rset, NULL, timeout ? &tv : NULL); - } while ((status < 0) && (errno == EINTR)); + do + { + status = select(sockfd + 1, NULL, &rset, NULL, timeout ? &tv : NULL); + } while ((status < 0) && (errno == EINTR)); #endif } diff --git a/libfreerdp/core/test/TestConnect.c b/libfreerdp/core/test/TestConnect.c index aa6c3e95b..d14f188fe 100644 --- a/libfreerdp/core/test/TestConnect.c +++ b/libfreerdp/core/test/TestConnect.c @@ -57,7 +57,7 @@ finish: static int testTimeout(int port) { - const DWORD timeout = 200; + const DWORD timeout = 200; DWORD start, end, diff; char arg1[] = "/v:192.0.2.1:XXXXX"; char* argv[] = { "test", "/v:192.0.2.1:XXXXX" }; diff --git a/libfreerdp/core/tscredentials.h b/libfreerdp/core/tscredentials.h index ae42b23e6..aa973450c 100644 --- a/libfreerdp/core/tscredentials.h +++ b/libfreerdp/core/tscredentials.h @@ -13,13 +13,15 @@ #include -typedef struct { +typedef struct +{ UINT32 credType; size_t credentialsLen; BYTE* credentials; } TSCredentials_t; -typedef struct { +typedef struct +{ size_t domainNameLen; BYTE* domainName; size_t userNameLen; @@ -28,7 +30,8 @@ typedef struct { BYTE* password; } TSPasswordCreds_t; -typedef struct { +typedef struct +{ UINT32 keySpec; char* cardName; char* readerName; @@ -36,21 +39,24 @@ typedef struct { char* cspName; } TSCspDataDetail_t; -typedef struct { +typedef struct +{ char* pin; TSCspDataDetail_t* cspData; char* userHint; char* domainHint; } TSSmartCardCreds_t; -typedef struct { +typedef struct +{ size_t packageNameLen; BYTE* packageName; size_t credBufferLen; BYTE* credBuffer; } TSRemoteGuardPackageCred_t; -typedef struct { +typedef struct +{ TSRemoteGuardPackageCred_t* logonCred; size_t supplementalCredsItems; TSRemoteGuardPackageCred_t* supplementalCreds; @@ -60,54 +66,67 @@ size_t ber_sizeof_nla_TSCredentials_content(const TSCredentials_t* item); size_t ber_sizeof_nla_TSCredentials(const TSCredentials_t* item); size_t ber_sizeof_contextual_nla_TSCredentials(const TSCredentials_t* item); void nla_TSCredentials_free(TSCredentials_t** pitem); -size_t ber_write_nla_TSCredentials(wStream *s, const TSCredentials_t* item); -size_t ber_write_contextual_nla_TSCredentials(wStream *s, BYTE tag, const TSCredentials_t* item); -BOOL ber_read_nla_TSCredentials(wStream *s, TSCredentials_t** pret); +size_t ber_write_nla_TSCredentials(wStream* s, const TSCredentials_t* item); +size_t ber_write_contextual_nla_TSCredentials(wStream* s, BYTE tag, const TSCredentials_t* item); +BOOL ber_read_nla_TSCredentials(wStream* s, TSCredentials_t** pret); size_t ber_sizeof_nla_TSPasswordCreds_content(const TSPasswordCreds_t* item); size_t ber_sizeof_nla_TSPasswordCreds(const TSPasswordCreds_t* item); size_t ber_sizeof_contextual_nla_TSPasswordCreds(const TSPasswordCreds_t* item); void nla_TSPasswordCreds_free(TSPasswordCreds_t** pitem); -size_t ber_write_nla_TSPasswordCreds(wStream *s, const TSPasswordCreds_t* item); -size_t ber_write_contextual_nla_TSPasswordCreds(wStream *s, BYTE tag, const TSPasswordCreds_t* item); -BOOL ber_read_nla_TSPasswordCreds(wStream *s, TSPasswordCreds_t** pret); +size_t ber_write_nla_TSPasswordCreds(wStream* s, const TSPasswordCreds_t* item); +size_t ber_write_contextual_nla_TSPasswordCreds(wStream* s, BYTE tag, + const TSPasswordCreds_t* item); +BOOL ber_read_nla_TSPasswordCreds(wStream* s, TSPasswordCreds_t** pret); size_t ber_sizeof_nla_TSCspDataDetail_content(const TSCspDataDetail_t* item); size_t ber_sizeof_nla_TSCspDataDetail(const TSCspDataDetail_t* item); size_t ber_sizeof_contextual_nla_TSCspDataDetail(const TSCspDataDetail_t* item); void nla_TSCspDataDetail_free(TSCspDataDetail_t** pitem); -size_t ber_write_nla_TSCspDataDetail(wStream *s, const TSCspDataDetail_t* item); -size_t ber_write_contextual_nla_TSCspDataDetail(wStream *s, BYTE tag, const TSCspDataDetail_t* item); -BOOL ber_read_nla_TSCspDataDetail(wStream *s, TSCspDataDetail_t** pret); +size_t ber_write_nla_TSCspDataDetail(wStream* s, const TSCspDataDetail_t* item); +size_t ber_write_contextual_nla_TSCspDataDetail(wStream* s, BYTE tag, + const TSCspDataDetail_t* item); +BOOL ber_read_nla_TSCspDataDetail(wStream* s, TSCspDataDetail_t** pret); size_t ber_sizeof_nla_TSSmartCardCreds_content(const TSSmartCardCreds_t* item); size_t ber_sizeof_nla_TSSmartCardCreds(const TSSmartCardCreds_t* item); size_t ber_sizeof_contextual_nla_TSSmartCardCreds(const TSSmartCardCreds_t* item); void nla_TSSmartCardCreds_free(TSSmartCardCreds_t** pitem); -size_t ber_write_nla_TSSmartCardCreds(wStream *s, const TSSmartCardCreds_t* item); -size_t ber_write_contextual_nla_TSSmartCardCreds(wStream *s, BYTE tag, const TSSmartCardCreds_t* item); -BOOL ber_read_nla_TSSmartCardCreds(wStream *s, TSSmartCardCreds_t** pret); +size_t ber_write_nla_TSSmartCardCreds(wStream* s, const TSSmartCardCreds_t* item); +size_t ber_write_contextual_nla_TSSmartCardCreds(wStream* s, BYTE tag, + const TSSmartCardCreds_t* item); +BOOL ber_read_nla_TSSmartCardCreds(wStream* s, TSSmartCardCreds_t** pret); size_t ber_sizeof_nla_TSRemoteGuardPackageCred_content(const TSRemoteGuardPackageCred_t* item); size_t ber_sizeof_nla_TSRemoteGuardPackageCred(const TSRemoteGuardPackageCred_t* item); size_t ber_sizeof_contextual_nla_TSRemoteGuardPackageCred(const TSRemoteGuardPackageCred_t* item); void nla_TSRemoteGuardPackageCred_free(TSRemoteGuardPackageCred_t** pitem); -size_t ber_write_nla_TSRemoteGuardPackageCred(wStream *s, const TSRemoteGuardPackageCred_t* item); -size_t ber_write_contextual_nla_TSRemoteGuardPackageCred(wStream *s, BYTE tag, const TSRemoteGuardPackageCred_t* item); -BOOL ber_read_nla_TSRemoteGuardPackageCred(wStream *s, TSRemoteGuardPackageCred_t** pret); -size_t ber_sizeof_nla_TSRemoteGuardPackageCred_array_content(const TSRemoteGuardPackageCred_t* item, size_t nitems); -size_t ber_sizeof_nla_TSRemoteGuardPackageCred_array(const TSRemoteGuardPackageCred_t* item, size_t nitems); -size_t ber_sizeof_contextual_nla_TSRemoteGuardPackageCred_array(const TSRemoteGuardPackageCred_t* item, size_t nitems); -size_t ber_write_nla_TSRemoteGuardPackageCred_array(wStream* s, const TSRemoteGuardPackageCred_t* item, size_t nitems); -size_t ber_write_contextual_nla_TSRemoteGuardPackageCred_array(wStream* s, BYTE tag, const TSRemoteGuardPackageCred_t* item, size_t nitems); -BOOL ber_read_nla_TSRemoteGuardPackageCred_array(wStream* s, TSRemoteGuardPackageCred_t** item, size_t* nitems); +size_t ber_write_nla_TSRemoteGuardPackageCred(wStream* s, const TSRemoteGuardPackageCred_t* item); +size_t ber_write_contextual_nla_TSRemoteGuardPackageCred(wStream* s, BYTE tag, + const TSRemoteGuardPackageCred_t* item); +BOOL ber_read_nla_TSRemoteGuardPackageCred(wStream* s, TSRemoteGuardPackageCred_t** pret); +size_t ber_sizeof_nla_TSRemoteGuardPackageCred_array_content(const TSRemoteGuardPackageCred_t* item, + size_t nitems); +size_t ber_sizeof_nla_TSRemoteGuardPackageCred_array(const TSRemoteGuardPackageCred_t* item, + size_t nitems); +size_t +ber_sizeof_contextual_nla_TSRemoteGuardPackageCred_array(const TSRemoteGuardPackageCred_t* item, + size_t nitems); +size_t ber_write_nla_TSRemoteGuardPackageCred_array(wStream* s, + const TSRemoteGuardPackageCred_t* item, + size_t nitems); +size_t ber_write_contextual_nla_TSRemoteGuardPackageCred_array( + wStream* s, BYTE tag, const TSRemoteGuardPackageCred_t* item, size_t nitems); +BOOL ber_read_nla_TSRemoteGuardPackageCred_array(wStream* s, TSRemoteGuardPackageCred_t** item, + size_t* nitems); size_t ber_sizeof_nla_TSRemoteGuardCreds_content(const TSRemoteGuardCreds_t* item); size_t ber_sizeof_nla_TSRemoteGuardCreds(const TSRemoteGuardCreds_t* item); size_t ber_sizeof_contextual_nla_TSRemoteGuardCreds(const TSRemoteGuardCreds_t* item); void nla_TSRemoteGuardCreds_free(TSRemoteGuardCreds_t** pitem); -size_t ber_write_nla_TSRemoteGuardCreds(wStream *s, const TSRemoteGuardCreds_t* item); -size_t ber_write_contextual_nla_TSRemoteGuardCreds(wStream *s, BYTE tag, const TSRemoteGuardCreds_t* item); -BOOL ber_read_nla_TSRemoteGuardCreds(wStream *s, TSRemoteGuardCreds_t** pret); +size_t ber_write_nla_TSRemoteGuardCreds(wStream* s, const TSRemoteGuardCreds_t* item); +size_t ber_write_contextual_nla_TSRemoteGuardCreds(wStream* s, BYTE tag, + const TSRemoteGuardCreds_t* item); +BOOL ber_read_nla_TSRemoteGuardCreds(wStream* s, TSRemoteGuardCreds_t** pret); #endif /* LIBFREERDP_CORE_CREDSSP_ASN1_H */ diff --git a/libfreerdp/gdi/bitmap.c b/libfreerdp/gdi/bitmap.c index 2be7fb3ca..e33e67270 100644 --- a/libfreerdp/gdi/bitmap.c +++ b/libfreerdp/gdi/bitmap.c @@ -155,8 +155,8 @@ HGDI_BITMAP gdi_CreateCompatibleBitmap(HGDI_DC hdc, UINT32 nWidth, UINT32 nHeigh hBitmap->format = hdc->format; hBitmap->width = nWidth; hBitmap->height = nHeight; - hBitmap->data = - winpr_aligned_malloc(nWidth * nHeight * FreeRDPGetBytesPerPixel(hBitmap->format) * 1ULL, 16); + hBitmap->data = winpr_aligned_malloc( + nWidth * nHeight * FreeRDPGetBytesPerPixel(hBitmap->format) * 1ULL, 16); hBitmap->free = winpr_aligned_free; if (!hBitmap->data) diff --git a/libfreerdp/gdi/gfx.c b/libfreerdp/gdi/gfx.c index a58c508f6..bcca85046 100644 --- a/libfreerdp/gdi/gfx.c +++ b/libfreerdp/gdi/gfx.c @@ -1480,8 +1480,10 @@ static UINT gdi_CacheImportReply(RdpgfxClientContext* context, error = context->SetCacheSlotData(context, cacheSlot, (void*)cacheEntry); - if (error) { - WLog_ERR(TAG, "CacheImportReply: SetCacheSlotData failed with error %" PRIu32 "", error); + if (error) + { + WLog_ERR(TAG, "CacheImportReply: SetCacheSlotData failed with error %" PRIu32 "", + error); break; } } @@ -1517,8 +1519,9 @@ static UINT gdi_ImportCacheEntry(RdpgfxClientContext* context, UINT16 cacheSlot, } if (!freerdp_image_copy(cacheEntry->data, cacheEntry->format, cacheEntry->scanline, 0, 0, - cacheEntry->width, cacheEntry->height, importCacheEntry->data, - PIXEL_FORMAT_BGRX32, 0, 0, 0, NULL, FREERDP_FLIP_NONE)) { + cacheEntry->width, cacheEntry->height, importCacheEntry->data, + PIXEL_FORMAT_BGRX32, 0, 0, 0, NULL, FREERDP_FLIP_NONE)) + { return ERROR_INTERNAL_ERROR; } @@ -1551,7 +1554,6 @@ static UINT gdi_ExportCacheEntry(RdpgfxClientContext* context, UINT16 cacheSlot, return ERROR_NOT_FOUND; } - /** * Function description * diff --git a/libfreerdp/gdi/graphics.c b/libfreerdp/gdi/graphics.c index ceebc34be..b57b0c65e 100644 --- a/libfreerdp/gdi/graphics.c +++ b/libfreerdp/gdi/graphics.c @@ -162,8 +162,8 @@ static BOOL gdi_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, const return FALSE; if (!rfx_process_message(context->codecs->rfx, pSrcData, SrcSize, bitmap->left, - bitmap->top, bitmap->data, bitmap->format, gdi->stride, gdi->height, - &invalidRegion)) + bitmap->top, bitmap->data, bitmap->format, gdi->stride, + gdi->height, &invalidRegion)) { WLog_ERR(TAG, "rfx_process_message failure"); return FALSE; @@ -188,8 +188,7 @@ static BOOL gdi_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, const } return freerdp_image_copy(bitmap->data, bitmap->format, 0, 0, 0, DstWidth, DstHeight, - pSrcData, PIXEL_FORMAT_XRGB32, 0, 0, 0, - &gdi->palette, + pSrcData, PIXEL_FORMAT_XRGB32, 0, 0, 0, &gdi->palette, FREERDP_FLIP_VERTICAL); } else if (bpp < 32) diff --git a/libfreerdp/utils/cliprdr_utils.c b/libfreerdp/utils/cliprdr_utils.c index eaba15bbd..0ed8d41a5 100644 --- a/libfreerdp/utils/cliprdr_utils.c +++ b/libfreerdp/utils/cliprdr_utils.c @@ -101,7 +101,7 @@ UINT cliprdr_parse_file_list(const BYTE* format_data, UINT32 format_data_length, UINT64 tmp; FILEDESCRIPTORW* file = &((*file_descriptor_array)[i]); - Stream_Read_UINT32(s, file->dwFlags); /* flags (4 bytes) */ + Stream_Read_UINT32(s, file->dwFlags); /* flags (4 bytes) */ Stream_Read_UINT32(s, file->clsid.Data1); Stream_Read_UINT16(s, file->clsid.Data2); Stream_Read_UINT16(s, file->clsid.Data3); diff --git a/libfreerdp/utils/stopwatch.c b/libfreerdp/utils/stopwatch.c index 792aef8ce..10a2079aa 100644 --- a/libfreerdp/utils/stopwatch.c +++ b/libfreerdp/utils/stopwatch.c @@ -88,7 +88,7 @@ void stopwatch_reset(STOPWATCH* stopwatch) double stopwatch_get_elapsed_time_in_seconds(STOPWATCH* stopwatch) { - return (stopwatch->elapsed / 1000000.0); + return (stopwatch->elapsed / 1000000.0); } void stopwatch_get_elapsed_time_in_useconds(STOPWATCH* stopwatch, UINT32* sec, UINT32* usec) diff --git a/libfreerdp/utils/test/TestPodArrays.c b/libfreerdp/utils/test/TestPodArrays.c index 9af89deee..b13def65c 100644 --- a/libfreerdp/utils/test/TestPodArrays.c +++ b/libfreerdp/utils/test/TestPodArrays.c @@ -18,14 +18,14 @@ */ #include -static BOOL cb_compute_sum(UINT32 *v, void* target) +static BOOL cb_compute_sum(UINT32* v, void* target) { UINT32* ret = (UINT32*)target; *ret += *v; return TRUE; } -static BOOL cb_stop_at_5(UINT32 *v, void* target) +static BOOL cb_stop_at_5(UINT32* v, void* target) { UINT32* ret = (UINT32*)target; *ret += 1; @@ -45,20 +45,19 @@ static BOOL cb_reset_after_1(UINT32* v, void* target) return TRUE; } -typedef struct { +typedef struct +{ UINT32 v1; UINT16 v2; } BasicStruct; -static BOOL cb_basic_struct(BasicStruct *v, void* target) +static BOOL cb_basic_struct(BasicStruct* v, void* target) { return (v->v1 == 1) && (v->v2 == 2); } - POD_ARRAYS_IMPL(BasicStruct, basicstruct); - int TestPodArrays(int argc, char* argv[]) { UINT32 i, sum, foreach_index; diff --git a/server/proxy/channels/pf_channel_drdynvc.c b/server/proxy/channels/pf_channel_drdynvc.c index 772792326..47b647a5a 100644 --- a/server/proxy/channels/pf_channel_drdynvc.c +++ b/server/proxy/channels/pf_channel_drdynvc.c @@ -26,18 +26,16 @@ #include "../proxy_modules.h" #include "../pf_utils.h" - #define TAG PROXY_TAG("drdynvc") /** @brief channel opened status */ typedef enum { - CHANNEL_OPENSTATE_WAITING_OPEN_STATUS, /*!< dynamic channel waiting for create response */ - CHANNEL_OPENSTATE_OPENED, /*!< opened */ - CHANNEL_OPENSTATE_CLOSED /*!< dynamic channel has been opened then closed */ + CHANNEL_OPENSTATE_WAITING_OPEN_STATUS, /*!< dynamic channel waiting for create response */ + CHANNEL_OPENSTATE_OPENED, /*!< opened */ + CHANNEL_OPENSTATE_CLOSED /*!< dynamic channel has been opened then closed */ } PfDynChannelOpenStatus; - /** @brief tracker state for a drdynvc stream */ typedef struct { @@ -50,71 +48,72 @@ typedef struct p_server_dynamic_channel_context pServerDynamicChannelContext; struct p_server_dynamic_channel_context { - char* channel_name; - UINT32 channel_id; - PfDynChannelOpenStatus openStatus; - pf_utils_channel_mode channelMode; - DynChannelTrackerState backTracker; - DynChannelTrackerState frontTracker; + char* channel_name; + UINT32 channel_id; + PfDynChannelOpenStatus openStatus; + pf_utils_channel_mode channelMode; + DynChannelTrackerState backTracker; + DynChannelTrackerState frontTracker; }; /** @brief context for the dynamic channel */ typedef struct { - wHashTable *channels; - ChannelStateTracker* backTracker; - ChannelStateTracker* frontTracker; + wHashTable* channels; + ChannelStateTracker* backTracker; + ChannelStateTracker* frontTracker; } DynChannelContext; - /** @brief result of dynamic channel packet treatment */ -typedef enum { - DYNCVC_READ_OK, /*!< read was OK */ - DYNCVC_READ_ERROR, /*!< an error happened during read */ - DYNCVC_READ_INCOMPLETE /*!< missing bytes to read the complete packet */ +typedef enum +{ + DYNCVC_READ_OK, /*!< read was OK */ + DYNCVC_READ_ERROR, /*!< an error happened during read */ + DYNCVC_READ_INCOMPLETE /*!< missing bytes to read the complete packet */ } DynvcReadResult; -static pServerDynamicChannelContext* DynamicChannelContext_new(pServerContext* ps, const char* name, UINT32 id) +static pServerDynamicChannelContext* DynamicChannelContext_new(pServerContext* ps, const char* name, + UINT32 id) { - pServerDynamicChannelContext* ret = calloc(1, sizeof(*ret)); - if (!ret) - { - PROXY_LOG_ERR(TAG, ps, "error allocating dynamic channel context '%s'", name); - return NULL; - } + pServerDynamicChannelContext* ret = calloc(1, sizeof(*ret)); + if (!ret) + { + PROXY_LOG_ERR(TAG, ps, "error allocating dynamic channel context '%s'", name); + return NULL; + } - ret->channel_id = id; - ret->channel_name = _strdup(name); - if (!ret->channel_name) - { - PROXY_LOG_ERR(TAG, ps, "error allocating name in dynamic channel context '%s'", name); - free(ret); - return NULL; - } + ret->channel_id = id; + ret->channel_name = _strdup(name); + if (!ret->channel_name) + { + PROXY_LOG_ERR(TAG, ps, "error allocating name in dynamic channel context '%s'", name); + free(ret); + return NULL; + } - ret->channelMode = pf_utils_get_channel_mode(ps->pdata->config, name); - ret->openStatus = CHANNEL_OPENSTATE_OPENED; - return ret; + ret->channelMode = pf_utils_get_channel_mode(ps->pdata->config, name); + ret->openStatus = CHANNEL_OPENSTATE_OPENED; + return ret; } static void DynamicChannelContext_free(pServerDynamicChannelContext* c) { - if (c) - { - free(c->channel_name); - free(c); - } + if (c) + { + free(c->channel_name); + free(c); + } } static UINT32 ChannelId_Hash(const void* key) { - const UINT32* v = (const UINT32*)key; - return *v; + const UINT32* v = (const UINT32*)key; + return *v; } static BOOL ChannelId_Compare(const UINT32* v1, const UINT32* v2) { - return (*v1 == *v2); + return (*v1 == *v2); } static DynvcReadResult dynvc_read_varInt(wStream* s, size_t len, UINT64* varInt, BOOL last) @@ -170,7 +169,8 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir const char* direction = isBackData ? "B->F" : "F->B"; - s = Stream_StaticConstInit(&sbuffer, Stream_Buffer(tracker->currentPacket), Stream_GetPosition(tracker->currentPacket)); + s = Stream_StaticConstInit(&sbuffer, Stream_Buffer(tracker->currentPacket), + Stream_GetPosition(tracker->currentPacket)); if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) return PF_CHANNEL_RESULT_ERROR; @@ -179,22 +179,22 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir switch (cmd) { - case CREATE_REQUEST_PDU: - case CLOSE_REQUEST_PDU: - case DATA_PDU: - case DATA_COMPRESSED_PDU: - haveChannelId = TRUE; - haveLength = FALSE; - break; - case DATA_FIRST_PDU: - case DATA_FIRST_COMPRESSED_PDU: - haveLength = TRUE; - haveChannelId = TRUE; - break; - default: - haveChannelId = FALSE; - haveLength = FALSE; - break; + case CREATE_REQUEST_PDU: + case CLOSE_REQUEST_PDU: + case DATA_PDU: + case DATA_COMPRESSED_PDU: + haveChannelId = TRUE; + haveLength = FALSE; + break; + case DATA_FIRST_PDU: + case DATA_FIRST_COMPRESSED_PDU: + haveLength = TRUE; + haveChannelId = TRUE; + break; + default: + haveChannelId = FALSE; + haveLength = FALSE; + break; } if (haveChannelId) @@ -203,25 +203,27 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir switch (dynvc_read_varInt(s, cbId, &dynChannelId, lastPacket)) { - case DYNCVC_READ_OK: - break; - case DYNCVC_READ_INCOMPLETE: - return PF_CHANNEL_RESULT_DROP; - case DYNCVC_READ_ERROR: - default: - WLog_ERR(TAG, "DynvcTrackerPeekFn: invalid channelId field"); - return PF_CHANNEL_RESULT_ERROR; + case DYNCVC_READ_OK: + break; + case DYNCVC_READ_INCOMPLETE: + return PF_CHANNEL_RESULT_DROP; + case DYNCVC_READ_ERROR: + default: + WLog_ERR(TAG, "DynvcTrackerPeekFn: invalid channelId field"); + return PF_CHANNEL_RESULT_ERROR; } /* we always try to retrieve the dynamic channel in case it would have been opened * and closed */ - dynChannel = (pServerDynamicChannelContext*)HashTable_GetItemValue(dynChannelContext->channels, &dynChannelId); + dynChannel = (pServerDynamicChannelContext*)HashTable_GetItemValue( + dynChannelContext->channels, &dynChannelId); if (cmd != CREATE_REQUEST_PDU || !isBackData) { if (!dynChannel) { - /* we've not found the target channel, so we drop this chunk, plus all the rest of the packet */ + /* we've not found the target channel, so we drop this chunk, plus all the rest of + * the packet */ tracker->mode = CHANNEL_TRACKER_DROP; return PF_CHANNEL_RESULT_DROP; } @@ -233,21 +235,22 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir BYTE lenLen = (byte0 >> 2) & 0x03; switch (dynvc_read_varInt(s, lenLen, &Length, lastPacket)) { - case DYNCVC_READ_OK: - break; - case DYNCVC_READ_INCOMPLETE: - return PF_CHANNEL_RESULT_DROP; - case DYNCVC_READ_ERROR: - default: - WLog_ERR(TAG, "DynvcTrackerPeekFn: invalid length field"); - return PF_CHANNEL_RESULT_ERROR; + case DYNCVC_READ_OK: + break; + case DYNCVC_READ_INCOMPLETE: + return PF_CHANNEL_RESULT_DROP; + case DYNCVC_READ_ERROR: + default: + WLog_ERR(TAG, "DynvcTrackerPeekFn: invalid length field"); + return PF_CHANNEL_RESULT_ERROR; } } switch (cmd) { case CAPABILITY_REQUEST_PDU: - WLog_DBG(TAG, "DynvcTracker: %s CAPABILITY_%s", direction, isBackData ? "REQUEST" : "RESPONSE"); + WLog_DBG(TAG, "DynvcTracker: %s CAPABILITY_%s", direction, + isBackData ? "REQUEST" : "RESPONSE"); tracker->mode = CHANNEL_TRACKER_PASS; return PF_CHANNEL_RESULT_PASS; @@ -277,8 +280,9 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir dev.flags = flags; dev.total_size = Stream_GetPosition(tracker->currentPacket); - if (!pf_modules_run_filter( - pdata->module, FILTER_TYPE_CLIENT_PASSTHROUGH_DYN_CHANNEL_CREATE, pdata, &dev)) + if (!pf_modules_run_filter(pdata->module, + FILTER_TYPE_CLIENT_PASSTHROUGH_DYN_CHANNEL_CREATE, pdata, + &dev)) return PF_CHANNEL_RESULT_DROP; /* Silently drop */ if (!dynChannel) @@ -290,7 +294,8 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir return PF_CHANNEL_RESULT_ERROR; } - if (!HashTable_Insert(dynChannelContext->channels, &dynChannel->channel_id, dynChannel)) + if (!HashTable_Insert(dynChannelContext->channels, &dynChannel->channel_id, + dynChannel)) { WLog_ERR(TAG, "unable register dynamic channel context data"); DynamicChannelContext_free(dynChannel); @@ -312,8 +317,8 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir if (creationStatus != 0) { - /* we remove it from the channels map, as it happens that server reused channel ids when - * the channel can't be opened + /* we remove it from the channels map, as it happens that server reused channel ids + * when the channel can't be opened */ HashTable_Remove(dynChannelContext->channels, &dynChannel->channel_id); } @@ -329,7 +334,8 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir if (!lastPacket) return PF_CHANNEL_RESULT_DROP; - WLog_DBG(TAG, "DynvcTracker(%s): %s Close request on channel", dynChannel->channel_name, direction); + WLog_DBG(TAG, "DynvcTracker(%s): %s Close request on channel", dynChannel->channel_name, + direction); tracker->mode = CHANNEL_TRACKER_PASS; dynChannel->openStatus = CHANNEL_OPENSTATE_CLOSED; return channelTracker_flushCurrent(tracker, firstPacket, lastPacket, !isBackData); @@ -350,7 +356,7 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir case DATA_FIRST_PDU: case DATA_PDU: /* treat these below */ - trackerState = isBackData ? &dynChannel->backTracker : &dynChannel->frontTracker; + trackerState = isBackData ? &dynChannel->backTracker : &dynChannel->frontTracker; break; case DATA_FIRST_COMPRESSED_PDU: @@ -363,15 +369,16 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir return PF_CHANNEL_RESULT_ERROR; } - if (dynChannel->openStatus != CHANNEL_OPENSTATE_OPENED) - { - WLog_ERR(TAG, "DynvcTracker(%s): channel is not opened", dynChannel->channel_name); - return PF_CHANNEL_RESULT_ERROR; - } + if (dynChannel->openStatus != CHANNEL_OPENSTATE_OPENED) + { + WLog_ERR(TAG, "DynvcTracker(%s): channel is not opened", dynChannel->channel_name); + return PF_CHANNEL_RESULT_ERROR; + } if ((cmd == DATA_FIRST_PDU) || (cmd == DATA_FIRST_COMPRESSED_PDU)) { - WLog_DBG(TAG, "DynvcTracker(%s): %s DATA_FIRST currentPacketLength=%d", dynChannel->channel_name, direction, Length); + WLog_DBG(TAG, "DynvcTracker(%s): %s DATA_FIRST currentPacketLength=%d", + dynChannel->channel_name, direction, Length); trackerState->currentDataLength = Length; trackerState->CurrentDataReceived = 0; trackerState->CurrentDataFragments = 0; @@ -381,10 +388,10 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir { trackerState->CurrentDataFragments++; trackerState->CurrentDataReceived += Stream_GetRemainingLength(s); - WLog_DBG(TAG, "DynvcTracker(%s): %s %s frags=%d received=%d(%d)", dynChannel->channel_name, direction, - cmd == DATA_PDU ? "DATA" : "DATA_FIRST", - trackerState->CurrentDataFragments, trackerState->CurrentDataReceived, - trackerState->currentDataLength); + WLog_DBG(TAG, "DynvcTracker(%s): %s %s frags=%d received=%d(%d)", dynChannel->channel_name, + direction, cmd == DATA_PDU ? "DATA" : "DATA_FIRST", + trackerState->CurrentDataFragments, trackerState->CurrentDataReceived, + trackerState->currentDataLength); } if (cmd == DATA_PDU) @@ -393,7 +400,10 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir { if (trackerState->CurrentDataReceived > trackerState->currentDataLength) { - WLog_ERR(TAG, "DynvcTracker: reassembled packet (%d) is bigger than announced length (%d)", trackerState->CurrentDataReceived, trackerState->currentDataLength); + WLog_ERR( + TAG, + "DynvcTracker: reassembled packet (%d) is bigger than announced length (%d)", + trackerState->CurrentDataReceived, trackerState->currentDataLength); return PF_CHANNEL_RESULT_ERROR; } @@ -411,19 +421,19 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir } } - switch(dynChannel->channelMode) + switch (dynChannel->channelMode) { - case PF_UTILS_CHANNEL_PASSTHROUGH: - return channelTracker_flushCurrent(tracker, firstPacket, lastPacket, !isBackData); - case PF_UTILS_CHANNEL_BLOCK: - tracker->mode = CHANNEL_TRACKER_DROP; - return PF_CHANNEL_RESULT_DROP; - case PF_UTILS_CHANNEL_INTERCEPT: - WLog_DBG(TAG, "TODO: implement intercepted dynamic channel"); - return PF_CHANNEL_RESULT_DROP; - default: - WLog_ERR(TAG, "unknown channel mode"); - return PF_CHANNEL_RESULT_ERROR; + case PF_UTILS_CHANNEL_PASSTHROUGH: + return channelTracker_flushCurrent(tracker, firstPacket, lastPacket, !isBackData); + case PF_UTILS_CHANNEL_BLOCK: + tracker->mode = CHANNEL_TRACKER_DROP; + return PF_CHANNEL_RESULT_DROP; + case PF_UTILS_CHANNEL_INTERCEPT: + WLog_DBG(TAG, "TODO: implement intercepted dynamic channel"); + return PF_CHANNEL_RESULT_DROP; + default: + WLog_ERR(TAG, "unknown channel mode"); + return PF_CHANNEL_RESULT_ERROR; } } @@ -438,9 +448,10 @@ static void DynChannelContext_free(void* context) free(c); } -static DynChannelContext* DynChannelContext_new(proxyData* pdata, pServerStaticChannelContext* channel) +static DynChannelContext* DynChannelContext_new(proxyData* pdata, + pServerStaticChannelContext* channel) { - wObject* obj; + wObject* obj; DynChannelContext* dyn = calloc(1, sizeof(DynChannelContext)); if (!dyn) return FALSE; @@ -457,16 +468,16 @@ static DynChannelContext* DynChannelContext_new(proxyData* pdata, pServerStaticC dyn->channels = HashTable_New(FALSE); if (!dyn->channels) - goto fail; + goto fail; - if (!HashTable_SetHashFunction(dyn->channels, ChannelId_Hash)) - goto fail; + if (!HashTable_SetHashFunction(dyn->channels, ChannelId_Hash)) + goto fail; - obj = HashTable_KeyObject(dyn->channels); - obj->fnObjectEquals = (OBJECT_EQUALS_FN)ChannelId_Compare; + obj = HashTable_KeyObject(dyn->channels); + obj->fnObjectEquals = (OBJECT_EQUALS_FN)ChannelId_Compare; - obj = HashTable_ValueObject(dyn->channels); - obj->fnObjectFree = (OBJECT_FREE_FN)DynamicChannelContext_free; + obj = HashTable_ValueObject(dyn->channels); + obj->fnObjectFree = (OBJECT_FREE_FN)DynamicChannelContext_free; return dyn; @@ -475,9 +486,10 @@ fail: return NULL; } -static PfChannelResult pf_dynvc_back_data(proxyData* pdata, const pServerStaticChannelContext* channel, - const BYTE* xdata, size_t xsize, UINT32 flags, - size_t totalSize) +static PfChannelResult pf_dynvc_back_data(proxyData* pdata, + const pServerStaticChannelContext* channel, + const BYTE* xdata, size_t xsize, UINT32 flags, + size_t totalSize) { WINPR_ASSERT(channel); DynChannelContext* dyn = (DynChannelContext*)channel->context; @@ -486,9 +498,10 @@ static PfChannelResult pf_dynvc_back_data(proxyData* pdata, const pServerStaticC return channelTracker_update(dyn->backTracker, xdata, xsize, flags, totalSize); } -static PfChannelResult pf_dynvc_front_data(proxyData* pdata, const pServerStaticChannelContext* channel, - const BYTE* xdata, size_t xsize, UINT32 flags, - size_t totalSize) +static PfChannelResult pf_dynvc_front_data(proxyData* pdata, + const pServerStaticChannelContext* channel, + const BYTE* xdata, size_t xsize, UINT32 flags, + size_t totalSize) { WINPR_ASSERT(channel); DynChannelContext* dyn = (DynChannelContext*)channel->context; @@ -497,7 +510,6 @@ static PfChannelResult pf_dynvc_front_data(proxyData* pdata, const pServerStatic return channelTracker_update(dyn->frontTracker, xdata, xsize, flags, totalSize); } - BOOL pf_channel_setup_drdynvc(proxyData* pdata, pServerStaticChannelContext* channel) { DynChannelContext* ret = DynChannelContext_new(pdata, channel); diff --git a/server/proxy/channels/pf_channel_drdynvc.h b/server/proxy/channels/pf_channel_drdynvc.h index e8d5a5b4f..b0841439a 100644 --- a/server/proxy/channels/pf_channel_drdynvc.h +++ b/server/proxy/channels/pf_channel_drdynvc.h @@ -21,7 +21,6 @@ #include - BOOL pf_channel_setup_drdynvc(proxyData* pdata, pServerStaticChannelContext* channel); #endif /* SERVER_PROXY_CHANNELS_PF_CHANNEL_DRDYNVC_H_ */ diff --git a/server/proxy/channels/pf_channel_rdpdr.c b/server/proxy/channels/pf_channel_rdpdr.c index aebebf441..a82c6bed9 100644 --- a/server/proxy/channels/pf_channel_rdpdr.c +++ b/server/proxy/channels/pf_channel_rdpdr.c @@ -1714,7 +1714,8 @@ BOOL pf_channel_rdpdr_client_reset(pClientContext* pc) return TRUE; } -static PfChannelResult pf_rdpdr_back_data(proxyData* pdata, const pServerStaticChannelContext* channel, +static PfChannelResult pf_rdpdr_back_data(proxyData* pdata, + const pServerStaticChannelContext* channel, const BYTE* xdata, size_t xsize, UINT32 flags, size_t totalSize) { @@ -1730,7 +1731,8 @@ static PfChannelResult pf_rdpdr_back_data(proxyData* pdata, const pServerStaticC return PF_CHANNEL_RESULT_PASS; } -static PfChannelResult pf_rdpdr_front_data(proxyData* pdata, const pServerStaticChannelContext* channel, +static PfChannelResult pf_rdpdr_front_data(proxyData* pdata, + const pServerStaticChannelContext* channel, const BYTE* xdata, size_t xsize, UINT32 flags, size_t totalSize) { diff --git a/server/proxy/cli/freerdp_proxy.c b/server/proxy/cli/freerdp_proxy.c index f7b251c2e..af1b609e5 100644 --- a/server/proxy/cli/freerdp_proxy.c +++ b/server/proxy/cli/freerdp_proxy.c @@ -109,7 +109,7 @@ int main(int argc, char* argv[]) pf_server_config_dump(argv[2]); status = 0; goto fail; - } + } config_path = argv[1]; } diff --git a/server/proxy/modules/capture/cap_protocol.c b/server/proxy/modules/capture/cap_protocol.c index 59e8f91a7..69c3fbe6d 100644 --- a/server/proxy/modules/capture/cap_protocol.c +++ b/server/proxy/modules/capture/cap_protocol.c @@ -54,12 +54,12 @@ wStream* capture_plugin_create_session_info_packet(pClientContext* pc) if (!s) return NULL; - Stream_Write_UINT16(s, (UINT16)username_length); /* username length (2 bytes) */ - Stream_Write(s, settings->Username, username_length); /* username */ - Stream_Write_UINT32(s, settings->DesktopWidth); /* desktop width (4 bytes) */ - Stream_Write_UINT32(s, settings->DesktopHeight); /* desktop height (4 bytes) */ + Stream_Write_UINT16(s, (UINT16)username_length); /* username length (2 bytes) */ + Stream_Write(s, settings->Username, username_length); /* username */ + Stream_Write_UINT32(s, settings->DesktopWidth); /* desktop width (4 bytes) */ + Stream_Write_UINT32(s, settings->DesktopHeight); /* desktop height (4 bytes) */ Stream_Write_UINT32( s, freerdp_settings_get_uint32(settings, FreeRDP_ColorDepth)); /* color depth (4 bytes) */ - Stream_Write(s, pc->pdata->session_id, PROXY_SESSION_ID_LENGTH); /* color depth (32 bytes) */ + Stream_Write(s, pc->pdata->session_id, PROXY_SESSION_ID_LENGTH); /* color depth (32 bytes) */ return s; } diff --git a/server/proxy/pf_channel.c b/server/proxy/pf_channel.c index c40bd6a07..9f6ede13a 100644 --- a/server/proxy/pf_channel.c +++ b/server/proxy/pf_channel.c @@ -25,7 +25,8 @@ #define TAG PROXY_TAG("channel") -ChannelStateTracker* channelTracker_new(pServerStaticChannelContext* channel, ChannelTrackerPeekFn fn, void* data) +ChannelStateTracker* channelTracker_new(pServerStaticChannelContext* channel, + ChannelTrackerPeekFn fn, void* data) { ChannelStateTracker* ret = calloc(1, sizeof(ChannelStateTracker)); if (!ret) @@ -45,8 +46,8 @@ ChannelStateTracker* channelTracker_new(pServerStaticChannelContext* channel, Ch return ret; } -PfChannelResult channelTracker_update(ChannelStateTracker* tracker, const BYTE* xdata, size_t xsize, UINT32 flags, - size_t totalSize) +PfChannelResult channelTracker_update(ChannelStateTracker* tracker, const BYTE* xdata, size_t xsize, + UINT32 flags, size_t totalSize) { PfChannelResult result; BOOL firstPacket = (flags & CHANNEL_FLAG_FIRST); @@ -54,7 +55,8 @@ PfChannelResult channelTracker_update(ChannelStateTracker* tracker, const BYTE* WINPR_ASSERT(tracker); - WLog_VRB(TAG, "channelTracker_update(%s): sz=%d first=%d last=%d", tracker->channel->channel_name, xsize, firstPacket, lastPacket); + WLog_VRB(TAG, "channelTracker_update(%s): sz=%d first=%d last=%d", + tracker->channel->channel_name, xsize, firstPacket, lastPacket); if (flags & CHANNEL_FLAG_FIRST) { /* don't keep a too big currentPacket */ @@ -79,37 +81,37 @@ PfChannelResult channelTracker_update(ChannelStateTracker* tracker, const BYTE* } if (tracker->currentPacketReceived + xsize > tracker->currentPacketSize) - WLog_INFO(TAG, "cumulated size is bigger (%d) than total size (%d)", tracker->currentPacketReceived + xsize, - tracker->currentPacketSize); + WLog_INFO(TAG, "cumulated size is bigger (%d) than total size (%d)", + tracker->currentPacketReceived + xsize, tracker->currentPacketSize); tracker->currentPacketReceived += xsize; tracker->currentPacketFragments++; - switch (tracker->mode) { - case CHANNEL_TRACKER_PEEK: - if (!Stream_EnsureRemainingCapacity(tracker->currentPacket, xsize)) - return PF_CHANNEL_RESULT_ERROR; + case CHANNEL_TRACKER_PEEK: + if (!Stream_EnsureRemainingCapacity(tracker->currentPacket, xsize)) + return PF_CHANNEL_RESULT_ERROR; - Stream_Write(tracker->currentPacket, xdata, xsize); + Stream_Write(tracker->currentPacket, xdata, xsize); - WINPR_ASSERT(tracker->peekFn); - result = tracker->peekFn(tracker, firstPacket, lastPacket); - break; - case CHANNEL_TRACKER_PASS: - result = PF_CHANNEL_RESULT_PASS; - break; - case CHANNEL_TRACKER_DROP: - result = PF_CHANNEL_RESULT_DROP; - break; + WINPR_ASSERT(tracker->peekFn); + result = tracker->peekFn(tracker, firstPacket, lastPacket); + break; + case CHANNEL_TRACKER_PASS: + result = PF_CHANNEL_RESULT_PASS; + break; + case CHANNEL_TRACKER_DROP: + result = PF_CHANNEL_RESULT_DROP; + break; } if (lastPacket) { tracker->mode = CHANNEL_TRACKER_PEEK; if (tracker->currentPacketReceived != tracker->currentPacketSize) - WLog_INFO(TAG, "cumulated size(%d) does not match total size (%d)", tracker->currentPacketReceived, tracker->currentPacketSize); + WLog_INFO(TAG, "cumulated size(%d) does not match total size (%d)", + tracker->currentPacketReceived, tracker->currentPacketSize); } return result; @@ -130,7 +132,8 @@ void channelTracker_free(ChannelStateTracker* t) * the accumulated current packet. */ -PfChannelResult channelTracker_flushCurrent(ChannelStateTracker* t, BOOL first, BOOL last, BOOL toBack) +PfChannelResult channelTracker_flushCurrent(ChannelStateTracker* t, BOOL first, BOOL last, + BOOL toBack) { proxyData* pdata; pServerContext* ps; @@ -141,8 +144,9 @@ PfChannelResult channelTracker_flushCurrent(ChannelStateTracker* t, BOOL first, WINPR_ASSERT(t); - WLog_VRB(TAG, "channelTracker_flushCurrent(%s): %s sz=%d first=%d last=%d", t->channel->channel_name, - direction, Stream_GetPosition(t->currentPacket), first, last); + WLog_VRB(TAG, "channelTracker_flushCurrent(%s): %s sz=%d first=%d last=%d", + t->channel->channel_name, direction, Stream_GetPosition(t->currentPacket), first, + last); if (first) return PF_CHANNEL_RESULT_PASS; @@ -166,81 +170,86 @@ PfChannelResult channelTracker_flushCurrent(ChannelStateTracker* t, BOOL first, if (!pdata->pc->sendChannelData) return PF_CHANNEL_RESULT_ERROR; - return pdata->pc->sendChannelData(pdata->pc, &ev) ? PF_CHANNEL_RESULT_DROP : PF_CHANNEL_RESULT_ERROR; + return pdata->pc->sendChannelData(pdata->pc, &ev) ? PF_CHANNEL_RESULT_DROP + : PF_CHANNEL_RESULT_ERROR; } ps = pdata->ps; - r = ps->context.peer->SendChannelPacket(ps->context.peer, channel->channel_id, t->currentPacketSize, - flags, Stream_Buffer(t->currentPacket), Stream_GetPosition(t->currentPacket)); + r = ps->context.peer->SendChannelPacket( + ps->context.peer, channel->channel_id, t->currentPacketSize, flags, + Stream_Buffer(t->currentPacket), Stream_GetPosition(t->currentPacket)); return r ? PF_CHANNEL_RESULT_DROP : PF_CHANNEL_RESULT_ERROR; } - - -static PfChannelResult pf_channel_generic_back_data(proxyData* pdata, const pServerStaticChannelContext* channel, - const BYTE* xdata, size_t xsize, UINT32 flags, - size_t totalSize) +static PfChannelResult pf_channel_generic_back_data(proxyData* pdata, + const pServerStaticChannelContext* channel, + const BYTE* xdata, size_t xsize, UINT32 flags, + size_t totalSize) { proxyChannelDataEventInfo ev = { 0 }; WINPR_ASSERT(pdata); WINPR_ASSERT(channel); - switch(channel->channelMode) { - case PF_UTILS_CHANNEL_PASSTHROUGH: - ev.channel_id = channel->channel_id; - ev.channel_name = channel->channel_name; - ev.data = xdata; - ev.data_len = xsize; - ev.flags = flags; - ev.total_size = totalSize; + switch (channel->channelMode) + { + case PF_UTILS_CHANNEL_PASSTHROUGH: + ev.channel_id = channel->channel_id; + ev.channel_name = channel->channel_name; + ev.data = xdata; + ev.data_len = xsize; + ev.flags = flags; + ev.total_size = totalSize; - if (!pf_modules_run_filter(pdata->module, FILTER_TYPE_CLIENT_PASSTHROUGH_CHANNEL_DATA, pdata, &ev)) - return PF_CHANNEL_RESULT_DROP; /* Silently drop */ + if (!pf_modules_run_filter(pdata->module, FILTER_TYPE_CLIENT_PASSTHROUGH_CHANNEL_DATA, + pdata, &ev)) + return PF_CHANNEL_RESULT_DROP; /* Silently drop */ - return PF_CHANNEL_RESULT_PASS; + return PF_CHANNEL_RESULT_PASS; - case PF_UTILS_CHANNEL_INTERCEPT: - /* TODO */ - case PF_UTILS_CHANNEL_BLOCK: - default: - return PF_CHANNEL_RESULT_DROP; + case PF_UTILS_CHANNEL_INTERCEPT: + /* TODO */ + case PF_UTILS_CHANNEL_BLOCK: + default: + return PF_CHANNEL_RESULT_DROP; } } -static PfChannelResult pf_channel_generic_front_data(proxyData* pdata, const pServerStaticChannelContext* channel, - const BYTE* xdata, size_t xsize, UINT32 flags, - size_t totalSize) +static PfChannelResult pf_channel_generic_front_data(proxyData* pdata, + const pServerStaticChannelContext* channel, + const BYTE* xdata, size_t xsize, UINT32 flags, + size_t totalSize) { proxyChannelDataEventInfo ev = { 0 }; WINPR_ASSERT(pdata); WINPR_ASSERT(channel); - switch(channel->channelMode) { - case PF_UTILS_CHANNEL_PASSTHROUGH: - ev.channel_id = channel->channel_id; - ev.channel_name = channel->channel_name; - ev.data = xdata; - ev.data_len = xsize; - ev.flags = flags; - ev.total_size = totalSize; + switch (channel->channelMode) + { + case PF_UTILS_CHANNEL_PASSTHROUGH: + ev.channel_id = channel->channel_id; + ev.channel_name = channel->channel_name; + ev.data = xdata; + ev.data_len = xsize; + ev.flags = flags; + ev.total_size = totalSize; - if (!pf_modules_run_filter(pdata->module, FILTER_TYPE_SERVER_PASSTHROUGH_CHANNEL_DATA, pdata, &ev)) - return PF_CHANNEL_RESULT_DROP; /* Silently drop */ + if (!pf_modules_run_filter(pdata->module, FILTER_TYPE_SERVER_PASSTHROUGH_CHANNEL_DATA, + pdata, &ev)) + return PF_CHANNEL_RESULT_DROP; /* Silently drop */ - return PF_CHANNEL_RESULT_PASS; + return PF_CHANNEL_RESULT_PASS; - case PF_UTILS_CHANNEL_INTERCEPT: - /* TODO */ - case PF_UTILS_CHANNEL_BLOCK: - default: - return PF_CHANNEL_RESULT_DROP; + case PF_UTILS_CHANNEL_INTERCEPT: + /* TODO */ + case PF_UTILS_CHANNEL_BLOCK: + default: + return PF_CHANNEL_RESULT_DROP; } } - BOOL pf_channel_setup_generic(pServerStaticChannelContext* channel) { channel->onBackData = pf_channel_generic_back_data; diff --git a/server/proxy/pf_channel.h b/server/proxy/pf_channel.h index e085bf10b..996bd484e 100644 --- a/server/proxy/pf_channel.h +++ b/server/proxy/pf_channel.h @@ -21,7 +21,6 @@ #include - /** @brief operating mode of a channel tracker */ typedef enum { @@ -31,10 +30,12 @@ typedef enum } ChannelTrackerMode; typedef struct _ChannelStateTracker ChannelStateTracker; -typedef PfChannelResult (*ChannelTrackerPeekFn)(ChannelStateTracker* tracker, BOOL first, BOOL lastPacket); +typedef PfChannelResult (*ChannelTrackerPeekFn)(ChannelStateTracker* tracker, BOOL first, + BOOL lastPacket); /** @brief a tracker for channel packets */ -struct _ChannelStateTracker { +struct _ChannelStateTracker +{ pServerStaticChannelContext* channel; ChannelTrackerMode mode; wStream* currentPacket; @@ -43,22 +44,22 @@ struct _ChannelStateTracker { size_t currentPacketFragments; ChannelTrackerPeekFn peekFn; - void *trackerData; + void* trackerData; proxyData* pdata; }; -ChannelStateTracker* channelTracker_new(pServerStaticChannelContext* channel, ChannelTrackerPeekFn fn, void* data); +ChannelStateTracker* channelTracker_new(pServerStaticChannelContext* channel, + ChannelTrackerPeekFn fn, void* data); void channelTracker_free(ChannelStateTracker* t); -PfChannelResult channelTracker_update(ChannelStateTracker* tracker, const BYTE* xdata, size_t xsize, UINT32 flags, - size_t totalSize); - -PfChannelResult channelTracker_flushCurrent(ChannelStateTracker* t, BOOL first, BOOL last, BOOL toFront); +PfChannelResult channelTracker_update(ChannelStateTracker* tracker, const BYTE* xdata, size_t xsize, + UINT32 flags, size_t totalSize); +PfChannelResult channelTracker_flushCurrent(ChannelStateTracker* t, BOOL first, BOOL last, + BOOL toFront); BOOL pf_channel_setup_rdpdr(pServerContext* ps, pServerStaticChannelContext* channel); BOOL pf_channel_setup_generic(pServerStaticChannelContext* channel); - #endif /* SERVER_PROXY_PF_CHANNEL_H_ */ diff --git a/server/proxy/pf_client.c b/server/proxy/pf_client.c index 7fe47e04a..de4763b84 100644 --- a/server/proxy/pf_client.c +++ b/server/proxy/pf_client.c @@ -426,12 +426,12 @@ static BOOL pf_client_receive_channel_data_hook(freerdp* instance, UINT16 channe WINPR_ASSERT(channel->onBackData); switch (channel->onBackData(pdata, channel, xdata, xsize, flags, totalSize)) { - case PF_CHANNEL_RESULT_PASS: - break; - case PF_CHANNEL_RESULT_DROP: - return TRUE; - case PF_CHANNEL_RESULT_ERROR: - return FALSE; + case PF_CHANNEL_RESULT_PASS: + break; + case PF_CHANNEL_RESULT_DROP: + return TRUE; + case PF_CHANNEL_RESULT_ERROR: + return FALSE; } server_channel_id = WTSChannelGetId(ps->context.peer, channel->channel_name); @@ -442,7 +442,8 @@ static BOOL pf_client_receive_channel_data_hook(freerdp* instance, UINT16 channe if (server_channel_id == 0) return TRUE; - return ps->context.peer->SendChannelPacket(ps->context.peer, server_channel_id, totalSize, flags, xdata, xsize); + return ps->context.peer->SendChannelPacket(ps->context.peer, server_channel_id, totalSize, + flags, xdata, xsize); } static BOOL pf_client_on_server_heartbeat(freerdp* instance, BYTE period, BYTE count1, BYTE count2) diff --git a/server/proxy/pf_config.c b/server/proxy/pf_config.c index 9875fb5d0..f4492e7c6 100644 --- a/server/proxy/pf_config.c +++ b/server/proxy/pf_config.c @@ -196,7 +196,6 @@ static BOOL pf_config_load_target(wIniFile* ini, proxyConfig* config) if (!pf_config_get_uint16(ini, "Target", "Port", &config->TargetPort, config->FixedTarget)) return FALSE; - if (config->FixedTarget) { target_value = pf_config_get_str(ini, "Target", "Host", TRUE); diff --git a/server/proxy/pf_context.c b/server/proxy/pf_context.c index 390dbd1f0..51c831673 100644 --- a/server/proxy/pf_context.c +++ b/server/proxy/pf_context.c @@ -46,7 +46,8 @@ static BOOL ChannelId_Compare(const UINT32* v1, const UINT32* v2) return (*v1 == *v2); } -pServerStaticChannelContext* StaticChannelContext_new(pServerContext* ps, const char* name, UINT32 id) +pServerStaticChannelContext* StaticChannelContext_new(pServerContext* ps, const char* name, + UINT32 id) { pServerStaticChannelContext* ret = calloc(1, sizeof(*ret)); if (!ret) @@ -73,7 +74,7 @@ void StaticChannelContext_free(pServerStaticChannelContext* ctx) if (!ctx) return; - IFCALL(ctx->contextDtor,ctx->context); + IFCALL(ctx->contextDtor, ctx->context); free(ctx->channel_name); free(ctx); diff --git a/server/proxy/pf_modules.c b/server/proxy/pf_modules.c index d37cdc849..7dbc2e7f1 100644 --- a/server/proxy/pf_modules.c +++ b/server/proxy/pf_modules.c @@ -317,7 +317,8 @@ BOOL pf_modules_run_filter(proxyModule* module, PF_FILTER_TYPE type, proxyData* static BOOL pf_modules_set_plugin_data(proxyPluginsManager* mgr, const char* plugin_name, proxyData* pdata, void* data) { - union { + union + { const char* ccp; char* cp; } ccharconv; @@ -347,7 +348,8 @@ static BOOL pf_modules_set_plugin_data(proxyPluginsManager* mgr, const char* plu static void* pf_modules_get_plugin_data(proxyPluginsManager* mgr, const char* plugin_name, proxyData* pdata) { - union { + union + { const char* ccp; char* cp; } ccharconv; diff --git a/server/proxy/pf_server.c b/server/proxy/pf_server.c index bf1cc3171..e1ee63097 100644 --- a/server/proxy/pf_server.c +++ b/server/proxy/pf_server.c @@ -223,7 +223,8 @@ static BOOL pf_server_setup_channels(freerdp_peer* peer) return FALSE; } } - else if (strcmp(cname, RDPDR_SVC_CHANNEL_NAME) == 0 && (channelContext->channelMode == PF_UTILS_CHANNEL_INTERCEPT)) + else if (strcmp(cname, RDPDR_SVC_CHANNEL_NAME) == 0 && + (channelContext->channelMode == PF_UTILS_CHANNEL_INTERCEPT)) { if (!pf_channel_setup_rdpdr(ps, channelContext)) { @@ -417,23 +418,23 @@ static BOOL pf_server_receive_channel_data_hook(freerdp_peer* peer, UINT16 chann WINPR_ASSERT(channel->onFrontData); switch (channel->onFrontData(pdata, channel, data, size, flags, totalSize)) { - case PF_CHANNEL_RESULT_PASS: { - proxyChannelDataEventInfo ev = { 0 }; + case PF_CHANNEL_RESULT_PASS: + { + proxyChannelDataEventInfo ev = { 0 }; - ev.channel_id = channelId; - ev.channel_name = channel->channel_name; - ev.data = data; - ev.data_len = size; - ev.flags = flags; - ev.total_size = totalSize; - return IFCALLRESULT(TRUE, pc->sendChannelData, pc, &ev); + ev.channel_id = channelId; + ev.channel_name = channel->channel_name; + ev.data = data; + ev.data_len = size; + ev.flags = flags; + ev.total_size = totalSize; + return IFCALLRESULT(TRUE, pc->sendChannelData, pc, &ev); + } + case PF_CHANNEL_RESULT_DROP: + return TRUE; + case PF_CHANNEL_RESULT_ERROR: + return FALSE; } - case PF_CHANNEL_RESULT_DROP: - return TRUE; - case PF_CHANNEL_RESULT_ERROR: - return FALSE; - } - original_cb: WINPR_ASSERT(pdata->server_receive_channel_data_original); @@ -1009,7 +1010,6 @@ void pf_server_stop(proxyServer* server) if (!server) return; - /* signal main thread to stop and wait for the thread to exit */ SetEvent(server->stopEvent); } diff --git a/server/proxy/pf_server.h b/server/proxy/pf_server.h index a4138e1d4..2ac84f224 100644 --- a/server/proxy/pf_server.h +++ b/server/proxy/pf_server.h @@ -36,7 +36,7 @@ struct proxy_server proxyConfig* config; freerdp_listener* listener; - HANDLE stopEvent; /* an event used to signal the main thread to stop */ + HANDLE stopEvent; /* an event used to signal the main thread to stop */ wArrayList* peer_list; }; diff --git a/server/shadow/shadow_encoder.c b/server/shadow/shadow_encoder.c index 37f9c658c..83e83f966 100644 --- a/server/shadow/shadow_encoder.c +++ b/server/shadow/shadow_encoder.c @@ -372,18 +372,18 @@ static int shadow_encoder_uninit(rdpShadowEncoder* encoder) encoder->bs = NULL; } - shadow_encoder_uninit_rfx(encoder); + shadow_encoder_uninit_rfx(encoder); - shadow_encoder_uninit_nsc(encoder); + shadow_encoder_uninit_nsc(encoder); - shadow_encoder_uninit_planar(encoder); + shadow_encoder_uninit_planar(encoder); - shadow_encoder_uninit_interleaved(encoder); - shadow_encoder_uninit_h264(encoder); + shadow_encoder_uninit_interleaved(encoder); + shadow_encoder_uninit_h264(encoder); - shadow_encoder_uninit_progressive(encoder); + shadow_encoder_uninit_progressive(encoder); - return 1; + return 1; } int shadow_encoder_reset(rdpShadowEncoder* encoder) diff --git a/server/shadow/shadow_subsystem.c b/server/shadow/shadow_subsystem.c index 186b68f42..9b3a356af 100644 --- a/server/shadow/shadow_subsystem.c +++ b/server/shadow/shadow_subsystem.c @@ -128,11 +128,11 @@ void shadow_subsystem_uninit(rdpShadowSubsystem* subsystem) /* Release resource in messages before free */ obj1 = MessageQueue_Object(subsystem->MsgPipe->In); - obj1->fnObjectFree = shadow_subsystem_free_queued_message; - MessageQueue_Clear(subsystem->MsgPipe->In); + obj1->fnObjectFree = shadow_subsystem_free_queued_message; + MessageQueue_Clear(subsystem->MsgPipe->In); - obj2 = MessageQueue_Object(subsystem->MsgPipe->Out); - obj2->fnObjectFree = shadow_subsystem_free_queued_message; + obj2 = MessageQueue_Object(subsystem->MsgPipe->Out); + obj2->fnObjectFree = shadow_subsystem_free_queued_message; MessageQueue_Clear(subsystem->MsgPipe->Out); MessagePipe_Free(subsystem->MsgPipe); subsystem->MsgPipe = NULL; diff --git a/uwac/include/uwac/uwac.h b/uwac/include/uwac/uwac.h index 81e832440..63439f909 100644 --- a/uwac/include/uwac/uwac.h +++ b/uwac/include/uwac/uwac.h @@ -294,7 +294,8 @@ struct uwac_output_geometry_event }; typedef struct uwac_output_geometry_event UwacOutputGeometryEvent; -union uwac_event { +union uwac_event +{ int type; UwacOutputNewEvent output_new; UwacOutputGeometryEvent output_geometry; diff --git a/uwac/libuwac/uwac-window.c b/uwac/libuwac/uwac-window.c index e072a67c8..2ddf81ea8 100644 --- a/uwac/libuwac/uwac-window.c +++ b/uwac/libuwac/uwac-window.c @@ -128,8 +128,7 @@ static void xdg_handle_toplevel_configure(void* data, struct xdg_toplevel* xdg_t event->window = window; event->states = surfaceState; - if ((width > 0 && height > 0) && - (width != window->width || height != window->height)) + if ((width > 0 && height > 0) && (width != window->width || height != window->height)) { event->width = width; event->height = height; @@ -504,20 +503,23 @@ UwacWindow* UwacCreateWindowShm(UwacDisplay* display, uint32_t width, uint32_t h if (display->ivi_application) { - w->ivi_surface = ivi_application_surface_create(display->ivi_application, ivi_surface_id, w->surface); + w->ivi_surface = + ivi_application_surface_create(display->ivi_application, ivi_surface_id, w->surface); assert(w->ivi_surface); ivi_surface_add_listener(w->ivi_surface, &ivi_surface_listener, w); - } else + } + else #endif #if BUILD_FULLSCREEN_SHELL - if (display->fullscreen_shell) + if (display->fullscreen_shell) { zwp_fullscreen_shell_v1_present_surface(display->fullscreen_shell, w->surface, - ZWP_FULLSCREEN_SHELL_V1_PRESENT_METHOD_CENTER, - NULL); - } else + ZWP_FULLSCREEN_SHELL_V1_PRESENT_METHOD_CENTER, + NULL); + } + else #endif - if (display->xdg_base) + if (display->xdg_base) { w->xdg_surface = xdg_wm_base_get_xdg_surface(display->xdg_base, w->surface); diff --git a/winpr/include/winpr/crt.h b/winpr/include/winpr/crt.h index 3f5b9f285..dc3939511 100644 --- a/winpr/include/winpr/crt.h +++ b/winpr/include/winpr/crt.h @@ -165,7 +165,7 @@ extern "C" #endif /* _WIN32 */ -#if !defined(_WIN32) || (defined(__MINGW32__) && ! defined(_UCRT)) +#if !defined(_WIN32) || (defined(__MINGW32__) && !defined(_UCRT)) /* note: we use our own implementation of _aligned_XXX function when: * - it's not win32 * - it's mingw with native libs (not ucrt64) because we didn't managed to have it working @@ -191,35 +191,34 @@ extern "C" WINPR_API void* winpr_aligned_realloc(void* memblock, size_t size, size_t alignment); - WINPR_API void* winpr_aligned_recalloc(void* memblock, size_t num, size_t size, size_t alignment); + WINPR_API void* winpr_aligned_recalloc(void* memblock, size_t num, size_t size, + size_t alignment); WINPR_API void* winpr_aligned_offset_malloc(size_t size, size_t alignment, size_t offset); WINPR_API void* winpr_aligned_offset_realloc(void* memblock, size_t size, size_t alignment, - size_t offset); + size_t offset); WINPR_API void* winpr_aligned_offset_recalloc(void* memblock, size_t num, size_t size, - size_t alignment, size_t offset); + size_t alignment, size_t offset); WINPR_API size_t winpr_aligned_msize(void* memblock, size_t alignment, size_t offset); WINPR_API void winpr_aligned_free(void* memblock); - #ifdef __cplusplus } #endif #else - #define winpr_aligned_malloc _aligned_malloc - #define winpr_aligned_realloc _aligned_realloc - #define winpr_aligned_recalloc _aligned_recalloc - #define winpr_aligned_offset_malloc _aligned_offset_malloc - #define winpr_aligned_offset_realloc _aligned_offset_realloc - #define winpr_aligned_offset_recalloc _aligned_offset_recalloc - #define winpr_aligned_msize _aligned_msize - #define winpr_aligned_free _aligned_free +#define winpr_aligned_malloc _aligned_malloc +#define winpr_aligned_realloc _aligned_realloc +#define winpr_aligned_recalloc _aligned_recalloc +#define winpr_aligned_offset_malloc _aligned_offset_malloc +#define winpr_aligned_offset_realloc _aligned_offset_realloc +#define winpr_aligned_offset_recalloc _aligned_offset_recalloc +#define winpr_aligned_msize _aligned_msize +#define winpr_aligned_free _aligned_free #endif /* !defined(_WIN32) || (defined(__MINGW32__) ... */ - #endif /* WINPR_CRT_H */ diff --git a/winpr/include/winpr/ncrypt.h b/winpr/include/winpr/ncrypt.h index d5681957b..8ea8270c7 100644 --- a/winpr/include/winpr/ncrypt.h +++ b/winpr/include/winpr/ncrypt.h @@ -199,8 +199,8 @@ extern "C" * @return ERROR_SUCCESS or an NTE error code something failed */ WINPR_API SECURITY_STATUS winpr_NCryptOpenStorageProviderEx(NCRYPT_PROV_HANDLE* phProvider, - LPCWSTR pszProviderName, DWORD dwFlags, - LPCSTR* modulePaths); + LPCWSTR pszProviderName, + DWORD dwFlags, LPCSTR* modulePaths); #ifdef __cplusplus } diff --git a/winpr/include/winpr/sspi.h b/winpr/include/winpr/sspi.h index 9480f629f..27f930ea9 100644 --- a/winpr/include/winpr/sspi.h +++ b/winpr/include/winpr/sspi.h @@ -725,10 +725,10 @@ typedef SecBufferDesc* PSecBufferDesc; #endif /* !defined(_WIN32) || defined(_UWP) */ typedef SECURITY_STATUS (*psSspiNtlmHashCallback)(void* client, - const SEC_WINNT_AUTH_IDENTITY* authIdentity, - const SecBuffer* ntproofvalue, - const BYTE* randkey, const BYTE* mic, - const SecBuffer* micvalue, BYTE* ntlmhash); + const SEC_WINNT_AUTH_IDENTITY* authIdentity, + const SecBuffer* ntproofvalue, + const BYTE* randkey, const BYTE* mic, + const SecBuffer* micvalue, BYTE* ntlmhash); typedef struct { diff --git a/winpr/include/winpr/stream.h b/winpr/include/winpr/stream.h index 46f2d6227..0e566e22b 100644 --- a/winpr/include/winpr/stream.h +++ b/winpr/include/winpr/stream.h @@ -163,42 +163,38 @@ extern "C" Stream_Seek(_s, sizeof(_t)); \ } while (0) -#define _stream_read_n64_le(_t, _s, _v, _p) \ - do \ - { \ - WINPR_ASSERT(_s); \ - if (_p) \ - { \ - WINPR_ASSERT(Stream_GetRemainingLength(_s) >= 8); \ - } \ - (_v) = (_t)((UINT64)(*(_s)->pointer) + (((UINT64)(*((_s)->pointer + 1))) << 8) + \ - (((UINT64)(*((_s)->pointer + 2))) << 16) + \ - (((UINT64)(*((_s)->pointer + 3))) << 24) + \ - (((UINT64)(*((_s)->pointer + 4))) << 32) + \ - (((UINT64)(*((_s)->pointer + 5))) << 40) + \ - (((UINT64)(*((_s)->pointer + 6))) << 48) + \ - (((UINT64)(*((_s)->pointer + 7))) << 56)); \ - if (_p) \ - Stream_Seek(_s, sizeof(_t)); \ +#define _stream_read_n64_le(_t, _s, _v, _p) \ + do \ + { \ + WINPR_ASSERT(_s); \ + if (_p) \ + { \ + WINPR_ASSERT(Stream_GetRemainingLength(_s) >= 8); \ + } \ + (_v) = (_t)( \ + (UINT64)(*(_s)->pointer) + (((UINT64)(*((_s)->pointer + 1))) << 8) + \ + (((UINT64)(*((_s)->pointer + 2))) << 16) + (((UINT64)(*((_s)->pointer + 3))) << 24) + \ + (((UINT64)(*((_s)->pointer + 4))) << 32) + (((UINT64)(*((_s)->pointer + 5))) << 40) + \ + (((UINT64)(*((_s)->pointer + 6))) << 48) + (((UINT64)(*((_s)->pointer + 7))) << 56)); \ + if (_p) \ + Stream_Seek(_s, sizeof(_t)); \ } while (0) -#define _stream_read_n64_be(_t, _s, _v, _p) \ - do \ - { \ - WINPR_ASSERT(_s); \ - if (_p) \ - { \ - WINPR_ASSERT(Stream_GetRemainingLength(_s) >= 8); \ - } \ - (_v) = \ - (_t)((((UINT64)(*((_s)->pointer))) << 56) + (((UINT64)(*((_s)->pointer + 1))) << 48) + \ - (((UINT64)(*((_s)->pointer + 2))) << 40) + \ - (((UINT64)(*((_s)->pointer + 3))) << 32) + \ - (((UINT64)(*((_s)->pointer + 4))) << 24) + \ - (((UINT64)(*((_s)->pointer + 5))) << 16) + \ - (((UINT64)(*((_s)->pointer + 6))) << 8) + (((UINT64)(*((_s)->pointer + 7))))); \ - if (_p) \ - Stream_Seek(_s, sizeof(_t)); \ +#define _stream_read_n64_be(_t, _s, _v, _p) \ + do \ + { \ + WINPR_ASSERT(_s); \ + if (_p) \ + { \ + WINPR_ASSERT(Stream_GetRemainingLength(_s) >= 8); \ + } \ + (_v) = (_t)( \ + (((UINT64)(*((_s)->pointer))) << 56) + (((UINT64)(*((_s)->pointer + 1))) << 48) + \ + (((UINT64)(*((_s)->pointer + 2))) << 40) + (((UINT64)(*((_s)->pointer + 3))) << 32) + \ + (((UINT64)(*((_s)->pointer + 4))) << 24) + (((UINT64)(*((_s)->pointer + 5))) << 16) + \ + (((UINT64)(*((_s)->pointer + 6))) << 8) + (((UINT64)(*((_s)->pointer + 7))))); \ + if (_p) \ + Stream_Seek(_s, sizeof(_t)); \ } while (0) #define Stream_Read_UINT8(_s, _v) _stream_read_n8(UINT8, _s, _v, TRUE) diff --git a/winpr/libwinpr/crt/alignment.c b/winpr/libwinpr/crt/alignment.c index 12ae19de0..e6050e1a9 100644 --- a/winpr/libwinpr/crt/alignment.c +++ b/winpr/libwinpr/crt/alignment.c @@ -23,7 +23,7 @@ /* Data Alignment: http://msdn.microsoft.com/en-us/library/fs9stz4e/ */ -#if !defined(_WIN32) || (defined(__MINGW32__) && ! defined(_UCRT)) +#if !defined(_WIN32) || (defined(__MINGW32__) && !defined(_UCRT)) #include #include @@ -166,7 +166,7 @@ static INLINE size_t cMIN(size_t a, size_t b) } void* winpr_aligned_offset_recalloc(void* memblock, size_t num, size_t size, size_t alignment, - size_t offset) + size_t offset) { char* newMemblock = NULL; WINPR_ALIGNED_MEM* pMem = NULL; diff --git a/winpr/libwinpr/crt/test/TestUnicodeConversion.c b/winpr/libwinpr/crt/test/TestUnicodeConversion.c index 4963df370..a0c27c1b5 100644 --- a/winpr/libwinpr/crt/test/TestUnicodeConversion.c +++ b/winpr/libwinpr/crt/test/TestUnicodeConversion.c @@ -406,7 +406,7 @@ static BOOL test_ConvertToUnicode_wrapper(void) { char name[] = "someteststring"; const BYTE cmp[] = { 's', 0, 'o', 0, 'm', 0, 'e', 0, 't', 0, 'e', 0, 's', 0, 't', 0, - 's', 0, 't', 0, 'r', 0, 'i', 0, 'n', 0, 'g', 0, 0, 0 }; + 's', 0, 't', 0, 'r', 0, 'i', 0, 'n', 0, 'g', 0, 0, 0 }; WCHAR xname[128] = { 0 }; LPWSTR aname = NULL; LPWSTR wname = &xname[0]; diff --git a/winpr/libwinpr/crypto/cipher.c b/winpr/libwinpr/crypto/cipher.c index 5aab3c5ce..5231cad7a 100644 --- a/winpr/libwinpr/crypto/cipher.c +++ b/winpr/libwinpr/crypto/cipher.c @@ -67,7 +67,7 @@ static WINPR_RC4_CTX* winpr_RC4_New_Internal(const BYTE* key, size_t keylen, BOO EVP_CIPHER_CTX_init((EVP_CIPHER_CTX*)ctx); if (EVP_EncryptInit_ex((EVP_CIPHER_CTX*)ctx, evp, NULL, NULL, NULL) != 1) { - EVP_CIPHER_CTX_free ((EVP_CIPHER_CTX*)ctx); + EVP_CIPHER_CTX_free((EVP_CIPHER_CTX*)ctx); return NULL; } @@ -81,7 +81,7 @@ static WINPR_RC4_CTX* winpr_RC4_New_Internal(const BYTE* key, size_t keylen, BOO EVP_CIPHER_CTX_set_key_length((EVP_CIPHER_CTX*)ctx, (int)keylen); if (EVP_EncryptInit_ex((EVP_CIPHER_CTX*)ctx, NULL, NULL, key, NULL) != 1) { - EVP_CIPHER_CTX_free ((EVP_CIPHER_CTX*)ctx); + EVP_CIPHER_CTX_free((EVP_CIPHER_CTX*)ctx); return NULL; } #elif defined(WITH_MBEDTLS) && defined(MBEDTLS_ARC4_C) diff --git a/winpr/libwinpr/environment/environment.c b/winpr/libwinpr/environment/environment.c index ae7eb9809..81c2f174d 100644 --- a/winpr/libwinpr/environment/environment.c +++ b/winpr/libwinpr/environment/environment.c @@ -562,8 +562,8 @@ BOOL SetEnvironmentVariableEBA(LPSTR* envBlock, LPCSTR lpName, LPCSTR lpValue) if (lpValue) { - length = (strlen(lpName) + strlen(lpValue) + 2); /* +2 because of = and \0 */ - envstr = (char*)malloc(length + 1); /* +1 because of closing \0 */ + length = (strlen(lpName) + strlen(lpValue) + 2); /* +2 because of = and \0 */ + envstr = (char*)malloc(length + 1); /* +1 because of closing \0 */ if (!envstr) return FALSE; diff --git a/winpr/libwinpr/interlocked/test/TestInterlockedDList.c b/winpr/libwinpr/interlocked/test/TestInterlockedDList.c index 0944b585a..7a4f3f83a 100644 --- a/winpr/libwinpr/interlocked/test/TestInterlockedDList.c +++ b/winpr/libwinpr/interlocked/test/TestInterlockedDList.c @@ -18,8 +18,8 @@ int TestInterlockedDList(int argc, char* argv[]) WINPR_PLIST_ENTRY pListEntry; WINPR_UNUSED(argc); WINPR_UNUSED(argv); - pListHead = - (WINPR_PLIST_ENTRY)winpr_aligned_malloc(sizeof(WINPR_LIST_ENTRY), MEMORY_ALLOCATION_ALIGNMENT); + pListHead = (WINPR_PLIST_ENTRY)winpr_aligned_malloc(sizeof(WINPR_LIST_ENTRY), + MEMORY_ALLOCATION_ALIGNMENT); if (!pListHead) { @@ -41,7 +41,8 @@ int TestInterlockedDList(int argc, char* argv[]) for (Count = 1; Count <= 10; Count += 1) { - pListItem = (PLIST_ITEM)winpr_aligned_malloc(sizeof(LIST_ITEM), MEMORY_ALLOCATION_ALIGNMENT); + pListItem = + (PLIST_ITEM)winpr_aligned_malloc(sizeof(LIST_ITEM), MEMORY_ALLOCATION_ALIGNMENT); pListItem->Signature = Count; InsertHeadList(pListHead, &(pListItem->ItemEntry)); } @@ -59,7 +60,8 @@ int TestInterlockedDList(int argc, char* argv[]) for (Count = 1; Count <= 10; Count += 1) { - pListItem = (PLIST_ITEM)winpr_aligned_malloc(sizeof(LIST_ITEM), MEMORY_ALLOCATION_ALIGNMENT); + pListItem = + (PLIST_ITEM)winpr_aligned_malloc(sizeof(LIST_ITEM), MEMORY_ALLOCATION_ALIGNMENT); pListItem->Signature = Count; InsertTailList(pListHead, &(pListItem->ItemEntry)); } diff --git a/winpr/libwinpr/interlocked/test/TestInterlockedSList.c b/winpr/libwinpr/interlocked/test/TestInterlockedSList.c index d388aa1d4..8962bc348 100644 --- a/winpr/libwinpr/interlocked/test/TestInterlockedSList.c +++ b/winpr/libwinpr/interlocked/test/TestInterlockedSList.c @@ -19,7 +19,7 @@ int TestInterlockedSList(int argc, char* argv[]) WINPR_UNUSED(argv); /* Initialize the list header to a MEMORY_ALLOCATION_ALIGNMENT boundary. */ pListHead = (WINPR_PSLIST_HEADER)winpr_aligned_malloc(sizeof(WINPR_SLIST_HEADER), - MEMORY_ALLOCATION_ALIGNMENT); + MEMORY_ALLOCATION_ALIGNMENT); if (!pListHead) { diff --git a/winpr/libwinpr/ncrypt/ncrypt.c b/winpr/libwinpr/ncrypt/ncrypt.c index 9b32a0334..5143c5fcb 100644 --- a/winpr/libwinpr/ncrypt/ncrypt.c +++ b/winpr/libwinpr/ncrypt/ncrypt.c @@ -108,7 +108,6 @@ SECURITY_STATUS NCryptEnumStorageProviders(DWORD* wProviderCount, if (!ret) return NTE_NO_MEMORY; - #ifdef WITH_PKCS11 strPtr = (LPWSTR)(ret + *wProviderCount); diff --git a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c index 7f567e5b5..fbdca94bf 100644 --- a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c +++ b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c @@ -100,7 +100,7 @@ static SECURITY_STATUS NCryptP11StorageProvider_dtor(NCRYPT_HANDLE handle) return winpr_NCryptDefault_dtor(handle); } -static void fix_padded_string(char *str, size_t maxlen) +static void fix_padded_string(char* str, size_t maxlen) { char* ptr = str + maxlen - 1; @@ -216,98 +216,100 @@ static CK_RV object_load_attributes(NCryptP11ProviderHandle* provider, CK_SESSIO static const char* CK_RV_error_string(CK_RV rv) { static char generic_buffer[200]; -#define ERR_ENTRY(X) case X: return #X +#define ERR_ENTRY(X) \ + case X: \ + return #X switch (rv) { - ERR_ENTRY(CKR_OK); - ERR_ENTRY(CKR_CANCEL); - ERR_ENTRY(CKR_HOST_MEMORY); - ERR_ENTRY(CKR_SLOT_ID_INVALID); - ERR_ENTRY(CKR_GENERAL_ERROR); - ERR_ENTRY(CKR_FUNCTION_FAILED); - ERR_ENTRY(CKR_ARGUMENTS_BAD); - ERR_ENTRY(CKR_NO_EVENT); - ERR_ENTRY(CKR_NEED_TO_CREATE_THREADS); - ERR_ENTRY(CKR_CANT_LOCK); - ERR_ENTRY(CKR_ATTRIBUTE_READ_ONLY); - ERR_ENTRY(CKR_ATTRIBUTE_SENSITIVE); - ERR_ENTRY(CKR_ATTRIBUTE_TYPE_INVALID); - ERR_ENTRY(CKR_ATTRIBUTE_VALUE_INVALID); - ERR_ENTRY(CKR_DATA_INVALID); - ERR_ENTRY(CKR_DATA_LEN_RANGE); - ERR_ENTRY(CKR_DEVICE_ERROR); - ERR_ENTRY(CKR_DEVICE_MEMORY); - ERR_ENTRY(CKR_DEVICE_REMOVED); - ERR_ENTRY(CKR_ENCRYPTED_DATA_INVALID); - ERR_ENTRY(CKR_ENCRYPTED_DATA_LEN_RANGE); - ERR_ENTRY(CKR_FUNCTION_CANCELED); - ERR_ENTRY(CKR_FUNCTION_NOT_PARALLEL); - ERR_ENTRY(CKR_FUNCTION_NOT_SUPPORTED); - ERR_ENTRY(CKR_KEY_HANDLE_INVALID); - ERR_ENTRY(CKR_KEY_SIZE_RANGE); - ERR_ENTRY(CKR_KEY_TYPE_INCONSISTENT); - ERR_ENTRY(CKR_KEY_NOT_NEEDED); - ERR_ENTRY(CKR_KEY_CHANGED); - ERR_ENTRY(CKR_KEY_NEEDED); - ERR_ENTRY(CKR_KEY_INDIGESTIBLE); - ERR_ENTRY(CKR_KEY_FUNCTION_NOT_PERMITTED); - ERR_ENTRY(CKR_KEY_NOT_WRAPPABLE); - ERR_ENTRY(CKR_KEY_UNEXTRACTABLE); - ERR_ENTRY(CKR_MECHANISM_INVALID); - ERR_ENTRY(CKR_MECHANISM_PARAM_INVALID); - ERR_ENTRY(CKR_OBJECT_HANDLE_INVALID); - ERR_ENTRY(CKR_OPERATION_ACTIVE); - ERR_ENTRY(CKR_OPERATION_NOT_INITIALIZED); - ERR_ENTRY(CKR_PIN_INCORRECT); - ERR_ENTRY(CKR_PIN_INVALID); - ERR_ENTRY(CKR_PIN_LEN_RANGE); - ERR_ENTRY(CKR_PIN_EXPIRED); - ERR_ENTRY(CKR_PIN_LOCKED); - ERR_ENTRY(CKR_SESSION_CLOSED); - ERR_ENTRY(CKR_SESSION_COUNT); - ERR_ENTRY(CKR_SESSION_HANDLE_INVALID); - ERR_ENTRY(CKR_SESSION_PARALLEL_NOT_SUPPORTED); - ERR_ENTRY(CKR_SESSION_READ_ONLY); - ERR_ENTRY(CKR_SESSION_EXISTS); - ERR_ENTRY(CKR_SESSION_READ_ONLY_EXISTS); - ERR_ENTRY(CKR_SESSION_READ_WRITE_SO_EXISTS); - ERR_ENTRY(CKR_SIGNATURE_INVALID); - ERR_ENTRY(CKR_SIGNATURE_LEN_RANGE); - ERR_ENTRY(CKR_TEMPLATE_INCOMPLETE); - ERR_ENTRY(CKR_TEMPLATE_INCONSISTENT); - ERR_ENTRY(CKR_TOKEN_NOT_PRESENT); - ERR_ENTRY(CKR_TOKEN_NOT_RECOGNIZED); - ERR_ENTRY(CKR_TOKEN_WRITE_PROTECTED); - ERR_ENTRY(CKR_UNWRAPPING_KEY_HANDLE_INVALID); - ERR_ENTRY(CKR_UNWRAPPING_KEY_SIZE_RANGE); - ERR_ENTRY(CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT); - ERR_ENTRY(CKR_USER_ALREADY_LOGGED_IN); - ERR_ENTRY(CKR_USER_NOT_LOGGED_IN); - ERR_ENTRY(CKR_USER_PIN_NOT_INITIALIZED); - ERR_ENTRY(CKR_USER_TYPE_INVALID); - ERR_ENTRY(CKR_USER_ANOTHER_ALREADY_LOGGED_IN); - ERR_ENTRY(CKR_USER_TOO_MANY_TYPES); - ERR_ENTRY(CKR_WRAPPED_KEY_INVALID); - ERR_ENTRY(CKR_WRAPPED_KEY_LEN_RANGE); - ERR_ENTRY(CKR_WRAPPING_KEY_HANDLE_INVALID); - ERR_ENTRY(CKR_WRAPPING_KEY_SIZE_RANGE); - ERR_ENTRY(CKR_WRAPPING_KEY_TYPE_INCONSISTENT); - ERR_ENTRY(CKR_RANDOM_SEED_NOT_SUPPORTED); - ERR_ENTRY(CKR_RANDOM_NO_RNG); - ERR_ENTRY(CKR_DOMAIN_PARAMS_INVALID); - ERR_ENTRY(CKR_BUFFER_TOO_SMALL); - ERR_ENTRY(CKR_SAVED_STATE_INVALID); - ERR_ENTRY(CKR_INFORMATION_SENSITIVE); - ERR_ENTRY(CKR_STATE_UNSAVEABLE); - ERR_ENTRY(CKR_CRYPTOKI_NOT_INITIALIZED); - ERR_ENTRY(CKR_CRYPTOKI_ALREADY_INITIALIZED); - ERR_ENTRY(CKR_MUTEX_BAD); - ERR_ENTRY(CKR_MUTEX_NOT_LOCKED); - ERR_ENTRY(CKR_FUNCTION_REJECTED); - default: - snprintf(generic_buffer, sizeof(generic_buffer), "unknown 0x%lx", rv); - return generic_buffer; + ERR_ENTRY(CKR_OK); + ERR_ENTRY(CKR_CANCEL); + ERR_ENTRY(CKR_HOST_MEMORY); + ERR_ENTRY(CKR_SLOT_ID_INVALID); + ERR_ENTRY(CKR_GENERAL_ERROR); + ERR_ENTRY(CKR_FUNCTION_FAILED); + ERR_ENTRY(CKR_ARGUMENTS_BAD); + ERR_ENTRY(CKR_NO_EVENT); + ERR_ENTRY(CKR_NEED_TO_CREATE_THREADS); + ERR_ENTRY(CKR_CANT_LOCK); + ERR_ENTRY(CKR_ATTRIBUTE_READ_ONLY); + ERR_ENTRY(CKR_ATTRIBUTE_SENSITIVE); + ERR_ENTRY(CKR_ATTRIBUTE_TYPE_INVALID); + ERR_ENTRY(CKR_ATTRIBUTE_VALUE_INVALID); + ERR_ENTRY(CKR_DATA_INVALID); + ERR_ENTRY(CKR_DATA_LEN_RANGE); + ERR_ENTRY(CKR_DEVICE_ERROR); + ERR_ENTRY(CKR_DEVICE_MEMORY); + ERR_ENTRY(CKR_DEVICE_REMOVED); + ERR_ENTRY(CKR_ENCRYPTED_DATA_INVALID); + ERR_ENTRY(CKR_ENCRYPTED_DATA_LEN_RANGE); + ERR_ENTRY(CKR_FUNCTION_CANCELED); + ERR_ENTRY(CKR_FUNCTION_NOT_PARALLEL); + ERR_ENTRY(CKR_FUNCTION_NOT_SUPPORTED); + ERR_ENTRY(CKR_KEY_HANDLE_INVALID); + ERR_ENTRY(CKR_KEY_SIZE_RANGE); + ERR_ENTRY(CKR_KEY_TYPE_INCONSISTENT); + ERR_ENTRY(CKR_KEY_NOT_NEEDED); + ERR_ENTRY(CKR_KEY_CHANGED); + ERR_ENTRY(CKR_KEY_NEEDED); + ERR_ENTRY(CKR_KEY_INDIGESTIBLE); + ERR_ENTRY(CKR_KEY_FUNCTION_NOT_PERMITTED); + ERR_ENTRY(CKR_KEY_NOT_WRAPPABLE); + ERR_ENTRY(CKR_KEY_UNEXTRACTABLE); + ERR_ENTRY(CKR_MECHANISM_INVALID); + ERR_ENTRY(CKR_MECHANISM_PARAM_INVALID); + ERR_ENTRY(CKR_OBJECT_HANDLE_INVALID); + ERR_ENTRY(CKR_OPERATION_ACTIVE); + ERR_ENTRY(CKR_OPERATION_NOT_INITIALIZED); + ERR_ENTRY(CKR_PIN_INCORRECT); + ERR_ENTRY(CKR_PIN_INVALID); + ERR_ENTRY(CKR_PIN_LEN_RANGE); + ERR_ENTRY(CKR_PIN_EXPIRED); + ERR_ENTRY(CKR_PIN_LOCKED); + ERR_ENTRY(CKR_SESSION_CLOSED); + ERR_ENTRY(CKR_SESSION_COUNT); + ERR_ENTRY(CKR_SESSION_HANDLE_INVALID); + ERR_ENTRY(CKR_SESSION_PARALLEL_NOT_SUPPORTED); + ERR_ENTRY(CKR_SESSION_READ_ONLY); + ERR_ENTRY(CKR_SESSION_EXISTS); + ERR_ENTRY(CKR_SESSION_READ_ONLY_EXISTS); + ERR_ENTRY(CKR_SESSION_READ_WRITE_SO_EXISTS); + ERR_ENTRY(CKR_SIGNATURE_INVALID); + ERR_ENTRY(CKR_SIGNATURE_LEN_RANGE); + ERR_ENTRY(CKR_TEMPLATE_INCOMPLETE); + ERR_ENTRY(CKR_TEMPLATE_INCONSISTENT); + ERR_ENTRY(CKR_TOKEN_NOT_PRESENT); + ERR_ENTRY(CKR_TOKEN_NOT_RECOGNIZED); + ERR_ENTRY(CKR_TOKEN_WRITE_PROTECTED); + ERR_ENTRY(CKR_UNWRAPPING_KEY_HANDLE_INVALID); + ERR_ENTRY(CKR_UNWRAPPING_KEY_SIZE_RANGE); + ERR_ENTRY(CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT); + ERR_ENTRY(CKR_USER_ALREADY_LOGGED_IN); + ERR_ENTRY(CKR_USER_NOT_LOGGED_IN); + ERR_ENTRY(CKR_USER_PIN_NOT_INITIALIZED); + ERR_ENTRY(CKR_USER_TYPE_INVALID); + ERR_ENTRY(CKR_USER_ANOTHER_ALREADY_LOGGED_IN); + ERR_ENTRY(CKR_USER_TOO_MANY_TYPES); + ERR_ENTRY(CKR_WRAPPED_KEY_INVALID); + ERR_ENTRY(CKR_WRAPPED_KEY_LEN_RANGE); + ERR_ENTRY(CKR_WRAPPING_KEY_HANDLE_INVALID); + ERR_ENTRY(CKR_WRAPPING_KEY_SIZE_RANGE); + ERR_ENTRY(CKR_WRAPPING_KEY_TYPE_INCONSISTENT); + ERR_ENTRY(CKR_RANDOM_SEED_NOT_SUPPORTED); + ERR_ENTRY(CKR_RANDOM_NO_RNG); + ERR_ENTRY(CKR_DOMAIN_PARAMS_INVALID); + ERR_ENTRY(CKR_BUFFER_TOO_SMALL); + ERR_ENTRY(CKR_SAVED_STATE_INVALID); + ERR_ENTRY(CKR_INFORMATION_SENSITIVE); + ERR_ENTRY(CKR_STATE_UNSAVEABLE); + ERR_ENTRY(CKR_CRYPTOKI_NOT_INITIALIZED); + ERR_ENTRY(CKR_CRYPTOKI_ALREADY_INITIALIZED); + ERR_ENTRY(CKR_MUTEX_BAD); + ERR_ENTRY(CKR_MUTEX_NOT_LOCKED); + ERR_ENTRY(CKR_FUNCTION_REJECTED); + default: + snprintf(generic_buffer, sizeof(generic_buffer), "unknown 0x%lx", rv); + return generic_buffer; } #undef ERR_ENTRY } @@ -341,11 +343,12 @@ static SECURITY_STATUS collect_private_keys(NCryptP11ProviderHandle* provider, continue; } - fix_padded_string((char *)slotInfo.slotDescription, sizeof(slotInfo.slotDescription)); - WLog_DBG(TAG, "%s: collecting private keys for slot #%d(%lu) descr='%s' flags=0x%x", __FUNCTION__, i, - state->slots[i], slotInfo.slotDescription, slotInfo.flags); + fix_padded_string((char*)slotInfo.slotDescription, sizeof(slotInfo.slotDescription)); + WLog_DBG(TAG, "%s: collecting private keys for slot #%d(%lu) descr='%s' flags=0x%x", + __FUNCTION__, i, state->slots[i], slotInfo.slotDescription, slotInfo.flags); - /* this is a safety guard as we're supposed to have listed only readers with tokens in them */ + /* this is a safety guard as we're supposed to have listed only readers with tokens in them + */ if (!(slotInfo.flags & CKF_TOKEN_PRESENT)) { WLog_INFO(TAG, "token not present for slot #%d(%d)", i, state->slots[i]); @@ -360,17 +363,17 @@ static SECURITY_STATUS collect_private_keys(NCryptP11ProviderHandle* provider, } else { - fix_padded_string((char *)tokenInfo.label, sizeof(tokenInfo.label)); + fix_padded_string((char*)tokenInfo.label, sizeof(tokenInfo.label)); WLog_DBG(TAG, "%s: token, label='%s' flags=0x%x", __FUNCTION__, tokenInfo.label, - tokenInfo.flags); + tokenInfo.flags); } WINPR_ASSERT(p11->C_OpenSession); rv = p11->C_OpenSession(state->slots[i], CKF_SERIAL_SESSION, NULL, NULL, &session); if (rv != CKR_OK) { - WLog_ERR(TAG, "unable to openSession for slot #%d(%d), session=%p rv=%s", i, state->slots[i], - session, CK_RV_error_string(rv)); + WLog_ERR(TAG, "unable to openSession for slot #%d(%d), session=%p rv=%s", i, + state->slots[i], session, CK_RV_error_string(rv)); continue; } @@ -380,7 +383,7 @@ static SECURITY_STATUS collect_private_keys(NCryptP11ProviderHandle* provider, { // TODO: shall it be fatal ? WLog_ERR(TAG, "unable to initiate search for slot #%d(%d), rv=%s", i, state->slots[i], - CK_RV_error_string(rv)); + CK_RV_error_string(rv)); step = "C_FindObjectsInit"; goto cleanup_FindObjectsInit; } @@ -390,7 +393,7 @@ static SECURITY_STATUS collect_private_keys(NCryptP11ProviderHandle* provider, if (rv != CKR_OK) { WLog_ERR(TAG, "unable to findObjects for slot #%d(%d), rv=%s", i, state->slots[i], - CK_RV_error_string(rv)); + CK_RV_error_string(rv)); step = "C_FindObjects"; goto cleanup_FindObjects; } @@ -426,8 +429,8 @@ static SECURITY_STATUS collect_private_keys(NCryptP11ProviderHandle* provider, rv = p11->C_FindObjectsFinal(session); if (rv != CKR_OK) { - WLog_ERR(TAG, "error during C_FindObjectsFinal for slot #%d(%d) (errorStep=%s), rv=%s", i, - state->slots[i], step, CK_RV_error_string(rv)); + WLog_ERR(TAG, "error during C_FindObjectsFinal for slot #%d(%d) (errorStep=%s), rv=%s", + i, state->slots[i], step, CK_RV_error_string(rv)); } cleanup_FindObjectsInit: WINPR_ASSERT(p11->C_CloseSession); @@ -435,7 +438,7 @@ static SECURITY_STATUS collect_private_keys(NCryptP11ProviderHandle* provider, if (rv != CKR_OK) { WLog_ERR(TAG, "error closing session for slot #%d(%d) (errorStep=%s), rv=%s", i, - state->slots[i], step, CK_RV_error_string(rv)); + state->slots[i], step, CK_RV_error_string(rv)); } } @@ -517,13 +520,15 @@ static void wprintKeyName(LPWSTR str, CK_SLOT_ID slotId, CK_BYTE* id, CK_ULONG i const CK_BYTE* bytePtr; CK_ULONG i; - *ptr = '\\'; ptr++; + *ptr = '\\'; + ptr++; bytePtr = ((CK_BYTE*)&slotId); for (i = 0; i < sizeof(slotId); i++, bytePtr++, ptr += 2) snprintf(ptr, 3, "%.2x", *bytePtr); - *ptr = '\\'; ptr++; + *ptr = '\\'; + ptr++; for (i = 0; i < idLen; i++, id++, ptr += 2) snprintf(ptr, 3, "%.2x", *id); @@ -753,7 +758,8 @@ static SECURITY_STATUS NCryptP11EnumKeys(NCRYPT_PROV_HANDLE hProvider, LPCWSTR p { /* sizeof keyName struct + "\\" + keyName->pszAlgid */ DWORD algoSz; - size_t KEYNAME_SZ = (1 + (sizeof(privKey->slotId) * 2) /*slotId*/ + 1 + (privKey->idLen * 2) + 1) * 2; + size_t KEYNAME_SZ = + (1 + (sizeof(privKey->slotId) * 2) /*slotId*/ + 1 + (privKey->idLen * 2) + 1) * 2; convertKeyType(privKey->keyType, NULL, 0, &algoSz); KEYNAME_SZ += (algoSz + 1) * 2; @@ -770,7 +776,7 @@ static SECURITY_STATUS NCryptP11EnumKeys(NCRYPT_PROV_HANDLE hProvider, LPCWSTR p wprintKeyName(keyName->pszName, privKey->slotId, privKey->id, privKey->idLen); keyName->pszAlgid = keyName->pszName + _wcslen(keyName->pszName) + 1; - convertKeyType(privKey->keyType, keyName->pszAlgid, algoSz+1, NULL); + convertKeyType(privKey->keyType, keyName->pszAlgid, algoSz + 1, NULL); } cleanup_FindObjects: @@ -1091,4 +1097,3 @@ SECURITY_STATUS NCryptOpenP11StorageProviderEx(NCRYPT_PROV_HANDLE* phProvider, return status; } - diff --git a/winpr/libwinpr/ncrypt/test/TestNCryptSmartcard.c b/winpr/libwinpr/ncrypt/test/TestNCryptSmartcard.c index c13845259..4b8d3e48e 100644 --- a/winpr/libwinpr/ncrypt/test/TestNCryptSmartcard.c +++ b/winpr/libwinpr/ncrypt/test/TestNCryptSmartcard.c @@ -27,12 +27,12 @@ #define TAG "testNCrypt" -static void crypto_print_name(const BYTE *b, DWORD sz) +static void crypto_print_name(const BYTE* b, DWORD sz) { X509_NAME* name; X509* x509; BIO* bio; - char *ret; + char* ret; bio = BIO_new_mem_buf(b, sz); if (!bio) @@ -66,7 +66,7 @@ int TestNCryptSmartcard(int argc, char* argv[]) SECURITY_STATUS status; size_t j = 0; DWORD providerCount; - NCryptProviderName *names = NULL; + NCryptProviderName* names = NULL; status = NCryptEnumStorageProviders(&providerCount, &names, NCRYPT_SILENT_FLAG); if (status != ERROR_SUCCESS) @@ -80,8 +80,8 @@ int TestNCryptSmartcard(int argc, char* argv[]) size_t i = 0; NCryptKeyName* keyName = NULL; - if (WideCharToMultiByte(CP_UTF8, 0, names[j].pszName, -1, providerNameStr, sizeof(providerNameStr), NULL, - FALSE) <= 0) + if (WideCharToMultiByte(CP_UTF8, 0, names[j].pszName, -1, providerNameStr, + sizeof(providerNameStr), NULL, FALSE) <= 0) continue; printf("provider %ld: %s\n", j, providerNameStr); @@ -89,8 +89,8 @@ int TestNCryptSmartcard(int argc, char* argv[]) if (status != ERROR_SUCCESS) continue; - while ((status = NCryptEnumKeys(provider, NULL, &keyName, &enumState, NCRYPT_SILENT_FLAG)) == - ERROR_SUCCESS) + while ((status = NCryptEnumKeys(provider, NULL, &keyName, &enumState, + NCRYPT_SILENT_FLAG)) == ERROR_SUCCESS) { NCRYPT_KEY_HANDLE phKey; DWORD dwFlags = 0, cbOutput; @@ -98,28 +98,31 @@ int TestNCryptSmartcard(int argc, char* argv[]) WCHAR reader[1024] = { 0 }; PBYTE certBytes = NULL; - if (WideCharToMultiByte(CP_UTF8, 0, keyName->pszName, -1, keyNameStr, sizeof(keyNameStr), NULL, - FALSE) <= 0) + if (WideCharToMultiByte(CP_UTF8, 0, keyName->pszName, -1, keyNameStr, + sizeof(keyNameStr), NULL, FALSE) <= 0) continue; printf("\tkey %ld: %s\n", i, keyNameStr); - status = - NCryptOpenKey(provider, &phKey, keyName->pszName, keyName->dwLegacyKeySpec, dwFlags); + status = NCryptOpenKey(provider, &phKey, keyName->pszName, keyName->dwLegacyKeySpec, + dwFlags); if (status != ERROR_SUCCESS) { WLog_ERR(TAG, "unable to open key %s", keyNameStr); continue; } - status = NCryptGetProperty(phKey, NCRYPT_READER_PROPERTY, (PBYTE)reader, sizeof(reader), &cbOutput, dwFlags); + status = NCryptGetProperty(phKey, NCRYPT_READER_PROPERTY, (PBYTE)reader, sizeof(reader), + &cbOutput, dwFlags); if (status == ERROR_SUCCESS) { char readerStr[1024] = { 0 }; - if (WideCharToMultiByte(CP_UTF8, 0, reader, cbOutput, readerStr, sizeof(readerStr), NULL, FALSE) > 0) + if (WideCharToMultiByte(CP_UTF8, 0, reader, cbOutput, readerStr, sizeof(readerStr), + NULL, FALSE) > 0) printf("\treader: %s\n", readerStr); } - status = NCryptGetProperty(phKey, NCRYPT_CERTIFICATE_PROPERTY, NULL, 0, &cbOutput, dwFlags); + status = + NCryptGetProperty(phKey, NCRYPT_CERTIFICATE_PROPERTY, NULL, 0, &cbOutput, dwFlags); if (status != ERROR_SUCCESS) { /* WLog_ERR(TAG, "unable to retrieve certificate for key '%s'", keyNameStr); */ @@ -128,7 +131,7 @@ int TestNCryptSmartcard(int argc, char* argv[]) certBytes = calloc(1, cbOutput); status = NCryptGetProperty(phKey, NCRYPT_CERTIFICATE_PROPERTY, certBytes, cbOutput, - &cbOutput, dwFlags); + &cbOutput, dwFlags); if (status != ERROR_SUCCESS) { WLog_ERR(TAG, "unable to retrieve certificate for key %s", keyNameStr); diff --git a/winpr/libwinpr/registry/registry_reg.c b/winpr/libwinpr/registry/registry_reg.c index 7e461bad5..b287c3f89 100644 --- a/winpr/libwinpr/registry/registry_reg.c +++ b/winpr/libwinpr/registry/registry_reg.c @@ -208,21 +208,21 @@ static RegVal* reg_load_value(const Reg* reg, RegKey* key) } value->data.dword = (DWORD)val; } - break; - case REG_QWORD: + break; + case REG_QWORD: + { + unsigned long long val; + errno = 0; + val = strtoull(data, NULL, 0); + + if ((errno != 0) || (val > UINT64_MAX)) { - unsigned long long val; - errno = 0; - val = strtoull(data, NULL, 0); - - if ((errno != 0) || (val > UINT64_MAX)) - { - WLog_WARN(TAG, "%s::%s value %s invalid", key->name, value->name, data); - goto fail; - } - - value->data.qword = (UINT64)val; + WLog_WARN(TAG, "%s::%s value %s invalid", key->name, value->name, data); + goto fail; } + + value->data.qword = (UINT64)val; + } break; case REG_SZ: { @@ -252,9 +252,9 @@ static RegVal* reg_load_value(const Reg* reg, RegKey* key) break; default: WLog_ERR(TAG, "[%s] %s unimplemented format: %s", key->name, value->name, - reg_data_type_string(value->type)); + reg_data_type_string(value->type)); break; - } + } if (!key->values) { diff --git a/winpr/libwinpr/smartcard/smartcard_pcsc.c b/winpr/libwinpr/smartcard/smartcard_pcsc.c index 463b264bc..f934f6f6c 100644 --- a/winpr/libwinpr/smartcard/smartcard_pcsc.c +++ b/winpr/libwinpr/smartcard/smartcard_pcsc.c @@ -1025,15 +1025,15 @@ typedef struct static PcscKnownAtr knownAtrs[] = { /* Yubico YubiKey 5 NFC (PKI) */ - { { 0x3B, 0xFD, 0x13, 0x00, 0x00, 0x81, 0x31, 0xFE, - 0x15, 0x80, 0x73, 0xC0, 0x21, 0xC0, 0x57, 0x59, - 0x75, 0x62, 0x69, 0x4B, 0x65, 0x79, 0x40 }, - 23, "NIST SP 800-73 [PIV]" }, + { { 0x3B, 0xFD, 0x13, 0x00, 0x00, 0x81, 0x31, 0xFE, 0x15, 0x80, 0x73, 0xC0, + 0x21, 0xC0, 0x57, 0x59, 0x75, 0x62, 0x69, 0x4B, 0x65, 0x79, 0x40 }, + 23, + "NIST SP 800-73 [PIV]" }, /* PIVKey C910 PKI Smart Card (eID) */ - { { 0x3B, 0xFC, 0x18, 0x00, 0x00, 0x81, 0x31, 0x80, - 0x45, 0x90, 0x67, 0x46, 0x4A, 0x00, 0x64, 0x16, - 0x06, 0xF2, 0x72, 0x7E, 0x00, 0xE0 }, - 22, "PIVKey Feitian (E0)" } + { { 0x3B, 0xFC, 0x18, 0x00, 0x00, 0x81, 0x31, 0x80, 0x45, 0x90, 0x67, + 0x46, 0x4A, 0x00, 0x64, 0x16, 0x06, 0xF2, 0x72, 0x7E, 0x00, 0xE0 }, + 22, + "PIVKey Feitian (E0)" } }; #ifndef ARRAY_LENGTH diff --git a/winpr/libwinpr/sspi/Kerberos/kerberos.c b/winpr/libwinpr/sspi/Kerberos/kerberos.c index a7f8dbcb2..8c71199e7 100644 --- a/winpr/libwinpr/sspi/Kerberos/kerberos.c +++ b/winpr/libwinpr/sspi/Kerberos/kerberos.c @@ -158,8 +158,10 @@ static void gss_log_status_messages(OM_uint32 major_status, OM_uint32 minor_stat /* taken from lib/gssapi/krb5/gssapi_err_krb5.h */ #define KG_EMPTY_CCACHE (39756044L) -static INLINE BOOL sspi_is_no_creds(OM_uint32 major, OM_uint32 minor) { - return (major == SSPI_GSS_S_NO_CRED) || (major == SSPI_GSS_S_FAILURE && minor == KG_EMPTY_CCACHE); +static INLINE BOOL sspi_is_no_creds(OM_uint32 major, OM_uint32 minor) +{ + return (major == SSPI_GSS_S_NO_CRED) || + (major == SSPI_GSS_S_FAILURE && minor == KG_EMPTY_CCACHE); } #endif /* WITH_GSSAPI */ @@ -247,7 +249,7 @@ static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleA( if (pszPrincipal) { /* Find realm component if included and convert to uppercase */ - char *p = strchr(pszPrincipal, '@'); + char* p = strchr(pszPrincipal, '@'); CharUpperA(p); if ((rv = krb5_parse_name(ctx, pszPrincipal, &principal))) @@ -304,7 +306,7 @@ static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleA( if ((rv = krb5_kt_default(ctx, &keytab))) goto cleanup; } - + if (fCredentialUse & SECPKG_CRED_OUTBOUND) { if ((rv = krb5_get_init_creds_opt_alloc(ctx, &gic_opt))) @@ -324,13 +326,14 @@ static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleA( if (krb_settings->withPac) krb5_get_init_creds_opt_set_pac_request(ctx, gic_opt, TRUE); if (krb_settings->armorCache) - krb5_get_init_creds_opt_set_fast_ccache_name(ctx, gic_opt, krb_settings->armorCache); + krb5_get_init_creds_opt_set_fast_ccache_name(ctx, gic_opt, + krb_settings->armorCache); if (krb_settings->pkinitX509Identity) krb5_get_init_creds_opt_set_pa(ctx, gic_opt, "X509_user_identity", - krb_settings->pkinitX509Identity); + krb_settings->pkinitX509Identity); if (krb_settings->pkinitX509Anchors) krb5_get_init_creds_opt_set_pa(ctx, gic_opt, "X509_anchors", - krb_settings->pkinitX509Anchors); + krb_settings->pkinitX509Anchors); } #ifdef WITH_GSSAPI_MIT @@ -349,8 +352,8 @@ static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleA( /* Check if there are initial creds already in the cache there's no need to request new ones */ major = sspi_gss_acquire_cred_from(&minor, SSPI_GSS_C_NO_NAME, SSPI_GSS_C_INDEFINITE, - &desired_mechs, cred_usage, &cred_store, &gss_creds, - NULL, &time_rec); + &desired_mechs, cred_usage, &cred_store, &gss_creds, NULL, + &time_rec); gss_log_status_messages(major, minor); /* No use getting initial creds for inbound creds */ @@ -607,11 +610,12 @@ static SECURITY_STATUS SEC_ENTRY kerberos_InitializeSecurityContextW( } static SECURITY_STATUS SEC_ENTRY kerberos_AcceptSecurityContext( - PCredHandle phCredential, PCtxtHandle phContext, PSecBufferDesc pInput, ULONG fContextReq, - ULONG TargetDataRep, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpity) + PCredHandle phCredential, PCtxtHandle phContext, PSecBufferDesc pInput, ULONG fContextReq, + ULONG TargetDataRep, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG* pfContextAttr, + PTimeStamp ptsExpity) { #ifdef WITH_GSSAPI - KRB_CONTEXT *context; + KRB_CONTEXT* context; sspi_gss_cred_id_t creds; sspi_gss_ctx_id_t gss_ctx = SSPI_GSS_C_NO_CONTEXT; PSecBuffer input_buffer; @@ -637,10 +641,11 @@ static SECURITY_STATUS SEC_ENTRY kerberos_AcceptSecurityContext( input_token.length = input_buffer->cbBuffer; input_token.value = input_buffer->pvBuffer; - - major = sspi_gss_accept_sec_context( - &minor, &gss_ctx, creds, &input_token, SSPI_GSS_C_NO_CHANNEL_BINDINGS, NULL, NULL, &output_token, pfContextAttr, &time_rec, NULL); - + + major = sspi_gss_accept_sec_context(&minor, &gss_ctx, creds, &input_token, + SSPI_GSS_C_NO_CHANNEL_BINDINGS, NULL, NULL, &output_token, + pfContextAttr, &time_rec, NULL); + if (SSPI_GSS_ERROR(major)) { gss_log_status_messages(major, minor); diff --git a/winpr/libwinpr/sspi/NTLM/ntlm.c b/winpr/libwinpr/sspi/NTLM/ntlm.c index e0d3745d6..4afa25b31 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm.c @@ -521,7 +521,7 @@ ntlm_AcceptSecurityContext(PCredHandle phCredential, PCtxtHandle phContext, PSec } default: - return SEC_E_OUT_OF_SEQUENCE; + return SEC_E_OUT_OF_SEQUENCE; } } @@ -1367,19 +1367,19 @@ char* ntlm_negotiate_flags_string(char* buffer, size_t size, UINT32 flags) const char* str = ntlm_get_negotiate_string(mask); const size_t flen = strlen(str); - if ((len > 0) && (buffer[len - 1] != ' ')) - { - if (size - len < 1) - break; - winpr_str_append("|", buffer, size, NULL); - len++; - } + if ((len > 0) && (buffer[len - 1] != ' ')) + { + if (size - len < 1) + break; + winpr_str_append("|", buffer, size, NULL); + len++; + } - if (size - len < flen) - break; - winpr_str_append(str, buffer, size, NULL); - } - } + if (size - len < flen) + break; + winpr_str_append(str, buffer, size, NULL); + } + } return buffer; } diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_compute.c b/winpr/libwinpr/sspi/NTLM/ntlm_compute.c index 9284583c0..44aa1dc6e 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_compute.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm_compute.c @@ -298,15 +298,15 @@ static BOOL ntlm_fetch_ntlm_v2_hash(NTLM_CONTEXT* context, BYTE* hash) goto fail; #ifdef WITH_DEBUG_NTLM - WLog_VRB(TAG, "NTLM Hash:"); - winpr_HexDump(TAG, WLOG_DEBUG, entry->NtHash, 16); + WLog_VRB(TAG, "NTLM Hash:"); + winpr_HexDump(TAG, WLOG_DEBUG, entry->NtHash, 16); #endif - NTOWFv2FromHashW(entry->NtHash, (LPWSTR)credentials->identity.User, - credentials->identity.UserLength * sizeof(WCHAR), - (LPWSTR)credentials->identity.Domain, - credentials->identity.DomainLength * sizeof(WCHAR), (BYTE*)hash); + NTOWFv2FromHashW(entry->NtHash, (LPWSTR)credentials->identity.User, + credentials->identity.UserLength * sizeof(WCHAR), + (LPWSTR)credentials->identity.Domain, + credentials->identity.DomainLength * sizeof(WCHAR), (BYTE*)hash); - rc = TRUE; + rc = TRUE; fail: SamFreeEntry(sam, entry); diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_message.c b/winpr/libwinpr/sspi/NTLM/ntlm_message.c index c1410e902..ef6a80d31 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_message.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm_message.c @@ -555,11 +555,11 @@ SECURITY_STATUS ntlm_read_NegotiateMessage(NTLM_CONTEXT* context, PSecBuffer buf return SEC_E_INVALID_TOKEN; } - if (!ntlm_read_message_fields_buffer(s, &message->DomainName)) - return SEC_E_INVALID_TOKEN; + if (!ntlm_read_message_fields_buffer(s, &message->DomainName)) + return SEC_E_INVALID_TOKEN; - if (!ntlm_read_message_fields_buffer(s, &message->Workstation)) - return SEC_E_INVALID_TOKEN; + if (!ntlm_read_message_fields_buffer(s, &message->Workstation)) + return SEC_E_INVALID_TOKEN; length = Stream_GetPosition(s); WINPR_ASSERT(length <= ULONG_MAX); @@ -890,8 +890,8 @@ SECURITY_STATUS ntlm_write_ChallengeMessage(NTLM_CONTEXT* context, PSecBuffer bu return SEC_E_INTERNAL_ERROR; } - Stream_Write(s, message->ServerChallenge, 8); /* ServerChallenge (8 bytes) */ - Stream_Write(s, message->Reserved, 8); /* Reserved (8 bytes), should be ignored */ + Stream_Write(s, message->ServerChallenge, 8); /* ServerChallenge (8 bytes) */ + Stream_Write(s, message->Reserved, 8); /* Reserved (8 bytes), should be ignored */ /* TargetInfoFields (8 bytes) */ if (!ntlm_write_message_fields(s, &(message->TargetInfo))) diff --git a/winpr/libwinpr/sspi/Negotiate/negotiate.c b/winpr/libwinpr/sspi/Negotiate/negotiate.c index 1983084ca..5501f384e 100644 --- a/winpr/libwinpr/sspi/Negotiate/negotiate.c +++ b/winpr/libwinpr/sspi/Negotiate/negotiate.c @@ -239,7 +239,8 @@ static void negotiate_ContextFree(NEGOTIATE_CONTEXT* context) static BOOL negotiate_oid_compare(const sspi_gss_OID_desc* oid1, const sspi_gss_OID_desc* oid2) { - return (oid1->length == oid2->length) && (memcmp(oid1->elements, oid2->elements, oid1->length) == 0); + return (oid1->length == oid2->length) && + (memcmp(oid1->elements, oid2->elements, oid1->length) == 0); } static const char* negotiate_mech_name(const sspi_gss_OID_desc* oid) @@ -336,7 +337,7 @@ static BOOL negotiate_get_config(BOOL* kerberos, BOOL* ntlm) return TRUE; } -static BOOL negotiate_write_neg_token(PSecBuffer output_buffer, NegToken *token) +static BOOL negotiate_write_neg_token(PSecBuffer output_buffer, NegToken* token) { size_t token_len = 0; size_t init_token_len = 0; @@ -600,7 +601,8 @@ static SECURITY_STATUS negotiate_mic_exchange(NEGOTIATE_CONTEXT* context, NegTok /* Store the mic token after the mech token in the output buffer */ output_token->mic.BufferType = SECBUFFER_TOKEN; output_token->mic.cbBuffer = output_buffer->cbBuffer - output_token->mechToken.cbBuffer; - output_token->mic.pvBuffer = (BYTE*)output_buffer->pvBuffer + output_token->mechToken.cbBuffer; + output_token->mic.pvBuffer = + (BYTE*)output_buffer->pvBuffer + output_token->mechToken.cbBuffer; CopyMemory(&mic_buffers[1], &output_token->mic, sizeof(SecBuffer)); @@ -665,8 +667,8 @@ static SECURITY_STATUS SEC_ENTRY negotiate_InitializeSecurityContextW( CopyMemory(&output_token.mechToken, output_buffer, sizeof(SecBuffer)); status = MechTable[i].pkg->table_w->InitializeSecurityContextW( - &creds[i].cred, NULL, pszTargetName, fContextReq | creds[i].mech->flags, - Reserved1, TargetDataRep, NULL, Reserved2, &init_context.sub_context, &mech_output, + &creds[i].cred, NULL, pszTargetName, fContextReq | creds[i].mech->flags, Reserved1, + TargetDataRep, NULL, Reserved2, &init_context.sub_context, &mech_output, pfContextAttr, ptsExpiry); /* If the mechanism failed we can't use it; skip */ @@ -796,9 +798,9 @@ static SECURITY_STATUS SEC_ENTRY negotiate_InitializeSecurityContextW( CopyMemory(&output_token.mechToken, output_buffer, sizeof(SecBuffer)); status = context->mech->pkg->table_w->InitializeSecurityContextW( - sub_cred, sub_context, pszTargetName, fContextReq | context->mech->flags, - Reserved1, TargetDataRep, input_token.mechToken.cbBuffer ? &mech_input : NULL, - Reserved2, &context->sub_context, &mech_output, pfContextAttr, ptsExpiry); + sub_cred, sub_context, pszTargetName, fContextReq | context->mech->flags, Reserved1, + TargetDataRep, input_token.mechToken.cbBuffer ? &mech_input : NULL, Reserved2, + &context->sub_context, &mech_output, pfContextAttr, ptsExpiry); if (IsSecurityStatusError(status)) return status; @@ -963,7 +965,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_AcceptSecurityContext( p = negotiate_read_tlv(p, &tag, &len, &bytes_remain); if (!p || len > bytes_remain || tag != 0x06) return SEC_E_INVALID_TOKEN; - + oid.length = len; oid.elements = p; p += len; @@ -988,8 +990,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_AcceptSecurityContext( status = SEC_E_NO_CREDENTIALS; } - WLog_DBG(TAG, "Initiators preferred mechanism: %s", - negotiate_mech_name(&oid)); + WLog_DBG(TAG, "Initiators preferred mechanism: %s", negotiate_mech_name(&oid)); } else { @@ -1098,9 +1099,8 @@ static SECURITY_STATUS SEC_ENTRY negotiate_AcceptSecurityContext( CopyMemory(&output_token.mechToken, output_buffer, sizeof(SecBuffer)); status = context->mech->pkg->table->AcceptSecurityContext( - sub_cred, &context->sub_context, &mech_input, - fContextReq | context->mech->flags, TargetDataRep, &context->sub_context, - &mech_output, pfContextAttr, ptsTimeStamp); + sub_cred, &context->sub_context, &mech_input, fContextReq | context->mech->flags, + TargetDataRep, &context->sub_context, &mech_output, pfContextAttr, ptsTimeStamp); if (IsSecurityStatusError(status)) return status; @@ -1216,7 +1216,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_QueryContextAttributesA(PCtxtHandle p if (context->mech->pkg->table->QueryContextAttributesA) return context->mech->pkg->table->QueryContextAttributesA(&context->sub_context, ulAttribute, pBuffer); - + return SEC_E_UNSUPPORTED_FUNCTION; } @@ -1232,7 +1232,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_SetContextAttributesW(PCtxtHandle phC if (context->mech->pkg->table_w->SetContextAttributesW) return context->mech->pkg->table_w->SetContextAttributesW(&context->sub_context, ulAttribute, pBuffer, cbBuffer); - + return SEC_E_UNSUPPORTED_FUNCTION; } @@ -1248,7 +1248,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_SetContextAttributesA(PCtxtHandle phC if (context->mech->pkg->table->SetContextAttributesA) return context->mech->pkg->table->SetContextAttributesA(&context->sub_context, ulAttribute, pBuffer, cbBuffer); - + return SEC_E_UNSUPPORTED_FUNCTION; } @@ -1392,7 +1392,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_DecryptMessage(PCtxtHandle phContext, if (context->mech->pkg->table->DecryptMessage) return context->mech->pkg->table->DecryptMessage(&context->sub_context, pMessage, MessageSeqNo, pfQOP); - + return SEC_E_UNSUPPORTED_FUNCTION; } @@ -1411,7 +1411,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_MakeSignature(PCtxtHandle phContext, if (context->mech->pkg->table->MakeSignature) return context->mech->pkg->table->MakeSignature(&context->sub_context, fQOP, pMessage, MessageSeqNo); - + return SEC_E_UNSUPPORTED_FUNCTION; } @@ -1430,7 +1430,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_VerifySignature(PCtxtHandle phContext if (context->mech->pkg->table->VerifySignature) return context->mech->pkg->table->VerifySignature(&context->sub_context, pMessage, MessageSeqNo, pfQOP); - + return SEC_E_UNSUPPORTED_FUNCTION; } diff --git a/winpr/libwinpr/sspi/Negotiate/negotiate.h b/winpr/libwinpr/sspi/Negotiate/negotiate.h index 449be630d..4925f2eec 100644 --- a/winpr/libwinpr/sspi/Negotiate/negotiate.h +++ b/winpr/libwinpr/sspi/Negotiate/negotiate.h @@ -41,7 +41,7 @@ typedef struct NEGOTIATE_STATE state; CtxtHandle sub_context; SecBuffer mechTypes; - const Mech *mech; + const Mech* mech; BOOL mic; BOOL spnego; } NEGOTIATE_CONTEXT; diff --git a/winpr/libwinpr/sspi/sspi_gss.c b/winpr/libwinpr/sspi/sspi_gss.c index 78a36ec61..33aed6192 100644 --- a/winpr/libwinpr/sspi/sspi_gss.c +++ b/winpr/libwinpr/sspi/sspi_gss.c @@ -1043,11 +1043,12 @@ UINT32 SSPI_GSSAPI sspi_gss_set_neg_mechs(UINT32* minor_status, sspi_gss_cred_id return status; } -UINT32 SSPI_GSSAPI sspi_gss_acquire_cred_from(UINT32 *minor_status, - sspi_gss_name_t desired_name, UINT32 time_req, sspi_gss_OID_set desired_mechs, - sspi_gss_cred_usage_t cred_usage, sspi_gss_const_key_value_set_t cred_store, - sspi_gss_cred_id_t *output_cred_handle, sspi_gss_OID_set *actual_mechs, - UINT32* time_rec) +UINT32 SSPI_GSSAPI sspi_gss_acquire_cred_from(UINT32* minor_status, sspi_gss_name_t desired_name, + UINT32 time_req, sspi_gss_OID_set desired_mechs, + sspi_gss_cred_usage_t cred_usage, + sspi_gss_const_key_value_set_t cred_store, + sspi_gss_cred_id_t* output_cred_handle, + sspi_gss_OID_set* actual_mechs, UINT32* time_rec) { SECURITY_STATUS status; InitOnceExecuteOnce(&g_Initialized, sspi_GssApiInit, NULL, NULL); @@ -1059,9 +1060,9 @@ UINT32 SSPI_GSSAPI sspi_gss_acquire_cred_from(UINT32 *minor_status, } status = g_GssApi->gss_acquire_cred_from(minor_status, desired_name, time_req, desired_mechs, - cred_usage, cred_store, output_cred_handle, actual_mechs, time_rec); + cred_usage, cred_store, output_cred_handle, + actual_mechs, time_rec); WLog_DBG(TAG, "gss_acquire_cred_from: %s (0x%08" PRIX32 ")", GetSecurityStatusString(status), status); return status; - } diff --git a/winpr/libwinpr/sspi/sspi_gss.h b/winpr/libwinpr/sspi/sspi_gss.h index e0572d116..e5329cf79 100644 --- a/winpr/libwinpr/sspi/sspi_gss.h +++ b/winpr/libwinpr/sspi/sspi_gss.h @@ -608,31 +608,34 @@ extern "C" sspi_gss_cred_id_t cred_handle, const sspi_gss_OID_set mech_set); - struct sspi_gss_key_value_element_struct { - const char *key; - const char *value; + struct sspi_gss_key_value_element_struct + { + const char* key; + const char* value; }; typedef struct sspi_gss_key_value_element_struct sspi_gss_key_value_element_desc; - struct sspi_gss_key_value_set_struct { + struct sspi_gss_key_value_set_struct + { UINT32 count; - sspi_gss_key_value_element_desc *elements; + sspi_gss_key_value_element_desc* elements; }; typedef struct sspi_gss_key_value_set_struct sspi_gss_key_value_set_desc; - typedef const sspi_gss_key_value_set_desc *sspi_gss_const_key_value_set_t; + typedef const sspi_gss_key_value_set_desc* sspi_gss_const_key_value_set_t; - UINT32 SSPI_GSSAPI sspi_gss_acquire_cred_from(UINT32 *minor_status, - sspi_gss_name_t desired_name, UINT32 time_req, sspi_gss_OID_set desired_mechs, - sspi_gss_cred_usage_t cred_usage, sspi_gss_const_key_value_set_t cred_store, - sspi_gss_cred_id_t *output_cred_handle, sspi_gss_OID_set *actual_mechs, - UINT32* time_rec); - - typedef UINT32 (SSPI_GSSAPI* fn_sspi_gss_acquire_cred_from)(UINT32 *minor_status, - sspi_gss_name_t desired_name, UINT32 time_req, sspi_gss_OID_set desired_mechs, - sspi_gss_cred_usage_t cred_usage, sspi_gss_const_key_value_set_t cred_store, - sspi_gss_cred_id_t *output_cred_handle, sspi_gss_OID_set *actual_mechs, - UINT32* time_rec); + UINT32 SSPI_GSSAPI sspi_gss_acquire_cred_from(UINT32* minor_status, + sspi_gss_name_t desired_name, UINT32 time_req, + sspi_gss_OID_set desired_mechs, + sspi_gss_cred_usage_t cred_usage, + sspi_gss_const_key_value_set_t cred_store, + sspi_gss_cred_id_t* output_cred_handle, + sspi_gss_OID_set* actual_mechs, UINT32* time_rec); + typedef UINT32(SSPI_GSSAPI* fn_sspi_gss_acquire_cred_from)( + UINT32* minor_status, sspi_gss_name_t desired_name, UINT32 time_req, + sspi_gss_OID_set desired_mechs, sspi_gss_cred_usage_t cred_usage, + sspi_gss_const_key_value_set_t cred_store, sspi_gss_cred_id_t* output_cred_handle, + sspi_gss_OID_set* actual_mechs, UINT32* time_rec); #ifdef __cplusplus } diff --git a/winpr/libwinpr/sspi/test/TestNTLM.c b/winpr/libwinpr/sspi/test/TestNTLM.c index 10e054a4a..3044e2b92 100644 --- a/winpr/libwinpr/sspi/test/TestNTLM.c +++ b/winpr/libwinpr/sspi/test/TestNTLM.c @@ -414,9 +414,9 @@ static int test_ntlm_server_authenticate(TEST_NTLM_SERVER* ntlm) CopyMemory(AuthNtlmHash.NtlmHash, TEST_NTLM_HASH, 16); } - status = ntlm->table->SetContextAttributes( - &ntlm->context, SECPKG_ATTR_AUTH_NTLM_HASH, &AuthNtlmHash, - sizeof(SecPkgContext_AuthNtlmHash)); + status = + ntlm->table->SetContextAttributes(&ntlm->context, SECPKG_ATTR_AUTH_NTLM_HASH, + &AuthNtlmHash, sizeof(SecPkgContext_AuthNtlmHash)); hash_set = TRUE; } diff --git a/winpr/libwinpr/thread/test/TestThreadCreateProcess.c b/winpr/libwinpr/thread/test/TestThreadCreateProcess.c index 981ba3881..29016b1bf 100644 --- a/winpr/libwinpr/thread/test/TestThreadCreateProcess.c +++ b/winpr/libwinpr/thread/test/TestThreadCreateProcess.c @@ -22,7 +22,7 @@ int TestThreadCreateProcess(int argc, char* argv[]) TCHAR lpCommandLine[200] = _T("printenv"); #endif - //LPTSTR lpCommandLine; + // LPTSTR lpCommandLine; LPSECURITY_ATTRIBUTES lpProcessAttributes; LPSECURITY_ATTRIBUTES lpThreadAttributes; BOOL bInheritHandles; diff --git a/winpr/libwinpr/utils/collections/HashTable.c b/winpr/libwinpr/utils/collections/HashTable.c index 453f3aed2..5335e1894 100644 --- a/winpr/libwinpr/utils/collections/HashTable.c +++ b/winpr/libwinpr/utils/collections/HashTable.c @@ -121,13 +121,13 @@ static INLINE BOOL HashTable_IsProbablePrime(size_t oddNumber) static INLINE size_t HashTable_CalculateIdealNumOfBuckets(wHashTable* table) { - float tmp; + float tmp; size_t idealNumOfBuckets; WINPR_ASSERT(table); - tmp = (table->numOfElements / table->idealRatio); - idealNumOfBuckets = (size_t)tmp; + tmp = (table->numOfElements / table->idealRatio); + idealNumOfBuckets = (size_t)tmp; if (idealNumOfBuckets < 5) idealNumOfBuckets = 5; diff --git a/winpr/libwinpr/utils/corkscrew/debug.c b/winpr/libwinpr/utils/corkscrew/debug.c index 0034fc9b3..5cf1366e8 100644 --- a/winpr/libwinpr/utils/corkscrew/debug.c +++ b/winpr/libwinpr/utils/corkscrew/debug.c @@ -259,4 +259,3 @@ char** winpr_corkscrew_backtrace_symbols(void* buffer, size_t* used) return vlines; } } - diff --git a/winpr/libwinpr/utils/lodepng/lodepng.c b/winpr/libwinpr/utils/lodepng/lodepng.c index c7b3f42f9..4ef382d7c 100644 --- a/winpr/libwinpr/utils/lodepng/lodepng.c +++ b/winpr/libwinpr/utils/lodepng/lodepng.c @@ -4738,8 +4738,8 @@ static unsigned readChunk_zTXt(LodePNGInfo* info, const LodePNGDecompressSetting while (!error) /*not really a while loop, only used to break on error*/ { for (length = 0; length < chunkLength && data[length] != 0; length++) - if (length + 2 >= chunkLength) - CERROR_BREAK(error, 75) /*no null termination, corrupt?*/ + if (length + 2 >= chunkLength) + CERROR_BREAK(error, 75) /*no null termination, corrupt?*/ if (length < 1 || length > 79) CERROR_BREAK(error, 89) /*keyword too short or long*/ diff --git a/winpr/libwinpr/utils/wlog/wlog.c b/winpr/libwinpr/utils/wlog/wlog.c index e6026978c..0542d5fab 100644 --- a/winpr/libwinpr/utils/wlog/wlog.c +++ b/winpr/libwinpr/utils/wlog/wlog.c @@ -237,7 +237,7 @@ static BOOL WLog_Write(wLog* log, wLogMessage* message) if (!appender->active) if (!WLog_OpenAppender(log)) - return FALSE; + return FALSE; EnterCriticalSection(&appender->lock); diff --git a/winpr/libwinpr/wtsapi/wtsapi.c b/winpr/libwinpr/wtsapi/wtsapi.c index f43533aa5..d5272b11d 100644 --- a/winpr/libwinpr/wtsapi/wtsapi.c +++ b/winpr/libwinpr/wtsapi/wtsapi.c @@ -51,10 +51,10 @@ static HMODULE g_WtsApi32Module = NULL; static WtsApiFunctionTable WtsApi32_WtsApiFunctionTable = { 0 }; #ifdef __MINGW32__ -#define WTSAPI32_LOAD_PROC(NAME, TYPE) \ +#define WTSAPI32_LOAD_PROC(NAME, TYPE) \ WtsApi32_WtsApiFunctionTable.p##NAME = (TYPE)GetProcAddress(g_WtsApi32Module, "WTS" #NAME); #else -#define WTSAPI32_LOAD_PROC(NAME, TYPE) \ +#define WTSAPI32_LOAD_PROC(NAME, TYPE) \ WtsApi32_WtsApiFunctionTable.p##NAME = (##TYPE)GetProcAddress(g_WtsApi32Module, "WTS" #NAME); #endif