diff --git a/channels/ainput/client/ainput_main.c b/channels/ainput/client/ainput_main.c index 304f1bc3c..f9300401f 100644 --- a/channels/ainput/client/ainput_main.c +++ b/channels/ainput/client/ainput_main.c @@ -56,7 +56,7 @@ struct AINPUT_PLUGIN_ static UINT ainput_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, wStream* data) { UINT16 type = 0; - AINPUT_PLUGIN* ainput = NULL; + AINPUT_PLUGIN* ainput = nullptr; GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; WINPR_ASSERT(callback); @@ -127,7 +127,7 @@ static UINT ainput_send_input_event(AInputClientContext* context, UINT64 flags, WINPR_ASSERT(callback->channel); WINPR_ASSERT(callback->channel->Write); const UINT rc = callback->channel->Write(callback->channel, (ULONG)Stream_Length(s), - Stream_Buffer(s), NULL); + Stream_Buffer(s), nullptr); LeaveCriticalSection(&ainput->lock); return rc; } @@ -184,8 +184,8 @@ static void terminate_plugin_cb(GENERIC_DYNVC_PLUGIN* base) } static const IWTSVirtualChannelCallback ainput_functions = { ainput_on_data_received, - NULL, /* Open */ - ainput_on_close, NULL }; + nullptr, /* Open */ + ainput_on_close, nullptr }; /** * Function description diff --git a/channels/ainput/server/ainput_main.c b/channels/ainput/server/ainput_main.c index b0a27d4df..f8cb971eb 100644 --- a/channels/ainput/server/ainput_main.c +++ b/channels/ainput/server/ainput_main.c @@ -89,10 +89,10 @@ static BOOL ainput_server_is_open(ainput_server_context* context) static UINT ainput_server_open_channel(ainput_server* ainput) { DWORD Error = 0; - HANDLE hEvent = NULL; + HANDLE hEvent = nullptr; DWORD StartTick = 0; DWORD BytesReturned = 0; - PULONG pSessionId = NULL; + PULONG pSessionId = nullptr; WINPR_ASSERT(ainput); @@ -108,7 +108,7 @@ static UINT ainput_server_open_channel(ainput_server* ainput) hEvent = WTSVirtualChannelManagerGetEventHandle(ainput->context.vcm); StartTick = GetTickCount(); - while (ainput->ainput_channel == NULL) + while (ainput->ainput_channel == nullptr) { if (WaitForSingleObject(hEvent, 1000) == WAIT_FAILED) { @@ -158,7 +158,7 @@ static UINT ainput_server_open_channel(ainput_server* ainput) static UINT ainput_server_send_version(ainput_server* ainput) { ULONG written = 0; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(ainput); @@ -216,9 +216,9 @@ static UINT ainput_server_recv_mouse_event(ainput_server* ainput, wStream* s) static HANDLE ainput_server_get_channel_handle(ainput_server* ainput) { - void* buffer = NULL; + void* buffer = nullptr; DWORD BytesReturned = 0; - HANDLE ChannelEvent = NULL; + HANDLE ChannelEvent = nullptr; WINPR_ASSERT(ainput); @@ -293,7 +293,7 @@ static DWORD WINAPI ainput_server_thread_func(LPVOID arg) } (void)WTSVirtualChannelClose(ainput->ainput_channel); - ainput->ainput_channel = NULL; + ainput->ainput_channel = nullptr; if (error && ainput->context.rdpcontext) setChannelError(ainput->context.rdpcontext, error, @@ -314,21 +314,21 @@ static UINT ainput_server_open(ainput_server_context* context) WINPR_ASSERT(ainput); - if (!ainput->externalThread && (ainput->thread == NULL)) + if (!ainput->externalThread && (ainput->thread == nullptr)) { - ainput->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ainput->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!ainput->stopEvent) { WLog_ERR(TAG, "CreateEvent failed!"); return ERROR_INTERNAL_ERROR; } - ainput->thread = CreateThread(NULL, 0, ainput_server_thread_func, ainput, 0, NULL); + ainput->thread = CreateThread(nullptr, 0, ainput_server_thread_func, ainput, 0, nullptr); if (!ainput->thread) { WLog_ERR(TAG, "CreateEvent failed!"); (void)CloseHandle(ainput->stopEvent); - ainput->stopEvent = NULL; + ainput->stopEvent = nullptr; return ERROR_INTERNAL_ERROR; } } @@ -362,15 +362,15 @@ static UINT ainput_server_close(ainput_server_context* context) (void)CloseHandle(ainput->thread); (void)CloseHandle(ainput->stopEvent); - ainput->thread = NULL; - ainput->stopEvent = NULL; + ainput->thread = nullptr; + ainput->stopEvent = nullptr; } if (ainput->externalThread) { if (ainput->state != AINPUT_INITIAL) { (void)WTSVirtualChannelClose(ainput->ainput_channel); - ainput->ainput_channel = NULL; + ainput->ainput_channel = nullptr; ainput->state = AINPUT_INITIAL; } } @@ -401,7 +401,7 @@ ainput_server_context* ainput_server_context_new(HANDLE vcm) ainput_server* ainput = (ainput_server*)calloc(1, sizeof(ainput_server)); if (!ainput) - return NULL; + return nullptr; ainput->context.vcm = vcm; ainput->context.Open = ainput_server_open; @@ -411,7 +411,7 @@ ainput_server_context* ainput_server_context_new(HANDLE vcm) ainput->context.Poll = ainput_server_context_poll; ainput->context.ChannelHandle = ainput_server_context_handle; - ainput->buffer = Stream_New(NULL, 4096); + ainput->buffer = Stream_New(nullptr, 4096); if (!ainput->buffer) goto fail; return &ainput->context; @@ -420,7 +420,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC ainput_server_context_free(&ainput->context); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void ainput_server_context_free(ainput_server_context* context) @@ -447,7 +447,7 @@ static UINT ainput_process_message(ainput_server* ainput) WINPR_ASSERT(s); Stream_SetPosition(s, 0); - const BOOL rc = WTSVirtualChannelRead(ainput->ainput_channel, 0, NULL, 0, &BytesReturned); + const BOOL rc = WTSVirtualChannelRead(ainput->ainput_channel, 0, nullptr, 0, &BytesReturned); if (!rc) goto out; @@ -546,7 +546,7 @@ UINT ainput_server_context_poll_int(ainput_server_context* context) } buffer; DWORD BytesReturned = 0; - buffer.pv = NULL; + buffer.pv = nullptr; if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer.pv, &BytesReturned) != TRUE) diff --git a/channels/audin/client/alsa/audin_alsa.c b/channels/audin/client/alsa/audin_alsa.c index 96649568b..20564dc04 100644 --- a/channels/audin/client/alsa/audin_alsa.c +++ b/channels/audin/client/alsa/audin_alsa.c @@ -85,7 +85,7 @@ static BOOL audin_alsa_set_params(AudinALSADevice* alsa, snd_pcm_t* capture_hand int error = 0; SSIZE_T s = 0; UINT32 channels = alsa->aformat.nChannels; - snd_pcm_hw_params_t* hw_params = NULL; + snd_pcm_hw_params_t* hw_params = nullptr; snd_pcm_format_t format = audin_alsa_format(alsa->aformat.wFormatTag, alsa->aformat.wBitsPerSample); @@ -98,7 +98,8 @@ static BOOL audin_alsa_set_params(AudinALSADevice* alsa, snd_pcm_t* capture_hand snd_pcm_hw_params_any(capture_handle, hw_params); snd_pcm_hw_params_set_access(capture_handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED); snd_pcm_hw_params_set_format(capture_handle, hw_params, format); - snd_pcm_hw_params_set_rate_near(capture_handle, hw_params, &alsa->aformat.nSamplesPerSec, NULL); + snd_pcm_hw_params_set_rate_near(capture_handle, hw_params, &alsa->aformat.nSamplesPerSec, + nullptr); snd_pcm_hw_params_set_channels_near(capture_handle, hw_params, &channels); snd_pcm_hw_params(capture_handle, hw_params); snd_pcm_hw_params_free(hw_params); @@ -116,14 +117,14 @@ static BOOL audin_alsa_set_params(AudinALSADevice* alsa, snd_pcm_t* capture_hand static DWORD WINAPI audin_alsa_thread_func(LPVOID arg) { DWORD error = CHANNEL_RC_OK; - BYTE* buffer = NULL; + BYTE* buffer = nullptr; AudinALSADevice* alsa = (AudinALSADevice*)arg; WINPR_ASSERT(alsa); WLog_Print(alsa->log, WLOG_DEBUG, "in"); - snd_pcm_t* capture_handle = NULL; + snd_pcm_t* capture_handle = nullptr; const int rc = snd_pcm_open(&capture_handle, alsa->device_name, SND_PCM_STREAM_CAPTURE, 0); if (rc < 0) { @@ -295,13 +296,13 @@ static UINT audin_alsa_open(IAudinDevice* device, AudinReceive receive, void* us alsa->receive = receive; alsa->user_data = user_data; - if (!(alsa->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL))) + if (!(alsa->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr))) { WLog_Print(alsa->log, WLOG_ERROR, "CreateEvent failed!"); goto error_out; } - if (!(alsa->thread = CreateThread(NULL, 0, audin_alsa_thread_func, alsa, 0, NULL))) + if (!(alsa->thread = CreateThread(nullptr, 0, audin_alsa_thread_func, alsa, 0, nullptr))) { WLog_Print(alsa->log, WLOG_ERROR, "CreateThread failed!"); goto error_out; @@ -310,7 +311,7 @@ static UINT audin_alsa_open(IAudinDevice* device, AudinReceive receive, void* us return CHANNEL_RC_OK; error_out: (void)CloseHandle(alsa->stopEvent); - alsa->stopEvent = NULL; + alsa->stopEvent = nullptr; return ERROR_INTERNAL_ERROR; } @@ -340,13 +341,13 @@ static UINT audin_alsa_close(IAudinDevice* device) } (void)CloseHandle(alsa->stopEvent); - alsa->stopEvent = NULL; + alsa->stopEvent = nullptr; (void)CloseHandle(alsa->thread); - alsa->thread = NULL; + alsa->thread = nullptr; } - alsa->receive = NULL; - alsa->user_data = NULL; + alsa->receive = nullptr; + alsa->user_data = nullptr; return error; } @@ -359,15 +360,17 @@ static UINT audin_alsa_parse_addin_args(AudinALSADevice* device, const ADDIN_ARG { int status = 0; DWORD flags = 0; - const COMMAND_LINE_ARGUMENT_A* arg = NULL; + const COMMAND_LINE_ARGUMENT_A* arg = nullptr; AudinALSADevice* alsa = device; - COMMAND_LINE_ARGUMENT_A audin_alsa_args[] = { { "dev", COMMAND_LINE_VALUE_REQUIRED, "", - NULL, NULL, -1, NULL, "audio device name" }, - { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } }; + COMMAND_LINE_ARGUMENT_A audin_alsa_args[] = { + { "dev", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, + "audio device name" }, + { nullptr, 0, nullptr, nullptr, nullptr, -1, nullptr, nullptr } + }; flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON | COMMAND_LINE_IGN_UNKNOWN_KEYWORD; - status = CommandLineParseArgumentsA(args->argc, args->argv, audin_alsa_args, flags, alsa, NULL, - NULL); + status = CommandLineParseArgumentsA(args->argc, args->argv, audin_alsa_args, flags, alsa, + nullptr, nullptr); if (status < 0) return ERROR_INVALID_PARAMETER; @@ -390,7 +393,7 @@ static UINT audin_alsa_parse_addin_args(AudinALSADevice* device, const ADDIN_ARG } } CommandLineSwitchEnd(arg) - } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); + } while ((arg = CommandLineFindNextArgumentA(arg)) != nullptr); return CHANNEL_RC_OK; } @@ -403,8 +406,8 @@ static UINT audin_alsa_parse_addin_args(AudinALSADevice* device, const ADDIN_ARG FREERDP_ENTRY_POINT(UINT VCAPITYPE alsa_freerdp_audin_client_subsystem_entry( PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)) { - const ADDIN_ARGV* args = NULL; - AudinALSADevice* alsa = NULL; + const ADDIN_ARGV* args = nullptr; + AudinALSADevice* alsa = nullptr; UINT error = 0; alsa = (AudinALSADevice*)calloc(1, sizeof(AudinALSADevice)); diff --git a/channels/audin/client/audin_main.c b/channels/audin/client/audin_main.c index 1b609cfc4..dfd1e0d9b 100644 --- a/channels/audin/client/audin_main.c +++ b/channels/audin/client/audin_main.c @@ -115,7 +115,7 @@ static UINT audin_channel_write_and_free(AUDIN_CHANNEL_CALLBACK* callback, wStre Stream_SealLength(out); WINPR_ASSERT(Stream_Length(out) <= UINT32_MAX); const UINT error = callback->channel->Write(callback->channel, (ULONG)Stream_Length(out), - Stream_Buffer(out), NULL); + Stream_Buffer(out), nullptr); if (freeStream) Stream_Free(out, TRUE); @@ -151,7 +151,7 @@ static UINT audin_process_version(AUDIN_PLUGIN* audin, AUDIN_CHANNEL_CALLBACK* c } audin->version = ServerVersion; - wStream* out = Stream_New(NULL, 5); + wStream* out = Stream_New(nullptr, 5); if (!out) { @@ -176,7 +176,7 @@ static UINT audin_send_incoming_data_pdu(AUDIN_CHANNEL_CALLBACK* callback) if (!callback || !callback->channel || !callback->channel->Write) return ERROR_INTERNAL_ERROR; - return callback->channel->Write(callback->channel, 1, out_data, NULL); + return callback->channel->Write(callback->channel, 1, out_data, nullptr); } /** @@ -207,7 +207,7 @@ static UINT audin_process_formats(AUDIN_PLUGIN* audin, AUDIN_CHANNEL_CALLBACK* c Stream_Seek_UINT32(s); /* cbSizeFormatsPacket */ - audin->format = NULL; + audin->format = nullptr; audio_formats_free(callback->formats, callback->formats_count); callback->formats_count = 0; @@ -219,7 +219,7 @@ static UINT audin_process_formats(AUDIN_PLUGIN* audin, AUDIN_CHANNEL_CALLBACK* c return ERROR_INVALID_DATA; } - wStream* out = Stream_New(NULL, 9); + wStream* out = Stream_New(nullptr, 9); if (!out) { @@ -285,9 +285,9 @@ out: if (error != CHANNEL_RC_OK) { - audin->format = NULL; + audin->format = nullptr; audio_formats_free(callback->formats, NumFormats); - callback->formats = NULL; + callback->formats = nullptr; } Stream_Free(out, TRUE); @@ -305,7 +305,7 @@ static UINT audin_send_format_change_pdu(AUDIN_PLUGIN* audin, AUDIN_CHANNEL_CALL WINPR_ASSERT(audin); WINPR_ASSERT(callback); - wStream* out = Stream_New(NULL, 5); + wStream* out = Stream_New(nullptr, 5); if (!out) { @@ -329,7 +329,7 @@ static UINT audin_send_open_reply_pdu(AUDIN_PLUGIN* audin, AUDIN_CHANNEL_CALLBAC WINPR_ASSERT(audin); WINPR_ASSERT(callback); - wStream* out = Stream_New(NULL, 5); + wStream* out = Stream_New(nullptr, 5); if (!out) { @@ -633,7 +633,7 @@ static UINT audin_on_close(IWTSVirtualChannelCallback* pChannelCallback) WLog_Print(audin->log, WLOG_ERROR, "Close failed with errorcode %" PRIu32 "", error); } - audin->format = NULL; + audin->format = nullptr; audio_formats_free(callback->formats, callback->formats_count); free(callback); return error; @@ -749,7 +749,7 @@ static UINT audin_plugin_terminated(IWTSPlugin* pPlugin) // don't stop on error } - audin->device = NULL; + audin->device = nullptr; } freerdp_dsp_context_free(audin->dsp_context); @@ -819,10 +819,11 @@ static UINT audin_load_device_plugin(AUDIN_PLUGIN* audin, const char* name, cons FREERDP_AUDIN_DEVICE_ENTRY_POINTS entryPoints = WINPR_C_ARRAY_INIT; UINT error = ERROR_INTERNAL_ERROR; - PVIRTUALCHANNELENTRY pvce = freerdp_load_channel_addin_entry(AUDIN_CHANNEL_NAME, name, NULL, 0); + PVIRTUALCHANNELENTRY pvce = + freerdp_load_channel_addin_entry(AUDIN_CHANNEL_NAME, name, nullptr, 0); PFREERDP_AUDIN_DEVICE_ENTRY entry = WINPR_FUNC_PTR_CAST(pvce, PFREERDP_AUDIN_DEVICE_ENTRY); - if (entry == NULL) + if (entry == nullptr) { WLog_Print(audin->log, WLOG_ERROR, "freerdp_load_channel_addin_entry did not return any function pointers for %s ", @@ -891,12 +892,15 @@ static UINT audin_set_device_name(AUDIN_PLUGIN* audin, const char* device_name) BOOL audin_process_addin_args(AUDIN_PLUGIN* audin, const ADDIN_ARGV* args) { COMMAND_LINE_ARGUMENT_A audin_args[] = { - { "sys", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "subsystem" }, - { "dev", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "device" }, - { "format", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "format" }, - { "rate", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "rate" }, - { "channel", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "channel" }, - { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } + { "sys", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, + "subsystem" }, + { "dev", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, "device" }, + { "format", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, + "format" }, + { "rate", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, "rate" }, + { "channel", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, + "channel" }, + { nullptr, 0, nullptr, nullptr, nullptr, -1, nullptr, nullptr } }; if (!args || args->argc == 1) @@ -904,8 +908,8 @@ BOOL audin_process_addin_args(AUDIN_PLUGIN* audin, const ADDIN_ARGV* args) const DWORD flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON | COMMAND_LINE_IGN_UNKNOWN_KEYWORD; - const int status = - CommandLineParseArgumentsA(args->argc, args->argv, audin_args, flags, audin, NULL, NULL); + const int status = CommandLineParseArgumentsA(args->argc, args->argv, audin_args, flags, audin, + nullptr, nullptr); if (status != 0) return FALSE; @@ -940,7 +944,7 @@ BOOL audin_process_addin_args(AUDIN_PLUGIN* audin, const ADDIN_ARGV* args) } CommandLineSwitchCase(arg, "format") { - unsigned long val = strtoul(arg->Value, NULL, 0); + unsigned long val = strtoul(arg->Value, nullptr, 0); if ((errno != 0) || (val > UINT16_MAX)) return FALSE; @@ -949,7 +953,7 @@ BOOL audin_process_addin_args(AUDIN_PLUGIN* audin, const ADDIN_ARGV* args) } CommandLineSwitchCase(arg, "rate") { - unsigned long val = strtoul(arg->Value, NULL, 0); + unsigned long val = strtoul(arg->Value, nullptr, 0); if ((errno != 0) || (val == 0) || (val > UINT32_MAX)) return FALSE; @@ -958,7 +962,7 @@ BOOL audin_process_addin_args(AUDIN_PLUGIN* audin, const ADDIN_ARGV* args) } CommandLineSwitchCase(arg, "channel") { - unsigned long val = strtoul(arg->Value, NULL, 0); + unsigned long val = strtoul(arg->Value, nullptr, 0); if ((errno != 0) || (val <= UINT16_MAX)) audin->fixed_format->nChannels = (UINT16)val; @@ -967,7 +971,7 @@ BOOL audin_process_addin_args(AUDIN_PLUGIN* audin, const ADDIN_ARGV* args) { } CommandLineSwitchEnd(arg) - } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); + } while ((arg = CommandLineFindNextArgumentA(arg)) != nullptr); return TRUE; } @@ -1010,14 +1014,14 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE audin_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* p #if defined(WITH_SNDIO) { "sndio", "default" }, #endif - { NULL, NULL } + { nullptr, nullptr } }; struct SubsystemEntry* entry = &entries[0]; WINPR_ASSERT(pEntryPoints); WINPR_ASSERT(pEntryPoints->GetPlugin); AUDIN_PLUGIN* audin = (AUDIN_PLUGIN*)pEntryPoints->GetPlugin(pEntryPoints, AUDIN_CHANNEL_NAME); - if (audin != NULL) + if (audin != nullptr) return CHANNEL_RC_ALREADY_INITIALIZED; audin = (AUDIN_PLUGIN*)calloc(1, sizeof(AUDIN_PLUGIN)); @@ -1029,7 +1033,7 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE audin_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* p } audin->log = WLog_Get(TAG); - audin->data = Stream_New(NULL, 4096); + audin->data = Stream_New(nullptr, 4096); audin->fixed_format = audio_format_new(); if (!audin->fixed_format) @@ -1045,8 +1049,8 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE audin_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* p audin->attached = TRUE; audin->iface.Initialize = audin_plugin_initialize; - audin->iface.Connected = NULL; - audin->iface.Disconnected = NULL; + audin->iface.Connected = nullptr; + audin->iface.Disconnected = nullptr; audin->iface.Terminated = audin_plugin_terminated; audin->iface.Attached = audin_plugin_attached; audin->iface.Detached = audin_plugin_detached; @@ -1101,7 +1105,7 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE audin_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* p } } - if (audin->device == NULL) + if (audin->device == nullptr) { /* If we have no audin device do not register plugin but still return OK or the client will * just disconnect due to a missing microphone. */ diff --git a/channels/audin/client/ios/audin_ios.m b/channels/audin/client/ios/audin_ios.m index 30819858e..e0682c6f7 100644 --- a/channels/audin/client/ios/audin_ios.m +++ b/channels/audin/client/ios/audin_ios.m @@ -99,7 +99,7 @@ static BOOL audin_ios_format_supported(IAudinDevice *device, const AUDIO_FORMAT AudinIosDevice *ios = (AudinIosDevice *)device; AudioFormatID req_fmt = 0; - if (device == NULL || format == NULL) + if (device == nullptr || format == nullptr) return FALSE; req_fmt = audin_ios_get_format(format); @@ -120,7 +120,7 @@ static UINT audin_ios_set_format(IAudinDevice *device, const AUDIO_FORMAT *forma { AudinIosDevice *ios = (AudinIosDevice *)device; - if (device == NULL || format == NULL) + if (device == nullptr || format == nullptr) return ERROR_INVALID_PARAMETER; ios->FramesPerPacket = FramesPerPacket; @@ -164,7 +164,7 @@ static void ios_audio_queue_input_cb(void *aqData, AudioQueueRef inAQ, AudioQueu if (buffer_size > 0) error = ios->receive(&ios->format, buffer, buffer_size, ios->user_data); - AudioQueueEnqueueBuffer(inAQ, inBuffer, 0, NULL); + AudioQueueEnqueueBuffer(inAQ, inBuffer, 0, nullptr); if (error) { @@ -180,7 +180,7 @@ static UINT audin_ios_close(IAudinDevice *device) OSStatus devStat; AudinIosDevice *ios = (AudinIosDevice *)device; - if (device == NULL) + if (device == nullptr) return ERROR_INVALID_PARAMETER; if (ios->isOpen) @@ -208,11 +208,11 @@ static UINT audin_ios_close(IAudinDevice *device) winpr_strerror(errCode, errString, sizeof(errString)), errCode); } - ios->audioQueue = NULL; + ios->audioQueue = nullptr; } - ios->receive = NULL; - ios->user_data = NULL; + ios->receive = nullptr; + ios->user_data = nullptr; return errCode; } @@ -225,7 +225,7 @@ static UINT audin_ios_open(IAudinDevice *device, AudinReceive receive, void *use ios->receive = receive; ios->user_data = user_data; - devStat = AudioQueueNewInput(&(ios->audioFormat), ios_audio_queue_input_cb, ios, NULL, + devStat = AudioQueueNewInput(&(ios->audioFormat), ios_audio_queue_input_cb, ios, nullptr, kCFRunLoopCommonModes, 0, &(ios->audioQueue)); if (devStat != 0) @@ -250,7 +250,7 @@ static UINT audin_ios_open(IAudinDevice *device, AudinReceive receive, void *use goto err_out; } - devStat = AudioQueueEnqueueBuffer(ios->audioQueue, ios->audioBuffers[index], 0, NULL); + devStat = AudioQueueEnqueueBuffer(ios->audioQueue, ios->audioBuffers[index], 0, nullptr); if (devStat != 0) { @@ -261,7 +261,7 @@ static UINT audin_ios_open(IAudinDevice *device, AudinReceive receive, void *use } } - devStat = AudioQueueStart(ios->audioQueue, NULL); + devStat = AudioQueueStart(ios->audioQueue, nullptr); if (devStat != 0) { @@ -283,7 +283,7 @@ static UINT audin_ios_free(IAudinDevice *device) AudinIosDevice *ios = (AudinIosDevice *)device; int error; - if (device == NULL) + if (device == nullptr) return ERROR_INVALID_PARAMETER; if ((error = audin_ios_close(device))) diff --git a/channels/audin/client/mac/audin_mac.m b/channels/audin/client/mac/audin_mac.m index 346d85945..f9e02ef0f 100644 --- a/channels/audin/client/mac/audin_mac.m +++ b/channels/audin/client/mac/audin_mac.m @@ -115,7 +115,7 @@ static BOOL audin_mac_format_supported(IAudinDevice *device, const AUDIO_FORMAT if (!mac->isAuthorized) return FALSE; - if (device == NULL || format == NULL) + if (device == nullptr || format == nullptr) return FALSE; if (format->nChannels != 2) @@ -142,7 +142,7 @@ static UINT audin_mac_set_format(IAudinDevice *device, const AUDIO_FORMAT *forma if (!mac->isAuthorized) return ERROR_INTERNAL_ERROR; - if (device == NULL || format == NULL) + if (device == nullptr || format == nullptr) return ERROR_INVALID_PARAMETER; mac->FramesPerPacket = FramesPerPacket; @@ -186,7 +186,7 @@ static void mac_audio_queue_input_cb(void *aqData, AudioQueueRef inAQ, AudioQueu if (buffer_size > 0) error = mac->receive(&mac->format, buffer, buffer_size, mac->user_data); - AudioQueueEnqueueBuffer(inAQ, inBuffer, 0, NULL); + AudioQueueEnqueueBuffer(inAQ, inBuffer, 0, nullptr); if (error) { @@ -205,7 +205,7 @@ static UINT audin_mac_close(IAudinDevice *device) if (!mac->isAuthorized) return ERROR_INTERNAL_ERROR; - if (device == NULL) + if (device == nullptr) return ERROR_INVALID_PARAMETER; if (mac->isOpen) @@ -233,11 +233,11 @@ static UINT audin_mac_close(IAudinDevice *device) winpr_strerror(errCode, errString, sizeof(errString)), errCode); } - mac->audioQueue = NULL; + mac->audioQueue = nullptr; } - mac->receive = NULL; - mac->user_data = NULL; + mac->receive = nullptr; + mac->user_data = nullptr; return errCode; } @@ -253,7 +253,7 @@ static UINT audin_mac_open(IAudinDevice *device, AudinReceive receive, void *use mac->receive = receive; mac->user_data = user_data; - devStat = AudioQueueNewInput(&(mac->audioFormat), mac_audio_queue_input_cb, mac, NULL, + devStat = AudioQueueNewInput(&(mac->audioFormat), mac_audio_queue_input_cb, mac, nullptr, kCFRunLoopCommonModes, 0, &(mac->audioQueue)); if (devStat != 0) @@ -278,7 +278,7 @@ static UINT audin_mac_open(IAudinDevice *device, AudinReceive receive, void *use goto err_out; } - devStat = AudioQueueEnqueueBuffer(mac->audioQueue, mac->audioBuffers[index], 0, NULL); + devStat = AudioQueueEnqueueBuffer(mac->audioQueue, mac->audioBuffers[index], 0, nullptr); if (devStat != 0) { @@ -289,7 +289,7 @@ static UINT audin_mac_open(IAudinDevice *device, AudinReceive receive, void *use } } - devStat = AudioQueueStart(mac->audioQueue, NULL); + devStat = AudioQueueStart(mac->audioQueue, nullptr); if (devStat != 0) { @@ -311,7 +311,7 @@ static UINT audin_mac_free(IAudinDevice *device) AudinMacDevice *mac = (AudinMacDevice *)device; int error; - if (device == NULL) + if (device == nullptr) return ERROR_INVALID_PARAMETER; if ((error = audin_mac_close(device))) @@ -331,9 +331,11 @@ static UINT audin_mac_parse_addin_args(AudinMacDevice *device, const ADDIN_ARGV char *str_num, *eptr; DWORD flags; const COMMAND_LINE_ARGUMENT_A *arg; - COMMAND_LINE_ARGUMENT_A audin_mac_args[] = { { "dev", COMMAND_LINE_VALUE_REQUIRED, "", - NULL, NULL, -1, NULL, "audio device name" }, - { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } }; + COMMAND_LINE_ARGUMENT_A audin_mac_args[] = { + { "dev", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, + "audio device name" }, + { nullptr, 0, nullptr, nullptr, nullptr, -1, nullptr, nullptr } + }; AudinMacDevice *mac = (AudinMacDevice *)device; @@ -342,8 +344,8 @@ static UINT audin_mac_parse_addin_args(AudinMacDevice *device, const ADDIN_ARGV flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON | COMMAND_LINE_IGN_UNKNOWN_KEYWORD; - status = - CommandLineParseArgumentsA(args->argc, args->argv, audin_mac_args, flags, mac, NULL, NULL); + status = CommandLineParseArgumentsA(args->argc, args->argv, audin_mac_args, flags, mac, nullptr, + nullptr); if (status < 0) return ERROR_INVALID_PARAMETER; @@ -375,7 +377,7 @@ static UINT audin_mac_parse_addin_args(AudinMacDevice *device, const ADDIN_ARGV free(str_num); } CommandLineSwitchEnd(arg) - } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); + } while ((arg = CommandLineFindNextArgumentA(arg)) != nullptr); return CHANNEL_RC_OK; } diff --git a/channels/audin/client/opensles/audin_opensl_es.c b/channels/audin/client/opensles/audin_opensl_es.c index d68c4330c..52281aec2 100644 --- a/channels/audin/client/opensles/audin_opensl_es.c +++ b/channels/audin/client/opensles/audin_opensl_es.c @@ -232,9 +232,9 @@ UINT audin_opensles_close(IAudinDevice* device) WLog_Print(opensles->log, WLOG_DEBUG, "device=%p", (void*)device); android_CloseRecDevice(opensles->stream); - opensles->receive = NULL; - opensles->user_data = NULL; - opensles->stream = NULL; + opensles->receive = nullptr; + opensles->user_data = nullptr; + opensles->stream = nullptr; return CHANNEL_RC_OK; } @@ -250,16 +250,16 @@ static UINT audin_opensles_parse_addin_args(AudinOpenSLESDevice* device, const A const COMMAND_LINE_ARGUMENT_A* arg; AudinOpenSLESDevice* opensles = (AudinOpenSLESDevice*)device; COMMAND_LINE_ARGUMENT_A audin_opensles_args[] = { - { "dev", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, + { "dev", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, "audio device name" }, - { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } + { nullptr, 0, nullptr, nullptr, nullptr, -1, nullptr, nullptr } }; WLog_Print(opensles->log, WLOG_DEBUG, "device=%p, args=%p", (void*)device, (void*)args); flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON | COMMAND_LINE_IGN_UNKNOWN_KEYWORD; status = CommandLineParseArgumentsA(args->argc, args->argv, audin_opensles_args, flags, - opensles, NULL, NULL); + opensles, nullptr, nullptr); if (status < 0) return status; @@ -282,7 +282,7 @@ static UINT audin_opensles_parse_addin_args(AudinOpenSLESDevice* device, const A } } CommandLineSwitchEnd(arg) - } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); + } while ((arg = CommandLineFindNextArgumentA(arg)) != nullptr); return CHANNEL_RC_OK; } diff --git a/channels/audin/client/opensles/opensl_io.c b/channels/audin/client/opensles/opensl_io.c index 39b3dc848..865b11e98 100644 --- a/channels/audin/client/opensles/opensl_io.c +++ b/channels/audin/client/opensles/opensl_io.c @@ -73,7 +73,7 @@ static SLresult openSLCreateEngine(OPENSL_STREAM* p) { SLresult result; // create engine - result = slCreateEngine(&(p->engineObject), 0, NULL, 0, NULL, NULL); + result = slCreateEngine(&(p->engineObject), 0, nullptr, 0, nullptr, nullptr); if (result != SL_RESULT_SUCCESS) goto engine_end; @@ -96,7 +96,7 @@ static SLresult openSLCreateEngine(OPENSL_STREAM* p) if (result != SL_RESULT_SUCCESS) { - p->deviceVolume = NULL; + p->deviceVolume = nullptr; result = SL_RESULT_SUCCESS; } @@ -171,8 +171,8 @@ static SLresult openSLRecOpen(OPENSL_STREAM* p) // configure audio source SLDataLocator_IODevice loc_dev = { SL_DATALOCATOR_IODEVICE, SL_IODEVICE_AUDIOINPUT, - SL_DEFAULTDEVICEID_AUDIOINPUT, NULL }; - SLDataSource audioSrc = { &loc_dev, NULL }; + SL_DEFAULTDEVICEID_AUDIOINPUT, nullptr }; + SLDataSource audioSrc = { &loc_dev, nullptr }; // configure audio sink int speakers; @@ -259,20 +259,20 @@ static SLresult openSLRecOpen(OPENSL_STREAM* p) static void openSLDestroyEngine(OPENSL_STREAM* p) { // destroy audio recorder object, and invalidate all associated interfaces - if (p->recorderObject != NULL) + if (p->recorderObject != nullptr) { (*p->recorderObject)->Destroy(p->recorderObject); - p->recorderObject = NULL; - p->recorderRecord = NULL; - p->recorderBufferQueue = NULL; + p->recorderObject = nullptr; + p->recorderRecord = nullptr; + p->recorderBufferQueue = nullptr; } // destroy engine object, and invalidate all associated interfaces - if (p->engineObject != NULL) + if (p->engineObject != nullptr) { (*p->engineObject)->Destroy(p->engineObject); - p->engineObject = NULL; - p->engineEngine = NULL; + p->engineObject = nullptr; + p->engineEngine = nullptr; } } @@ -292,7 +292,7 @@ static queue_element* opensles_queue_element_new(size_t size) return q; fail: free(q); - return NULL; + return nullptr; } static void opensles_queue_element_free(void* obj) @@ -312,12 +312,12 @@ OPENSL_STREAM* android_OpenRecDevice(void* context, opensl_receive_t receive, in OPENSL_STREAM* p; if (!context || !receive) - return NULL; + return nullptr; p = (OPENSL_STREAM*)calloc(1, sizeof(OPENSL_STREAM)); if (!p) - return NULL; + return nullptr; p->context = context; p->receive = receive; @@ -348,13 +348,13 @@ OPENSL_STREAM* android_OpenRecDevice(void* context, opensl_receive_t receive, in return p; fail: android_CloseRecDevice(p); - return NULL; + return nullptr; } // close the android audio device void android_CloseRecDevice(OPENSL_STREAM* p) { - if (p == NULL) + if (p == nullptr) return; opensles_queue_element_free(p->next); diff --git a/channels/audin/client/oss/audin_oss.c b/channels/audin/client/oss/audin_oss.c index 571409da5..f709130be 100644 --- a/channels/audin/client/oss/audin_oss.c +++ b/channels/audin/client/oss/audin_oss.c @@ -100,7 +100,7 @@ static UINT32 audin_oss_get_format(const AUDIO_FORMAT* format) static BOOL audin_oss_format_supported(IAudinDevice* device, const AUDIO_FORMAT* format) { - if (device == NULL || format == NULL) + if (device == nullptr || format == nullptr) return FALSE; switch (format->wFormatTag) @@ -130,7 +130,7 @@ static UINT audin_oss_set_format(IAudinDevice* device, const AUDIO_FORMAT* forma { AudinOSSDevice* oss = (AudinOSSDevice*)device; - if (device == NULL || format == NULL) + if (device == nullptr || format == nullptr) return ERROR_INVALID_PARAMETER; oss->FramesPerPacket = FramesPerPacket; @@ -142,14 +142,14 @@ static DWORD WINAPI audin_oss_thread_func(LPVOID arg) { char dev_name[PATH_MAX] = "/dev/dsp"; int pcm_handle = -1; - BYTE* buffer = NULL; + BYTE* buffer = nullptr; unsigned long tmp = 0; size_t buffer_size = 0; AudinOSSDevice* oss = (AudinOSSDevice*)arg; UINT error = 0; DWORD status = 0; - if (oss == NULL) + if (oss == nullptr) { error = ERROR_INVALID_PARAMETER; goto err_out; @@ -192,7 +192,7 @@ static DWORD WINAPI audin_oss_thread_func(LPVOID arg) (1ull * oss->FramesPerPacket * oss->format.nChannels * (oss->format.wBitsPerSample / 8ull)); buffer = (BYTE*)calloc((buffer_size + sizeof(void*)), sizeof(BYTE)); - if (NULL == buffer) + if (nullptr == buffer) { OSS_LOG_ERR("malloc() fail", errno); error = ERROR_NOT_ENOUGH_MEMORY; @@ -260,17 +260,17 @@ static UINT audin_oss_open(IAudinDevice* device, AudinReceive receive, void* use oss->receive = receive; oss->user_data = user_data; - if (!(oss->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL))) + if (!(oss->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr))) { WLog_ERR(TAG, "CreateEvent failed!"); return ERROR_INTERNAL_ERROR; } - if (!(oss->thread = CreateThread(NULL, 0, audin_oss_thread_func, oss, 0, NULL))) + if (!(oss->thread = CreateThread(nullptr, 0, audin_oss_thread_func, oss, 0, nullptr))) { WLog_ERR(TAG, "CreateThread failed!"); (void)CloseHandle(oss->stopEvent); - oss->stopEvent = NULL; + oss->stopEvent = nullptr; return ERROR_INTERNAL_ERROR; } @@ -287,10 +287,10 @@ static UINT audin_oss_close(IAudinDevice* device) UINT error = 0; AudinOSSDevice* oss = (AudinOSSDevice*)device; - if (device == NULL) + if (device == nullptr) return ERROR_INVALID_PARAMETER; - if (oss->stopEvent != NULL) + if (oss->stopEvent != nullptr) { (void)SetEvent(oss->stopEvent); @@ -302,13 +302,13 @@ static UINT audin_oss_close(IAudinDevice* device) } (void)CloseHandle(oss->stopEvent); - oss->stopEvent = NULL; + oss->stopEvent = nullptr; (void)CloseHandle(oss->thread); - oss->thread = NULL; + oss->thread = nullptr; } - oss->receive = NULL; - oss->user_data = NULL; + oss->receive = nullptr; + oss->user_data = nullptr; return CHANNEL_RC_OK; } @@ -322,7 +322,7 @@ static UINT audin_oss_free(IAudinDevice* device) AudinOSSDevice* oss = (AudinOSSDevice*)device; UINT error = 0; - if (device == NULL) + if (device == nullptr) return ERROR_INVALID_PARAMETER; if ((error = audin_oss_close(device))) @@ -342,19 +342,21 @@ static UINT audin_oss_free(IAudinDevice* device) static UINT audin_oss_parse_addin_args(AudinOSSDevice* device, const ADDIN_ARGV* args) { int status = 0; - char* str_num = NULL; - char* eptr = NULL; + char* str_num = nullptr; + char* eptr = nullptr; DWORD flags = 0; - const COMMAND_LINE_ARGUMENT_A* arg = NULL; + const COMMAND_LINE_ARGUMENT_A* arg = nullptr; AudinOSSDevice* oss = device; - COMMAND_LINE_ARGUMENT_A audin_oss_args[] = { { "dev", COMMAND_LINE_VALUE_REQUIRED, "", - NULL, NULL, -1, NULL, "audio device name" }, - { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } }; + COMMAND_LINE_ARGUMENT_A audin_oss_args[] = { + { "dev", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, + "audio device name" }, + { nullptr, 0, nullptr, nullptr, nullptr, -1, nullptr, nullptr } + }; flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON | COMMAND_LINE_IGN_UNKNOWN_KEYWORD; - status = - CommandLineParseArgumentsA(args->argc, args->argv, audin_oss_args, flags, oss, NULL, NULL); + status = CommandLineParseArgumentsA(args->argc, args->argv, audin_oss_args, flags, oss, nullptr, + nullptr); if (status < 0) return ERROR_INVALID_PARAMETER; @@ -395,7 +397,7 @@ static UINT audin_oss_parse_addin_args(AudinOSSDevice* device, const ADDIN_ARGV* free(str_num); } CommandLineSwitchEnd(arg) - } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); + } while ((arg = CommandLineFindNextArgumentA(arg)) != nullptr); return CHANNEL_RC_OK; } @@ -408,8 +410,8 @@ static UINT audin_oss_parse_addin_args(AudinOSSDevice* device, const ADDIN_ARGV* FREERDP_ENTRY_POINT(UINT VCAPITYPE oss_freerdp_audin_client_subsystem_entry( PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)) { - const ADDIN_ARGV* args = NULL; - AudinOSSDevice* oss = NULL; + const ADDIN_ARGV* args = nullptr; + AudinOSSDevice* oss = nullptr; UINT error = 0; oss = (AudinOSSDevice*)calloc(1, sizeof(AudinOSSDevice)); diff --git a/channels/audin/client/pulse/audin_pulse.c b/channels/audin/client/pulse/audin_pulse.c index 6e1816994..b46904de1 100644 --- a/channels/audin/client/pulse/audin_pulse.c +++ b/channels/audin/client/pulse/audin_pulse.c @@ -139,7 +139,7 @@ static UINT audin_pulse_connect(IAudinDevice* device) if (!pulse->context) return ERROR_INVALID_PARAMETER; - if (pa_context_connect(pulse->context, NULL, PA_CONTEXT_NOFLAGS, NULL)) + if (pa_context_connect(pulse->context, nullptr, PA_CONTEXT_NOFLAGS, nullptr)) { WLog_Print(pulse->log, WLOG_ERROR, "pa_context_connect failed (%d)", pa_context_errno(pulse->context)); @@ -200,13 +200,13 @@ static UINT audin_pulse_free(IAudinDevice* device) { pa_context_disconnect(pulse->context); pa_context_unref(pulse->context); - pulse->context = NULL; + pulse->context = nullptr; } if (pulse->mainloop) { pa_threaded_mainloop_free(pulse->mainloop); - pulse->mainloop = NULL; + pulse->mainloop = nullptr; } free(pulse->device_name); @@ -324,7 +324,7 @@ static void audin_pulse_stream_state_callback(pa_stream* stream, void* userdata) static void audin_pulse_stream_request_callback(pa_stream* stream, size_t length, void* userdata) { - const void* data = NULL; + const void* data = nullptr; AudinPulseDevice* pulse = (AudinPulseDevice*)userdata; UINT error = CHANNEL_RC_OK; pa_stream_peek(stream, &data, &length); @@ -353,12 +353,12 @@ static UINT audin_pulse_close(IAudinDevice* device) pa_threaded_mainloop_lock(pulse->mainloop); pa_stream_disconnect(pulse->stream); pa_stream_unref(pulse->stream); - pulse->stream = NULL; + pulse->stream = nullptr; pa_threaded_mainloop_unlock(pulse->mainloop); } - pulse->receive = NULL; - pulse->user_data = NULL; + pulse->receive = nullptr; + pulse->user_data = nullptr; return CHANNEL_RC_OK; } @@ -385,7 +385,7 @@ static UINT audin_pulse_open(IAudinDevice* device, AudinReceive receive, void* u pulse->receive = receive; pulse->user_data = user_data; pa_threaded_mainloop_lock(pulse->mainloop); - pulse->stream = pa_stream_new(pulse->context, pulse->stream_name, &pulse->sample_spec, NULL); + pulse->stream = pa_stream_new(pulse->context, pulse->stream_name, &pulse->sample_spec, nullptr); if (!pulse->stream) { @@ -456,27 +456,27 @@ static UINT audin_pulse_open(IAudinDevice* device, AudinReceive receive, void* u static UINT audin_pulse_parse_addin_args(AudinPulseDevice* pulse, const ADDIN_ARGV* args) { COMMAND_LINE_ARGUMENT_A audin_pulse_args[] = { - { "dev", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, + { "dev", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, "audio device name" }, - { "client_name", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, - "name of pulse client" }, - { "stream_name", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, - "name of pulse stream" }, - { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } + { "client_name", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, + nullptr, "name of pulse client" }, + { "stream_name", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, + nullptr, "name of pulse stream" }, + { nullptr, 0, nullptr, nullptr, nullptr, -1, nullptr, nullptr } }; const DWORD flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON | COMMAND_LINE_IGN_UNKNOWN_KEYWORD; const int status = CommandLineParseArgumentsA(args->argc, args->argv, audin_pulse_args, flags, - pulse, NULL, NULL); + pulse, nullptr, nullptr); if (status < 0) return ERROR_INVALID_PARAMETER; const COMMAND_LINE_ARGUMENT_A* arg = audin_pulse_args; - const char* client_name = NULL; - const char* stream_name = NULL; + const char* client_name = nullptr; + const char* stream_name = nullptr; do { if (!(arg->Flags & COMMAND_LINE_VALUE_PRESENT)) @@ -493,7 +493,7 @@ static UINT audin_pulse_parse_addin_args(AudinPulseDevice* pulse, const ADDIN_AR } } CommandLineSwitchEnd(arg) - } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); + } while ((arg = CommandLineFindNextArgumentA(arg)) != nullptr); if (!client_name) client_name = freerdp_getApplicationDetailsString(); @@ -516,8 +516,8 @@ static UINT audin_pulse_parse_addin_args(AudinPulseDevice* pulse, const ADDIN_AR FREERDP_ENTRY_POINT(UINT VCAPITYPE pulse_freerdp_audin_client_subsystem_entry( PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints)) { - const ADDIN_ARGV* args = NULL; - AudinPulseDevice* pulse = NULL; + const ADDIN_ARGV* args = nullptr; + AudinPulseDevice* pulse = nullptr; UINT error = 0; pulse = (AudinPulseDevice*)calloc(1, sizeof(AudinPulseDevice)); diff --git a/channels/audin/client/sndio/audin_sndio.c b/channels/audin/client/sndio/audin_sndio.c index af5426e72..d922855be 100644 --- a/channels/audin/client/sndio/audin_sndio.c +++ b/channels/audin/client/sndio/audin_sndio.c @@ -49,7 +49,7 @@ typedef struct static BOOL audin_sndio_format_supported(IAudinDevice* device, const AUDIO_FORMAT* format) { - if (device == NULL || format == NULL) + if (device == nullptr || format == nullptr) return FALSE; return (format->wFormatTag == WAVE_FORMAT_PCM); @@ -65,7 +65,7 @@ static UINT audin_sndio_set_format(IAudinDevice* device, AUDIO_FORMAT* format, { AudinSndioDevice* sndio = (AudinSndioDevice*)device; - if (device == NULL || format == NULL) + if (device == nullptr || format == nullptr) return ERROR_INVALID_PARAMETER; if (format->wFormatTag != WAVE_FORMAT_PCM) @@ -81,20 +81,20 @@ static void* audin_sndio_thread_func(void* arg) { struct sio_hdl* hdl; struct sio_par par; - BYTE* buffer = NULL; + BYTE* buffer = nullptr; size_t n, nbytes; AudinSndioDevice* sndio = (AudinSndioDevice*)arg; UINT error = 0; DWORD status; - if (arg == NULL) + if (arg == nullptr) { error = ERROR_INVALID_PARAMETER; goto err_out; } hdl = sio_open(SIO_DEVANY, SIO_REC, 0); - if (hdl == NULL) + if (hdl == nullptr) { WLog_ERR(TAG, "could not open audio device"); error = ERROR_INTERNAL_ERROR; @@ -129,7 +129,7 @@ static void* audin_sndio_thread_func(void* arg) (sndio->FramesPerPacket * sndio->format.nChannels * (sndio->format.wBitsPerSample / 8)); buffer = (BYTE*)calloc((nbytes + sizeof(void*)), sizeof(BYTE)); - if (buffer == NULL) + if (buffer == nullptr) { error = ERROR_NOT_ENOUGH_MEMORY; goto err_out; @@ -168,10 +168,10 @@ static void* audin_sndio_thread_func(void* arg) } err_out: - if (error && sndio->rdpcontext) + if (error && sndio && sndio->rdpcontext) setChannelError(sndio->rdpcontext, error, "audin_sndio_thread_func reported an error"); - if (hdl != NULL) + if (hdl != nullptr) { WLog_INFO(TAG, "sio_close"); sio_stop(hdl); @@ -180,7 +180,7 @@ err_out: free(buffer); ExitThread(0); - return NULL; + return nullptr; } /** @@ -194,18 +194,18 @@ static UINT audin_sndio_open(IAudinDevice* device, AudinReceive receive, void* u sndio->receive = receive; sndio->user_data = user_data; - if (!(sndio->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL))) + if (!(sndio->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr))) { WLog_ERR(TAG, "CreateEvent failed"); return ERROR_INTERNAL_ERROR; } - if (!(sndio->thread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)audin_sndio_thread_func, - sndio, 0, NULL))) + if (!(sndio->thread = CreateThread(nullptr, 0, (LPTHREAD_START_ROUTINE)audin_sndio_thread_func, + sndio, 0, nullptr))) { WLog_ERR(TAG, "CreateThread failed"); (void)CloseHandle(sndio->stopEvent); - sndio->stopEvent = NULL; + sndio->stopEvent = nullptr; return ERROR_INTERNAL_ERROR; } @@ -222,10 +222,10 @@ static UINT audin_sndio_close(IAudinDevice* device) UINT error; AudinSndioDevice* sndio = (AudinSndioDevice*)device; - if (device == NULL) + if (device == nullptr) return ERROR_INVALID_PARAMETER; - if (sndio->stopEvent != NULL) + if (sndio->stopEvent != nullptr) { (void)SetEvent(sndio->stopEvent); @@ -237,13 +237,13 @@ static UINT audin_sndio_close(IAudinDevice* device) } (void)CloseHandle(sndio->stopEvent); - sndio->stopEvent = NULL; + sndio->stopEvent = nullptr; (void)CloseHandle(sndio->thread); - sndio->thread = NULL; + sndio->thread = nullptr; } - sndio->receive = NULL; - sndio->user_data = NULL; + sndio->receive = nullptr; + sndio->user_data = nullptr; return CHANNEL_RC_OK; } @@ -258,7 +258,7 @@ static UINT audin_sndio_free(IAudinDevice* device) AudinSndioDevice* sndio = (AudinSndioDevice*)device; int error; - if (device == NULL) + if (device == nullptr) return ERROR_INVALID_PARAMETER; if ((error = audin_sndio_close(device))) @@ -282,11 +282,12 @@ static UINT audin_sndio_parse_addin_args(AudinSndioDevice* device, ADDIN_ARGV* a DWORD flags; COMMAND_LINE_ARGUMENT_A* arg; AudinSndioDevice* sndio = (AudinSndioDevice*)device; - COMMAND_LINE_ARGUMENT_A audin_sndio_args[] = { { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } }; + COMMAND_LINE_ARGUMENT_A audin_sndio_args[] = { { nullptr, 0, nullptr, nullptr, nullptr, -1, + nullptr, nullptr } }; flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON | COMMAND_LINE_IGN_UNKNOWN_KEYWORD; status = CommandLineParseArgumentsA(args->argc, (const char**)args->argv, audin_sndio_args, - flags, sndio, NULL, NULL); + flags, sndio, nullptr, nullptr); if (status < 0) return ERROR_INVALID_PARAMETER; @@ -299,7 +300,7 @@ static UINT audin_sndio_parse_addin_args(AudinSndioDevice* device, ADDIN_ARGV* a continue; CommandLineSwitchStart(arg) CommandLineSwitchEnd(arg) - } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); + } while ((arg = CommandLineFindNextArgumentA(arg)) != nullptr); return CHANNEL_RC_OK; } @@ -317,7 +318,7 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE sndio_freerdp_audin_client_subsystem_entry( UINT ret = CHANNEL_RC_OK; sndio = (AudinSndioDevice*)calloc(1, sizeof(AudinSndioDevice)); - if (sndio == NULL) + if (sndio == nullptr) return CHANNEL_RC_NO_MEMORY; sndio->device.Open = audin_sndio_open; diff --git a/channels/audin/client/winmm/audin_winmm.c b/channels/audin/client/winmm/audin_winmm.c index 55aa4e160..0c1cd3867 100644 --- a/channels/audin/client/winmm/audin_winmm.c +++ b/channels/audin/client/winmm/audin_winmm.c @@ -161,7 +161,7 @@ static BOOL test_format_supported(const PWAVEFORMATEX pwfx) return FALSE; } - rc = waveInOpen(NULL, WAVE_MAPPER, pwfx, 0, 0, + rc = waveInOpen(nullptr, WAVE_MAPPER, pwfx, 0, 0, WAVE_FORMAT_QUERY | WAVE_MAPPED_DEFAULT_COMMUNICATION_DEVICE); return (rc == MMSYSERR_NOERROR); } @@ -169,7 +169,7 @@ static BOOL test_format_supported(const PWAVEFORMATEX pwfx) static DWORD WINAPI audin_winmm_thread_func(LPVOID arg) { AudinWinmmDevice* winmm = (AudinWinmmDevice*)arg; - char* buffer = NULL; + char* buffer = nullptr; int size = 0; WAVEHDR waveHdr[4] = WINPR_C_ARRAY_INIT; DWORD status = 0; @@ -252,7 +252,7 @@ static DWORD WINAPI audin_winmm_thread_func(LPVOID arg) { } - winmm->hWaveIn = NULL; + winmm->hWaveIn = nullptr; return 0; } @@ -306,10 +306,10 @@ static UINT audin_winmm_close(IAudinDevice* device) (void)CloseHandle(winmm->thread); (void)CloseHandle(winmm->stopEvent); - winmm->thread = NULL; - winmm->stopEvent = NULL; - winmm->receive = NULL; - winmm->user_data = NULL; + winmm->thread = nullptr; + winmm->stopEvent = nullptr; + winmm->receive = nullptr; + winmm->user_data = nullptr; return error; } @@ -427,17 +427,17 @@ static UINT audin_winmm_open(IAudinDevice* device, AudinReceive receive, void* u winmm->receive = receive; winmm->user_data = user_data; - if (!(winmm->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL))) + if (!(winmm->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr))) { WLog_Print(winmm->log, WLOG_ERROR, "CreateEvent failed!"); return ERROR_INTERNAL_ERROR; } - if (!(winmm->thread = CreateThread(NULL, 0, audin_winmm_thread_func, winmm, 0, NULL))) + if (!(winmm->thread = CreateThread(nullptr, 0, audin_winmm_thread_func, winmm, 0, nullptr))) { WLog_Print(winmm->log, WLOG_ERROR, "CreateThread failed!"); (void)CloseHandle(winmm->stopEvent); - winmm->stopEvent = NULL; + winmm->stopEvent = nullptr; return ERROR_INTERNAL_ERROR; } @@ -455,14 +455,16 @@ static UINT audin_winmm_parse_addin_args(AudinWinmmDevice* device, const ADDIN_A DWORD flags; const COMMAND_LINE_ARGUMENT_A* arg; AudinWinmmDevice* winmm = (AudinWinmmDevice*)device; - COMMAND_LINE_ARGUMENT_A audin_winmm_args[] = { { "dev", COMMAND_LINE_VALUE_REQUIRED, "", - NULL, NULL, -1, NULL, "audio device name" }, - { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } }; + COMMAND_LINE_ARGUMENT_A audin_winmm_args[] = { + { "dev", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, + "audio device name" }, + { nullptr, 0, nullptr, nullptr, nullptr, -1, nullptr, nullptr } + }; flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON | COMMAND_LINE_IGN_UNKNOWN_KEYWORD; status = CommandLineParseArgumentsA(args->argc, args->argv, audin_winmm_args, flags, winmm, - NULL, NULL); + nullptr, nullptr); arg = audin_winmm_args; do @@ -481,7 +483,7 @@ static UINT audin_winmm_parse_addin_args(AudinWinmmDevice* device, const ADDIN_A } } CommandLineSwitchEnd(arg) - } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); + } while ((arg = CommandLineFindNextArgumentA(arg)) != nullptr); return CHANNEL_RC_OK; } diff --git a/channels/audin/server/audin.c b/channels/audin/server/audin.c index 52383e242..aa3b3a115 100644 --- a/channels/audin/server/audin.c +++ b/channels/audin/server/audin.c @@ -274,12 +274,12 @@ static UINT audin_server_recv_format_change(audin_server_context* context, wStre static DWORD WINAPI audin_server_thread_func(LPVOID arg) { - wStream* s = NULL; - void* buffer = NULL; + wStream* s = nullptr; + void* buffer = nullptr; DWORD nCount = 0; HANDLE events[8] = WINPR_C_ARRAY_INIT; BOOL ready = FALSE; - HANDLE ChannelEvent = NULL; + HANDLE ChannelEvent = nullptr; DWORD BytesReturned = 0; audin_server* audin = (audin_server*)arg; UINT error = CHANNEL_RC_OK; @@ -337,7 +337,7 @@ static DWORD WINAPI audin_server_thread_func(LPVOID arg) break; } - s = Stream_New(NULL, 4096); + s = Stream_New(nullptr, 4096); if (!s) { @@ -378,7 +378,7 @@ static DWORD WINAPI audin_server_thread_func(LPVOID arg) Stream_SetPosition(s, 0); - if (!WTSVirtualChannelRead(audin->audin_channel, 0, NULL, 0, &BytesReturned)) + if (!WTSVirtualChannelRead(audin->audin_channel, 0, nullptr, 0, &BytesReturned)) { WLog_Print(audin->log, WLOG_ERROR, "WTSVirtualChannelRead failed!"); error = ERROR_INTERNAL_ERROR; @@ -444,7 +444,7 @@ out_capacity: Stream_Free(s, TRUE); out: (void)WTSVirtualChannelClose(audin->audin_channel); - audin->audin_channel = NULL; + audin->audin_channel = nullptr; if (error && audin->context.rdpcontext) setChannelError(audin->context.rdpcontext, error, @@ -461,7 +461,7 @@ static BOOL audin_server_open(audin_server_context* context) WINPR_ASSERT(audin); if (!audin->thread) { - PULONG pSessionId = NULL; + PULONG pSessionId = nullptr; DWORD BytesReturned = 0; audin->SessionId = WTS_CURRENT_SESSION; UINT32 channelId = 0; @@ -492,18 +492,18 @@ static BOOL audin_server_open(audin_server_context* context) return FALSE; } - if (!(audin->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL))) + if (!(audin->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr))) { WLog_Print(audin->log, WLOG_ERROR, "CreateEvent failed!"); return FALSE; } if (!(audin->thread = - CreateThread(NULL, 0, audin_server_thread_func, (void*)audin, 0, NULL))) + CreateThread(nullptr, 0, audin_server_thread_func, (void*)audin, 0, nullptr))) { WLog_Print(audin->log, WLOG_ERROR, "CreateThread failed!"); (void)CloseHandle(audin->stopEvent); - audin->stopEvent = NULL; + audin->stopEvent = nullptr; return FALSE; } @@ -519,7 +519,7 @@ static BOOL audin_server_is_open(audin_server_context* context) audin_server* audin = (audin_server*)context; WINPR_ASSERT(audin); - return audin->thread != NULL; + return audin->thread != nullptr; } static BOOL audin_server_close(audin_server_context* context) @@ -540,17 +540,17 @@ static BOOL audin_server_close(audin_server_context* context) (void)CloseHandle(audin->thread); (void)CloseHandle(audin->stopEvent); - audin->thread = NULL; - audin->stopEvent = NULL; + audin->thread = nullptr; + audin->stopEvent = nullptr; } if (audin->audin_channel) { (void)WTSVirtualChannelClose(audin->audin_channel); - audin->audin_channel = NULL; + audin->audin_channel = nullptr; } - audin->audin_negotiated_format = NULL; + audin->audin_negotiated_format = nullptr; return TRUE; } @@ -560,11 +560,11 @@ static wStream* audin_server_packet_new(wLog* log, size_t size, BYTE MessageId) WINPR_ASSERT(log); /* Allocate what we need plus header bytes */ - wStream* s = Stream_New(NULL, size + SNDIN_HEADER_SIZE); + wStream* s = Stream_New(nullptr, size + SNDIN_HEADER_SIZE); if (!s) { WLog_Print(log, WLOG_ERROR, "Stream_New failed!"); - return NULL; + return nullptr; } Stream_Write_UINT8(s, MessageId); @@ -839,7 +839,7 @@ audin_server_context* audin_server_context_new(HANDLE vcm) if (!audin) { WLog_ERR(AUDIN_TAG, "calloc failed!"); - return NULL; + return nullptr; } audin->log = WLog_Get(AUDIN_TAG); audin->context.vcm = vcm; @@ -872,7 +872,7 @@ void audin_server_context_free(audin_server_context* context) audin_server_close(context); audio_formats_free(audin->audin_server_formats, audin->audin_n_server_formats); - audin->audin_server_formats = NULL; + audin->audin_server_formats = nullptr; free(audin); } @@ -884,8 +884,8 @@ BOOL audin_server_set_formats(audin_server_context* context, SSIZE_T count, audio_formats_free(audin->audin_server_formats, audin->audin_n_server_formats); audin->audin_n_server_formats = 0; - audin->audin_server_formats = NULL; - audin->audin_negotiated_format = NULL; + audin->audin_server_formats = nullptr; + audin->audin_negotiated_format = nullptr; if (count < 0) { diff --git a/channels/client/CMakeLists.txt b/channels/client/CMakeLists.txt index 9d002b30e..d63b6ec74 100644 --- a/channels/client/CMakeLists.txt +++ b/channels/client/CMakeLists.txt @@ -86,13 +86,13 @@ foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES}) ) string(APPEND CLIENT_STATIC_ENTRY_TABLES "const ${CLIENT_STATIC_ENTRY_TYPE} CLIENT_${STATIC_ENTRY}_TABLE[] =\n{") string(APPEND CLIENT_STATIC_ENTRY_TABLES "\n${${STATIC_ENTRY}_TABLE}") - string(APPEND CLIENT_STATIC_ENTRY_TABLES "\n\t{ NULL, NULL }\n};") + string(APPEND CLIENT_STATIC_ENTRY_TABLES "\n\t{ nullptr, nullptr }\n};") string(APPEND CLIENT_STATIC_ENTRY_TABLES_LIST "\n\t{ \"${STATIC_ENTRY}\", { ${CLIENT_STATIC_ENTRY_INITIALIZER} = CLIENT_${STATIC_ENTRY}_TABLE } }," ) endforeach() -string(APPEND CLIENT_STATIC_ENTRY_TABLES_LIST "\n\t{ NULL, { .cse = NULL } }\n};") +string(APPEND CLIENT_STATIC_ENTRY_TABLES_LIST "\n\t{ nullptr, { .cse = nullptr } }\n};") set(CLIENT_STATIC_ADDIN_TABLE "extern const STATIC_ADDIN_TABLE CLIENT_STATIC_ADDIN_TABLE[];\n") string(APPEND CLIENT_STATIC_ADDIN_TABLE "const STATIC_ADDIN_TABLE CLIENT_STATIC_ADDIN_TABLE[] =\n{") @@ -132,7 +132,7 @@ foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES}) set(SUBSYSTEM_IMPORT "extern UINT VCAPITYPE ${STATIC_SUBSYSTEM_ENTRY}(void*);") string(APPEND CLIENT_STATIC_SUBSYSTEM_IMPORTS "\n${SUBSYSTEM_IMPORT}") endforeach() - string(APPEND SUBSYSTEM_TABLE "\n\t{ NULL, NULL, NULL }\n};") + string(APPEND SUBSYSTEM_TABLE "\n\t{ nullptr, nullptr, nullptr }\n};") string(APPEND CLIENT_STATIC_SUBSYSTEM_TABLES "\n${SUBSYSTEM_TABLE}") foreach(ENTRY ${${STATIC_MODULE}_CLIENT_ENTRY}) @@ -155,7 +155,7 @@ foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES}) ) endforeach() endforeach() -string(APPEND CLIENT_STATIC_ADDIN_TABLE "\n\t{ NULL, NULL, { .cse = NULL }, NULL }\n};") +string(APPEND CLIENT_STATIC_ADDIN_TABLE "\n\t{ nullptr, nullptr, { .cse = nullptr }, nullptr }\n};") cleaning_configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tables.c.in ${CMAKE_CURRENT_BINARY_DIR}/tables.c) diff --git a/channels/client/addin.c b/channels/client/addin.c index 71a37a562..cc5fd880b 100644 --- a/channels/client/addin.c +++ b/channels/client/addin.c @@ -50,7 +50,7 @@ static void* freerdp_channels_find_static_entry_in_table(const STATIC_ENTRY_TABL size_t index = 0; const STATIC_ENTRY* pEntry = &table->table.cse[index++]; - while (pEntry->entry != NULL) + while (pEntry->entry != nullptr) { static_entry_fn_t fkt = pEntry->entry; if (strcmp(pEntry->name, identifier) == 0) @@ -59,7 +59,7 @@ static void* freerdp_channels_find_static_entry_in_table(const STATIC_ENTRY_TABL pEntry = &table->table.cse[index++]; } - return NULL; + return nullptr; } void* freerdp_channels_client_find_static_entry(const char* name, const char* identifier) @@ -67,7 +67,7 @@ void* freerdp_channels_client_find_static_entry(const char* name, const char* id size_t index = 0; const STATIC_ENTRY_TABLE* pEntry = &CLIENT_STATIC_ENTRY_TABLES[index++]; - while (pEntry->table.cse != NULL) + while (pEntry->table.cse != nullptr) { if (strcmp(pEntry->name, name) == 0) { @@ -77,7 +77,7 @@ void* freerdp_channels_client_find_static_entry(const char* name, const char* id pEntry = &CLIENT_STATIC_ENTRY_TABLES[index++]; } - return NULL; + return nullptr; } extern const STATIC_ADDIN_TABLE CLIENT_STATIC_ADDIN_TABLE[]; @@ -87,20 +87,20 @@ static FREERDP_ADDIN** freerdp_channels_list_client_static_addins( WINPR_ATTR_UNUSED LPCSTR pszType, WINPR_ATTR_UNUSED DWORD dwFlags) { DWORD nAddins = 0; - FREERDP_ADDIN** ppAddins = NULL; - const STATIC_SUBSYSTEM_ENTRY* subsystems = NULL; + FREERDP_ADDIN** ppAddins = nullptr; + const STATIC_SUBSYSTEM_ENTRY* subsystems = nullptr; nAddins = 0; ppAddins = (FREERDP_ADDIN**)calloc(128, sizeof(FREERDP_ADDIN*)); if (!ppAddins) { WLog_ERR(TAG, "calloc failed!"); - return NULL; + return nullptr; } - ppAddins[nAddins] = NULL; + ppAddins[nAddins] = nullptr; - for (size_t i = 0; CLIENT_STATIC_ADDIN_TABLE[i].name != NULL; i++) + for (size_t i = 0; CLIENT_STATIC_ADDIN_TABLE[i].name != nullptr; i++) { FREERDP_ADDIN* pAddin = (FREERDP_ADDIN*)calloc(1, sizeof(FREERDP_ADDIN)); const STATIC_ADDIN_TABLE* table = &CLIENT_STATIC_ADDIN_TABLE[i]; @@ -117,7 +117,7 @@ static FREERDP_ADDIN** freerdp_channels_list_client_static_addins( ppAddins[nAddins++] = pAddin; subsystems = table->table; - for (size_t j = 0; subsystems[j].name != NULL; j++) + for (size_t j = 0; subsystems[j].name != nullptr; j++) { pAddin = (FREERDP_ADDIN*)calloc(1, sizeof(FREERDP_ADDIN)); @@ -141,7 +141,7 @@ static FREERDP_ADDIN** freerdp_channels_list_client_static_addins( return ppAddins; error_out: freerdp_channels_addin_list_free(ppAddins); - return NULL; + return nullptr; } static HANDLE FindFirstFileUTF8(LPCSTR pszSearchPath, WIN32_FIND_DATAW* FindData) @@ -149,7 +149,7 @@ static HANDLE FindFirstFileUTF8(LPCSTR pszSearchPath, WIN32_FIND_DATAW* FindData HANDLE hdl = INVALID_HANDLE_VALUE; if (!pszSearchPath) return hdl; - WCHAR* wpath = ConvertUtf8ToWCharAlloc(pszSearchPath, NULL); + WCHAR* wpath = ConvertUtf8ToWCharAlloc(pszSearchPath, nullptr); if (!wpath) return hdl; @@ -164,18 +164,18 @@ static FREERDP_ADDIN** freerdp_channels_list_dynamic_addins(LPCSTR pszName, LPCS WINPR_ATTR_UNUSED DWORD dwFlags) { int nDashes = 0; - HANDLE hFind = NULL; + HANDLE hFind = nullptr; DWORD nAddins = 0; - LPSTR pszPattern = NULL; + LPSTR pszPattern = nullptr; size_t cchPattern = 0; LPCSTR pszAddinPath = FREERDP_ADDIN_PATH; LPCSTR pszInstallPrefix = FREERDP_INSTALL_PREFIX; - LPCSTR pszExtension = NULL; - LPSTR pszSearchPath = NULL; + LPCSTR pszExtension = nullptr; + LPSTR pszSearchPath = nullptr; size_t cchSearchPath = 0; size_t cchAddinPath = 0; size_t cchInstallPrefix = 0; - FREERDP_ADDIN** ppAddins = NULL; + FREERDP_ADDIN** ppAddins = nullptr; WIN32_FIND_DATAW FindData = WINPR_C_ARRAY_INIT; cchAddinPath = strnlen(pszAddinPath, sizeof(FREERDP_ADDIN_PATH)); cchInstallPrefix = strnlen(pszInstallPrefix, sizeof(FREERDP_INSTALL_PREFIX)); @@ -186,7 +186,7 @@ static FREERDP_ADDIN** freerdp_channels_list_dynamic_addins(LPCSTR pszName, LPCS if (!pszPattern) { WLog_ERR(TAG, "malloc failed!"); - return NULL; + return nullptr; } if (pszName && pszSubsystem && pszType) @@ -218,7 +218,7 @@ static FREERDP_ADDIN** freerdp_channels_list_dynamic_addins(LPCSTR pszName, LPCS { WLog_ERR(TAG, "malloc failed!"); free(pszPattern); - return NULL; + return nullptr; } CopyMemory(pszSearchPath, pszInstallPrefix, cchInstallPrefix); @@ -230,7 +230,7 @@ static FREERDP_ADDIN** freerdp_channels_list_dynamic_addins(LPCSTR pszName, LPCS if (FAILED(hr1) || FAILED(hr2)) { free(pszSearchPath); - return NULL; + return nullptr; } hFind = FindFirstFileUTF8(pszSearchPath, &FindData); @@ -243,7 +243,7 @@ static FREERDP_ADDIN** freerdp_channels_list_dynamic_addins(LPCSTR pszName, LPCS { FindClose(hFind); WLog_ERR(TAG, "calloc failed!"); - return NULL; + return nullptr; } if (hFind == INVALID_HANDLE_VALUE) @@ -251,7 +251,7 @@ static FREERDP_ADDIN** freerdp_channels_list_dynamic_addins(LPCSTR pszName, LPCS do { - char* cFileName = NULL; + char* cFileName = nullptr; BOOL used = FALSE; FREERDP_ADDIN* pAddin = (FREERDP_ADDIN*)calloc(1, sizeof(FREERDP_ADDIN)); @@ -262,7 +262,7 @@ static FREERDP_ADDIN** freerdp_channels_list_dynamic_addins(LPCSTR pszName, LPCS } cFileName = - ConvertWCharNToUtf8Alloc(FindData.cFileName, ARRAYSIZE(FindData.cFileName), NULL); + ConvertWCharNToUtf8Alloc(FindData.cFileName, ARRAYSIZE(FindData.cFileName), nullptr); if (!cFileName) goto skip; @@ -404,12 +404,12 @@ static FREERDP_ADDIN** freerdp_channels_list_dynamic_addins(LPCSTR pszName, LPCS } while (FindNextFileW(hFind, &FindData)); FindClose(hFind); - ppAddins[nAddins] = NULL; + ppAddins[nAddins] = nullptr; return ppAddins; error_out: FindClose(hFind); freerdp_channels_addin_list_free(ppAddins); - return NULL; + return nullptr; } FREERDP_ADDIN** freerdp_channels_list_addins(LPCSTR pszName, LPCSTR pszSubsystem, LPCSTR pszType, @@ -420,7 +420,7 @@ FREERDP_ADDIN** freerdp_channels_list_addins(LPCSTR pszName, LPCSTR pszSubsystem else if (dwFlags & FREERDP_ADDIN_DYNAMIC) return freerdp_channels_list_dynamic_addins(pszName, pszSubsystem, pszType, dwFlags); - return NULL; + return nullptr; } void freerdp_channels_addin_list_free(FREERDP_ADDIN** ppAddins) @@ -428,7 +428,7 @@ void freerdp_channels_addin_list_free(FREERDP_ADDIN** ppAddins) if (!ppAddins) return; - for (size_t index = 0; ppAddins[index] != NULL; index++) + for (size_t index = 0; ppAddins[index] != nullptr; index++) free(ppAddins[index]); free((void*)ppAddins); @@ -438,7 +438,7 @@ extern const STATIC_ENTRY CLIENT_VirtualChannelEntryEx_TABLE[]; static BOOL freerdp_channels_is_virtual_channel_entry_ex(LPCSTR pszName) { - for (size_t i = 0; CLIENT_VirtualChannelEntryEx_TABLE[i].name != NULL; i++) + for (size_t i = 0; CLIENT_VirtualChannelEntryEx_TABLE[i].name != nullptr; i++) { const STATIC_ENTRY* entry = &CLIENT_VirtualChannelEntryEx_TABLE[i]; @@ -453,10 +453,10 @@ PVIRTUALCHANNELENTRY freerdp_channels_load_static_addin_entry(LPCSTR pszName, LP LPCSTR pszType, DWORD dwFlags) { const STATIC_ADDIN_TABLE* table = CLIENT_STATIC_ADDIN_TABLE; - const char* type = NULL; + const char* type = nullptr; if (!pszName) - return NULL; + return nullptr; if (dwFlags & FREERDP_ADDIN_CHANNEL_DYNAMIC) type = "DVCPluginEntry"; @@ -470,18 +470,18 @@ PVIRTUALCHANNELENTRY freerdp_channels_load_static_addin_entry(LPCSTR pszName, LP type = "VirtualChannelEntry"; } - for (; table->name != NULL; table++) + for (; table->name != nullptr; table++) { if (strncmp(table->name, pszName, MAX_PATH) == 0) { if (type && (strncmp(table->type, type, MAX_PATH) != 0)) continue; - if (pszSubsystem != NULL) + if (pszSubsystem != nullptr) { const STATIC_SUBSYSTEM_ENTRY* subsystems = table->table; - for (; subsystems->name != NULL; subsystems++) + for (; subsystems->name != nullptr; subsystems++) { /* If the pszSubsystem is an empty string use the default backend. */ if ((strnlen(pszSubsystem, 1) == @@ -505,7 +505,7 @@ PVIRTUALCHANNELENTRY freerdp_channels_load_static_addin_entry(LPCSTR pszName, LP if (dwFlags & FREERDP_ADDIN_CHANNEL_ENTRYEX) { if (!freerdp_channels_is_virtual_channel_entry_ex(pszName)) - return NULL; + return nullptr; } return table->entry.csevc; @@ -513,7 +513,7 @@ PVIRTUALCHANNELENTRY freerdp_channels_load_static_addin_entry(LPCSTR pszName, LP } } - return NULL; + return nullptr; } typedef struct @@ -530,7 +530,7 @@ typedef struct static DWORD WINAPI channel_client_thread_proc(LPVOID userdata) { UINT error = CHANNEL_RC_OK; - wStream* data = NULL; + wStream* data = nullptr; wMessage message = WINPR_C_ARRAY_INIT; msg_proc_internals* internals = userdata; @@ -610,7 +610,7 @@ void* channel_client_create_handler(rdpContext* ctx, LPVOID userdata, MsgHandler if (!internals) { WLog_ERR(TAG, "calloc failed!"); - return NULL; + return nullptr; } internals->msg_handler = msg_handler; internals->userdata = userdata; @@ -635,8 +635,8 @@ void* channel_client_create_handler(rdpContext* ctx, LPVOID userdata, MsgHandler goto fail; } - if (!(internals->thread = - CreateThread(NULL, 0, channel_client_thread_proc, (void*)internals, 0, NULL))) + if (!(internals->thread = CreateThread(nullptr, 0, channel_client_thread_proc, + (void*)internals, 0, nullptr))) { WLog_ERR(TAG, "CreateThread failed!"); goto fail; @@ -646,14 +646,14 @@ void* channel_client_create_handler(rdpContext* ctx, LPVOID userdata, MsgHandler fail: channel_client_handler_free(internals); - return NULL; + return nullptr; } /* post a message in the queue or directly call the processing handler */ UINT channel_client_post_message(void* MsgsHandle, LPVOID pData, UINT32 dataLength, UINT32 totalLength, UINT32 dataFlags) { msg_proc_internals* internals = MsgsHandle; - wStream* data_in = NULL; + wStream* data_in = nullptr; if (!internals) { @@ -674,7 +674,7 @@ UINT channel_client_post_message(void* MsgsHandle, LPVOID pData, UINT32 dataLeng return CHANNEL_RC_NO_MEMORY; } else - internals->data_in = Stream_New(NULL, totalLength); + internals->data_in = Stream_New(nullptr, totalLength); } if (!(data_in = internals->data_in)) @@ -686,7 +686,7 @@ UINT channel_client_post_message(void* MsgsHandle, LPVOID pData, UINT32 dataLeng if (!Stream_EnsureRemainingCapacity(data_in, dataLength)) { Stream_Free(internals->data_in, TRUE); - internals->data_in = NULL; + internals->data_in = nullptr; return CHANNEL_RC_NO_MEMORY; } @@ -700,7 +700,7 @@ UINT channel_client_post_message(void* MsgsHandle, LPVOID pData, UINT32 dataLeng return ERROR_INTERNAL_ERROR; } - internals->data_in = NULL; + internals->data_in = nullptr; Stream_SealLength(data_in); Stream_SetPosition(data_in, 0); @@ -717,7 +717,7 @@ UINT channel_client_post_message(void* MsgsHandle, LPVOID pData, UINT32 dataLeng return ERROR_INTERNAL_ERROR; } } - else if (!MessageQueue_Post(internals->queue, NULL, 0, (void*)data_in, NULL)) + else if (!MessageQueue_Post(internals->queue, nullptr, 0, (void*)data_in, nullptr)) { WLog_ERR(TAG, "MessageQueue_Post failed!"); return ERROR_INTERNAL_ERROR; diff --git a/channels/client/generic_dynvc.c b/channels/client/generic_dynvc.c index 3da12310b..9b2b2612c 100644 --- a/channels/client/generic_dynvc.c +++ b/channels/client/generic_dynvc.c @@ -29,8 +29,8 @@ static UINT generic_on_new_channel_connection(IWTSListenerCallback* pListenerCal WINPR_ATTR_UNUSED BOOL* pbAccept, IWTSVirtualChannelCallback** ppCallback) { - GENERIC_CHANNEL_CALLBACK* callback = NULL; - GENERIC_DYNVC_PLUGIN* plugin = NULL; + GENERIC_CHANNEL_CALLBACK* callback = nullptr; + GENERIC_DYNVC_PLUGIN* plugin = nullptr; GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; if (!listener_callback || !listener_callback->plugin) @@ -64,7 +64,7 @@ static UINT generic_dynvc_plugin_initialize(IWTSPlugin* pPlugin, IWTSVirtualChannelManager* pChannelMgr) { UINT rc = 0; - GENERIC_LISTENER_CALLBACK* listener_callback = NULL; + GENERIC_LISTENER_CALLBACK* listener_callback = nullptr; GENERIC_DYNVC_PLUGIN* plugin = (GENERIC_DYNVC_PLUGIN*)pPlugin; if (!plugin) @@ -158,7 +158,7 @@ UINT freerdp_generic_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints, const c DYNVC_PLUGIN_INIT_FN initPluginFn, DYNVC_PLUGIN_TERMINATE_FN terminatePluginFn) { - GENERIC_DYNVC_PLUGIN* plugin = NULL; + GENERIC_DYNVC_PLUGIN* plugin = nullptr; UINT error = CHANNEL_RC_INITIALIZATION_ERROR; WINPR_ASSERT(pEntryPoints); @@ -169,7 +169,7 @@ UINT freerdp_generic_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints, const c WINPR_ASSERT(channelCallbackSize >= sizeof(GENERIC_CHANNEL_CALLBACK)); plugin = (GENERIC_DYNVC_PLUGIN*)pEntryPoints->GetPlugin(pEntryPoints, name); - if (plugin != NULL) + if (plugin != nullptr) return CHANNEL_RC_ALREADY_INITIALIZED; plugin = (GENERIC_DYNVC_PLUGIN*)calloc(1, pluginSize); @@ -184,8 +184,8 @@ UINT freerdp_generic_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints, const c plugin->channel_callbacks = channel_callbacks; plugin->channelCallbackSize = channelCallbackSize; plugin->iface.Initialize = generic_dynvc_plugin_initialize; - plugin->iface.Connected = NULL; - plugin->iface.Disconnected = NULL; + plugin->iface.Connected = nullptr; + plugin->iface.Disconnected = nullptr; plugin->iface.Terminated = generic_plugin_terminated; plugin->iface.Attached = generic_dynvc_plugin_attached; plugin->iface.Detached = generic_dynvc_plugin_detached; diff --git a/channels/cliprdr/client/cliprdr_main.c b/channels/cliprdr/client/cliprdr_main.c index d7d40330c..2fdb3dbc0 100644 --- a/channels/cliprdr/client/cliprdr_main.c +++ b/channels/cliprdr/client/cliprdr_main.c @@ -44,10 +44,10 @@ const char type_FileContents[] = "FileContents"; CliprdrClientContext* cliprdr_get_client_interface(cliprdrPlugin* cliprdr) { - CliprdrClientContext* pInterface = NULL; + CliprdrClientContext* pInterface = nullptr; if (!cliprdr) - return NULL; + return nullptr; pInterface = (CliprdrClientContext*)cliprdr->channelEntryPoints.pInterface; return pInterface; @@ -560,10 +560,10 @@ static UINT cliprdr_order_recv(LPVOID userdata, wStream* s) static UINT cliprdr_client_capabilities(CliprdrClientContext* context, const CLIPRDR_CAPABILITIES* capabilities) { - wStream* s = NULL; + wStream* s = nullptr; UINT32 flags = 0; - const CLIPRDR_GENERAL_CAPABILITY_SET* generalCapabilitySet = NULL; - cliprdrPlugin* cliprdr = NULL; + const CLIPRDR_GENERAL_CAPABILITY_SET* generalCapabilitySet = nullptr; + cliprdrPlugin* cliprdr = nullptr; WINPR_ASSERT(context); @@ -623,8 +623,8 @@ static UINT cliprdr_client_capabilities(CliprdrClientContext* context, static UINT cliprdr_temp_directory(CliprdrClientContext* context, const CLIPRDR_TEMP_DIRECTORY* tempDirectory) { - wStream* s = NULL; - cliprdrPlugin* cliprdr = NULL; + wStream* s = nullptr; + cliprdrPlugin* cliprdr = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(tempDirectory); @@ -663,8 +663,8 @@ static UINT cliprdr_temp_directory(CliprdrClientContext* context, static UINT cliprdr_client_format_list(CliprdrClientContext* context, const CLIPRDR_FORMAT_LIST* formatList) { - wStream* s = NULL; - cliprdrPlugin* cliprdr = NULL; + wStream* s = nullptr; + cliprdrPlugin* cliprdr = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(formatList); @@ -729,8 +729,8 @@ static UINT cliprdr_client_format_list_response(CliprdrClientContext* context, const CLIPRDR_FORMAT_LIST_RESPONSE* formatListResponse) { - wStream* s = NULL; - cliprdrPlugin* cliprdr = NULL; + wStream* s = nullptr; + cliprdrPlugin* cliprdr = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(formatListResponse); @@ -758,8 +758,8 @@ cliprdr_client_format_list_response(CliprdrClientContext* context, static UINT cliprdr_client_lock_clipboard_data(CliprdrClientContext* context, const CLIPRDR_LOCK_CLIPBOARD_DATA* lockClipboardData) { - wStream* s = NULL; - cliprdrPlugin* cliprdr = NULL; + wStream* s = nullptr; + cliprdrPlugin* cliprdr = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(lockClipboardData); @@ -789,8 +789,8 @@ static UINT cliprdr_client_unlock_clipboard_data(CliprdrClientContext* context, const CLIPRDR_UNLOCK_CLIPBOARD_DATA* unlockClipboardData) { - wStream* s = NULL; - cliprdrPlugin* cliprdr = NULL; + wStream* s = nullptr; + cliprdrPlugin* cliprdr = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(unlockClipboardData); @@ -889,7 +889,7 @@ static UINT cliprdr_client_file_contents_request(CliprdrClientContext* context, const CLIPRDR_FILE_CONTENTS_REQUEST* fileContentsRequest) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(fileContentsRequest); @@ -937,8 +937,8 @@ static UINT cliprdr_client_file_contents_response(CliprdrClientContext* context, const CLIPRDR_FILE_CONTENTS_RESPONSE* fileContentsResponse) { - wStream* s = NULL; - cliprdrPlugin* cliprdr = NULL; + wStream* s = nullptr; + cliprdrPlugin* cliprdr = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(fileContentsResponse); @@ -1046,7 +1046,7 @@ static UINT cliprdr_virtual_channel_event_disconnected(cliprdrPlugin* cliprdr) WINPR_ASSERT(cliprdr); channel_client_quit_handler(cliprdr->MsgsHandle); - cliprdr->MsgsHandle = NULL; + cliprdr->MsgsHandle = nullptr; if (cliprdr->OpenHandle == 0) return CHANNEL_RC_OK; @@ -1076,7 +1076,7 @@ static UINT cliprdr_virtual_channel_event_terminated(cliprdrPlugin* cliprdr) { WINPR_ASSERT(cliprdr); - cliprdr->InitHandle = 0; + cliprdr->InitHandle = nullptr; free(cliprdr->context); free(cliprdr); return CHANNEL_RC_OK; @@ -1138,7 +1138,7 @@ FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS_E PVOID pInitHandle)) { UINT rc = 0; - CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = NULL; + CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = nullptr; cliprdrPlugin* cliprdr = (cliprdrPlugin*)calloc(1, sizeof(cliprdrPlugin)); wLog* log = WLog_Get(CHANNELS_TAG("cliprdr.client")); @@ -1172,7 +1172,7 @@ FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS_E } context->handle = (void*)cliprdr; - context->custom = NULL; + context->custom = nullptr; context->ClientCapabilities = cliprdr_client_capabilities; context->TempDirectory = cliprdr_temp_directory; context->ClientFormatList = cliprdr_client_format_list; diff --git a/channels/cliprdr/cliprdr_common.c b/channels/cliprdr/cliprdr_common.c index 50b61b4ef..06b752a2d 100644 --- a/channels/cliprdr/cliprdr_common.c +++ b/channels/cliprdr/cliprdr_common.c @@ -119,12 +119,12 @@ static BOOL cliprdr_validate_file_contents_request(const CLIPRDR_FILE_CONTENTS_R wStream* cliprdr_packet_new(UINT16 msgType, UINT16 msgFlags, size_t dataLen) { WINPR_ASSERT(dataLen < UINT32_MAX); - wStream* s = Stream_New(NULL, dataLen + 8ULL); + wStream* s = Stream_New(nullptr, dataLen + 8ULL); if (!s) { WLog_ERR(TAG, "Stream_New failed!"); - return NULL; + return nullptr; } Stream_Write_UINT16(s, msgType); @@ -174,15 +174,15 @@ static void cliprdr_write_file_contents_response(wStream* s, wStream* cliprdr_packet_lock_clipdata_new(const CLIPRDR_LOCK_CLIPBOARD_DATA* lockClipboardData) { - wStream* s = NULL; + wStream* s = nullptr; if (!lockClipboardData) - return NULL; + return nullptr; s = cliprdr_packet_new(CB_LOCK_CLIPDATA, 0, 4); if (!s) - return NULL; + return nullptr; cliprdr_write_lock_clipdata(s, lockClipboardData); return s; @@ -191,15 +191,15 @@ wStream* cliprdr_packet_lock_clipdata_new(const CLIPRDR_LOCK_CLIPBOARD_DATA* loc wStream* cliprdr_packet_unlock_clipdata_new(const CLIPRDR_UNLOCK_CLIPBOARD_DATA* unlockClipboardData) { - wStream* s = NULL; + wStream* s = nullptr; if (!unlockClipboardData) - return NULL; + return nullptr; s = cliprdr_packet_new(CB_UNLOCK_CLIPDATA, 0, 4); if (!s) - return NULL; + return nullptr; cliprdr_write_unlock_clipdata(s, unlockClipboardData); return s; @@ -207,15 +207,15 @@ cliprdr_packet_unlock_clipdata_new(const CLIPRDR_UNLOCK_CLIPBOARD_DATA* unlockCl wStream* cliprdr_packet_file_contents_request_new(const CLIPRDR_FILE_CONTENTS_REQUEST* request) { - wStream* s = NULL; + wStream* s = nullptr; if (!request) - return NULL; + return nullptr; s = cliprdr_packet_new(CB_FILECONTENTS_REQUEST, 0, 28); if (!s) - return NULL; + return nullptr; cliprdr_write_file_contents_request(s, request); return s; @@ -223,16 +223,16 @@ wStream* cliprdr_packet_file_contents_request_new(const CLIPRDR_FILE_CONTENTS_RE wStream* cliprdr_packet_file_contents_response_new(const CLIPRDR_FILE_CONTENTS_RESPONSE* response) { - wStream* s = NULL; + wStream* s = nullptr; if (!response) - return NULL; + return nullptr; s = cliprdr_packet_new(CB_FILECONTENTS_RESPONSE, response->common.msgFlags, 4 + response->cbRequested); if (!s) - return NULL; + return nullptr; cliprdr_write_file_contents_response(s, response); return s; @@ -259,7 +259,7 @@ wStream* cliprdr_packet_format_list_new(const CLIPRDR_FORMAT_LIST* formatList, if (!s) { WLog_ERR(TAG, "cliprdr_packet_new failed!"); - return NULL; + return nullptr; } for (UINT32 index = 0; index < formatList->numFormats; index++) @@ -306,7 +306,7 @@ wStream* cliprdr_packet_format_list_new(const CLIPRDR_FORMAT_LIST* formatList, fail: Stream_Free(s, TRUE); - return NULL; + return nullptr; } UINT cliprdr_read_unlock_clipdata(wStream* s, CLIPRDR_UNLOCK_CLIPBOARD_DATA* unlockClipboardData) @@ -329,7 +329,7 @@ UINT cliprdr_read_format_data_request(wStream* s, CLIPRDR_FORMAT_DATA_REQUEST* r UINT cliprdr_read_format_data_response(wStream* s, CLIPRDR_FORMAT_DATA_RESPONSE* response) { - response->requestedFormatData = NULL; + response->requestedFormatData = nullptr; if (!Stream_CheckAndLogRequiredLength(TAG, s, response->common.dataLen)) return ERROR_INVALID_DATA; @@ -383,17 +383,17 @@ UINT cliprdr_read_format_list(wLog* log, wStream* s, CLIPRDR_FORMAT_LIST* format { UINT32 index = 0; size_t formatNameLength = 0; - const char* szFormatName = NULL; - const WCHAR* wszFormatName = NULL; + const char* szFormatName = nullptr; + const WCHAR* wszFormatName = nullptr; wStream sub1buffer = WINPR_C_ARRAY_INIT; - CLIPRDR_FORMAT* formats = NULL; + CLIPRDR_FORMAT* formats = nullptr; UINT error = ERROR_INTERNAL_ERROR; const BOOL asciiNames = (formatList->common.msgFlags & CB_ASCII_NAMES) != 0; index = 0; /* empty format list */ - formatList->formats = NULL; + formatList->formats = nullptr; formatList->numFormats = 0; wStream* sub1 = @@ -448,7 +448,7 @@ UINT cliprdr_read_format_list(wLog* log, wStream* s, CLIPRDR_FORMAT_LIST* format goto error_out; free(format->formatName); - format->formatName = NULL; + format->formatName = nullptr; if (asciiNames) { @@ -468,7 +468,7 @@ UINT cliprdr_read_format_list(wLog* log, wStream* s, CLIPRDR_FORMAT_LIST* format { if (wszFormatName[0]) { - format->formatName = ConvertWCharNToUtf8Alloc(wszFormatName, 16, NULL); + format->formatName = ConvertWCharNToUtf8Alloc(wszFormatName, 16, nullptr); if (!format->formatName) goto error_out; } @@ -519,7 +519,7 @@ UINT cliprdr_read_format_list(wLog* log, wStream* s, CLIPRDR_FORMAT_LIST* format Stream_Read_UINT32(sub2, format->formatId); /* formatId (4 bytes) */ free(format->formatName); - format->formatName = NULL; + format->formatName = nullptr; wszFormatName = Stream_ConstPointer(sub2); rest = Stream_GetRemainingLength(sub2); @@ -530,7 +530,7 @@ UINT cliprdr_read_format_list(wLog* log, wStream* s, CLIPRDR_FORMAT_LIST* format if (formatNameLength) { format->formatName = - ConvertWCharNToUtf8Alloc(wszFormatName, formatNameLength, NULL); + ConvertWCharNToUtf8Alloc(wszFormatName, formatNameLength, nullptr); if (!format->formatName) goto error_out; } @@ -548,7 +548,7 @@ error_out: void cliprdr_free_format_list(CLIPRDR_FORMAT_LIST* formatList) { - if (formatList == NULL) + if (formatList == nullptr) return; if (formatList->formats) @@ -559,7 +559,7 @@ void cliprdr_free_format_list(CLIPRDR_FORMAT_LIST* formatList) } free(formatList->formats); - formatList->formats = NULL; + formatList->formats = nullptr; formatList->numFormats = 0; } } diff --git a/channels/cliprdr/server/cliprdr_main.c b/channels/cliprdr/server/cliprdr_main.c index 375e8b1e9..446edf5fd 100644 --- a/channels/cliprdr/server/cliprdr_main.c +++ b/channels/cliprdr/server/cliprdr_main.c @@ -186,8 +186,8 @@ static UINT cliprdr_server_capabilities(CliprdrServerContext* context, static UINT cliprdr_server_monitor_ready(CliprdrServerContext* context, const CLIPRDR_MONITOR_READY* monitorReady) { - wStream* s = NULL; - CliprdrServerPrivate* cliprdr = NULL; + wStream* s = nullptr; + CliprdrServerPrivate* cliprdr = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(monitorReady); @@ -218,8 +218,8 @@ static UINT cliprdr_server_monitor_ready(CliprdrServerContext* context, static UINT cliprdr_server_format_list(CliprdrServerContext* context, const CLIPRDR_FORMAT_LIST* formatList) { - wStream* s = NULL; - CliprdrServerPrivate* cliprdr = NULL; + wStream* s = nullptr; + CliprdrServerPrivate* cliprdr = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(formatList); @@ -246,8 +246,8 @@ static UINT cliprdr_server_format_list_response(CliprdrServerContext* context, const CLIPRDR_FORMAT_LIST_RESPONSE* formatListResponse) { - wStream* s = NULL; - CliprdrServerPrivate* cliprdr = NULL; + wStream* s = nullptr; + CliprdrServerPrivate* cliprdr = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(formatListResponse); @@ -277,8 +277,8 @@ cliprdr_server_format_list_response(CliprdrServerContext* context, static UINT cliprdr_server_lock_clipboard_data(CliprdrServerContext* context, const CLIPRDR_LOCK_CLIPBOARD_DATA* lockClipboardData) { - wStream* s = NULL; - CliprdrServerPrivate* cliprdr = NULL; + wStream* s = nullptr; + CliprdrServerPrivate* cliprdr = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(lockClipboardData); @@ -308,8 +308,8 @@ static UINT cliprdr_server_unlock_clipboard_data(CliprdrServerContext* context, const CLIPRDR_UNLOCK_CLIPBOARD_DATA* unlockClipboardData) { - wStream* s = NULL; - CliprdrServerPrivate* cliprdr = NULL; + wStream* s = nullptr; + CliprdrServerPrivate* cliprdr = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(unlockClipboardData); @@ -339,8 +339,8 @@ cliprdr_server_unlock_clipboard_data(CliprdrServerContext* context, static UINT cliprdr_server_format_data_request(CliprdrServerContext* context, const CLIPRDR_FORMAT_DATA_REQUEST* formatDataRequest) { - wStream* s = NULL; - CliprdrServerPrivate* cliprdr = NULL; + wStream* s = nullptr; + CliprdrServerPrivate* cliprdr = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(formatDataRequest); @@ -372,8 +372,8 @@ static UINT cliprdr_server_format_data_response(CliprdrServerContext* context, const CLIPRDR_FORMAT_DATA_RESPONSE* formatDataResponse) { - wStream* s = NULL; - CliprdrServerPrivate* cliprdr = NULL; + wStream* s = nullptr; + CliprdrServerPrivate* cliprdr = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(formatDataResponse); @@ -406,8 +406,8 @@ static UINT cliprdr_server_file_contents_request(CliprdrServerContext* context, const CLIPRDR_FILE_CONTENTS_REQUEST* fileContentsRequest) { - wStream* s = NULL; - CliprdrServerPrivate* cliprdr = NULL; + wStream* s = nullptr; + CliprdrServerPrivate* cliprdr = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(fileContentsRequest); @@ -438,8 +438,8 @@ static UINT cliprdr_server_file_contents_response(CliprdrServerContext* context, const CLIPRDR_FILE_CONTENTS_RESPONSE* fileContentsResponse) { - wStream* s = NULL; - CliprdrServerPrivate* cliprdr = NULL; + wStream* s = nullptr; + CliprdrServerPrivate* cliprdr = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(fileContentsResponse); @@ -509,7 +509,7 @@ static UINT cliprdr_server_receive_capabilities(CliprdrServerContext* context, w UINT error = ERROR_INVALID_DATA; size_t cap_sets_size = 0; CLIPRDR_CAPABILITIES capabilities = WINPR_C_ARRAY_INIT; - CLIPRDR_CAPABILITY_SET* capSet = NULL; + CLIPRDR_CAPABILITY_SET* capSet = nullptr; WINPR_ASSERT(context); WINPR_UNUSED(header); @@ -523,7 +523,7 @@ static UINT cliprdr_server_receive_capabilities(CliprdrServerContext* context, w for (size_t index = 0; index < capabilities.cCapabilitiesSets; index++) { - void* tmp = NULL; + void* tmp = nullptr; if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) goto out; Stream_Read_UINT16(s, capabilitySetType); /* capabilitySetType (2 bytes) */ @@ -533,7 +533,7 @@ static UINT cliprdr_server_receive_capabilities(CliprdrServerContext* context, w if (cap_sets_size > 0) tmp = realloc(capabilities.capabilitySets, cap_sets_size); - if (tmp == NULL) + if (tmp == nullptr) { WLog_ERR(TAG, "capabilities.capabilitySets realloc failed!"); free(capabilities.capabilitySets); @@ -586,7 +586,7 @@ static UINT cliprdr_server_receive_temporary_directory(CliprdrServerContext* con { size_t length = 0; CLIPRDR_TEMP_DIRECTORY tempDirectory = WINPR_C_ARRAY_INIT; - CliprdrServerPrivate* cliprdr = NULL; + CliprdrServerPrivate* cliprdr = nullptr; UINT error = CHANNEL_RC_OK; WINPR_ASSERT(context); @@ -1060,12 +1060,12 @@ static UINT cliprdr_server_init(CliprdrServerContext* context) */ static UINT cliprdr_server_read(CliprdrServerContext* context) { - wStream* s = NULL; + wStream* s = nullptr; size_t position = 0; DWORD BytesToRead = 0; DWORD BytesReturned = 0; CLIPRDR_HEADER header = WINPR_C_ARRAY_INIT; - CliprdrServerPrivate* cliprdr = NULL; + CliprdrServerPrivate* cliprdr = nullptr; UINT error = 0; DWORD status = 0; @@ -1208,9 +1208,9 @@ static DWORD WINAPI cliprdr_server_thread(LPVOID arg) DWORD status = 0; DWORD nCount = 0; HANDLE events[MAXIMUM_WAIT_OBJECTS] = WINPR_C_ARRAY_INIT; - HANDLE ChannelEvent = NULL; + HANDLE ChannelEvent = nullptr; CliprdrServerContext* context = (CliprdrServerContext*)arg; - CliprdrServerPrivate* cliprdr = NULL; + CliprdrServerPrivate* cliprdr = nullptr; UINT error = CHANNEL_RC_OK; WINPR_ASSERT(context); @@ -1290,9 +1290,9 @@ out: */ static UINT cliprdr_server_open(CliprdrServerContext* context) { - void* buffer = NULL; + void* buffer = nullptr; DWORD BytesReturned = 0; - CliprdrServerPrivate* cliprdr = NULL; + CliprdrServerPrivate* cliprdr = nullptr; WINPR_ASSERT(context); @@ -1308,7 +1308,7 @@ static UINT cliprdr_server_open(CliprdrServerContext* context) return ERROR_INTERNAL_ERROR; } - cliprdr->ChannelEvent = NULL; + cliprdr->ChannelEvent = nullptr; if (WTSVirtualChannelQuery(cliprdr->ChannelHandle, WTSVirtualEventHandle, &buffer, &BytesReturned)) @@ -1339,7 +1339,7 @@ static UINT cliprdr_server_open(CliprdrServerContext* context) */ static UINT cliprdr_server_close(CliprdrServerContext* context) { - CliprdrServerPrivate* cliprdr = NULL; + CliprdrServerPrivate* cliprdr = nullptr; WINPR_ASSERT(context); @@ -1349,7 +1349,7 @@ static UINT cliprdr_server_close(CliprdrServerContext* context) if (cliprdr->ChannelHandle) { (void)WTSVirtualChannelClose(cliprdr->ChannelHandle); - cliprdr->ChannelHandle = NULL; + cliprdr->ChannelHandle = nullptr; } return CHANNEL_RC_OK; @@ -1363,7 +1363,7 @@ static UINT cliprdr_server_close(CliprdrServerContext* context) static UINT cliprdr_server_start(CliprdrServerContext* context) { UINT error = 0; - CliprdrServerPrivate* cliprdr = NULL; + CliprdrServerPrivate* cliprdr = nullptr; WINPR_ASSERT(context); @@ -1379,17 +1379,18 @@ static UINT cliprdr_server_start(CliprdrServerContext* context) } } - if (!(cliprdr->StopEvent = CreateEvent(NULL, TRUE, FALSE, NULL))) + if (!(cliprdr->StopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr))) { WLog_ERR(TAG, "CreateEvent failed!"); return ERROR_INTERNAL_ERROR; } - if (!(cliprdr->Thread = CreateThread(NULL, 0, cliprdr_server_thread, (void*)context, 0, NULL))) + if (!(cliprdr->Thread = + CreateThread(nullptr, 0, cliprdr_server_thread, (void*)context, 0, nullptr))) { WLog_ERR(TAG, "CreateThread failed!"); (void)CloseHandle(cliprdr->StopEvent); - cliprdr->StopEvent = NULL; + cliprdr->StopEvent = nullptr; return ERROR_INTERNAL_ERROR; } @@ -1404,7 +1405,7 @@ static UINT cliprdr_server_start(CliprdrServerContext* context) static UINT cliprdr_server_stop(CliprdrServerContext* context) { UINT error = CHANNEL_RC_OK; - CliprdrServerPrivate* cliprdr = NULL; + CliprdrServerPrivate* cliprdr = nullptr; WINPR_ASSERT(context); @@ -1434,7 +1435,7 @@ static UINT cliprdr_server_stop(CliprdrServerContext* context) static HANDLE cliprdr_server_get_event_handle(CliprdrServerContext* context) { - CliprdrServerPrivate* cliprdr = NULL; + CliprdrServerPrivate* cliprdr = nullptr; WINPR_ASSERT(context); @@ -1455,7 +1456,7 @@ static UINT cliprdr_server_check_event_handle(CliprdrServerContext* context) CliprdrServerContext* cliprdr_server_context_new(HANDLE vcm) { - CliprdrServerPrivate* cliprdr = NULL; + CliprdrServerPrivate* cliprdr = nullptr; CliprdrServerContext* context = (CliprdrServerContext*)calloc(1, sizeof(CliprdrServerContext)); if (context) @@ -1482,21 +1483,21 @@ CliprdrServerContext* cliprdr_server_context_new(HANDLE vcm) if (cliprdr) { cliprdr->vcm = vcm; - cliprdr->s = Stream_New(NULL, 4096); + cliprdr->s = Stream_New(nullptr, 4096); if (!cliprdr->s) { WLog_ERR(TAG, "Stream_New failed!"); free(context->handle); free(context); - return NULL; + return nullptr; } } else { WLog_ERR(TAG, "calloc failed!"); free(context); - return NULL; + return nullptr; } } @@ -1505,7 +1506,7 @@ CliprdrServerContext* cliprdr_server_context_new(HANDLE vcm) void cliprdr_server_context_free(CliprdrServerContext* context) { - CliprdrServerPrivate* cliprdr = NULL; + CliprdrServerPrivate* cliprdr = nullptr; if (!context) return; diff --git a/channels/disp/client/disp_main.c b/channels/disp/client/disp_main.c index 47e24cd6a..a0f38098c 100644 --- a/channels/disp/client/disp_main.c +++ b/channels/disp/client/disp_main.c @@ -63,8 +63,8 @@ disp_send_display_control_monitor_layout_pdu(GENERIC_CHANNEL_CALLBACK* callback, const DISPLAY_CONTROL_MONITOR_LAYOUT* Monitors) { UINT status = 0; - wStream* s = NULL; - DISP_PLUGIN* disp = NULL; + wStream* s = nullptr; + DISP_PLUGIN* disp = nullptr; UINT32 MonitorLayoutSize = 0; DISPLAY_CONTROL_HEADER header = WINPR_C_ARRAY_INIT; @@ -78,7 +78,7 @@ disp_send_display_control_monitor_layout_pdu(GENERIC_CHANNEL_CALLBACK* callback, header.length = 8 + 8 + (NumMonitors * MonitorLayoutSize); header.type = DISPLAY_CONTROL_PDU_TYPE_MONITOR_LAYOUT; - s = Stream_New(NULL, header.length); + s = Stream_New(nullptr, header.length); if (!s) { @@ -144,7 +144,7 @@ disp_send_display_control_monitor_layout_pdu(GENERIC_CHANNEL_CALLBACK* callback, out: Stream_SealLength(s); status = callback->channel->Write(callback->channel, (UINT32)Stream_Length(s), Stream_Buffer(s), - NULL); + nullptr); Stream_Free(s, TRUE); return status; } @@ -156,8 +156,8 @@ out: */ static UINT disp_recv_display_control_caps_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) { - DISP_PLUGIN* disp = NULL; - DispClientContext* context = NULL; + DISP_PLUGIN* disp = nullptr; + DispClientContext* context = nullptr; UINT ret = CHANNEL_RC_OK; WINPR_ASSERT(callback); @@ -256,8 +256,8 @@ static UINT disp_on_close(IWTSVirtualChannelCallback* pChannelCallback) static UINT disp_send_monitor_layout(DispClientContext* context, UINT32 NumMonitors, DISPLAY_CONTROL_MONITOR_LAYOUT* Monitors) { - DISP_PLUGIN* disp = NULL; - GENERIC_CHANNEL_CALLBACK* callback = NULL; + DISP_PLUGIN* disp = nullptr; + GENERIC_CHANNEL_CALLBACK* callback = nullptr; WINPR_ASSERT(context); @@ -278,7 +278,7 @@ static UINT disp_plugin_initialize(GENERIC_DYNVC_PLUGIN* base, WINPR_ATTR_UNUSED rdpContext* rcontext, WINPR_ATTR_UNUSED rdpSettings* settings) { - DispClientContext* context = NULL; + DispClientContext* context = nullptr; DISP_PLUGIN* disp = (DISP_PLUGIN*)base; WINPR_ASSERT(disp); @@ -310,8 +310,9 @@ static void disp_plugin_terminated(GENERIC_DYNVC_PLUGIN* base) free(disp->context); } -static const IWTSVirtualChannelCallback disp_callbacks = { disp_on_data_received, NULL, /* Open */ - disp_on_close, NULL }; +static const IWTSVirtualChannelCallback disp_callbacks = { disp_on_data_received, + nullptr, /* Open */ + disp_on_close, nullptr }; /** * Function description diff --git a/channels/disp/server/disp_main.c b/channels/disp/server/disp_main.c index 792c2ffc1..a2bdd96a0 100644 --- a/channels/disp/server/disp_main.c +++ b/channels/disp/server/disp_main.c @@ -48,7 +48,7 @@ static wStream* disp_server_single_packet_new(UINT32 type, UINT32 length) { UINT error = 0; DISPLAY_CONTROL_HEADER header; - wStream* s = Stream_New(NULL, DISPLAY_CONTROL_HEADER_LENGTH + length); + wStream* s = Stream_New(nullptr, DISPLAY_CONTROL_HEADER_LENGTH + length); if (!s) { @@ -68,7 +68,7 @@ static wStream* disp_server_single_packet_new(UINT32 type, UINT32 length) return s; error: Stream_Free(s, TRUE); - return NULL; + return nullptr; } static void disp_server_sanitize_monitor_layout(DISPLAY_CONTROL_MONITOR_LAYOUT* monitor) @@ -260,10 +260,10 @@ static UINT disp_server_receive_pdu(DispServerContext* context, wStream* s) static UINT disp_server_handle_messages(DispServerContext* context) { DWORD BytesReturned = 0; - void* buffer = NULL; + void* buffer = nullptr; UINT ret = CHANNEL_RC_OK; - DispServerPrivate* priv = NULL; - wStream* s = NULL; + DispServerPrivate* priv = nullptr; + wStream* s = nullptr; WINPR_ASSERT(context); @@ -293,7 +293,7 @@ static UINT disp_server_handle_messages(DispServerContext* context) /* Consume channel event only after the disp dynamic channel is ready */ Stream_SetPosition(s, 0); - if (!WTSVirtualChannelRead(priv->disp_channel, 0, NULL, 0, &BytesReturned)) + if (!WTSVirtualChannelRead(priv->disp_channel, 0, nullptr, 0, &BytesReturned)) { if (GetLastError() == ERROR_NO_DATA) return ERROR_NO_DATA; @@ -343,7 +343,7 @@ static UINT disp_server_handle_messages(DispServerContext* context) static DWORD WINAPI disp_server_thread_func(LPVOID arg) { DispServerContext* context = (DispServerContext*)arg; - DispServerPrivate* priv = NULL; + DispServerPrivate* priv = nullptr; DWORD status = 0; DWORD nCount = 0; HANDLE events[8] = WINPR_C_ARRAY_INIT; @@ -392,10 +392,10 @@ static DWORD WINAPI disp_server_thread_func(LPVOID arg) static UINT disp_server_open(DispServerContext* context) { UINT rc = ERROR_INTERNAL_ERROR; - DispServerPrivate* priv = NULL; + DispServerPrivate* priv = nullptr; DWORD BytesReturned = 0; - PULONG pSessionId = NULL; - void* buffer = NULL; + PULONG pSessionId = nullptr; + void* buffer = nullptr; UINT32 channelId = 0; BOOL status = TRUE; @@ -456,9 +456,9 @@ static UINT disp_server_open(DispServerContext* context) priv->channelEvent = *(HANDLE*)buffer; WTSFreeMemory(buffer); - if (priv->thread == NULL) + if (priv->thread == nullptr) { - if (!(priv->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL))) + if (!(priv->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr))) { WLog_ERR(TAG, "CreateEvent failed!"); rc = ERROR_INTERNAL_ERROR; @@ -466,11 +466,11 @@ static UINT disp_server_open(DispServerContext* context) } if (!(priv->thread = - CreateThread(NULL, 0, disp_server_thread_func, (void*)context, 0, NULL))) + CreateThread(nullptr, 0, disp_server_thread_func, (void*)context, 0, nullptr))) { WLog_ERR(TAG, "CreateEvent failed!"); (void)CloseHandle(priv->stopEvent); - priv->stopEvent = NULL; + priv->stopEvent = nullptr; rc = ERROR_INTERNAL_ERROR; goto out_close; } @@ -479,8 +479,8 @@ static UINT disp_server_open(DispServerContext* context) return CHANNEL_RC_OK; out_close: (void)WTSVirtualChannelClose(priv->disp_channel); - priv->disp_channel = NULL; - priv->channelEvent = NULL; + priv->disp_channel = nullptr; + priv->channelEvent = nullptr; return rc; } @@ -522,7 +522,7 @@ out: */ static UINT disp_server_send_caps_pdu(DispServerContext* context) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); @@ -548,7 +548,7 @@ static UINT disp_server_send_caps_pdu(DispServerContext* context) static UINT disp_server_close(DispServerContext* context) { UINT error = CHANNEL_RC_OK; - DispServerPrivate* priv = NULL; + DispServerPrivate* priv = nullptr; WINPR_ASSERT(context); @@ -568,14 +568,14 @@ static UINT disp_server_close(DispServerContext* context) (void)CloseHandle(priv->thread); (void)CloseHandle(priv->stopEvent); - priv->thread = NULL; - priv->stopEvent = NULL; + priv->thread = nullptr; + priv->stopEvent = nullptr; } if (priv->disp_channel) { (void)WTSVirtualChannelClose(priv->disp_channel); - priv->disp_channel = NULL; + priv->disp_channel = nullptr; } return error; @@ -583,8 +583,8 @@ static UINT disp_server_close(DispServerContext* context) DispServerContext* disp_server_context_new(HANDLE vcm) { - DispServerContext* context = NULL; - DispServerPrivate* priv = NULL; + DispServerContext* context = nullptr; + DispServerPrivate* priv = nullptr; context = (DispServerContext*)calloc(1, sizeof(DispServerContext)); if (!context) @@ -601,7 +601,7 @@ DispServerContext* disp_server_context_new(HANDLE vcm) goto fail; } - priv->input_stream = Stream_New(NULL, 4); + priv->input_stream = Stream_New(nullptr, 4); if (!priv->input_stream) { @@ -620,7 +620,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC disp_server_context_free(context); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void disp_server_context_free(DispServerContext* context) diff --git a/channels/drdynvc/client/drdynvc_main.c b/channels/drdynvc/client/drdynvc_main.c index ddcc9d6e5..fb6b0d7d6 100644 --- a/channels/drdynvc/client/drdynvc_main.c +++ b/channels/drdynvc/client/drdynvc_main.c @@ -73,7 +73,7 @@ static UINT dvcman_get_configuration(IWTSListener* pListener, void** ppPropertyB { WINPR_ASSERT(ppPropertyBag); WINPR_UNUSED(pListener); - *ppPropertyBag = NULL; + *ppPropertyBag = nullptr; return ERROR_INTERNAL_ERROR; } @@ -88,7 +88,7 @@ static UINT dvcman_create_listener(IWTSVirtualChannelManager* pChannelMgr, IWTSListener** ppListener) { DVCMAN* dvcman = (DVCMAN*)pChannelMgr; - DVCMAN_LISTENER* listener = NULL; + DVCMAN_LISTENER* listener = nullptr; WINPR_ASSERT(dvcman); WLog_DBG(TAG, "create_listener: %" PRIuz ".%s.", HashTable_Count(dvcman->listeners) + 1, @@ -102,7 +102,7 @@ static UINT dvcman_create_listener(IWTSVirtualChannelManager* pChannelMgr, } listener->iface.GetConfiguration = dvcman_get_configuration; - listener->iface.pInterface = NULL; + listener->iface.pInterface = nullptr; listener->dvcman = dvcman; listener->channel_name = _strdup(pszChannelName); @@ -168,18 +168,18 @@ static UINT dvcman_register_plugin(IDRDYNVC_ENTRY_POINTS* pEntryPoints, const ch static IWTSPlugin* dvcman_get_plugin(IDRDYNVC_ENTRY_POINTS* pEntryPoints, const char* name) { - IWTSPlugin* plugin = NULL; + IWTSPlugin* plugin = nullptr; size_t nc = 0; size_t pc = 0; WINPR_ASSERT(pEntryPoints); DVCMAN* dvcman = ((DVCMAN_ENTRY_POINTS*)pEntryPoints)->dvcman; if (!dvcman || !pEntryPoints || !name) - return NULL; + return nullptr; nc = ArrayList_Count(dvcman->plugin_names); pc = ArrayList_Count(dvcman->plugins); if (nc != pc) - return NULL; + return nullptr; ArrayList_Lock(dvcman->plugin_names); ArrayList_Lock(dvcman->plugins); @@ -236,7 +236,7 @@ static DVCMAN_CHANNEL* dvcman_get_channel_by_id(IWTSVirtualChannelManager* pChan UINT32 ChannelId, BOOL doRef) { DVCMAN* dvcman = (DVCMAN*)pChannelMgr; - DVCMAN_CHANNEL* dvcChannel = NULL; + DVCMAN_CHANNEL* dvcChannel = nullptr; WINPR_ASSERT(dvcman); HashTable_Lock(dvcman->channelsById); @@ -256,7 +256,7 @@ static IWTSVirtualChannel* dvcman_find_channel_by_id(IWTSVirtualChannelManager* { DVCMAN_CHANNEL* channel = dvcman_get_channel_by_id(pChannelMgr, ChannelId, FALSE); if (!channel) - return NULL; + return nullptr; return &channel->iface; } @@ -302,11 +302,11 @@ static void channelByIdCleanerFn(void* value) static IWTSVirtualChannelManager* dvcman_new(drdynvcPlugin* plugin) { - wObject* obj = NULL; + wObject* obj = nullptr; DVCMAN* dvcman = (DVCMAN*)calloc(1, sizeof(DVCMAN)); if (!dvcman) - return NULL; + return nullptr; dvcman->iface.CreateListener = dvcman_create_listener; dvcman->iface.DestroyListener = dvcman_destroy_listener; @@ -358,7 +358,7 @@ static IWTSVirtualChannelManager* dvcman_new(drdynvcPlugin* plugin) return &dvcman->iface; fail: dvcman_free(plugin, &dvcman->iface); - return NULL; + return nullptr; } /** @@ -376,8 +376,8 @@ static UINT dvcman_load_addin(drdynvcPlugin* drdynvc, IWTSVirtualChannelManager* WLog_Print(drdynvc->log, WLOG_INFO, "Loading Dynamic Virtual Channel %s", args->argv[0]); - PVIRTUALCHANNELENTRY pvce = - freerdp_load_channel_addin_entry(args->argv[0], NULL, NULL, FREERDP_ADDIN_CHANNEL_DYNAMIC); + PVIRTUALCHANNELENTRY pvce = freerdp_load_channel_addin_entry(args->argv[0], nullptr, nullptr, + FREERDP_ADDIN_CHANNEL_DYNAMIC); PDVC_PLUGIN_ENTRY pDVCPluginEntry = WINPR_FUNC_PTR_CAST(pvce, PDVC_PLUGIN_ENTRY); if (pDVCPluginEntry) @@ -473,7 +473,7 @@ static UINT dvcman_call_on_receive(DVCMAN_CHANNEL* channel, wStream* data) static UINT dvcman_channel_close(DVCMAN_CHANNEL* channel, BOOL perRequest, BOOL fromHashTableFn) { UINT error = CHANNEL_RC_OK; - DrdynvcClientContext* context = NULL; + DrdynvcClientContext* context = nullptr; WINPR_ASSERT(channel); switch (channel->state) @@ -512,7 +512,7 @@ static UINT dvcman_channel_close(DVCMAN_CHANNEL* channel, BOOL perRequest, BOOL check_open_close_receive(channel); IWTSVirtualChannelCallback* cb = channel->channel_callback; - channel->channel_callback = NULL; + channel->channel_callback = nullptr; if (cb) error = IFCALLRESULT(CHANNEL_RC_OK, cb->OnClose, cb); } @@ -542,14 +542,14 @@ static DVCMAN_CHANNEL* dvcman_channel_new(WINPR_ATTR_UNUSED drdynvcPlugin* drdyn IWTSVirtualChannelManager* pChannelMgr, UINT32 ChannelId, const char* ChannelName) { - DVCMAN_CHANNEL* channel = NULL; + DVCMAN_CHANNEL* channel = nullptr; WINPR_ASSERT(drdynvc); WINPR_ASSERT(pChannelMgr); channel = (DVCMAN_CHANNEL*)calloc(1, sizeof(DVCMAN_CHANNEL)); if (!channel) - return NULL; + return nullptr; channel->dvcman = (DVCMAN*)pChannelMgr; channel->channel_id = ChannelId; @@ -569,7 +569,7 @@ static DVCMAN_CHANNEL* dvcman_channel_new(WINPR_ATTR_UNUSED drdynvcPlugin* drdyn return channel; fail: dvcman_channel_free(channel); - return NULL; + return nullptr; } static void dvcman_clear(drdynvcPlugin* drdynvc, IWTSVirtualChannelManager* pChannelMgr) @@ -683,11 +683,11 @@ static DVCMAN_CHANNEL* dvcman_create_channel(drdynvcPlugin* drdynvc, UINT32 ChannelId, const char* ChannelName, UINT* res) { BOOL bAccept = 0; - DVCMAN_CHANNEL* channel = NULL; - DrdynvcClientContext* context = NULL; + DVCMAN_CHANNEL* channel = nullptr; + DrdynvcClientContext* context = nullptr; DVCMAN* dvcman = (DVCMAN*)pChannelMgr; - DVCMAN_LISTENER* listener = NULL; - IWTSVirtualChannelCallback* pCallback = NULL; + DVCMAN_LISTENER* listener = nullptr; + IWTSVirtualChannelCallback* pCallback = nullptr; WINPR_ASSERT(dvcman); WINPR_ASSERT(res); @@ -738,7 +738,7 @@ static DVCMAN_CHANNEL* dvcman_create_channel(drdynvcPlugin* drdynvc, WLog_Print(drdynvc->log, WLOG_ERROR, "unable to register channel in our channel list"); *res = ERROR_INTERNAL_ERROR; dvcman_channel_free(channel); - channel = NULL; + channel = nullptr; goto out; } @@ -747,7 +747,7 @@ static DVCMAN_CHANNEL* dvcman_create_channel(drdynvcPlugin* drdynvc, bAccept = TRUE; *res = listener->listener_callback->OnNewChannelConnection( - listener->listener_callback, &channel->iface, NULL, &bAccept, &pCallback); + listener->listener_callback, &channel->iface, nullptr, &bAccept, &pCallback); if (*res != CHANNEL_RC_OK) { @@ -763,7 +763,7 @@ static DVCMAN_CHANNEL* dvcman_create_channel(drdynvcPlugin* drdynvc, WLog_Print(drdynvc->log, WLOG_ERROR, "OnNewChannelConnection returned with bAccept FALSE!"); *res = ERROR_INTERNAL_ERROR; dvcman_channel_unref(channel); - channel = NULL; + channel = nullptr; goto out; } @@ -869,7 +869,7 @@ static UINT dvcman_receive_channel_data(DVCMAN_CHANNEL* channel, wStream* data, { WLog_Print(drdynvc->log, WLOG_ERROR, "data exceeding declared length!"); Stream_Release(channel->dvc_data); - channel->dvc_data = NULL; + channel->dvc_data = nullptr; status = ERROR_INVALID_DATA; goto out; } @@ -883,7 +883,7 @@ static UINT dvcman_receive_channel_data(DVCMAN_CHANNEL* channel, wStream* data, status = dvcman_call_on_receive(channel, channel->dvc_data); Stream_Release(channel->dvc_data); - channel->dvc_data = NULL; + channel->dvc_data = nullptr; } } else @@ -966,12 +966,12 @@ static UINT drdynvc_send(drdynvcPlugin* drdynvc, wStream* s) static UINT drdynvc_write_data(drdynvcPlugin* drdynvc, UINT32 ChannelId, const BYTE* data, UINT32 dataSize, BOOL* close) { - wStream* data_out = NULL; + wStream* data_out = nullptr; size_t pos = 0; UINT8 cbChId = 0; UINT8 cbLen = 0; UINT status = CHANNEL_RC_BAD_INIT_HANDLE; - DVCMAN* dvcman = NULL; + DVCMAN* dvcman = nullptr; if (!drdynvc) return CHANNEL_RC_BAD_CHANNEL_HANDLE; @@ -1077,8 +1077,8 @@ static UINT drdynvc_write_data(drdynvcPlugin* drdynvc, UINT32 ChannelId, const B static UINT drdynvc_send_capability_response(drdynvcPlugin* drdynvc) { UINT status = 0; - wStream* s = NULL; - DVCMAN* dvcman = NULL; + wStream* s = nullptr; + DVCMAN* dvcman = nullptr; if (!drdynvc) return CHANNEL_RC_BAD_CHANNEL_HANDLE; @@ -1193,10 +1193,10 @@ static UINT drdynvc_process_create_request(drdynvcPlugin* drdynvc, UINT8 Sp, UIN wStream* s) { UINT status = 0; - wStream* data_out = NULL; + wStream* data_out = nullptr; UINT channel_status = 0; - DVCMAN* dvcman = NULL; - DVCMAN_CHANNEL* channel = NULL; + DVCMAN* dvcman = nullptr; + DVCMAN_CHANNEL* channel = nullptr; INT32 retStatus = 0; WINPR_UNUSED(Sp); @@ -1332,7 +1332,7 @@ static UINT drdynvc_process_data_first(drdynvcPlugin* drdynvc, int Sp, int cbChI if (compressed) { - BYTE* data = NULL; + BYTE* data = nullptr; UINT32 dataSize = 0; if (zgfx_decompress(channel->decompressor, Stream_Pointer(s), WINPR_ASSERTING_INT_CAST(UINT32, Stream_GetRemainingLength(s)), &data, @@ -1405,7 +1405,7 @@ static UINT drdynvc_process_data(drdynvcPlugin* drdynvc, int Sp, int cbChId, wSt if (compressed) { - BYTE* data = NULL; + BYTE* data = nullptr; UINT32 dataSize = 0; if (zgfx_decompress(channel->decompressor, Stream_Pointer(s), @@ -1448,7 +1448,7 @@ out: static UINT drdynvc_process_close_request(drdynvcPlugin* drdynvc, int Sp, int cbChId, wStream* s) { UINT32 ChannelId = 0; - DVCMAN_CHANNEL* channel = NULL; + DVCMAN_CHANNEL* channel = nullptr; WINPR_ASSERT(drdynvc); if (!Stream_CheckAndLogRequiredLength(TAG, s, drdynvc_cblen_to_bytes(cbChId))) @@ -1531,7 +1531,7 @@ static UINT drdynvc_virtual_channel_event_data_received(drdynvcPlugin* drdynvc, UINT32 dataLength, UINT32 totalLength, UINT32 dataFlags) { - wStream* data_in = NULL; + wStream* data_in = nullptr; WINPR_ASSERT(drdynvc); if ((dataFlags & CHANNEL_FLAG_SUSPEND) || (dataFlags & CHANNEL_FLAG_RESUME)) @@ -1558,7 +1558,7 @@ static UINT drdynvc_virtual_channel_event_data_received(drdynvcPlugin* drdynvc, { WLog_Print(drdynvc->log, WLOG_ERROR, "Stream_EnsureRemainingCapacity failed!"); Stream_Release(drdynvc->data_in); - drdynvc->data_in = NULL; + drdynvc->data_in = nullptr; return ERROR_INTERNAL_ERROR; } @@ -1574,13 +1574,13 @@ static UINT drdynvc_virtual_channel_event_data_received(drdynvcPlugin* drdynvc, return ERROR_INVALID_DATA; } - drdynvc->data_in = NULL; + drdynvc->data_in = nullptr; Stream_SealLength(data_in); Stream_SetPosition(data_in, 0); if (drdynvc->async) { - if (!MessageQueue_Post(drdynvc->queue, NULL, 0, (void*)data_in, NULL)) + if (!MessageQueue_Post(drdynvc->queue, nullptr, 0, (void*)data_in, nullptr)) { WLog_Print(drdynvc->log, WLOG_ERROR, "MessageQueue_Post failed!"); return ERROR_INTERNAL_ERROR; @@ -1651,7 +1651,7 @@ static void VCAPITYPE drdynvc_virtual_channel_open_event_ex(LPVOID lpUserParam, static DWORD WINAPI drdynvc_virtual_channel_client_thread(LPVOID arg) { /* TODO: rewrite this */ - wStream* data = NULL; + wStream* data = nullptr; wMessage message = WINPR_C_ARRAY_INIT; UINT error = CHANNEL_RC_OK; drdynvcPlugin* drdynvc = (drdynvcPlugin*)arg; @@ -1715,7 +1715,7 @@ static DWORD WINAPI drdynvc_virtual_channel_client_thread(LPVOID arg) static void drdynvc_queue_object_free(void* obj) { - wStream* s = NULL; + wStream* s = nullptr; wMessage* msg = (wMessage*)obj; if (!msg || (msg->id != 0)) @@ -1730,14 +1730,14 @@ static void drdynvc_queue_object_free(void* obj) static UINT drdynvc_virtual_channel_event_initialized(drdynvcPlugin* drdynvc, LPVOID pData, UINT32 dataLength) { - wObject* obj = NULL; + wObject* obj = nullptr; WINPR_UNUSED(pData); WINPR_UNUSED(dataLength); if (!drdynvc) goto error; - drdynvc->queue = MessageQueue_New(NULL); + drdynvc->queue = MessageQueue_New(nullptr); if (!drdynvc->queue) { @@ -1770,7 +1770,7 @@ static UINT drdynvc_virtual_channel_event_connected(drdynvcPlugin* drdynvc, LPVO { UINT error = 0; UINT32 status = 0; - rdpSettings* settings = NULL; + rdpSettings* settings = nullptr; WINPR_ASSERT(drdynvc); WINPR_UNUSED(pData); @@ -1816,8 +1816,8 @@ static UINT drdynvc_virtual_channel_event_connected(drdynvcPlugin* drdynvc, LPVO if (drdynvc->async) { - if (!(drdynvc->thread = CreateThread(NULL, 0, drdynvc_virtual_channel_client_thread, - (void*)drdynvc, 0, NULL))) + if (!(drdynvc->thread = CreateThread(nullptr, 0, drdynvc_virtual_channel_client_thread, + (void*)drdynvc, 0, nullptr))) { error = ERROR_INTERNAL_ERROR; WLog_Print(drdynvc->log, WLOG_ERROR, "CreateThread failed!"); @@ -1869,7 +1869,7 @@ static UINT drdynvc_virtual_channel_event_disconnected(drdynvcPlugin* drdynvc) } (void)CloseHandle(drdynvc->thread); - drdynvc->thread = NULL; + drdynvc->thread = nullptr; } else { @@ -1901,7 +1901,7 @@ static UINT drdynvc_virtual_channel_event_disconnected(drdynvcPlugin* drdynvc) if (drdynvc->data_in) { Stream_Release(drdynvc->data_in); - drdynvc->data_in = NULL; + drdynvc->data_in = nullptr; } return status; @@ -1918,14 +1918,14 @@ static UINT drdynvc_virtual_channel_event_terminated(drdynvcPlugin* drdynvc) return CHANNEL_RC_BAD_CHANNEL_HANDLE; MessageQueue_Free(drdynvc->queue); - drdynvc->queue = NULL; + drdynvc->queue = nullptr; if (drdynvc->channel_mgr) { dvcman_free(drdynvc, drdynvc->channel_mgr); - drdynvc->channel_mgr = NULL; + drdynvc->channel_mgr = nullptr; } - drdynvc->InitHandle = 0; + drdynvc->InitHandle = nullptr; free(drdynvc->context); free(drdynvc); return CHANNEL_RC_OK; @@ -1934,7 +1934,7 @@ static UINT drdynvc_virtual_channel_event_terminated(drdynvcPlugin* drdynvc) static UINT drdynvc_virtual_channel_event_attached(drdynvcPlugin* drdynvc) { UINT error = CHANNEL_RC_OK; - DVCMAN* dvcman = NULL; + DVCMAN* dvcman = nullptr; if (!drdynvc) return CHANNEL_RC_BAD_CHANNEL_HANDLE; @@ -1965,7 +1965,7 @@ fail: static UINT drdynvc_virtual_channel_event_detached(drdynvcPlugin* drdynvc) { UINT error = CHANNEL_RC_OK; - DVCMAN* dvcman = NULL; + DVCMAN* dvcman = nullptr; if (!drdynvc) return CHANNEL_RC_BAD_CHANNEL_HANDLE; @@ -2081,9 +2081,9 @@ FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS_E PVOID pInitHandle)) { UINT rc = 0; - drdynvcPlugin* drdynvc = NULL; - DrdynvcClientContext* context = NULL; - CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = NULL; + drdynvcPlugin* drdynvc = nullptr; + DrdynvcClientContext* context = nullptr; + CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = nullptr; drdynvc = (drdynvcPlugin*)calloc(1, sizeof(drdynvcPlugin)); WINPR_ASSERT(pEntryPoints); @@ -2113,7 +2113,7 @@ FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS_E } context->handle = (void*)drdynvc; - context->custom = NULL; + context->custom = nullptr; drdynvc->context = context; context->GetVersion = drdynvc_get_version; drdynvc->rdpcontext = pEntryPointsEx->context; diff --git a/channels/drdynvc/server/drdynvc_main.c b/channels/drdynvc/server/drdynvc_main.c index c5f2435dd..b1f2bc195 100644 --- a/channels/drdynvc/server/drdynvc_main.c +++ b/channels/drdynvc/server/drdynvc_main.c @@ -44,11 +44,11 @@ static DWORD WINAPI drdynvc_server_thread(WINPR_ATTR_UNUSED LPVOID arg) DrdynvcServerContext* context; UINT error = ERROR_INTERNAL_ERROR; context = (DrdynvcServerContext*) arg; - buffer = NULL; + buffer = nullptr; BytesReturned = 0; - ChannelEvent = NULL; + ChannelEvent = nullptr; - s = Stream_New(NULL, 4096); + s = Stream_New(nullptr, 4096); if (!s) { @@ -80,7 +80,7 @@ static DWORD WINAPI drdynvc_server_thread(WINPR_ATTR_UNUSED LPVOID arg) break; } - if (!WTSVirtualChannelRead(context->priv->ChannelHandle, 0, NULL, 0, + if (!WTSVirtualChannelRead(context->priv->ChannelHandle, 0, nullptr, 0, &BytesReturned)) { WLog_ERR(TAG, "WTSVirtualChannelRead failed!"); @@ -128,18 +128,18 @@ static UINT drdynvc_server_start(DrdynvcServerContext* context) return CHANNEL_RC_NO_MEMORY; } - if (!(context->priv->StopEvent = CreateEvent(NULL, TRUE, FALSE, NULL))) + if (!(context->priv->StopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr))) { WLog_ERR(TAG, "CreateEvent failed!"); return ERROR_INTERNAL_ERROR; } if (!(context->priv->Thread = - CreateThread(NULL, 0, drdynvc_server_thread, (void*)context, 0, NULL))) + CreateThread(nullptr, 0, drdynvc_server_thread, (void*)context, 0, nullptr))) { WLog_ERR(TAG, "CreateThread failed!"); (void)CloseHandle(context->priv->StopEvent); - context->priv->StopEvent = NULL; + context->priv->StopEvent = nullptr; return ERROR_INTERNAL_ERROR; } @@ -169,7 +169,7 @@ static UINT drdynvc_server_stop(DrdynvcServerContext* context) DrdynvcServerContext* drdynvc_server_context_new(HANDLE vcm) { - DrdynvcServerContext* context = NULL; + DrdynvcServerContext* context = nullptr; context = (DrdynvcServerContext*)calloc(1, sizeof(DrdynvcServerContext)); if (context) @@ -183,7 +183,7 @@ DrdynvcServerContext* drdynvc_server_context_new(HANDLE vcm) { WLog_ERR(TAG, "calloc failed!"); free(context); - return NULL; + return nullptr; } } else diff --git a/channels/drive/client/drive_file.c b/channels/drive/client/drive_file.c index a2b3a7834..8ea7552a7 100644 --- a/channels/drive/client/drive_file.c +++ b/channels/drive/client/drive_file.c @@ -124,7 +124,7 @@ static WCHAR* drive_file_combine_fullpath(const WCHAR* base_path, const WCHAR* p size_t PathWCharLength) { BOOL ok = FALSE; - WCHAR* fullpath = NULL; + WCHAR* fullpath = nullptr; if (!base_path || (!path && (PathWCharLength > 0))) goto fail; @@ -161,7 +161,7 @@ fail: if (!ok) { free(fullpath); - fullpath = NULL; + fullpath = nullptr; } return fullpath; } @@ -173,7 +173,7 @@ static BOOL drive_file_set_fullpath(DRIVE_FILE* file, const WCHAR* fullpath) const size_t len = _wcslen(fullpath); free(file->fullpath); - file->fullpath = NULL; + file->fullpath = nullptr; if (len == 0) return TRUE; @@ -235,7 +235,7 @@ static BOOL drive_file_init(DRIVE_FILE* file) if ((file->CreateDisposition == FILE_OPEN_IF) || (file->CreateDisposition == FILE_CREATE)) { - if (CreateDirectoryW(file->fullpath, NULL) != 0) + if (CreateDirectoryW(file->fullpath, nullptr) != 0) { return TRUE; } @@ -288,7 +288,7 @@ static BOOL drive_file_init(DRIVE_FILE* file) file->SharedAccess = 0; #endif file->file_handle = CreateFileW(file->fullpath, file->DesiredAccess, file->SharedAccess, - NULL, CreateDisposition, file->FileAttributes, NULL); + nullptr, CreateDisposition, file->FileAttributes, nullptr); } #ifdef WIN32 @@ -299,12 +299,12 @@ static BOOL drive_file_init(DRIVE_FILE* file) if (errorMessageID != 0) { - LPSTR messageBuffer = NULL; + LPSTR messageBuffer = nullptr; size_t size = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, errorMessageID, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPSTR)&messageBuffer, 0, NULL); + nullptr, errorMessageID, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPSTR)&messageBuffer, 0, nullptr); char fullpath[MAX_PATH] = WINPR_C_ARRAY_INIT; (void)ConvertWCharToUtf8(file->fullpath, fullpath, sizeof(fullpath)); WLog_ERR(TAG, "Error in drive_file_init: %s %s", messageBuffer, fullpath); @@ -324,14 +324,14 @@ DRIVE_FILE* drive_file_new(const WCHAR* base_path, const WCHAR* path, UINT32 Pat UINT32 CreateOptions, UINT32 FileAttributes, UINT32 SharedAccess) { if (!base_path || (!path && (PathWCharLength > 0))) - return NULL; + return nullptr; DRIVE_FILE* file = (DRIVE_FILE*)calloc(1, sizeof(DRIVE_FILE)); if (!file) { WLog_ERR(TAG, "calloc failed!"); - return NULL; + return nullptr; } file->file_handle = INVALID_HANDLE_VALUE; @@ -353,7 +353,7 @@ DRIVE_FILE* drive_file_new(const WCHAR* base_path, const WCHAR* path, UINT32 Pat DWORD lastError = GetLastError(); drive_file_free(file); SetLastError(lastError); - return NULL; + return nullptr; } return file; @@ -411,7 +411,7 @@ BOOL drive_file_seek(DRIVE_FILE* file, UINT64 Offset) return FALSE; loffset.QuadPart = (LONGLONG)Offset; - return SetFilePointerEx(file->file_handle, loffset, NULL, FILE_BEGIN); + return SetFilePointerEx(file->file_handle, loffset, nullptr, FILE_BEGIN); } BOOL drive_file_read(DRIVE_FILE* file, BYTE* buffer, UINT32* Length) @@ -423,7 +423,7 @@ BOOL drive_file_read(DRIVE_FILE* file, BYTE* buffer, UINT32* Length) DEBUG_WSTR("Read file %s", file->fullpath); - if (ReadFile(file->file_handle, buffer, *Length, &read, NULL)) + if (ReadFile(file->file_handle, buffer, *Length, &read, nullptr)) { *Length = read; return TRUE; @@ -443,7 +443,7 @@ BOOL drive_file_write(DRIVE_FILE* file, const BYTE* buffer, UINT32 Length) while (Length > 0) { - if (!WriteFile(file->file_handle, buffer, Length, &written, NULL)) + if (!WriteFile(file->file_handle, buffer, Length, &written, nullptr)) return FALSE; Length -= written; @@ -598,8 +598,8 @@ BOOL drive_file_query_information(DRIVE_FILE* file, UINT32 FsInformationClass, w if (!file->is_dir) { - HANDLE hFile = CreateFileW(file->fullpath, 0, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, NULL); + HANDLE hFile = CreateFileW(file->fullpath, 0, FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, nullptr); if (hFile != INVALID_HANDLE_VALUE) { status = GetFileInformationByHandle(hFile, &fileInformation); @@ -665,9 +665,9 @@ static BOOL drive_file_set_basic_information(DRIVE_FILE* file, UINT32 Length, wS FILETIME ftCreationTime = WINPR_C_ARRAY_INIT; FILETIME ftLastAccessTime = WINPR_C_ARRAY_INIT; FILETIME ftLastWriteTime = WINPR_C_ARRAY_INIT; - FILETIME* pftCreationTime = NULL; - FILETIME* pftLastAccessTime = NULL; - FILETIME* pftLastWriteTime = NULL; + FILETIME* pftCreationTime = nullptr; + FILETIME* pftLastAccessTime = nullptr; + FILETIME* pftLastWriteTime = nullptr; if (liCreationTime.QuadPart != 0) { ftCreationTime.dwHighDateTime = liCreationTime.u.HighPart; @@ -740,7 +740,7 @@ static BOOL drive_file_set_alloc_information(DRIVE_FILE* file, UINT32 Length, wS LARGE_INTEGER liSize = { .QuadPart = size }; - if (!SetFilePointerEx(file->file_handle, liSize, NULL, FILE_BEGIN)) + if (!SetFilePointerEx(file->file_handle, liSize, nullptr, FILE_BEGIN)) { char fullpath[MAX_PATH] = WINPR_C_ARRAY_INIT; (void)ConvertWCharToUtf8(file->fullpath, fullpath, sizeof(fullpath)); @@ -1028,7 +1028,7 @@ BOOL drive_file_query_directory(DRIVE_FILE* file, UINT32 FsInformationClass, BYT { BOOL rc = FALSE; size_t length = 0; - WCHAR* ent_path = NULL; + WCHAR* ent_path = nullptr; if (!file || !path || !output) return FALSE; diff --git a/channels/drive/client/drive_main.c b/channels/drive/client/drive_main.c index 90357ed62..94b8b7f44 100644 --- a/channels/drive/client/drive_main.c +++ b/channels/drive/client/drive_main.c @@ -139,11 +139,11 @@ static NTSTATUS drive_map_windows_err(DWORD fs_errno) static DRIVE_FILE* drive_get_file_by_id(DRIVE_DEVICE* drive, UINT32 id) { - DRIVE_FILE* file = NULL; + DRIVE_FILE* file = nullptr; void* key = (void*)(size_t)id; if (!drive) - return NULL; + return nullptr; file = (DRIVE_FILE*)ListDictionary_GetItemValue(drive->files, key); return file; @@ -276,7 +276,7 @@ static UINT drive_process_irp_close(DRIVE_DEVICE* drive, IRP* irp) */ static UINT drive_process_irp_read(DRIVE_DEVICE* drive, IRP* irp) { - DRIVE_FILE* file = NULL; + DRIVE_FILE* file = nullptr; UINT32 Length = 0; UINT64 Offset = 0; @@ -336,7 +336,7 @@ static UINT drive_process_irp_read(DRIVE_DEVICE* drive, IRP* irp) */ static UINT drive_process_irp_write(DRIVE_DEVICE* drive, IRP* irp) { - DRIVE_FILE* file = NULL; + DRIVE_FILE* file = nullptr; UINT32 Length = 0; UINT64 Offset = 0; @@ -385,7 +385,7 @@ static UINT drive_process_irp_write(DRIVE_DEVICE* drive, IRP* irp) */ static UINT drive_process_irp_query_information(DRIVE_DEVICE* drive, IRP* irp) { - DRIVE_FILE* file = NULL; + DRIVE_FILE* file = nullptr; UINT32 FsInformationClass = 0; WINPR_ASSERT(drive); @@ -416,7 +416,7 @@ static UINT drive_process_irp_query_information(DRIVE_DEVICE* drive, IRP* irp) */ static UINT drive_process_irp_set_information(DRIVE_DEVICE* drive, IRP* irp) { - DRIVE_FILE* file = NULL; + DRIVE_FILE* file = nullptr; UINT32 FsInformationClass = 0; UINT32 Length = 0; @@ -623,8 +623,8 @@ static UINT drive_process_irp_silent_ignore(WINPR_ATTR_UNUSED DRIVE_DEVICE* driv */ static UINT drive_process_irp_query_directory(DRIVE_DEVICE* drive, IRP* irp) { - const WCHAR* path = NULL; - DRIVE_FILE* file = NULL; + const WCHAR* path = nullptr; + DRIVE_FILE* file = nullptr; BYTE InitialQuery = 0; UINT32 PathLength = 0; UINT32 FsInformationClass = 0; @@ -645,7 +645,7 @@ static UINT drive_process_irp_query_directory(DRIVE_DEVICE* drive, IRP* irp) file = drive_get_file_by_id(drive, irp->FileId); - if (file == NULL) + if (file == nullptr) { irp->IoStatus = STATUS_UNSUCCESSFUL; Stream_Write_UINT32(irp->output, 0); /* Length */ @@ -858,7 +858,7 @@ static UINT drive_irp_request(DEVICE* device, IRP* irp) if (drive->async) { - if (!MessageQueue_Post(drive->IrpQueue, NULL, 0, (void*)irp, NULL)) + if (!MessageQueue_Post(drive->IrpQueue, nullptr, 0, (void*)irp, nullptr)) { WLog_ERR(TAG, "MessageQueue_Post failed!"); return ERROR_INTERNAL_ERROR; @@ -947,7 +947,7 @@ static UINT drive_register_drive_path(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, WINPR_ASSERT(pid); size_t length = 0; - DRIVE_DEVICE* drive = NULL; + DRIVE_DEVICE* drive = nullptr; UINT error = ERROR_INTERNAL_ERROR; if (!pEntryPoints || !name || !path) @@ -976,7 +976,7 @@ static UINT drive_register_drive_path(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, drive->rdpcontext = pEntryPoints->rdpcontext; drive->automount = automount; length = strlen(name); - drive->device.data = Stream_New(NULL, length + 1); + drive->device.data = Stream_New(nullptr, length + 1); if (!drive->device.data) { @@ -1014,7 +1014,7 @@ static UINT drive_register_drive_path(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, if ((pathLength > 1) && (path[pathLength - 1] == '/')) pathLength--; - drive->path = ConvertUtf8NToWCharAlloc(path, pathLength, NULL); + drive->path = ConvertUtf8NToWCharAlloc(path, pathLength, nullptr); if (!drive->path) { error = CHANNEL_RC_NO_MEMORY; @@ -1031,7 +1031,7 @@ static UINT drive_register_drive_path(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, } ListDictionary_ValueObject(drive->files)->fnObjectFree = drive_file_objfree; - drive->IrpQueue = MessageQueue_New(NULL); + drive->IrpQueue = MessageQueue_New(nullptr); if (!drive->IrpQueue) { @@ -1055,8 +1055,8 @@ static UINT drive_register_drive_path(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, FreeRDP_SynchronousStaticChannels); if (drive->async) { - if (!(drive->thread = - CreateThread(NULL, 0, drive_thread_func, drive, CREATE_SUSPENDED, NULL))) + if (!(drive->thread = CreateThread(nullptr, 0, drive_thread_func, drive, + CREATE_SUSPENDED, nullptr))) { WLog_ERR(TAG, "CreateThread failed!"); goto out_error; @@ -1097,7 +1097,7 @@ static UINT handle_all_drives(RDPDR_DRIVE* drive, PDEVICE_SERVICE_ENTRY_POINTS p WINPR_ASSERT(pEntryPoints); /* Enumerate all devices: */ - const DWORD dlen = GetLogicalDriveStringsW(0, NULL); + const DWORD dlen = GetLogicalDriveStringsW(0, nullptr); WCHAR* devlist = calloc(dlen, sizeof(WCHAR)); if (!devlist) @@ -1114,8 +1114,8 @@ static UINT handle_all_drives(RDPDR_DRIVE* drive, PDEVICE_SERVICE_ENTRY_POINTS p const WCHAR* dev = &devlist[offset]; if (!drive_filtered(dev)) { - char* bufdup = NULL; - char* devdup = ConvertWCharNToUtf8Alloc(dev, len, NULL); + char* bufdup = nullptr; + char* devdup = ConvertWCharNToUtf8Alloc(dev, len, nullptr); if (!devdup) { error = ERROR_OUTOFMEMORY; diff --git a/channels/echo/client/echo_main.c b/channels/echo/client/echo_main.c index af6baafb5..f64b1c630 100644 --- a/channels/echo/client/echo_main.c +++ b/channels/echo/client/echo_main.c @@ -59,7 +59,7 @@ static UINT echo_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, return ERROR_INVALID_PARAMETER; /* echo back what we have received. ECHO does not have any message IDs. */ - return callback->channel->Write(callback->channel, (ULONG)cbSize, pBuffer, NULL); + return callback->channel->Write(callback->channel, (ULONG)cbSize, pBuffer, nullptr); } /** @@ -76,8 +76,9 @@ static UINT echo_on_close(IWTSVirtualChannelCallback* pChannelCallback) return CHANNEL_RC_OK; } -static const IWTSVirtualChannelCallback echo_callbacks = { echo_on_data_received, NULL, /* Open */ - echo_on_close, NULL }; +static const IWTSVirtualChannelCallback echo_callbacks = { echo_on_data_received, + nullptr, /* Open */ + echo_on_close, nullptr }; /** * Function description @@ -88,5 +89,5 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE echo_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pE { return freerdp_generic_DVCPluginEntry(pEntryPoints, TAG, ECHO_DVC_CHANNEL_NAME, sizeof(ECHO_PLUGIN), sizeof(GENERIC_CHANNEL_CALLBACK), - &echo_callbacks, NULL, NULL); + &echo_callbacks, nullptr, nullptr); } diff --git a/channels/echo/server/echo_main.c b/channels/echo/server/echo_main.c index 7a00e3170..6d21464d2 100644 --- a/channels/echo/server/echo_main.c +++ b/channels/echo/server/echo_main.c @@ -62,10 +62,10 @@ typedef struct static UINT echo_server_open_channel(echo_server* echo) { DWORD Error = 0; - HANDLE hEvent = NULL; + HANDLE hEvent = nullptr; DWORD StartTick = 0; DWORD BytesReturned = 0; - PULONG pSessionId = NULL; + PULONG pSessionId = nullptr; if (WTSQuerySessionInformationA(echo->context.vcm, WTS_CURRENT_SESSION, WTSSessionId, (LPSTR*)&pSessionId, &BytesReturned) == FALSE) @@ -79,7 +79,7 @@ static UINT echo_server_open_channel(echo_server* echo) hEvent = WTSVirtualChannelManagerGetEventHandle(echo->context.vcm); StartTick = GetTickCount(); - while (echo->echo_channel == NULL) + while (echo->echo_channel == nullptr) { if (WaitForSingleObject(hEvent, 1000) == WAIT_FAILED) { @@ -122,12 +122,12 @@ static UINT echo_server_open_channel(echo_server* echo) static DWORD WINAPI echo_server_thread_func(LPVOID arg) { - wStream* s = NULL; - void* buffer = NULL; + wStream* s = nullptr; + void* buffer = nullptr; DWORD nCount = 0; HANDLE events[8]; BOOL ready = FALSE; - HANDLE ChannelEvent = NULL; + HANDLE ChannelEvent = nullptr; DWORD BytesReturned = 0; echo_server* echo = (echo_server*)arg; UINT error = 0; @@ -147,9 +147,9 @@ static DWORD WINAPI echo_server_thread_func(LPVOID arg) goto out; } - buffer = NULL; + buffer = nullptr; BytesReturned = 0; - ChannelEvent = NULL; + ChannelEvent = nullptr; if (WTSVirtualChannelQuery(echo->echo_channel, WTSVirtualEventHandle, &buffer, &BytesReturned) == TRUE) @@ -214,7 +214,7 @@ static DWORD WINAPI echo_server_thread_func(LPVOID arg) } } - s = Stream_New(NULL, 4096); + s = Stream_New(nullptr, 4096); if (!s) { @@ -239,7 +239,7 @@ static DWORD WINAPI echo_server_thread_func(LPVOID arg) break; Stream_SetPosition(s, 0); - if (!WTSVirtualChannelRead(echo->echo_channel, 0, NULL, 0, &BytesReturned)) + if (!WTSVirtualChannelRead(echo->echo_channel, 0, nullptr, 0, &BytesReturned)) { WLog_ERR(TAG, "WTSVirtualChannelRead failed!"); error = ERROR_INTERNAL_ERROR; @@ -275,7 +275,7 @@ static DWORD WINAPI echo_server_thread_func(LPVOID arg) Stream_Free(s, TRUE); (void)WTSVirtualChannelClose(echo->echo_channel); - echo->echo_channel = NULL; + echo->echo_channel = nullptr; out: if (error && echo->context.rdpcontext) @@ -295,19 +295,20 @@ static UINT echo_server_open(echo_server_context* context) { echo_server* echo = (echo_server*)context; - if (echo->thread == NULL) + if (echo->thread == nullptr) { - if (!(echo->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL))) + if (!(echo->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr))) { WLog_ERR(TAG, "CreateEvent failed!"); return ERROR_INTERNAL_ERROR; } - if (!(echo->thread = CreateThread(NULL, 0, echo_server_thread_func, (void*)echo, 0, NULL))) + if (!(echo->thread = + CreateThread(nullptr, 0, echo_server_thread_func, (void*)echo, 0, nullptr))) { WLog_ERR(TAG, "CreateEvent failed!"); (void)CloseHandle(echo->stopEvent); - echo->stopEvent = NULL; + echo->stopEvent = nullptr; return ERROR_INTERNAL_ERROR; } } @@ -338,8 +339,8 @@ static UINT echo_server_close(echo_server_context* context) (void)CloseHandle(echo->thread); (void)CloseHandle(echo->stopEvent); - echo->thread = NULL; - echo->stopEvent = NULL; + echo->thread = nullptr; + echo->stopEvent = nullptr; } return error; @@ -356,12 +357,12 @@ static BOOL echo_server_request(echo_server_context* context, const BYTE* buffer echo_server* echo = (echo_server*)context; WINPR_ASSERT(echo); - return WTSVirtualChannelWrite(echo->echo_channel, cnv.pv, length, NULL); + return WTSVirtualChannelWrite(echo->echo_channel, cnv.pv, length, nullptr); } echo_server_context* echo_server_context_new(HANDLE vcm) { - echo_server* echo = NULL; + echo_server* echo = nullptr; echo = (echo_server*)calloc(1, sizeof(echo_server)); if (echo) diff --git a/channels/encomsp/client/encomsp_main.c b/channels/encomsp/client/encomsp_main.c index 599a038de..7c9c40e04 100644 --- a/channels/encomsp/client/encomsp_main.c +++ b/channels/encomsp/client/encomsp_main.c @@ -654,7 +654,7 @@ static UINT encomsp_send_change_participant_control_level_pdu( header.Type = ODTYPE_PARTICIPANT_CTRL_CHANGED; header.Length = ENCOMSP_ORDER_HEADER_SIZE + 6; - wStream* s = Stream_New(NULL, header.Length); + wStream* s = Stream_New(nullptr, header.Length); if (!s) { @@ -946,7 +946,7 @@ static UINT encomsp_virtual_channel_event_data_received(encomspPlugin* encomsp, if (encomsp->data_in) Stream_Free(encomsp->data_in, TRUE); - encomsp->data_in = Stream_New(NULL, totalLength); + encomsp->data_in = Stream_New(nullptr, totalLength); if (!encomsp->data_in) { @@ -973,11 +973,11 @@ static UINT encomsp_virtual_channel_event_data_received(encomspPlugin* encomsp, return ERROR_INVALID_DATA; } - encomsp->data_in = NULL; + encomsp->data_in = nullptr; Stream_SealLength(data_in); Stream_SetPosition(data_in, 0); - if (!MessageQueue_Post(encomsp->queue, NULL, 0, (void*)data_in, NULL)) + if (!MessageQueue_Post(encomsp->queue, nullptr, 0, (void*)data_in, nullptr)) { WLog_ERR(TAG, "MessageQueue_Post failed!"); return ERROR_INTERNAL_ERROR; @@ -1033,7 +1033,7 @@ static VOID VCAPITYPE encomsp_virtual_channel_open_event_ex(LPVOID lpUserParam, static DWORD WINAPI encomsp_virtual_channel_client_thread(LPVOID arg) { - wStream* data = NULL; + wStream* data = nullptr; wMessage message = WINPR_C_ARRAY_INIT; encomspPlugin* encomsp = (encomspPlugin*)arg; UINT error = CHANNEL_RC_OK; @@ -1092,7 +1092,7 @@ static UINT encomsp_virtual_channel_event_connected(encomspPlugin* encomsp, { WINPR_ASSERT(encomsp); - encomsp->queue = MessageQueue_New(NULL); + encomsp->queue = MessageQueue_New(nullptr); if (!encomsp->queue) { @@ -1100,8 +1100,8 @@ static UINT encomsp_virtual_channel_event_connected(encomspPlugin* encomsp, return CHANNEL_RC_NO_MEMORY; } - if (!(encomsp->thread = CreateThread(NULL, 0, encomsp_virtual_channel_client_thread, - (void*)encomsp, 0, NULL))) + if (!(encomsp->thread = CreateThread(nullptr, 0, encomsp_virtual_channel_client_thread, + (void*)encomsp, 0, nullptr))) { WLog_ERR(TAG, "CreateThread failed!"); MessageQueue_Free(encomsp->queue); @@ -1137,8 +1137,8 @@ static UINT encomsp_virtual_channel_event_disconnected(encomspPlugin* encomsp) MessageQueue_Free(encomsp->queue); (void)CloseHandle(encomsp->thread); - encomsp->queue = NULL; - encomsp->thread = NULL; + encomsp->queue = nullptr; + encomsp->thread = nullptr; WINPR_ASSERT(encomsp->channelEntryPoints.pVirtualChannelCloseEx); const UINT rc = encomsp->channelEntryPoints.pVirtualChannelCloseEx(encomsp->InitHandle, @@ -1156,7 +1156,7 @@ static UINT encomsp_virtual_channel_event_disconnected(encomspPlugin* encomsp) if (encomsp->data_in) { Stream_Free(encomsp->data_in, TRUE); - encomsp->data_in = NULL; + encomsp->data_in = nullptr; } return CHANNEL_RC_OK; @@ -1171,7 +1171,7 @@ static UINT encomsp_virtual_channel_event_terminated(encomspPlugin* encomsp) { WINPR_ASSERT(encomsp); - encomsp->InitHandle = 0; + encomsp->InitHandle = nullptr; free(encomsp->context); free(encomsp); return CHANNEL_RC_OK; @@ -1247,7 +1247,7 @@ FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS_E (CHANNEL_ENTRY_POINTS_FREERDP_EX*)pEntryPoints; WINPR_ASSERT(pEntryPointsEx); - EncomspClientContext* context = NULL; + EncomspClientContext* context = nullptr; if ((pEntryPointsEx->cbSize >= sizeof(CHANNEL_ENTRY_POINTS_FREERDP_EX)) && (pEntryPointsEx->MagicNumber == FREERDP_CHANNEL_MAGIC_NUMBER)) { @@ -1260,17 +1260,17 @@ FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS_E } context->handle = (void*)encomsp; - context->FilterUpdated = NULL; - context->ApplicationCreated = NULL; - context->ApplicationRemoved = NULL; - context->WindowCreated = NULL; - context->WindowRemoved = NULL; - context->ShowWindow = NULL; - context->ParticipantCreated = NULL; - context->ParticipantRemoved = NULL; + context->FilterUpdated = nullptr; + context->ApplicationCreated = nullptr; + context->ApplicationRemoved = nullptr; + context->WindowCreated = nullptr; + context->WindowRemoved = nullptr; + context->ShowWindow = nullptr; + context->ParticipantCreated = nullptr; + context->ParticipantRemoved = nullptr; context->ChangeParticipantControlLevel = encomsp_send_change_participant_control_level_pdu; - context->GraphicsStreamPaused = NULL; - context->GraphicsStreamResumed = NULL; + context->GraphicsStreamPaused = nullptr; + context->GraphicsStreamResumed = nullptr; encomsp->context = context; encomsp->rdpcontext = pEntryPointsEx->context; isFreerdp = TRUE; diff --git a/channels/encomsp/server/encomsp_main.c b/channels/encomsp/server/encomsp_main.c index 67fc9d949..ec3399f6a 100644 --- a/channels/encomsp/server/encomsp_main.c +++ b/channels/encomsp/server/encomsp_main.c @@ -143,22 +143,22 @@ static UINT encomsp_server_receive_pdu(EncomspServerContext* context, wStream* s static DWORD WINAPI encomsp_server_thread(LPVOID arg) { - wStream* s = NULL; + wStream* s = nullptr; DWORD nCount = 0; - void* buffer = NULL; + void* buffer = nullptr; HANDLE events[8]; - HANDLE ChannelEvent = NULL; + HANDLE ChannelEvent = nullptr; DWORD BytesReturned = 0; - ENCOMSP_ORDER_HEADER* header = NULL; - EncomspServerContext* context = NULL; + ENCOMSP_ORDER_HEADER* header = nullptr; + EncomspServerContext* context = nullptr; UINT error = CHANNEL_RC_OK; DWORD status = 0; context = (EncomspServerContext*)arg; - buffer = NULL; + buffer = nullptr; BytesReturned = 0; - ChannelEvent = NULL; - s = Stream_New(NULL, 4096); + ChannelEvent = nullptr; + s = Stream_New(nullptr, 4096); if (!s) { @@ -205,7 +205,7 @@ static DWORD WINAPI encomsp_server_thread(LPVOID arg) break; } - if (!WTSVirtualChannelRead(context->priv->ChannelHandle, 0, NULL, 0, &BytesReturned)) + if (!WTSVirtualChannelRead(context->priv->ChannelHandle, 0, nullptr, 0, &BytesReturned)) { WLog_ERR(TAG, "WTSVirtualChannelRead failed!"); error = ERROR_INTERNAL_ERROR; @@ -276,18 +276,18 @@ static UINT encomsp_server_start(EncomspServerContext* context) if (!context->priv->ChannelHandle) return CHANNEL_RC_BAD_CHANNEL; - if (!(context->priv->StopEvent = CreateEvent(NULL, TRUE, FALSE, NULL))) + if (!(context->priv->StopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr))) { WLog_ERR(TAG, "CreateEvent failed!"); return ERROR_INTERNAL_ERROR; } if (!(context->priv->Thread = - CreateThread(NULL, 0, encomsp_server_thread, (void*)context, 0, NULL))) + CreateThread(nullptr, 0, encomsp_server_thread, (void*)context, 0, nullptr))) { WLog_ERR(TAG, "CreateThread failed!"); (void)CloseHandle(context->priv->StopEvent); - context->priv->StopEvent = NULL; + context->priv->StopEvent = nullptr; return ERROR_INTERNAL_ERROR; } @@ -318,7 +318,7 @@ static UINT encomsp_server_stop(EncomspServerContext* context) EncomspServerContext* encomsp_server_context_new(HANDLE vcm) { - EncomspServerContext* context = NULL; + EncomspServerContext* context = nullptr; context = (EncomspServerContext*)calloc(1, sizeof(EncomspServerContext)); if (context) @@ -332,7 +332,7 @@ EncomspServerContext* encomsp_server_context_new(HANDLE vcm) { WLog_ERR(TAG, "calloc failed!"); free(context); - return NULL; + return nullptr; } } diff --git a/channels/geometry/client/geometry_main.c b/channels/geometry/client/geometry_main.c index e8b496ea8..1c4f96ad4 100644 --- a/channels/geometry/client/geometry_main.c +++ b/channels/geometry/client/geometry_main.c @@ -343,13 +343,13 @@ static void mappedGeometryUnref_void(void* arg) */ static const IWTSVirtualChannelCallback geometry_callbacks = { geometry_on_data_received, - NULL, /* Open */ - geometry_on_close, NULL }; + nullptr, /* Open */ + geometry_on_close, nullptr }; static UINT init_plugin_cb(GENERIC_DYNVC_PLUGIN* base, WINPR_ATTR_UNUSED rdpContext* rcontext, rdpSettings* settings) { - GeometryClientContext* context = NULL; + GeometryClientContext* context = nullptr; GEOMETRY_PLUGIN* geometry = (GEOMETRY_PLUGIN*)base; WINPR_ASSERT(base); diff --git a/channels/gfxredir/server/gfxredir_main.c b/channels/gfxredir/server/gfxredir_main.c index 57a0110a1..c5cf94fb2 100644 --- a/channels/gfxredir/server/gfxredir_main.c +++ b/channels/gfxredir/server/gfxredir_main.c @@ -204,7 +204,7 @@ static UINT gfxredir_server_handle_messages(GfxRedirServerContext* context) /* Check whether the dynamic channel is ready */ if (!priv->isReady) { - void* buffer = NULL; + void* buffer = nullptr; DWORD BytesReturned = 0; if (WTSVirtualChannelQuery(priv->gfxredir_channel, WTSVirtualChannelReady, &buffer, &BytesReturned) == FALSE) @@ -226,7 +226,7 @@ static UINT gfxredir_server_handle_messages(GfxRedirServerContext* context) Stream_SetPosition(s, 0); DWORD BytesReturned = 0; - if (!WTSVirtualChannelRead(priv->gfxredir_channel, 0, NULL, 0, &BytesReturned)) + if (!WTSVirtualChannelRead(priv->gfxredir_channel, 0, nullptr, 0, &BytesReturned)) { if (GetLastError() == ERROR_NO_DATA) return ERROR_NO_DATA; @@ -330,7 +330,7 @@ static DWORD WINAPI gfxredir_server_thread_func(LPVOID arg) static wStream* gfxredir_server_single_packet_new(UINT32 cmdId, size_t length) { GFXREDIR_HEADER header = WINPR_C_ARRAY_INIT; - wStream* s = Stream_New(NULL, GFXREDIR_HEADER_SIZE + length); + wStream* s = Stream_New(nullptr, GFXREDIR_HEADER_SIZE + length); if (!s) { @@ -351,7 +351,7 @@ static wStream* gfxredir_server_single_packet_new(UINT32 cmdId, size_t length) return s; error: Stream_Free(s, TRUE); - return NULL; + return nullptr; } /** @@ -464,7 +464,7 @@ static UINT gfxredir_send_open_pool(GfxRedirServerContext* context, return ERROR_INTERNAL_ERROR; } - if (openPool->sectionNameLength == 0 || openPool->sectionName == NULL) + if (openPool->sectionNameLength == 0 || openPool->sectionName == nullptr) { WLog_ERR(TAG, "section name must be provided!"); return ERROR_INVALID_DATA; @@ -473,7 +473,7 @@ static UINT gfxredir_send_open_pool(GfxRedirServerContext* context, /* make sure null-terminate */ if (openPool->sectionName[openPool->sectionNameLength - 1] != 0) { - WLog_ERR(TAG, "section name must be terminated with NULL!"); + WLog_ERR(TAG, "section name must be terminated with nullptr!"); return ERROR_INVALID_DATA; } @@ -657,8 +657,8 @@ static UINT gfxredir_server_open(GfxRedirServerContext* context) WINPR_ASSERT(priv); DWORD BytesReturned = 0; - PULONG pSessionId = NULL; - void* buffer = NULL; + PULONG pSessionId = nullptr; + void* buffer = nullptr; priv->SessionId = WTS_CURRENT_SESSION; if (WTSQuerySessionInformationA(context->vcm, WTS_CURRENT_SESSION, WTSSessionId, @@ -701,20 +701,20 @@ static UINT gfxredir_server_open(GfxRedirServerContext* context) priv->channelEvent = *(HANDLE*)buffer; WTSFreeMemory(buffer); - if (priv->thread == NULL) + if (priv->thread == nullptr) { - if (!(priv->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL))) + if (!(priv->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr))) { WLog_ERR(TAG, "CreateEvent failed!"); goto out_close; } - if (!(priv->thread = - CreateThread(NULL, 0, gfxredir_server_thread_func, (void*)context, 0, NULL))) + if (!(priv->thread = CreateThread(nullptr, 0, gfxredir_server_thread_func, (void*)context, + 0, nullptr))) { WLog_ERR(TAG, "CreateEvent failed!"); (void)CloseHandle(priv->stopEvent); - priv->stopEvent = NULL; + priv->stopEvent = nullptr; goto out_close; } } @@ -722,8 +722,8 @@ static UINT gfxredir_server_open(GfxRedirServerContext* context) return CHANNEL_RC_OK; out_close: WTSVirtualChannelClose(priv->gfxredir_channel); - priv->gfxredir_channel = NULL; - priv->channelEvent = NULL; + priv->gfxredir_channel = nullptr; + priv->channelEvent = nullptr; return rc; } @@ -753,14 +753,14 @@ static UINT gfxredir_server_close(GfxRedirServerContext* context) (void)CloseHandle(priv->thread); (void)CloseHandle(priv->stopEvent); - priv->thread = NULL; - priv->stopEvent = NULL; + priv->thread = nullptr; + priv->stopEvent = nullptr; } if (priv->gfxredir_channel) { WTSVirtualChannelClose(priv->gfxredir_channel); - priv->gfxredir_channel = NULL; + priv->gfxredir_channel = nullptr; } return error; @@ -774,7 +774,7 @@ GfxRedirServerContext* gfxredir_server_context_new(HANDLE vcm) if (!context) { WLog_ERR(TAG, "gfxredir_server_context_new(): calloc GfxRedirServerContext failed!"); - return NULL; + return nullptr; } GfxRedirServerPrivate* priv = context->priv = @@ -786,7 +786,7 @@ GfxRedirServerContext* gfxredir_server_context_new(HANDLE vcm) goto fail; } - priv->input_stream = Stream_New(NULL, 4); + priv->input_stream = Stream_New(nullptr, 4); if (!priv->input_stream) { @@ -809,7 +809,7 @@ GfxRedirServerContext* gfxredir_server_context_new(HANDLE vcm) return context; fail: gfxredir_server_context_free(context); - return NULL; + return nullptr; } void gfxredir_server_context_free(GfxRedirServerContext* context) diff --git a/channels/location/client/location_main.c b/channels/location/client/location_main.c index 895fc6ccc..1cd01b222 100644 --- a/channels/location/client/location_main.c +++ b/channels/location/client/location_main.c @@ -108,7 +108,7 @@ static UINT location_channel_send(IWTSVirtualChannel* channel, wStream* s) WINPR_ASSERT(channel); WINPR_ASSERT(channel->Write); - return channel->Write(channel, (UINT32)len, Stream_Buffer(s), NULL); + return channel->Write(channel, (UINT32)len, Stream_Buffer(s), nullptr); } static UINT location_send_client_ready_pdu(const LOCATION_CALLBACK* callback) @@ -128,7 +128,7 @@ static UINT location_send_client_ready_pdu(const LOCATION_CALLBACK* callback) static const char* location_version_str(UINT32 version, char* buffer, size_t size) { - const char* str = NULL; + const char* str = nullptr; switch (version) { case RDPLOCATION_PROTOCOL_VERSION_100: @@ -198,7 +198,7 @@ static UINT location_on_data_received(IWTSVirtualChannelCallback* pChannelCallba if (!plugin->context.LocationStart) { WLog_Print(plugin->baseDynPlugin.log, WLOG_WARN, - "LocationStart=NULL, no location data will be sent"); + "LocationStart=nullptr, no location data will be sent"); return CHANNEL_RC_OK; } @@ -368,10 +368,10 @@ static UINT location_send(LocationClientContext* context, LOCATION_PDUTYPE type, RDPLOCATION_BASE_LOCATION3D_PDU pdu = { .latitude = va_arg(ap, double), .longitude = va_arg(ap, double), .altitude = va_arg(ap, INT32), - .speed = NULL, - .heading = NULL, - .horizontalAccuracy = NULL, - .source = NULL }; + .speed = nullptr, + .heading = nullptr, + .horizontalAccuracy = nullptr, + .source = nullptr }; if ((count > 3) && (callback->clientVersion >= RDPLOCATION_PROTOCOL_VERSION_200)) { @@ -394,8 +394,8 @@ static UINT location_send(LocationClientContext* context, LOCATION_PDUTYPE type, { RDPLOCATION_LOCATION2D_DELTA_PDU pdu = { .latitudeDelta = va_arg(ap, double), .longitudeDelta = va_arg(ap, double), - .speedDelta = NULL, - .headingDelta = NULL }; + .speedDelta = nullptr, + .headingDelta = nullptr }; double speedDelta = FP_NAN; double headingDelta = FP_NAN; @@ -420,8 +420,8 @@ static UINT location_send(LocationClientContext* context, LOCATION_PDUTYPE type, RDPLOCATION_LOCATION3D_DELTA_PDU pdu = { .latitudeDelta = va_arg(ap, double), .longitudeDelta = va_arg(ap, double), .altitudeDelta = va_arg(ap, INT32), - .speedDelta = NULL, - .headingDelta = NULL }; + .speedDelta = nullptr, + .headingDelta = nullptr }; if ((count > 3) && (callback->clientVersion >= RDPLOCATION_PROTOCOL_VERSION_200)) { speedDelta = va_arg(ap, double); @@ -476,8 +476,8 @@ static UINT location_init(GENERIC_DYNVC_PLUGIN* plugin, WINPR_ATTR_UNUSED rdpCon } static const IWTSVirtualChannelCallback location_callbacks = { location_on_data_received, - NULL, /* Open */ - location_on_close, NULL }; + nullptr, /* Open */ + location_on_close, nullptr }; /** * Function description @@ -488,5 +488,5 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE location_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS { return freerdp_generic_DVCPluginEntry(pEntryPoints, TAG, LOCATION_DVC_CHANNEL_NAME, sizeof(LOCATION_PLUGIN), sizeof(LOCATION_CALLBACK), - &location_callbacks, location_init, NULL); + &location_callbacks, location_init, nullptr); } diff --git a/channels/location/server/location_main.c b/channels/location/server/location_main.c index b8758cbb2..b4cf40f1a 100644 --- a/channels/location/server/location_main.c +++ b/channels/location/server/location_main.c @@ -77,9 +77,9 @@ static UINT location_server_open_channel(location_server* location) { LocationServerContext* context = &location->context; DWORD Error = ERROR_SUCCESS; - HANDLE hEvent = NULL; + HANDLE hEvent = nullptr; DWORD BytesReturned = 0; - PULONG pSessionId = NULL; + PULONG pSessionId = nullptr; UINT32 channelId = 0; BOOL status = TRUE; @@ -187,10 +187,10 @@ static UINT location_server_recv_base_location3d(LocationServerContext* context, .latitude = FP_NAN, .longitude = FP_NAN, .altitude = 0, - .speed = NULL, - .heading = NULL, - .horizontalAccuracy = NULL, - .source = NULL }; + .speed = nullptr, + .heading = nullptr, + .horizontalAccuracy = nullptr, + .source = nullptr }; if (!freerdp_read_four_byte_float(s, &pdu.latitude) || !freerdp_read_four_byte_float(s, &pdu.longitude) || @@ -248,8 +248,8 @@ static UINT location_server_recv_location2d_delta(LocationServerContext* context RDPLOCATION_LOCATION2D_DELTA_PDU pdu = { .header = *header, .latitudeDelta = FP_NAN, .longitudeDelta = FP_NAN, - .speedDelta = NULL, - .headingDelta = NULL }; + .speedDelta = nullptr, + .headingDelta = nullptr }; if (!freerdp_read_four_byte_float(s, &pdu.latitudeDelta) || !freerdp_read_four_byte_float(s, &pdu.longitudeDelta)) @@ -286,8 +286,8 @@ static UINT location_server_recv_location3d_delta(LocationServerContext* context RDPLOCATION_LOCATION3D_DELTA_PDU pdu = { .header = *header, .latitudeDelta = FP_NAN, .longitudeDelta = FP_NAN, - .speedDelta = NULL, - .headingDelta = NULL }; + .speedDelta = nullptr, + .headingDelta = nullptr }; if (!freerdp_read_four_byte_float(s, &pdu.latitudeDelta) || !freerdp_read_four_byte_float(s, &pdu.longitudeDelta) || @@ -323,7 +323,8 @@ static UINT location_process_message(location_server* location) WINPR_ASSERT(s); Stream_SetPosition(s, 0); - const BOOL rc = WTSVirtualChannelRead(location->location_channel, 0, NULL, 0, &BytesReturned); + const BOOL rc = + WTSVirtualChannelRead(location->location_channel, 0, nullptr, 0, &BytesReturned); if (!rc) goto out; @@ -412,9 +413,9 @@ static UINT location_server_context_poll_int(LocationServerContext* context) static HANDLE location_server_get_channel_handle(location_server* location) { - void* buffer = NULL; + void* buffer = nullptr; DWORD BytesReturned = 0; - HANDLE ChannelEvent = NULL; + HANDLE ChannelEvent = nullptr; WINPR_ASSERT(location); @@ -478,7 +479,7 @@ static DWORD WINAPI location_server_thread_func(LPVOID arg) } (void)WTSVirtualChannelClose(location->location_channel); - location->location_channel = NULL; + location->location_channel = nullptr; if (error && location->context.rdpcontext) setChannelError(location->context.rdpcontext, error, @@ -494,21 +495,22 @@ static UINT location_server_open(LocationServerContext* context) WINPR_ASSERT(location); - if (!location->externalThread && (location->thread == NULL)) + if (!location->externalThread && (location->thread == nullptr)) { - location->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + location->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!location->stopEvent) { WLog_ERR(TAG, "CreateEvent failed!"); return ERROR_INTERNAL_ERROR; } - location->thread = CreateThread(NULL, 0, location_server_thread_func, location, 0, NULL); + location->thread = + CreateThread(nullptr, 0, location_server_thread_func, location, 0, nullptr); if (!location->thread) { WLog_ERR(TAG, "CreateThread failed!"); (void)CloseHandle(location->stopEvent); - location->stopEvent = NULL; + location->stopEvent = nullptr; return ERROR_INTERNAL_ERROR; } } @@ -537,15 +539,15 @@ static UINT location_server_close(LocationServerContext* context) (void)CloseHandle(location->thread); (void)CloseHandle(location->stopEvent); - location->thread = NULL; - location->stopEvent = NULL; + location->thread = nullptr; + location->stopEvent = nullptr; } if (location->externalThread) { if (location->state != LOCATION_INITIAL) { (void)WTSVirtualChannelClose(location->location_channel); - location->location_channel = NULL; + location->location_channel = nullptr; location->state = LOCATION_INITIAL; } } @@ -616,7 +618,7 @@ out: static UINT location_server_send_server_ready(LocationServerContext* context, const RDPLOCATION_SERVER_READY_PDU* serverReady) { - wStream* s = NULL; + wStream* s = nullptr; UINT32 pduLength = 0; UINT32 protocolVersion = 0; @@ -627,7 +629,7 @@ static UINT location_server_send_server_ready(LocationServerContext* context, pduLength = LOCATION_HEADER_SIZE + 4 + 4; - s = Stream_New(NULL, pduLength); + s = Stream_New(nullptr, pduLength); if (!s) { WLog_ERR(TAG, "Stream_New failed!"); @@ -649,7 +651,7 @@ LocationServerContext* location_server_context_new(HANDLE vcm) location_server* location = (location_server*)calloc(1, sizeof(location_server)); if (!location) - return NULL; + return nullptr; location->context.vcm = vcm; location->context.Initialize = location_server_initialize; @@ -660,7 +662,7 @@ LocationServerContext* location_server_context_new(HANDLE vcm) location->context.ServerReady = location_server_send_server_ready; - location->buffer = Stream_New(NULL, 4096); + location->buffer = Stream_New(nullptr, 4096); if (!location->buffer) goto fail; @@ -670,7 +672,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC location_server_context_free(&location->context); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void location_server_context_free(LocationServerContext* context) diff --git a/channels/parallel/client/parallel_main.c b/channels/parallel/client/parallel_main.c index 1e8fe2854..e8efe050c 100644 --- a/channels/parallel/client/parallel_main.c +++ b/channels/parallel/client/parallel_main.c @@ -78,7 +78,7 @@ typedef struct */ static UINT parallel_process_irp_create(PARALLEL_DEVICE* parallel, IRP* irp) { - char* path = NULL; + char* path = nullptr; UINT32 PathLength = 0; WINPR_ASSERT(parallel); @@ -96,7 +96,7 @@ static UINT parallel_process_irp_create(PARALLEL_DEVICE* parallel, IRP* irp) const WCHAR* ptr = Stream_ConstPointer(irp->input); if (!Stream_SafeSeek(irp->input, PathLength)) return ERROR_INVALID_DATA; - path = ConvertWCharNToUtf8Alloc(ptr, PathLength / sizeof(WCHAR), NULL); + path = ConvertWCharNToUtf8Alloc(ptr, PathLength / sizeof(WCHAR), nullptr); if (!path) return CHANNEL_RC_NO_MEMORY; @@ -148,7 +148,7 @@ static UINT parallel_process_irp_read(PARALLEL_DEVICE* parallel, IRP* irp) UINT32 Length = 0; UINT64 Offset = 0; ssize_t status = 0; - BYTE* buffer = NULL; + BYTE* buffer = nullptr; WINPR_ASSERT(parallel); WINPR_ASSERT(irp); @@ -173,7 +173,7 @@ static UINT parallel_process_irp_read(PARALLEL_DEVICE* parallel, IRP* irp) { irp->IoStatus = STATUS_UNSUCCESSFUL; free(buffer); - buffer = NULL; + buffer = nullptr; Length = 0; } else @@ -388,7 +388,7 @@ static UINT parallel_irp_request(DEVICE* device, IRP* irp) WINPR_ASSERT(parallel); - if (!MessageQueue_Post(parallel->queue, NULL, 0, (void*)irp, NULL)) + if (!MessageQueue_Post(parallel->queue, nullptr, 0, (void*)irp, nullptr)) { WLog_Print(parallel->log, WLOG_ERROR, "MessageQueue_Post failed!"); irp->Discard(irp); @@ -453,7 +453,7 @@ static void parallel_message_free(void* obj) FREERDP_ENTRY_POINT( UINT VCAPITYPE parallel_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)) { - PARALLEL_DEVICE* parallel = NULL; + PARALLEL_DEVICE* parallel = nullptr; UINT error = 0; WINPR_ASSERT(pEntryPoints); @@ -491,7 +491,7 @@ FREERDP_ENTRY_POINT( parallel->device.Free = parallel_free; parallel->rdpcontext = pEntryPoints->rdpcontext; const size_t length = strlen(name); - parallel->device.data = Stream_New(NULL, length + 1); + parallel->device.data = Stream_New(nullptr, length + 1); if (!parallel->device.data) { @@ -504,7 +504,7 @@ FREERDP_ENTRY_POINT( Stream_Write_INT8(parallel->device.data, name[i] < 0 ? '_' : name[i]); parallel->path = path; - parallel->queue = MessageQueue_New(NULL); + parallel->queue = MessageQueue_New(nullptr); if (!parallel->queue) { @@ -525,7 +525,7 @@ FREERDP_ENTRY_POINT( goto error_out; } - parallel->thread = CreateThread(NULL, 0, parallel_thread_func, parallel, 0, NULL); + parallel->thread = CreateThread(nullptr, 0, parallel_thread_func, parallel, 0, nullptr); if (!parallel->thread) { WLog_Print(parallel->log, WLOG_ERROR, "CreateThread failed!"); diff --git a/channels/printer/client/cups/printer_cups.c b/channels/printer/client/cups/printer_cups.c index 98d16079d..408b783bb 100644 --- a/channels/printer/client/cups/printer_cups.c +++ b/channels/printer/client/cups/printer_cups.c @@ -54,7 +54,7 @@ static bool is_mac_os_sonoma_or_later(void) size_t size = sizeof(str); errno = 0; - int ret = sysctlbyname("kern.osrelease", str, &size, NULL, 0); + int ret = sysctlbyname("kern.osrelease", str, &size, nullptr, 0); if (ret != 0) { char buffer[256] = WINPR_C_ARRAY_INIT; @@ -108,10 +108,10 @@ WINPR_ATTR_MALLOC(free, 1) static char* printer_cups_get_printjob_name(size_t id) { struct tm tres = WINPR_C_ARRAY_INIT; - const time_t tt = time(NULL); + const time_t tt = time(nullptr); const struct tm* t = localtime_r(&tt, &tres); - char* str = NULL; + char* str = nullptr; size_t len = 0; const int rc = winpr_asprintf(&str, &len, "%s Print %04d-%02d-%02d %02d-%02d-%02d - Job %" PRIuz, @@ -120,7 +120,7 @@ static char* printer_cups_get_printjob_name(size_t id) if (rc <= 0) { free(str); - return NULL; + return nullptr; } return str; @@ -164,7 +164,7 @@ static UINT printer_cups_write_printjob(rdpPrintJob* printjob, const BYTE* data, static void printer_cups_close_printjob(rdpPrintJob* printjob) { rdpCupsPrintJob* cups_printjob = (rdpCupsPrintJob*)printjob; - rdpCupsPrinter* cups_printer = NULL; + rdpCupsPrinter* cups_printer = nullptr; WINPR_ASSERT(cups_printjob); @@ -178,26 +178,26 @@ static void printer_cups_close_printjob(rdpPrintJob* printjob) cups_printer = (rdpCupsPrinter*)printjob->printer; WINPR_ASSERT(cups_printer); - cups_printer->printjob = NULL; + cups_printer->printjob = nullptr; free(cups_printjob); } static rdpPrintJob* printer_cups_create_printjob(rdpPrinter* printer, UINT32 id) { rdpCupsPrinter* cups_printer = (rdpCupsPrinter*)printer; - rdpCupsPrintJob* cups_printjob = NULL; + rdpCupsPrintJob* cups_printjob = nullptr; WINPR_ASSERT(cups_printer); - if (cups_printer->printjob != NULL) + if (cups_printer->printjob != nullptr) { WLog_WARN(TAG, "printjob [printer '%s'] already existing, abort!", printer->name); - return NULL; + return nullptr; } cups_printjob = (rdpCupsPrintJob*)calloc(1, sizeof(rdpCupsPrintJob)); if (!cups_printjob) - return NULL; + return nullptr; cups_printjob->printjob.id = id; cups_printjob->printjob.printer = printer; @@ -206,14 +206,14 @@ static rdpPrintJob* printer_cups_create_printjob(rdpPrinter* printer, UINT32 id) cups_printjob->printjob.Close = printer_cups_close_printjob; { - cups_printjob->printjob_object = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC, - HTTP_ENCRYPT_IF_REQUESTED, 1, 10000, NULL); + cups_printjob->printjob_object = httpConnect2(cupsServer(), ippPort(), nullptr, AF_UNSPEC, + HTTP_ENCRYPT_IF_REQUESTED, 1, 10000, nullptr); if (!cups_printjob->printjob_object) { WLog_WARN(TAG, "httpConnect2 failed for '%s:%d", cupsServer(), ippPort()); free(cups_printjob); - return NULL; + return nullptr; } char* jobTitle = printer_cups_get_printjob_name(cups_printjob->printjob.id); @@ -221,11 +221,11 @@ static rdpPrintJob* printer_cups_create_printjob(rdpPrinter* printer, UINT32 id) { httpClose(cups_printjob->printjob_object); free(cups_printjob); - return NULL; + return nullptr; } cups_printjob->printjob_id = - cupsCreateJob(cups_printjob->printjob_object, printer->name, jobTitle, 0, NULL); + cupsCreateJob(cups_printjob->printjob_object, printer->name, jobTitle, 0, nullptr); if (!cups_printjob->printjob_id) { @@ -234,7 +234,7 @@ static rdpPrintJob* printer_cups_create_printjob(rdpPrinter* printer, UINT32 id) httpClose(cups_printjob->printjob_object); free(cups_printjob); free(jobTitle); - return NULL; + return nullptr; } http_status_t rc = @@ -257,10 +257,10 @@ static rdpPrintJob* printer_cups_find_printjob(rdpPrinter* printer, UINT32 id) WINPR_ASSERT(cups_printer); - if (cups_printer->printjob == NULL) - return NULL; + if (cups_printer->printjob == nullptr) + return nullptr; if (cups_printer->printjob->printjob.id != id) - return NULL; + return nullptr; return &cups_printer->printjob->printjob; } @@ -306,11 +306,11 @@ static void printer_cups_release_ref_printer(rdpPrinter* printer) static rdpPrinter* printer_cups_new_printer(rdpCupsPrinterDriver* cups_driver, const char* name, const char* driverName, BOOL is_default) { - rdpCupsPrinter* cups_printer = NULL; + rdpCupsPrinter* cups_printer = nullptr; cups_printer = (rdpCupsPrinter*)calloc(1, sizeof(rdpCupsPrinter)); if (!cups_printer) - return NULL; + return nullptr; cups_printer->printer.backend = &cups_driver->driver; @@ -350,14 +350,14 @@ static rdpPrinter* printer_cups_new_printer(rdpCupsPrinterDriver* cups_driver, c fail: printer_cups_free_printer(&cups_printer->printer); - return NULL; + return nullptr; } static void printer_cups_release_enum_printers(rdpPrinter** printers) { rdpPrinter** cur = printers; - while ((cur != NULL) && ((*cur) != NULL)) + while ((cur != nullptr) && ((*cur) != nullptr)) { if ((*cur)->ReleaseRef) (*cur)->ReleaseRef(*cur); @@ -368,9 +368,9 @@ static void printer_cups_release_enum_printers(rdpPrinter** printers) static rdpPrinter** printer_cups_enum_printers(rdpPrinterDriver* driver) { - rdpPrinter** printers = NULL; + rdpPrinter** printers = nullptr; int num_printers = 0; - cups_dest_t* dests = NULL; + cups_dest_t* dests = nullptr; BOOL haveDefault = FALSE; const int num_dests = cupsGetDests(&dests); @@ -378,19 +378,19 @@ static rdpPrinter** printer_cups_enum_printers(rdpPrinterDriver* driver) if (num_dests >= 0) printers = (rdpPrinter**)calloc((size_t)num_dests + 1, sizeof(rdpPrinter*)); if (!printers) - return NULL; + return nullptr; for (size_t i = 0; i < (size_t)num_dests; i++) { const cups_dest_t* dest = &dests[i]; - if (dest->instance == NULL) + if (dest->instance == nullptr) { rdpPrinter* current = printer_cups_new_printer((rdpCupsPrinterDriver*)driver, - dest->name, NULL, dest->is_default); + dest->name, nullptr, dest->is_default); if (!current) { printer_cups_release_enum_printers(printers); - printers = NULL; + printers = nullptr; break; } @@ -428,7 +428,7 @@ static void printer_cups_add_ref_driver(rdpPrinterDriver* driver) } /* Singleton */ -static rdpCupsPrinterDriver* uniq_cups_driver = NULL; +static rdpCupsPrinterDriver* uniq_cups_driver = nullptr; static void printer_cups_release_ref_driver(rdpPrinterDriver* driver) { @@ -439,7 +439,7 @@ static void printer_cups_release_ref_driver(rdpPrinterDriver* driver) if (cups_driver->references <= 1) { if (uniq_cups_driver == cups_driver) - uniq_cups_driver = NULL; + uniq_cups_driver = nullptr; free(cups_driver); } else diff --git a/channels/printer/client/printer_main.c b/channels/printer/client/printer_main.c index a5ecb20fb..77eb5c5c7 100644 --- a/channels/printer/client/printer_main.c +++ b/channels/printer/client/printer_main.c @@ -85,7 +85,7 @@ static char* get_printer_hash(const WCHAR* name, size_t length) BYTE hash[WINPR_SHA256_DIGEST_LENGTH] = WINPR_C_ARRAY_INIT; if (!winpr_Digest(WINPR_MD_SHA256, name, length, hash, sizeof(hash))) - return NULL; + return nullptr; return winpr_BinToHexString(hash, sizeof(hash), FALSE); } @@ -94,11 +94,11 @@ WINPR_ATTR_MALLOC(free, 1) WINPR_ATTR_NODISCARD static char* get_printer_config_path(const rdpSettings* settings, const WCHAR* name, size_t length) { - char* config = NULL; + char* config = nullptr; const char* path = freerdp_settings_get_string(settings, FreeRDP_ConfigPath); char* dir = GetCombinedPath(path, "printers"); if (!dir) - return NULL; + return nullptr; char* bname = get_printer_hash(name, length); if (!bname) goto fail; @@ -106,10 +106,10 @@ static char* get_printer_config_path(const rdpSettings* settings, const WCHAR* n if (config && !winpr_PathFileExists(config)) { - if (!winpr_PathMakePath(config, NULL)) + if (!winpr_PathMakePath(config, nullptr)) { free(config); - config = NULL; + config = nullptr; } } @@ -127,8 +127,8 @@ static BOOL printer_write_setting(const char* path, prn_conf_t type, const void* DWORD written = 0; BOOL rc = FALSE; - HANDLE file = NULL; - char* base64 = NULL; + HANDLE file = nullptr; + char* base64 = nullptr; const char* name = filemap[type]; char* abs = GetCombinedPath(path, name); @@ -138,8 +138,8 @@ static BOOL printer_write_setting(const char* path, prn_conf_t type, const void* return FALSE; } - file = - winpr_CreateFile(abs, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + file = winpr_CreateFile(abs, GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, + nullptr); free(abs); if (file == INVALID_HANDLE_VALUE) @@ -155,7 +155,7 @@ static BOOL printer_write_setting(const char* path, prn_conf_t type, const void* /* base64 char represents 6bit -> 4*(n/3) is the length which is * always smaller than 2*n */ const size_t b64len = strnlen(base64, 2 * length); - rc = WriteFile(file, base64, (UINT32)b64len, &written, NULL); + rc = WriteFile(file, base64, (UINT32)b64len, &written, nullptr); if (b64len != written) rc = FALSE; @@ -186,7 +186,7 @@ static BOOL printer_read_setting(const char* path, prn_conf_t type, void** data, DWORD highSize = 0; DWORD read = 0; BOOL rc = FALSE; - char* fdata = NULL; + char* fdata = nullptr; const char* name = filemap[type]; switch (type) @@ -202,8 +202,8 @@ static BOOL printer_read_setting(const char* path, prn_conf_t type, void** data, if (!abs) return FALSE; - HANDLE file = - winpr_CreateFile(abs, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + HANDLE file = winpr_CreateFile(abs, GENERIC_READ, 0, nullptr, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, nullptr); free(abs); if (file == INVALID_HANDLE_VALUE) @@ -221,7 +221,7 @@ static BOOL printer_read_setting(const char* path, prn_conf_t type, void** data, if (!fdata) goto fail; - rc = ReadFile(file, fdata, lowSize, &read, NULL); + rc = ReadFile(file, fdata, lowSize, &read, nullptr); if (lowSize != read) rc = FALSE; @@ -246,7 +246,7 @@ fail: else { *length = 0; - *data = NULL; + *data = nullptr; } free(fdata); @@ -325,15 +325,15 @@ static BOOL printer_load_from_config(const rdpSettings* settings, rdpPrinter* pr PRINTER_DEVICE* printer_dev) { BOOL res = FALSE; - WCHAR* wname = NULL; + WCHAR* wname = nullptr; size_t wlen = 0; - char* path = NULL; + char* path = nullptr; UINT32 flags = 0; - void* DriverName = NULL; + void* DriverName = nullptr; UINT32 DriverNameLen = 0; - void* PnPName = NULL; + void* PnPName = nullptr; UINT32 PnPNameLen = 0; - void* CachedPrinterConfigData = NULL; + void* CachedPrinterConfigData = nullptr; UINT32 CachedFieldsLen = 0; UINT32 PrinterNameLen = 0; @@ -435,21 +435,21 @@ fail: static BOOL printer_save_default_config(const rdpSettings* settings, rdpPrinter* printer) { BOOL res = FALSE; - WCHAR* wname = NULL; - WCHAR* driver = NULL; + WCHAR* wname = nullptr; + WCHAR* driver = nullptr; size_t wlen = 0; size_t dlen = 0; - char* path = NULL; + char* path = nullptr; if (!settings || !printer || !printer->name || !printer->driver) return FALSE; - wname = ConvertUtf8ToWCharAlloc(printer->name, NULL); + wname = ConvertUtf8ToWCharAlloc(printer->name, nullptr); if (!wname) goto fail; - driver = ConvertUtf8ToWCharAlloc(printer->driver, NULL); + driver = ConvertUtf8ToWCharAlloc(printer->driver, nullptr); if (!driver) goto fail; @@ -482,7 +482,7 @@ fail: */ static UINT printer_process_irp_create(PRINTER_DEVICE* printer_dev, IRP* irp) { - rdpPrintJob* printjob = NULL; + rdpPrintJob* printjob = nullptr; WINPR_ASSERT(printer_dev); WINPR_ASSERT(irp); @@ -514,7 +514,7 @@ static UINT printer_process_irp_create(PRINTER_DEVICE* printer_dev, IRP* irp) */ static UINT printer_process_irp_close(PRINTER_DEVICE* printer_dev, IRP* irp) { - rdpPrintJob* printjob = NULL; + rdpPrintJob* printjob = nullptr; WINPR_ASSERT(printer_dev); WINPR_ASSERT(irp); @@ -547,7 +547,7 @@ static UINT printer_process_irp_write(PRINTER_DEVICE* printer_dev, IRP* irp) { UINT32 Length = 0; UINT64 Offset = 0; - rdpPrintJob* printjob = NULL; + rdpPrintJob* printjob = nullptr; UINT error = CHANNEL_RC_OK; WINPR_ASSERT(printer_dev); @@ -659,7 +659,7 @@ static UINT printer_process_irp(PRINTER_DEVICE* printer_dev, IRP* irp) static DWORD WINAPI printer_thread_func(LPVOID arg) { - IRP* irp = NULL; + IRP* irp = nullptr; PRINTER_DEVICE* printer_dev = (PRINTER_DEVICE*)arg; UINT error = CHANNEL_RC_OK; @@ -685,7 +685,7 @@ static DWORD WINAPI printer_thread_func(LPVOID arg) (void)ResetEvent(printer_dev->event); irp = (IRP*)InterlockedPopEntrySList(printer_dev->pIrpList); - if (irp == NULL) + if (irp == nullptr) { WLog_ERR(TAG, "InterlockedPopEntrySList failed!"); error = ERROR_INTERNAL_ERROR; @@ -767,10 +767,10 @@ static UINT printer_custom_component(DEVICE* device, UINT16 component, UINT16 pa UINT32 DriverNameLen = 0; UINT32 PrintNameLen = 0; UINT32 CacheFieldsLen = 0; - const WCHAR* PnPName = NULL; - const WCHAR* DriverName = NULL; - const WCHAR* PrinterName = NULL; - const BYTE* CachedPrinterConfigData = NULL; + const WCHAR* PnPName = nullptr; + const WCHAR* DriverName = nullptr; + const WCHAR* PrinterName = nullptr; + const BYTE* CachedPrinterConfigData = nullptr; if (!Stream_CheckAndLogRequiredLength(TAG, s, 24)) return ERROR_INVALID_DATA; @@ -817,8 +817,8 @@ static UINT printer_custom_component(DEVICE* device, UINT16 component, UINT16 pa { UINT32 PrinterNameLen = 0; UINT32 ConfigDataLen = 0; - const WCHAR* PrinterName = NULL; - const BYTE* ConfigData = NULL; + const WCHAR* PrinterName = nullptr; + const BYTE* ConfigData = nullptr; if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) return ERROR_INVALID_DATA; @@ -847,7 +847,7 @@ static UINT printer_custom_component(DEVICE* device, UINT16 component, UINT16 pa case RDPDR_DELETE_PRINTER_EVENT: { UINT32 PrinterNameLen = 0; - const WCHAR* PrinterName = NULL; + const WCHAR* PrinterName = nullptr; if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) return ERROR_INVALID_DATA; @@ -867,8 +867,8 @@ static UINT printer_custom_component(DEVICE* device, UINT16 component, UINT16 pa { UINT32 OldPrinterNameLen = 0; UINT32 NewPrinterNameLen = 0; - const WCHAR* OldPrinterName = NULL; - const WCHAR* NewPrinterName = NULL; + const WCHAR* OldPrinterName = nullptr; + const WCHAR* NewPrinterName = nullptr; if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) return ERROR_INVALID_DATA; @@ -931,7 +931,7 @@ static UINT printer_custom_component(DEVICE* device, UINT16 component, UINT16 pa */ static UINT printer_free(DEVICE* device) { - IRP* irp = NULL; + IRP* irp = nullptr; PRINTER_DEVICE* printer_dev = (PRINTER_DEVICE*)device; UINT error = 0; @@ -954,7 +954,7 @@ static UINT printer_free(DEVICE* device) #endif } - while ((irp = (IRP*)InterlockedPopEntrySList(printer_dev->pIrpList)) != NULL) + while ((irp = (IRP*)InterlockedPopEntrySList(printer_dev->pIrpList)) != nullptr) { WINPR_ASSERT(irp->Discard); irp->Discard(irp); @@ -984,7 +984,7 @@ static UINT printer_free(DEVICE* device) */ static UINT printer_register(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, rdpPrinter* printer) { - PRINTER_DEVICE* printer_dev = NULL; + PRINTER_DEVICE* printer_dev = nullptr; UINT error = ERROR_INTERNAL_ERROR; WINPR_ASSERT(pEntryPoints); @@ -998,7 +998,7 @@ static UINT printer_register(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, rdpPrint return CHANNEL_RC_NO_MEMORY; } - printer_dev->device.data = Stream_New(NULL, 1024); + printer_dev->device.data = Stream_New(nullptr, 1024); if (!printer_dev->device.data) goto error_out; @@ -1033,7 +1033,7 @@ static UINT printer_register(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, rdpPrint InitializeSListHead(printer_dev->pIrpList); - printer_dev->event = CreateEvent(NULL, TRUE, FALSE, NULL); + printer_dev->event = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!printer_dev->event) { WLog_ERR(TAG, "CreateEvent failed!"); @@ -1041,7 +1041,7 @@ static UINT printer_register(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, rdpPrint goto error_out; } - printer_dev->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + printer_dev->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!printer_dev->stopEvent) { WLog_ERR(TAG, "CreateEvent failed!"); @@ -1060,7 +1060,7 @@ static UINT printer_register(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, rdpPrint if (printer_dev->async) { printer_dev->thread = - CreateThread(NULL, 0, printer_thread_func, (void*)printer_dev, 0, NULL); + CreateThread(nullptr, 0, printer_thread_func, (void*)printer_dev, 0, nullptr); if (!printer_dev->thread) { WLog_ERR(TAG, "CreateThread failed!"); @@ -1080,15 +1080,15 @@ error_out: static rdpPrinterDriver* printer_load_backend(const char* backend) { typedef UINT(VCAPITYPE * backend_load_t)(rdpPrinterDriver**); - PVIRTUALCHANNELENTRY entry = freerdp_load_channel_addin_entry("printer", backend, NULL, 0); + PVIRTUALCHANNELENTRY entry = freerdp_load_channel_addin_entry("printer", backend, nullptr, 0); backend_load_t func = WINPR_FUNC_PTR_CAST(entry, backend_load_t); if (!func) - return NULL; + return nullptr; - rdpPrinterDriver* printer = NULL; + rdpPrinterDriver* printer = nullptr; const UINT rc = func(&printer); if (rc != CHANNEL_RC_OK) - return NULL; + return nullptr; return printer; } @@ -1101,11 +1101,11 @@ static rdpPrinterDriver* printer_load_backend(const char* backend) FREERDP_ENTRY_POINT( UINT VCAPITYPE printer_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)) { - char* name = NULL; - char* driver_name = NULL; + char* name = nullptr; + char* driver_name = nullptr; BOOL default_backend = TRUE; - RDPDR_PRINTER* device = NULL; - rdpPrinterDriver* driver = NULL; + RDPDR_PRINTER* device = nullptr; + rdpPrinterDriver* driver = nullptr; UINT error = CHANNEL_RC_OK; if (!pEntryPoints || !pEntryPoints->device) diff --git a/channels/printer/client/win/printer_win.c b/channels/printer/client/win/printer_win.c index 92d6f6d82..38b9a8008 100644 --- a/channels/printer/client/win/printer_win.c +++ b/channels/printer/client/win/printer_win.c @@ -77,10 +77,10 @@ WINPR_ATTR_MALLOC(free, 1) static WCHAR* printer_win_get_printjob_name(size_t id) { struct tm tres = WINPR_C_ARRAY_INIT; - WCHAR* str = NULL; + WCHAR* str = nullptr; size_t len = 0; - const time_t tt = time(NULL); + const time_t tt = time(nullptr); const errno_t err = localtime_s(&tres, &tt); do @@ -89,7 +89,7 @@ static WCHAR* printer_win_get_printjob_name(size_t id) { str = calloc(len + 1, sizeof(WCHAR)); if (!str) - return NULL; + return nullptr; } const int rc = swprintf_s( @@ -100,7 +100,7 @@ static WCHAR* printer_win_get_printjob_name(size_t id) if (rc <= 0) { free(str); - return NULL; + return nullptr; } len = WINPR_ASSERTING_INT_CAST(size_t, rc) + 1ull; } while (!str); @@ -154,7 +154,7 @@ static void printer_win_close_printjob(rdpPrintJob* printjob) { } - win_printer->printjob = NULL; + win_printer->printjob = nullptr; free(win_printjob->di.pDocName); free(win_printjob); @@ -165,18 +165,18 @@ static rdpPrintJob* printer_win_create_printjob(rdpPrinter* printer, UINT32 id) rdpWinPrinter* win_printer = (rdpWinPrinter*)printer; rdpWinPrintJob* win_printjob; - if (win_printer->printjob != NULL) - return NULL; + if (win_printer->printjob != nullptr) + return nullptr; win_printjob = (rdpWinPrintJob*)calloc(1, sizeof(rdpWinPrintJob)); if (!win_printjob) - return NULL; + return nullptr; win_printjob->printjob.id = id; win_printjob->printjob.printer = printer; win_printjob->di.pDocName = printer_win_get_printjob_name(id); - win_printjob->di.pDatatype = NULL; - win_printjob->di.pOutputFile = NULL; + win_printjob->di.pDatatype = nullptr; + win_printjob->di.pOutputFile = nullptr; win_printjob->handle = StartDocPrinter(win_printer->hPrinter, 1, (LPBYTE) & (win_printjob->di)); @@ -184,14 +184,14 @@ static rdpPrintJob* printer_win_create_printjob(rdpPrinter* printer, UINT32 id) { free(win_printjob->di.pDocName); free(win_printjob); - return NULL; + return nullptr; } if (!StartPagePrinter(win_printer->hPrinter)) { free(win_printjob->di.pDocName); free(win_printjob); - return NULL; + return nullptr; } win_printjob->printjob.Write = printer_win_write_printjob; @@ -207,10 +207,10 @@ static rdpPrintJob* printer_win_find_printjob(rdpPrinter* printer, UINT32 id) rdpWinPrinter* win_printer = (rdpWinPrinter*)printer; if (!win_printer->printjob) - return NULL; + return nullptr; if (win_printer->printjob->printjob.id != id) - return NULL; + return nullptr; return (rdpPrintJob*)win_printer->printjob; } @@ -254,18 +254,18 @@ static rdpPrinter* printer_win_new_printer(rdpWinPrinterDriver* win_driver, cons { rdpWinPrinter* win_printer; DWORD needed = 0; - PRINTER_INFO_2* prninfo = NULL; + PRINTER_INFO_2* prninfo = nullptr; if (!name) - return NULL; + return nullptr; win_printer = (rdpWinPrinter*)calloc(1, sizeof(rdpWinPrinter)); if (!win_printer) - return NULL; + return nullptr; win_printer->printer.backend = &win_driver->driver; win_printer->printer.id = win_driver->id_sequence++; - win_printer->printer.name = ConvertWCharToUtf8Alloc(name, NULL); + win_printer->printer.name = ConvertWCharToUtf8Alloc(name, nullptr); if (!win_printer->printer.name) goto fail; @@ -278,7 +278,7 @@ static rdpPrinter* printer_win_new_printer(rdpWinPrinterDriver* win_driver, cons win_printer->printer.AddRef = printer_win_add_ref_printer; win_printer->printer.ReleaseRef = printer_win_release_ref_printer; - if (!OpenPrinter(WINPR_CAST_CONST_PTR_AWAY(name, WCHAR*), &(win_printer->hPrinter), NULL)) + if (!OpenPrinter(WINPR_CAST_CONST_PTR_AWAY(name, WCHAR*), &(win_printer->hPrinter), nullptr)) goto fail; /* How many memory should be allocated for printer data */ @@ -297,9 +297,9 @@ static rdpPrinter* printer_win_new_printer(rdpWinPrinterDriver* win_driver, cons } if (drivername) - win_printer->printer.driver = ConvertWCharToUtf8Alloc(drivername, NULL); + win_printer->printer.driver = ConvertWCharToUtf8Alloc(drivername, nullptr); else - win_printer->printer.driver = ConvertWCharToUtf8Alloc(prninfo->pDriverName, NULL); + win_printer->printer.driver = ConvertWCharToUtf8Alloc(prninfo->pDriverName, nullptr); GlobalFree(prninfo); if (!win_printer->printer.driver) goto fail; @@ -310,14 +310,14 @@ static rdpPrinter* printer_win_new_printer(rdpWinPrinterDriver* win_driver, cons fail: printer_win_free_printer(&win_printer->printer); - return NULL; + return nullptr; } static void printer_win_release_enum_printers(rdpPrinter** printers) { rdpPrinter** cur = printers; - while ((cur != NULL) && ((*cur) != NULL)) + while ((cur != nullptr) && ((*cur) != nullptr)) { if ((*cur)->ReleaseRef) (*cur)->ReleaseRef(*cur); @@ -330,25 +330,25 @@ static rdpPrinter** printer_win_enum_printers(rdpPrinterDriver* driver) { rdpPrinter** printers; int num_printers; - PRINTER_INFO_2* prninfo = NULL; + PRINTER_INFO_2* prninfo = nullptr; DWORD needed, returned; BOOL haveDefault = FALSE; - LPWSTR defaultPrinter = NULL; + LPWSTR defaultPrinter = nullptr; - GetDefaultPrinter(NULL, &needed); + GetDefaultPrinter(nullptr, &needed); if (needed) { defaultPrinter = (LPWSTR)calloc(needed, sizeof(WCHAR)); if (!defaultPrinter) - return NULL; + return nullptr; if (!GetDefaultPrinter(defaultPrinter, &needed)) defaultPrinter[0] = '\0'; } /* find required size for the buffer */ - EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS, NULL, 2, NULL, 0, &needed, + EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS, nullptr, 2, nullptr, 0, &needed, &returned); /* allocate array of PRINTER_INFO structures */ @@ -356,11 +356,11 @@ static rdpPrinter** printer_win_enum_printers(rdpPrinterDriver* driver) if (!prninfo) { free(defaultPrinter); - return NULL; + return nullptr; } /* call again */ - if (!EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS, NULL, 2, (LPBYTE)prninfo, + if (!EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS, nullptr, 2, (LPBYTE)prninfo, needed, &needed, &returned)) { } @@ -370,7 +370,7 @@ static rdpPrinter** printer_win_enum_printers(rdpPrinterDriver* driver) { GlobalFree(prninfo); free(defaultPrinter); - return NULL; + return nullptr; } num_printers = 0; @@ -384,7 +384,7 @@ static rdpPrinter** printer_win_enum_printers(rdpPrinterDriver* driver) if (!current) { printer_win_release_enum_printers(printers); - printers = NULL; + printers = nullptr; break; } if (current->is_default) @@ -403,22 +403,22 @@ static rdpPrinter** printer_win_enum_printers(rdpPrinterDriver* driver) static rdpPrinter* printer_win_get_printer(rdpPrinterDriver* driver, const char* name, const char* driverName, BOOL isDefault) { - WCHAR* driverNameW = NULL; - WCHAR* nameW = NULL; + WCHAR* driverNameW = nullptr; + WCHAR* nameW = nullptr; rdpWinPrinterDriver* win_driver = (rdpWinPrinterDriver*)driver; - rdpPrinter* myPrinter = NULL; + rdpPrinter* myPrinter = nullptr; if (name) { - nameW = ConvertUtf8ToWCharAlloc(name, NULL); + nameW = ConvertUtf8ToWCharAlloc(name, nullptr); if (!nameW) - return NULL; + return nullptr; } if (driverName) { - driverNameW = ConvertUtf8ToWCharAlloc(driverName, NULL); + driverNameW = ConvertUtf8ToWCharAlloc(driverName, nullptr); if (!driverNameW) - return NULL; + return nullptr; } myPrinter = printer_win_new_printer(win_driver, nameW, driverNameW, isDefault); @@ -436,7 +436,7 @@ static void printer_win_add_ref_driver(rdpPrinterDriver* driver) } /* Singleton */ -static rdpWinPrinterDriver* win_driver = NULL; +static rdpWinPrinterDriver* win_driver = nullptr; static void printer_win_release_ref_driver(rdpPrinterDriver* driver) { @@ -444,7 +444,7 @@ static void printer_win_release_ref_driver(rdpPrinterDriver* driver) if (win->references <= 1) { free(win); - win_driver = NULL; + win_driver = nullptr; } else win->references--; diff --git a/channels/rail/client/client_rails.c b/channels/rail/client/client_rails.c index e89b58dee..e7ee89c9a 100644 --- a/channels/rail/client/client_rails.c +++ b/channels/rail/client/client_rails.c @@ -56,7 +56,7 @@ UINT client_rail_server_start_cmd(RailClientContext* context) sysparam.params = 0; sysparam.params |= SPI_MASK_SET_HIGH_CONTRAST; - sysparam.highContrast.colorScheme.string = NULL; + sysparam.highContrast.colorScheme.string = nullptr; sysparam.highContrast.colorScheme.length = 0; sysparam.highContrast.flags = 0x7E; sysparam.params |= SPI_MASK_SET_MOUSE_BUTTON_SWAP; diff --git a/channels/rail/client/rail_main.c b/channels/rail/client/rail_main.c index 9cad5bc2d..1a9528c4e 100644 --- a/channels/rail/client/rail_main.c +++ b/channels/rail/client/rail_main.c @@ -38,10 +38,10 @@ RailClientContext* rail_get_client_interface(railPlugin* rail) { - RailClientContext* pInterface = NULL; + RailClientContext* pInterface = nullptr; if (!rail) - return NULL; + return nullptr; pInterface = (RailClientContext*)rail->channelEntryPoints.pInterface; return pInterface; @@ -102,9 +102,9 @@ UINT rail_send_channel_data(railPlugin* rail, wStream* src) */ static UINT rail_client_execute(RailClientContext* context, const RAIL_EXEC_ORDER* exec) { - const char* exeOrFile = NULL; + const char* exeOrFile = nullptr; UINT error = 0; - railPlugin* rail = NULL; + railPlugin* rail = nullptr; UINT16 flags = 0; RAIL_UNICODE_STRING ruExeOrFile = WINPR_C_ARRAY_INIT; RAIL_UNICODE_STRING ruWorkingDir = WINPR_C_ARRAY_INIT; @@ -143,7 +143,7 @@ static UINT rail_client_execute(RailClientContext* context, const RAIL_EXEC_ORDE */ static UINT rail_client_activate(RailClientContext* context, const RAIL_ACTIVATE_ORDER* activate) { - railPlugin* rail = NULL; + railPlugin* rail = nullptr; if (!context || !activate) return ERROR_INVALID_PARAMETER; @@ -159,9 +159,9 @@ static UINT rail_client_activate(RailClientContext* context, const RAIL_ACTIVATE */ static UINT rail_send_client_sysparam(RailClientContext* context, RAIL_SYSPARAM_ORDER* sysparam) { - wStream* s = NULL; + wStream* s = nullptr; size_t length = RAIL_SYSPARAM_ORDER_LENGTH; - railPlugin* rail = NULL; + railPlugin* rail = nullptr; UINT error = 0; BOOL extendedSpiSupported = 0; @@ -326,7 +326,7 @@ static UINT rail_client_system_param(RailClientContext* context, static UINT rail_client_system_command(RailClientContext* context, const RAIL_SYSCOMMAND_ORDER* syscommand) { - railPlugin* rail = NULL; + railPlugin* rail = nullptr; if (!context || !syscommand) return ERROR_INVALID_PARAMETER; @@ -342,7 +342,7 @@ static UINT rail_client_system_command(RailClientContext* context, */ static UINT rail_client_handshake(RailClientContext* context, const RAIL_HANDSHAKE_ORDER* handshake) { - railPlugin* rail = NULL; + railPlugin* rail = nullptr; if (!context || !handshake) return ERROR_INVALID_PARAMETER; @@ -359,7 +359,7 @@ static UINT rail_client_handshake(RailClientContext* context, const RAIL_HANDSHA static UINT rail_client_notify_event(RailClientContext* context, const RAIL_NOTIFY_EVENT_ORDER* notifyEvent) { - railPlugin* rail = NULL; + railPlugin* rail = nullptr; if (!context || !notifyEvent) return ERROR_INVALID_PARAMETER; @@ -376,7 +376,7 @@ static UINT rail_client_notify_event(RailClientContext* context, static UINT rail_client_window_move(RailClientContext* context, const RAIL_WINDOW_MOVE_ORDER* windowMove) { - railPlugin* rail = NULL; + railPlugin* rail = nullptr; if (!context || !windowMove) return ERROR_INVALID_PARAMETER; @@ -393,7 +393,7 @@ static UINT rail_client_window_move(RailClientContext* context, static UINT rail_client_information(RailClientContext* context, const RAIL_CLIENT_STATUS_ORDER* clientStatus) { - railPlugin* rail = NULL; + railPlugin* rail = nullptr; if (!context || !clientStatus) return ERROR_INVALID_PARAMETER; @@ -409,7 +409,7 @@ static UINT rail_client_information(RailClientContext* context, */ static UINT rail_client_system_menu(RailClientContext* context, const RAIL_SYSMENU_ORDER* sysmenu) { - railPlugin* rail = NULL; + railPlugin* rail = nullptr; if (!context || !sysmenu) return ERROR_INVALID_PARAMETER; @@ -426,7 +426,7 @@ static UINT rail_client_system_menu(RailClientContext* context, const RAIL_SYSME static UINT rail_client_language_bar_info(RailClientContext* context, const RAIL_LANGBAR_INFO_ORDER* langBarInfo) { - railPlugin* rail = NULL; + railPlugin* rail = nullptr; if (!context || !langBarInfo) return ERROR_INVALID_PARAMETER; @@ -438,7 +438,7 @@ static UINT rail_client_language_bar_info(RailClientContext* context, static UINT rail_client_language_ime_info(RailClientContext* context, const RAIL_LANGUAGEIME_INFO_ORDER* langImeInfo) { - railPlugin* rail = NULL; + railPlugin* rail = nullptr; if (!context || !langImeInfo) return ERROR_INVALID_PARAMETER; @@ -455,7 +455,7 @@ static UINT rail_client_language_ime_info(RailClientContext* context, static UINT rail_client_get_appid_request(RailClientContext* context, const RAIL_GET_APPID_REQ_ORDER* getAppIdReq) { - railPlugin* rail = NULL; + railPlugin* rail = nullptr; if (!context || !getAppIdReq || !context->handle) return ERROR_INVALID_PARAMETER; @@ -467,7 +467,7 @@ static UINT rail_client_get_appid_request(RailClientContext* context, static UINT rail_client_compartment_info(RailClientContext* context, const RAIL_COMPARTMENT_INFO_ORDER* compartmentInfo) { - railPlugin* rail = NULL; + railPlugin* rail = nullptr; if (!context || !compartmentInfo || !context->handle) return ERROR_INVALID_PARAMETER; @@ -478,7 +478,7 @@ static UINT rail_client_compartment_info(RailClientContext* context, static UINT rail_client_cloak(RailClientContext* context, const RAIL_CLOAK* cloak) { - railPlugin* rail = NULL; + railPlugin* rail = nullptr; if (!context || !cloak || !context->handle) return ERROR_INVALID_PARAMETER; @@ -489,7 +489,7 @@ static UINT rail_client_cloak(RailClientContext* context, const RAIL_CLOAK* cloa static UINT rail_client_snap_arrange(RailClientContext* context, const RAIL_SNAP_ARRANGE* snap) { - railPlugin* rail = NULL; + railPlugin* rail = nullptr; if (!context || !snap || !context->handle) return ERROR_INVALID_PARAMETER; @@ -624,7 +624,7 @@ static UINT rail_virtual_channel_event_disconnected(railPlugin* rail) static void rail_virtual_channel_event_terminated(railPlugin* rail) { - rail->InitHandle = 0; + rail->InitHandle = nullptr; free(rail->context); free(rail); } @@ -680,9 +680,9 @@ FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS_E PVOID pInitHandle)) { UINT rc = 0; - railPlugin* rail = NULL; - RailClientContext* context = NULL; - CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = NULL; + railPlugin* rail = nullptr; + RailClientContext* context = nullptr; + CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = nullptr; BOOL isFreerdp = FALSE; rail = (railPlugin*)calloc(1, sizeof(railPlugin)); @@ -712,7 +712,7 @@ FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS_E } context->handle = (void*)rail; - context->custom = NULL; + context->custom = nullptr; context->ClientExecute = rail_client_execute; context->ClientActivate = rail_client_activate; context->ClientSystemParam = rail_client_system_param; diff --git a/channels/rail/client/rail_orders.c b/channels/rail/client/rail_orders.c index ae836bd8d..7aa50922e 100644 --- a/channels/rail/client/rail_orders.c +++ b/channels/rail/client/rail_orders.c @@ -1162,7 +1162,7 @@ UINT rail_send_handshake_ex_order(railPlugin* rail, const RAIL_HANDSHAKE_EX_ORDE */ UINT rail_send_client_status_order(railPlugin* rail, const RAIL_CLIENT_STATUS_ORDER* clientStatus) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!rail || !clientStatus) @@ -1199,7 +1199,7 @@ UINT rail_send_client_exec_order(railPlugin* rail, UINT16 flags, const RAIL_UNICODE_STRING* workingDir, const RAIL_UNICODE_STRING* arguments) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; size_t length = 0; @@ -1235,7 +1235,7 @@ out: */ UINT rail_send_client_activate_order(railPlugin* rail, const RAIL_ACTIVATE_ORDER* activate) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!rail || !activate) @@ -1268,7 +1268,7 @@ UINT rail_send_client_activate_order(railPlugin* rail, const RAIL_ACTIVATE_ORDER */ UINT rail_send_client_sysmenu_order(railPlugin* rail, const RAIL_SYSMENU_ORDER* sysmenu) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!rail || !sysmenu) @@ -1301,7 +1301,7 @@ UINT rail_send_client_sysmenu_order(railPlugin* rail, const RAIL_SYSMENU_ORDER* */ UINT rail_send_client_syscommand_order(railPlugin* rail, const RAIL_SYSCOMMAND_ORDER* syscommand) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!rail || !syscommand) @@ -1335,7 +1335,7 @@ UINT rail_send_client_syscommand_order(railPlugin* rail, const RAIL_SYSCOMMAND_O UINT rail_send_client_notify_event_order(railPlugin* rail, const RAIL_NOTIFY_EVENT_ORDER* notifyEvent) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!rail || !notifyEvent) @@ -1368,7 +1368,7 @@ UINT rail_send_client_notify_event_order(railPlugin* rail, */ UINT rail_send_client_window_move_order(railPlugin* rail, const RAIL_WINDOW_MOVE_ORDER* windowMove) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!rail || !windowMove) @@ -1402,7 +1402,7 @@ UINT rail_send_client_window_move_order(railPlugin* rail, const RAIL_WINDOW_MOVE UINT rail_send_client_get_appid_req_order(railPlugin* rail, const RAIL_GET_APPID_REQ_ORDER* getAppIdReq) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!rail || !getAppIdReq) @@ -1435,7 +1435,7 @@ UINT rail_send_client_get_appid_req_order(railPlugin* rail, UINT rail_send_client_langbar_info_order(railPlugin* rail, const RAIL_LANGBAR_INFO_ORDER* langBarInfo) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!rail || !langBarInfo) @@ -1466,7 +1466,7 @@ UINT rail_send_client_langbar_info_order(railPlugin* rail, UINT rail_send_client_languageime_info_order(railPlugin* rail, const RAIL_LANGUAGEIME_INFO_ORDER* langImeInfo) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!rail || !langImeInfo) @@ -1497,7 +1497,7 @@ UINT rail_send_client_languageime_info_order(railPlugin* rail, UINT rail_send_client_compartment_info_order(railPlugin* rail, const RAIL_COMPARTMENT_INFO_ORDER* compartmentInfo) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!rail || !compartmentInfo) diff --git a/channels/rail/rail_common.c b/channels/rail/rail_common.c index 2e10716ba..c98afba80 100644 --- a/channels/rail/rail_common.c +++ b/channels/rail/rail_common.c @@ -121,10 +121,10 @@ void rail_write_pdu_header(wStream* s, UINT16 orderType, UINT16 orderLength) wStream* rail_pdu_init(size_t length) { - wStream* s = Stream_New(NULL, length + RAIL_PDU_HEADER_LENGTH); + wStream* s = Stream_New(nullptr, length + RAIL_PDU_HEADER_LENGTH); if (!s) - return NULL; + return nullptr; Stream_Seek(s, RAIL_PDU_HEADER_LENGTH); return s; @@ -592,7 +592,7 @@ BOOL rail_is_extended_spi_supported(UINT32 channelFlags) const char* rail_handshake_ex_flags_to_string(UINT32 flags, char* buffer, size_t len) { if (len < 1) - return NULL; + return nullptr; (void)_snprintf(buffer, len, "{"); char* fbuffer = &buffer[1]; diff --git a/channels/rail/server/rail_main.c b/channels/rail/server/rail_main.c index f8a8e9d14..2729bc6d8 100644 --- a/channels/rail/server/rail_main.c +++ b/channels/rail/server/rail_main.c @@ -265,7 +265,7 @@ static UINT rail_write_get_appid_resp_ex_order(wStream* s, static UINT rail_send_server_handshake(RailServerContext* context, const RAIL_HANDSHAKE_ORDER* handshake) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!context || !handshake) @@ -293,7 +293,7 @@ static UINT rail_send_server_handshake(RailServerContext* context, static UINT rail_send_server_handshake_ex(RailServerContext* context, const RAIL_HANDSHAKE_EX_ORDER* handshakeEx) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!context || !handshakeEx || !context->priv) @@ -323,9 +323,9 @@ static UINT rail_send_server_handshake_ex(RailServerContext* context, static UINT rail_send_server_sysparam(RailServerContext* context, const RAIL_SYSPARAM_ORDER* sysparam) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; - RailServerPrivate* priv = NULL; + RailServerPrivate* priv = nullptr; BOOL extendedSpiSupported = 0; if (!context || !sysparam) @@ -360,7 +360,7 @@ static UINT rail_send_server_sysparam(RailServerContext* context, static UINT rail_send_server_local_move_size(RailServerContext* context, const RAIL_LOCALMOVESIZE_ORDER* localMoveSize) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!context || !localMoveSize) @@ -388,7 +388,7 @@ static UINT rail_send_server_local_move_size(RailServerContext* context, static UINT rail_send_server_min_max_info(RailServerContext* context, const RAIL_MINMAXINFO_ORDER* minMaxInfo) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!context || !minMaxInfo) @@ -416,7 +416,7 @@ static UINT rail_send_server_min_max_info(RailServerContext* context, static UINT rail_send_server_taskbar_info(RailServerContext* context, const RAIL_TASKBAR_INFO_ORDER* taskbarInfo) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!context || !taskbarInfo) @@ -444,7 +444,7 @@ static UINT rail_send_server_taskbar_info(RailServerContext* context, static UINT rail_send_server_langbar_info(RailServerContext* context, const RAIL_LANGBAR_INFO_ORDER* langbarInfo) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!context || !langbarInfo) @@ -472,7 +472,7 @@ static UINT rail_send_server_langbar_info(RailServerContext* context, static UINT rail_send_server_exec_result(RailServerContext* context, const RAIL_EXEC_RESULT_ORDER* execResult) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!context || !execResult) @@ -500,7 +500,7 @@ static UINT rail_send_server_exec_result(RailServerContext* context, static UINT rail_send_server_z_order_sync(RailServerContext* context, const RAIL_ZORDER_SYNC* zOrderSync) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!context || !zOrderSync) @@ -527,7 +527,7 @@ static UINT rail_send_server_z_order_sync(RailServerContext* context, */ static UINT rail_send_server_cloak(RailServerContext* context, const RAIL_CLOAK* cloak) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!context || !cloak) @@ -556,7 +556,7 @@ static UINT rail_send_server_power_display_request(RailServerContext* context, const RAIL_POWER_DISPLAY_REQUEST* powerDisplayRequest) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!context || !powerDisplayRequest) @@ -584,7 +584,7 @@ rail_send_server_power_display_request(RailServerContext* context, static UINT rail_send_server_get_app_id_resp(RailServerContext* context, const RAIL_GET_APPID_RESP_ORDER* getAppidResp) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!context || !getAppidResp) @@ -612,7 +612,7 @@ static UINT rail_send_server_get_app_id_resp(RailServerContext* context, static UINT rail_send_server_get_appid_resp_ex(RailServerContext* context, const RAIL_GET_APPID_RESP_EX* getAppidRespEx) { - wStream* s = NULL; + wStream* s = nullptr; UINT error = 0; if (!context || !getAppidRespEx) @@ -672,7 +672,8 @@ static UINT rail_read_exec_order(wStream* s, RAIL_EXEC_ORDER* exec, char* args[] if (exeLen > 0) { const size_t len = exeLen / sizeof(WCHAR); - exec->RemoteApplicationProgram = args[0] = Stream_Read_UTF16_String_As_UTF8(s, len, NULL); + exec->RemoteApplicationProgram = args[0] = + Stream_Read_UTF16_String_As_UTF8(s, len, nullptr); if (!exec->RemoteApplicationProgram) goto fail; } @@ -680,14 +681,15 @@ static UINT rail_read_exec_order(wStream* s, RAIL_EXEC_ORDER* exec, char* args[] { const size_t len = workLen / sizeof(WCHAR); exec->RemoteApplicationWorkingDir = args[1] = - Stream_Read_UTF16_String_As_UTF8(s, len, NULL); + Stream_Read_UTF16_String_As_UTF8(s, len, nullptr); if (!exec->RemoteApplicationWorkingDir) goto fail; } if (argLen > 0) { const size_t len = argLen / sizeof(WCHAR); - exec->RemoteApplicationArguments = args[2] = Stream_Read_UTF16_String_As_UTF8(s, len, NULL); + exec->RemoteApplicationArguments = args[2] = + Stream_Read_UTF16_String_As_UTF8(s, len, nullptr); if (!exec->RemoteApplicationArguments) goto fail; } @@ -1412,7 +1414,7 @@ static DWORD WINAPI rail_server_thread(LPVOID arg) */ static UINT rail_server_start(RailServerContext* context) { - void* buffer = NULL; + void* buffer = nullptr; DWORD bytesReturned = 0; RailServerPrivate* priv = context->priv; UINT error = ERROR_INTERNAL_ERROR; @@ -1442,7 +1444,7 @@ static UINT rail_server_start(RailServerContext* context) priv->channelEvent = *(HANDLE*)buffer; WTSFreeMemory(buffer); - context->priv->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + context->priv->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!context->priv->stopEvent) { @@ -1450,7 +1452,8 @@ static UINT rail_server_start(RailServerContext* context) goto out_close; } - context->priv->thread = CreateThread(NULL, 0, rail_server_thread, (void*)context, 0, NULL); + context->priv->thread = + CreateThread(nullptr, 0, rail_server_thread, (void*)context, 0, nullptr); if (!context->priv->thread) { @@ -1461,10 +1464,10 @@ static UINT rail_server_start(RailServerContext* context) return CHANNEL_RC_OK; out_stop_event: (void)CloseHandle(context->priv->stopEvent); - context->priv->stopEvent = NULL; + context->priv->stopEvent = nullptr; out_close: (void)WTSVirtualChannelClose(context->priv->rail_channel); - context->priv->rail_channel = NULL; + context->priv->rail_channel = nullptr; return error; } @@ -1484,30 +1487,30 @@ static BOOL rail_server_stop(RailServerContext* context) (void)CloseHandle(priv->thread); (void)CloseHandle(priv->stopEvent); - priv->thread = NULL; - priv->stopEvent = NULL; + priv->thread = nullptr; + priv->stopEvent = nullptr; } if (priv->rail_channel) { (void)WTSVirtualChannelClose(priv->rail_channel); - priv->rail_channel = NULL; + priv->rail_channel = nullptr; } - priv->channelEvent = NULL; + priv->channelEvent = nullptr; return TRUE; } RailServerContext* rail_server_context_new(HANDLE vcm) { - RailServerContext* context = NULL; - RailServerPrivate* priv = NULL; + RailServerContext* context = nullptr; + RailServerPrivate* priv = nullptr; context = (RailServerContext*)calloc(1, sizeof(RailServerContext)); if (!context) { WLog_ERR(TAG, "calloc failed!"); - return NULL; + return nullptr; } context->vcm = vcm; @@ -1535,7 +1538,7 @@ RailServerContext* rail_server_context_new(HANDLE vcm) } /* Create shared input stream */ - priv->input_stream = Stream_New(NULL, 4096); + priv->input_stream = Stream_New(nullptr, 4096); if (!priv->input_stream) { @@ -1548,7 +1551,7 @@ out_free_priv: free(context->priv); out_free: free(context); - return NULL; + return nullptr; } void rail_server_context_free(RailServerContext* context) @@ -1562,7 +1565,7 @@ void rail_server_context_free(RailServerContext* context) void rail_server_set_handshake_ex_flags(RailServerContext* context, DWORD flags) { - RailServerPrivate* priv = NULL; + RailServerPrivate* priv = nullptr; if (!context || !context->priv) return; diff --git a/channels/rdp2tcp/client/rdp2tcp_main.c b/channels/rdp2tcp/client/rdp2tcp_main.c index 4e0af1adf..2d2bb4007 100644 --- a/channels/rdp2tcp/client/rdp2tcp_main.c +++ b/channels/rdp2tcp/client/rdp2tcp_main.c @@ -56,7 +56,7 @@ static int init_external_addin(Plugin* plugin) saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); saAttr.bInheritHandle = TRUE; - saAttr.lpSecurityDescriptor = NULL; + saAttr.lpSecurityDescriptor = nullptr; siStartInfo.cb = sizeof(STARTUPINFO); siStartInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE); siStartInfo.dwFlags = STARTF_USESTDHANDLES; @@ -95,14 +95,14 @@ static int init_external_addin(Plugin* plugin) } plugin->commandline = _strdup(args->argv[1]); - if (!CreateProcessA(NULL, + if (!CreateProcessA(nullptr, plugin->commandline, // command line - NULL, // process security attributes - NULL, // primary thread security attributes + nullptr, // process security attributes + nullptr, // primary thread security attributes TRUE, // handles are inherited 0, // creation flags - NULL, // use parent's environment - NULL, // use parent's current directory + nullptr, // use parent's environment + nullptr, // use parent's current directory &siStartInfo, // STARTUPINFO pointer &procInfo // receives PROCESS_INFORMATION )) @@ -143,8 +143,8 @@ static DWORD WINAPI copyThread(void* data) } // if (!ReadFile(plugin->hStdOutputRead, plugin->buffer, sizeof plugin->buffer, &dwRead, - // NULL)) - if (!ReadFile(plugin->hStdOutputRead, buffer, bufsize, &dwRead, NULL)) + // nullptr)) + if (!ReadFile(plugin->hStdOutputRead, buffer, bufsize, &dwRead, nullptr)) { free(buffer); goto fail; @@ -190,11 +190,12 @@ static void dataReceived(Plugin* plugin, void* pData, UINT32 dataLength, UINT32 if (dataFlags & CHANNEL_FLAG_FIRST) { - if (!WriteFile(plugin->hStdInputWrite, &totalLength, sizeof(totalLength), &dwWritten, NULL)) + if (!WriteFile(plugin->hStdInputWrite, &totalLength, sizeof(totalLength), &dwWritten, + nullptr)) closeChannel(plugin); } - if (!WriteFile(plugin->hStdInputWrite, pData, dataLength, &dwWritten, NULL)) + if (!WriteFile(plugin->hStdInputWrite, pData, dataLength, &dwWritten, nullptr)) closeChannel(plugin); } @@ -246,10 +247,10 @@ static void channel_initialized(Plugin* plugin) { WINPR_ASSERT(plugin); WINPR_ASSERT(!plugin->writeComplete); - plugin->writeComplete = CreateEvent(NULL, TRUE, FALSE, NULL); + plugin->writeComplete = CreateEvent(nullptr, TRUE, FALSE, nullptr); WINPR_ASSERT(!plugin->copyThread); - plugin->copyThread = CreateThread(NULL, 0, copyThread, plugin, 0, NULL); + plugin->copyThread = CreateThread(nullptr, 0, copyThread, plugin, 0, nullptr); } static VOID VCAPITYPE VirtualChannelInitEventEx(LPVOID lpUserParam, LPVOID pInitHandle, UINT event, @@ -317,7 +318,7 @@ FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS_E channelDef.options = CHANNEL_OPTION_INITIALIZED | CHANNEL_OPTION_ENCRYPT_RDP | CHANNEL_OPTION_COMPRESS_RDP; - if (pEntryPointsEx->pVirtualChannelInitEx(plugin, NULL, pInitHandle, &channelDef, 1, + if (pEntryPointsEx->pVirtualChannelInitEx(plugin, nullptr, pInitHandle, &channelDef, 1, VIRTUAL_CHANNEL_VERSION_WIN2000, VirtualChannelInitEventEx) != CHANNEL_RC_OK) { diff --git a/channels/rdpdr/client/devman.c b/channels/rdpdr/client/devman.c index 325a71f9a..25a51bdaa 100644 --- a/channels/rdpdr/client/devman.c +++ b/channels/rdpdr/client/devman.c @@ -54,17 +54,17 @@ static void devman_device_free(void* obj) DEVMAN* devman_new(rdpdrPlugin* rdpdr) { - DEVMAN* devman = NULL; + DEVMAN* devman = nullptr; if (!rdpdr) - return NULL; + return nullptr; devman = (DEVMAN*)calloc(1, sizeof(DEVMAN)); if (!devman) { WLog_Print(rdpdr->log, WLOG_INFO, "calloc failed!"); - return NULL; + return nullptr; } devman->plugin = (void*)rdpdr; @@ -75,7 +75,7 @@ DEVMAN* devman_new(rdpdrPlugin* rdpdr) { WLog_Print(rdpdr->log, WLOG_INFO, "ListDictionary_New failed!"); free(devman); - return NULL; + return nullptr; } ListDictionary_ValueObject(devman->devices)->fnObjectFree = devman_device_free; @@ -90,7 +90,7 @@ void devman_free(DEVMAN* devman) void devman_unregister_device(DEVMAN* devman, void* key) { - DEVICE* device = NULL; + DEVICE* device = nullptr; if (!devman || !key) return; @@ -108,7 +108,7 @@ void devman_unregister_device(DEVMAN* devman, void* key) */ static UINT devman_register_device(DEVMAN* devman, DEVICE* device) { - void* key = NULL; + void* key = nullptr; if (!devman || !device) return ERROR_INVALID_PARAMETER; @@ -127,13 +127,13 @@ static UINT devman_register_device(DEVMAN* devman, DEVICE* device) DEVICE* devman_get_device_by_id(DEVMAN* devman, UINT32 id) { - DEVICE* device = NULL; + DEVICE* device = nullptr; void* key = (void*)(size_t)id; if (!devman) { - WLog_ERR(TAG, "device manager=NULL"); - return NULL; + WLog_ERR(TAG, "device manager=nullptr"); + return nullptr; } device = (DEVICE*)ListDictionary_GetItemValue(devman->devices, key); @@ -144,11 +144,11 @@ DEVICE* devman_get_device_by_id(DEVMAN* devman, UINT32 id) DEVICE* devman_get_device_by_type(DEVMAN* devman, UINT32 type) { - DEVICE* device = NULL; - ULONG_PTR* keys = NULL; + DEVICE* device = nullptr; + ULONG_PTR* keys = nullptr; if (!devman) - return NULL; + return nullptr; ListDictionary_Lock(devman->devices); const size_t count = ListDictionary_GetKeys(devman->devices, &keys); @@ -185,7 +185,7 @@ static const char PARALLEL_SERVICE_NAME[] = "parallel"; */ UINT devman_load_device_service(DEVMAN* devman, RDPDR_DEVICE* device, rdpContext* rdpcontext) { - const char* ServiceName = NULL; + const char* ServiceName = nullptr; DEVICE_SERVICE_ENTRY_POINTS ep = WINPR_C_ARRAY_INIT; union { @@ -220,7 +220,7 @@ UINT devman_load_device_service(DEVMAN* devman, RDPDR_DEVICE* device, rdpContext WLog_INFO(TAG, "Loading device service %s (static)", ServiceName); PVIRTUALCHANNELENTRY pvce = - freerdp_load_channel_addin_entry(ServiceName, NULL, "DeviceServiceEntry", 0); + freerdp_load_channel_addin_entry(ServiceName, nullptr, "DeviceServiceEntry", 0); PDEVICE_SERVICE_ENTRY entry = WINPR_FUNC_PTR_CAST(pvce, PDEVICE_SERVICE_ENTRY); if (!entry) diff --git a/channels/rdpdr/client/irp.c b/channels/rdpdr/client/irp.c index 46d6ae604..b235b3201 100644 --- a/channels/rdpdr/client/irp.c +++ b/channels/rdpdr/client/irp.c @@ -74,7 +74,7 @@ static UINT irp_complete(IRP* irp) Stream_SetPosition(irp->output, pos); const UINT error = rdpdr_send(rdpdr, irp->output); - irp->output = NULL; + irp->output = nullptr; irp_free(irp); return error; @@ -82,8 +82,8 @@ static UINT irp_complete(IRP* irp) IRP* irp_new(DEVMAN* devman, wStreamPool* pool, wStream* s, wLog* log, UINT* error) { - IRP* irp = NULL; - DEVICE* device = NULL; + IRP* irp = nullptr; + DEVICE* device = nullptr; UINT32 DeviceId = 0; WINPR_ASSERT(devman); @@ -94,7 +94,7 @@ IRP* irp_new(DEVMAN* devman, wStreamPool* pool, wStream* s, wLog* log, UINT* err { if (error) *error = ERROR_INVALID_DATA; - return NULL; + return nullptr; } Stream_Read_UINT32(s, DeviceId); /* DeviceId (4 bytes) */ @@ -105,7 +105,7 @@ IRP* irp_new(DEVMAN* devman, wStreamPool* pool, wStream* s, wLog* log, UINT* err if (error) *error = ERROR_DEV_NOT_EXIST; - return NULL; + return nullptr; } irp = (IRP*)winpr_aligned_calloc(1, sizeof(IRP), MEMORY_ALLOCATION_ALIGNMENT); @@ -115,7 +115,7 @@ IRP* irp_new(DEVMAN* devman, wStreamPool* pool, wStream* s, wLog* log, UINT* err WLog_Print(log, WLOG_ERROR, "_aligned_malloc failed!"); if (error) *error = CHANNEL_RC_NO_MEMORY; - return NULL; + return nullptr; } Stream_Read_UINT32(s, irp->FileId); /* FileId (4 bytes) */ @@ -135,7 +135,7 @@ IRP* irp_new(DEVMAN* devman, wStreamPool* pool, wStream* s, wLog* log, UINT* err irp_free(irp); if (error) *error = CHANNEL_RC_NO_MEMORY; - return NULL; + return nullptr; } if (!rdpdr_write_iocompletion_header(irp->output, DeviceId, irp->CompletionId, 0)) @@ -143,13 +143,13 @@ IRP* irp_new(DEVMAN* devman, wStreamPool* pool, wStream* s, wLog* log, UINT* err irp_free(irp); if (error) *error = CHANNEL_RC_NO_MEMORY; - return NULL; + return nullptr; } irp->Complete = irp_complete; irp->Discard = irp_free; - irp->thread = NULL; + irp->thread = nullptr; irp->cancelled = FALSE; if (error) diff --git a/channels/rdpdr/client/rdpdr_main.c b/channels/rdpdr/client/rdpdr_main.c index 2f6db73b7..861a01454 100644 --- a/channels/rdpdr/client/rdpdr_main.c +++ b/channels/rdpdr/client/rdpdr_main.c @@ -159,7 +159,7 @@ static BOOL device_foreach(rdpdrPlugin* rdpdr, BOOL abortOnFail, BOOL (*fkt)(ULONG_PTR key, void* element, void* data), void* data) { BOOL rc = TRUE; - ULONG_PTR* keys = NULL; + ULONG_PTR* keys = nullptr; ListDictionary_Lock(rdpdr->devman->devices); const size_t count = ListDictionary_GetKeys(rdpdr->devman->devices, &keys); @@ -193,7 +193,7 @@ static BOOL rdpdr_load_drive(rdpdrPlugin* rdpdr, const char* name, const char* p RDPDR_DRIVE* drive; RDPDR_DEVICE* device; } drive; - const char* args[] = { name, path, automount ? NULL : name }; + const char* args[] = { name, path, automount ? nullptr : name }; drive.device = freerdp_device_new(RDPDR_DTYP_FILESYSTEM, ARRAYSIZE(args), args); if (!drive.device) @@ -217,7 +217,7 @@ fail: static UINT rdpdr_send_device_list_remove_request(rdpdrPlugin* rdpdr, UINT32 count, const UINT32 ids[]) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(rdpdr); WINPR_ASSERT(ids || (count == 0)); @@ -285,7 +285,7 @@ static BOOL check_path(const char* path) type == DRIVE_REMOTE)) return FALSE; - return GetVolumeInformationA(path, NULL, 0, NULL, NULL, NULL, NULL, 0); + return GetVolumeInformationA(path, nullptr, 0, nullptr, nullptr, nullptr, nullptr, 0); } static void first_hotplug(rdpdrPlugin* rdpdr) @@ -356,7 +356,7 @@ static LRESULT CALLBACK hotplug_proc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM PDEV_BROADCAST_VOLUME lpdbv = (PDEV_BROADCAST_VOLUME)lpdb; DWORD unitmask = lpdbv->dbcv_unitmask; char drive_name_upper, drive_name_lower; - ULONG_PTR* keys = NULL; + ULONG_PTR* keys = nullptr; DEVICE_DRIVE_EXT* device_ext; for (int i = 0; i < 26; i++) @@ -438,16 +438,17 @@ static DWORD WINAPI drive_hotplug_thread_func(LPVOID arg) wnd_cls.lpfnWndProc = hotplug_proc; wnd_cls.cbClsExtra = 0; wnd_cls.cbWndExtra = 0; - wnd_cls.hIcon = LoadIcon(NULL, IDI_APPLICATION); - wnd_cls.hCursor = NULL; + wnd_cls.hIcon = LoadIcon(nullptr, IDI_APPLICATION); + wnd_cls.hCursor = nullptr; wnd_cls.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH); - wnd_cls.lpszMenuName = NULL; + wnd_cls.lpszMenuName = nullptr; wnd_cls.lpszClassName = L"DRIVE_HOTPLUG"; - wnd_cls.hInstance = NULL; - wnd_cls.hIconSm = LoadIcon(NULL, IDI_APPLICATION); + wnd_cls.hInstance = nullptr; + wnd_cls.hIconSm = LoadIcon(nullptr, IDI_APPLICATION); RegisterClassEx(&wnd_cls); /* create window */ - hwnd = CreateWindowEx(0, L"DRIVE_HOTPLUG", NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + hwnd = CreateWindowEx(0, L"DRIVE_HOTPLUG", nullptr, 0, 0, 0, 0, 0, nullptr, nullptr, nullptr, + nullptr); SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)rdpdr); rdpdr->hotplug_wnd = hwnd; /* register device interface to hwnd */ @@ -512,27 +513,27 @@ static UINT handle_hotplug(WINPR_ATTR_UNUSED RdpdrClientContext* context, WINPR_ASSERT(context); rdpdrPlugin* rdpdr = context->handle; - struct dirent* pDirent = NULL; + struct dirent* pDirent = nullptr; char fullpath[PATH_MAX] = WINPR_C_ARRAY_INIT; char* szdir = (char*)"/Volumes"; struct stat buf = WINPR_C_ARRAY_INIT; hotplug_dev dev_array[MAX_USB_DEVICES] = WINPR_C_ARRAY_INIT; int count = 0; - DEVICE_DRIVE_EXT* device_ext = NULL; - ULONG_PTR* keys = NULL; + DEVICE_DRIVE_EXT* device_ext = nullptr; + ULONG_PTR* keys = nullptr; int size = 0; UINT error = ERROR_INTERNAL_ERROR; UINT32 ids[1]; DIR* pDir = opendir(szdir); - if (pDir == NULL) + if (pDir == nullptr) { printf("Cannot open directory\n"); return ERROR_OPEN_FAILED; } - while ((pDirent = readdir(pDir)) != NULL) + while ((pDirent = readdir(pDir)) != nullptr) { if (pDirent->d_name[0] != '.') { @@ -562,7 +563,7 @@ static UINT handle_hotplug(WINPR_ATTR_UNUSED RdpdrClientContext* context, for (size_t j = 0; j < count; j++) { - char* path = NULL; + char* path = nullptr; BOOL dev_found = FALSE; device_ext = (DEVICE_DRIVE_EXT*)ListDictionary_GetItemValue(rdpdr->devman->devices, (void*)keys[j]); @@ -573,15 +574,15 @@ static UINT handle_hotplug(WINPR_ATTR_UNUSED RdpdrClientContext* context, if (device_ext->device.type != RDPDR_DTYP_FILESYSTEM) continue; - if (device_ext->path == NULL) + if (device_ext->path == nullptr) continue; - path = ConvertWCharToUtf8Alloc(device_ext->path, NULL); + path = ConvertWCharToUtf8Alloc(device_ext->path, nullptr); if (!path) continue; /* not pluggable device */ - if (strstr(path, "/Volumes/") == NULL) + if (strstr(path, "/Volumes/") == nullptr) { free(path); continue; @@ -589,7 +590,7 @@ static UINT handle_hotplug(WINPR_ATTR_UNUSED RdpdrClientContext* context, for (size_t i = 0; i < size; i++) { - if (strstr(path, dev_array[i].path) != NULL) + if (strstr(path, dev_array[i].path) != nullptr) { dev_found = TRUE; dev_array[i].to_add = FALSE; @@ -699,15 +700,15 @@ static DWORD WINAPI drive_hotplug_thread_func(LPVOID arg) WINPR_ASSERT(rdpdr->stopEvent); CFStringRef path = CFSTR("/Volumes/"); - CFArrayRef pathsToWatch = CFArrayCreate(kCFAllocatorMalloc, (const void**)&path, 1, NULL); + CFArrayRef pathsToWatch = CFArrayCreate(kCFAllocatorMalloc, (const void**)&path, 1, nullptr); FSEventStreamContext ctx = { - .copyDescription = NULL, .info = arg, .release = NULL, .retain = NULL, .version = 0 + .copyDescription = nullptr, .info = arg, .release = nullptr, .retain = nullptr, .version = 0 }; FSEventStreamRef fsev = FSEventStreamCreate(kCFAllocatorMalloc, drive_hotplug_fsevent_callback, &ctx, pathsToWatch, kFSEventStreamEventIdSinceNow, 1, kFSEventStreamCreateFlagNone); - dispatch_queue_t queue = dispatch_queue_create(TAG, NULL); + dispatch_queue_t queue = dispatch_queue_create(TAG, nullptr); FSEventStreamSetDispatchQueue(fsev, queue); FSEventStreamStart(fsev); WLog_Print(rdpdr->log, WLOG_DEBUG, "Started hotplug watcher"); @@ -807,7 +808,7 @@ static UINT handle_platform_mounts_sun(wLog* log, hotplug_dev* dev_array, size_t FILE* f; struct mnttab ent; f = winpr_fopen("/etc/mnttab", "r"); - if (f == NULL) + if (f == nullptr) { WLog_Print(log, WLOG_ERROR, "fopen failed!"); return ERROR_OPEN_FAILED; @@ -826,7 +827,7 @@ static UINT handle_platform_mounts_sun(wLog* log, hotplug_dev* dev_array, size_t static UINT handle_platform_mounts_bsd(wLog* log, hotplug_dev* dev_array, size_t* size) { int mntsize; - struct statfs* mntbuf = NULL; + struct statfs* mntbuf = nullptr; mntsize = getmntinfo(&mntbuf, MNT_NOWAIT); if (!mntsize) @@ -862,17 +863,17 @@ static struct mntent* getmntent_x(FILE* f, struct mntent* buffer, char* pathbuff static UINT handle_platform_mounts_linux(wLog* log, hotplug_dev* dev_array, size_t* size) { - FILE* f = NULL; + FILE* f = nullptr; struct mntent mnt = WINPR_C_ARRAY_INIT; char pathbuffer[PATH_MAX] = WINPR_C_ARRAY_INIT; - struct mntent* ent = NULL; + struct mntent* ent = nullptr; f = winpr_fopen("/proc/mounts", "r"); - if (f == NULL) + if (f == nullptr) { WLog_Print(log, WLOG_ERROR, "fopen failed!"); return ERROR_OPEN_FAILED; } - while ((ent = getmntent_x(f, &mnt, pathbuffer, sizeof(pathbuffer))) != NULL) + while ((ent = getmntent_x(f, &mnt, pathbuffer, sizeof(pathbuffer))) != nullptr) { handle_mountpoint(dev_array, size, ent->mnt_dir); } @@ -911,7 +912,7 @@ static BOOL device_not_plugged(ULONG_PTR key, void* element, void* data) static BOOL device_already_plugged(rdpdrPlugin* rdpdr, const hotplug_dev* device) { BOOL rc = FALSE; - WCHAR* path = NULL; + WCHAR* path = nullptr; if (!rdpdr || !device) return TRUE; @@ -921,7 +922,7 @@ static BOOL device_already_plugged(rdpdrPlugin* rdpdr, const hotplug_dev* device WINPR_ASSERT(rdpdr->devman); WINPR_ASSERT(device->path); - path = ConvertUtf8ToWCharAlloc(device->path, NULL); + path = ConvertUtf8ToWCharAlloc(device->path, nullptr); if (!path) return TRUE; @@ -939,7 +940,7 @@ struct hotplug_delete_arg static BOOL hotplug_delete_foreach(ULONG_PTR key, void* element, void* data) { - char* path = NULL; + char* path = nullptr; BOOL dev_found = FALSE; struct hotplug_delete_arg* arg = (struct hotplug_delete_arg*)data; DEVICE_DRIVE_EXT* device_ext = (DEVICE_DRIVE_EXT*)element; @@ -954,7 +955,7 @@ static BOOL hotplug_delete_foreach(ULONG_PTR key, void* element, void* data) return TRUE; WINPR_ASSERT(device_ext->path); - path = ConvertWCharToUtf8Alloc(device_ext->path, NULL); + path = ConvertWCharToUtf8Alloc(device_ext->path, nullptr); if (!path) return FALSE; @@ -964,7 +965,7 @@ static BOOL hotplug_delete_foreach(ULONG_PTR key, void* element, void* data) for (size_t i = 0; i < arg->dev_array_size; i++) { hotplug_dev* cur = &arg->dev_array[i]; - if (cur->path && strstr(path, cur->path) != NULL) + if (cur->path && strstr(path, cur->path) != nullptr) { dev_found = TRUE; cur->to_add = FALSE; @@ -1124,7 +1125,7 @@ static UINT drive_hotplug_thread_terminate(rdpdrPlugin* rdpdr) } (void)CloseHandle(rdpdr->hotplugThread); - rdpdr->hotplugThread = NULL; + rdpdr->hotplugThread = nullptr; } return CHANNEL_RC_OK; @@ -1176,7 +1177,7 @@ static UINT rdpdr_add_devices(rdpdrPlugin* rdpdr) if (!rdpdr->hotplugThread) { rdpdr->hotplugThread = - CreateThread(NULL, 0, drive_hotplug_thread_func, rdpdr, 0, NULL); + CreateThread(nullptr, 0, drive_hotplug_thread_func, rdpdr, 0, nullptr); if (!rdpdr->hotplugThread) { WLog_Print(rdpdr->log, WLOG_ERROR, "CreateThread failed!"); @@ -1296,8 +1297,8 @@ static UINT rdpdr_send_client_announce_reply(rdpdrPlugin* rdpdr) */ static UINT rdpdr_send_client_name_request(rdpdrPlugin* rdpdr) { - wStream* s = NULL; - WCHAR* computerNameW = NULL; + wStream* s = nullptr; + WCHAR* computerNameW = nullptr; size_t computerNameLenW = 0; WINPR_ASSERT(rdpdr); @@ -1380,7 +1381,7 @@ struct device_announce_arg static BOOL device_announce(ULONG_PTR key, void* element, void* data) { struct device_announce_arg* arg = data; - rdpdrPlugin* rdpdr = NULL; + rdpdrPlugin* rdpdr = nullptr; DEVICE* device = (DEVICE*)element; WINPR_UNUSED(key); @@ -1402,7 +1403,7 @@ static BOOL device_announce(ULONG_PTR key, void* element, void* data) if ((rdpdr->clientVersionMinor == RDPDR_VERSION_MINOR_RDP51) || (device->type == RDPDR_DTYP_SMARTCARD) || arg->userLoggedOn) { - size_t data_len = (device->data == NULL ? 0 : Stream_GetPosition(device->data)); + size_t data_len = (device->data == nullptr ? 0 : Stream_GetPosition(device->data)); if (!Stream_EnsureRemainingCapacity(arg->s, 20 + data_len)) { @@ -1444,7 +1445,7 @@ static BOOL device_announce(ULONG_PTR key, void* element, void* data) static UINT rdpdr_send_device_list_announce_request(rdpdrPlugin* rdpdr, BOOL userLoggedOn) { size_t pos = 0; - wStream* s = NULL; + wStream* s = nullptr; size_t count_pos = 0; struct device_announce_arg arg = WINPR_C_ARRAY_INIT; @@ -1573,7 +1574,7 @@ static UINT rdpdr_process_component(rdpdrPlugin* rdpdr, UINT16 component, UINT16 wStream* s) { UINT32 type = 0; - DEVICE* device = NULL; + DEVICE* device = nullptr; WINPR_ASSERT(rdpdr); WINPR_ASSERT(s); @@ -1877,7 +1878,7 @@ static UINT rdpdr_process_receive(rdpdrPlugin* rdpdr, wStream* s) return error; } else - s = NULL; + s = nullptr; break; @@ -1964,7 +1965,7 @@ static UINT rdpdr_virtual_channel_event_data_received(rdpdrPlugin* rdpdr, void* UINT32 dataLength, UINT32 totalLength, UINT32 dataFlags) { - wStream* data_in = NULL; + wStream* data_in = nullptr; WINPR_ASSERT(rdpdr); WINPR_ASSERT(pData || (dataLength == 0)); @@ -1982,7 +1983,7 @@ static UINT rdpdr_virtual_channel_event_data_received(rdpdrPlugin* rdpdr, void* if (dataFlags & CHANNEL_FLAG_FIRST) { - if (rdpdr->data_in != NULL) + if (rdpdr->data_in != nullptr) Stream_Release(rdpdr->data_in); rdpdr->data_in = StreamPool_Take(rdpdr->pool, totalLength); @@ -2020,18 +2021,18 @@ static UINT rdpdr_virtual_channel_event_data_received(rdpdrPlugin* rdpdr, void* if (rdpdr->async) { - if (!MessageQueue_Post(rdpdr->queue, NULL, 0, (void*)data_in, NULL)) + if (!MessageQueue_Post(rdpdr->queue, nullptr, 0, (void*)data_in, nullptr)) { WLog_Print(rdpdr->log, WLOG_ERROR, "MessageQueue_Post failed!"); return ERROR_INTERNAL_ERROR; } - rdpdr->data_in = NULL; + rdpdr->data_in = nullptr; } else { UINT error = rdpdr_process_receive(rdpdr, data_in); Stream_Release(data_in); - rdpdr->data_in = NULL; + rdpdr->data_in = nullptr; if (error) return error; } @@ -2155,7 +2156,7 @@ fail: static void queue_free(void* obj) { - wStream* s = NULL; + wStream* s = nullptr; wMessage* msg = (wMessage*)obj; if (!msg || (msg->id != 0)) @@ -2174,7 +2175,7 @@ static void queue_free(void* obj) static UINT rdpdr_virtual_channel_event_connected(rdpdrPlugin* rdpdr, LPVOID pData, UINT32 dataLength) { - wObject* obj = NULL; + wObject* obj = nullptr; WINPR_ASSERT(rdpdr); WINPR_UNUSED(pData); @@ -2182,7 +2183,7 @@ static UINT rdpdr_virtual_channel_event_connected(rdpdrPlugin* rdpdr, LPVOID pDa if (rdpdr->async) { - rdpdr->queue = MessageQueue_New(NULL); + rdpdr->queue = MessageQueue_New(nullptr); if (!rdpdr->queue) { @@ -2193,8 +2194,8 @@ static UINT rdpdr_virtual_channel_event_connected(rdpdrPlugin* rdpdr, LPVOID pDa obj = MessageQueue_Object(rdpdr->queue); obj->fnObjectFree = queue_free; - if (!(rdpdr->thread = CreateThread(NULL, 0, rdpdr_virtual_channel_client_thread, - (void*)rdpdr, 0, NULL))) + if (!(rdpdr->thread = CreateThread(nullptr, 0, rdpdr_virtual_channel_client_thread, + (void*)rdpdr, 0, nullptr))) { WLog_Print(rdpdr->log, WLOG_ERROR, "CreateThread failed!"); return ERROR_INTERNAL_ERROR; @@ -2245,8 +2246,8 @@ static UINT rdpdr_virtual_channel_event_disconnected(rdpdrPlugin* rdpdr) if (rdpdr->thread) (void)CloseHandle(rdpdr->thread); MessageQueue_Free(rdpdr->queue); - rdpdr->queue = NULL; - rdpdr->thread = NULL; + rdpdr->queue = nullptr; + rdpdr->thread = nullptr; WINPR_ASSERT(rdpdr->channelEntryPoints.pVirtualChannelCloseEx); error = rdpdr->channelEntryPoints.pVirtualChannelCloseEx(rdpdr->InitHandle, rdpdr->OpenHandle); @@ -2262,13 +2263,13 @@ static UINT rdpdr_virtual_channel_event_disconnected(rdpdrPlugin* rdpdr) if (rdpdr->data_in) { Stream_Release(rdpdr->data_in); - rdpdr->data_in = NULL; + rdpdr->data_in = nullptr; } if (rdpdr->devman) { devman_free(rdpdr->devman); - rdpdr->devman = NULL; + rdpdr->devman = nullptr; } return error; @@ -2281,10 +2282,10 @@ static void rdpdr_virtual_channel_event_terminated(rdpdrPlugin* rdpdr) if (rdpdr->stopEvent) { (void)CloseHandle(rdpdr->stopEvent); - rdpdr->stopEvent = NULL; + rdpdr->stopEvent = nullptr; } #endif - rdpdr->InitHandle = 0; + rdpdr->InitHandle = nullptr; StreamPool_Free(rdpdr->pool); free(rdpdr); } @@ -2333,7 +2334,7 @@ static UINT rdpdr_virtual_channel_event_initialized(rdpdrPlugin* rdpdr, WINPR_ASSERT(rdpdr); #if !defined(_WIN32) WINPR_ASSERT(!rdpdr->stopEvent); - rdpdr->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + rdpdr->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr); WINPR_ASSERT(rdpdr->stopEvent); #endif @@ -2383,7 +2384,7 @@ static VOID VCAPITYPE rdpdr_virtual_channel_init_event_ex(LPVOID lpUserParam, LP case CHANNEL_EVENT_TERMINATED: rdpdr_virtual_channel_event_terminated(rdpdr); - rdpdr = NULL; + rdpdr = nullptr; break; case CHANNEL_EVENT_ATTACHED: diff --git a/channels/rdpdr/server/rdpdr_main.c b/channels/rdpdr/server/rdpdr_main.c index 3acc2454e..a5e0d3786 100644 --- a/channels/rdpdr/server/rdpdr_main.c +++ b/channels/rdpdr/server/rdpdr_main.c @@ -144,7 +144,7 @@ static void* rdpdr_device_clone(const void* val) const RdpdrDevice* other = val; if (!other) - return NULL; + return nullptr; RdpdrDevice* tmp = rdpdr_device_new(); if (!tmp) @@ -162,18 +162,18 @@ static void* rdpdr_device_clone(const void* val) fail: rdpdr_device_free(tmp); - return NULL; + return nullptr; } static void* rdpdr_device_key_clone(const void* pvval) { const UINT32* val = pvval; if (!val) - return NULL; + return nullptr; UINT32* ptr = calloc(1, sizeof(UINT32)); if (!ptr) - return NULL; + return nullptr; *ptr = *val; return ptr; } @@ -225,11 +225,11 @@ static const WCHAR* rdpdr_read_ustring(wLog* log, wStream* s, size_t bytelen) const size_t charlen = (bytelen + 1) / sizeof(WCHAR); const WCHAR* str = Stream_ConstPointer(s); if (!Stream_CheckAndLogRequiredLengthWLog(log, s, bytelen)) - return NULL; + return nullptr; if (_wcsnlen(str, charlen) == charlen) { WLog_Print(log, WLOG_WARN, "[rdpdr] unicode string not '\\0' terminated"); - return NULL; + return nullptr; } Stream_Seek(s, bytelen); return str; @@ -256,7 +256,7 @@ static BOOL rdpdr_server_enqueue_irp(RdpdrServerContext* context, RDPDR_IRP* irp static RDPDR_IRP* rdpdr_server_dequeue_irp(RdpdrServerContext* context, UINT32 completionId) { - RDPDR_IRP* irp = NULL; + RDPDR_IRP* irp = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -305,7 +305,7 @@ static UINT rdpdr_seal_send_free_request(RdpdrServerContext* context, wStream* s static UINT rdpdr_server_send_announce_request(RdpdrServerContext* context) { UINT error = 0; - wStream* s = NULL; + wStream* s = nullptr; RDPDR_HEADER header = WINPR_C_ARRAY_INIT; WINPR_ASSERT(context); @@ -318,7 +318,7 @@ static UINT rdpdr_server_send_announce_request(RdpdrServerContext* context) if (error != CHANNEL_RC_OK) return error; - s = Stream_New(NULL, RDPDR_HEADER_LENGTH + 8); + s = Stream_New(nullptr, RDPDR_HEADER_LENGTH + 8); if (!s) { @@ -403,7 +403,7 @@ static UINT rdpdr_server_receive_client_name_request(RdpdrServerContext* context /** * Caution: ComputerNameLen is given *bytes*, - * not in characters, including the NULL terminator! + * not in characters, including the nullptr terminator! */ if (UnicodeFlag) @@ -439,13 +439,13 @@ static UINT rdpdr_server_receive_client_name_request(RdpdrServerContext* context if (context->priv->ClientComputerName) { free(context->priv->ClientComputerName); - context->priv->ClientComputerName = NULL; + context->priv->ClientComputerName = nullptr; } if (UnicodeFlag) { context->priv->ClientComputerName = - Stream_Read_UTF16_String_As_UTF8(s, ComputerNameLen / sizeof(WCHAR), NULL); + Stream_Read_UTF16_String_As_UTF8(s, ComputerNameLen / sizeof(WCHAR), nullptr); if (!context->priv->ClientComputerName) { WLog_Print(context->priv->log, WLOG_ERROR, "failed to convert client computer name"); @@ -480,7 +480,7 @@ static UINT rdpdr_server_write_capability_set_header_cb(RdpdrServerContext* cont if (error != CHANNEL_RC_OK) return error; - return IFCALLRESULT(CHANNEL_RC_OK, context->SendCaps, context, header, 0, NULL); + return IFCALLRESULT(CHANNEL_RC_OK, context->SendCaps, context, header, 0, nullptr); } /** @@ -808,7 +808,7 @@ static UINT rdpdr_server_write_smartcard_capability_set(RdpdrServerContext* cont */ static UINT rdpdr_server_send_core_capability_request(RdpdrServerContext* context) { - wStream* s = NULL; + wStream* s = nullptr; RDPDR_HEADER header = WINPR_C_ARRAY_INIT; UINT16 numCapabilities = 0; UINT error = 0; @@ -832,7 +832,7 @@ static UINT rdpdr_server_send_core_capability_request(RdpdrServerContext* contex if ((context->supported & RDPDR_DTYP_SMARTCARD) != 0) numCapabilities++; - s = Stream_New(NULL, RDPDR_HEADER_LENGTH + 512); + s = Stream_New(nullptr, RDPDR_HEADER_LENGTH + 512); if (!s) { @@ -1045,7 +1045,7 @@ static UINT rdpdr_server_receive_core_capability_response(RdpdrServerContext* co */ static UINT rdpdr_server_send_client_id_confirm(RdpdrServerContext* context) { - wStream* s = NULL; + wStream* s = nullptr; RDPDR_HEADER header = WINPR_C_ARRAY_INIT; WINPR_ASSERT(context); @@ -1053,7 +1053,7 @@ static UINT rdpdr_server_send_client_id_confirm(RdpdrServerContext* context) header.Component = RDPDR_CTYP_CORE; header.PacketId = PAKID_CORE_CLIENTID_CONFIRM; - s = Stream_New(NULL, RDPDR_HEADER_LENGTH + 8); + s = Stream_New(nullptr, RDPDR_HEADER_LENGTH + 8); if (!s) { @@ -1210,7 +1210,7 @@ static UINT rdpdr_server_receive_device_list_remove_request(RdpdrServerContext* for (UINT32 i = 0; i < DeviceCount; i++) { UINT error = 0; - const RdpdrDevice* device = NULL; + const RdpdrDevice* device = nullptr; if (!Stream_CheckAndLogRequiredLengthWLog(context->priv->log, s, 4)) return ERROR_INVALID_DATA; @@ -1278,7 +1278,7 @@ static UINT rdpdr_server_receive_io_create_request(RdpdrServerContext* context, WINPR_ATTR_UNUSED UINT32 FileId, WINPR_ATTR_UNUSED UINT32 CompletionId) { - const WCHAR* path = NULL; + const WCHAR* path = nullptr; UINT32 DesiredAccess = 0; UINT32 AllocationSize = 0; UINT32 FileAttributes = 0; @@ -1585,7 +1585,7 @@ static UINT rdpdr_server_receive_io_query_directory_request(RdpdrServerContext* if (!wPath && (PathLength > 0)) return ERROR_INVALID_DATA; - char* Path = ConvertWCharNToUtf8Alloc(wPath, PathLength / sizeof(WCHAR), NULL); + char* Path = ConvertWCharNToUtf8Alloc(wPath, PathLength / sizeof(WCHAR), nullptr); WLog_Print(context->priv->log, WLOG_DEBUG, "Got FSInformationClass %s [0x%08" PRIx32 "], InitialQuery [%" PRIu8 "] Path[%" PRIu32 "] %s", @@ -1786,7 +1786,7 @@ static UINT rdpdr_server_receive_device_io_completion(RdpdrServerContext* contex UINT32 deviceId = 0; UINT32 completionId = 0; UINT32 ioStatus = 0; - RDPDR_IRP* irp = NULL; + RDPDR_IRP* irp = nullptr; UINT error = CHANNEL_RC_OK; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1829,7 +1829,7 @@ static UINT rdpdr_server_receive_device_io_completion(RdpdrServerContext* contex */ static UINT rdpdr_server_send_user_logged_on(RdpdrServerContext* context) { - wStream* s = NULL; + wStream* s = nullptr; RDPDR_HEADER header = WINPR_C_ARRAY_INIT; WINPR_ASSERT(context); @@ -1837,7 +1837,7 @@ static UINT rdpdr_server_send_user_logged_on(RdpdrServerContext* context) header.Component = RDPDR_CTYP_CORE; header.PacketId = PAKID_CORE_USER_LOGGEDON; - s = Stream_New(NULL, RDPDR_HEADER_LENGTH); + s = Stream_New(nullptr, RDPDR_HEADER_LENGTH); if (!s) { @@ -1857,9 +1857,9 @@ static UINT rdpdr_server_receive_prn_cache_add_printer(RdpdrServerContext* conte UINT32 DriverNameLen = 0; UINT32 PrinterNameLen = 0; UINT32 CachedFieldsLen = 0; - const WCHAR* PnPName = NULL; - const WCHAR* DriverName = NULL; - const WCHAR* PrinterName = NULL; + const WCHAR* PnPName = nullptr; + const WCHAR* DriverName = nullptr; + const WCHAR* PrinterName = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1897,7 +1897,7 @@ static UINT rdpdr_server_receive_prn_cache_update_printer(RdpdrServerContext* co { UINT32 PrinterNameLen = 0; UINT32 CachedFieldsLen = 0; - const WCHAR* PrinterName = NULL; + const WCHAR* PrinterName = nullptr; WINPR_ASSERT(context); @@ -1926,7 +1926,7 @@ static UINT rdpdr_server_receive_prn_cache_update_printer(RdpdrServerContext* co static UINT rdpdr_server_receive_prn_cache_delete_printer(RdpdrServerContext* context, wStream* s) { UINT32 PrinterNameLen = 0; - const WCHAR* PrinterName = NULL; + const WCHAR* PrinterName = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -1951,8 +1951,8 @@ static UINT rdpdr_server_receive_prn_cache_rename_cachedata(RdpdrServerContext* { UINT32 OldPrinterNameLen = 0; UINT32 NewPrinterNameLen = 0; - const WCHAR* OldPrinterName = NULL; - const WCHAR* NewPrinterName = NULL; + const WCHAR* OldPrinterName = nullptr; + const WCHAR* NewPrinterName = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -2160,13 +2160,13 @@ static DWORD WINAPI rdpdr_server_thread(LPVOID arg) { DWORD status = 0; DWORD nCount = 0; - void* buffer = NULL; + void* buffer = nullptr; HANDLE events[8] = WINPR_C_ARRAY_INIT; - HANDLE ChannelEvent = NULL; + HANDLE ChannelEvent = nullptr; DWORD BytesReturned = 0; UINT error = 0; RdpdrServerContext* context = (RdpdrServerContext*)arg; - wStream* s = Stream_New(NULL, 4096); + wStream* s = Stream_New(nullptr, 4096); WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -2225,7 +2225,7 @@ static DWORD WINAPI rdpdr_server_thread(LPVOID arg) if (status == WAIT_OBJECT_0) break; - if (!WTSVirtualChannelRead(context->priv->ChannelHandle, 0, NULL, 0, &BytesReturned)) + if (!WTSVirtualChannelRead(context->priv->ChannelHandle, 0, nullptr, 0, &BytesReturned)) { WLog_Print(context->priv->log, WLOG_ERROR, "WTSVirtualChannelRead failed!"); error = ERROR_INTERNAL_ERROR; @@ -2298,18 +2298,18 @@ static UINT rdpdr_server_start(RdpdrServerContext* context) return CHANNEL_RC_BAD_CHANNEL; } - if (!(context->priv->StopEvent = CreateEvent(NULL, TRUE, FALSE, NULL))) + if (!(context->priv->StopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr))) { WLog_Print(context->priv->log, WLOG_ERROR, "CreateEvent failed!"); return ERROR_INTERNAL_ERROR; } if (!(context->priv->Thread = - CreateThread(NULL, 0, rdpdr_server_thread, (void*)context, 0, NULL))) + CreateThread(nullptr, 0, rdpdr_server_thread, (void*)context, 0, nullptr))) { WLog_Print(context->priv->log, WLOG_ERROR, "CreateThread failed!"); (void)CloseHandle(context->priv->StopEvent); - context->priv->StopEvent = NULL; + context->priv->StopEvent = nullptr; return ERROR_INTERNAL_ERROR; } @@ -2340,15 +2340,15 @@ static UINT rdpdr_server_stop(RdpdrServerContext* context) } (void)CloseHandle(context->priv->Thread); - context->priv->Thread = NULL; + context->priv->Thread = nullptr; (void)CloseHandle(context->priv->StopEvent); - context->priv->StopEvent = NULL; + context->priv->StopEvent = nullptr; } if (context->priv->ChannelHandle) { (void)WTSVirtualChannelClose(context->priv->ChannelHandle); - context->priv->ChannelHandle = NULL; + context->priv->ChannelHandle = nullptr; } return CHANNEL_RC_OK; } @@ -2420,7 +2420,7 @@ static UINT rdpdr_server_send_device_create_request(RdpdrServerContext* context, UINT32 createDisposition) { size_t pathLength = 0; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -2431,7 +2431,7 @@ static UINT rdpdr_server_send_device_create_request(RdpdrServerContext* context, deviceId, path, desiredAccess, createOptions, createDisposition); /* Compute the required Unicode size. */ pathLength = (strlen(path) + 1U) * sizeof(WCHAR); - s = Stream_New(NULL, 256U + pathLength); + s = Stream_New(nullptr, 256U + pathLength); if (!s) { @@ -2467,14 +2467,14 @@ static UINT rdpdr_server_send_device_create_request(RdpdrServerContext* context, static UINT rdpdr_server_send_device_close_request(RdpdrServerContext* context, UINT32 deviceId, UINT32 fileId, UINT32 completionId) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); WLog_Print(context->priv->log, WLOG_DEBUG, "RdpdrServerSendDeviceCloseRequest: deviceId=%" PRIu32 ", fileId=%" PRIu32 "", deviceId, fileId); - s = Stream_New(NULL, 128); + s = Stream_New(nullptr, 128); if (!s) { @@ -2496,7 +2496,7 @@ static UINT rdpdr_server_send_device_read_request(RdpdrServerContext* context, U UINT32 fileId, UINT32 completionId, UINT32 length, UINT32 offset) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -2504,7 +2504,7 @@ static UINT rdpdr_server_send_device_read_request(RdpdrServerContext* context, U "RdpdrServerSendDeviceReadRequest: deviceId=%" PRIu32 ", fileId=%" PRIu32 ", length=%" PRIu32 ", offset=%" PRIu32 "", deviceId, fileId, length, offset); - s = Stream_New(NULL, 128); + s = Stream_New(nullptr, 128); if (!s) { @@ -2529,7 +2529,7 @@ static UINT rdpdr_server_send_device_write_request(RdpdrServerContext* context, UINT32 fileId, UINT32 completionId, const char* data, UINT32 length, UINT32 offset) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -2537,7 +2537,7 @@ static UINT rdpdr_server_send_device_write_request(RdpdrServerContext* context, "RdpdrServerSendDeviceWriteRequest: deviceId=%" PRIu32 ", fileId=%" PRIu32 ", length=%" PRIu32 ", offset=%" PRIu32 "", deviceId, fileId, length, offset); - s = Stream_New(NULL, 64 + length); + s = Stream_New(nullptr, 64 + length); if (!s) { @@ -2564,7 +2564,7 @@ static UINT rdpdr_server_send_device_query_directory_request(RdpdrServerContext* UINT32 completionId, const char* path) { size_t pathLength = 0; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -2574,7 +2574,7 @@ static UINT rdpdr_server_send_device_query_directory_request(RdpdrServerContext* deviceId, fileId, path); /* Compute the required Unicode size. */ pathLength = path ? (strlen(path) + 1) * sizeof(WCHAR) : 0; - s = Stream_New(NULL, 64 + pathLength); + s = Stream_New(nullptr, 64 + pathLength); if (!s) { @@ -2614,7 +2614,7 @@ static UINT rdpdr_server_send_device_file_rename_request(RdpdrServerContext* con UINT32 completionId, const char* path) { size_t pathLength = 0; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -2624,7 +2624,7 @@ static UINT rdpdr_server_send_device_file_rename_request(RdpdrServerContext* con deviceId, fileId, path); /* Compute the required Unicode size. */ pathLength = path ? (strlen(path) + 1) * sizeof(WCHAR) : 0; - s = Stream_New(NULL, 64 + pathLength); + s = Stream_New(nullptr, 64 + pathLength); if (!s) { @@ -2758,7 +2758,7 @@ static UINT rdpdr_server_drive_create_directory_callback1(RdpdrServerContext* co static UINT rdpdr_server_drive_create_directory(RdpdrServerContext* context, void* callbackData, UINT32 deviceId, const char* path) { - RDPDR_IRP* irp = NULL; + RDPDR_IRP* irp = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); WINPR_ASSERT(callbackData); @@ -2963,7 +2963,7 @@ static UINT rdpdr_server_drive_query_directory_callback2(RdpdrServerContext* con { /* Invoke the query directory completion routine. */ context->OnDriveQueryDirectoryComplete(context, irp->CallbackData, ioStatus, - length > 0 ? &fdi : NULL); + length > 0 ? &fdi : nullptr); /* Setup the IRP. */ irp->CompletionId = context->priv->NextCompletionId++; irp->Callback = rdpdr_server_drive_query_directory_callback2; @@ -2977,12 +2977,12 @@ static UINT rdpdr_server_drive_query_directory_callback2(RdpdrServerContext* con /* Send a request to query the directory. */ return rdpdr_server_send_device_query_directory_request(context, irp->DeviceId, irp->FileId, - irp->CompletionId, NULL); + irp->CompletionId, nullptr); } else { /* Invoke the query directory completion routine. */ - context->OnDriveQueryDirectoryComplete(context, irp->CallbackData, ioStatus, NULL); + context->OnDriveQueryDirectoryComplete(context, irp->CallbackData, ioStatus, nullptr); /* Destroy the IRP. */ rdpdr_server_irp_free(irp); } @@ -3010,7 +3010,7 @@ static UINT rdpdr_server_drive_query_directory_callback1(RdpdrServerContext* con if (ioStatus != STATUS_SUCCESS) { /* Invoke the query directory completion routine. */ - context->OnDriveQueryDirectoryComplete(context, irp->CallbackData, ioStatus, NULL); + context->OnDriveQueryDirectoryComplete(context, irp->CallbackData, ioStatus, nullptr); /* Destroy the IRP. */ rdpdr_server_irp_free(irp); return CHANNEL_RC_OK; @@ -3025,7 +3025,7 @@ static UINT rdpdr_server_drive_query_directory_callback1(RdpdrServerContext* con irp->Callback = rdpdr_server_drive_query_directory_callback2; irp->DeviceId = deviceId; irp->FileId = fileId; - winpr_str_append("\\*.*", irp->PathName, ARRAYSIZE(irp->PathName), NULL); + winpr_str_append("\\*.*", irp->PathName, ARRAYSIZE(irp->PathName), nullptr); if (!rdpdr_server_enqueue_irp(context, irp)) { @@ -3168,7 +3168,7 @@ static UINT rdpdr_server_drive_read_file_callback(RdpdrServerContext* context, w UINT32 completionId, UINT32 ioStatus) { UINT32 length = 0; - char* buffer = NULL; + char* buffer = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); WINPR_ASSERT(irp); @@ -3722,7 +3722,7 @@ static RdpdrServerPrivate* rdpdr_server_private_new(void) return priv; fail: rdpdr_server_private_free(priv); - return NULL; + return nullptr; } RdpdrServerContext* rdpdr_server_context_new(HANDLE vcm) @@ -3757,7 +3757,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC rdpdr_server_context_free(context); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void rdpdr_server_context_free(RdpdrServerContext* context) diff --git a/channels/rdpear/client/rdpear_main.c b/channels/rdpear/client/rdpear_main.c index 179a3295c..2259512b5 100644 --- a/channels/rdpear/client/rdpear_main.c +++ b/channels/rdpear/client/rdpear_main.c @@ -90,7 +90,7 @@ static krb5_error_code kerb_do_checksum(krb5_context ctx, const KERB_RPC_ENCRYPT WINPR_ASSERT(plain); WINPR_ASSERT(out); - krb5_keyblock* keyblock = NULL; + krb5_keyblock* keyblock = nullptr; krb5_data data = WINPR_C_ARRAY_INIT; krb5_error_code rv = RPC_ENCRYPTION_KEY_to_keyblock(ctx, key, &keyblock); @@ -115,7 +115,7 @@ static krb5_error_code kerb_do_encrypt(krb5_context ctx, const KERB_RPC_ENCRYPTI WINPR_ASSERT(plain); WINPR_ASSERT(out); - krb5_keyblock* keyblock = NULL; + krb5_keyblock* keyblock = nullptr; krb5_data data = WINPR_C_ARRAY_INIT; krb5_enc_data enc = WINPR_C_ARRAY_INIT; size_t elen = 0; @@ -143,7 +143,7 @@ static krb5_error_code kerb_do_encrypt(krb5_context ctx, const KERB_RPC_ENCRYPTI goto out; } - rv = krb5_c_encrypt(ctx, keyblock, kusage, NULL, &data, &enc); + rv = krb5_c_encrypt(ctx, keyblock, kusage, nullptr, &data, &enc); out->data = enc.ciphertext.data; out->length = enc.ciphertext.length; @@ -162,7 +162,7 @@ static krb5_error_code kerb_do_decrypt(krb5_context ctx, const KERB_RPC_ENCRYPTI WINPR_ASSERT(cipher->length); WINPR_ASSERT(plain); - krb5_keyblock* keyblock = NULL; + krb5_keyblock* keyblock = nullptr; krb5_data data = WINPR_C_ARRAY_INIT; krb5_enc_data enc = WINPR_C_ARRAY_INIT; @@ -183,7 +183,7 @@ static krb5_error_code kerb_do_decrypt(krb5_context ctx, const KERB_RPC_ENCRYPTI goto out; } - rv = krb5_c_decrypt(ctx, keyblock, kusage, NULL, &enc, &data); + rv = krb5_c_decrypt(ctx, keyblock, kusage, nullptr, &enc, &data); plain->Asn1Buffer = (BYTE*)data.data; plain->Asn1BufferHints.count = data.length; @@ -197,7 +197,7 @@ static BOOL rdpear_send_payload(RDPEAR_PLUGIN* rdpear, IWTSVirtualChannelCallbac { GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; BOOL ret = FALSE; - wStream* finalStream = NULL; + wStream* finalStream = nullptr; SecBuffer cryptedBuffer = WINPR_C_ARRAY_INIT; wStream* unencodedContent = rdpear_encodePayload(isKerb, payload); if (!unencodedContent) @@ -215,7 +215,7 @@ static BOOL rdpear_send_payload(RDPEAR_PLUGIN* rdpear, IWTSVirtualChannelCallbac if (!freerdp_nla_encrypt(rdpear->rdp_context, &inBuffer, &cryptedBuffer)) goto out; - finalStream = Stream_New(NULL, 200); + finalStream = Stream_New(nullptr, 200); if (!finalStream) goto out; Stream_Write_UINT32(finalStream, 0x4EACC3C8); /* ProtocolMagic (4 bytes) */ @@ -236,8 +236,8 @@ static BOOL rdpear_send_payload(RDPEAR_PLUGIN* rdpear, IWTSVirtualChannelCallbac goto out; #endif - UINT status = - callback->channel->Write(callback->channel, (ULONG)pos, Stream_Buffer(finalStream), NULL); + UINT status = callback->channel->Write(callback->channel, (ULONG)pos, + Stream_Buffer(finalStream), nullptr); ret = (status == CHANNEL_RC_OK); if (!ret) WLog_DBG(TAG, "rdpear_send_payload=0x%x", status); @@ -255,7 +255,7 @@ static BOOL rdpear_prepare_response(NdrContext* rcontext, BOOL isKerb, UINT16 ca WINPR_ASSERT(pwcontext); BOOL ret = FALSE; - *pwcontext = NULL; + *pwcontext = nullptr; NdrContext* wcontext = ndr_context_copy(rcontext); if (!wcontext) return FALSE; @@ -309,12 +309,12 @@ static BOOL rdpear_kerb_ComputeTgsChecksum(RDPEAR_PLUGIN* rdpear, NdrContext* rc { ComputeTgsChecksumReq req = WINPR_C_ARRAY_INIT; krb5_checksum checksum = WINPR_C_ARRAY_INIT; - wStream* asn1Payload = NULL; + wStream* asn1Payload = nullptr; *pstatus = ERROR_INVALID_DATA; WLog_DBG(TAG, "-> ComputeTgsChecksum"); - if (!ndr_read_ComputeTgsChecksumReq(rcontext, s, NULL, &req) || + if (!ndr_read_ComputeTgsChecksumReq(rcontext, s, nullptr, &req) || !ndr_treat_deferred_read(rcontext, s)) goto out; // ComputeTgsChecksumReq_dump(WLog_Get(""), WLOG_DEBUG, &req); @@ -338,7 +338,7 @@ static BOOL rdpear_kerb_ComputeTgsChecksum(RDPEAR_PLUGIN* rdpear, NdrContext* rc *pstatus = 0; out: - ndr_destroy_ComputeTgsChecksumReq(rcontext, NULL, &req); + ndr_destroy_ComputeTgsChecksumReq(rcontext, nullptr, &req); krb5_free_checksum_contents(rdpear->krbContext, &checksum); Stream_Free(asn1Payload, FALSE); return TRUE; @@ -349,13 +349,13 @@ static BOOL rdpear_kerb_BuildEncryptedAuthData(RDPEAR_PLUGIN* rdpear, NdrContext { BuildEncryptedAuthDataReq req = WINPR_C_ARRAY_INIT; krb5_data encrypted = WINPR_C_ARRAY_INIT; - wStream* asn1Payload = NULL; + wStream* asn1Payload = nullptr; krb5_error_code rv = 0; *pstatus = ERROR_INVALID_DATA; WLog_DBG(TAG, "-> BuildEncryptedAuthData"); - if (!ndr_read_BuildEncryptedAuthDataReq(rcontext, s, NULL, &req) || + if (!ndr_read_BuildEncryptedAuthDataReq(rcontext, s, nullptr, &req) || !ndr_treat_deferred_read(rcontext, s)) goto out; @@ -381,7 +381,7 @@ static BOOL rdpear_kerb_BuildEncryptedAuthData(RDPEAR_PLUGIN* rdpear, NdrContext out: krb5_free_data_contents(rdpear->krbContext, &encrypted); - ndr_destroy_BuildEncryptedAuthDataReq(rcontext, NULL, &req); + ndr_destroy_BuildEncryptedAuthDataReq(rcontext, nullptr, &req); Stream_Free(asn1Payload, FALSE); return TRUE; } @@ -389,7 +389,7 @@ out: static char* KERB_RPC_UNICODESTR_to_charptr(const RPC_UNICODE_STRING* src) { WINPR_ASSERT(src); - return ConvertWCharNToUtf8Alloc(src->Buffer, src->strLength, NULL); + return ConvertWCharNToUtf8Alloc(src->Buffer, src->strLength, nullptr); } static BOOL extractAuthData(const KERB_ASN1_DATA* src, krb5_authdata* authData, BOOL* haveData) @@ -471,22 +471,22 @@ static BOOL rdpear_kerb_CreateApReqAuthenticator(RDPEAR_PLUGIN* rdpear, NdrConte CreateApReqAuthenticatorResp* resp) { krb5_error_code rv = 0; - wStream* asn1EncodedAuth = NULL; + wStream* asn1EncodedAuth = nullptr; CreateApReqAuthenticatorReq req = WINPR_C_ARRAY_INIT; krb5_data authenticator = WINPR_C_ARRAY_INIT; - krb5_data* der = NULL; - krb5_keyblock* subkey = NULL; + krb5_data* der = nullptr; + krb5_keyblock* subkey = nullptr; krb5_principal_data client = WINPR_C_ARRAY_INIT; *pstatus = ERROR_INVALID_DATA; WLog_DBG(TAG, "-> CreateApReqAuthenticator"); - if (!ndr_read_CreateApReqAuthenticatorReq(rcontext, s, NULL, &req) || + if (!ndr_read_CreateApReqAuthenticatorReq(rcontext, s, nullptr, &req) || !ndr_treat_deferred_read(rcontext, s)) goto out; krb5_authdata authdata = WINPR_C_ARRAY_INIT; - krb5_authdata* authDataPtr[2] = { &authdata, NULL }; + krb5_authdata* authDataPtr[2] = { &authdata, nullptr }; BOOL haveData = 0; if (!extractAuthData(req.AuthData, &authdata, &haveData)) @@ -512,10 +512,10 @@ static BOOL rdpear_kerb_CreateApReqAuthenticator(RDPEAR_PLUGIN* rdpear, NdrConte } } - krb5_authenticator authent = { .checksum = NULL, - .subkey = NULL, + krb5_authenticator authent = { .checksum = nullptr, + .subkey = nullptr, .seq_number = req.SequenceNumber, - .authorization_data = haveData ? authDataPtr : NULL }; + .authorization_data = haveData ? authDataPtr : nullptr }; client.type = req.ClientName->NameType; if (req.ClientName->nameHints.count > INT32_MAX) @@ -558,7 +558,7 @@ static BOOL rdpear_kerb_CreateApReqAuthenticator(RDPEAR_PLUGIN* rdpear, NdrConte authent.client = &client; krb5_checksum checksum; - krb5_checksum* pchecksum = NULL; + krb5_checksum* pchecksum = nullptr; if (req.GssChecksum) { if (!extractChecksum(req.GssChecksum, &checksum)) @@ -619,7 +619,7 @@ out: krb5_free_data_contents(rdpear->krbContext, &authenticator); if (subkey) krb5_free_keyblock(rdpear->krbContext, subkey); - ndr_destroy_CreateApReqAuthenticatorReq(rcontext, NULL, &req); + ndr_destroy_CreateApReqAuthenticatorReq(rcontext, nullptr, &req); Stream_Free(asn1EncodedAuth, FALSE); return TRUE; } @@ -653,7 +653,7 @@ static BOOL rdpear_kerb_UnpackKdcReplyBody(RDPEAR_PLUGIN* rdpear, NdrContext* rc *pstatus = ERROR_INVALID_DATA; - if (!ndr_read_UnpackKdcReplyBodyReq(rcontext, s, NULL, &req) || + if (!ndr_read_UnpackKdcReplyBodyReq(rcontext, s, nullptr, &req) || !ndr_treat_deferred_read(rcontext, s)) goto out; @@ -680,7 +680,7 @@ static BOOL rdpear_kerb_UnpackKdcReplyBody(RDPEAR_PLUGIN* rdpear, NdrContext* rc *pstatus = 0; out: - ndr_destroy_UnpackKdcReplyBodyReq(rcontext, NULL, &req); + ndr_destroy_UnpackKdcReplyBodyReq(rcontext, nullptr, &req); return TRUE; } @@ -690,7 +690,7 @@ static BOOL rdpear_kerb_DecryptApReply(RDPEAR_PLUGIN* rdpear, NdrContext* rconte DecryptApReplyReq req = WINPR_C_ARRAY_INIT; *pstatus = ERROR_INVALID_DATA; - if (!ndr_read_DecryptApReplyReq(rcontext, s, NULL, &req) || + if (!ndr_read_DecryptApReplyReq(rcontext, s, nullptr, &req) || !ndr_treat_deferred_read(rcontext, s)) goto out; @@ -716,7 +716,7 @@ static BOOL rdpear_kerb_DecryptApReply(RDPEAR_PLUGIN* rdpear, NdrContext* rconte // winpr_HexDump(TAG, WLOG_DEBUG, resp->Asn1Buffer, resp->Asn1BufferHints.count); *pstatus = 0; out: - ndr_destroy_DecryptApReplyReq(rcontext, NULL, &req); + ndr_destroy_DecryptApReplyReq(rcontext, nullptr, &req); return TRUE; } @@ -725,11 +725,12 @@ static BOOL rdpear_kerb_PackApReply(RDPEAR_PLUGIN* rdpear, NdrContext* rcontext, { PackApReplyReq req = WINPR_C_ARRAY_INIT; krb5_data asn1Data = WINPR_C_ARRAY_INIT; - krb5_data* out = NULL; + krb5_data* out = nullptr; WLog_DBG(TAG, "-> PackApReply"); *pstatus = ERROR_INVALID_DATA; - if (!ndr_read_PackApReplyReq(rcontext, s, NULL, &req) || !ndr_treat_deferred_read(rcontext, s)) + if (!ndr_read_PackApReplyReq(rcontext, s, nullptr, &req) || + !ndr_treat_deferred_read(rcontext, s)) goto out; krb5_error_code rv = kerb_do_encrypt(rdpear->krbContext, req.SessionKey, @@ -753,7 +754,7 @@ static BOOL rdpear_kerb_PackApReply(RDPEAR_PLUGIN* rdpear, NdrContext* rcontext, out: free(out); krb5_free_data_contents(rdpear->krbContext, &asn1Data); - ndr_destroy_PackApReplyReq(rcontext, NULL, &req); + ndr_destroy_PackApReplyReq(rcontext, nullptr, &req); return TRUE; } @@ -775,8 +776,8 @@ static UINT rdpear_decode_payload(RDPEAR_PLUGIN* rdpear, const WinPrAsn1_OctetString* packageName, wStream* s) { UINT ret = ERROR_INVALID_DATA; - NdrContext* context = NULL; - NdrContext* wcontext = NULL; + NdrContext* context = nullptr; + NdrContext* wcontext = nullptr; UINT32 status = 0; UINT32 uint32Resp = 0; @@ -784,10 +785,10 @@ static UINT rdpear_decode_payload(RDPEAR_PLUGIN* rdpear, CreateApReqAuthenticatorResp createApReqAuthenticatorResp = WINPR_C_ARRAY_INIT; UnpackKdcReplyBodyResp unpackKdcReplyBodyResp = WINPR_C_ARRAY_INIT; PackApReplyResp packApReplyResp = WINPR_C_ARRAY_INIT; - void* resp = NULL; - NdrMessageType respDescr = NULL; + void* resp = nullptr; + NdrMessageType respDescr = nullptr; - wStream* respStream = Stream_New(NULL, 500); + wStream* respStream = Stream_New(nullptr, 500); if (!respStream) goto out; @@ -905,11 +906,11 @@ static UINT rdpear_decode_payload(RDPEAR_PLUGIN* rdpear, { WINPR_ASSERT(respDescr->writeFn); - BOOL r = respDescr->writeFn(wcontext, respStream, NULL, resp) && + BOOL r = respDescr->writeFn(wcontext, respStream, nullptr, resp) && ndr_treat_deferred_write(wcontext, respStream); if (respDescr->destroyFn) - respDescr->destroyFn(wcontext, NULL, resp); + respDescr->destroyFn(wcontext, nullptr, resp); if (!r) { @@ -1045,7 +1046,7 @@ static UINT init_plugin_cb(GENERIC_DYNVC_PLUGIN* base, rdpContext* rcontext, rdp static const IWTSVirtualChannelCallback rdpear_callbacks = { rdpear_on_data_received, rdpear_on_open, rdpear_on_close, - NULL }; + nullptr }; /** * Function description diff --git a/channels/rdpear/common/ndr.c b/channels/rdpear/common/ndr.c index 278374794..6e4b10aa8 100644 --- a/channels/rdpear/common/ndr.c +++ b/channels/rdpear/common/ndr.c @@ -52,7 +52,7 @@ NdrContext* ndr_context_new(BOOL bigEndianDrep, BYTE version) { NdrContext* ret = calloc(1, sizeof(*ret)); if (!ret) - return NULL; + return nullptr; ret->version = version; ret->bigEndianDrep = bigEndianDrep; @@ -61,7 +61,7 @@ NdrContext* ndr_context_new(BOOL bigEndianDrep, BYTE version) if (!ret->refPointers) { free(ret); - return NULL; + return nullptr; } ndr_context_reset(ret); @@ -88,7 +88,7 @@ NdrContext* ndr_context_copy(const NdrContext* src) NdrContext* ret = calloc(1, sizeof(*ret)); if (!ret) - return NULL; + return nullptr; *ret = *src; @@ -96,7 +96,7 @@ NdrContext* ndr_context_copy(const NdrContext* src) if (!ret->refPointers) { free(ret); - return NULL; + return nullptr; } ndr_context_reset(ret); @@ -126,14 +126,14 @@ static void ndr_context_bytes_written(NdrContext* context, size_t len) NdrContext* ndr_read_header(wStream* s) { if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) - return NULL; + return nullptr; BYTE version = Stream_Get_UINT8(s); BYTE drep = Stream_Get_UINT8(s); UINT16 headerLen = Stream_Get_UINT16(s); if (headerLen < 4 || !Stream_CheckAndLogRequiredLength(TAG, s, headerLen - 4)) - return NULL; + return nullptr; /* skip filler */ Stream_Seek(s, headerLen - 4); @@ -344,8 +344,8 @@ BOOL ndr_write_uint8_(NdrContext* context, wStream* s, const void* hints, const return ndr_write_uint8(context, s, *(const BYTE*)v); } -const static NdrMessageDescr uint8_descr = { NDR_ARITY_SIMPLE, 1, ndr_read_uint8_, - ndr_write_uint8_, NULL, NULL }; +const static NdrMessageDescr uint8_descr = { NDR_ARITY_SIMPLE, 1, ndr_read_uint8_, + ndr_write_uint8_, nullptr, nullptr }; NdrMessageType ndr_uint8_descr(void) { @@ -404,12 +404,10 @@ NdrMessageType ndr_uint8_descr(void) return ndr_write_##LOWERTYPE(context, s, *(const UPPERTYPE*)v); \ } \ \ - const NdrMessageDescr ndr_##LOWERTYPE##_descr_s = { NDR_ARITY_SIMPLE, \ - sizeof(UPPERTYPE), \ - ndr_read_##LOWERTYPE##_, \ - ndr_write_##LOWERTYPE##_, \ - NULL, \ - NULL }; \ + const NdrMessageDescr ndr_##LOWERTYPE##_descr_s = { \ + NDR_ARITY_SIMPLE, sizeof(UPPERTYPE), ndr_read_##LOWERTYPE##_, \ + ndr_write_##LOWERTYPE##_, nullptr, nullptr \ + }; \ \ NdrMessageType ndr_##LOWERTYPE##_descr(void) \ { \ @@ -449,13 +447,13 @@ SIMPLE_TYPE_IMPL(UINT64, uint64) { \ UPPERTYPE* ptr = (UPPERTYPE*)obj; \ for (UINT32 i = 0; i < ahints->count; i++, ptr++) \ - descr->destroyFn(context, NULL, ptr); \ + descr->destroyFn(context, nullptr, ptr); \ } \ } \ \ const NdrMessageDescr ndr_##TYPE##Array_descr_s = { \ NDR_ARITY_ARRAYOF, sizeof(UPPERTYPE), ndr_read_##TYPE##Array, \ - ndr_write_##TYPE##Array, ndr_destroy_##TYPE##Array, NULL \ + ndr_write_##TYPE##Array, ndr_destroy_##TYPE##Array, nullptr \ }; \ \ NdrMessageType ndr_##TYPE##Array_descr(void) \ @@ -482,12 +480,10 @@ SIMPLE_TYPE_IMPL(UINT64, uint64) ndr_##TYPE##_descr(), v); \ } \ \ - const NdrMessageDescr ndr_##TYPE##VaryingArray_descr_s = { NDR_ARITY_VARYING_ARRAYOF, \ - sizeof(UPPERTYPE), \ - ndr_read_##TYPE##VaryingArray, \ - ndr_write_##TYPE##VaryingArray, \ - NULL, \ - NULL }; \ + const NdrMessageDescr ndr_##TYPE##VaryingArray_descr_s = { \ + NDR_ARITY_VARYING_ARRAYOF, sizeof(UPPERTYPE), ndr_read_##TYPE##VaryingArray, \ + ndr_write_##TYPE##VaryingArray, nullptr, nullptr \ + }; \ \ NdrMessageType ndr_##TYPE##VaryingArray_descr(void) \ { \ @@ -532,7 +528,7 @@ BOOL ndr_read_uconformant_varying_array(NdrContext* context, wStream* s, BYTE* target = (BYTE*)ptarget; for (UINT32 i = 0; i < length; i++, target += itemType->itemSize) { - if (!itemType->readFn(context, s, NULL, target)) + if (!itemType->readFn(context, s, nullptr, target)) return FALSE; } @@ -559,7 +555,7 @@ BOOL ndr_write_uconformant_varying_array(NdrContext* context, wStream* s, const BYTE* src = (const BYTE*)psrc; for (UINT32 i = 0; i < hints->length; i++, src += itemType->itemSize) { - if (!itemType->writeFn(context, s, NULL, src)) + if (!itemType->writeFn(context, s, nullptr, src)) return FALSE; } @@ -595,7 +591,7 @@ BOOL ndr_read_uconformant_array(NdrContext* context, wStream* s, const NdrArrayH BYTE* target = (BYTE*)vtarget; for (UINT32 i = 0; i < count; i++, target += itemType->itemSize) { - if (!itemType->readFn(context, s, NULL, target)) + if (!itemType->readFn(context, s, nullptr, target)) return FALSE; } @@ -617,7 +613,7 @@ BOOL ndr_write_uconformant_array(NdrContext* context, wStream* s, UINT32 len, for (UINT32 i = 0; i < len; i++, ptr += itemType->itemSize) { - if (!itemType->writeFn(context, s, NULL, ptr)) + if (!itemType->writeFn(context, s, nullptr, ptr)) return FALSE; } @@ -646,7 +642,7 @@ BOOL ndr_struct_read_fromDescr(NdrContext* context, wStream* s, const NdrStructD const NdrFieldStruct* field = &descr->fields[i]; BYTE* ptr = target; ptr += field->structOffset; - void* hints = NULL; + void* hints = nullptr; if (field->hintsField >= 0) { @@ -721,7 +717,7 @@ BOOL ndr_struct_write_fromDescr(NdrContext* context, wStream* s, const NdrStruct const NdrFieldStruct* field = &descr->fields[i]; const BYTE* ptr = (const BYTE*)src + field->structOffset; - const void* hints = NULL; + const void* hints = nullptr; if (field->hintsField >= 0) { @@ -833,7 +829,7 @@ void ndr_struct_destroy(NdrContext* context, const NdrStructDescr* descr, void* { const NdrFieldStruct* field = &descr->fields[i]; void* ptr = (BYTE*)pptr + field->structOffset; - void* hints = NULL; + void* hints = nullptr; if (field->hintsField >= 0) { @@ -912,7 +908,7 @@ BOOL ndr_read_pointedMessageEx(NdrContext* context, wStream* s, ndr_refid ptrId, WINPR_ASSERT(descr); WINPR_ASSERT(target); - *target = NULL; + *target = nullptr; if (!ptrId) return TRUE; diff --git a/channels/rdpear/common/rdpear-common/ndr.h b/channels/rdpear/common/rdpear-common/ndr.h index 6f630c290..6545a7715 100644 --- a/channels/rdpear/common/rdpear-common/ndr.h +++ b/channels/rdpear/common/rdpear-common/ndr.h @@ -134,7 +134,7 @@ extern "C" { WINPR_ASSERT(pcontext); ndr_context_free(*pcontext); - *pcontext = NULL; + *pcontext = nullptr; } WINPR_ATTR_MALLOC(ndr_context_free, 1) diff --git a/channels/rdpear/common/rdpear_asn1.c b/channels/rdpear/common/rdpear_asn1.c index c16006648..d24ab4ff9 100644 --- a/channels/rdpear/common/rdpear_asn1.c +++ b/channels/rdpear/common/rdpear_asn1.c @@ -28,10 +28,10 @@ wStream* rdpear_enc_Checksum(UINT32 cksumtype, krb5_checksum* csum) * checksum [1] OCTET STRING * } */ - wStream* ret = NULL; + wStream* ret = nullptr; WinPrAsn1Encoder* enc = WinPrAsn1Encoder_New(WINPR_ASN1_DER); if (!enc) - return NULL; + return nullptr; if (!WinPrAsn1EncSeqContainer(enc)) goto out; @@ -45,14 +45,14 @@ wStream* rdpear_enc_Checksum(UINT32 cksumtype, krb5_checksum* csum) if (!WinPrAsn1EncContextualOctetString(enc, 1, &octets) || !WinPrAsn1EncEndContainer(enc)) goto out; - ret = Stream_New(NULL, 1024); + ret = Stream_New(nullptr, 1024); if (!ret) goto out; if (!WinPrAsn1EncToStream(enc, ret)) { Stream_Free(ret, TRUE); - ret = NULL; + ret = nullptr; goto out; } @@ -70,10 +70,10 @@ wStream* rdpear_enc_EncryptedData(UINT32 encType, krb5_data* payload) * cipher [2] OCTET STRING -- ciphertext * } */ - wStream* ret = NULL; + wStream* ret = nullptr; WinPrAsn1Encoder* enc = WinPrAsn1Encoder_New(WINPR_ASN1_DER); if (!enc) - return NULL; + return nullptr; if (!WinPrAsn1EncSeqContainer(enc)) goto out; @@ -87,14 +87,14 @@ wStream* rdpear_enc_EncryptedData(UINT32 encType, krb5_data* payload) if (!WinPrAsn1EncContextualOctetString(enc, 2, &octets) || !WinPrAsn1EncEndContainer(enc)) goto out; - ret = Stream_New(NULL, 1024); + ret = Stream_New(nullptr, 1024); if (!ret) goto out; if (!WinPrAsn1EncToStream(enc, ret)) { Stream_Free(ret, TRUE); - ret = NULL; + ret = nullptr; goto out; } diff --git a/channels/rdpear/common/rdpear_common.c b/channels/rdpear/common/rdpear_common.c index a781fa036..baad6cc7b 100644 --- a/channels/rdpear/common/rdpear_common.c +++ b/channels/rdpear/common/rdpear_common.c @@ -46,10 +46,10 @@ RdpEarPackageType rdpear_packageType_from_name(const WinPrAsn1_OctetString* pack wStream* rdpear_encodePayload(BOOL isKerb, wStream* payload) { - wStream* ret = NULL; + wStream* ret = nullptr; WinPrAsn1Encoder* enc = WinPrAsn1Encoder_New(WINPR_ASN1_DER); if (!enc) - return NULL; + return nullptr; /* TSRemoteGuardInnerPacket ::= SEQUENCE { */ if (!WinPrAsn1EncSeqContainer(enc)) @@ -81,14 +81,14 @@ wStream* rdpear_encodePayload(BOOL isKerb, wStream* payload) if (!WinPrAsn1EncEndContainer(enc)) goto out; - ret = Stream_New(NULL, 100); + ret = Stream_New(nullptr, 100); if (!ret) goto out; if (!WinPrAsn1EncToStream(enc, ret)) { Stream_Free(ret, TRUE); - ret = NULL; + ret = nullptr; goto out; } out: @@ -244,7 +244,7 @@ void ndr_destroy_RPC_UNICODE_STRING(NdrContext* context, const void* hints, RPC_ if (!obj) return; free(obj->Buffer); - obj->Buffer = NULL; + obj->Buffer = nullptr; } static void ndr_descr_destroy_RPC_UNICODE_STRING(NdrContext* context, const void* hints, void* obj) @@ -292,8 +292,8 @@ static const NdrMessageDescr RPC_UNICODE_STRING_Array_descr_s = { sizeof(RPC_UNICODE_STRING), ndr_read_RPC_UNICODE_STRING_Array, ndr_write_RPC_UNICODE_STRING_Array, - NULL, - NULL + nullptr, + nullptr }; static NdrMessageType ndr_RPC_UNICODE_STRING_Array_descr(void) @@ -367,10 +367,10 @@ void ndr_destroy_KERB_RPC_INTERNAL_NAME(NdrContext* context, const void* hints, return; for (UINT32 i = 0; i < obj->nameHints.count; i++) - ndr_destroy_RPC_UNICODE_STRING(context, NULL, &obj->Names[i]); + ndr_destroy_RPC_UNICODE_STRING(context, nullptr, &obj->Names[i]); free(obj->Names); - obj->Names = NULL; + obj->Names = nullptr; } static void ndr_descr_destroy_KERB_RPC_INTERNAL_NAME(NdrContext* context, const void* hints, @@ -382,7 +382,7 @@ static void ndr_descr_destroy_KERB_RPC_INTERNAL_NAME(NdrContext* context, const static NdrMessageDescr KERB_RPC_INTERNAL_NAME_descr_s = { NDR_ARITY_SIMPLE, sizeof(KERB_RPC_INTERNAL_NAME), ndr_descr_read_KERB_RPC_INTERNAL_NAME, - NULL, + nullptr, ndr_descr_destroy_KERB_RPC_INTERNAL_NAME, ndr_descr_dump_KERB_RPC_INTERNAL_NAME }; diff --git a/channels/rdpear/common/test/TestNdr.c b/channels/rdpear/common/test/TestNdr.c index 934ff11c5..bc471be60 100644 --- a/channels/rdpear/common/test/TestNdr.c +++ b/channels/rdpear/common/test/TestNdr.c @@ -19,7 +19,7 @@ int TestNdr(int argc, char* argv[]) wStream staticS; wStream* s = Stream_StaticInit(&staticS, payload, sizeof(payload)); - BYTE* target = NULL; + BYTE* target = nullptr; NdrArrayHints hints = { 2 }; NdrDeferredEntry e = { 0x020028, "arrayContent", &hints, (void*)&target, ndr_uint8Array_descr() }; diff --git a/channels/rdpear/common/test/TestNdrEar.c b/channels/rdpear/common/test/TestNdrEar.c index 131b0eb44..4411a6b35 100644 --- a/channels/rdpear/common/test/TestNdrEar.c +++ b/channels/rdpear/common/test/TestNdrEar.c @@ -41,7 +41,7 @@ static BYTE* parseHexBlock(const char* str, size_t* plen) { WLog_ERR("", "error parsing hex block, unpaired char"); free(ret); - return NULL; + return nullptr; } break; case '0': @@ -104,7 +104,7 @@ static BYTE* parseHexBlock(const char* str, size_t* plen) default: WLog_ERR("", "invalid char in hex block"); free(ret); - return NULL; + return nullptr; } } @@ -121,7 +121,7 @@ static int TestNdrEarWrite(int argc, char* argv[]) BYTE buffer[16] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; KERB_ASN1_DATA asn1 = { 7, { 16 }, buffer }; - wStream* s = Stream_New(NULL, 100); + wStream* s = Stream_New(nullptr, 100); if (!s) return -1; @@ -129,7 +129,7 @@ static int TestNdrEarWrite(int argc, char* argv[]) if (!context) goto fail; - if (!ndr_write_KERB_ASN1_DATA(context, s, NULL, &asn1)) + if (!ndr_write_KERB_ASN1_DATA(context, s, nullptr, &asn1)) goto fail; if (!ndr_treat_deferred_write(context, s)) goto fail; @@ -156,7 +156,7 @@ static BOOL run_payload(NdrContext* context, const BYTE* payload4, size_t sizeof wStream* s = Stream_StaticInit(&staticS, payload4, sizeofPayload4); if (!ndr_skip_bytes(context, s, 4)) /* skip union id */ return FALSE; - if (!ndr_read_CreateApReqAuthenticatorReq(context, s, NULL, &createApReqAuthenticatorReq)) + if (!ndr_read_CreateApReqAuthenticatorReq(context, s, nullptr, &createApReqAuthenticatorReq)) return FALSE; if (!ndr_treat_deferred_read(context, s)) return FALSE; @@ -181,7 +181,7 @@ static BOOL run_payload(NdrContext* context, const BYTE* payload4, size_t sizeof if (createApReqAuthenticatorReq.SkewTime->QuadPart != 0) return FALSE; - ndr_destroy_CreateApReqAuthenticatorReq(context, NULL, &createApReqAuthenticatorReq); + ndr_destroy_CreateApReqAuthenticatorReq(context, nullptr, &createApReqAuthenticatorReq); ndr_context_reset(context); return TRUE; } @@ -215,11 +215,11 @@ static int TestNdrEarRead(int argc, char* argv[]) wStream* s = Stream_StaticInit(&staticS, payload, sizeof(payload)); KERB_ASN1_DATA asn1 = WINPR_C_ARRAY_INIT; - if (!ndr_read_KERB_ASN1_DATA(context, s, NULL, &asn1) || + if (!ndr_read_KERB_ASN1_DATA(context, s, nullptr, &asn1) || !ndr_treat_deferred_read(context, s) || asn1.Asn1BufferHints.count != 2 || *asn1.Asn1Buffer != 0x30) goto out; - ndr_destroy_KERB_ASN1_DATA(context, NULL, &asn1); + ndr_destroy_KERB_ASN1_DATA(context, nullptr, &asn1); ndr_context_reset(context); /* ====================================================================== */ @@ -246,10 +246,10 @@ static int TestNdrEarRead(int argc, char* argv[]) wStream staticS = WINPR_C_ARRAY_INIT; wStream* s = Stream_StaticInit(&staticS, payload2, sizeof(payload2)); RPC_UNICODE_STRING unicode = WINPR_C_ARRAY_INIT; - if (!ndr_read_RPC_UNICODE_STRING(context, s, NULL, &unicode) || + if (!ndr_read_RPC_UNICODE_STRING(context, s, nullptr, &unicode) || !ndr_treat_deferred_read(context, s)) goto out; - ndr_destroy_RPC_UNICODE_STRING(context, NULL, &unicode); + ndr_destroy_RPC_UNICODE_STRING(context, nullptr, &unicode); ndr_context_reset(context); } { @@ -281,10 +281,10 @@ static int TestNdrEarRead(int argc, char* argv[]) wStream staticS = WINPR_C_ARRAY_INIT; wStream* s = Stream_StaticInit(&staticS, payload3, sizeof(payload3)); - if (!ndr_read_KERB_RPC_INTERNAL_NAME(context, s, NULL, &intName) || + if (!ndr_read_KERB_RPC_INTERNAL_NAME(context, s, nullptr, &intName) || !ndr_treat_deferred_read(context, s)) goto out; - ndr_destroy_KERB_RPC_INTERNAL_NAME(context, NULL, &intName); + ndr_destroy_KERB_RPC_INTERNAL_NAME(context, nullptr, &intName); ndr_context_reset(context); } diff --git a/channels/rdpecam/client/camera_device_enum_main.c b/channels/rdpecam/client/camera_device_enum_main.c index 16427b998..111863f75 100644 --- a/channels/rdpecam/client/camera_device_enum_main.c +++ b/channels/rdpecam/client/camera_device_enum_main.c @@ -36,7 +36,7 @@ UINT ecam_channel_send_error_response(CameraPlugin* ecam, GENERIC_CHANNEL_CALLBA WINPR_ASSERT(ecam); - wStream* s = Stream_New(NULL, CAM_HEADER_SIZE + 4); + wStream* s = Stream_New(nullptr, CAM_HEADER_SIZE + 4); if (!s) { WLog_ERR(TAG, "Stream_New failed!"); @@ -60,7 +60,7 @@ UINT ecam_channel_send_generic_msg(CameraPlugin* ecam, GENERIC_CHANNEL_CALLBACK* { WINPR_ASSERT(ecam); - wStream* s = Stream_New(NULL, CAM_HEADER_SIZE); + wStream* s = Stream_New(nullptr, CAM_HEADER_SIZE); if (!s) { WLog_ERR(TAG, "Stream_New failed!"); @@ -91,7 +91,7 @@ UINT ecam_channel_write(WINPR_ATTR_UNUSED CameraPlugin* ecam, GENERIC_CHANNEL_CA hchannel->channel_mgr->GetChannelId(hchannel->channel), msg, Stream_Length(out)); const UINT error = hchannel->channel->Write(hchannel->channel, (ULONG)Stream_Length(out), - Stream_Buffer(out), NULL); + Stream_Buffer(out), nullptr); if (freeStream) Stream_Free(out, TRUE); @@ -112,7 +112,7 @@ static UINT ecam_send_device_added_notification(CameraPlugin* ecam, WINPR_ASSERT(ecam); - wStream* s = Stream_New(NULL, 256); + wStream* s = Stream_New(nullptr, 256); if (!s) { WLog_ERR(TAG, "Stream_New failed!"); @@ -481,9 +481,9 @@ static UINT ecam_load_hal_plugin(CameraPlugin* ecam, const char* name, const ADD PVIRTUALCHANNELENTRY pvce; const PFREERDP_CAMERA_HAL_ENTRY entry; } cnv; - cnv.pvce = freerdp_load_channel_addin_entry(RDPECAM_CHANNEL_NAME, name, NULL, 0); + cnv.pvce = freerdp_load_channel_addin_entry(RDPECAM_CHANNEL_NAME, name, nullptr, 0); - if (cnv.entry == NULL) + if (cnv.entry == nullptr) { WLog_ERR(TAG, "freerdp_load_channel_addin_entry did not return any function pointers for %s ", @@ -520,7 +520,7 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE rdpecam_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* WINPR_ASSERT(pEntryPoints->GetPlugin); CameraPlugin* ecam = (CameraPlugin*)pEntryPoints->GetPlugin(pEntryPoints, RDPECAM_CHANNEL_NAME); - if (ecam != NULL) + if (ecam != nullptr) return CHANNEL_RC_ALREADY_INITIALIZED; ecam = (CameraPlugin*)calloc(1, sizeof(CameraPlugin)); @@ -533,8 +533,8 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE rdpecam_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* ecam->attached = TRUE; ecam->iface.Initialize = ecam_plugin_initialize; - ecam->iface.Connected = NULL; /* server connects to client */ - ecam->iface.Disconnected = NULL; + ecam->iface.Connected = nullptr; /* server connects to client */ + ecam->iface.Disconnected = nullptr; ecam->iface.Terminated = ecam_plugin_terminated; ecam->iface.Attached = ecam_plugin_attached; ecam->iface.Detached = ecam_plugin_detached; @@ -543,12 +543,12 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE rdpecam_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* #if defined(WITH_V4L) ecam->subsystem = "v4l"; #else - ecam->subsystem = NULL; + ecam->subsystem = nullptr; #endif if (ecam->subsystem) { - if ((error = ecam_load_hal_plugin(ecam, ecam->subsystem, NULL /*args*/))) + if ((error = ecam_load_hal_plugin(ecam, ecam->subsystem, nullptr /*args*/))) { WLog_ERR(TAG, "Unable to load camera redirection subsystem %s because of error %" PRIu32 "", diff --git a/channels/rdpecam/client/camera_device_main.c b/channels/rdpecam/client/camera_device_main.c index c4e241e7d..033b1a962 100644 --- a/channels/rdpecam/client/camera_device_main.c +++ b/channels/rdpecam/client/camera_device_main.c @@ -262,10 +262,10 @@ static void ecam_dev_stop_stream(CameraDevice* dev, size_t streamIndex) } Stream_Free(stream->sampleRespBuffer, TRUE); - stream->sampleRespBuffer = NULL; + stream->sampleRespBuffer = nullptr; Stream_Free(stream->pendingSample, TRUE); - stream->pendingSample = NULL; + stream->pendingSample = nullptr; ecam_encoder_context_free(stream); } @@ -344,7 +344,7 @@ static UINT ecam_dev_process_start_streams_request(CameraDevice* dev, return ERROR_INVALID_DATA; } - stream->sampleRespBuffer = Stream_New(NULL, ECAM_SAMPLE_RESPONSE_BUFFER_SIZE); + stream->sampleRespBuffer = Stream_New(nullptr, ECAM_SAMPLE_RESPONSE_BUFFER_SIZE); if (!stream->sampleRespBuffer) { WLog_ERR(TAG, "Stream_New failed"); @@ -367,7 +367,7 @@ static UINT ecam_dev_process_start_streams_request(CameraDevice* dev, return ERROR_INVALID_DATA; } - stream->pendingSample = Stream_New(NULL, 4ull * mediaType.Width * mediaType.Height); + stream->pendingSample = Stream_New(nullptr, 4ull * mediaType.Width * mediaType.Height); if (!stream->pendingSample) { WLog_ERR(TAG, "pending stream failed"); @@ -418,7 +418,7 @@ static UINT ecam_dev_send_current_media_type_response(CameraDevice* dev, WINPR_ASSERT(dev); - wStream* s = Stream_New(NULL, CAM_HEADER_SIZE + sizeof(CAM_MEDIA_TYPE_DESCRIPTION)); + wStream* s = Stream_New(nullptr, CAM_HEADER_SIZE + sizeof(CAM_MEDIA_TYPE_DESCRIPTION)); if (!s) { WLog_ERR(TAG, "Stream_New failed"); @@ -523,8 +523,8 @@ static UINT ecam_dev_send_media_type_list_response(CameraDevice* dev, WINPR_ASSERT(dev); - wStream* s = Stream_New(NULL, CAM_HEADER_SIZE + ECAM_MAX_MEDIA_TYPE_DESCRIPTORS * - sizeof(CAM_MEDIA_TYPE_DESCRIPTION)); + wStream* s = Stream_New(nullptr, CAM_HEADER_SIZE + ECAM_MAX_MEDIA_TYPE_DESCRIPTORS * + sizeof(CAM_MEDIA_TYPE_DESCRIPTION)); if (!s) { WLog_ERR(TAG, "Stream_New failed"); @@ -552,7 +552,7 @@ static UINT ecam_dev_process_media_type_list_request(CameraDevice* dev, { UINT error = CHANNEL_RC_OK; BYTE streamIndex = 0; - CAM_MEDIA_TYPE_DESCRIPTION* mediaTypes = NULL; + CAM_MEDIA_TYPE_DESCRIPTION* mediaTypes = nullptr; size_t nMediaTypes = ECAM_MAX_MEDIA_TYPE_DESCRIPTORS; WINPR_ASSERT(dev); @@ -624,7 +624,7 @@ static UINT ecam_dev_send_stream_list_response(CameraDevice* dev, WINPR_ASSERT(dev); - wStream* s = Stream_New(NULL, CAM_HEADER_SIZE + sizeof(CAM_STREAM_DESCRIPTION)); + wStream* s = Stream_New(nullptr, CAM_HEADER_SIZE + sizeof(CAM_STREAM_DESCRIPTION)); if (!s) { WLog_ERR(TAG, "Stream_New failed"); @@ -804,7 +804,7 @@ static UINT ecam_dev_on_close(IWTSVirtualChannelCallback* pChannelCallback) /* make sure this channel is not used for sample responses */ for (size_t i = 0; i < ECAM_DEVICE_MAX_STREAMS; i++) if (dev->streams[i].hSampleReqChannel == hchannel) - dev->streams[i].hSampleReqChannel = NULL; + dev->streams[i].hSampleReqChannel = nullptr; free(hchannel); return CHANNEL_RC_OK; @@ -849,7 +849,7 @@ static UINT ecam_dev_on_new_channel_connection(IWTSListenerCallback* pListenerCa /** * Function description * - * @return CameraDevice pointer or NULL in case of error + * @return CameraDevice pointer or nullptr in case of error */ CameraDevice* ecam_dev_create(CameraPlugin* ecam, const char* deviceId, WINPR_ATTR_UNUSED const char* deviceName) @@ -867,7 +867,7 @@ CameraDevice* ecam_dev_create(CameraPlugin* ecam, const char* deviceId, if (!dev) { WLog_ERR(TAG, "calloc failed"); - return NULL; + return nullptr; } dev->ecam = ecam; @@ -879,7 +879,7 @@ CameraDevice* ecam_dev_create(CameraPlugin* ecam, const char* deviceId, { free(dev); WLog_ERR(TAG, "calloc failed"); - return NULL; + return nullptr; } dev->hlistener->iface.OnNewChannelConnection = ecam_dev_on_new_channel_connection; @@ -891,7 +891,7 @@ CameraDevice* ecam_dev_create(CameraPlugin* ecam, const char* deviceId, free(dev->hlistener); free(dev); WLog_ERR(TAG, "CreateListener failed"); - return NULL; + return nullptr; } return dev; diff --git a/channels/rdpecam/client/encoding.c b/channels/rdpecam/client/encoding.c index 54698852a..0925d062c 100644 --- a/channels/rdpecam/client/encoding.c +++ b/channels/rdpecam/client/encoding.c @@ -53,7 +53,7 @@ static size_t demux_uvcH264(const BYTE* srcData, size_t srcSize, BYTE* h264_data WLog_ERR(TAG, "Expected srcSize >= 30, got %" PRIuz, srcSize); return 0; } - const uint8_t* spl = NULL; + const uint8_t* spl = nullptr; uint8_t* ph264 = h264_data; /* search for 1st APP4 marker @@ -68,7 +68,7 @@ static size_t demux_uvcH264(const BYTE* srcData, size_t srcSize, BYTE* h264_data } } - if (spl == NULL) + if (spl == nullptr) { WLog_ERR(TAG, "Expected 1st APP4 marker but none found"); return 0; @@ -225,7 +225,7 @@ static void ecam_sws_free(CameraDeviceStream* stream) if (stream->sws) { sws_freeContext(stream->sws); - stream->sws = NULL; + stream->sws = nullptr; } } @@ -300,8 +300,8 @@ static BOOL ecam_init_sws_context(CameraDeviceStream* stream, enum AVPixelFormat h264_context_get_option(stream->h264, H264_CONTEXT_OPTION_HW_ACCEL) ? AV_PIX_FMT_NV12 : AV_PIX_FMT_YUV420P; - stream->sws = - sws_getContext(width, height, pixFormat, width, height, outPixFormat, 0, NULL, NULL, NULL); + stream->sws = sws_getContext(width, height, pixFormat, width, height, outPixFormat, 0, nullptr, + nullptr, nullptr); if (!stream->sws) { WLog_ERR(TAG, "sws_getContext failed"); @@ -422,31 +422,31 @@ static void ecam_encoder_context_free_h264(CameraDeviceStream* stream) #if defined(WITH_INPUT_FORMAT_MJPG) if (stream->avOutFrame) - av_frame_free(&stream->avOutFrame); /* sets to NULL */ + av_frame_free(&stream->avOutFrame); /* sets to nullptr */ if (stream->avInputPkt) { - stream->avInputPkt->data = NULL; + stream->avInputPkt->data = nullptr; stream->avInputPkt->size = 0; - av_packet_free(&stream->avInputPkt); /* sets to NULL */ + av_packet_free(&stream->avInputPkt); /* sets to nullptr */ } if (stream->avContext) - avcodec_free_context(&stream->avContext); /* sets to NULL */ + avcodec_free_context(&stream->avContext); /* sets to nullptr */ #endif #if defined(WITH_INPUT_FORMAT_H264) if (stream->h264Frame) { free(stream->h264Frame); - stream->h264Frame = NULL; + stream->h264Frame = nullptr; } #endif if (stream->h264) { h264_context_free(stream->h264); - stream->h264 = NULL; + stream->h264 = nullptr; } } @@ -481,7 +481,7 @@ static BOOL ecam_init_mjpeg_decoder(CameraDeviceStream* stream) * return error, so we can skip corrupted frames, if any */ stream->avContext->err_recognition |= AV_EF_EXPLODE; - if (avcodec_open2(stream->avContext, avcodec, NULL) < 0) + if (avcodec_open2(stream->avContext, avcodec, nullptr) < 0) { WLog_ERR(TAG, "avcodec_open2 failed"); return FALSE; diff --git a/channels/rdpecam/client/v4l/camera_v4l.c b/channels/rdpecam/client/v4l/camera_v4l.c index 1851145bb..034516b90 100644 --- a/channels/rdpecam/client/v4l/camera_v4l.c +++ b/channels/rdpecam/client/v4l/camera_v4l.c @@ -53,12 +53,12 @@ static CAM_ERROR_CODE cam_v4l_stream_stop(CamV4lStream* stream); /** * Function description * - * @return NULL-terminated fourcc string + * @return \0-terminated fourcc string */ static const char* cam_v4l_get_fourcc_str(unsigned int fourcc, char* buffer, size_t size) { if (size < 5) - return NULL; + return nullptr; buffer[0] = (char)(fourcc & 0xFF); buffer[1] = (char)((fourcc >> 8) & 0xFF); @@ -355,7 +355,7 @@ static void cam_v4l_stream_free_buffers(CamV4lStream* stream) } free(stream->buffers); - stream->buffers = NULL; + stream->buffers = nullptr; stream->nBuffers = 0; } @@ -406,7 +406,7 @@ static size_t cam_v4l_stream_alloc_buffers(CamV4lStream* stream) return 0; } - stream->buffers[i].start = mmap(NULL, vbuffer.length, PROT_READ | PROT_WRITE, MAP_SHARED, + stream->buffers[i].start = mmap(nullptr, vbuffer.length, PROT_READ | PROT_WRITE, MAP_SHARED, stream->fd, vbuffer.m.offset); if (MAP_FAILED == stream->buffers[i].start) @@ -531,7 +531,7 @@ CamV4lStream* cam_v4l_stream_create(const char* deviceId, size_t streamIndex) if (!stream) { WLog_ERR(TAG, "Failure in calloc"); - return NULL; + return nullptr; } stream->streamIndex = streamIndex; stream->fd = -1; @@ -541,7 +541,7 @@ CamV4lStream* cam_v4l_stream_create(const char* deviceId, size_t streamIndex) { WLog_ERR(TAG, "Failure in calloc"); free(stream); - return NULL; + return nullptr; } return stream; @@ -563,7 +563,7 @@ CAM_ERROR_CODE cam_v4l_stream_stop(CamV4lStream* stream) { (void)WaitForSingleObject(stream->captureThread, INFINITE); (void)CloseHandle(stream->captureThread); - stream->captureThread = NULL; + stream->captureThread = nullptr; } EnterCriticalSection(&stream->lock); @@ -706,7 +706,8 @@ static CAM_ERROR_CODE cam_v4l_stream_start(ICamHal* ihal, CameraDevice* dev, siz return CAM_ERROR_CODE_UnexpectedError; } - stream->captureThread = CreateThread(NULL, 0, cam_v4l_stream_capture_thread, stream, 0, NULL); + stream->captureThread = + CreateThread(nullptr, 0, cam_v4l_stream_capture_thread, stream, 0, nullptr); if (!stream->captureThread) { WLog_ERR(TAG, "CreateThread failure"); @@ -772,7 +773,7 @@ static CAM_ERROR_CODE cam_v4l_free(ICamHal* ihal) { CamV4lHal* hal = (CamV4lHal*)ihal; - if (hal == NULL) + if (hal == nullptr) return CAM_ERROR_CODE_NotInitialized; HashTable_Free(hal->streams); @@ -795,7 +796,7 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE v4l_freerdp_rdpecam_client_subsystem_entry( CamV4lHal* hal = (CamV4lHal*)calloc(1, sizeof(CamV4lHal)); - if (hal == NULL) + if (hal == nullptr) return CHANNEL_RC_NO_MEMORY; hal->iHal.Enumerate = cam_v4l_enumerate; diff --git a/channels/rdpecam/client/v4l/uvc_h264.c b/channels/rdpecam/client/v4l/uvc_h264.c index b03e87876..30f0cf4b4 100644 --- a/channels/rdpecam/client/v4l/uvc_h264.c +++ b/channels/rdpecam/client/v4l/uvc_h264.c @@ -288,7 +288,7 @@ static BOOL get_devpath_from_device_id(const char* deviceId, char* path, size_t if (!p) return FALSE; - p++; // now points to NULL terminated devpath + p++; // now points to nullptr terminated devpath strncpy(path, p, size - 1); return TRUE; @@ -395,7 +395,7 @@ static uint8_t get_guid_unit_id_from_device(libusb_device* device, const uint8_t for (uint8_t i = 0; i < ddesc.bNumConfigurations; ++i) { uint8_t rc = 0; - struct libusb_config_descriptor* config = NULL; + struct libusb_config_descriptor* config = nullptr; if (libusb_get_config_descriptor(device, i, &config) != 0) { @@ -428,8 +428,8 @@ static uint8_t get_guid_unit_id_from_device(libusb_device* device, const uint8_t static uint8_t get_guid_unit_id(const char* deviceId, const uint8_t* guid) { char cam_devpath[MAX_DEVPATH_STR_SIZE] = WINPR_C_ARRAY_INIT; - libusb_context* usb_ctx = NULL; - libusb_device** device_list = NULL; + libusb_context* usb_ctx = nullptr; + libusb_device** device_list = nullptr; uint8_t unit_id = 0; if (!get_devpath_from_device_id(deviceId, cam_devpath, sizeof(cam_devpath))) diff --git a/channels/rdpecam/server/camera_device_enumerator_main.c b/channels/rdpecam/server/camera_device_enumerator_main.c index e35060cc5..8c0dda54b 100644 --- a/channels/rdpecam/server/camera_device_enumerator_main.c +++ b/channels/rdpecam/server/camera_device_enumerator_main.c @@ -78,9 +78,9 @@ static UINT enumerator_server_open_channel(enumerator_server* enumerator) { CamDevEnumServerContext* context = &enumerator->context; DWORD Error = ERROR_SUCCESS; - HANDLE hEvent = NULL; + HANDLE hEvent = nullptr; DWORD BytesReturned = 0; - PULONG pSessionId = NULL; + PULONG pSessionId = nullptr; UINT32 channelId = 0; BOOL status = TRUE; @@ -151,7 +151,7 @@ static UINT enumerator_server_recv_device_added_notification(CamDevEnumServerCon CAM_DEVICE_ADDED_NOTIFICATION pdu; UINT error = CHANNEL_RC_OK; size_t remaining_length = 0; - WCHAR* channel_name_start = 0; + WCHAR* channel_name_start = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(header); @@ -265,7 +265,7 @@ static UINT enumerator_process_message(enumerator_server* enumerator) UINT error = ERROR_INTERNAL_ERROR; ULONG BytesReturned = 0; CAM_SHARED_MSG_HEADER header = WINPR_C_ARRAY_INIT; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(enumerator); WINPR_ASSERT(enumerator->enumerator_channel); @@ -274,7 +274,7 @@ static UINT enumerator_process_message(enumerator_server* enumerator) WINPR_ASSERT(s); Stream_SetPosition(s, 0); - rc = WTSVirtualChannelRead(enumerator->enumerator_channel, 0, NULL, 0, &BytesReturned); + rc = WTSVirtualChannelRead(enumerator->enumerator_channel, 0, nullptr, 0, &BytesReturned); if (!rc) goto out; @@ -366,9 +366,9 @@ static UINT enumerator_server_context_poll_int(CamDevEnumServerContext* context) static HANDLE enumerator_server_get_channel_handle(enumerator_server* enumerator) { - void* buffer = NULL; + void* buffer = nullptr; DWORD BytesReturned = 0; - HANDLE ChannelEvent = NULL; + HANDLE ChannelEvent = nullptr; WINPR_ASSERT(enumerator); @@ -432,7 +432,7 @@ static DWORD WINAPI enumerator_server_thread_func(LPVOID arg) } (void)WTSVirtualChannelClose(enumerator->enumerator_channel); - enumerator->enumerator_channel = NULL; + enumerator->enumerator_channel = nullptr; if (error && enumerator->context.rdpcontext) setChannelError(enumerator->context.rdpcontext, error, @@ -448,9 +448,9 @@ static UINT enumerator_server_open(CamDevEnumServerContext* context) WINPR_ASSERT(enumerator); - if (!enumerator->externalThread && (enumerator->thread == NULL)) + if (!enumerator->externalThread && (enumerator->thread == nullptr)) { - enumerator->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + enumerator->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!enumerator->stopEvent) { WLog_ERR(TAG, "CreateEvent failed!"); @@ -458,12 +458,12 @@ static UINT enumerator_server_open(CamDevEnumServerContext* context) } enumerator->thread = - CreateThread(NULL, 0, enumerator_server_thread_func, enumerator, 0, NULL); + CreateThread(nullptr, 0, enumerator_server_thread_func, enumerator, 0, nullptr); if (!enumerator->thread) { WLog_ERR(TAG, "CreateThread failed!"); (void)CloseHandle(enumerator->stopEvent); - enumerator->stopEvent = NULL; + enumerator->stopEvent = nullptr; return ERROR_INTERNAL_ERROR; } } @@ -492,15 +492,15 @@ static UINT enumerator_server_close(CamDevEnumServerContext* context) (void)CloseHandle(enumerator->thread); (void)CloseHandle(enumerator->stopEvent); - enumerator->thread = NULL; - enumerator->stopEvent = NULL; + enumerator->thread = nullptr; + enumerator->stopEvent = nullptr; } if (enumerator->externalThread) { if (enumerator->state != ENUMERATOR_INITIAL) { (void)WTSVirtualChannelClose(enumerator->enumerator_channel); - enumerator->enumerator_channel = NULL; + enumerator->enumerator_channel = nullptr; enumerator->state = ENUMERATOR_INITIAL; } } @@ -568,9 +568,9 @@ out: static UINT enumerator_send_select_version_response_pdu( CamDevEnumServerContext* context, const CAM_SELECT_VERSION_RESPONSE* selectVersionResponse) { - wStream* s = NULL; + wStream* s = nullptr; - s = Stream_New(NULL, CAM_HEADER_SIZE); + s = Stream_New(nullptr, CAM_HEADER_SIZE); if (!s) { WLog_ERR(TAG, "Stream_New failed!"); @@ -589,7 +589,7 @@ CamDevEnumServerContext* cam_dev_enum_server_context_new(HANDLE vcm) enumerator_server* enumerator = (enumerator_server*)calloc(1, sizeof(enumerator_server)); if (!enumerator) - return NULL; + return nullptr; enumerator->context.vcm = vcm; enumerator->context.Initialize = enumerator_server_initialize; @@ -600,7 +600,7 @@ CamDevEnumServerContext* cam_dev_enum_server_context_new(HANDLE vcm) enumerator->context.SelectVersionResponse = enumerator_send_select_version_response_pdu; - enumerator->buffer = Stream_New(NULL, 4096); + enumerator->buffer = Stream_New(nullptr, 4096); if (!enumerator->buffer) goto fail; @@ -610,7 +610,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC cam_dev_enum_server_context_free(&enumerator->context); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void cam_dev_enum_server_context_free(CamDevEnumServerContext* context) diff --git a/channels/rdpecam/server/camera_device_main.c b/channels/rdpecam/server/camera_device_main.c index 331ba89ff..7d1d5de12 100644 --- a/channels/rdpecam/server/camera_device_main.c +++ b/channels/rdpecam/server/camera_device_main.c @@ -78,9 +78,9 @@ static UINT device_server_open_channel(device_server* device) { CameraDeviceServerContext* context = &device->context; DWORD Error = ERROR_SUCCESS; - HANDLE hEvent = NULL; + HANDLE hEvent = nullptr; DWORD BytesReturned = 0; - PULONG pSessionId = NULL; + PULONG pSessionId = nullptr; UINT32 channelId = 0; BOOL status = TRUE; @@ -471,7 +471,7 @@ static UINT device_process_message(device_server* device) UINT error = ERROR_INTERNAL_ERROR; ULONG BytesReturned = 0; CAM_SHARED_MSG_HEADER header = WINPR_C_ARRAY_INIT; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(device); WINPR_ASSERT(device->device_channel); @@ -480,7 +480,7 @@ static UINT device_process_message(device_server* device) WINPR_ASSERT(s); Stream_SetPosition(s, 0); - rc = WTSVirtualChannelRead(device->device_channel, 0, NULL, 0, &BytesReturned); + rc = WTSVirtualChannelRead(device->device_channel, 0, nullptr, 0, &BytesReturned); if (!rc) goto out; @@ -586,9 +586,9 @@ static UINT device_server_context_poll_int(CameraDeviceServerContext* context) static HANDLE device_server_get_channel_handle(device_server* device) { - void* buffer = NULL; + void* buffer = nullptr; DWORD BytesReturned = 0; - HANDLE ChannelEvent = NULL; + HANDLE ChannelEvent = nullptr; WINPR_ASSERT(device); @@ -652,7 +652,7 @@ static DWORD WINAPI device_server_thread_func(LPVOID arg) } (void)WTSVirtualChannelClose(device->device_channel); - device->device_channel = NULL; + device->device_channel = nullptr; if (error && device->context.rdpcontext) setChannelError(device->context.rdpcontext, error, @@ -668,21 +668,21 @@ static UINT device_server_open(CameraDeviceServerContext* context) WINPR_ASSERT(device); - if (!device->externalThread && (device->thread == NULL)) + if (!device->externalThread && (device->thread == nullptr)) { - device->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + device->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!device->stopEvent) { WLog_ERR(TAG, "CreateEvent failed!"); return ERROR_INTERNAL_ERROR; } - device->thread = CreateThread(NULL, 0, device_server_thread_func, device, 0, NULL); + device->thread = CreateThread(nullptr, 0, device_server_thread_func, device, 0, nullptr); if (!device->thread) { WLog_ERR(TAG, "CreateThread failed!"); (void)CloseHandle(device->stopEvent); - device->stopEvent = NULL; + device->stopEvent = nullptr; return ERROR_INTERNAL_ERROR; } } @@ -711,15 +711,15 @@ static UINT device_server_close(CameraDeviceServerContext* context) (void)CloseHandle(device->thread); (void)CloseHandle(device->stopEvent); - device->thread = NULL; - device->stopEvent = NULL; + device->thread = nullptr; + device->stopEvent = nullptr; } if (device->externalThread) { if (device->state != CAMERA_DEVICE_INITIAL) { (void)WTSVirtualChannelClose(device->device_channel); - device->device_channel = NULL; + device->device_channel = nullptr; device->state = CAMERA_DEVICE_INITIAL; } } @@ -759,14 +759,14 @@ static BOOL device_server_context_handle(CameraDeviceServerContext* context, HAN static wStream* device_server_packet_new(size_t size, BYTE version, BYTE messageId) { - wStream* s = NULL; + wStream* s = nullptr; /* Allocate what we need plus header bytes */ - s = Stream_New(NULL, size + CAM_HEADER_SIZE); + s = Stream_New(nullptr, size + CAM_HEADER_SIZE); if (!s) { WLog_ERR(TAG, "Stream_New failed!"); - return NULL; + return nullptr; } Stream_Write_UINT8(s, version); @@ -807,7 +807,7 @@ out: static UINT device_server_write_and_send_header(CameraDeviceServerContext* context, BYTE messageId) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); @@ -849,7 +849,7 @@ static UINT device_send_media_type_list_request_pdu(CameraDeviceServerContext* context, const CAM_MEDIA_TYPE_LIST_REQUEST* mediaTypeListRequest) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(mediaTypeListRequest); @@ -867,7 +867,7 @@ static UINT device_send_current_media_type_request_pdu( CameraDeviceServerContext* context, const CAM_CURRENT_MEDIA_TYPE_REQUEST* currentMediaTypeRequest) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(currentMediaTypeRequest); @@ -885,7 +885,7 @@ static UINT device_send_start_streams_request_pdu(CameraDeviceServerContext* context, const CAM_START_STREAMS_REQUEST* startStreamsRequest) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(startStreamsRequest); @@ -927,7 +927,7 @@ static UINT device_send_stop_streams_request_pdu( static UINT device_send_sample_request_pdu(CameraDeviceServerContext* context, const CAM_SAMPLE_REQUEST* sampleRequest) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(sampleRequest); @@ -954,7 +954,7 @@ static UINT device_send_property_value_request_pdu(CameraDeviceServerContext* context, const CAM_PROPERTY_VALUE_REQUEST* propertyValueRequest) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(propertyValueRequest); @@ -973,7 +973,7 @@ static UINT device_send_set_property_value_request_pdu( CameraDeviceServerContext* context, const CAM_SET_PROPERTY_VALUE_REQUEST* setPropertyValueRequest) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(setPropertyValueRequest); @@ -998,7 +998,7 @@ CameraDeviceServerContext* camera_device_server_context_new(HANDLE vcm) device_server* device = (device_server*)calloc(1, sizeof(device_server)); if (!device) - return NULL; + return nullptr; device->context.vcm = vcm; device->context.Initialize = device_server_initialize; @@ -1022,7 +1022,7 @@ CameraDeviceServerContext* camera_device_server_context_new(HANDLE vcm) device->context.PropertyValueRequest = device_send_property_value_request_pdu; device->context.SetPropertyValueRequest = device_send_set_property_value_request_pdu; - device->buffer = Stream_New(NULL, 4096); + device->buffer = Stream_New(nullptr, 4096); if (!device->buffer) goto fail; @@ -1032,7 +1032,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC camera_device_server_context_free(&device->context); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void camera_device_server_context_free(CameraDeviceServerContext* context) diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c index 6a666bc13..502b9d643 100644 --- a/channels/rdpei/client/rdpei_main.c +++ b/channels/rdpei/client/rdpei_main.c @@ -149,7 +149,7 @@ static RDPINPUT_CONTACT_POINT* rdpei_contact(RDPEI_PLUGIN* rdpei, INT32 external return contactPoint; } } - return NULL; + return nullptr; } /** @@ -235,7 +235,7 @@ static UINT rdpei_send_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s, UINT1 Stream_Write_UINT32(s, (UINT32)pduLength); /* pduLength (4 bytes) */ Stream_SetPosition(s, Stream_Length(s)); const UINT status = callback->channel->Write(callback->channel, (UINT32)Stream_Length(s), - Stream_Buffer(s), NULL); + Stream_Buffer(s), nullptr); #ifdef WITH_DEBUG_RDPEI WLog_Print(rdpei->base.log, WLOG_DEBUG, "rdpei_send_pdu: eventId: %" PRIu16 " (%s) length: %" PRIu32 " status: %" PRIu32 "", @@ -315,7 +315,7 @@ static UINT rdpei_send_pen_event_pdu(GENERIC_CHANNEL_CALLBACK* callback, size_t if (!frames || (count == 0)) return ERROR_INTERNAL_ERROR; - wStream* s = Stream_New(NULL, 64); + wStream* s = Stream_New(nullptr, 64); if (!s) { @@ -552,7 +552,7 @@ static UINT rdpei_send_cs_ready_pdu(GENERIC_CHANNEL_CALLBACK* callback) flags |= CS_READY_FLAGS_ENABLE_MULTIPEN_INJECTION & rdpei->context->clientFeaturesMask; UINT32 pduLength = RDPINPUT_HEADER_LENGTH + 10; - wStream* s = Stream_New(NULL, pduLength); + wStream* s = Stream_New(nullptr, pduLength); if (!s) { @@ -722,7 +722,7 @@ static UINT rdpei_send_touch_event_pdu(GENERIC_CHANNEL_CALLBACK* callback, return ERROR_INTERNAL_ERROR; size_t pduLength = 64ULL + (64ULL * frame->contactCount); - wStream* s = Stream_New(NULL, pduLength); + wStream* s = Stream_New(nullptr, pduLength); if (!s) { @@ -959,7 +959,7 @@ static UINT rdpei_on_close(IWTSVirtualChannelCallback* pChannelCallback) if (rdpei && rdpei->base.listener_callback) { if (rdpei->base.listener_callback->channel_callback == callback) - rdpei->base.listener_callback->channel_callback = NULL; + rdpei->base.listener_callback->channel_callback = nullptr; } } free(callback); @@ -1240,7 +1240,7 @@ static RDPINPUT_PEN_CONTACT_POINT* rdpei_pen_contact(RDPEI_PLUGIN* rdpei, INT32 BOOL active) { if (!rdpei) - return NULL; + return nullptr; for (UINT32 x = 0; x < rdpei->maxPenContacts; x++) { @@ -1263,7 +1263,7 @@ static RDPINPUT_PEN_CONTACT_POINT* rdpei_pen_contact(RDPEI_PLUGIN* rdpei, INT32 } } } - return NULL; + return nullptr; } static UINT rdpei_add_pen(RdpeiClientContext* context, INT32 externalId, @@ -1292,7 +1292,7 @@ static UINT rdpei_add_pen(RdpeiClientContext* context, INT32 externalId, static UINT rdpei_pen_process(RdpeiClientContext* context, INT32 externalId, UINT32 contactFlags, UINT32 fieldFlags, INT32 x, INT32 y, va_list ap) { - RDPINPUT_PEN_CONTACT_POINT* contactPoint = NULL; + RDPINPUT_PEN_CONTACT_POINT* contactPoint = nullptr; UINT error = CHANNEL_RC_OK; if (!context || !context->handle) @@ -1312,7 +1312,7 @@ static UINT rdpei_pen_process(RdpeiClientContext* context, INT32 externalId, UIN } } - if (contactPoint != NULL) + if (contactPoint != nullptr) { RDPINPUT_PEN_CONTACT contact = WINPR_C_ARRAY_INIT; @@ -1511,7 +1511,7 @@ static UINT init_plugin_cb(GENERIC_DYNVC_PLUGIN* base, rdpContext* rcontext, rdp WINPR_ASSERT(rdpei->base.log); InitializeCriticalSection(&rdpei->lock); - rdpei->event = CreateEventA(NULL, TRUE, FALSE, NULL); + rdpei->event = CreateEventA(nullptr, TRUE, FALSE, nullptr); if (!rdpei->event) { WLog_Print(rdpei->base.log, WLOG_ERROR, "calloc failed!"); @@ -1555,7 +1555,7 @@ static UINT init_plugin_cb(GENERIC_DYNVC_PLUGIN* base, rdpContext* rcontext, rdp { rdpei->running = TRUE; - rdpei->thread = CreateThread(NULL, 0, rdpei_periodic_update, rdpei, 0, NULL); + rdpei->thread = CreateThread(nullptr, 0, rdpei_periodic_update, rdpei, 0, nullptr); if (!rdpei->thread) { WLog_Print(rdpei->base.log, WLOG_ERROR, "calloc failed!"); @@ -1597,8 +1597,9 @@ static void terminate_plugin_cb(GENERIC_DYNVC_PLUGIN* base) free(rdpei->context); } -static const IWTSVirtualChannelCallback rdpei_callbacks = { rdpei_on_data_received, NULL, /* Open */ - rdpei_on_close, NULL }; +static const IWTSVirtualChannelCallback rdpei_callbacks = { rdpei_on_data_received, + nullptr, /* Open */ + rdpei_on_close, nullptr }; /** * Function description diff --git a/channels/rdpei/rdpei_common.c b/channels/rdpei/rdpei_common.c index 65bc05f10..e97082875 100644 --- a/channels/rdpei/rdpei_common.c +++ b/channels/rdpei/rdpei_common.c @@ -616,14 +616,14 @@ void touch_event_reset(RDPINPUT_TOUCH_EVENT* event) touch_frame_reset(&event->frames[i]); free(event->frames); - event->frames = NULL; + event->frames = nullptr; event->frameCount = 0; } void touch_frame_reset(RDPINPUT_TOUCH_FRAME* frame) { free(frame->contacts); - frame->contacts = NULL; + frame->contacts = nullptr; frame->contactCount = 0; } @@ -633,13 +633,13 @@ void pen_event_reset(RDPINPUT_PEN_EVENT* event) pen_frame_reset(&event->frames[i]); free(event->frames); - event->frames = NULL; + event->frames = nullptr; event->frameCount = 0; } void pen_frame_reset(RDPINPUT_PEN_FRAME* frame) { free(frame->contacts); - frame->contacts = NULL; + frame->contacts = nullptr; frame->contactCount = 0; } diff --git a/channels/rdpei/server/rdpei_main.c b/channels/rdpei/server/rdpei_main.c index 38ab9666c..91d2c5057 100644 --- a/channels/rdpei/server/rdpei_main.c +++ b/channels/rdpei/server/rdpei_main.c @@ -74,7 +74,7 @@ static UINT rdpei_server_open_channel(RdpeiServerContext* context) { DWORD error = ERROR_SUCCESS; DWORD bytesReturned = 0; - PULONG pSessionId = NULL; + PULONG pSessionId = nullptr; BOOL status = TRUE; WINPR_ASSERT(context); @@ -115,7 +115,7 @@ static UINT rdpei_server_open_channel(RdpeiServerContext* context) static UINT rdpei_server_context_poll_int(RdpeiServerContext* context) { - RdpeiServerPrivate* priv = NULL; + RdpeiServerPrivate* priv = nullptr; UINT error = ERROR_INTERNAL_ERROR; WINPR_ASSERT(context); @@ -143,10 +143,10 @@ static UINT rdpei_server_context_poll_int(RdpeiServerContext* context) static HANDLE rdpei_server_get_channel_handle(RdpeiServerContext* context) { - RdpeiServerPrivate* priv = NULL; - void* buffer = NULL; + RdpeiServerPrivate* priv = nullptr; + void* buffer = nullptr; DWORD bytesReturned = 0; - HANDLE channelEvent = NULL; + HANDLE channelEvent = nullptr; WINPR_ASSERT(context); priv = context->priv; @@ -167,7 +167,7 @@ static HANDLE rdpei_server_get_channel_handle(RdpeiServerContext* context) static DWORD WINAPI rdpei_server_thread_func(LPVOID arg) { RdpeiServerContext* context = (RdpeiServerContext*)arg; - RdpeiServerPrivate* priv = NULL; + RdpeiServerPrivate* priv = nullptr; HANDLE events[2] = WINPR_C_ARRAY_INIT; DWORD nCount = 0; UINT error = CHANNEL_RC_OK; @@ -214,7 +214,7 @@ static DWORD WINAPI rdpei_server_thread_func(LPVOID arg) } (void)WTSVirtualChannelClose(priv->channelHandle); - priv->channelHandle = NULL; + priv->channelHandle = nullptr; ExitThread(error); return error; @@ -222,26 +222,26 @@ static DWORD WINAPI rdpei_server_thread_func(LPVOID arg) static UINT rdpei_server_open(RdpeiServerContext* context) { - RdpeiServerPrivate* priv = NULL; + RdpeiServerPrivate* priv = nullptr; priv = context->priv; WINPR_ASSERT(priv); if (!priv->thread) { - priv->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + priv->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!priv->stopEvent) { WLog_ERR(TAG, "CreateEvent failed!"); return ERROR_INTERNAL_ERROR; } - priv->thread = CreateThread(NULL, 0, rdpei_server_thread_func, context, 0, NULL); + priv->thread = CreateThread(nullptr, 0, rdpei_server_thread_func, context, 0, nullptr); if (!priv->thread) { WLog_ERR(TAG, "CreateThread failed!"); (void)CloseHandle(priv->stopEvent); - priv->stopEvent = NULL; + priv->stopEvent = nullptr; return ERROR_INTERNAL_ERROR; } } @@ -251,7 +251,7 @@ static UINT rdpei_server_open(RdpeiServerContext* context) static UINT rdpei_server_close(RdpeiServerContext* context) { - RdpeiServerPrivate* priv = NULL; + RdpeiServerPrivate* priv = nullptr; UINT error = CHANNEL_RC_OK; priv = context->priv; @@ -270,8 +270,8 @@ static UINT rdpei_server_close(RdpeiServerContext* context) (void)CloseHandle(priv->thread); (void)CloseHandle(priv->stopEvent); - priv->thread = NULL; - priv->stopEvent = NULL; + priv->thread = nullptr; + priv->stopEvent = nullptr; } return error; @@ -282,7 +282,7 @@ RdpeiServerContext* rdpei_server_context_new(HANDLE vcm) RdpeiServerContext* ret = calloc(1, sizeof(*ret)); if (!ret) - return NULL; + return nullptr; ret->Open = rdpei_server_open; ret->Close = rdpei_server_close; @@ -291,11 +291,11 @@ RdpeiServerContext* rdpei_server_context_new(HANDLE vcm) if (!ret->priv) goto fail; - ret->priv->inputStream = Stream_New(NULL, 256); + ret->priv->inputStream = Stream_New(nullptr, 256); if (!ret->priv->inputStream) goto fail; - ret->priv->outputStream = Stream_New(NULL, 200); + ret->priv->outputStream = Stream_New(nullptr, 200); if (!ret->priv->outputStream) goto fail; @@ -308,7 +308,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC rdpei_server_context_free(ret); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } /** @@ -507,7 +507,7 @@ static UINT read_pen_contact(RdpeiServerContext* context, wStream* s, */ static UINT read_touch_frame(RdpeiServerContext* context, wStream* s, RDPINPUT_TOUCH_FRAME* frame) { - RDPINPUT_CONTACT_DATA* contact = NULL; + RDPINPUT_CONTACT_DATA* contact = nullptr; UINT error = 0; if (!rdpei_read_2byte_unsigned(s, &frame->contactCount) || @@ -539,7 +539,7 @@ static UINT read_touch_frame(RdpeiServerContext* context, wStream* s, RDPINPUT_T static UINT read_pen_frame(RdpeiServerContext* context, wStream* s, RDPINPUT_PEN_FRAME* frame) { - RDPINPUT_PEN_CONTACT* contact = NULL; + RDPINPUT_PEN_CONTACT* contact = nullptr; UINT error = 0; if (!rdpei_read_2byte_unsigned(s, &frame->contactCount) || @@ -579,7 +579,7 @@ static UINT read_touch_event(RdpeiServerContext* context, wStream* s) { UINT16 frameCount = 0; RDPINPUT_TOUCH_EVENT* event = &context->priv->touchEvent; - RDPINPUT_TOUCH_FRAME* frame = NULL; + RDPINPUT_TOUCH_FRAME* frame = nullptr; UINT error = CHANNEL_RC_OK; if (!rdpei_read_4byte_unsigned(s, &event->encodeTime) || @@ -621,7 +621,7 @@ static UINT read_pen_event(RdpeiServerContext* context, wStream* s) { UINT16 frameCount = 0; RDPINPUT_PEN_EVENT* event = &context->priv->penEvent; - RDPINPUT_PEN_FRAME* frame = NULL; + RDPINPUT_PEN_FRAME* frame = nullptr; UINT error = CHANNEL_RC_OK; if (!rdpei_read_4byte_unsigned(s, &event->encodeTime) || diff --git a/channels/rdpemsc/server/mouse_cursor_main.c b/channels/rdpemsc/server/mouse_cursor_main.c index 2d256617b..c036c1a87 100644 --- a/channels/rdpemsc/server/mouse_cursor_main.c +++ b/channels/rdpemsc/server/mouse_cursor_main.c @@ -72,10 +72,10 @@ static UINT mouse_cursor_server_initialize(MouseCursorServerContext* context, BO static UINT mouse_cursor_server_open_channel(mouse_cursor_server* mouse_cursor) { - MouseCursorServerContext* context = NULL; + MouseCursorServerContext* context = nullptr; DWORD Error = ERROR_SUCCESS; DWORD BytesReturned = 0; - PULONG pSessionId = NULL; + PULONG pSessionId = nullptr; UINT32 channelId = 0; BOOL status = TRUE; @@ -116,7 +116,7 @@ static UINT mouse_cursor_server_open_channel(mouse_cursor_server* mouse_cursor) static BOOL read_cap_set(wStream* s, wArrayList* capsSets) { - RDP_MOUSE_CURSOR_CAPSET* capsSet = NULL; + RDP_MOUSE_CURSOR_CAPSET* capsSet = nullptr; UINT32 signature = 0; UINT32 size = 0; size_t capsDataSize = 0; @@ -156,7 +156,7 @@ static BOOL read_cap_set(wStream* s, wArrayList* capsSets) { case RDP_MOUSE_CURSOR_CAPVERSION_1: { - RDP_MOUSE_CURSOR_CAPSET_VERSION1* capsSetV1 = NULL; + RDP_MOUSE_CURSOR_CAPSET_VERSION1* capsSetV1 = nullptr; capsSetV1 = calloc(1, sizeof(RDP_MOUSE_CURSOR_CAPSET_VERSION1)); if (!capsSetV1) @@ -238,7 +238,7 @@ static UINT mouse_cursor_process_message(mouse_cursor_server* mouse_cursor) BOOL rc = 0; UINT error = ERROR_INTERNAL_ERROR; ULONG BytesReturned = 0; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(mouse_cursor); WINPR_ASSERT(mouse_cursor->mouse_cursor_channel); @@ -247,7 +247,7 @@ static UINT mouse_cursor_process_message(mouse_cursor_server* mouse_cursor) WINPR_ASSERT(s); Stream_SetPosition(s, 0); - rc = WTSVirtualChannelRead(mouse_cursor->mouse_cursor_channel, 0, NULL, 0, &BytesReturned); + rc = WTSVirtualChannelRead(mouse_cursor->mouse_cursor_channel, 0, nullptr, 0, &BytesReturned); if (!rc) goto out; @@ -348,9 +348,9 @@ static UINT mouse_cursor_server_context_poll_int(MouseCursorServerContext* conte static HANDLE mouse_cursor_server_get_channel_handle(mouse_cursor_server* mouse_cursor) { - void* buffer = NULL; + void* buffer = nullptr; DWORD BytesReturned = 0; - HANDLE ChannelEvent = NULL; + HANDLE ChannelEvent = nullptr; WINPR_ASSERT(mouse_cursor); @@ -414,7 +414,7 @@ static DWORD WINAPI mouse_cursor_server_thread_func(LPVOID arg) } (void)WTSVirtualChannelClose(mouse_cursor->mouse_cursor_channel); - mouse_cursor->mouse_cursor_channel = NULL; + mouse_cursor->mouse_cursor_channel = nullptr; if (error && mouse_cursor->context.rdpcontext) setChannelError(mouse_cursor->context.rdpcontext, error, @@ -430,9 +430,9 @@ static UINT mouse_cursor_server_open(MouseCursorServerContext* context) WINPR_ASSERT(mouse_cursor); - if (!mouse_cursor->externalThread && (mouse_cursor->thread == NULL)) + if (!mouse_cursor->externalThread && (mouse_cursor->thread == nullptr)) { - mouse_cursor->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + mouse_cursor->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!mouse_cursor->stopEvent) { WLog_ERR(TAG, "CreateEvent failed!"); @@ -440,12 +440,12 @@ static UINT mouse_cursor_server_open(MouseCursorServerContext* context) } mouse_cursor->thread = - CreateThread(NULL, 0, mouse_cursor_server_thread_func, mouse_cursor, 0, NULL); + CreateThread(nullptr, 0, mouse_cursor_server_thread_func, mouse_cursor, 0, nullptr); if (!mouse_cursor->thread) { WLog_ERR(TAG, "CreateThread failed!"); (void)CloseHandle(mouse_cursor->stopEvent); - mouse_cursor->stopEvent = NULL; + mouse_cursor->stopEvent = nullptr; return ERROR_INTERNAL_ERROR; } } @@ -474,15 +474,15 @@ static UINT mouse_cursor_server_close(MouseCursorServerContext* context) (void)CloseHandle(mouse_cursor->thread); (void)CloseHandle(mouse_cursor->stopEvent); - mouse_cursor->thread = NULL; - mouse_cursor->stopEvent = NULL; + mouse_cursor->thread = nullptr; + mouse_cursor->stopEvent = nullptr; } if (mouse_cursor->externalThread) { if (mouse_cursor->state != MOUSE_CURSOR_INITIAL) { (void)WTSVirtualChannelClose(mouse_cursor->mouse_cursor_channel); - mouse_cursor->mouse_cursor_channel = NULL; + mouse_cursor->mouse_cursor_channel = nullptr; mouse_cursor->state = MOUSE_CURSOR_INITIAL; } } @@ -523,14 +523,14 @@ static BOOL mouse_cursor_server_context_handle(MouseCursorServerContext* context static wStream* mouse_cursor_server_packet_new(size_t size, RDP_MOUSE_CURSOR_PDUTYPE pduType, const RDP_MOUSE_CURSOR_HEADER* header) { - wStream* s = NULL; + wStream* s = nullptr; /* Allocate what we need plus header bytes */ - s = Stream_New(NULL, size + RDPEMSC_HEADER_SIZE); + s = Stream_New(nullptr, size + RDPEMSC_HEADER_SIZE); if (!s) { WLog_ERR(TAG, "Stream_New failed!"); - return NULL; + return nullptr; } WINPR_ASSERT(pduType <= UINT8_MAX); @@ -578,10 +578,10 @@ static UINT mouse_cursor_server_send_sc_caps_confirm(MouseCursorServerContext* context, const RDP_MOUSE_CURSOR_CAPS_CONFIRM_PDU* capsConfirm) { - RDP_MOUSE_CURSOR_CAPSET* capsetHeader = NULL; + RDP_MOUSE_CURSOR_CAPSET* capsetHeader = nullptr; RDP_MOUSE_CURSOR_PDUTYPE pduType = PDUTYPE_EMSC_RESERVED; size_t caps_size = 0; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(capsConfirm); @@ -633,12 +633,12 @@ static void write_point16(wStream* s, const TS_POINT16* point16) static UINT mouse_cursor_server_send_sc_mouseptr_update( MouseCursorServerContext* context, const RDP_MOUSE_CURSOR_MOUSEPTR_UPDATE_PDU* mouseptrUpdate) { - TS_POINT16* position = NULL; - TS_POINTERATTRIBUTE* pointerAttribute = NULL; - TS_LARGEPOINTERATTRIBUTE* largePointerAttribute = NULL; + TS_POINT16* position = nullptr; + TS_POINTERATTRIBUTE* pointerAttribute = nullptr; + TS_LARGEPOINTERATTRIBUTE* largePointerAttribute = nullptr; RDP_MOUSE_CURSOR_PDUTYPE pduType = PDUTYPE_EMSC_RESERVED; size_t update_size = 0; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(mouseptrUpdate); @@ -732,7 +732,7 @@ MouseCursorServerContext* mouse_cursor_server_context_new(HANDLE vcm) (mouse_cursor_server*)calloc(1, sizeof(mouse_cursor_server)); if (!mouse_cursor) - return NULL; + return nullptr; mouse_cursor->context.vcm = vcm; mouse_cursor->context.Initialize = mouse_cursor_server_initialize; @@ -744,7 +744,7 @@ MouseCursorServerContext* mouse_cursor_server_context_new(HANDLE vcm) mouse_cursor->context.CapsConfirm = mouse_cursor_server_send_sc_caps_confirm; mouse_cursor->context.MouseptrUpdate = mouse_cursor_server_send_sc_mouseptr_update; - mouse_cursor->buffer = Stream_New(NULL, 4096); + mouse_cursor->buffer = Stream_New(nullptr, 4096); if (!mouse_cursor->buffer) goto fail; @@ -754,7 +754,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC mouse_cursor_server_context_free(&mouse_cursor->context); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void mouse_cursor_server_context_free(MouseCursorServerContext* context) diff --git a/channels/rdpgfx/client/rdpgfx_codec.c b/channels/rdpgfx/client/rdpgfx_codec.c index 29fe85d75..7fc4f1588 100644 --- a/channels/rdpgfx/client/rdpgfx_codec.c +++ b/channels/rdpgfx/client/rdpgfx_codec.c @@ -40,11 +40,11 @@ static UINT rdpgfx_read_h264_metablock(WINPR_ATTR_UNUSED RDPGFX_PLUGIN* gfx, wStream* s, RDPGFX_H264_METABLOCK* meta) { - RECTANGLE_16* regionRect = NULL; - RDPGFX_H264_QUANT_QUALITY* quantQualityVal = NULL; + RECTANGLE_16* regionRect = nullptr; + RDPGFX_H264_QUANT_QUALITY* quantQualityVal = nullptr; UINT error = ERROR_INVALID_DATA; - meta->regionRects = NULL; - meta->quantQualityVals = NULL; + meta->regionRects = nullptr; + meta->quantQualityVals = nullptr; if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) goto error_out; @@ -157,7 +157,7 @@ static UINT rdpgfx_decode_AVC420(RDPGFX_PLUGIN* gfx, RDPGFX_SURFACE_COMMAND* cmd } free_h264_metablock(&h264.meta); - cmd->extra = NULL; + cmd->extra = nullptr; return error; } @@ -258,7 +258,7 @@ fail: Stream_Free(s, FALSE); free_h264_metablock(&h264.bitstream[0].meta); free_h264_metablock(&h264.bitstream[1].meta); - cmd->extra = NULL; + cmd->extra = nullptr; return error; } diff --git a/channels/rdpgfx/client/rdpgfx_main.c b/channels/rdpgfx/client/rdpgfx_main.c index bdd681e76..c18a91dd2 100644 --- a/channels/rdpgfx/client/rdpgfx_main.c +++ b/channels/rdpgfx/client/rdpgfx_main.c @@ -92,7 +92,7 @@ static UINT evict_cache_slots(RdpgfxClientContext* context, UINT16 MaxCacheSlots error = rc; } - CacheSlots[index] = NULL; + CacheSlots[index] = nullptr; } } return error; @@ -108,9 +108,9 @@ static UINT rdpgfx_send_caps_advertise_pdu(RdpgfxClientContext* context, { UINT error = CHANNEL_RC_OK; RDPGFX_HEADER header = WINPR_C_ARRAY_INIT; - RDPGFX_PLUGIN* gfx = NULL; - GENERIC_CHANNEL_CALLBACK* callback = NULL; - wStream* s = NULL; + RDPGFX_PLUGIN* gfx = nullptr; + GENERIC_CHANNEL_CALLBACK* callback = nullptr; + wStream* s = nullptr; WINPR_ASSERT(pdu); WINPR_ASSERT(context); @@ -133,7 +133,7 @@ static UINT rdpgfx_send_caps_advertise_pdu(RdpgfxClientContext* context, } DEBUG_RDPGFX(gfx->log, "SendCapsAdvertisePdu %" PRIu16 "", pdu->capsSetCount); - s = Stream_New(NULL, header.pduLength); + s = Stream_New(nullptr, header.pduLength); if (!s) { @@ -162,7 +162,7 @@ static UINT rdpgfx_send_caps_advertise_pdu(RdpgfxClientContext* context, Stream_SealLength(s); error = callback->channel->Write(callback->channel, (UINT32)Stream_Length(s), Stream_Buffer(s), - NULL); + nullptr); fail: Stream_Free(s, TRUE); return error; @@ -196,9 +196,9 @@ static BOOL rdpgfx_is_capability_filtered(RDPGFX_PLUGIN* gfx, UINT32 caps) */ static UINT rdpgfx_send_supported_caps(GENERIC_CHANNEL_CALLBACK* callback) { - RDPGFX_PLUGIN* gfx = NULL; - RdpgfxClientContext* context = NULL; - RDPGFX_CAPSET* capsSet = NULL; + RDPGFX_PLUGIN* gfx = nullptr; + RdpgfxClientContext* context = nullptr; + RDPGFX_CAPSET* capsSet = nullptr; RDPGFX_CAPSET capsSets[RDPGFX_NUMBER_CAPSETS] = WINPR_C_ARRAY_INIT; RDPGFX_CAPS_ADVERTISE_PDU pdu = WINPR_C_ARRAY_INIT; @@ -408,10 +408,10 @@ static UINT rdpgfx_send_frame_acknowledge_pdu(RdpgfxClientContext* context, const RDPGFX_FRAME_ACKNOWLEDGE_PDU* pdu) { UINT error = 0; - wStream* s = NULL; + wStream* s = nullptr; RDPGFX_HEADER header = WINPR_C_ARRAY_INIT; - RDPGFX_PLUGIN* gfx = NULL; - GENERIC_CHANNEL_CALLBACK* callback = NULL; + RDPGFX_PLUGIN* gfx = nullptr; + GENERIC_CHANNEL_CALLBACK* callback = nullptr; if (!context || !pdu) return ERROR_BAD_ARGUMENTS; @@ -430,7 +430,7 @@ static UINT rdpgfx_send_frame_acknowledge_pdu(RdpgfxClientContext* context, header.cmdId = RDPGFX_CMDID_FRAMEACKNOWLEDGE; header.pduLength = RDPGFX_HEADER_SIZE + 12; DEBUG_RDPGFX(gfx->log, "SendFrameAcknowledgePdu: %" PRIu32 "", pdu->frameId); - s = Stream_New(NULL, header.pduLength); + s = Stream_New(nullptr, header.pduLength); if (!s) { @@ -446,7 +446,7 @@ static UINT rdpgfx_send_frame_acknowledge_pdu(RdpgfxClientContext* context, Stream_Write_UINT32(s, pdu->frameId); /* frameId (4 bytes) */ Stream_Write_UINT32(s, pdu->totalFramesDecoded); /* totalFramesDecoded (4 bytes) */ error = callback->channel->Write(callback->channel, (UINT32)Stream_Length(s), Stream_Buffer(s), - NULL); + nullptr); if (error == CHANNEL_RC_OK) /* frame successfully acked */ gfx->UnacknowledgedFrames--; @@ -460,10 +460,10 @@ static UINT rdpgfx_send_qoe_frame_acknowledge_pdu(RdpgfxClientContext* context, const RDPGFX_QOE_FRAME_ACKNOWLEDGE_PDU* pdu) { UINT error = 0; - wStream* s = NULL; + wStream* s = nullptr; RDPGFX_HEADER header = WINPR_C_ARRAY_INIT; - GENERIC_CHANNEL_CALLBACK* callback = NULL; - RDPGFX_PLUGIN* gfx = NULL; + GENERIC_CHANNEL_CALLBACK* callback = nullptr; + RDPGFX_PLUGIN* gfx = nullptr; header.flags = 0; header.cmdId = RDPGFX_CMDID_QOEFRAMEACKNOWLEDGE; @@ -483,7 +483,7 @@ static UINT rdpgfx_send_qoe_frame_acknowledge_pdu(RdpgfxClientContext* context, return ERROR_BAD_CONFIGURATION; DEBUG_RDPGFX(gfx->log, "SendQoeFrameAcknowledgePdu: %" PRIu32 "", pdu->frameId); - s = Stream_New(NULL, header.pduLength); + s = Stream_New(nullptr, header.pduLength); if (!s) { @@ -500,7 +500,7 @@ static UINT rdpgfx_send_qoe_frame_acknowledge_pdu(RdpgfxClientContext* context, Stream_Write_UINT16(s, pdu->timeDiffSE); Stream_Write_UINT16(s, pdu->timeDiffEDR); error = callback->channel->Write(callback->channel, (UINT32)Stream_Length(s), Stream_Buffer(s), - NULL); + nullptr); fail: Stream_Free(s, TRUE); return error; @@ -642,7 +642,7 @@ static UINT rdpgfx_save_persistent_cache(RDPGFX_PLUGIN* gfx) { UINT error = CHANNEL_RC_OK; PERSISTENT_CACHE_ENTRY cacheEntry; - rdpPersistentCache* persistent = NULL; + rdpPersistentCache* persistent = nullptr; WINPR_ASSERT(gfx); WINPR_ASSERT(gfx->rdpcontext); rdpSettings* settings = gfx->rdpcontext->settings; @@ -704,9 +704,9 @@ static UINT rdpgfx_send_cache_import_offer_pdu(RdpgfxClientContext* context, const RDPGFX_CACHE_IMPORT_OFFER_PDU* pdu) { UINT error = CHANNEL_RC_OK; - wStream* s = NULL; + wStream* s = nullptr; RDPGFX_HEADER header; - GENERIC_CHANNEL_CALLBACK* callback = NULL; + GENERIC_CHANNEL_CALLBACK* callback = nullptr; if (!context || !pdu) return ERROR_BAD_ARGUMENTS; @@ -726,7 +726,7 @@ static UINT rdpgfx_send_cache_import_offer_pdu(RdpgfxClientContext* context, header.pduLength = RDPGFX_HEADER_SIZE + 2ul + pdu->cacheEntriesCount * 12ul; WLog_Print(gfx->log, WLOG_DEBUG, "SendCacheImportOfferPdu: cacheEntriesCount: %" PRIu16 "", pdu->cacheEntriesCount); - s = Stream_New(NULL, header.pduLength); + s = Stream_New(nullptr, header.pduLength); if (!s) { @@ -755,7 +755,7 @@ static UINT rdpgfx_send_cache_import_offer_pdu(RdpgfxClientContext* context, } error = callback->channel->Write(callback->channel, (UINT32)Stream_Length(s), Stream_Buffer(s), - NULL); + nullptr); fail: Stream_Free(s, TRUE); @@ -772,8 +772,8 @@ static UINT rdpgfx_send_cache_offer(RDPGFX_PLUGIN* gfx) int count = 0; UINT error = CHANNEL_RC_OK; PERSISTENT_CACHE_ENTRY entry; - RDPGFX_CACHE_IMPORT_OFFER_PDU* offer = NULL; - rdpPersistentCache* persistent = NULL; + RDPGFX_CACHE_IMPORT_OFFER_PDU* offer = nullptr; + rdpPersistentCache* persistent = nullptr; WINPR_ASSERT(gfx); WINPR_ASSERT(gfx->rdpcontext); @@ -868,7 +868,7 @@ static UINT rdpgfx_load_cache_import_reply(RDPGFX_PLUGIN* gfx, const RDPGFX_CACHE_IMPORT_REPLY_PDU* reply) { UINT error = CHANNEL_RC_OK; - rdpPersistentCache* persistent = NULL; + rdpPersistentCache* persistent = nullptr; WINPR_ASSERT(gfx); WINPR_ASSERT(gfx->rdpcontext); rdpSettings* settings = gfx->rdpcontext->settings; @@ -1273,7 +1273,7 @@ static UINT rdpgfx_recv_wire_to_surface_1_pdu(GENERIC_CHANNEL_CALLBACK* callback cmd.height = cmd.bottom - cmd.top; cmd.length = pdu.bitmapDataLength; cmd.data = pdu.bitmapData; - cmd.extra = NULL; + cmd.extra = nullptr; if (cmd.right < cmd.left) { @@ -1354,7 +1354,7 @@ static UINT rdpgfx_recv_wire_to_surface_2_pdu(GENERIC_CHANNEL_CALLBACK* callback cmd.height = 0; cmd.length = pdu.bitmapDataLength; cmd.data = pdu.bitmapData; - cmd.extra = NULL; + cmd.extra = nullptr; if (context) { @@ -1411,7 +1411,7 @@ static UINT rdpgfx_recv_delete_encoding_context_pdu(GENERIC_CHANNEL_CALLBACK* ca */ static UINT rdpgfx_recv_solid_fill_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) { - RECTANGLE_16* fillRect = NULL; + RECTANGLE_16* fillRect = nullptr; RDPGFX_SOLID_FILL_PDU pdu = WINPR_C_ARRAY_INIT; WINPR_ASSERT(callback); RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)callback->plugin; @@ -1479,7 +1479,7 @@ static UINT rdpgfx_recv_solid_fill_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStre */ static UINT rdpgfx_recv_surface_to_surface_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) { - RDPGFX_POINT16* destPt = NULL; + RDPGFX_POINT16* destPt = nullptr; RDPGFX_SURFACE_TO_SURFACE_PDU pdu = WINPR_C_ARRAY_INIT; WINPR_ASSERT(callback); RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)callback->plugin; @@ -1601,7 +1601,7 @@ static UINT rdpgfx_recv_surface_to_cache_pdu(GENERIC_CHANNEL_CALLBACK* callback, */ static UINT rdpgfx_recv_cache_to_surface_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s) { - RDPGFX_POINT16* destPt = NULL; + RDPGFX_POINT16* destPt = nullptr; RDPGFX_CACHE_TO_SURFACE_PDU pdu = WINPR_C_ARRAY_INIT; WINPR_ASSERT(callback); RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)callback->plugin; @@ -2027,7 +2027,7 @@ static UINT rdpgfx_on_data_received(IWTSVirtualChannelCallback* pChannelCallback { int status = 0; UINT32 DstSize = 0; - BYTE* pDstData = NULL; + BYTE* pDstData = nullptr; GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; WINPR_ASSERT(callback); RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)callback->plugin; @@ -2199,8 +2199,8 @@ static UINT rdpgfx_get_surface_ids(RdpgfxClientContext* context, UINT16** ppSurf UINT16* count_out) { size_t count = 0; - UINT16* pSurfaceIds = NULL; - ULONG_PTR* pKeys = NULL; + UINT16* pSurfaceIds = nullptr; + ULONG_PTR* pKeys = nullptr; WINPR_ASSERT(context); RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)context->handle; WINPR_ASSERT(gfx); @@ -2237,7 +2237,7 @@ static UINT rdpgfx_get_surface_ids(RdpgfxClientContext* context, UINT16** ppSurf static void* rdpgfx_get_surface_data(RdpgfxClientContext* context, UINT16 surfaceId) { ULONG_PTR key = 0; - void* pData = NULL; + void* pData = nullptr; WINPR_ASSERT(context); RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)context->handle; WINPR_ASSERT(gfx); @@ -2271,7 +2271,7 @@ static UINT rdpgfx_set_cache_slot_data(RdpgfxClientContext* context, UINT16 cach static void* rdpgfx_get_cache_slot_data(RdpgfxClientContext* context, UINT16 cacheSlot) { - void* pData = NULL; + void* pData = nullptr; WINPR_ASSERT(context); RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)context->handle; WINPR_ASSERT(gfx); @@ -2280,7 +2280,7 @@ static void* rdpgfx_get_cache_slot_data(RdpgfxClientContext* context, UINT16 cac { WLog_ERR(TAG, "invalid cache slot %" PRIu16 ", must be between 1 and %" PRIu16 "", cacheSlot, gfx->MaxCacheSlots); - return NULL; + return nullptr; } pData = gfx->CacheSlots[cacheSlot - 1]; @@ -2290,7 +2290,7 @@ static void* rdpgfx_get_cache_slot_data(RdpgfxClientContext* context, UINT16 cac static UINT init_plugin_cb(GENERIC_DYNVC_PLUGIN* base, rdpContext* rcontext, WINPR_ATTR_UNUSED rdpSettings* settings) { - RdpgfxClientContext* context = NULL; + RdpgfxClientContext* context = nullptr; RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)base; WINPR_ASSERT(base); @@ -2314,7 +2314,7 @@ static UINT init_plugin_cb(GENERIC_DYNVC_PLUGIN* base, rdpContext* rcontext, { WLog_ERR(TAG, "context calloc failed!"); HashTable_Free(gfx->SurfaceTable); - gfx->SurfaceTable = NULL; + gfx->SurfaceTable = nullptr; return CHANNEL_RC_NO_MEMORY; } @@ -2323,7 +2323,7 @@ static UINT init_plugin_cb(GENERIC_DYNVC_PLUGIN* base, rdpContext* rcontext, { WLog_ERR(TAG, "zgfx_context_new failed!"); HashTable_Free(gfx->SurfaceTable); - gfx->SurfaceTable = NULL; + gfx->SurfaceTable = nullptr; free(context); return CHANNEL_RC_NO_MEMORY; } @@ -2347,7 +2347,7 @@ static UINT init_plugin_cb(GENERIC_DYNVC_PLUGIN* base, rdpContext* rcontext, void rdpgfx_client_context_free(RdpgfxClientContext* context) { - RDPGFX_PLUGIN* gfx = NULL; + RDPGFX_PLUGIN* gfx = nullptr; if (!context) return; @@ -2360,7 +2360,7 @@ void rdpgfx_client_context_free(RdpgfxClientContext* context) if (gfx->zgfx) { zgfx_context_free(gfx->zgfx); - gfx->zgfx = NULL; + gfx->zgfx = nullptr; } HashTable_Free(gfx->SurfaceTable); @@ -2369,7 +2369,7 @@ void rdpgfx_client_context_free(RdpgfxClientContext* context) static const IWTSVirtualChannelCallback rdpgfx_callbacks = { rdpgfx_on_data_received, rdpgfx_on_open, rdpgfx_on_close, - NULL }; + nullptr }; /** * Function description diff --git a/channels/rdpgfx/server/rdpgfx_main.c b/channels/rdpgfx/server/rdpgfx_main.c index 18817c654..cbb239e9f 100644 --- a/channels/rdpgfx/server/rdpgfx_main.c +++ b/channels/rdpgfx/server/rdpgfx_main.c @@ -125,11 +125,11 @@ static UINT rdpgfx_server_packet_send(RdpgfxServerContext* context, wStream* s) if (SrcSize > UINT32_MAX) return ERROR_INTERNAL_ERROR; - wStream* fs = NULL; + wStream* fs = nullptr; /* Allocate new stream with enough capacity. Additional overhead is * descriptor (1 bytes) + segmentCount (2 bytes) + uncompressedSize (4 bytes) * + segmentCount * size (4 bytes) */ - fs = Stream_New(NULL, SrcSize + 7 + (SrcSize / ZGFX_SEGMENTED_MAXSIZE + 1) * 4); + fs = Stream_New(nullptr, SrcSize + 7 + (SrcSize / ZGFX_SEGMENTED_MAXSIZE + 1) * 4); if (!fs) { @@ -186,9 +186,9 @@ out: static wStream* rdpgfx_server_single_packet_new(wLog* log, UINT16 cmdId, UINT32 dataLen) { UINT error = 0; - wStream* s = NULL; + wStream* s = nullptr; UINT32 pduLength = rdpgfx_pdu_length(dataLen); - s = Stream_New(NULL, pduLength); + s = Stream_New(nullptr, pduLength); if (!s) { @@ -205,7 +205,7 @@ static wStream* rdpgfx_server_single_packet_new(wLog* log, UINT16 cmdId, UINT32 return s; error: Stream_Free(s, TRUE); - return NULL; + return nullptr; } /** @@ -231,8 +231,8 @@ static inline UINT rdpgfx_server_single_packet_send(RdpgfxServerContext* context static UINT rdpgfx_send_caps_confirm_pdu(RdpgfxServerContext* context, const RDPGFX_CAPS_CONFIRM_PDU* capsConfirm) { - wStream* s = NULL; - RDPGFX_CAPSET* capsSet = NULL; + wStream* s = nullptr; + RDPGFX_CAPSET* capsSet = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(capsConfirm); @@ -277,7 +277,7 @@ static UINT rdpgfx_send_reset_graphics_pdu(RdpgfxServerContext* context, if (!checkCapsAreExchanged(context)) return CHANNEL_RC_NOT_INITIALIZED; - wStream* s = NULL; + wStream* s = nullptr; /* Check monitorCount. This ensures total size within 340 bytes) */ if (pdu->monitorCount >= 16) @@ -525,8 +525,8 @@ static inline UINT32 rdpgfx_estimate_h264_avc420(const RDPGFX_AVC420_BITMAP_STRE */ static inline UINT32 rdpgfx_estimate_surface_command(const RDPGFX_SURFACE_COMMAND* cmd) { - RDPGFX_AVC420_BITMAP_STREAM* havc420 = NULL; - RDPGFX_AVC444_BITMAP_STREAM* havc444 = NULL; + RDPGFX_AVC420_BITMAP_STREAM* havc420 = nullptr; + RDPGFX_AVC444_BITMAP_STREAM* havc444 = nullptr; UINT32 h264Size = 0; /* Estimate stream size according to codec. */ @@ -587,8 +587,8 @@ static inline UINT16 rdpgfx_surface_command_cmdid(const RDPGFX_SURFACE_COMMAND* */ static UINT rdpgfx_write_h264_metablock(wLog* log, wStream* s, const RDPGFX_H264_METABLOCK* meta) { - RECTANGLE_16* regionRect = NULL; - RDPGFX_H264_QUANT_QUALITY* quantQualityVal = NULL; + RECTANGLE_16* regionRect = nullptr; + RDPGFX_H264_QUANT_QUALITY* quantQualityVal = nullptr; UINT error = CHANNEL_RC_OK; if (!Stream_EnsureRemainingCapacity(s, 4 + meta->numRegionRects * 10)) @@ -656,8 +656,8 @@ static inline UINT rdpgfx_write_h264_avc420(wLog* log, wStream* s, static UINT rdpgfx_write_surface_command(wLog* log, wStream* s, const RDPGFX_SURFACE_COMMAND* cmd) { UINT error = CHANNEL_RC_OK; - RDPGFX_AVC420_BITMAP_STREAM* havc420 = NULL; - RDPGFX_AVC444_BITMAP_STREAM* havc444 = NULL; + RDPGFX_AVC420_BITMAP_STREAM* havc420 = nullptr; + RDPGFX_AVC444_BITMAP_STREAM* havc444 = nullptr; UINT8 pixelFormat = 0; switch (cmd->format) @@ -788,7 +788,7 @@ static UINT rdpgfx_send_surface_command(RdpgfxServerContext* context, if (!checkCapsAreExchanged(context)) return CHANNEL_RC_NOT_INITIALIZED; UINT error = CHANNEL_RC_OK; - wStream* s = NULL; + wStream* s = nullptr; s = rdpgfx_server_single_packet_new(context->priv->log, rdpgfx_surface_command_cmdid(cmd), rdpgfx_estimate_surface_command(cmd)); @@ -841,7 +841,7 @@ static UINT rdpgfx_send_surface_frame_command(RdpgfxServerContext* context, size += rdpgfx_pdu_length(RDPGFX_END_FRAME_PDU_SIZE); } - wStream* s = Stream_New(NULL, size); + wStream* s = Stream_New(nullptr, size); if (!s) { @@ -951,7 +951,7 @@ static UINT rdpgfx_send_solid_fill_pdu(RdpgfxServerContext* context, if (!checkCapsAreExchanged(context)) return CHANNEL_RC_NOT_INITIALIZED; UINT error = CHANNEL_RC_OK; - RECTANGLE_16* fillRect = NULL; + RECTANGLE_16* fillRect = nullptr; wStream* s = rdpgfx_server_single_packet_new(context->priv->log, RDPGFX_CMDID_SOLIDFILL, 8 + 8 * pdu->fillRectCount); @@ -1002,7 +1002,7 @@ static UINT rdpgfx_send_surface_to_surface_pdu(RdpgfxServerContext* context, if (!checkCapsAreExchanged(context)) return CHANNEL_RC_NOT_INITIALIZED; UINT error = CHANNEL_RC_OK; - RDPGFX_POINT16* destPt = NULL; + RDPGFX_POINT16* destPt = nullptr; wStream* s = rdpgfx_server_single_packet_new(context->priv->log, RDPGFX_CMDID_SURFACETOSURFACE, 14 + 4 * pdu->destPtsCount); @@ -1092,7 +1092,7 @@ static UINT rdpgfx_send_cache_to_surface_pdu(RdpgfxServerContext* context, if (!checkCapsAreExchanged(context)) return CHANNEL_RC_NOT_INITIALIZED; UINT error = CHANNEL_RC_OK; - RDPGFX_POINT16* destPt = NULL; + RDPGFX_POINT16* destPt = nullptr; wStream* s = rdpgfx_server_single_packet_new(context->priv->log, RDPGFX_CMDID_CACHETOSURFACE, 6 + 4 * pdu->destPtsCount); @@ -1242,7 +1242,7 @@ static UINT rdpgfx_recv_cache_import_offer_pdu(RdpgfxServerContext* context, wSt return CHANNEL_RC_NOT_INITIALIZED; RDPGFX_CACHE_IMPORT_OFFER_PDU pdu = WINPR_C_ARRAY_INIT; - RDPGFX_CACHE_ENTRY_METADATA* cacheEntry = NULL; + RDPGFX_CACHE_ENTRY_METADATA* cacheEntry = nullptr; UINT error = CHANNEL_RC_OK; if (!Stream_CheckAndLogRequiredLength(TAG, s, 2)) @@ -1288,7 +1288,7 @@ static UINT rdpgfx_recv_cache_import_offer_pdu(RdpgfxServerContext* context, wSt */ static UINT rdpgfx_recv_caps_advertise_pdu(RdpgfxServerContext* context, wStream* s) { - RDPGFX_CAPSET* capsSets = NULL; + RDPGFX_CAPSET* capsSets = nullptr; RDPGFX_CAPS_ADVERTISE_PDU pdu = WINPR_C_ARRAY_INIT; UINT error = ERROR_INVALID_DATA; @@ -1547,13 +1547,13 @@ static BOOL rdpgfx_server_open(RdpgfxServerContext* context) { WINPR_ASSERT(context); RdpgfxServerPrivate* priv = context->priv; - void* buffer = NULL; + void* buffer = nullptr; WINPR_ASSERT(priv); if (!priv->isOpened) { - PULONG pSessionId = NULL; + PULONG pSessionId = nullptr; DWORD BytesReturned = 0; priv->SessionId = WTS_CURRENT_SESSION; UINT32 channelId = 0; @@ -1616,14 +1616,14 @@ static BOOL rdpgfx_server_open(RdpgfxServerContext* context) priv->activeCapSet = empty; if (priv->ownThread) { - if (!(priv->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL))) + if (!(priv->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr))) { WLog_Print(context->priv->log, WLOG_ERROR, "CreateEvent failed!"); goto fail; } - if (!(priv->thread = - CreateThread(NULL, 0, rdpgfx_server_thread_func, (void*)context, 0, NULL))) + if (!(priv->thread = CreateThread(nullptr, 0, rdpgfx_server_thread_func, (void*)context, + 0, nullptr))) { WLog_Print(context->priv->log, WLOG_ERROR, "CreateThread failed!"); goto fail; @@ -1660,20 +1660,20 @@ BOOL rdpgfx_server_close(RdpgfxServerContext* context) (void)CloseHandle(priv->thread); (void)CloseHandle(priv->stopEvent); - priv->thread = NULL; - priv->stopEvent = NULL; + priv->thread = nullptr; + priv->stopEvent = nullptr; } zgfx_context_free(priv->zgfx); - priv->zgfx = NULL; + priv->zgfx = nullptr; if (priv->rdpgfx_channel) { (void)WTSVirtualChannelClose(priv->rdpgfx_channel); - priv->rdpgfx_channel = NULL; + priv->rdpgfx_channel = nullptr; } - priv->channelEvent = NULL; + priv->channelEvent = nullptr; priv->isOpened = FALSE; priv->isReady = FALSE; const RDPGFX_CAPSET empty = WINPR_C_ARRAY_INIT; @@ -1705,7 +1705,7 @@ RdpgfxServerContext* rdpgfx_server_context_new(HANDLE vcm) if (!context) { WLog_ERR(TAG, "calloc failed!"); - return NULL; + return nullptr; } context->vcm = vcm; @@ -1731,10 +1731,10 @@ RdpgfxServerContext* rdpgfx_server_context_new(HANDLE vcm) context->MapSurfaceToWindow = rdpgfx_send_map_surface_to_window_pdu; context->MapSurfaceToScaledOutput = rdpgfx_send_map_surface_to_scaled_output_pdu; context->MapSurfaceToScaledWindow = rdpgfx_send_map_surface_to_scaled_window_pdu; - context->CapsAdvertise = NULL; + context->CapsAdvertise = nullptr; context->CapsConfirm = rdpgfx_send_caps_confirm_pdu; - context->FrameAcknowledge = NULL; - context->QoeFrameAcknowledge = NULL; + context->FrameAcknowledge = nullptr; + context->QoeFrameAcknowledge = nullptr; RdpgfxServerPrivate* priv = context->priv = (RdpgfxServerPrivate*)calloc(1, sizeof(RdpgfxServerPrivate)); @@ -1749,7 +1749,7 @@ RdpgfxServerContext* rdpgfx_server_context_new(HANDLE vcm) goto fail; /* Create shared input stream */ - priv->input_stream = Stream_New(NULL, 4); + priv->input_stream = Stream_New(nullptr, 4); if (!priv->input_stream) { @@ -1772,7 +1772,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC rdpgfx_server_context_free(context); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void rdpgfx_server_context_free(RdpgfxServerContext* context) @@ -1792,9 +1792,9 @@ void rdpgfx_server_context_free(RdpgfxServerContext* context) HANDLE rdpgfx_server_get_event_handle(RdpgfxServerContext* context) { if (!context) - return NULL; + return nullptr; if (!context->priv) - return NULL; + return nullptr; return context->priv->channelEvent; } @@ -1810,7 +1810,7 @@ HANDLE rdpgfx_server_get_event_handle(RdpgfxServerContext* context) UINT rdpgfx_server_handle_messages(RdpgfxServerContext* context) { DWORD BytesReturned = 0; - void* buffer = NULL; + void* buffer = nullptr; UINT ret = CHANNEL_RC_OK; WINPR_ASSERT(context); @@ -1841,7 +1841,7 @@ UINT rdpgfx_server_handle_messages(RdpgfxServerContext* context) { Stream_SetPosition(s, 0); - if (!WTSVirtualChannelRead(priv->rdpgfx_channel, 0, NULL, 0, &BytesReturned)) + if (!WTSVirtualChannelRead(priv->rdpgfx_channel, 0, nullptr, 0, &BytesReturned)) { if (GetLastError() == ERROR_NO_DATA) return ERROR_NO_DATA; diff --git a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c index 1cdd6021b..3bf4a218a 100644 --- a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c +++ b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c @@ -70,7 +70,7 @@ typedef struct static int rdpsnd_alsa_set_hw_params(rdpsndAlsaPlugin* alsa) { int status = 0; - snd_pcm_hw_params_t* hw_params = NULL; + snd_pcm_hw_params_t* hw_params = nullptr; snd_pcm_uframes_t buffer_size_max = 0; status = snd_pcm_hw_params_malloc(&hw_params); SND_PCM_CHECK("snd_pcm_hw_params_malloc", status); @@ -84,7 +84,8 @@ static int rdpsnd_alsa_set_hw_params(rdpsndAlsaPlugin* alsa) status = snd_pcm_hw_params_set_format(alsa->pcm_handle, hw_params, alsa->format); SND_PCM_CHECK("snd_pcm_hw_params_set_format", status); /* Set sample rate */ - status = snd_pcm_hw_params_set_rate_near(alsa->pcm_handle, hw_params, &alsa->actual_rate, NULL); + status = + snd_pcm_hw_params_set_rate_near(alsa->pcm_handle, hw_params, &alsa->actual_rate, nullptr); SND_PCM_CHECK("snd_pcm_hw_params_set_rate_near", status); /* Set number of channels */ status = snd_pcm_hw_params_set_channels(alsa->pcm_handle, hw_params, alsa->actual_channels); @@ -129,7 +130,7 @@ static int rdpsnd_alsa_set_hw_params(rdpsndAlsaPlugin* alsa) SND_PCM_CHECK("snd_pcm_hw_params_set_buffer_size_near", status); /* Set period size */ status = snd_pcm_hw_params_set_period_size_near(alsa->pcm_handle, hw_params, &alsa->period_size, - NULL); + nullptr); SND_PCM_CHECK("snd_pcm_hw_params_set_period_size_near", status); status = snd_pcm_hw_params(alsa->pcm_handle, hw_params); SND_PCM_CHECK("snd_pcm_hw_params", status); @@ -140,7 +141,7 @@ static int rdpsnd_alsa_set_hw_params(rdpsndAlsaPlugin* alsa) static int rdpsnd_alsa_set_sw_params(rdpsndAlsaPlugin* alsa) { int status = 0; - snd_pcm_sw_params_t* sw_params = NULL; + snd_pcm_sw_params_t* sw_params = nullptr; status = snd_pcm_sw_params_malloc(&sw_params); SND_PCM_CHECK("snd_pcm_sw_params_malloc", status); status = snd_pcm_sw_params_current(alsa->pcm_handle, sw_params); @@ -226,7 +227,7 @@ static void rdpsnd_alsa_close_mixer(rdpsndAlsaPlugin* alsa) if (alsa && alsa->mixer_handle) { snd_mixer_close(alsa->mixer_handle); - alsa->mixer_handle = NULL; + alsa->mixer_handle = nullptr; } } @@ -253,7 +254,7 @@ static BOOL rdpsnd_alsa_open_mixer(rdpsndAlsaPlugin* alsa) goto fail; } - status = snd_mixer_selem_register(alsa->mixer_handle, NULL, NULL); + status = snd_mixer_selem_register(alsa->mixer_handle, nullptr, nullptr); if (status < 0) { @@ -281,7 +282,7 @@ static void rdpsnd_alsa_pcm_close(rdpsndAlsaPlugin* alsa) { snd_pcm_drain(alsa->pcm_handle); snd_pcm_close(alsa->pcm_handle); - alsa->pcm_handle = 0; + alsa->pcm_handle = nullptr; } } @@ -442,7 +443,7 @@ static UINT rdpsnd_alsa_play(rdpsndDevicePlugin* device, const BYTE* data, size_ { WLog_ERR(TAG, "status: %ld\n", status); rdpsnd_alsa_close(device); - rdpsnd_alsa_open(device, NULL, alsa->latency); + rdpsnd_alsa_open(device, nullptr, alsa->latency); break; } @@ -470,15 +471,16 @@ static UINT rdpsnd_alsa_parse_addin_args(rdpsndDevicePlugin* device, const ADDIN { int status = 0; DWORD flags = 0; - const COMMAND_LINE_ARGUMENT_A* arg = NULL; + const COMMAND_LINE_ARGUMENT_A* arg = nullptr; rdpsndAlsaPlugin* alsa = (rdpsndAlsaPlugin*)device; - COMMAND_LINE_ARGUMENT_A rdpsnd_alsa_args[] = { { "dev", COMMAND_LINE_VALUE_REQUIRED, "", - NULL, NULL, -1, NULL, "device" }, - { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } }; + COMMAND_LINE_ARGUMENT_A rdpsnd_alsa_args[] = { + { "dev", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, "device" }, + { nullptr, 0, nullptr, nullptr, nullptr, -1, nullptr, nullptr } + }; flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON | COMMAND_LINE_IGN_UNKNOWN_KEYWORD; - status = CommandLineParseArgumentsA(args->argc, args->argv, rdpsnd_alsa_args, flags, alsa, NULL, - NULL); + status = CommandLineParseArgumentsA(args->argc, args->argv, rdpsnd_alsa_args, flags, alsa, + nullptr, nullptr); if (status < 0) { @@ -501,7 +503,7 @@ static UINT rdpsnd_alsa_parse_addin_args(rdpsndDevicePlugin* device, const ADDIN return CHANNEL_RC_NO_MEMORY; } CommandLineSwitchEnd(arg) - } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); + } while ((arg = CommandLineFindNextArgumentA(arg)) != nullptr); return CHANNEL_RC_OK; } @@ -514,8 +516,8 @@ static UINT rdpsnd_alsa_parse_addin_args(rdpsndDevicePlugin* device, const ADDIN FREERDP_ENTRY_POINT(UINT VCAPITYPE alsa_freerdp_rdpsnd_client_subsystem_entry( PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)) { - const ADDIN_ARGV* args = NULL; - rdpsndAlsaPlugin* alsa = NULL; + const ADDIN_ARGV* args = nullptr; + rdpsndAlsaPlugin* alsa = nullptr; UINT error = 0; alsa = (rdpsndAlsaPlugin*)calloc(1, sizeof(rdpsndAlsaPlugin)); @@ -555,7 +557,7 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE alsa_freerdp_rdpsnd_client_subsystem_entry( } } - alsa->pcm_handle = 0; + alsa->pcm_handle = nullptr; alsa->actual_rate = 22050; alsa->format = SND_PCM_FORMAT_S16_LE; alsa->actual_channels = 2; diff --git a/channels/rdpsnd/client/fake/rdpsnd_fake.c b/channels/rdpsnd/client/fake/rdpsnd_fake.c index 803ee9544..e1f1d6fb9 100644 --- a/channels/rdpsnd/client/fake/rdpsnd_fake.c +++ b/channels/rdpsnd/client/fake/rdpsnd_fake.c @@ -86,12 +86,13 @@ static UINT rdpsnd_fake_parse_addin_args(rdpsndFakePlugin* fake, const ADDIN_ARG { int status = 0; DWORD flags = 0; - const COMMAND_LINE_ARGUMENT_A* arg = NULL; - COMMAND_LINE_ARGUMENT_A rdpsnd_fake_args[] = { { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } }; + const COMMAND_LINE_ARGUMENT_A* arg = nullptr; + COMMAND_LINE_ARGUMENT_A rdpsnd_fake_args[] = { { nullptr, 0, nullptr, nullptr, nullptr, -1, + nullptr, nullptr } }; flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON | COMMAND_LINE_IGN_UNKNOWN_KEYWORD; - status = CommandLineParseArgumentsA(args->argc, args->argv, rdpsnd_fake_args, flags, fake, NULL, - NULL); + status = CommandLineParseArgumentsA(args->argc, args->argv, rdpsnd_fake_args, flags, fake, + nullptr, nullptr); if (status < 0) return ERROR_INVALID_DATA; @@ -104,7 +105,7 @@ static UINT rdpsnd_fake_parse_addin_args(rdpsndFakePlugin* fake, const ADDIN_ARG continue; CommandLineSwitchStart(arg) CommandLineSwitchEnd(arg) - } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); + } while ((arg = CommandLineFindNextArgumentA(arg)) != nullptr); return CHANNEL_RC_OK; } @@ -117,8 +118,8 @@ static UINT rdpsnd_fake_parse_addin_args(rdpsndFakePlugin* fake, const ADDIN_ARG FREERDP_ENTRY_POINT(UINT VCAPITYPE fake_freerdp_rdpsnd_client_subsystem_entry( PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)) { - const ADDIN_ARGV* args = NULL; - rdpsndFakePlugin* fake = NULL; + const ADDIN_ARGV* args = nullptr; + rdpsndFakePlugin* fake = nullptr; UINT ret = CHANNEL_RC_OK; fake = (rdpsndFakePlugin*)calloc(1, sizeof(rdpsndFakePlugin)); diff --git a/channels/rdpsnd/client/ios/TPCircularBuffer.h b/channels/rdpsnd/client/ios/TPCircularBuffer.h index cc338a67f..0e388400e 100644 --- a/channels/rdpsnd/client/ios/TPCircularBuffer.h +++ b/channels/rdpsnd/client/ios/TPCircularBuffer.h @@ -100,14 +100,14 @@ extern "C" * * @param buffer Circular buffer * @param availableBytes On output, the number of bytes ready for reading - * @return Pointer to the first bytes ready for reading, or NULL if buffer is empty + * @return Pointer to the first bytes ready for reading, or nullptr if buffer is empty */ static inline __attribute__((always_inline)) void* TPCircularBufferTail(TPCircularBuffer* buffer, int32_t* availableBytes) { *availableBytes = buffer->fillCount; if (*availableBytes == 0) - return NULL; + return nullptr; return (void*)((char*)buffer->buffer + buffer->tail); } @@ -147,14 +147,14 @@ extern "C" * * @param buffer Circular buffer * @param availableBytes On output, the number of bytes ready for writing - * @return Pointer to the first bytes ready for writing, or NULL if buffer is full + * @return Pointer to the first bytes ready for writing, or nullptr if buffer is full */ static inline __attribute__((always_inline)) void* TPCircularBufferHead(TPCircularBuffer* buffer, int32_t* availableBytes) { *availableBytes = (buffer->length - buffer->fillCount); if (*availableBytes == 0) - return NULL; + return nullptr; return (void*)((char*)buffer->buffer + buffer->head); } diff --git a/channels/rdpsnd/client/ios/rdpsnd_ios.c b/channels/rdpsnd/client/ios/rdpsnd_ios.c index d259867d9..7dfca839a 100644 --- a/channels/rdpsnd/client/ios/rdpsnd_ios.c +++ b/channels/rdpsnd/client/ios/rdpsnd_ios.c @@ -63,7 +63,7 @@ static OSStatus rdpsnd_ios_render_cb(void* inRefCon, int32_t available_bytes = 0; const void* buffer = TPCircularBufferTail(&p->buffer, &available_bytes); - if (buffer != NULL && available_bytes > 0) + if (buffer != nullptr && available_bytes > 0) { const int bytes_to_copy = MIN((int32_t)target_buffer->mDataByteSize, available_bytes); memcpy(target_buffer->mData, buffer, bytes_to_copy); @@ -158,9 +158,9 @@ static BOOL rdpsnd_ios_open(rdpsndDevicePlugin* device, const AUDIO_FORMAT* form desc.componentSubType = kAudioUnitSubType_RemoteIO; desc.componentFlags = 0; desc.componentFlagsMask = 0; - AudioComponent audioComponent = AudioComponentFindNext(NULL, &desc); + AudioComponent audioComponent = AudioComponentFindNext(nullptr, &desc); - if (audioComponent == NULL) + if (audioComponent == nullptr) return FALSE; /* Open the audio unit. */ @@ -185,7 +185,7 @@ static BOOL rdpsnd_ios_open(rdpsndDevicePlugin* device, const AUDIO_FORMAT* form if (status != 0) { AudioComponentInstanceDispose(p->audio_unit); - p->audio_unit = NULL; + p->audio_unit = nullptr; return FALSE; } @@ -200,7 +200,7 @@ static BOOL rdpsnd_ios_open(rdpsndDevicePlugin* device, const AUDIO_FORMAT* form if (status != 0) { AudioComponentInstanceDispose(p->audio_unit); - p->audio_unit = NULL; + p->audio_unit = nullptr; return FALSE; } @@ -210,7 +210,7 @@ static BOOL rdpsnd_ios_open(rdpsndDevicePlugin* device, const AUDIO_FORMAT* form if (status != 0) { AudioComponentInstanceDispose(p->audio_unit); - p->audio_unit = NULL; + p->audio_unit = nullptr; return FALSE; } @@ -221,7 +221,7 @@ static BOOL rdpsnd_ios_open(rdpsndDevicePlugin* device, const AUDIO_FORMAT* form { AudioUnitUninitialize(p->audio_unit); AudioComponentInstanceDispose(p->audio_unit); - p->audio_unit = NULL; + p->audio_unit = nullptr; return FALSE; } @@ -241,7 +241,7 @@ static void rdpsnd_ios_close(rdpsndDevicePlugin* device) /* Close the device. */ AudioUnitUninitialize(p->audio_unit); AudioComponentInstanceDispose(p->audio_unit); - p->audio_unit = NULL; + p->audio_unit = nullptr; p->is_opened = 0; /* Destroy the circular buffer. */ TPCircularBufferCleanup(&p->buffer); diff --git a/channels/rdpsnd/client/mac/rdpsnd_mac.m b/channels/rdpsnd/client/mac/rdpsnd_mac.m index 89e02c2d5..1c915e17f 100644 --- a/channels/rdpsnd/client/mac/rdpsnd_mac.m +++ b/channels/rdpsnd/client/mac/rdpsnd_mac.m @@ -127,11 +127,11 @@ static void rdpsnd_mac_release(rdpsndMacPlugin *mac) { if (mac->player) [mac->player release]; - mac->player = NULL; + mac->player = nullptr; if (mac->engine) [mac->engine release]; - mac->engine = NULL; + mac->engine = nullptr; } static BOOL rdpsnd_mac_open(rdpsndDevicePlugin *device, const AUDIO_FORMAT *format, UINT32 latency) @@ -160,7 +160,7 @@ static BOOL rdpsnd_mac_open(rdpsndDevicePlugin *device, const AUDIO_FORMAT *form return FALSE; propertySize = sizeof(outputDeviceID); - err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, + err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, nullptr, &propertySize, &outputDeviceID); if (err) { diff --git a/channels/rdpsnd/client/opensles/opensl_io.c b/channels/rdpsnd/client/opensles/opensl_io.c index 70da341b3..8dcbb1d11 100644 --- a/channels/rdpsnd/client/opensles/opensl_io.c +++ b/channels/rdpsnd/client/opensles/opensl_io.c @@ -41,7 +41,7 @@ static SLresult openSLCreateEngine(OPENSL_STREAM* p) { SLresult result; // create engine - result = slCreateEngine(&(p->engineObject), 0, NULL, 0, NULL, NULL); + result = slCreateEngine(&(p->engineObject), 0, nullptr, 0, nullptr, nullptr); DEBUG_SND("engineObject=%p", (void*)p->engineObject); if (result != SL_RESULT_SUCCESS) @@ -169,7 +169,7 @@ static SLresult openSLPlayOpen(OPENSL_STREAM* p) SLDataSource audioSrc = { &loc_bufq, &format_pcm }; // configure audio sink SLDataLocator_OutputMix loc_outmix = { SL_DATALOCATOR_OUTPUTMIX, p->outputMixObject }; - SLDataSink audioSnk = { &loc_outmix, NULL }; + SLDataSink audioSnk = { &loc_outmix, nullptr }; // create audio player const SLInterfaceID ids1[] = { SL_IID_ANDROIDSIMPLEBUFFERQUEUE, SL_IID_VOLUME }; const SLboolean req1[] = { SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE }; @@ -243,29 +243,29 @@ static SLresult openSLPlayOpen(OPENSL_STREAM* p) static void openSLDestroyEngine(OPENSL_STREAM* p) { // destroy buffer queue audio player object, and invalidate all associated interfaces - if (p->bqPlayerObject != NULL) + if (p->bqPlayerObject != nullptr) { (*p->bqPlayerObject)->Destroy(p->bqPlayerObject); - p->bqPlayerObject = NULL; - p->bqPlayerVolume = NULL; - p->bqPlayerPlay = NULL; - p->bqPlayerBufferQueue = NULL; - p->bqPlayerEffectSend = NULL; + p->bqPlayerObject = nullptr; + p->bqPlayerVolume = nullptr; + p->bqPlayerPlay = nullptr; + p->bqPlayerBufferQueue = nullptr; + p->bqPlayerEffectSend = nullptr; } // destroy output mix object, and invalidate all associated interfaces - if (p->outputMixObject != NULL) + if (p->outputMixObject != nullptr) { (*p->outputMixObject)->Destroy(p->outputMixObject); - p->outputMixObject = NULL; + p->outputMixObject = nullptr; } // destroy engine object, and invalidate all associated interfaces - if (p->engineObject != NULL) + if (p->engineObject != nullptr) { (*p->engineObject)->Destroy(p->engineObject); - p->engineObject = NULL; - p->engineEngine = NULL; + p->engineObject = nullptr; + p->engineEngine = nullptr; } } @@ -276,7 +276,7 @@ OPENSL_STREAM* android_OpenAudioDevice(int sr, int outchannels, int bufferframes p = (OPENSL_STREAM*)calloc(1, sizeof(OPENSL_STREAM)); if (!p) - return NULL; + return nullptr; p->queuesize = bufferframes; p->outchannels = outchannels; @@ -285,13 +285,13 @@ OPENSL_STREAM* android_OpenAudioDevice(int sr, int outchannels, int bufferframes if (openSLCreateEngine(p) != SL_RESULT_SUCCESS) { android_CloseAudioDevice(p); - return NULL; + return nullptr; } if (openSLPlayOpen(p) != SL_RESULT_SUCCESS) { android_CloseAudioDevice(p); - return NULL; + return nullptr; } p->queue = Queue_New(TRUE, -1, -1); @@ -299,7 +299,7 @@ OPENSL_STREAM* android_OpenAudioDevice(int sr, int outchannels, int bufferframes if (!p->queue) { android_CloseAudioDevice(p); - return NULL; + return nullptr; } return p; @@ -308,7 +308,7 @@ OPENSL_STREAM* android_OpenAudioDevice(int sr, int outchannels, int bufferframes // close the android audio device void android_CloseAudioDevice(OPENSL_STREAM* p) { - if (p == NULL) + if (p == nullptr) return; openSLDestroyEngine(p); diff --git a/channels/rdpsnd/client/opensles/rdpsnd_opensles.c b/channels/rdpsnd/client/opensles/rdpsnd_opensles.c index 7ae66513b..70762eedf 100644 --- a/channels/rdpsnd/client/opensles/rdpsnd_opensles.c +++ b/channels/rdpsnd/client/opensles/rdpsnd_opensles.c @@ -160,7 +160,7 @@ static void rdpsnd_opensles_close(rdpsndDevicePlugin* device) return; android_CloseAudioDevice(opensles->stream); - opensles->stream = NULL; + opensles->stream = nullptr; } static void rdpsnd_opensles_free(rdpsndDevicePlugin* device) @@ -289,8 +289,8 @@ static int rdpsnd_opensles_parse_addin_args(rdpsndDevicePlugin* device, const AD { rdpsndopenslesPlugin* opensles = (rdpsndopenslesPlugin*)device; COMMAND_LINE_ARGUMENT_A rdpsnd_opensles_args[] = { - { "dev", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "device" }, - { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } + { "dev", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, "device" }, + { nullptr, 0, nullptr, nullptr, nullptr, -1, nullptr, nullptr } }; WINPR_ASSERT(opensles); @@ -299,7 +299,7 @@ static int rdpsnd_opensles_parse_addin_args(rdpsndDevicePlugin* device, const AD const DWORD flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON | COMMAND_LINE_IGN_UNKNOWN_KEYWORD; const int status = CommandLineParseArgumentsA(args->argc, args->argv, rdpsnd_opensles_args, - flags, opensles, NULL, NULL); + flags, opensles, nullptr, nullptr); if (status < 0) return status; @@ -319,7 +319,7 @@ static int rdpsnd_opensles_parse_addin_args(rdpsndDevicePlugin* device, const AD return ERROR_OUTOFMEMORY; } CommandLineSwitchEnd(arg) - } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); + } while ((arg = CommandLineFindNextArgumentA(arg)) != nullptr); return status; } diff --git a/channels/rdpsnd/client/oss/rdpsnd_oss.c b/channels/rdpsnd/client/oss/rdpsnd_oss.c index b89b45e5b..2c872ad0b 100644 --- a/channels/rdpsnd/client/oss/rdpsnd_oss.c +++ b/channels/rdpsnd/client/oss/rdpsnd_oss.c @@ -100,7 +100,7 @@ static BOOL rdpsnd_oss_format_supported(rdpsndDevicePlugin* device, const AUDIO_ int req_fmt = 0; rdpsndOssPlugin* oss = (rdpsndOssPlugin*)device; - if (device == NULL || format == NULL) + if (device == nullptr || format == nullptr) return FALSE; switch (format->wFormatTag) @@ -140,7 +140,7 @@ static BOOL rdpsnd_oss_set_format(rdpsndDevicePlugin* device, const AUDIO_FORMAT int tmp = 0; rdpsndOssPlugin* oss = (rdpsndOssPlugin*)device; - if (device == NULL || oss->pcm_handle == -1 || format == NULL) + if (device == nullptr || oss->pcm_handle == -1 || format == nullptr) return FALSE; oss->latency = latency; @@ -212,7 +212,7 @@ static BOOL rdpsnd_oss_open(rdpsndDevicePlugin* device, const AUDIO_FORMAT* form char dev_name[PATH_MAX] = "/dev/dsp"; rdpsndOssPlugin* oss = (rdpsndOssPlugin*)device; - if (device == NULL || oss->pcm_handle != -1) + if (device == nullptr || oss->pcm_handle != -1) return TRUE; if (oss->dev_unit != -1) @@ -244,7 +244,7 @@ static void rdpsnd_oss_close(rdpsndDevicePlugin* device) { rdpsndOssPlugin* oss = (rdpsndOssPlugin*)device; - if (device == NULL) + if (device == nullptr) return; if (oss->pcm_handle != -1) @@ -266,7 +266,7 @@ static void rdpsnd_oss_free(rdpsndDevicePlugin* device) { rdpsndOssPlugin* oss = (rdpsndOssPlugin*)device; - if (device == NULL) + if (device == nullptr) return; rdpsnd_oss_close(device); @@ -284,7 +284,7 @@ static UINT32 rdpsnd_oss_get_volume(rdpsndDevicePlugin* device) UINT32 dwVolumeRight = ((50 * 0xFFFF) / 100); /* 50% */ UINT32 dwVolume = ((dwVolumeLeft << 16) | dwVolumeRight); - if (device == NULL || oss->mixer_handle == -1) + if (device == nullptr || oss->mixer_handle == -1) return dwVolume; if (ioctl(oss->mixer_handle, MIXER_READ(SOUND_MIXER_VOLUME), &vol) == -1) @@ -304,7 +304,7 @@ static BOOL rdpsnd_oss_set_volume(rdpsndDevicePlugin* device, UINT32 value) rdpsndOssPlugin* oss = (rdpsndOssPlugin*)device; WINPR_ASSERT(oss); - if (device == NULL || oss->mixer_handle == -1) + if (device == nullptr || oss->mixer_handle == -1) return FALSE; unsigned left = (((value & 0xFFFF) * 100) / 0xFFFF); @@ -325,7 +325,7 @@ static UINT rdpsnd_oss_play(rdpsndDevicePlugin* device, const BYTE* data, size_t { rdpsndOssPlugin* oss = (rdpsndOssPlugin*)device; - if (device == NULL || oss->mixer_handle == -1) + if (device == nullptr || oss->mixer_handle == -1) return 0; while (size > 0) @@ -336,7 +336,7 @@ static UINT rdpsnd_oss_play(rdpsndDevicePlugin* device, const BYTE* data, size_t { OSS_LOG_ERR("write fail", errno); rdpsnd_oss_close(device); - rdpsnd_oss_open(device, NULL, oss->latency); + rdpsnd_oss_open(device, nullptr, oss->latency); break; } @@ -354,18 +354,19 @@ static UINT rdpsnd_oss_play(rdpsndDevicePlugin* device, const BYTE* data, size_t static int rdpsnd_oss_parse_addin_args(rdpsndDevicePlugin* device, const ADDIN_ARGV* args) { int status = 0; - char* str_num = NULL; - char* eptr = NULL; + char* str_num = nullptr; + char* eptr = nullptr; DWORD flags = 0; - const COMMAND_LINE_ARGUMENT_A* arg = NULL; + const COMMAND_LINE_ARGUMENT_A* arg = nullptr; rdpsndOssPlugin* oss = (rdpsndOssPlugin*)device; - COMMAND_LINE_ARGUMENT_A rdpsnd_oss_args[] = { { "dev", COMMAND_LINE_VALUE_REQUIRED, "", - NULL, NULL, -1, NULL, "device" }, - { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } }; + COMMAND_LINE_ARGUMENT_A rdpsnd_oss_args[] = { + { "dev", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, "device" }, + { nullptr, 0, nullptr, nullptr, nullptr, -1, nullptr, nullptr } + }; flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON | COMMAND_LINE_IGN_UNKNOWN_KEYWORD; - status = - CommandLineParseArgumentsA(args->argc, args->argv, rdpsnd_oss_args, flags, oss, NULL, NULL); + status = CommandLineParseArgumentsA(args->argc, args->argv, rdpsnd_oss_args, flags, oss, + nullptr, nullptr); if (status < 0) return status; @@ -403,7 +404,7 @@ static int rdpsnd_oss_parse_addin_args(rdpsndDevicePlugin* device, const ADDIN_A free(str_num); } CommandLineSwitchEnd(arg) - } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); + } while ((arg = CommandLineFindNextArgumentA(arg)) != nullptr); return status; } @@ -416,7 +417,7 @@ static int rdpsnd_oss_parse_addin_args(rdpsndDevicePlugin* device, const ADDIN_A FREERDP_ENTRY_POINT(UINT VCAPITYPE oss_freerdp_rdpsnd_client_subsystem_entry( PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints)) { - const ADDIN_ARGV* args = NULL; + const ADDIN_ARGV* args = nullptr; rdpsndOssPlugin* oss = (rdpsndOssPlugin*)calloc(1, sizeof(rdpsndOssPlugin)); if (!oss) diff --git a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c index 72ace7b85..bbf15368b 100644 --- a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c +++ b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c @@ -66,7 +66,7 @@ static BOOL rdpsnd_check_pulse(rdpsndPulsePlugin* pulse, BOOL haveStream) if (!pulse->context) { - WLog_WARN(TAG, "pulse->context=NULL"); + WLog_WARN(TAG, "pulse->context=nullptr"); rc = FALSE; } @@ -144,9 +144,9 @@ static void rdpsnd_pulse_context_state_callback(pa_context* context, void* userd case PA_CONTEXT_FAILED: // Destroy context now, create new one for next connection attempt pa_context_unref(pulse->context); - pulse->context = NULL; + pulse->context = nullptr; if (pulse->reconnect_delay_seconds >= 0) - pulse->reconnect_time = time(NULL) + pulse->reconnect_delay_seconds; + pulse->reconnect_time = time(nullptr) + pulse->reconnect_delay_seconds; pa_threaded_mainloop_signal(pulse->mainloop, 0); break; @@ -162,7 +162,7 @@ static void rdpsnd_pulse_context_state_callback(pa_context* context, void* userd static BOOL rdpsnd_pulse_connect(rdpsndDevicePlugin* device) { BOOL rc = 0; - pa_operation* o = NULL; + pa_operation* o = nullptr; pa_context_state_t state = PA_CONTEXT_FAILED; rdpsndPulsePlugin* pulse = (rdpsndPulsePlugin*)device; @@ -171,7 +171,7 @@ static BOOL rdpsnd_pulse_connect(rdpsndDevicePlugin* device) pa_threaded_mainloop_lock(pulse->mainloop); - if (pa_context_connect(pulse->context, NULL, PA_CONTEXT_NOFLAGS, NULL) < 0) + if (pa_context_connect(pulse->context, nullptr, PA_CONTEXT_NOFLAGS, nullptr) < 0) { pa_threaded_mainloop_unlock(pulse->mainloop); return FALSE; @@ -257,7 +257,7 @@ static void rdpsnd_pulse_stream_state_callback(pa_stream* stream, void* userdata case PA_STREAM_FAILED: case PA_STREAM_TERMINATED: // Stream object is about to be destroyed, clean up our pointer - pulse->stream = NULL; + pulse->stream = nullptr; pa_threaded_mainloop_signal(pulse->mainloop, 0); break; @@ -294,7 +294,7 @@ static void rdpsnd_pulse_close(rdpsndDevicePlugin* device) pulse, pa_stream_drain(pulse->stream, rdpsnd_pulse_stream_success_callback, pulse)); pa_stream_disconnect(pulse->stream); pa_stream_unref(pulse->stream); - pulse->stream = NULL; + pulse->stream = nullptr; } pa_threaded_mainloop_unlock(pulse->mainloop); } @@ -376,7 +376,7 @@ static BOOL rdpsnd_pulse_open_stream(rdpsndDevicePlugin* device) if (!pulse->context) { pa_threaded_mainloop_unlock(pulse->mainloop); - if (pulse->reconnect_delay_seconds >= 0 && time(NULL) - pulse->reconnect_time >= 0) + if (pulse->reconnect_delay_seconds >= 0 && time(nullptr) - pulse->reconnect_time >= 0) rdpsnd_pulse_context_connect(device); pa_threaded_mainloop_lock(pulse->mainloop); } @@ -387,7 +387,7 @@ static BOOL rdpsnd_pulse_open_stream(rdpsndDevicePlugin* device) return FALSE; } - pulse->stream = pa_stream_new(pulse->context, pulse->stream_name, &pulse->sample_spec, NULL); + pulse->stream = pa_stream_new(pulse->context, pulse->stream_name, &pulse->sample_spec, nullptr); if (!pulse->stream) { @@ -414,12 +414,12 @@ static BOOL rdpsnd_pulse_open_stream(rdpsndDevicePlugin* device) // NOLINTNEXTLINE(clang-analyzer-optin.core.EnumCastOutOfRange) pa_stream_flags_t eflags = (pa_stream_flags_t)flags; if (pa_stream_connect_playback(pulse->stream, pulse->device_name, - pulse->latency > 0 ? &buffer_attr : NULL, eflags, NULL, - NULL) < 0) + pulse->latency > 0 ? &buffer_attr : nullptr, eflags, nullptr, + nullptr) < 0) { WLog_ERR(TAG, "error connecting playback stream"); pa_stream_unref(pulse->stream); - pulse->stream = NULL; + pulse->stream = nullptr; pa_threaded_mainloop_unlock(pulse->mainloop); return FALSE; } @@ -482,13 +482,13 @@ static void rdpsnd_pulse_free(rdpsndDevicePlugin* device) { pa_context_disconnect(pulse->context); pa_context_unref(pulse->context); - pulse->context = NULL; + pulse->context = nullptr; } if (pulse->mainloop) { pa_threaded_mainloop_free(pulse->mainloop); - pulse->mainloop = NULL; + pulse->mainloop = nullptr; } free(pulse->device_name); @@ -506,7 +506,7 @@ static BOOL rdpsnd_pulse_default_format(rdpsndDevicePlugin* device, const AUDIO_ return FALSE; *defaultFormat = *desired; - defaultFormat->data = NULL; + defaultFormat->data = nullptr; defaultFormat->cbSize = 0; defaultFormat->wFormatTag = WAVE_FORMAT_PCM; if ((defaultFormat->nChannels < 1) || (defaultFormat->nChannels > PA_CHANNELS_MAX)) @@ -547,7 +547,7 @@ BOOL rdpsnd_pulse_format_supported(rdpsndDevicePlugin* device, const AUDIO_FORMA static UINT32 rdpsnd_pulse_get_volume(rdpsndDevicePlugin* device) { - pa_operation* o = NULL; + pa_operation* o = nullptr; rdpsndPulsePlugin* pulse = (rdpsndPulsePlugin*)device; if (!rdpsnd_check_pulse(pulse, FALSE)) @@ -577,7 +577,7 @@ static BOOL rdpsnd_pulse_set_volume(rdpsndDevicePlugin* device, UINT32 value) pa_cvolume cv = WINPR_C_ARRAY_INIT; pa_volume_t left = 0; pa_volume_t right = 0; - pa_operation* operation = NULL; + pa_operation* operation = nullptr; rdpsndPulsePlugin* pulse = (rdpsndPulsePlugin*)device; if (!rdpsnd_check_pulse(pulse, TRUE)) @@ -606,7 +606,7 @@ static BOOL rdpsnd_pulse_set_volume(rdpsndDevicePlugin* device, UINT32 value) static UINT rdpsnd_pulse_play(rdpsndDevicePlugin* device, const BYTE* data, size_t size) { size_t length = 0; - void* pa_data = NULL; + void* pa_data = nullptr; int status = 0; pa_usec_t latency = 0; int negative = 0; @@ -637,7 +637,7 @@ static UINT rdpsnd_pulse_play(rdpsndDevicePlugin* device, const BYTE* data, size memcpy(pa_data, data, length); - status = pa_stream_write(pulse->stream, pa_data, length, NULL, 0LL, PA_SEEK_RELATIVE); + status = pa_stream_write(pulse->stream, pa_data, length, nullptr, 0LL, PA_SEEK_RELATIVE); if (status < 0) { @@ -662,14 +662,14 @@ static UINT rdpsnd_pulse_play(rdpsndDevicePlugin* device, const BYTE* data, size static UINT rdpsnd_pulse_parse_addin_args(rdpsndPulsePlugin* pulse, const ADDIN_ARGV* args) { COMMAND_LINE_ARGUMENT_A rdpsnd_pulse_args[] = { - { "dev", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "device" }, - { "reconnect_delay_seconds", COMMAND_LINE_VALUE_REQUIRED, "", NULL, - NULL, -1, NULL, "reconnect_delay_seconds" }, - { "client_name", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, - "name of pulse client" }, - { "stream_name", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, - "name of pulse stream" }, - { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } + { "dev", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, "device" }, + { "reconnect_delay_seconds", COMMAND_LINE_VALUE_REQUIRED, "", + nullptr, nullptr, -1, nullptr, "reconnect_delay_seconds" }, + { "client_name", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, + nullptr, "name of pulse client" }, + { "stream_name", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, + nullptr, "name of pulse stream" }, + { nullptr, 0, nullptr, nullptr, nullptr, -1, nullptr, nullptr } }; const DWORD flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON | COMMAND_LINE_IGN_UNKNOWN_KEYWORD; @@ -678,15 +678,15 @@ static UINT rdpsnd_pulse_parse_addin_args(rdpsndPulsePlugin* pulse, const ADDIN_ WINPR_ASSERT(args); const int status = CommandLineParseArgumentsA(args->argc, args->argv, rdpsnd_pulse_args, flags, - pulse, NULL, NULL); + pulse, nullptr, nullptr); if (status < 0) return ERROR_INVALID_DATA; const COMMAND_LINE_ARGUMENT_A* arg = rdpsnd_pulse_args; - const char* client_name = NULL; - const char* stream_name = NULL; + const char* client_name = nullptr; + const char* stream_name = nullptr; do { if (!(arg->Flags & COMMAND_LINE_VALUE_PRESENT)) @@ -701,7 +701,7 @@ static UINT rdpsnd_pulse_parse_addin_args(rdpsndPulsePlugin* pulse, const ADDIN_ } CommandLineSwitchCase(arg, "reconnect_delay_seconds") { - unsigned long val = strtoul(arg->Value, NULL, 0); + unsigned long val = strtoul(arg->Value, nullptr, 0); if ((errno != 0) || (val > INT32_MAX)) return ERROR_INVALID_DATA; @@ -717,7 +717,7 @@ static UINT rdpsnd_pulse_parse_addin_args(rdpsndPulsePlugin* pulse, const ADDIN_ stream_name = arg->Value; } CommandLineSwitchEnd(arg) - } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); + } while ((arg = CommandLineFindNextArgumentA(arg)) != nullptr); if (!client_name) client_name = freerdp_getApplicationDetailsString(); @@ -760,7 +760,7 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE pulse_freerdp_rdpsnd_client_subsystem_entry( } pulse->reconnect_delay_seconds = 5; - pulse->reconnect_time = time(NULL); + pulse->reconnect_time = time(nullptr); ret = CHANNEL_RC_NO_MEMORY; pulse->mainloop = pa_threaded_mainloop_new(); diff --git a/channels/rdpsnd/client/rdpsnd_main.c b/channels/rdpsnd/client/rdpsnd_main.c index 964bb706e..6cab3cbaa 100644 --- a/channels/rdpsnd/client/rdpsnd_main.c +++ b/channels/rdpsnd/client/rdpsnd_main.c @@ -142,9 +142,9 @@ static UINT rdpsnd_virtual_channel_write(rdpsndPlugin* rdpsnd, wStream* s); */ static UINT rdpsnd_send_quality_mode_pdu(rdpsndPlugin* rdpsnd) { - wStream* pdu = NULL; + wStream* pdu = nullptr; WINPR_ASSERT(rdpsnd); - pdu = Stream_New(NULL, 8); + pdu = Stream_New(nullptr, 8); if (!pdu) { @@ -167,7 +167,7 @@ static void rdpsnd_select_supported_audio_formats(rdpsndPlugin* rdpsnd) WINPR_ASSERT(rdpsnd); audio_formats_free(rdpsnd->ClientFormats, rdpsnd->NumberOfClientFormats); rdpsnd->NumberOfClientFormats = 0; - rdpsnd->ClientFormats = NULL; + rdpsnd->ClientFormats = nullptr; if (!rdpsnd->NumberOfServerFormats) return; @@ -201,7 +201,7 @@ static void rdpsnd_select_supported_audio_formats(rdpsndPlugin* rdpsnd) */ static UINT rdpsnd_send_client_audio_formats(rdpsndPlugin* rdpsnd) { - wStream* pdu = NULL; + wStream* pdu = nullptr; UINT16 length = 0; UINT32 dwVolume = 0; UINT16 wNumberOfFormats = 0; @@ -217,7 +217,7 @@ static UINT rdpsnd_send_client_audio_formats(rdpsndPlugin* rdpsnd) for (UINT16 index = 0; index < wNumberOfFormats; index++) length += (18 + rdpsnd->ClientFormats[index].cbSize); - pdu = Stream_New(NULL, length); + pdu = Stream_New(nullptr, length); if (!pdu) { @@ -266,7 +266,7 @@ static UINT rdpsnd_recv_server_audio_formats_pdu(rdpsndPlugin* rdpsnd, wStream* WINPR_ASSERT(rdpsnd); audio_formats_free(rdpsnd->ServerFormats, rdpsnd->NumberOfServerFormats); rdpsnd->NumberOfServerFormats = 0; - rdpsnd->ServerFormats = NULL; + rdpsnd->ServerFormats = nullptr; if (!Stream_CheckAndLogRequiredLength(TAG, s, 30)) return ERROR_BAD_LENGTH; @@ -321,7 +321,7 @@ static UINT rdpsnd_recv_server_audio_formats_pdu(rdpsndPlugin* rdpsnd, wStream* return ret; out_fail: audio_formats_free(rdpsnd->ServerFormats, rdpsnd->NumberOfServerFormats); - rdpsnd->ServerFormats = NULL; + rdpsnd->ServerFormats = nullptr; rdpsnd->NumberOfServerFormats = 0; return ret; } @@ -334,9 +334,9 @@ out_fail: static UINT rdpsnd_send_training_confirm_pdu(rdpsndPlugin* rdpsnd, UINT16 wTimeStamp, UINT16 wPackSize) { - wStream* pdu = NULL; + wStream* pdu = nullptr; WINPR_ASSERT(rdpsnd); - pdu = Stream_New(NULL, 8); + pdu = Stream_New(nullptr, 8); if (!pdu) { @@ -452,7 +452,7 @@ static BOOL rdpsnd_ensure_device_is_open(rdpsndPlugin* rdpsnd, UINT16 wFormatNo, static UINT rdpsnd_recv_wave_info_pdu(rdpsndPlugin* rdpsnd, wStream* s, UINT16 BodySize) { UINT16 wFormatNo = 0; - const AUDIO_FORMAT* format = NULL; + const AUDIO_FORMAT* format = nullptr; WINPR_ASSERT(rdpsnd); WINPR_ASSERT(s); @@ -491,9 +491,9 @@ static UINT rdpsnd_recv_wave_info_pdu(rdpsndPlugin* rdpsnd, wStream* s, UINT16 B static UINT rdpsnd_send_wave_confirm_pdu(rdpsndPlugin* rdpsnd, UINT16 wTimeStamp, BYTE cConfirmedBlockNo) { - wStream* pdu = NULL; + wStream* pdu = nullptr; WINPR_ASSERT(rdpsnd); - pdu = Stream_New(NULL, 8); + pdu = Stream_New(nullptr, 8); if (!pdu) { @@ -600,7 +600,7 @@ static BOOL rdpsnd_detect_overrun(rdpsndPlugin* rdpsnd, const AUDIO_FORMAT* form static UINT rdpsnd_treat_wave(rdpsndPlugin* rdpsnd, wStream* s, size_t size) { - AUDIO_FORMAT* format = NULL; + AUDIO_FORMAT* format = nullptr; UINT64 end = 0; UINT64 diffMS = 0; UINT64 ts = 0; @@ -697,7 +697,7 @@ static UINT rdpsnd_recv_wave_pdu(rdpsndPlugin* rdpsnd, wStream* s) static UINT rdpsnd_recv_wave2_pdu(rdpsndPlugin* rdpsnd, wStream* s, UINT16 BodySize) { UINT16 wFormatNo = 0; - AUDIO_FORMAT* format = NULL; + AUDIO_FORMAT* format = nullptr; UINT32 dwAudioTimeStamp = 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, 12)) @@ -858,7 +858,7 @@ static UINT rdpsnd_load_device_plugin(rdpsndPlugin* rdpsnd, const char* name, if (rdpsnd->dynamic) flags = FREERDP_ADDIN_CHANNEL_DYNAMIC; PVIRTUALCHANNELENTRY pvce = - freerdp_load_channel_addin_entry(RDPSND_CHANNEL_NAME, name, NULL, flags); + freerdp_load_channel_addin_entry(RDPSND_CHANNEL_NAME, name, nullptr, flags); PFREERDP_RDPSND_DEVICE_ENTRY entry = WINPR_FUNC_PTR_CAST(pvce, PFREERDP_RDPSND_DEVICE_ENTRY); if (!entry) @@ -881,14 +881,14 @@ static BOOL rdpsnd_set_subsystem(rdpsndPlugin* rdpsnd, const char* subsystem) { free(rdpsnd->subsystem); rdpsnd->subsystem = _strdup(subsystem); - return (rdpsnd->subsystem != NULL); + return (rdpsnd->subsystem != nullptr); } static BOOL rdpsnd_set_device_name(rdpsndPlugin* rdpsnd, const char* device_name) { free(rdpsnd->device_name); rdpsnd->device_name = _strdup(device_name); - return (rdpsnd->device_name != NULL); + return (rdpsnd->device_name != nullptr); } /** @@ -900,17 +900,21 @@ static UINT rdpsnd_process_addin_args(rdpsndPlugin* rdpsnd, const ADDIN_ARGV* ar { int status = 0; DWORD flags = 0; - const COMMAND_LINE_ARGUMENT_A* arg = NULL; + const COMMAND_LINE_ARGUMENT_A* arg = nullptr; COMMAND_LINE_ARGUMENT_A rdpsnd_args[] = { - { "sys", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "subsystem" }, - { "dev", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "device" }, - { "format", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "format" }, - { "rate", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "rate" }, - { "channel", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "channel" }, - { "latency", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "latency" }, - { "quality", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, + { "sys", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, + "subsystem" }, + { "dev", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, "device" }, + { "format", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, + "format" }, + { "rate", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, "rate" }, + { "channel", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, + "channel" }, + { "latency", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, + "latency" }, + { "quality", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, "quality mode" }, - { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } + { nullptr, 0, nullptr, nullptr, nullptr, -1, nullptr, nullptr } }; rdpsnd->wQualityMode = HIGH_QUALITY; /* default quality mode */ @@ -918,7 +922,7 @@ static UINT rdpsnd_process_addin_args(rdpsndPlugin* rdpsnd, const ADDIN_ARGV* ar { flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON; status = CommandLineParseArgumentsA(args->argc, args->argv, rdpsnd_args, flags, rdpsnd, - NULL, NULL); + nullptr, nullptr); if (status < 0) return CHANNEL_RC_INITIALIZATION_ERROR; @@ -943,7 +947,7 @@ static UINT rdpsnd_process_addin_args(rdpsndPlugin* rdpsnd, const ADDIN_ARGV* ar } CommandLineSwitchCase(arg, "format") { - unsigned long val = strtoul(arg->Value, NULL, 0); + unsigned long val = strtoul(arg->Value, nullptr, 0); if ((errno != 0) || (val > UINT16_MAX)) return CHANNEL_RC_INITIALIZATION_ERROR; @@ -952,7 +956,7 @@ static UINT rdpsnd_process_addin_args(rdpsndPlugin* rdpsnd, const ADDIN_ARGV* ar } CommandLineSwitchCase(arg, "rate") { - unsigned long val = strtoul(arg->Value, NULL, 0); + unsigned long val = strtoul(arg->Value, nullptr, 0); if ((errno != 0) || (val > UINT32_MAX)) return CHANNEL_RC_INITIALIZATION_ERROR; @@ -961,7 +965,7 @@ static UINT rdpsnd_process_addin_args(rdpsndPlugin* rdpsnd, const ADDIN_ARGV* ar } CommandLineSwitchCase(arg, "channel") { - unsigned long val = strtoul(arg->Value, NULL, 0); + unsigned long val = strtoul(arg->Value, nullptr, 0); if ((errno != 0) || (val > UINT16_MAX)) return CHANNEL_RC_INITIALIZATION_ERROR; @@ -970,7 +974,7 @@ static UINT rdpsnd_process_addin_args(rdpsndPlugin* rdpsnd, const ADDIN_ARGV* ar } CommandLineSwitchCase(arg, "latency") { - unsigned long val = strtoul(arg->Value, NULL, 0); + unsigned long val = strtoul(arg->Value, nullptr, 0); if ((errno != 0) || (val > UINT32_MAX)) return CHANNEL_RC_INITIALIZATION_ERROR; @@ -989,7 +993,7 @@ static UINT rdpsnd_process_addin_args(rdpsndPlugin* rdpsnd, const ADDIN_ARGV* ar wQualityMode = HIGH_QUALITY; else { - wQualityMode = strtol(arg->Value, NULL, 0); + wQualityMode = strtol(arg->Value, nullptr, 0); if (errno != 0) return CHANNEL_RC_INITIALIZATION_ERROR; @@ -1004,7 +1008,7 @@ static UINT rdpsnd_process_addin_args(rdpsndPlugin* rdpsnd, const ADDIN_ARGV* ar { } CommandLineSwitchEnd(arg) - } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); + } while ((arg = CommandLineFindNextArgumentA(arg)) != nullptr); } return CHANNEL_RC_OK; @@ -1048,7 +1052,7 @@ static UINT rdpsnd_process_connect(rdpsndPlugin* rdpsnd) #endif { "fake", "" } }; - const ADDIN_ARGV* args = NULL; + const ADDIN_ARGV* args = nullptr; UINT status = ERROR_INTERNAL_ERROR; WINPR_ASSERT(rdpsnd); rdpsnd->latency = 0; @@ -1115,11 +1119,12 @@ UINT rdpsnd_virtual_channel_write(rdpsndPlugin* rdpsnd, wStream* s) { if (rdpsnd->dynamic) { - IWTSVirtualChannel* channel = NULL; + IWTSVirtualChannel* channel = nullptr; if (rdpsnd->listener_callback) { channel = rdpsnd->listener_callback->channel_callback->channel; - status = channel->Write(channel, (UINT32)Stream_Length(s), Stream_Buffer(s), NULL); + status = + channel->Write(channel, (UINT32)Stream_Length(s), Stream_Buffer(s), nullptr); } Stream_Free(s, TRUE); } @@ -1173,14 +1178,14 @@ static UINT rdpsnd_virtual_channel_event_data_received(rdpsndPlugin* plugin, voi if (plugin->async) { - if (!MessageQueue_Post(plugin->queue, NULL, 0, plugin->data_in, NULL)) + if (!MessageQueue_Post(plugin->queue, nullptr, 0, plugin->data_in, nullptr)) return ERROR_INTERNAL_ERROR; - plugin->data_in = NULL; + plugin->data_in = nullptr; } else { UINT error = rdpsnd_recv_pdu(plugin, plugin->data_in); - plugin->data_in = NULL; + plugin->data_in = nullptr; if (error) return error; } @@ -1293,8 +1298,8 @@ static void rdpsnd_terminate_thread(rdpsndPlugin* rdpsnd) } MessageQueue_Free(rdpsnd->queue); - rdpsnd->thread = NULL; - rdpsnd->queue = NULL; + rdpsnd->thread = nullptr; + rdpsnd->queue = nullptr; } static void cleanup_internals(rdpsndPlugin* rdpsnd) @@ -1309,11 +1314,11 @@ static void cleanup_internals(rdpsndPlugin* rdpsnd) audio_formats_free(rdpsnd->ServerFormats, rdpsnd->NumberOfServerFormats); rdpsnd->NumberOfClientFormats = 0; - rdpsnd->ClientFormats = NULL; + rdpsnd->ClientFormats = nullptr; rdpsnd->NumberOfServerFormats = 0; - rdpsnd->ServerFormats = NULL; + rdpsnd->ServerFormats = nullptr; - rdpsnd->data_in = NULL; + rdpsnd->data_in = nullptr; } /** @@ -1349,7 +1354,7 @@ static UINT rdpsnd_virtual_channel_event_disconnected(rdpsndPlugin* rdpsnd) if (rdpsnd->device) { IFCALL(rdpsnd->device->Free, rdpsnd->device); - rdpsnd->device = NULL; + rdpsnd->device = nullptr; } return CHANNEL_RC_OK; @@ -1380,8 +1385,8 @@ static void free_internals(rdpsndPlugin* rdpsnd) rdpsnd_terminate_thread(rdpsnd); freerdp_dsp_context_free(rdpsnd->dsp_context); StreamPool_Free(rdpsnd->pool); - rdpsnd->pool = NULL; - rdpsnd->dsp_context = NULL; + rdpsnd->pool = nullptr; + rdpsnd->dsp_context = nullptr; } static BOOL allocate_internals(rdpsndPlugin* rdpsnd) @@ -1416,7 +1421,7 @@ static BOOL allocate_internals(rdpsndPlugin* rdpsnd) if (!rdpsnd->thread) { - rdpsnd->thread = CreateThread(NULL, 0, play_thread, rdpsnd, 0, NULL); + rdpsnd->thread = CreateThread(nullptr, 0, play_thread, rdpsnd, 0, nullptr); if (!rdpsnd->thread) return CHANNEL_RC_INITIALIZATION_ERROR; } @@ -1439,7 +1444,7 @@ static DWORD WINAPI play_thread(LPVOID arg) { int rc = -1; wMessage message = WINPR_C_ARRAY_INIT; - wStream* s = NULL; + wStream* s = nullptr; DWORD status = 0; DWORD nCount = 0; HANDLE handles[MAXIMUM_WAIT_OBJECTS] = WINPR_C_ARRAY_INIT; @@ -1491,7 +1496,7 @@ void rdpsnd_virtual_channel_event_terminated(rdpsndPlugin* rdpsnd) audio_formats_free(rdpsnd->fixed_format, 1); free(rdpsnd->subsystem); free(rdpsnd->device_name); - rdpsnd->InitHandle = 0; + rdpsnd->InitHandle = nullptr; } free(rdpsnd); @@ -1529,7 +1534,7 @@ static VOID VCAPITYPE rdpsnd_virtual_channel_init_event_ex(LPVOID lpUserParam, L case CHANNEL_EVENT_TERMINATED: rdpsnd_virtual_channel_event_terminated(plugin); - plugin = NULL; + plugin = nullptr; break; case CHANNEL_EVENT_ATTACHED: @@ -1556,7 +1561,7 @@ static VOID VCAPITYPE rdpsnd_virtual_channel_init_event_ex(LPVOID lpUserParam, L rdpContext* freerdp_rdpsnd_get_context(rdpsndPlugin* plugin) { if (!plugin) - return NULL; + return nullptr; return plugin->rdpcontext; } @@ -1581,15 +1586,15 @@ fail: if (rdpsnd) audio_formats_free(rdpsnd->fixed_format, 1); free(rdpsnd); - return NULL; + return nullptr; } /* rdpsnd is always built-in */ FREERDP_ENTRY_POINT(BOOL VCAPITYPE rdpsnd_VirtualChannelEntryEx( PCHANNEL_ENTRY_POINTS_EX pEntryPoints, PVOID pInitHandle)) { UINT rc = 0; - rdpsndPlugin* rdpsnd = NULL; - CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = NULL; + rdpsndPlugin* rdpsnd = nullptr; + CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = nullptr; if (!pEntryPoints) return FALSE; @@ -1619,7 +1624,7 @@ FREERDP_ENTRY_POINT(BOOL VCAPITYPE rdpsnd_VirtualChannelEntryEx( WINPR_ASSERT(rdpsnd->channelEntryPoints.pVirtualChannelInitEx); rc = rdpsnd->channelEntryPoints.pVirtualChannelInitEx( - rdpsnd, NULL, pInitHandle, &rdpsnd->channelDef, 1, VIRTUAL_CHANNEL_VERSION_WIN2000, + rdpsnd, nullptr, pInitHandle, &rdpsnd->channelDef, 1, VIRTUAL_CHANNEL_VERSION_WIN2000, rdpsnd_virtual_channel_init_event_ex); if (CHANNEL_RC_OK != rc) @@ -1636,7 +1641,7 @@ FREERDP_ENTRY_POINT(BOOL VCAPITYPE rdpsnd_VirtualChannelEntryEx( static UINT rdpsnd_on_open(IWTSVirtualChannelCallback* pChannelCallback) { GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; - rdpsndPlugin* rdpsnd = NULL; + rdpsndPlugin* rdpsnd = nullptr; WINPR_ASSERT(callback); @@ -1656,8 +1661,8 @@ 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; - rdpsndPlugin* plugin = NULL; - wStream* copy = NULL; + rdpsndPlugin* plugin = nullptr; + wStream* copy = nullptr; size_t len = 0; len = Stream_GetRemainingLength(data); @@ -1676,7 +1681,7 @@ static UINT rdpsnd_on_data_received(IWTSVirtualChannelCallback* pChannelCallback if (plugin->async) { - if (!MessageQueue_Post(plugin->queue, NULL, 0, copy, NULL)) + if (!MessageQueue_Post(plugin->queue, nullptr, 0, copy, nullptr)) { Stream_Release(copy); return ERROR_INTERNAL_ERROR; @@ -1695,7 +1700,7 @@ static UINT rdpsnd_on_data_received(IWTSVirtualChannelCallback* pChannelCallback static UINT rdpsnd_on_close(IWTSVirtualChannelCallback* pChannelCallback) { GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; - rdpsndPlugin* rdpsnd = NULL; + rdpsndPlugin* rdpsnd = nullptr; WINPR_ASSERT(callback); @@ -1712,7 +1717,7 @@ static UINT rdpsnd_on_close(IWTSVirtualChannelCallback* pChannelCallback) if (rdpsnd->device) { IFCALL(rdpsnd->device->Free, rdpsnd->device); - rdpsnd->device = NULL; + rdpsnd->device = nullptr; } free(pChannelCallback); @@ -1726,7 +1731,7 @@ static UINT rdpsnd_on_new_channel_connection(IWTSListenerCallback* pListenerCall IWTSVirtualChannelCallback** ppCallback) // NOLINTEND(readability-non-const-parameter) { - GENERIC_CHANNEL_CALLBACK* callback = NULL; + GENERIC_CHANNEL_CALLBACK* callback = nullptr; GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; WINPR_ASSERT(listener_callback); WINPR_ASSERT(pChannel); @@ -1822,7 +1827,7 @@ static UINT rdpsnd_plugin_terminated(IWTSPlugin* pPlugin) FREERDP_ENTRY_POINT(UINT VCAPITYPE rdpsnd_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)) { UINT error = CHANNEL_RC_OK; - rdpsndPlugin* rdpsnd = NULL; + rdpsndPlugin* rdpsnd = nullptr; WINPR_ASSERT(pEntryPoints); WINPR_ASSERT(pEntryPoints->GetPlugin); @@ -1831,7 +1836,7 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE rdpsnd_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* if (!rdpsnd) { - IWTSPlugin* iface = NULL; + IWTSPlugin* iface = nullptr; union { const void* cev; @@ -1847,8 +1852,8 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE rdpsnd_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* iface = &rdpsnd->iface; iface->Initialize = rdpsnd_plugin_initialize; - iface->Connected = NULL; - iface->Disconnected = NULL; + iface->Connected = nullptr; + iface->Disconnected = nullptr; iface->Terminated = rdpsnd_plugin_terminated; rdpsnd->dynamic = TRUE; diff --git a/channels/rdpsnd/client/sndio/rdpsnd_sndio.c b/channels/rdpsnd/client/sndio/rdpsnd_sndio.c index 541c6f7b5..fc3071928 100644 --- a/channels/rdpsnd/client/sndio/rdpsnd_sndio.c +++ b/channels/rdpsnd/client/sndio/rdpsnd_sndio.c @@ -46,14 +46,14 @@ static BOOL rdpsnd_sndio_open(rdpsndDevicePlugin* device, AUDIO_FORMAT* format, { rdpsndSndioPlugin* sndio = (rdpsndSndioPlugin*)device; - if (device == NULL || format == NULL) + if (device == nullptr || format == nullptr) return FALSE; - if (sndio->hdl != NULL) + if (sndio->hdl != nullptr) return TRUE; sndio->hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0); - if (sndio->hdl == NULL) + if (sndio->hdl == nullptr) { WLog_ERR(TAG, "could not open audio device"); return FALSE; @@ -87,14 +87,14 @@ static void rdpsnd_sndio_close(rdpsndDevicePlugin* device) { rdpsndSndioPlugin* sndio = (rdpsndSndioPlugin*)device; - if (device == NULL) + if (device == nullptr) return; - if (sndio->hdl != NULL) + if (sndio->hdl != nullptr) { sio_stop(sndio->hdl); sio_close(sndio->hdl); - sndio->hdl = NULL; + sndio->hdl = nullptr; } } @@ -102,7 +102,7 @@ static BOOL rdpsnd_sndio_set_volume(rdpsndDevicePlugin* device, UINT32 value) { rdpsndSndioPlugin* sndio = (rdpsndSndioPlugin*)device; - if (device == NULL || sndio->hdl == NULL) + if (device == nullptr || sndio->hdl == nullptr) return FALSE; /* @@ -116,7 +116,7 @@ static void rdpsnd_sndio_free(rdpsndDevicePlugin* device) { rdpsndSndioPlugin* sndio = (rdpsndSndioPlugin*)device; - if (device == NULL) + if (device == nullptr) return; rdpsnd_sndio_close(device); @@ -125,7 +125,7 @@ static void rdpsnd_sndio_free(rdpsndDevicePlugin* device) static BOOL rdpsnd_sndio_format_supported(rdpsndDevicePlugin* device, AUDIO_FORMAT* format) { - if (format == NULL) + if (format == nullptr) return FALSE; return (format->wFormatTag == WAVE_FORMAT_PCM); @@ -135,7 +135,7 @@ static void rdpsnd_sndio_play(rdpsndDevicePlugin* device, BYTE* data, int size) { rdpsndSndioPlugin* sndio = (rdpsndSndioPlugin*)device; - if (device == NULL || sndio->hdl == NULL) + if (device == nullptr || sndio->hdl == nullptr) return; sio_write(sndio->hdl, data, size); @@ -152,11 +152,12 @@ static UINT rdpsnd_sndio_parse_addin_args(rdpsndDevicePlugin* device, ADDIN_ARGV DWORD flags; COMMAND_LINE_ARGUMENT_A* arg; rdpsndSndioPlugin* sndio = (rdpsndSndioPlugin*)device; - COMMAND_LINE_ARGUMENT_A rdpsnd_sndio_args[] = { { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } }; + COMMAND_LINE_ARGUMENT_A rdpsnd_sndio_args[] = { { nullptr, 0, nullptr, nullptr, nullptr, -1, + nullptr, nullptr } }; flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON | COMMAND_LINE_IGN_UNKNOWN_KEYWORD; status = CommandLineParseArgumentsA(args->argc, (const char**)args->argv, rdpsnd_sndio_args, - flags, sndio, NULL, NULL); + flags, sndio, nullptr, nullptr); if (status < 0) return ERROR_INVALID_DATA; @@ -169,7 +170,7 @@ static UINT rdpsnd_sndio_parse_addin_args(rdpsndDevicePlugin* device, ADDIN_ARGV continue; CommandLineSwitchStart(arg) CommandLineSwitchEnd(arg) - } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); + } while ((arg = CommandLineFindNextArgumentA(arg)) != nullptr); return CHANNEL_RC_OK; } @@ -187,7 +188,7 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE sndio_freerdp_rdpsnd_client_subsystem_entry( UINT ret = CHANNEL_RC_OK; sndio = (rdpsndSndioPlugin*)calloc(1, sizeof(rdpsndSndioPlugin)); - if (sndio == NULL) + if (sndio == nullptr) return CHANNEL_RC_NO_MEMORY; sndio->device.Open = rdpsnd_sndio_open; diff --git a/channels/rdpsnd/client/winmm/rdpsnd_winmm.c b/channels/rdpsnd/client/winmm/rdpsnd_winmm.c index fd4c471b2..35a1bf166 100644 --- a/channels/rdpsnd/client/winmm/rdpsnd_winmm.c +++ b/channels/rdpsnd/client/winmm/rdpsnd_winmm.c @@ -95,7 +95,7 @@ static DWORD WINAPI waveOutProc(LPVOID lpParameter) { MSG msg; rdpsndWinmmPlugin* winmm = (rdpsndWinmmPlugin*)lpParameter; - while (GetMessage(&msg, NULL, 0, 0)) + while (GetMessage(&msg, nullptr, 0, 0)) { if (msg.message == MM_WOM_CLOSE) { @@ -129,7 +129,7 @@ static BOOL rdpsnd_winmm_open(rdpsndDevicePlugin* device, const AUDIO_FORMAT* fo if (!rdpsnd_winmm_set_format(device, format, latency)) return FALSE; - winmm->hThread = CreateThread(NULL, 0, waveOutProc, winmm, 0, &winmm->threadId); + winmm->hThread = CreateThread(nullptr, 0, waveOutProc, winmm, 0, &winmm->threadId); if (!winmm->hThread) { WLog_Print(winmm->log, WLOG_ERROR, "CreateThread failed: %" PRIu32 "", GetLastError()); @@ -175,14 +175,14 @@ static void rdpsnd_winmm_close(rdpsndDevicePlugin* device) LeaveCriticalSection(&winmm->cs); - winmm->hWaveOut = NULL; + winmm->hWaveOut = nullptr; } if (winmm->hThread) { (void)WaitForSingleObject(winmm->hThread, INFINITE); (void)CloseHandle(winmm->hThread); - winmm->hThread = NULL; + winmm->hThread = nullptr; } } @@ -206,7 +206,7 @@ static BOOL rdpsnd_winmm_format_supported(rdpsndDevicePlugin* device, const AUDI WINPR_UNUSED(device); if (rdpsnd_winmm_convert_format(format, &out)) { - result = waveOutOpen(NULL, WAVE_MAPPER, &out, 0, 0, WAVE_FORMAT_QUERY); + result = waveOutOpen(nullptr, WAVE_MAPPER, &out, 0, 0, WAVE_FORMAT_QUERY); if (result == MMSYSERR_NOERROR) return TRUE; diff --git a/channels/rdpsnd/server/rdpsnd_main.c b/channels/rdpsnd/server/rdpsnd_main.c index 7997f227d..108cd9913 100644 --- a/channels/rdpsnd/server/rdpsnd_main.c +++ b/channels/rdpsnd/server/rdpsnd_main.c @@ -39,7 +39,7 @@ static wStream* rdpsnd_server_get_buffer(RdpsndServerContext* context) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -338,7 +338,7 @@ static UINT rdpsnd_server_select_format(RdpsndServerContext* context, UINT16 cli { size_t bs = 0; size_t out_buffer_size = 0; - AUDIO_FORMAT* format = NULL; + AUDIO_FORMAT* format = nullptr; UINT error = CHANNEL_RC_OK; WINPR_ASSERT(context); @@ -400,7 +400,7 @@ static UINT rdpsnd_server_select_format(RdpsndServerContext* context, UINT16 cli if (context->priv->out_buffer_size < out_buffer_size) { - BYTE* newBuffer = NULL; + BYTE* newBuffer = nullptr; newBuffer = (BYTE*)realloc(context->priv->out_buffer, out_buffer_size); if (!newBuffer) @@ -496,7 +496,7 @@ static BOOL rdpsnd_server_align_wave_pdu(wStream* s, UINT32 alignment) */ static UINT rdpsnd_server_send_wave_pdu(RdpsndServerContext* context, UINT16 wTimestamp) { - AUDIO_FORMAT* format = NULL; + AUDIO_FORMAT* format = nullptr; ULONG written = 0; UINT error = CHANNEL_RC_OK; wStream* s = rdpsnd_server_get_buffer(context); @@ -619,7 +619,7 @@ static UINT rdpsnd_server_send_wave2_pdu(RdpsndServerContext* context, UINT16 fo } else { - AUDIO_FORMAT* format = NULL; + AUDIO_FORMAT* format = nullptr; if (!freerdp_dsp_encode(context->priv->dsp_context, context->src_format, data, size, s)) { @@ -669,7 +669,7 @@ out: /* Wrapper function to send WAVE or WAVE2 PDU depending on client connected */ static UINT rdpsnd_server_send_audio_pdu(RdpsndServerContext* context, UINT16 wTimestamp) { - const BYTE* src = NULL; + const BYTE* src = nullptr; size_t length = 0; WINPR_ASSERT(context); @@ -854,11 +854,11 @@ static UINT rdpsnd_server_close(RdpsndServerContext* context) */ static UINT rdpsnd_server_start(RdpsndServerContext* context) { - void* buffer = NULL; + void* buffer = nullptr; DWORD bytesReturned = 0; - RdpsndServerPrivate* priv = NULL; + RdpsndServerPrivate* priv = nullptr; UINT error = ERROR_INTERNAL_ERROR; - PULONG pSessionId = NULL; + PULONG pSessionId = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -928,7 +928,7 @@ static UINT rdpsnd_server_start(RdpsndServerContext* context) priv->channelEvent = *(HANDLE*)buffer; WTSFreeMemory(buffer); - priv->rdpsnd_pdu = Stream_New(NULL, 4096); + priv->rdpsnd_pdu = Stream_New(nullptr, 4096); if (!priv->rdpsnd_pdu) { @@ -951,7 +951,7 @@ static UINT rdpsnd_server_start(RdpsndServerContext* context) if (priv->ownThread) { - context->priv->StopEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + context->priv->StopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!context->priv->StopEvent) { @@ -960,7 +960,7 @@ static UINT rdpsnd_server_start(RdpsndServerContext* context) } context->priv->Thread = - CreateThread(NULL, 0, rdpsnd_server_thread, (void*)context, 0, NULL); + CreateThread(nullptr, 0, rdpsnd_server_thread, (void*)context, 0, nullptr); if (!context->priv->Thread) { @@ -972,15 +972,15 @@ static UINT rdpsnd_server_start(RdpsndServerContext* context) return CHANNEL_RC_OK; out_stopEvent: (void)CloseHandle(context->priv->StopEvent); - context->priv->StopEvent = NULL; + context->priv->StopEvent = nullptr; out_lock: DeleteCriticalSection(&context->priv->lock); out_pdu: Stream_Free(context->priv->rdpsnd_pdu, TRUE); - context->priv->rdpsnd_pdu = NULL; + context->priv->rdpsnd_pdu = nullptr; out_close: (void)WTSVirtualChannelClose(context->priv->ChannelHandle); - context->priv->ChannelHandle = NULL; + context->priv->ChannelHandle = nullptr; return error; } @@ -1014,8 +1014,8 @@ static UINT rdpsnd_server_stop(RdpsndServerContext* context) (void)CloseHandle(context->priv->Thread); (void)CloseHandle(context->priv->StopEvent); - context->priv->Thread = NULL; - context->priv->StopEvent = NULL; + context->priv->Thread = nullptr; + context->priv->StopEvent = nullptr; } } @@ -1024,13 +1024,13 @@ static UINT rdpsnd_server_stop(RdpsndServerContext* context) if (context->priv->rdpsnd_pdu) { Stream_Free(context->priv->rdpsnd_pdu, TRUE); - context->priv->rdpsnd_pdu = NULL; + context->priv->rdpsnd_pdu = nullptr; } if (context->priv->ChannelHandle) { (void)WTSVirtualChannelClose(context->priv->ChannelHandle); - context->priv->ChannelHandle = NULL; + context->priv->ChannelHandle = nullptr; } return error; @@ -1038,7 +1038,7 @@ static UINT rdpsnd_server_stop(RdpsndServerContext* context) RdpsndServerContext* rdpsnd_server_context_new(HANDLE vcm) { - RdpsndServerPrivate* priv = NULL; + RdpsndServerPrivate* priv = nullptr; RdpsndServerContext* context = (RdpsndServerContext*)calloc(1, sizeof(RdpsndServerContext)); if (!context) @@ -1072,7 +1072,7 @@ RdpsndServerContext* rdpsnd_server_context_new(HANDLE vcm) goto fail; } - priv->input_stream = Stream_New(NULL, 4); + priv->input_stream = Stream_New(nullptr, 4); if (!priv->input_stream) { @@ -1089,7 +1089,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC rdpsnd_server_context_free(context); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void rdpsnd_server_context_reset(RdpsndServerContext* context) @@ -1152,8 +1152,8 @@ UINT rdpsnd_server_handle_messages(RdpsndServerContext* context) { DWORD bytesReturned = 0; UINT ret = CHANNEL_RC_OK; - RdpsndServerPrivate* priv = NULL; - wStream* s = NULL; + RdpsndServerPrivate* priv = nullptr; + wStream* s = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); diff --git a/channels/remdesk/client/remdesk_main.c b/channels/remdesk/client/remdesk_main.c index 3cc96ab67..9115fa0f5 100644 --- a/channels/remdesk/client/remdesk_main.c +++ b/channels/remdesk/client/remdesk_main.c @@ -70,10 +70,10 @@ static UINT remdesk_virtual_channel_write(remdeskPlugin* remdesk, wStream* s) */ static UINT remdesk_generate_expert_blob(remdeskPlugin* remdesk) { - const char* name = NULL; - char* pass = NULL; - const char* password = NULL; - rdpSettings* settings = NULL; + const char* name = nullptr; + char* pass = nullptr; + const char* password = nullptr; + rdpSettings* settings = nullptr; WINPR_ASSERT(remdesk); @@ -192,7 +192,7 @@ static UINT remdesk_send_ctl_version_info_pdu(remdeskPlugin* remdesk) pdu.versionMajor = 1; pdu.versionMinor = 2; - wStream* s = Stream_New(NULL, REMDESK_CHANNEL_CTL_SIZE + pdu.ctlHeader.ch.DataLength); + wStream* s = Stream_New(nullptr, REMDESK_CHANNEL_CTL_SIZE + pdu.ctlHeader.ch.DataLength); if (!s) { @@ -260,7 +260,7 @@ static UINT remdesk_send_ctl_authenticate_pdu(remdeskPlugin* remdesk) { UINT error = ERROR_INTERNAL_ERROR; size_t cbExpertBlobW = 0; - WCHAR* expertBlobW = NULL; + WCHAR* expertBlobW = nullptr; size_t cbRaConnectionStringW = 0; REMDESK_CTL_HEADER ctlHeader = WINPR_C_ARRAY_INIT; @@ -299,7 +299,7 @@ static UINT remdesk_send_ctl_authenticate_pdu(remdeskPlugin* remdesk) goto out; { - wStream* s = Stream_New(NULL, REMDESK_CHANNEL_CTL_SIZE + ctlHeader.ch.DataLength); + wStream* s = Stream_New(nullptr, REMDESK_CHANNEL_CTL_SIZE + ctlHeader.ch.DataLength); if (!s) { WLog_ERR(TAG, "Stream_New failed!"); @@ -359,7 +359,7 @@ static UINT remdesk_send_ctl_remote_control_desktop_pdu(remdeskPlugin* remdesk) goto out; { - wStream* s = Stream_New(NULL, REMDESK_CHANNEL_CTL_SIZE + ctlHeader.ch.DataLength); + wStream* s = Stream_New(nullptr, REMDESK_CHANNEL_CTL_SIZE + ctlHeader.ch.DataLength); if (!s) { @@ -420,7 +420,7 @@ static UINT remdesk_send_ctl_verify_password_pdu(remdeskPlugin* remdesk) { wStream* s = - Stream_New(NULL, 1ULL * REMDESK_CHANNEL_CTL_SIZE + pdu.ctlHeader.ch.DataLength); + Stream_New(nullptr, 1ULL * REMDESK_CHANNEL_CTL_SIZE + pdu.ctlHeader.ch.DataLength); if (!s) { @@ -476,7 +476,7 @@ static UINT remdesk_send_ctl_expert_on_vista_pdu(remdeskPlugin* remdesk) if (error) return error; - wStream* s = Stream_New(NULL, REMDESK_CHANNEL_CTL_SIZE + pdu.ctlHeader.ch.DataLength); + wStream* s = Stream_New(nullptr, REMDESK_CHANNEL_CTL_SIZE + pdu.ctlHeader.ch.DataLength); if (!s) { @@ -682,7 +682,7 @@ static UINT remdesk_virtual_channel_event_data_received(remdeskPlugin* remdesk, UINT32 dataLength, UINT32 totalLength, UINT32 dataFlags) { - wStream* data_in = NULL; + wStream* data_in = nullptr; WINPR_ASSERT(remdesk); @@ -696,7 +696,7 @@ static UINT remdesk_virtual_channel_event_data_received(remdeskPlugin* remdesk, if (remdesk->data_in) Stream_Free(remdesk->data_in, TRUE); - remdesk->data_in = Stream_New(NULL, totalLength); + remdesk->data_in = Stream_New(nullptr, totalLength); if (!remdesk->data_in) { @@ -723,11 +723,11 @@ static UINT remdesk_virtual_channel_event_data_received(remdeskPlugin* remdesk, return ERROR_INTERNAL_ERROR; } - remdesk->data_in = NULL; + remdesk->data_in = nullptr; Stream_SealLength(data_in); Stream_SetPosition(data_in, 0); - if (!MessageQueue_Post(remdesk->queue, NULL, 0, (void*)data_in, NULL)) + if (!MessageQueue_Post(remdesk->queue, nullptr, 0, (void*)data_in, nullptr)) { WLog_ERR(TAG, "MessageQueue_Post failed!"); return ERROR_INTERNAL_ERROR; @@ -789,7 +789,7 @@ static VOID VCAPITYPE remdesk_virtual_channel_open_event_ex(LPVOID lpUserParam, static DWORD WINAPI remdesk_virtual_channel_client_thread(LPVOID arg) { - wStream* data = NULL; + wStream* data = nullptr; wMessage message = WINPR_C_ARRAY_INIT; remdeskPlugin* remdesk = (remdeskPlugin*)arg; UINT error = CHANNEL_RC_OK; @@ -853,7 +853,7 @@ static UINT remdesk_virtual_channel_event_connected(remdeskPlugin* remdesk, WINPR_ASSERT(remdesk); - remdesk->queue = MessageQueue_New(NULL); + remdesk->queue = MessageQueue_New(nullptr); if (!remdesk->queue) { @@ -863,7 +863,7 @@ static UINT remdesk_virtual_channel_event_connected(remdeskPlugin* remdesk, } remdesk->thread = - CreateThread(NULL, 0, remdesk_virtual_channel_client_thread, (void*)remdesk, 0, NULL); + CreateThread(nullptr, 0, remdesk_virtual_channel_client_thread, (void*)remdesk, 0, nullptr); if (!remdesk->thread) { @@ -877,7 +877,7 @@ static UINT remdesk_virtual_channel_event_connected(remdeskPlugin* remdesk, remdesk_virtual_channel_open_event_ex); error_out: MessageQueue_Free(remdesk->queue); - remdesk->queue = NULL; + remdesk->queue = nullptr; return error; } @@ -920,9 +920,9 @@ static UINT remdesk_virtual_channel_event_disconnected(remdeskPlugin* remdesk) MessageQueue_Free(remdesk->queue); (void)CloseHandle(remdesk->thread); Stream_Free(remdesk->data_in, TRUE); - remdesk->data_in = NULL; - remdesk->queue = NULL; - remdesk->thread = NULL; + remdesk->data_in = nullptr; + remdesk->queue = nullptr; + remdesk->thread = nullptr; return rc; } @@ -930,7 +930,7 @@ static void remdesk_virtual_channel_event_terminated(remdeskPlugin* remdesk) { WINPR_ASSERT(remdesk); - remdesk->InitHandle = 0; + remdesk->InitHandle = nullptr; free(remdesk->context); free(remdesk); } @@ -988,9 +988,9 @@ FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS_E PVOID pInitHandle)) { UINT rc = 0; - remdeskPlugin* remdesk = NULL; - RemdeskClientContext* context = NULL; - CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = NULL; + remdeskPlugin* remdesk = nullptr; + RemdeskClientContext* context = nullptr; + CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = nullptr; if (!pEntryPoints) { diff --git a/channels/remdesk/server/remdesk_main.c b/channels/remdesk/server/remdesk_main.c index 1f89a4536..8782b32a1 100644 --- a/channels/remdesk/server/remdesk_main.c +++ b/channels/remdesk/server/remdesk_main.c @@ -52,7 +52,7 @@ static UINT remdesk_virtual_channel_write(RemdeskServerContext* context, wStream */ static UINT remdesk_send_ctl_result_pdu(RemdeskServerContext* context, UINT32 result) { - wStream* s = NULL; + wStream* s = nullptr; REMDESK_CTL_RESULT_PDU pdu; UINT error = 0; pdu.result = result; @@ -63,7 +63,7 @@ static UINT remdesk_send_ctl_result_pdu(RemdeskServerContext* context, UINT32 re return error; } - s = Stream_New(NULL, REMDESK_CHANNEL_CTL_SIZE + pdu.ctlHeader.ch.DataLength); + s = Stream_New(nullptr, REMDESK_CHANNEL_CTL_SIZE + pdu.ctlHeader.ch.DataLength); if (!s) { @@ -95,7 +95,7 @@ out: */ static UINT remdesk_send_ctl_version_info_pdu(RemdeskServerContext* context) { - wStream* s = NULL; + wStream* s = nullptr; REMDESK_CTL_VERSION_INFO_PDU pdu; UINT error = 0; @@ -107,7 +107,7 @@ static UINT remdesk_send_ctl_version_info_pdu(RemdeskServerContext* context) pdu.versionMajor = 1; pdu.versionMinor = 2; - s = Stream_New(NULL, REMDESK_CHANNEL_CTL_SIZE + pdu.ctlHeader.ch.DataLength); + s = Stream_New(nullptr, REMDESK_CHANNEL_CTL_SIZE + pdu.ctlHeader.ch.DataLength); if (!s) { @@ -186,8 +186,8 @@ static UINT remdesk_recv_ctl_remote_control_desktop_pdu(RemdeskServerContext* co cchStringW++; const size_t cbRaConnectionStringW = cchStringW * sizeof(WCHAR); - pdu.raConnectionString = - ConvertWCharNToUtf8Alloc(raConnectionStringW, cbRaConnectionStringW / sizeof(WCHAR), NULL); + pdu.raConnectionString = ConvertWCharNToUtf8Alloc( + raConnectionStringW, cbRaConnectionStringW / sizeof(WCHAR), nullptr); if (!pdu.raConnectionString) return ERROR_INTERNAL_ERROR; @@ -209,7 +209,7 @@ static UINT remdesk_recv_ctl_authenticate_pdu(WINPR_ATTR_UNUSED RemdeskServerCon wStream* s, REMDESK_CHANNEL_HEADER* header) { size_t cchTmpStringW = 0; - const WCHAR* expertBlobW = NULL; + const WCHAR* expertBlobW = nullptr; REMDESK_CTL_AUTHENTICATE_PDU pdu = WINPR_C_ARRAY_INIT; UINT32 msgLength = header->DataLength - 4; const WCHAR* pStringW = Stream_ConstPointer(s); @@ -241,12 +241,12 @@ static UINT remdesk_recv_ctl_authenticate_pdu(WINPR_ATTR_UNUSED RemdeskServerCon cchStringW++; const size_t cbExpertBlobW = cchStringW * sizeof(WCHAR); - pdu.raConnectionString = - ConvertWCharNToUtf8Alloc(raConnectionStringW, cbRaConnectionStringW / sizeof(WCHAR), NULL); + pdu.raConnectionString = ConvertWCharNToUtf8Alloc( + raConnectionStringW, cbRaConnectionStringW / sizeof(WCHAR), nullptr); if (!pdu.raConnectionString) return ERROR_INTERNAL_ERROR; - pdu.expertBlob = ConvertWCharNToUtf8Alloc(expertBlobW, cbExpertBlobW / sizeof(WCHAR), NULL); + pdu.expertBlob = ConvertWCharNToUtf8Alloc(expertBlobW, cbExpertBlobW / sizeof(WCHAR), nullptr); if (!pdu.expertBlob) { free(pdu.raConnectionString); @@ -278,7 +278,7 @@ static UINT remdesk_recv_ctl_verify_password_pdu(RemdeskServerContext* context, const size_t cbExpertBlobW = header->DataLength - 4; - pdu.expertBlob = ConvertWCharNToUtf8Alloc(expertBlobW, cbExpertBlobW / sizeof(WCHAR), NULL); + pdu.expertBlob = ConvertWCharNToUtf8Alloc(expertBlobW, cbExpertBlobW / sizeof(WCHAR), nullptr); if (!pdu.expertBlob) return ERROR_INTERNAL_ERROR; @@ -426,14 +426,14 @@ static UINT remdesk_server_receive_pdu(RemdeskServerContext* context, wStream* s static DWORD WINAPI remdesk_server_thread(LPVOID arg) { - void* buffer = NULL; + void* buffer = nullptr; HANDLE events[8] = WINPR_C_ARRAY_INIT; - HANDLE ChannelEvent = NULL; + HANDLE ChannelEvent = nullptr; DWORD BytesReturned = 0; UINT error = 0; RemdeskServerContext* context = (RemdeskServerContext*)arg; WINPR_ASSERT(context); - wStream* s = Stream_New(NULL, 4096); + wStream* s = Stream_New(nullptr, 4096); if (!s) { @@ -565,18 +565,18 @@ static UINT remdesk_server_start(RemdeskServerContext* context) return ERROR_INTERNAL_ERROR; } - if (!(context->priv->StopEvent = CreateEvent(NULL, TRUE, FALSE, NULL))) + if (!(context->priv->StopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr))) { WLog_ERR(TAG, "CreateEvent failed!"); return ERROR_INTERNAL_ERROR; } if (!(context->priv->Thread = - CreateThread(NULL, 0, remdesk_server_thread, (void*)context, 0, NULL))) + CreateThread(nullptr, 0, remdesk_server_thread, (void*)context, 0, nullptr))) { WLog_ERR(TAG, "CreateThread failed!"); (void)CloseHandle(context->priv->StopEvent); - context->priv->StopEvent = NULL; + context->priv->StopEvent = nullptr; return ERROR_INTERNAL_ERROR; } @@ -607,7 +607,7 @@ static UINT remdesk_server_stop(RemdeskServerContext* context) RemdeskServerContext* remdesk_server_context_new(HANDLE vcm) { - RemdeskServerContext* context = NULL; + RemdeskServerContext* context = nullptr; context = (RemdeskServerContext*)calloc(1, sizeof(RemdeskServerContext)); if (context) @@ -620,7 +620,7 @@ RemdeskServerContext* remdesk_server_context_new(HANDLE vcm) if (!context->priv) { free(context); - return NULL; + return nullptr; } context->priv->Version = 1; diff --git a/channels/serial/client/serial_main.c b/channels/serial/client/serial_main.c index a492cd3b3..3ffee297d 100644 --- a/channels/serial/client/serial_main.c +++ b/channels/serial/client/serial_main.c @@ -166,9 +166,9 @@ static UINT serial_process_irp_create(SERIAL_DEVICE* serial, IRP* irp) CreateDisposition = OPEN_EXISTING; #endif serial->hComm = winpr_CreateFile(serial->device.name, DesiredAccess, SharedAccess, - NULL, /* SecurityAttributes */ + nullptr, /* SecurityAttributes */ CreateDisposition, 0, /* FlagsAndAttributes */ - NULL); /* TemplateFile */ + nullptr); /* TemplateFile */ if (!serial->hComm || (serial->hComm == INVALID_HANDLE_VALUE)) { @@ -196,8 +196,8 @@ static UINT serial_process_irp_create(SERIAL_DEVICE* serial, IRP* irp) { DWORD BytesReturned = 0; - if (!CommDeviceIoControl(serial->hComm, IOCTL_SERIAL_RESET_DEVICE, NULL, 0, NULL, 0, - &BytesReturned, NULL)) + if (!CommDeviceIoControl(serial->hComm, IOCTL_SERIAL_RESET_DEVICE, nullptr, 0, nullptr, 0, + &BytesReturned, nullptr)) goto error_handle; } @@ -231,7 +231,7 @@ static UINT serial_process_irp_close(SERIAL_DEVICE* serial, IRP* irp) serial->device.name, irp->device->id, irp->FileId); irp->IoStatus = STATUS_SUCCESS; error_handle: - serial->hComm = NULL; + serial->hComm = nullptr; Stream_Zero(irp->output, 5); /* Padding (5 bytes) */ return CHANNEL_RC_OK; } @@ -245,7 +245,7 @@ static UINT serial_process_irp_read(SERIAL_DEVICE* serial, IRP* irp) { UINT32 Length = 0; UINT64 Offset = 0; - BYTE* buffer = NULL; + BYTE* buffer = nullptr; DWORD nbRead = 0; WINPR_ASSERT(serial); @@ -261,7 +261,7 @@ static UINT serial_process_irp_read(SERIAL_DEVICE* serial, IRP* irp) Stream_Seek(irp->input, 20); /* Padding (20 bytes) */ buffer = (BYTE*)calloc(Length, sizeof(BYTE)); - if (buffer == NULL) + if (buffer == nullptr) { irp->IoStatus = STATUS_NO_MEMORY; goto error_handle; @@ -274,7 +274,7 @@ static UINT serial_process_irp_read(SERIAL_DEVICE* serial, IRP* irp) serial->device.name); /* FIXME: CommReadFile to be replaced by ReadFile */ - if (CommReadFile(serial->hComm, buffer, Length, &nbRead, NULL)) + if (CommReadFile(serial->hComm, buffer, Length, &nbRead, nullptr)) { irp->IoStatus = STATUS_SUCCESS; } @@ -339,7 +339,7 @@ static UINT serial_process_irp_write(SERIAL_DEVICE* serial, IRP* irp) if (!Stream_SafeSeek(irp->input, Length)) return ERROR_INVALID_DATA; /* FIXME: CommWriteFile to be replaced by WriteFile */ - if (CommWriteFile(serial->hComm, ptr, Length, &nbWritten, NULL)) + if (CommWriteFile(serial->hComm, ptr, Length, &nbWritten, nullptr)) { irp->IoStatus = STATUS_SUCCESS; } @@ -367,9 +367,9 @@ static UINT serial_process_irp_device_control(SERIAL_DEVICE* serial, IRP* irp) { UINT32 IoControlCode = 0; UINT32 InputBufferLength = 0; - BYTE* InputBuffer = NULL; + BYTE* InputBuffer = nullptr; UINT32 OutputBufferLength = 0; - BYTE* OutputBuffer = NULL; + BYTE* OutputBuffer = nullptr; DWORD BytesReturned = 0; WINPR_ASSERT(serial); @@ -388,7 +388,7 @@ static UINT serial_process_irp_device_control(SERIAL_DEVICE* serial, IRP* irp) OutputBuffer = (BYTE*)calloc(OutputBufferLength, sizeof(BYTE)); - if (OutputBuffer == NULL) + if (OutputBuffer == nullptr) { irp->IoStatus = STATUS_NO_MEMORY; goto error_handle; @@ -396,7 +396,7 @@ static UINT serial_process_irp_device_control(SERIAL_DEVICE* serial, IRP* irp) InputBuffer = (BYTE*)calloc(InputBufferLength, sizeof(BYTE)); - if (InputBuffer == NULL) + if (InputBuffer == nullptr) { irp->IoStatus = STATUS_NO_MEMORY; goto error_handle; @@ -409,7 +409,7 @@ static UINT serial_process_irp_device_control(SERIAL_DEVICE* serial, IRP* irp) /* FIXME: CommDeviceIoControl to be replaced by DeviceIoControl() */ if (CommDeviceIoControl(serial->hComm, IoControlCode, InputBuffer, InputBufferLength, - OutputBuffer, OutputBufferLength, &BytesReturned, NULL)) + OutputBuffer, OutputBufferLength, &BytesReturned, nullptr)) { /* WLog_Print(serial->log, WLOG_DEBUG, "CommDeviceIoControl: CompletionId=%"PRIu32", * IoControlCode=[0x%"PRIX32"] %s done", irp->CompletionId, IoControlCode, @@ -585,7 +585,7 @@ void close_terminated_irp_thread_handles(SERIAL_DEVICE* serial, BOOL forceClose) EnterCriticalSection(&serial->TerminatingIrpThreadsLock); ListDictionary_Lock(serial->IrpThreads); - ULONG_PTR* ids = NULL; + ULONG_PTR* ids = nullptr; const size_t nbIds = ListDictionary_GetKeys(serial->IrpThreads, &ids); for (size_t i = 0; i < nbIds; i++) @@ -605,9 +605,9 @@ void close_terminated_irp_thread_handles(SERIAL_DEVICE* serial, BOOL forceClose) static void create_irp_thread(SERIAL_DEVICE* serial, IRP* irp) { - IRP_THREAD_DATA* data = NULL; - HANDLE irpThread = NULL; - HANDLE previousIrpThread = NULL; + IRP_THREAD_DATA* data = nullptr; + HANDLE irpThread = nullptr; + HANDLE previousIrpThread = nullptr; uintptr_t key = 0; WINPR_ASSERT(serial); @@ -658,7 +658,7 @@ static void create_irp_thread(SERIAL_DEVICE* serial, IRP* irp) /* error_handle to be used ... */ data = (IRP_THREAD_DATA*)calloc(1, sizeof(IRP_THREAD_DATA)); - if (data == NULL) + if (data == nullptr) { WLog_Print(serial->log, WLOG_WARN, "Could not allocate a new IRP_THREAD_DATA."); goto error_handle; @@ -667,7 +667,7 @@ static void create_irp_thread(SERIAL_DEVICE* serial, IRP* irp) data->serial = serial; data->irp = irp; /* data freed by irp_thread_func */ - irpThread = CreateThread(NULL, 0, irp_thread_func, (void*)data, CREATE_SUSPENDED, NULL); + irpThread = CreateThread(nullptr, 0, irp_thread_func, (void*)data, CREATE_SUSPENDED, nullptr); if (irpThread == INVALID_HANDLE_VALUE) { @@ -718,7 +718,7 @@ error_handle: static DWORD WINAPI serial_thread_func(LPVOID arg) { - IRP* irp = NULL; + IRP* irp = nullptr; wMessage message = WINPR_C_ARRAY_INIT; SERIAL_DEVICE* serial = (SERIAL_DEVICE*)arg; UINT error = CHANNEL_RC_OK; @@ -769,7 +769,7 @@ static DWORD WINAPI serial_thread_func(LPVOID arg) static UINT serial_irp_request(DEVICE* device, IRP* irp) { SERIAL_DEVICE* serial = (SERIAL_DEVICE*)device; - WINPR_ASSERT(irp != NULL); + WINPR_ASSERT(irp != nullptr); WINPR_ASSERT(serial); /* NB: ENABLE_ASYNCIO is set, (MS-RDPEFS 2.2.2.7.2) this @@ -777,7 +777,7 @@ static UINT serial_irp_request(DEVICE* device, IRP* irp) * write requests. */ - if (!MessageQueue_Post(serial->MainIrpQueue, NULL, 0, (void*)irp, NULL)) + if (!MessageQueue_Post(serial->MainIrpQueue, nullptr, 0, (void*)irp, nullptr)) { WLog_Print(serial->log, WLOG_ERROR, "MessageQueue_Post failed!"); irp->Discard(irp); @@ -867,7 +867,7 @@ FREERDP_ENTRY_POINT( UINT VCAPITYPE serial_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)) { size_t len = 0; - SERIAL_DEVICE* serial = NULL; + SERIAL_DEVICE* serial = nullptr; UINT error = CHANNEL_RC_OK; WINPR_ASSERT(pEntryPoints); @@ -914,7 +914,7 @@ FREERDP_ENTRY_POINT( serial->device.Free = serial_free; serial->rdpcontext = pEntryPoints->rdpcontext; len = strlen(name); - serial->device.data = Stream_New(NULL, len + 1); + serial->device.data = Stream_New(nullptr, len + 1); if (!serial->device.data) { @@ -926,7 +926,7 @@ FREERDP_ENTRY_POINT( for (size_t i = 0; i <= len; i++) Stream_Write_INT8(serial->device.data, name[i] < 0 ? '_' : name[i]); - if (driver != NULL) + if (driver != nullptr) { if (_stricmp(driver, "Serial") == 0) serial->ServerSerialDriverId = SerialDriverSerialSys; @@ -948,7 +948,7 @@ FREERDP_ENTRY_POINT( serial->ServerSerialDriverId = SerialDriverSerialSys; } - if (device->Permissive != NULL) + if (device->Permissive != nullptr) { if (_stricmp(device->Permissive, "permissive") == 0) { @@ -964,7 +964,7 @@ FREERDP_ENTRY_POINT( WLog_Print(serial->log, WLOG_DEBUG, "Server's serial driver: %s (id: %u)", driver, serial->ServerSerialDriverId); - serial->MainIrpQueue = MessageQueue_New(NULL); + serial->MainIrpQueue = MessageQueue_New(nullptr); if (!serial->MainIrpQueue) { @@ -1005,7 +1005,7 @@ FREERDP_ENTRY_POINT( goto error_out; } - serial->MainThread = CreateThread(NULL, 0, serial_thread_func, serial, 0, NULL); + serial->MainThread = CreateThread(nullptr, 0, serial_thread_func, serial, 0, nullptr); if (!serial->MainThread) { WLog_Print(serial->log, WLOG_ERROR, "CreateThread failed!"); diff --git a/channels/server/channels.c b/channels/server/channels.c index 1e7c96ba7..635ee8526 100644 --- a/channels/server/channels.c +++ b/channels/server/channels.c @@ -104,135 +104,135 @@ extern void freerdp_channels_dummy(void); void freerdp_channels_dummy(void) { #if defined(CHANNEL_AUDIN_SERVER) - audin_server_context* audin = NULL; + audin_server_context* audin = nullptr; #endif #if defined(CHANNEL_RDPSND_SERVER) - RdpsndServerContext* rdpsnd = NULL; + RdpsndServerContext* rdpsnd = nullptr; #endif #if defined(CHANNEL_CLIPRDR_SERVER) - CliprdrServerContext* cliprdr = NULL; + CliprdrServerContext* cliprdr = nullptr; #endif #if defined(CHANNEL_ECHO_SERVER) - echo_server_context* echo = NULL; + echo_server_context* echo = nullptr; #endif #if defined(CHANNEL_RDPDR_SERVER) - RdpdrServerContext* rdpdr = NULL; + RdpdrServerContext* rdpdr = nullptr; #endif #if defined(CHANNEL_DRDYNVC_SERVER) - DrdynvcServerContext* drdynvc = NULL; + DrdynvcServerContext* drdynvc = nullptr; #endif #if defined(CHANNEL_RDPEI_SERVER) - RdpeiServerContext* rdpei = NULL; + RdpeiServerContext* rdpei = nullptr; #endif #if defined(CHANNEL_REMDESK_SERVER) - RemdeskServerContext* remdesk = NULL; + RemdeskServerContext* remdesk = nullptr; #endif #if defined(CHANNEL_ENCOMSP_SERVER) - EncomspServerContext* encomsp = NULL; + EncomspServerContext* encomsp = nullptr; #endif #if defined(CHANNEL_RAIL_SERVER) - RailServerContext* rail = NULL; + RailServerContext* rail = nullptr; #endif #if defined(CHANNEL_TELEMETRY_SERVER) - TelemetryServerContext* telemetry = NULL; + TelemetryServerContext* telemetry = nullptr; #endif #if defined(CHANNEL_RDPGFX_SERVER) - RdpgfxServerContext* rdpgfx = NULL; + RdpgfxServerContext* rdpgfx = nullptr; #endif #if defined(CHANNEL_DISP_SERVER) - DispServerContext* disp = NULL; + DispServerContext* disp = nullptr; #endif #if defined(CHANNEL_RDPEMSC_SERVER) - MouseCursorServerContext* mouse_cursor = NULL; + MouseCursorServerContext* mouse_cursor = nullptr; #endif /* CHANNEL_RDPEMSC_SERVER */ #if defined(CHANNEL_RDPECAM_SERVER) - CamDevEnumServerContext* camera_enumerator = NULL; - CameraDeviceServerContext* camera_device = NULL; + CamDevEnumServerContext* camera_enumerator = nullptr; + CameraDeviceServerContext* camera_device = nullptr; #endif #if defined(CHANNEL_LOCATION_SERVER) - LocationServerContext* location = NULL; + LocationServerContext* location = nullptr; #endif /* CHANNEL_LOCATION_SERVER */ #ifdef WITH_CHANNEL_GFXREDIR GfxRedirServerContext* gfxredir; #endif // WITH_CHANNEL_GFXREDIR #if defined(CHANNEL_AUDIN_SERVER) - audin = audin_server_context_new(NULL); + audin = audin_server_context_new(nullptr); #endif #if defined(CHANNEL_AUDIN_SERVER) audin_server_context_free(audin); #endif #if defined(CHANNEL_RDPSND_SERVER) - rdpsnd = rdpsnd_server_context_new(NULL); + rdpsnd = rdpsnd_server_context_new(nullptr); rdpsnd_server_context_free(rdpsnd); #endif #if defined(CHANNEL_CLIPRDR_SERVER) - cliprdr = cliprdr_server_context_new(NULL); + cliprdr = cliprdr_server_context_new(nullptr); cliprdr_server_context_free(cliprdr); #endif #if defined(CHANNEL_ECHO_SERVER) - echo = echo_server_context_new(NULL); + echo = echo_server_context_new(nullptr); echo_server_context_free(echo); #endif #if defined(CHANNEL_RDPDR_SERVER) - rdpdr = rdpdr_server_context_new(NULL); + rdpdr = rdpdr_server_context_new(nullptr); rdpdr_server_context_free(rdpdr); #endif #if defined(CHANNEL_DRDYNVC_SERVER) - drdynvc = drdynvc_server_context_new(NULL); + drdynvc = drdynvc_server_context_new(nullptr); drdynvc_server_context_free(drdynvc); #endif #if defined(CHANNEL_RDPEI_SERVER) - rdpei = rdpei_server_context_new(NULL); + rdpei = rdpei_server_context_new(nullptr); rdpei_server_context_free(rdpei); #endif #if defined(CHANNEL_REMDESK_SERVER) - remdesk = remdesk_server_context_new(NULL); + remdesk = remdesk_server_context_new(nullptr); remdesk_server_context_free(remdesk); #endif #if defined(CHANNEL_ENCOMSP_SERVER) - encomsp = encomsp_server_context_new(NULL); + encomsp = encomsp_server_context_new(nullptr); encomsp_server_context_free(encomsp); #endif #if defined(CHANNEL_RAIL_SERVER) - rail = rail_server_context_new(NULL); + rail = rail_server_context_new(nullptr); rail_server_context_free(rail); #endif #if defined(CHANNEL_TELEMETRY_SERVER) - telemetry = telemetry_server_context_new(NULL); + telemetry = telemetry_server_context_new(nullptr); telemetry_server_context_free(telemetry); #endif #if defined(CHANNEL_RDPGFX_SERVER) - rdpgfx = rdpgfx_server_context_new(NULL); + rdpgfx = rdpgfx_server_context_new(nullptr); rdpgfx_server_context_free(rdpgfx); #endif #if defined(CHANNEL_DISP_SERVER) - disp = disp_server_context_new(NULL); + disp = disp_server_context_new(nullptr); disp_server_context_free(disp); #endif #if defined(CHANNEL_RDPEMSC_SERVER) - mouse_cursor = mouse_cursor_server_context_new(NULL); + mouse_cursor = mouse_cursor_server_context_new(nullptr); mouse_cursor_server_context_free(mouse_cursor); #endif /* CHANNEL_RDPEMSC_SERVER */ #if defined(CHANNEL_RDPECAM_SERVER) - camera_enumerator = cam_dev_enum_server_context_new(NULL); + camera_enumerator = cam_dev_enum_server_context_new(nullptr); cam_dev_enum_server_context_free(camera_enumerator); - camera_device = camera_device_server_context_new(NULL); + camera_device = camera_device_server_context_new(nullptr); camera_device_server_context_free(camera_device); #endif #if defined(CHANNEL_LOCATION_SERVER) - location = location_server_context_new(NULL); + location = location_server_context_new(nullptr); location_server_context_free(location); #endif /* CHANNEL_LOCATION_SERVER */ #ifdef WITH_CHANNEL_GFXREDIR - gfxredir = gfxredir_server_context_new(NULL); + gfxredir = gfxredir_server_context_new(nullptr); gfxredir_server_context_free(gfxredir); #endif // WITH_CHANNEL_GFXREDIR #if defined(CHANNEL_AINPUT_SERVER) { - ainput_server_context* ainput = ainput_server_context_new(NULL); + ainput_server_context* ainput = ainput_server_context_new(nullptr); ainput_server_context_free(ainput); } #endif diff --git a/channels/smartcard/client/smartcard_main.c b/channels/smartcard/client/smartcard_main.c index 1038f160d..826a34f5c 100644 --- a/channels/smartcard/client/smartcard_main.c +++ b/channels/smartcard/client/smartcard_main.c @@ -54,9 +54,9 @@ static SMARTCARD_DEVICE* cast_device_from(DEVICE* device, const char* fkt, const { if (!device) { - WLog_ERR(TAG, "%s [%s:%" PRIuz "] Called smartcard channel with NULL device", fkt, file, + WLog_ERR(TAG, "%s [%s:%" PRIuz "] Called smartcard channel with nullptr device", fkt, file, line); - return NULL; + return nullptr; } if (device->type != RDPDR_DTYP_SMARTCARD) @@ -64,7 +64,7 @@ static SMARTCARD_DEVICE* cast_device_from(DEVICE* device, const char* fkt, const WLog_ERR(TAG, "%s [%s:%" PRIuz "] Called smartcard channel with invalid device of type %" PRIx32, fkt, file, line, device->type); - return NULL; + return nullptr; } return (SMARTCARD_DEVICE*)device; @@ -77,7 +77,7 @@ static DWORD WINAPI smartcard_context_thread(LPVOID arg) DWORD waitStatus = 0; HANDLE hEvents[2] = WINPR_C_ARRAY_INIT; wMessage message = WINPR_C_ARRAY_INIT; - SMARTCARD_DEVICE* smartcard = NULL; + SMARTCARD_DEVICE* smartcard = nullptr; UINT error = CHANNEL_RC_OK; smartcard = pContext->smartcard; @@ -105,7 +105,7 @@ static DWORD WINAPI smartcard_context_thread(LPVOID arg) if (waitStatus == WAIT_OBJECT_0) { - scard_irp_queue_element* element = NULL; + scard_irp_queue_element* element = nullptr; if (!MessageQueue_Peek(pContext->IrpQueue, &message, TRUE)) { @@ -190,7 +190,7 @@ static void* smartcard_context_new(void* smartcard, SCARDCONTEXT hContext) pContext->smartcard = smartcard; pContext->hContext = hContext; - pContext->IrpQueue = MessageQueue_New(NULL); + pContext->IrpQueue = MessageQueue_New(nullptr); if (!pContext->IrpQueue) { @@ -204,7 +204,7 @@ static void* smartcard_context_new(void* smartcard, SCARDCONTEXT hContext) obj->fnObjectFree = smartcard_operation_queue_free; } - pContext->thread = CreateThread(NULL, 0, smartcard_context_thread, pContext, 0, NULL); + pContext->thread = CreateThread(nullptr, 0, smartcard_context_thread, pContext, 0, nullptr); if (!pContext->thread) { @@ -215,7 +215,7 @@ static void* smartcard_context_new(void* smartcard, SCARDCONTEXT hContext) return pContext; fail: smartcard_context_free(pContext); - return NULL; + return nullptr; } void smartcard_context_free(void* pCtx) @@ -353,7 +353,7 @@ static UINT smartcard_process_irp(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL* h { LONG status = 0; BOOL asyncIrp = FALSE; - SMARTCARD_CONTEXT* pContext = NULL; + SMARTCARD_CONTEXT* pContext = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(handled); @@ -488,7 +488,7 @@ static UINT smartcard_process_irp(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL* h { if (pContext) { - if (!MessageQueue_Post(pContext->IrpQueue, NULL, 0, (void*)element, NULL)) + if (!MessageQueue_Post(pContext->IrpQueue, nullptr, 0, (void*)element, nullptr)) { smartcard_operation_free(&element->operation, TRUE); WLog_ERR(TAG, "MessageQueue_Post failed!"); @@ -517,7 +517,7 @@ static UINT smartcard_process_irp(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL* h static DWORD WINAPI smartcard_thread_func(LPVOID arg) { - IRP* irp = NULL; + IRP* irp = nullptr; DWORD nCount = 0; DWORD status = 0; HANDLE hEvents[1] = WINPR_C_ARRAY_INIT; @@ -596,7 +596,7 @@ static UINT smartcard_irp_request(DEVICE* device, IRP* irp) return ERROR_INVALID_PARAMETER; } - if (!MessageQueue_Post(smartcard->IrpQueue, NULL, 0, (void*)irp, NULL)) + if (!MessageQueue_Post(smartcard->IrpQueue, nullptr, 0, (void*)irp, nullptr)) { WLog_ERR(TAG, "MessageQueue_Post failed!"); irp->Discard(irp); @@ -649,7 +649,7 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POIN smartcard->device.Free = smartcard_free; smartcard->rdpcontext = pEntryPoints->rdpcontext; length = strlen(smartcard->device.name); - smartcard->device.data = Stream_New(NULL, length + 1); + smartcard->device.data = Stream_New(nullptr, length + 1); if (!smartcard->device.data) { @@ -658,7 +658,7 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POIN } Stream_Write(smartcard->device.data, "SCARD", 6); - smartcard->IrpQueue = MessageQueue_New(NULL); + smartcard->IrpQueue = MessageQueue_New(nullptr); if (!smartcard->IrpQueue) { @@ -693,7 +693,7 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POIN } smartcard->thread = - CreateThread(NULL, 0, smartcard_thread_func, smartcard, CREATE_SUSPENDED, NULL); + CreateThread(nullptr, 0, smartcard_thread_func, smartcard, CREATE_SUSPENDED, nullptr); if (!smartcard->thread) { diff --git a/channels/sshagent/client/sshagent_main.c b/channels/sshagent/client/sshagent_main.c index 3f0880b42..614bde8a3 100644 --- a/channels/sshagent/client/sshagent_main.c +++ b/channels/sshagent/client/sshagent_main.c @@ -129,7 +129,7 @@ static int connect_to_sshagent(const char* udspath) * Entry point for thread to read from the ssh-agent socket and forward * the data to RDP * - * @return NULL + * @return 0 */ static DWORD WINAPI sshagent_read_thread(LPVOID data) { @@ -167,7 +167,7 @@ static DWORD WINAPI sshagent_read_thread(LPVOID data) { /* Something read: forward to virtual channel */ IWTSVirtualChannel* channel = callback->generic.channel; - status = channel->Write(channel, (ULONG)bytes_read, buffer, NULL); + status = channel->Write(channel, (ULONG)bytes_read, buffer, nullptr); if (status != CHANNEL_RC_OK) { @@ -298,7 +298,7 @@ static UINT sshagent_on_new_channel_connection(IWTSListenerCallback* pListenerCa generic->channel_mgr = listener_callback->channel_mgr; generic->channel = pChannel; callback->rdpcontext = listener_callback->rdpcontext; - callback->thread = CreateThread(NULL, 0, sshagent_read_thread, (void*)callback, 0, NULL); + callback->thread = CreateThread(nullptr, 0, sshagent_read_thread, (void*)callback, 0, nullptr); if (!callback->thread) { @@ -339,16 +339,16 @@ static UINT sshagent_plugin_initialize(IWTSPlugin* pPlugin, IWTSVirtualChannelMa // NOLINTNEXTLINE(concurrency-mt-unsafe) sshagent->listener_callback->agent_uds_path = getenv("SSH_AUTH_SOCK"); - if (sshagent->listener_callback->agent_uds_path == NULL) + if (sshagent->listener_callback->agent_uds_path == nullptr) { WLog_ERR(TAG, "Environment variable $SSH_AUTH_SOCK undefined!"); free(sshagent->listener_callback); - sshagent->listener_callback = NULL; + sshagent->listener_callback = nullptr; return CHANNEL_RC_INITIALIZATION_ERROR; } return pChannelMgr->CreateListener(pChannelMgr, "SSHAGENT", 0, - (IWTSListenerCallback*)sshagent->listener_callback, NULL); + (IWTSListenerCallback*)sshagent->listener_callback, nullptr); } /** @@ -387,8 +387,8 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE sshagent_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS } sshagent->iface.Initialize = sshagent_plugin_initialize; - sshagent->iface.Connected = NULL; - sshagent->iface.Disconnected = NULL; + sshagent->iface.Connected = nullptr; + sshagent->iface.Disconnected = nullptr; sshagent->iface.Terminated = sshagent_plugin_terminated; sshagent->rdpcontext = pEntryPoints->GetRdpContext(pEntryPoints); status = pEntryPoints->RegisterPlugin(pEntryPoints, "sshagent", &sshagent->iface); diff --git a/channels/telemetry/server/telemetry_main.c b/channels/telemetry/server/telemetry_main.c index 387412313..91c89bea4 100644 --- a/channels/telemetry/server/telemetry_main.c +++ b/channels/telemetry/server/telemetry_main.c @@ -74,9 +74,9 @@ static UINT telemetry_server_open_channel(telemetry_server* telemetry) { TelemetryServerContext* context = &telemetry->context; DWORD Error = ERROR_SUCCESS; - HANDLE hEvent = NULL; + HANDLE hEvent = nullptr; DWORD BytesReturned = 0; - PULONG pSessionId = NULL; + PULONG pSessionId = nullptr; UINT32 channelId = 0; BOOL status = TRUE; @@ -148,7 +148,7 @@ static UINT telemetry_process_message(telemetry_server* telemetry) ULONG BytesReturned = 0; BYTE MessageId = 0; BYTE Length = 0; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(telemetry); WINPR_ASSERT(telemetry->telemetry_channel); @@ -157,7 +157,7 @@ static UINT telemetry_process_message(telemetry_server* telemetry) WINPR_ASSERT(s); Stream_SetPosition(s, 0); - rc = WTSVirtualChannelRead(telemetry->telemetry_channel, 0, NULL, 0, &BytesReturned); + rc = WTSVirtualChannelRead(telemetry->telemetry_channel, 0, nullptr, 0, &BytesReturned); if (!rc) goto out; @@ -236,9 +236,9 @@ static UINT telemetry_server_context_poll_int(TelemetryServerContext* context) static HANDLE telemetry_server_get_channel_handle(telemetry_server* telemetry) { - void* buffer = NULL; + void* buffer = nullptr; DWORD BytesReturned = 0; - HANDLE ChannelEvent = NULL; + HANDLE ChannelEvent = nullptr; WINPR_ASSERT(telemetry); @@ -302,7 +302,7 @@ static DWORD WINAPI telemetry_server_thread_func(LPVOID arg) } (void)WTSVirtualChannelClose(telemetry->telemetry_channel); - telemetry->telemetry_channel = NULL; + telemetry->telemetry_channel = nullptr; if (error && telemetry->context.rdpcontext) setChannelError(telemetry->context.rdpcontext, error, @@ -318,21 +318,22 @@ static UINT telemetry_server_open(TelemetryServerContext* context) WINPR_ASSERT(telemetry); - if (!telemetry->externalThread && (telemetry->thread == NULL)) + if (!telemetry->externalThread && (telemetry->thread == nullptr)) { - telemetry->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + telemetry->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!telemetry->stopEvent) { WLog_ERR(TAG, "CreateEvent failed!"); return ERROR_INTERNAL_ERROR; } - telemetry->thread = CreateThread(NULL, 0, telemetry_server_thread_func, telemetry, 0, NULL); + telemetry->thread = + CreateThread(nullptr, 0, telemetry_server_thread_func, telemetry, 0, nullptr); if (!telemetry->thread) { WLog_ERR(TAG, "CreateThread failed!"); (void)CloseHandle(telemetry->stopEvent); - telemetry->stopEvent = NULL; + telemetry->stopEvent = nullptr; return ERROR_INTERNAL_ERROR; } } @@ -361,15 +362,15 @@ static UINT telemetry_server_close(TelemetryServerContext* context) (void)CloseHandle(telemetry->thread); (void)CloseHandle(telemetry->stopEvent); - telemetry->thread = NULL; - telemetry->stopEvent = NULL; + telemetry->thread = nullptr; + telemetry->stopEvent = nullptr; } if (telemetry->externalThread) { if (telemetry->state != TELEMETRY_INITIAL) { (void)WTSVirtualChannelClose(telemetry->telemetry_channel); - telemetry->telemetry_channel = NULL; + telemetry->telemetry_channel = nullptr; telemetry->state = TELEMETRY_INITIAL; } } @@ -412,7 +413,7 @@ TelemetryServerContext* telemetry_server_context_new(HANDLE vcm) telemetry_server* telemetry = (telemetry_server*)calloc(1, sizeof(telemetry_server)); if (!telemetry) - return NULL; + return nullptr; telemetry->context.vcm = vcm; telemetry->context.Initialize = telemetry_server_initialize; @@ -421,7 +422,7 @@ TelemetryServerContext* telemetry_server_context_new(HANDLE vcm) telemetry->context.Poll = telemetry_server_context_poll; telemetry->context.ChannelHandle = telemetry_server_context_handle; - telemetry->buffer = Stream_New(NULL, 4096); + telemetry->buffer = Stream_New(nullptr, 4096); if (!telemetry->buffer) goto fail; @@ -431,7 +432,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC telemetry_server_context_free(&telemetry->context); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void telemetry_server_context_free(TelemetryServerContext* context) diff --git a/channels/tsmf/client/alsa/tsmf_alsa.c b/channels/tsmf/client/alsa/tsmf_alsa.c index a2623f0ee..d24e29646 100644 --- a/channels/tsmf/client/alsa/tsmf_alsa.c +++ b/channels/tsmf/client/alsa/tsmf_alsa.c @@ -82,8 +82,8 @@ static BOOL tsmf_alsa_set_format(ITSMFAudioDevice* audio, UINT32 sample_rate, UI { int error = 0; snd_pcm_uframes_t frames = 0; - snd_pcm_hw_params_t* hw_params = NULL; - snd_pcm_sw_params_t* sw_params = NULL; + snd_pcm_hw_params_t* hw_params = nullptr; + snd_pcm_sw_params_t* sw_params = nullptr; TSMFAlsaAudioDevice* alsa = (TSMFAlsaAudioDevice*)audio; if (!alsa->out_handle) @@ -104,7 +104,7 @@ static BOOL tsmf_alsa_set_format(ITSMFAudioDevice* audio, UINT32 sample_rate, UI snd_pcm_hw_params_any(alsa->out_handle, hw_params); snd_pcm_hw_params_set_access(alsa->out_handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED); snd_pcm_hw_params_set_format(alsa->out_handle, hw_params, SND_PCM_FORMAT_S16_LE); - snd_pcm_hw_params_set_rate_near(alsa->out_handle, hw_params, &alsa->actual_rate, NULL); + snd_pcm_hw_params_set_rate_near(alsa->out_handle, hw_params, &alsa->actual_rate, nullptr); snd_pcm_hw_params_set_channels_near(alsa->out_handle, hw_params, &alsa->actual_channels); frames = sample_rate; snd_pcm_hw_params_set_buffer_size_near(alsa->out_handle, hw_params, &frames); @@ -141,7 +141,7 @@ static BOOL tsmf_alsa_set_format(ITSMFAudioDevice* audio, UINT32 sample_rate, UI static BOOL tsmf_alsa_play(ITSMFAudioDevice* audio, const BYTE* src, UINT32 data_size) { - const BYTE* pindex = NULL; + const BYTE* pindex = nullptr; TSMFAlsaAudioDevice* alsa = (TSMFAlsaAudioDevice*)audio; DEBUG_TSMF("data_size %" PRIu32 "", data_size); @@ -221,7 +221,7 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE alsa_freerdp_tsmf_client_audio_subsystem_entr { ITSMFAudioDevice** sptr = (ITSMFAudioDevice**)ptr; WINPR_ASSERT(sptr); - *sptr = NULL; + *sptr = nullptr; TSMFAlsaAudioDevice* alsa = calloc(1, sizeof(TSMFAlsaAudioDevice)); if (!alsa) diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c index e10bdd1e0..364b5abed 100644 --- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c +++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c @@ -94,7 +94,7 @@ typedef struct static BOOL tsmf_ffmpeg_init_context(ITSMFDecoder* decoder) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*)decoder; - mdecoder->codec_context = avcodec_alloc_context3(NULL); + mdecoder->codec_context = avcodec_alloc_context3(nullptr); if (!mdecoder->codec_context) { @@ -162,9 +162,9 @@ static BOOL tsmf_ffmpeg_init_audio_stream(ITSMFDecoder* decoder, const TS_AM_MED static BOOL tsmf_ffmpeg_init_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYPE* media_type) { - BYTE* p = NULL; + BYTE* p = nullptr; UINT32 size = 0; - const BYTE* s = NULL; + const BYTE* s = nullptr; TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*)decoder; WINPR_PRAGMA_DIAG_PUSH @@ -273,7 +273,7 @@ static BOOL tsmf_ffmpeg_prepare(ITSMFDecoder* decoder) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*)decoder; - if (avcodec_open2(mdecoder->codec_context, mdecoder->codec, NULL) < 0) + if (avcodec_open2(mdecoder->codec_context, mdecoder->codec, nullptr) < 0) { WLog_ERR(TAG, "avcodec_open2 failed."); return FALSE; @@ -382,7 +382,7 @@ static BOOL tsmf_ffmpeg_decode_video(ITSMFDecoder* decoder, const BYTE* data, UI TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*)decoder; int decoded = 0; int len = 0; - AVFrame* frame = NULL; + AVFrame* frame = nullptr; BOOL ret = TRUE; #if LIBAVCODEC_VERSION_MAJOR < 52 || \ (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR <= 20) @@ -487,7 +487,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const BYTE* data, UI /* Ensure enough space for decoding */ if (mdecoder->decoded_size_max - mdecoder->decoded_size < MAX_AUDIO_FRAME_SIZE) { - BYTE* tmp_data = NULL; + BYTE* tmp_data = nullptr; tmp_data = realloc(mdecoder->decoded_data, mdecoder->decoded_size_max * 2ull + 16ull); if (!tmp_data) @@ -547,8 +547,9 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const BYTE* data, UI #else const int channels = mdecoder->codec_context->channels; #endif - frame_size = av_samples_get_buffer_size(NULL, channels, decoded_frame->nb_samples, - mdecoder->codec_context->sample_fmt, 1); + frame_size = + av_samples_get_buffer_size(nullptr, channels, decoded_frame->nb_samples, + mdecoder->codec_context->sample_fmt, 1); memcpy(dst, decoded_frame->data[0], frame_size); } else @@ -576,7 +577,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const BYTE* data, UI if (mdecoder->decoded_size == 0) { free(mdecoder->decoded_data); - mdecoder->decoded_data = NULL; + mdecoder->decoded_data = nullptr; } else if (dst_offset) { @@ -597,7 +598,7 @@ static BOOL tsmf_ffmpeg_decode(ITSMFDecoder* decoder, const BYTE* data, UINT32 d if (mdecoder->decoded_data) { free(mdecoder->decoded_data); - mdecoder->decoded_data = NULL; + mdecoder->decoded_data = nullptr; } mdecoder->decoded_size = 0; @@ -618,11 +619,11 @@ static BOOL tsmf_ffmpeg_decode(ITSMFDecoder* decoder, const BYTE* data, UINT32 d static BYTE* tsmf_ffmpeg_get_decoded_data(ITSMFDecoder* decoder, UINT32* size) { - BYTE* buf = NULL; + BYTE* buf = nullptr; TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*)decoder; *size = mdecoder->decoded_size; buf = mdecoder->decoded_data; - mdecoder->decoded_data = NULL; + mdecoder->decoded_data = nullptr; mdecoder->decoded_size = 0; return buf; } @@ -670,7 +671,7 @@ static void tsmf_ffmpeg_free(ITSMFDecoder* decoder) if (mdecoder->codec_context) { free(mdecoder->codec_context->extradata); - mdecoder->codec_context->extradata = NULL; + mdecoder->codec_context->extradata = nullptr; #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 69, 100) avcodec_free_context(&mdecoder->codec_context); @@ -700,10 +701,10 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE ffmpeg_freerdp_tsmf_client_decoder_subsystem_ { ITSMFDecoder** sptr = (ITSMFDecoder**)ptr; WINPR_ASSERT(sptr); - *sptr = NULL; + *sptr = nullptr; - TSMFFFmpegDecoder* decoder = NULL; - InitOnceExecuteOnce(&g_Initialized, InitializeAvCodecs, NULL, NULL); + TSMFFFmpegDecoder* decoder = nullptr; + InitOnceExecuteOnce(&g_Initialized, InitializeAvCodecs, nullptr, nullptr); WLog_DBG(TAG, "TSMFDecoderEntry FFMPEG"); decoder = (TSMFFFmpegDecoder*)calloc(1, sizeof(TSMFFFmpegDecoder)); diff --git a/channels/tsmf/client/gstreamer/tsmf_X11.c b/channels/tsmf/client/gstreamer/tsmf_X11.c index f0b7391c1..d553512af 100644 --- a/channels/tsmf/client/gstreamer/tsmf_X11.c +++ b/channels/tsmf/client/gstreamer/tsmf_X11.c @@ -201,7 +201,7 @@ int tsmf_platform_create(TSMFGstreamerDecoder* decoder) return -3; } - hdl->disp = XOpenDisplay(NULL); + hdl->disp = XOpenDisplay(nullptr); if (!hdl->disp) { WLog_ERR(TAG, "Failed to open display"); @@ -242,7 +242,8 @@ int tsmf_platform_register_handler(TSMFGstreamerDecoder* decoder) bus = gst_pipeline_get_bus(GST_PIPELINE(decoder->pipe)); #if GST_VERSION_MAJOR > 0 - gst_bus_set_sync_handler(bus, (GstBusSyncHandler)tsmf_platform_bus_sync_handler, decoder, NULL); + gst_bus_set_sync_handler(bus, (GstBusSyncHandler)tsmf_platform_bus_sync_handler, decoder, + nullptr); #else gst_bus_set_sync_handler(bus, (GstBusSyncHandler)tsmf_platform_bus_sync_handler, decoder); #endif @@ -275,7 +276,7 @@ int tsmf_platform_free(TSMFGstreamerDecoder* decoder) close(hdl->shmid); free(hdl); - decoder->platform = NULL; + decoder->platform = nullptr; return 0; } @@ -384,7 +385,7 @@ int tsmf_window_resize(TSMFGstreamerDecoder* decoder, int x, int y, int width, i #if defined(WITH_XEXT) if (hdl->has_shape) { - XRectangle* xrects = NULL; + XRectangle* xrects = nullptr; if (nr_rects == 0) { @@ -489,7 +490,7 @@ int tsmf_window_destroy(TSMFGstreamerDecoder* decoder) XUnlockDisplay(hdl->disp); } - hdl->overlay = NULL; + hdl->overlay = nullptr; hdl->subwin = 0; hdl->subwinMapped = FALSE; hdl->subwinX = -1; diff --git a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c index 81d7095fd..54e746e81 100644 --- a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c +++ b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c @@ -53,7 +53,7 @@ static BOOL tsmf_gstreamer_buffer_level(ITSMFDecoder* decoder); static const char* get_type(TSMFGstreamerDecoder* mdecoder) { if (!mdecoder) - return NULL; + return nullptr; switch (mdecoder->media_type) { @@ -76,20 +76,21 @@ static void cb_child_added(GstChildProxy* child_proxy, GObject* object, !g_strcmp0(G_OBJECT_TYPE_NAME(object), "GstFluVAAutoSink")) { gst_base_sink_set_max_lateness((GstBaseSink*)object, 10000000); /* nanoseconds */ - g_object_set(G_OBJECT(object), "sync", TRUE, NULL); /* synchronize on the clock */ - g_object_set(G_OBJECT(object), "async", TRUE, NULL); /* no async state changes */ + g_object_set(G_OBJECT(object), "sync", TRUE, nullptr); /* synchronize on the clock */ + g_object_set(G_OBJECT(object), "async", TRUE, nullptr); /* no async state changes */ } else if (!g_strcmp0(G_OBJECT_TYPE_NAME(object), "GstAlsaSink") || !g_strcmp0(G_OBJECT_TYPE_NAME(object), "GstPulseSink")) { gst_base_sink_set_max_lateness((GstBaseSink*)object, 10000000); /* nanoseconds */ - g_object_set(G_OBJECT(object), "slave-method", 1, NULL); - g_object_set(G_OBJECT(object), "buffer-time", (gint64)20000, NULL); /* microseconds */ - g_object_set(G_OBJECT(object), "drift-tolerance", (gint64)20000, NULL); /* microseconds */ - g_object_set(G_OBJECT(object), "latency-time", (gint64)10000, NULL); /* microseconds */ - g_object_set(G_OBJECT(object), "sync", TRUE, NULL); /* synchronize on the clock */ - g_object_set(G_OBJECT(object), "async", TRUE, NULL); /* no async state changes */ + g_object_set(G_OBJECT(object), "slave-method", 1, nullptr); + g_object_set(G_OBJECT(object), "buffer-time", (gint64)20000, nullptr); /* microseconds */ + g_object_set(G_OBJECT(object), "drift-tolerance", (gint64)20000, + nullptr); /* microseconds */ + g_object_set(G_OBJECT(object), "latency-time", (gint64)10000, nullptr); /* microseconds */ + g_object_set(G_OBJECT(object), "sync", TRUE, nullptr); /* synchronize on the clock */ + g_object_set(G_OBJECT(object), "async", TRUE, nullptr); /* no async state changes */ } } @@ -137,8 +138,8 @@ static BOOL tsmf_gstreamer_change_volume(ITSMFDecoder* decoder, UINT32 newVolume if (!G_IS_OBJECT(mdecoder->volume)) return TRUE; - g_object_set(mdecoder->volume, "mute", mdecoder->gstMuted, NULL); - g_object_set(mdecoder->volume, "volume", mdecoder->gstVolume, NULL); + g_object_set(mdecoder->volume, "mute", mdecoder->gstMuted, nullptr); + g_object_set(mdecoder->volume, "volume", mdecoder->gstVolume, nullptr); return TRUE; } @@ -194,17 +195,17 @@ static GstBuffer* tsmf_get_buffer_from_data(const void* raw_data, gsize size) gpointer data; if (!raw_data) - return NULL; + return nullptr; if (size < 1) - return NULL; + return nullptr; data = g_malloc(size); if (!data) { WLog_ERR(TAG, "Could not allocate %" G_GSIZE_FORMAT " bytes of data.", size); - return NULL; + return nullptr; } CopyMemory(data, raw_data, size); @@ -218,7 +219,7 @@ static GstBuffer* tsmf_get_buffer_from_data(const void* raw_data, gsize size) { WLog_ERR(TAG, "Could not create GstBuffer"); free(data); - return NULL; + return nullptr; } GST_BUFFER_MALLOCDATA(buffer) = data; @@ -264,7 +265,7 @@ static BOOL tsmf_gstreamer_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* m #endif "framerate", GST_TYPE_FRACTION, media_type->SamplesPerSecond.Numerator, media_type->SamplesPerSecond.Denominator, "pixel-aspect-ratio", GST_TYPE_FRACTION, - 1, 1, NULL); + 1, 1, nullptr); break; case TSMF_SUB_TYPE_MP4S: mdecoder->gst_caps = gst_caps_new_simple( @@ -277,7 +278,7 @@ static BOOL tsmf_gstreamer_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* m "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC('M', 'P', '4', '2'), #endif "framerate", GST_TYPE_FRACTION, media_type->SamplesPerSecond.Numerator, - media_type->SamplesPerSecond.Denominator, NULL); + media_type->SamplesPerSecond.Denominator, nullptr); break; case TSMF_SUB_TYPE_MP42: mdecoder->gst_caps = gst_caps_new_simple( @@ -290,7 +291,7 @@ static BOOL tsmf_gstreamer_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* m "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC('M', 'P', '4', '2'), #endif "framerate", GST_TYPE_FRACTION, media_type->SamplesPerSecond.Numerator, - media_type->SamplesPerSecond.Denominator, NULL); + media_type->SamplesPerSecond.Denominator, nullptr); break; case TSMF_SUB_TYPE_MP43: mdecoder->gst_caps = gst_caps_new_simple( @@ -303,7 +304,7 @@ static BOOL tsmf_gstreamer_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* m "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC('M', 'P', '4', '3'), #endif "framerate", GST_TYPE_FRACTION, media_type->SamplesPerSecond.Numerator, - media_type->SamplesPerSecond.Denominator, NULL); + media_type->SamplesPerSecond.Denominator, nullptr); break; case TSMF_SUB_TYPE_M4S2: mdecoder->gst_caps = gst_caps_new_simple( @@ -315,7 +316,7 @@ static BOOL tsmf_gstreamer_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* m "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC('M', '4', 'S', '2'), #endif "framerate", GST_TYPE_FRACTION, media_type->SamplesPerSecond.Numerator, - media_type->SamplesPerSecond.Denominator, NULL); + media_type->SamplesPerSecond.Denominator, nullptr); break; case TSMF_SUB_TYPE_WMA9: mdecoder->gst_caps = gst_caps_new_simple( @@ -323,7 +324,8 @@ static BOOL tsmf_gstreamer_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* m media_type->SamplesPerSecond.Numerator, "channels", G_TYPE_INT, media_type->Channels, "bitrate", G_TYPE_INT, media_type->BitRate, "depth", G_TYPE_INT, media_type->BitsPerSample, "width", G_TYPE_INT, - media_type->BitsPerSample, "block_align", G_TYPE_INT, media_type->BlockAlign, NULL); + media_type->BitsPerSample, "block_align", G_TYPE_INT, media_type->BlockAlign, + nullptr); break; case TSMF_SUB_TYPE_WMA1: mdecoder->gst_caps = gst_caps_new_simple( @@ -331,7 +333,8 @@ static BOOL tsmf_gstreamer_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* m media_type->SamplesPerSecond.Numerator, "channels", G_TYPE_INT, media_type->Channels, "bitrate", G_TYPE_INT, media_type->BitRate, "depth", G_TYPE_INT, media_type->BitsPerSample, "width", G_TYPE_INT, - media_type->BitsPerSample, "block_align", G_TYPE_INT, media_type->BlockAlign, NULL); + media_type->BitsPerSample, "block_align", G_TYPE_INT, media_type->BlockAlign, + nullptr); break; case TSMF_SUB_TYPE_WMA2: mdecoder->gst_caps = gst_caps_new_simple( @@ -339,13 +342,14 @@ static BOOL tsmf_gstreamer_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* m media_type->SamplesPerSecond.Numerator, "channels", G_TYPE_INT, media_type->Channels, "bitrate", G_TYPE_INT, media_type->BitRate, "depth", G_TYPE_INT, media_type->BitsPerSample, "width", G_TYPE_INT, - media_type->BitsPerSample, "block_align", G_TYPE_INT, media_type->BlockAlign, NULL); + media_type->BitsPerSample, "block_align", G_TYPE_INT, media_type->BlockAlign, + nullptr); break; case TSMF_SUB_TYPE_MP3: mdecoder->gst_caps = gst_caps_new_simple("audio/mpeg", "mpegversion", G_TYPE_INT, 1, "layer", G_TYPE_INT, 3, "rate", G_TYPE_INT, media_type->SamplesPerSecond.Numerator, - "channels", G_TYPE_INT, media_type->Channels, NULL); + "channels", G_TYPE_INT, media_type->Channels, nullptr); break; case TSMF_SUB_TYPE_WMV1: mdecoder->gst_caps = gst_caps_new_simple( @@ -358,7 +362,7 @@ static BOOL tsmf_gstreamer_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* m "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC('W', 'M', 'V', '1'), #endif "framerate", GST_TYPE_FRACTION, media_type->SamplesPerSecond.Numerator, - media_type->SamplesPerSecond.Denominator, NULL); + media_type->SamplesPerSecond.Denominator, nullptr); break; case TSMF_SUB_TYPE_WMV2: mdecoder->gst_caps = gst_caps_new_simple( @@ -371,7 +375,7 @@ static BOOL tsmf_gstreamer_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* m #endif "framerate", GST_TYPE_FRACTION, media_type->SamplesPerSecond.Numerator, media_type->SamplesPerSecond.Denominator, "pixel-aspect-ratio", GST_TYPE_FRACTION, - 1, 1, NULL); + 1, 1, nullptr); break; case TSMF_SUB_TYPE_WMV3: mdecoder->gst_caps = gst_caps_new_simple( @@ -385,7 +389,7 @@ static BOOL tsmf_gstreamer_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* m #endif "framerate", GST_TYPE_FRACTION, media_type->SamplesPerSecond.Numerator, media_type->SamplesPerSecond.Denominator, "pixel-aspect-ratio", GST_TYPE_FRACTION, - 1, 1, NULL); + 1, 1, nullptr); break; case TSMF_SUB_TYPE_AVC1: case TSMF_SUB_TYPE_H264: @@ -394,12 +398,12 @@ static BOOL tsmf_gstreamer_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* m media_type->Height, "framerate", GST_TYPE_FRACTION, media_type->SamplesPerSecond.Numerator, media_type->SamplesPerSecond.Denominator, "pixel-aspect-ratio", GST_TYPE_FRACTION, 1, 1, "stream-format", G_TYPE_STRING, - "byte-stream", "alignment", G_TYPE_STRING, "nal", NULL); + "byte-stream", "alignment", G_TYPE_STRING, "nal", nullptr); break; case TSMF_SUB_TYPE_AC3: mdecoder->gst_caps = gst_caps_new_simple( "audio/x-ac3", "rate", G_TYPE_INT, media_type->SamplesPerSecond.Numerator, - "channels", G_TYPE_INT, media_type->Channels, NULL); + "channels", G_TYPE_INT, media_type->Channels, nullptr); break; case TSMF_SUB_TYPE_AAC: @@ -417,44 +421,45 @@ static BOOL tsmf_gstreamer_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* m mdecoder->gst_caps = gst_caps_new_simple( "audio/mpeg", "rate", G_TYPE_INT, media_type->SamplesPerSecond.Numerator, "channels", G_TYPE_INT, media_type->Channels, "mpegversion", G_TYPE_INT, 4, - "framed", G_TYPE_BOOLEAN, TRUE, "stream-format", G_TYPE_STRING, "raw", NULL); + "framed", G_TYPE_BOOLEAN, TRUE, "stream-format", G_TYPE_STRING, "raw", nullptr); break; case TSMF_SUB_TYPE_MP1A: mdecoder->gst_caps = gst_caps_new_simple("audio/mpeg", "mpegversion", G_TYPE_INT, 1, "channels", - G_TYPE_INT, media_type->Channels, NULL); + G_TYPE_INT, media_type->Channels, nullptr); break; case TSMF_SUB_TYPE_MP1V: mdecoder->gst_caps = gst_caps_new_simple("video/mpeg", "mpegversion", G_TYPE_INT, 1, "width", G_TYPE_INT, media_type->Width, "height", G_TYPE_INT, media_type->Height, - "systemstream", G_TYPE_BOOLEAN, FALSE, NULL); + "systemstream", G_TYPE_BOOLEAN, FALSE, nullptr); break; case TSMF_SUB_TYPE_YUY2: #if GST_VERSION_MAJOR > 0 mdecoder->gst_caps = gst_caps_new_simple( "video/x-raw", "format", G_TYPE_STRING, "YUY2", "width", G_TYPE_INT, - media_type->Width, "height", G_TYPE_INT, media_type->Height, NULL); + media_type->Width, "height", G_TYPE_INT, media_type->Height, nullptr); #else mdecoder->gst_caps = gst_caps_new_simple( "video/x-raw-yuv", "format", G_TYPE_STRING, "YUY2", "width", G_TYPE_INT, media_type->Width, "height", G_TYPE_INT, media_type->Height, "framerate", GST_TYPE_FRACTION, media_type->SamplesPerSecond.Numerator, - media_type->SamplesPerSecond.Denominator, NULL); + media_type->SamplesPerSecond.Denominator, nullptr); #endif break; case TSMF_SUB_TYPE_MP2V: - mdecoder->gst_caps = gst_caps_new_simple("video/mpeg", "mpegversion", G_TYPE_INT, 2, - "systemstream", G_TYPE_BOOLEAN, FALSE, NULL); + mdecoder->gst_caps = + gst_caps_new_simple("video/mpeg", "mpegversion", G_TYPE_INT, 2, "systemstream", + G_TYPE_BOOLEAN, FALSE, nullptr); break; case TSMF_SUB_TYPE_MP2A: mdecoder->gst_caps = gst_caps_new_simple("audio/mpeg", "mpegversion", G_TYPE_INT, 1, "rate", G_TYPE_INT, media_type->SamplesPerSecond.Numerator, "channels", G_TYPE_INT, - media_type->Channels, NULL); + media_type->Channels, nullptr); break; case TSMF_SUB_TYPE_FLAC: - mdecoder->gst_caps = gst_caps_new_simple("audio/x-flac", "", NULL); + mdecoder->gst_caps = gst_caps_new_simple("audio/x-flac", "", nullptr); break; default: WLog_ERR(TAG, "unknown format:(%d).", media_type->SubType); @@ -473,7 +478,7 @@ static BOOL tsmf_gstreamer_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* m return FALSE; } - gst_caps_set_simple(mdecoder->gst_caps, "codec_data", GST_TYPE_BUFFER, buffer, NULL); + gst_caps_set_simple(mdecoder->gst_caps, "codec_data", GST_TYPE_BUFFER, buffer, nullptr); } DEBUG_TSMF("%p format '%s'", (void*)mdecoder, gst_caps_to_string(mdecoder->gst_caps)); @@ -500,9 +505,9 @@ void tsmf_gstreamer_clean_up(TSMFGstreamerDecoder* mdecoder) mdecoder->ready = FALSE; mdecoder->paused = FALSE; - mdecoder->pipe = NULL; - mdecoder->src = NULL; - mdecoder->queue = NULL; + mdecoder->pipe = nullptr; + mdecoder->src = nullptr; + mdecoder->queue = nullptr; } BOOL tsmf_gstreamer_pipeline_build(TSMFGstreamerDecoder* mdecoder) @@ -536,7 +541,7 @@ BOOL tsmf_gstreamer_pipeline_build(TSMFGstreamerDecoder* mdecoder) tsmf_platform_get_audio_sink()); DEBUG_TSMF("pipeline=%s", pipeline); - mdecoder->pipe = gst_parse_launch(pipeline, NULL); + mdecoder->pipe = gst_parse_launch(pipeline, nullptr); if (!mdecoder->pipe) { @@ -596,22 +601,22 @@ BOOL tsmf_gstreamer_pipeline_build(TSMFGstreamerDecoder* mdecoder) tsmf_platform_register_handler(mdecoder); /* AppSrc settings */ GstAppSrcCallbacks callbacks = { - tsmf_gstreamer_need_data, tsmf_gstreamer_enough_data, tsmf_gstreamer_seek_data, { NULL } + tsmf_gstreamer_need_data, tsmf_gstreamer_enough_data, tsmf_gstreamer_seek_data, { nullptr } }; - g_object_set(mdecoder->src, "format", GST_FORMAT_TIME, NULL); - g_object_set(mdecoder->src, "is-live", FALSE, NULL); - g_object_set(mdecoder->src, "block", FALSE, NULL); - g_object_set(mdecoder->src, "blocksize", 1024, NULL); + g_object_set(mdecoder->src, "format", GST_FORMAT_TIME, nullptr); + g_object_set(mdecoder->src, "is-live", FALSE, nullptr); + g_object_set(mdecoder->src, "block", FALSE, nullptr); + g_object_set(mdecoder->src, "blocksize", 1024, nullptr); gst_app_src_set_caps((GstAppSrc*)mdecoder->src, mdecoder->gst_caps); - gst_app_src_set_callbacks((GstAppSrc*)mdecoder->src, &callbacks, mdecoder, NULL); + gst_app_src_set_callbacks((GstAppSrc*)mdecoder->src, &callbacks, mdecoder, nullptr); gst_app_src_set_stream_type((GstAppSrc*)mdecoder->src, GST_APP_STREAM_TYPE_SEEKABLE); gst_app_src_set_latency((GstAppSrc*)mdecoder->src, 0, -1); gst_app_src_set_max_bytes((GstAppSrc*)mdecoder->src, (guint64)0); // unlimited - g_object_set(G_OBJECT(mdecoder->queue), "use-buffering", FALSE, NULL); - g_object_set(G_OBJECT(mdecoder->queue), "use-rate-estimate", FALSE, NULL); - g_object_set(G_OBJECT(mdecoder->queue), "max-size-buffers", 0, NULL); - g_object_set(G_OBJECT(mdecoder->queue), "max-size-bytes", 0, NULL); - g_object_set(G_OBJECT(mdecoder->queue), "max-size-time", (guint64)0, NULL); + g_object_set(G_OBJECT(mdecoder->queue), "use-buffering", FALSE, nullptr); + g_object_set(G_OBJECT(mdecoder->queue), "use-rate-estimate", FALSE, nullptr); + g_object_set(G_OBJECT(mdecoder->queue), "max-size-buffers", 0, nullptr); + g_object_set(G_OBJECT(mdecoder->queue), "max-size-bytes", 0, nullptr); + g_object_set(G_OBJECT(mdecoder->queue), "max-size-time", (guint64)0, nullptr); /* Only set these properties if not an autosink, otherwise we will set properties when real * sinks are added */ @@ -628,16 +633,17 @@ BOOL tsmf_gstreamer_pipeline_build(TSMFGstreamerDecoder* mdecoder) gst_base_sink_set_max_lateness((GstBaseSink*)mdecoder->outsink, 10000000); /* nanoseconds */ g_object_set(G_OBJECT(mdecoder->outsink), "buffer-time", (gint64)20000, - NULL); /* microseconds */ + nullptr); /* microseconds */ g_object_set(G_OBJECT(mdecoder->outsink), "drift-tolerance", (gint64)20000, - NULL); /* microseconds */ + nullptr); /* microseconds */ g_object_set(G_OBJECT(mdecoder->outsink), "latency-time", (gint64)10000, - NULL); /* microseconds */ - g_object_set(G_OBJECT(mdecoder->outsink), "slave-method", 1, NULL); + nullptr); /* microseconds */ + g_object_set(G_OBJECT(mdecoder->outsink), "slave-method", 1, nullptr); } g_object_set(G_OBJECT(mdecoder->outsink), "sync", TRUE, - NULL); /* synchronize on the clock */ - g_object_set(G_OBJECT(mdecoder->outsink), "async", TRUE, NULL); /* no async state changes */ + nullptr); /* synchronize on the clock */ + g_object_set(G_OBJECT(mdecoder->outsink), "async", TRUE, + nullptr); /* no async state changes */ } tsmf_window_create(mdecoder); @@ -684,7 +690,7 @@ static BOOL tsmf_gstreamer_decodeEx(ITSMFDecoder* decoder, const BYTE* data, UIN return TRUE; } - if (mdecoder->gst_caps == NULL) + if (mdecoder->gst_caps == nullptr) { WLog_ERR(TAG, "tsmf_gstreamer_set_format not called or invalid format."); return FALSE; @@ -703,7 +709,7 @@ static BOOL tsmf_gstreamer_decodeEx(ITSMFDecoder* decoder, const BYTE* data, UIN gst_buf = tsmf_get_buffer_from_data(data, data_size); - if (gst_buf == NULL) + if (gst_buf == nullptr) { WLog_ERR(TAG, "tsmf_get_buffer_from_data(%p, %" PRIu32 ") failed.", (void*)data, data_size); return FALSE; @@ -920,7 +926,7 @@ static BOOL tsmf_gstreamer_buffer_level(ITSMFDecoder* decoder) guint clbuff = 0; if (G_IS_OBJECT(mdecoder->queue)) - g_object_get(mdecoder->queue, "current-level-buffers", &clbuff, NULL); + g_object_get(mdecoder->queue, "current-level-buffers", &clbuff, nullptr); DEBUG_TSMF("%s buffer level %u", get_type(mdecoder), clbuff); return clbuff; @@ -942,7 +948,7 @@ static void tsmf_gstreamer_free(ITSMFDecoder* decoder) tsmf_platform_free(mdecoder); ZeroMemory(mdecoder, sizeof(TSMFGstreamerDecoder)); free(mdecoder); - mdecoder = NULL; + mdecoder = nullptr; } } @@ -989,7 +995,7 @@ static BOOL tsmf_gstreamer_ack(ITSMFDecoder* decoder, BOOL (*cb)(void*, BOOL), v { TSMFGstreamerDecoder* mdecoder = (TSMFGstreamerDecoder*)decoder; DEBUG_TSMF(""); - mdecoder->ack_cb = NULL; + mdecoder->ack_cb = nullptr; mdecoder->stream = stream; return TRUE; } @@ -998,7 +1004,7 @@ static BOOL tsmf_gstreamer_sync(ITSMFDecoder* decoder, void (*cb)(void*), void* { TSMFGstreamerDecoder* mdecoder = (TSMFGstreamerDecoder*)decoder; DEBUG_TSMF(""); - mdecoder->sync_cb = NULL; + mdecoder->sync_cb = nullptr; mdecoder->stream = stream; return TRUE; } @@ -1007,15 +1013,15 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE gstreamer_freerdp_tsmf_client_decoder_subsyst { ITSMFDecoder** sptr = (ITSMFDecoder**)ptr; WINPR_ASSERT(sptr); - *sptr = NULL; + *sptr = nullptr; #if GST_CHECK_VERSION(0, 10, 31) if (!gst_is_initialized()) { - gst_init(NULL, NULL); + gst_init(nullptr, nullptr); } #else - gst_init(NULL, NULL); + gst_init(nullptr, nullptr); #endif TSMFGstreamerDecoder* decoder; @@ -1025,10 +1031,10 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE gstreamer_freerdp_tsmf_client_decoder_subsyst return ERROR_OUTOFMEMORY; decoder->iface.SetFormat = tsmf_gstreamer_set_format; - decoder->iface.Decode = NULL; - decoder->iface.GetDecodedData = NULL; - decoder->iface.GetDecodedFormat = NULL; - decoder->iface.GetDecodedDimension = NULL; + decoder->iface.Decode = nullptr; + decoder->iface.GetDecodedData = nullptr; + decoder->iface.GetDecodedFormat = nullptr; + decoder->iface.GetDecodedDimension = nullptr; decoder->iface.GetRunningTime = tsmf_gstreamer_get_running_time; decoder->iface.UpdateRenderingArea = tsmf_gstreamer_update_rendering_area; decoder->iface.Free = tsmf_gstreamer_free; diff --git a/channels/tsmf/client/oss/tsmf_oss.c b/channels/tsmf/client/oss/tsmf_oss.c index bf137c5ad..50027d3d4 100644 --- a/channels/tsmf/client/oss/tsmf_oss.c +++ b/channels/tsmf/client/oss/tsmf_oss.c @@ -73,10 +73,10 @@ static BOOL tsmf_oss_open(ITSMFAudioDevice* audio, const char* device) int tmp = 0; TSMFOssAudioDevice* oss = (TSMFOssAudioDevice*)audio; - if (oss == NULL || oss->pcm_handle != -1) + if (oss == nullptr || oss->pcm_handle != -1) return FALSE; - if (device == NULL) /* Default device. */ + if (device == nullptr) /* Default device. */ { strncpy(oss->dev_name, "/dev/dsp", sizeof(oss->dev_name)); } @@ -119,7 +119,7 @@ static BOOL tsmf_oss_set_format(ITSMFAudioDevice* audio, UINT32 sample_rate, UIN int tmp = 0; TSMFOssAudioDevice* oss = (TSMFOssAudioDevice*)audio; - if (oss == NULL || oss->pcm_handle == -1) + if (oss == nullptr || oss->pcm_handle == -1) return FALSE; oss->sample_rate = sample_rate; @@ -156,10 +156,10 @@ static BOOL tsmf_oss_play(ITSMFAudioDevice* audio, const BYTE* data, UINT32 data TSMFOssAudioDevice* oss = (TSMFOssAudioDevice*)audio; DEBUG_TSMF("tsmf_oss_play: data_size %" PRIu32 "", data_size); - if (oss == NULL || oss->pcm_handle == -1) + if (oss == nullptr || oss->pcm_handle == -1) return FALSE; - if (data == NULL || data_size == 0) + if (data == nullptr || data_size == 0) return TRUE; offset = 0; @@ -186,7 +186,7 @@ static UINT64 tsmf_oss_get_latency(ITSMFAudioDevice* audio) UINT64 latency = 0; TSMFOssAudioDevice* oss = (TSMFOssAudioDevice*)audio; - if (oss == NULL) + if (oss == nullptr) return 0; // latency = ((oss->data_size_last / (oss->bits_per_sample / 8)) * oss->sample_rate); @@ -203,7 +203,7 @@ static void tsmf_oss_free(ITSMFAudioDevice* audio) { TSMFOssAudioDevice* oss = (TSMFOssAudioDevice*)audio; - if (oss == NULL) + if (oss == nullptr) return; if (oss->pcm_handle != -1) @@ -219,7 +219,7 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE oss_freerdp_tsmf_client_audio_subsystem_entry { ITSMFAudioDevice** sptr = (ITSMFAudioDevice**)ptr; WINPR_ASSERT(sptr); - *sptr = NULL; + *sptr = nullptr; TSMFOssAudioDevice* oss = calloc(1, sizeof(TSMFOssAudioDevice)); if (!oss) diff --git a/channels/tsmf/client/pulse/tsmf_pulse.c b/channels/tsmf/client/pulse/tsmf_pulse.c index bc1943eed..5e9c72cb6 100644 --- a/channels/tsmf/client/pulse/tsmf_pulse.c +++ b/channels/tsmf/client/pulse/tsmf_pulse.c @@ -73,7 +73,7 @@ static BOOL tsmf_pulse_connect(TSMFPulseAudioDevice* pulse) if (!pulse->context) return FALSE; - if (pa_context_connect(pulse->context, NULL, 0, NULL)) + if (pa_context_connect(pulse->context, nullptr, 0, nullptr)) { WLog_ERR(TAG, "pa_context_connect failed (%d)", pa_context_errno(pulse->context)); return FALSE; @@ -165,7 +165,7 @@ static void tsmf_pulse_stream_success_callback(WINPR_ATTR_UNUSED pa_stream* stre static void tsmf_pulse_wait_for_operation(TSMFPulseAudioDevice* pulse, pa_operation* operation) { - if (operation == NULL) + if (operation == nullptr) return; while (pa_operation_get_state(operation) == PA_OPERATION_RUNNING) @@ -217,12 +217,12 @@ static BOOL tsmf_pulse_close_stream(TSMFPulseAudioDevice* pulse) DEBUG_TSMF(""); pa_threaded_mainloop_lock(pulse->mainloop); - pa_stream_set_write_callback(pulse->stream, NULL, NULL); + pa_stream_set_write_callback(pulse->stream, nullptr, nullptr); tsmf_pulse_wait_for_operation( pulse, pa_stream_drain(pulse->stream, tsmf_pulse_stream_success_callback, pulse)); pa_stream_disconnect(pulse->stream); pa_stream_unref(pulse->stream); - pulse->stream = NULL; + pulse->stream = nullptr; pa_threaded_mainloop_unlock(pulse->mainloop); return TRUE; } @@ -238,7 +238,7 @@ static BOOL tsmf_pulse_open_stream(TSMFPulseAudioDevice* pulse) DEBUG_TSMF(""); pa_threaded_mainloop_lock(pulse->mainloop); pulse->stream = pa_stream_new(pulse->context, freerdp_getApplicationDetailsString(), - &pulse->sample_spec, NULL); + &pulse->sample_spec, nullptr); if (!pulse->stream) { @@ -256,9 +256,9 @@ static BOOL tsmf_pulse_open_stream(TSMFPulseAudioDevice* pulse) buffer_attr.fragsize = (UINT32)-1; if (pa_stream_connect_playback( - pulse->stream, pulse->device[0] ? pulse->device : NULL, &buffer_attr, + pulse->stream, pulse->device[0] ? pulse->device : nullptr, &buffer_attr, PA_STREAM_ADJUST_LATENCY | PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE, - NULL, NULL) < 0) + nullptr, nullptr) < 0) { pa_threaded_mainloop_unlock(pulse->mainloop); WLog_ERR(TAG, "pa_stream_connect_playback failed (%d)", pa_context_errno(pulse->context)); @@ -312,7 +312,7 @@ static BOOL tsmf_pulse_set_format(ITSMFAudioDevice* audio, UINT32 sample_rate, U static BOOL tsmf_pulse_play(ITSMFAudioDevice* audio, const BYTE* data, UINT32 data_size) { TSMFPulseAudioDevice* pulse = (TSMFPulseAudioDevice*)audio; - const BYTE* src = NULL; + const BYTE* src = nullptr; size_t len = 0; int ret = 0; DEBUG_TSMF("data_size %" PRIu32 "", data_size); @@ -336,7 +336,7 @@ static BOOL tsmf_pulse_play(ITSMFAudioDevice* audio, const BYTE* data, UINT32 da if (len > data_size) len = data_size; - ret = pa_stream_write(pulse->stream, src, len, NULL, 0LL, PA_SEEK_RELATIVE); + ret = pa_stream_write(pulse->stream, src, len, nullptr, 0LL, PA_SEEK_RELATIVE); if (ret < 0) { @@ -360,7 +360,7 @@ static UINT64 tsmf_pulse_get_latency(ITSMFAudioDevice* audio) UINT64 latency = 0; TSMFPulseAudioDevice* pulse = (TSMFPulseAudioDevice*)audio; - if (pulse->stream && pa_stream_get_latency(pulse->stream, &usec, NULL) == 0) + if (pulse->stream && pa_stream_get_latency(pulse->stream, &usec, nullptr) == 0) { latency = ((UINT64)usec) * 10LL; } @@ -393,13 +393,13 @@ static void tsmf_pulse_free(ITSMFAudioDevice* audio) { pa_context_disconnect(pulse->context); pa_context_unref(pulse->context); - pulse->context = NULL; + pulse->context = nullptr; } if (pulse->mainloop) { pa_threaded_mainloop_free(pulse->mainloop); - pulse->mainloop = NULL; + pulse->mainloop = nullptr; } free(pulse); @@ -409,7 +409,7 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE pulse_freerdp_tsmf_client_audio_subsystem_ent { ITSMFAudioDevice** sptr = (ITSMFAudioDevice**)ptr; WINPR_ASSERT(sptr); - *sptr = NULL; + *sptr = nullptr; TSMFPulseAudioDevice* pulse = (TSMFPulseAudioDevice*)calloc(1, sizeof(TSMFPulseAudioDevice)); diff --git a/channels/tsmf/client/tsmf_audio.c b/channels/tsmf/client/tsmf_audio.c index 6aaec3f3a..5058ed67a 100644 --- a/channels/tsmf/client/tsmf_audio.c +++ b/channels/tsmf/client/tsmf_audio.c @@ -27,7 +27,7 @@ static ITSMFAudioDevice* tsmf_load_audio_device_by_name(const char* name, const char* device) { - ITSMFAudioDevice* audio = NULL; + ITSMFAudioDevice* audio = nullptr; union { PVIRTUALCHANNELENTRY pvce; @@ -36,20 +36,20 @@ static ITSMFAudioDevice* tsmf_load_audio_device_by_name(const char* name, const cnv.pvce = freerdp_load_channel_addin_entry("tsmf", name, "audio", 0); if (!cnv.entry) - return NULL; + return nullptr; const UINT rc = cnv.entry(&audio); if ((rc != CHANNEL_RC_OK) || !audio) { WLog_ERR(TAG, "failed to call export function in %s", name); - return NULL; + return nullptr; } if (!audio->Open(audio, device)) { audio->Free(audio); - audio = NULL; + audio = nullptr; WLog_ERR(TAG, "failed to open, name: %s, device: %s", name, device); } else @@ -62,7 +62,7 @@ static ITSMFAudioDevice* tsmf_load_audio_device_by_name(const char* name, const ITSMFAudioDevice* tsmf_load_audio_device(const char* name, const char* device) { - ITSMFAudioDevice* audio = NULL; + ITSMFAudioDevice* audio = nullptr; if (name) { @@ -86,7 +86,7 @@ ITSMFAudioDevice* tsmf_load_audio_device(const char* name, const char* device) #endif } - if (audio == NULL) + if (audio == nullptr) { WLog_ERR(TAG, "no sound device."); } diff --git a/channels/tsmf/client/tsmf_decoder.c b/channels/tsmf/client/tsmf_decoder.c index b5dd108e1..9aaabeeba 100644 --- a/channels/tsmf/client/tsmf_decoder.c +++ b/channels/tsmf/client/tsmf_decoder.c @@ -32,7 +32,7 @@ static ITSMFDecoder* tsmf_load_decoder_by_name(const char* name) { - ITSMFDecoder* decoder = NULL; + ITSMFDecoder* decoder = nullptr; union { PVIRTUALCHANNELENTRY pvce; @@ -41,14 +41,14 @@ static ITSMFDecoder* tsmf_load_decoder_by_name(const char* name) cnv.pvce = freerdp_load_channel_addin_entry("tsmf", name, "decoder", 0); if (!cnv.entry) - return NULL; + return nullptr; const UINT rc = cnv.entry(&decoder); if ((rc != CHANNEL_RC_OK) || !decoder) { WLog_ERR(TAG, "failed to call export function in %s", name); - return NULL; + return nullptr; } return decoder; @@ -64,7 +64,7 @@ static BOOL tsmf_decoder_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* med ITSMFDecoder* tsmf_load_decoder(const char* name, TS_AM_MEDIA_TYPE* media_type) { - ITSMFDecoder* decoder = NULL; + ITSMFDecoder* decoder = nullptr; if (name) decoder = tsmf_load_decoder_by_name(name); @@ -84,7 +84,7 @@ ITSMFDecoder* tsmf_load_decoder(const char* name, TS_AM_MEDIA_TYPE* media_type) if (!tsmf_decoder_set_format(decoder, media_type)) { decoder->Free(decoder); - decoder = NULL; + decoder = nullptr; } } @@ -93,7 +93,7 @@ ITSMFDecoder* tsmf_load_decoder(const char* name, TS_AM_MEDIA_TYPE* media_type) BOOL tsmf_check_decoder_available(const char* name) { - ITSMFDecoder* decoder = NULL; + ITSMFDecoder* decoder = nullptr; BOOL retValue = FALSE; if (name) @@ -113,7 +113,7 @@ BOOL tsmf_check_decoder_available(const char* name) if (decoder) { decoder->Free(decoder); - decoder = NULL; + decoder = nullptr; retValue = TRUE; } diff --git a/channels/tsmf/client/tsmf_ifman.c b/channels/tsmf/client/tsmf_ifman.c index 17d11a8e4..4192b67ce 100644 --- a/channels/tsmf/client/tsmf_ifman.c +++ b/channels/tsmf/client/tsmf_ifman.c @@ -184,7 +184,7 @@ UINT tsmf_ifman_check_format_support_request(TSMF_IFMAN* ifman) UINT tsmf_ifman_on_new_presentation(TSMF_IFMAN* ifman) { UINT status = CHANNEL_RC_OK; - TSMF_PRESENTATION* presentation = NULL; + TSMF_PRESENTATION* presentation = nullptr; DEBUG_TSMF(""); if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, GUID_SIZE)) @@ -219,8 +219,8 @@ UINT tsmf_ifman_add_stream(TSMF_IFMAN* ifman, rdpContext* rdpcontext) { UINT32 StreamId = 0; UINT status = CHANNEL_RC_OK; - TSMF_STREAM* stream = NULL; - TSMF_PRESENTATION* presentation = NULL; + TSMF_STREAM* stream = nullptr; + TSMF_PRESENTATION* presentation = nullptr; DEBUG_TSMF(""); if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, GUID_SIZE + 8)) @@ -286,8 +286,8 @@ UINT tsmf_ifman_remove_stream(TSMF_IFMAN* ifman) { int status = CHANNEL_RC_OK; UINT32 StreamId = 0; - TSMF_STREAM* stream = NULL; - TSMF_PRESENTATION* presentation = NULL; + TSMF_STREAM* stream = nullptr; + TSMF_PRESENTATION* presentation = nullptr; DEBUG_TSMF(""); if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, 20)) @@ -332,7 +332,7 @@ static float tsmf_stream_read_float(wStream* s) UINT tsmf_ifman_set_source_video_rect(TSMF_IFMAN* ifman) { UINT status = CHANNEL_RC_OK; - TSMF_PRESENTATION* presentation = NULL; + TSMF_PRESENTATION* presentation = nullptr; DEBUG_TSMF(""); if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, 32)) @@ -368,7 +368,7 @@ UINT tsmf_ifman_set_source_video_rect(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_shutdown_presentation(TSMF_IFMAN* ifman) { - TSMF_PRESENTATION* presentation = NULL; + TSMF_PRESENTATION* presentation = nullptr; DEBUG_TSMF(""); if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, GUID_SIZE)) @@ -399,7 +399,7 @@ UINT tsmf_ifman_shutdown_presentation(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_on_stream_volume(TSMF_IFMAN* ifman) { - TSMF_PRESENTATION* presentation = NULL; + TSMF_PRESENTATION* presentation = nullptr; UINT32 newVolume = 0; UINT32 muted = 0; DEBUG_TSMF("on stream volume"); @@ -435,7 +435,7 @@ UINT tsmf_ifman_on_stream_volume(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_on_channel_volume(TSMF_IFMAN* ifman) { - TSMF_PRESENTATION* presentation = NULL; + TSMF_PRESENTATION* presentation = nullptr; DEBUG_TSMF("on channel volume"); if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, GUID_SIZE + 8)) @@ -477,14 +477,14 @@ UINT tsmf_ifman_set_video_window(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_update_geometry_info(TSMF_IFMAN* ifman) { - TSMF_PRESENTATION* presentation = NULL; + TSMF_PRESENTATION* presentation = nullptr; UINT32 numGeometryInfo = 0; UINT32 Left = 0; UINT32 Top = 0; UINT32 Width = 0; UINT32 Height = 0; UINT32 cbVisibleRect = 0; - RECTANGLE_32* rects = NULL; + RECTANGLE_32* rects = nullptr; UINT error = CHANNEL_RC_OK; size_t pos = 0; @@ -570,8 +570,8 @@ UINT tsmf_ifman_notify_preroll(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_on_sample(TSMF_IFMAN* ifman) { - TSMF_PRESENTATION* presentation = NULL; - TSMF_STREAM* stream = NULL; + TSMF_PRESENTATION* presentation = nullptr; + TSMF_STREAM* stream = nullptr; UINT32 StreamId = 0; UINT64 SampleStartTime = 0; UINT64 SampleEndTime = 0; @@ -643,8 +643,8 @@ UINT tsmf_ifman_on_sample(TSMF_IFMAN* ifman) UINT tsmf_ifman_on_flush(TSMF_IFMAN* ifman) { UINT32 StreamId = 0; - TSMF_PRESENTATION* presentation = NULL; - TSMF_STREAM* stream = NULL; + TSMF_PRESENTATION* presentation = nullptr; + TSMF_STREAM* stream = nullptr; if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, 20)) return ERROR_INVALID_DATA; @@ -685,8 +685,8 @@ UINT tsmf_ifman_on_flush(TSMF_IFMAN* ifman) UINT tsmf_ifman_on_end_of_stream(TSMF_IFMAN* ifman) { UINT32 StreamId = 0; - TSMF_STREAM* stream = NULL; - TSMF_PRESENTATION* presentation = NULL; + TSMF_STREAM* stream = nullptr; + TSMF_PRESENTATION* presentation = nullptr; if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, 20)) return ERROR_INVALID_DATA; @@ -716,7 +716,7 @@ UINT tsmf_ifman_on_end_of_stream(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_on_playback_started(TSMF_IFMAN* ifman) { - TSMF_PRESENTATION* presentation = NULL; + TSMF_PRESENTATION* presentation = nullptr; DEBUG_TSMF(""); if (!Stream_CheckAndLogRequiredLength(TAG, ifman->input, 16)) @@ -747,7 +747,7 @@ UINT tsmf_ifman_on_playback_started(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_on_playback_paused(TSMF_IFMAN* ifman) { - TSMF_PRESENTATION* presentation = NULL; + TSMF_PRESENTATION* presentation = nullptr; DEBUG_TSMF(""); ifman->output_pending = TRUE; /* Added pause control so gstreamer pipeline can be paused accordingly */ @@ -771,7 +771,7 @@ UINT tsmf_ifman_on_playback_paused(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_on_playback_restarted(TSMF_IFMAN* ifman) { - TSMF_PRESENTATION* presentation = NULL; + TSMF_PRESENTATION* presentation = nullptr; DEBUG_TSMF(""); ifman->output_pending = TRUE; /* Added restart control so gstreamer pipeline can be resumed accordingly */ @@ -795,7 +795,7 @@ UINT tsmf_ifman_on_playback_restarted(TSMF_IFMAN* ifman) */ UINT tsmf_ifman_on_playback_stopped(TSMF_IFMAN* ifman) { - TSMF_PRESENTATION* presentation = NULL; + TSMF_PRESENTATION* presentation = nullptr; DEBUG_TSMF(""); presentation = tsmf_presentation_find_by_id(Stream_Pointer(ifman->input)); diff --git a/channels/tsmf/client/tsmf_main.c b/channels/tsmf/client/tsmf_main.c index a60940edf..481691e0e 100644 --- a/channels/tsmf/client/tsmf_main.c +++ b/channels/tsmf/client/tsmf_main.c @@ -47,7 +47,7 @@ BOOL tsmf_send_eos_response(IWTSVirtualChannelCallback* pChannelCallback, UINT32 if (callback && callback->stream_id && callback->channel && callback->channel->Write) { - wStream* s = Stream_New(NULL, 24); + wStream* s = Stream_New(nullptr, 24); if (!s) return FALSE; @@ -61,7 +61,8 @@ BOOL tsmf_send_eos_response(IWTSVirtualChannelCallback* pChannelCallback, UINT32 const size_t pos = Stream_GetPosition(s); DEBUG_TSMF("EOS response size %" PRIuz "", pos); WINPR_ASSERT(pos <= UINT32_MAX); - status = callback->channel->Write(callback->channel, (UINT32)pos, Stream_Buffer(s), NULL); + status = + callback->channel->Write(callback->channel, (UINT32)pos, Stream_Buffer(s), nullptr); if (status) { @@ -83,7 +84,7 @@ BOOL tsmf_playback_ack(IWTSVirtualChannelCallback* pChannelCallback, UINT32 mess if (!callback) return FALSE; - wStream* s = Stream_New(NULL, 32); + wStream* s = Stream_New(nullptr, 32); if (!s) return FALSE; @@ -102,12 +103,12 @@ BOOL tsmf_playback_ack(IWTSVirtualChannelCallback* pChannelCallback, UINT32 mess { WLog_ERR(TAG, "channel=%p, write=%p", WINPR_CXX_COMPAT_CAST(const void*, callback->channel), WINPR_CXX_COMPAT_CAST(const void*, - callback->channel ? callback->channel->Write : NULL)); + callback->channel ? callback->channel->Write : nullptr)); } else { status = callback->channel->Write( - callback->channel, WINPR_ASSERTING_INT_CAST(uint32_t, pos), Stream_Buffer(s), NULL); + callback->channel, WINPR_ASSERTING_INT_CAST(uint32_t, pos), Stream_Buffer(s), nullptr); } if (status) @@ -126,8 +127,8 @@ BOOL tsmf_playback_ack(IWTSVirtualChannelCallback* pChannelCallback, UINT32 mess */ static UINT tsmf_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, wStream* data) { - wStream* input = NULL; - wStream* output = NULL; + wStream* input = nullptr; + wStream* output = nullptr; UINT error = CHANNEL_RC_OK; BOOL processed = FALSE; TSMF_IFMAN ifman = WINPR_C_ARRAY_INIT; @@ -142,7 +143,7 @@ static UINT tsmf_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, return ERROR_INVALID_DATA; input = data; - output = Stream_New(NULL, 256); + output = Stream_New(nullptr, 256); if (!output) return ERROR_OUTOFMEMORY; @@ -333,8 +334,8 @@ static UINT tsmf_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, break; } - input = NULL; - ifman.input = NULL; + input = nullptr; + ifman.input = nullptr; if (error) { @@ -384,7 +385,7 @@ static UINT tsmf_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, Stream_Write_UINT32(output, MessageId); DEBUG_TSMF("response size %d", length); error = callback->channel->Write(callback->channel, (UINT32)length, Stream_Buffer(output), - NULL); + nullptr); if (error) { @@ -404,8 +405,8 @@ out: */ static UINT tsmf_on_close(IWTSVirtualChannelCallback* pChannelCallback) { - TSMF_STREAM* stream = NULL; - TSMF_PRESENTATION* presentation = NULL; + TSMF_STREAM* stream = nullptr; + TSMF_PRESENTATION* presentation = nullptr; TSMF_CHANNEL_CALLBACK* callback = (TSMF_CHANNEL_CALLBACK*)pChannelCallback; DEBUG_TSMF(""); @@ -437,7 +438,7 @@ static UINT tsmf_on_new_channel_connection(IWTSListenerCallback* pListenerCallba WINPR_ATTR_UNUSED BOOL* pbAccept, IWTSVirtualChannelCallback** ppCallback) { - TSMF_CHANNEL_CALLBACK* callback = NULL; + TSMF_CHANNEL_CALLBACK* callback = nullptr; TSMF_LISTENER_CALLBACK* listener_callback = (TSMF_LISTENER_CALLBACK*)pListenerCallback; DEBUG_TSMF(""); callback = (TSMF_CHANNEL_CALLBACK*)calloc(1, sizeof(TSMF_CHANNEL_CALLBACK)); @@ -447,7 +448,7 @@ static UINT tsmf_on_new_channel_connection(IWTSListenerCallback* pListenerCallba callback->iface.OnDataReceived = tsmf_on_data_received; callback->iface.OnClose = tsmf_on_close; - callback->iface.OnOpen = NULL; + callback->iface.OnOpen = nullptr; callback->plugin = listener_callback->plugin; callback->channel_mgr = listener_callback->channel_mgr; callback->channel = pChannel; @@ -502,17 +503,19 @@ static UINT tsmf_process_addin_args(IWTSPlugin* pPlugin, const ADDIN_ARGV* args) { int status = 0; DWORD flags = 0; - const COMMAND_LINE_ARGUMENT_A* arg = NULL; + const COMMAND_LINE_ARGUMENT_A* arg = nullptr; TSMF_PLUGIN* tsmf = (TSMF_PLUGIN*)pPlugin; COMMAND_LINE_ARGUMENT_A tsmf_args[] = { { "sys", COMMAND_LINE_VALUE_REQUIRED, "", - NULL, NULL, -1, NULL, "audio subsystem" }, - { "dev", COMMAND_LINE_VALUE_REQUIRED, "", NULL, - NULL, -1, NULL, "audio device name" }, + nullptr, nullptr, -1, nullptr, "audio subsystem" }, + { "dev", COMMAND_LINE_VALUE_REQUIRED, "", + nullptr, nullptr, -1, nullptr, "audio device name" }, { "decoder", COMMAND_LINE_VALUE_REQUIRED, "", - NULL, NULL, -1, NULL, "decoder subsystem" }, - { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } }; + nullptr, nullptr, -1, nullptr, "decoder subsystem" }, + { nullptr, 0, nullptr, nullptr, nullptr, -1, nullptr, + nullptr } }; flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON; - status = CommandLineParseArgumentsA(args->argc, args->argv, tsmf_args, flags, tsmf, NULL, NULL); + status = CommandLineParseArgumentsA(args->argc, args->argv, tsmf_args, flags, tsmf, nullptr, + nullptr); if (status != 0) return ERROR_INVALID_DATA; @@ -549,7 +552,7 @@ static UINT tsmf_process_addin_args(IWTSPlugin* pPlugin, const ADDIN_ARGV* args) { } CommandLineSwitchEnd(arg) - } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); + } while ((arg = CommandLineFindNextArgumentA(arg)) != nullptr); return CHANNEL_RC_OK; } @@ -562,8 +565,8 @@ static UINT tsmf_process_addin_args(IWTSPlugin* pPlugin, const ADDIN_ARGV* args) FREERDP_ENTRY_POINT(UINT VCAPITYPE tsmf_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)) { UINT status = 0; - TSMF_PLUGIN* tsmf = NULL; - TsmfClientContext* context = NULL; + TSMF_PLUGIN* tsmf = nullptr; + TsmfClientContext* context = nullptr; UINT error = CHANNEL_RC_NO_MEMORY; tsmf = (TSMF_PLUGIN*)pEntryPoints->GetPlugin(pEntryPoints, "tsmf"); @@ -578,8 +581,8 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE tsmf_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pE } tsmf->iface.Initialize = tsmf_plugin_initialize; - tsmf->iface.Connected = NULL; - tsmf->iface.Disconnected = NULL; + tsmf->iface.Connected = nullptr; + tsmf->iface.Disconnected = nullptr; tsmf->iface.Terminated = tsmf_plugin_terminated; tsmf->rdpcontext = pEntryPoints->GetRdpContext(pEntryPoints); context = (TsmfClientContext*)calloc(1, sizeof(TsmfClientContext)); diff --git a/channels/tsmf/client/tsmf_media.c b/channels/tsmf/client/tsmf_media.c index c24b8328b..f28dbbf91 100644 --- a/channels/tsmf/client/tsmf_media.c +++ b/channels/tsmf/client/tsmf_media.c @@ -148,7 +148,7 @@ struct S_TSMF_SAMPLE UINT64 ack_time; }; -static wArrayList* presentation_list = NULL; +static wArrayList* presentation_list = nullptr; static int TERMINATING = 0; static void s_tsmf_presentation_free(void* obj); @@ -163,16 +163,16 @@ static UINT64 get_current_time(void) static TSMF_SAMPLE* tsmf_stream_pop_sample(TSMF_STREAM* stream, int sync) { - TSMF_SAMPLE* sample = NULL; + TSMF_SAMPLE* sample = nullptr; BOOL pending = FALSE; if (!stream) - return NULL; + return nullptr; TSMF_PRESENTATION* presentation = stream->presentation; if (Queue_Count(stream->sample_list) < 1) - return NULL; + return nullptr; if (sync) { @@ -228,7 +228,7 @@ static TSMF_SAMPLE* tsmf_stream_pop_sample(TSMF_STREAM* stream, int sync) } if (pending) - return NULL; + return nullptr; sample = (TSMF_SAMPLE*)Queue_Dequeue(stream->sample_list); @@ -282,7 +282,7 @@ static BOOL tsmf_sample_queue_ack(TSMF_SAMPLE* sample) static BOOL tsmf_stream_process_ack(void* arg, BOOL force) { TSMF_STREAM* stream = arg; - TSMF_SAMPLE* sample = NULL; + TSMF_SAMPLE* sample = nullptr; UINT64 ack_time = 0; BOOL rc = FALSE; @@ -335,18 +335,18 @@ finally: TSMF_PRESENTATION* tsmf_presentation_new(const BYTE* guid, IWTSVirtualChannelCallback* pChannelCallback) { - wObject* obj = NULL; - TSMF_PRESENTATION* presentation = NULL; + wObject* obj = nullptr; + TSMF_PRESENTATION* presentation = nullptr; if (!guid || !pChannelCallback) - return NULL; + return nullptr; presentation = (TSMF_PRESENTATION*)calloc(1, sizeof(TSMF_PRESENTATION)); if (!presentation) { WLog_ERR(TAG, "calloc failed"); - return NULL; + return nullptr; } CopyMemory(presentation->presentation_id, guid, GUID_SIZE); @@ -370,13 +370,13 @@ error_add: ArrayList_Free(presentation->stream_list); error_stream_list: free(presentation); - return NULL; + return nullptr; } static char* guid_to_string(const BYTE* guid, char* str, size_t len) { if (!guid || !str) - return NULL; + return nullptr; for (size_t i = 0; i < GUID_SIZE && (len > 2 * i); i++) (void)sprintf_s(str + (2 * i), len - 2 * i, "%02" PRIX8 "", guid[i]); @@ -388,7 +388,7 @@ TSMF_PRESENTATION* tsmf_presentation_find_by_id(const BYTE* guid) { BOOL found = FALSE; char guid_str[GUID_SIZE * 2ull + 1] = WINPR_C_ARRAY_INIT; - TSMF_PRESENTATION* presentation = NULL; + TSMF_PRESENTATION* presentation = nullptr; ArrayList_Lock(presentation_list); const size_t count = ArrayList_Count(presentation_list); @@ -409,7 +409,7 @@ TSMF_PRESENTATION* tsmf_presentation_find_by_id(const BYTE* guid) WLog_WARN(TAG, "presentation id %s not found", guid_to_string(guid, guid_str, sizeof(guid_str))); - return (found) ? presentation : NULL; + return (found) ? presentation : nullptr; } static BOOL tsmf_sample_playback_video(TSMF_SAMPLE* sample) @@ -504,7 +504,7 @@ static BOOL tsmf_sample_playback_video(TSMF_SAMPLE* sample) /* The frame data ownership is passed to the event object, and is freed after the event is * processed. */ - sample->data = NULL; + sample->data = nullptr; sample->decoded_size = 0; if (tsmf->FrameEvent) @@ -530,7 +530,7 @@ static BOOL tsmf_sample_playback_audio(TSMF_SAMPLE* sample) ret = sample->stream->audio->Play(sample->stream->audio, sample->data, sample->decoded_size); free(sample->data); - sample->data = NULL; + sample->data = nullptr; sample->decoded_size = 0; if (stream->audio->GetLatency) @@ -575,7 +575,7 @@ static BOOL tsmf_sample_playback(TSMF_SAMPLE* sample) */ if (stream->major_type == TSMF_MAJOR_TYPE_VIDEO) { - TSMF_STREAM* temp_stream = NULL; + TSMF_STREAM* temp_stream = nullptr; TSMF_PRESENTATION* presentation = stream->presentation; ArrayList_Lock(presentation->stream_list); const size_t count = ArrayList_Count(presentation->stream_list); @@ -635,7 +635,7 @@ static BOOL tsmf_sample_playback(TSMF_SAMPLE* sample) } free(sample->data); - sample->data = NULL; + sample->data = nullptr; if (stream->major_type == TSMF_MAJOR_TYPE_VIDEO) { @@ -769,7 +769,7 @@ static DWORD WINAPI tsmf_stream_ack_func(LPVOID arg) tsmf_stream_flush(stream); if (stream->decoder && stream->decoder->Control) - stream->decoder->Control(stream->decoder, Control_Stop, NULL); + stream->decoder->Control(stream->decoder, Control_Stop, nullptr); } } @@ -807,7 +807,7 @@ static DWORD WINAPI tsmf_stream_ack_func(LPVOID arg) static DWORD WINAPI tsmf_stream_playback_func(LPVOID arg) { HANDLE hdl[2]; - TSMF_SAMPLE* sample = NULL; + TSMF_SAMPLE* sample = nullptr; TSMF_STREAM* stream = (TSMF_STREAM*)arg; TSMF_PRESENTATION* presentation = stream->presentation; UINT error = CHANNEL_RC_OK; @@ -824,10 +824,10 @@ static DWORD WINAPI tsmf_stream_playback_func(LPVOID arg) stream->audio = tsmf_load_audio_device( presentation->audio_name && presentation->audio_name[0] ? presentation->audio_name - : NULL, + : nullptr, presentation->audio_device && presentation->audio_device[0] ? presentation->audio_device - : NULL); + : nullptr); if (stream->audio) { @@ -884,7 +884,7 @@ static DWORD WINAPI tsmf_stream_playback_func(LPVOID arg) if (stream->audio) { stream->audio->Free(stream->audio); - stream->audio = NULL; + stream->audio = nullptr; } if (error && stream->rdpcontext) @@ -901,7 +901,7 @@ static BOOL tsmf_stream_start(TSMF_STREAM* stream) return TRUE; stream->eos = 0; - return stream->decoder->Control(stream->decoder, Control_Restart, NULL); + return stream->decoder->Control(stream->decoder, Control_Restart, nullptr); } static BOOL tsmf_stream_stop(TSMF_STREAM* stream) @@ -924,7 +924,7 @@ static BOOL tsmf_stream_stop(TSMF_STREAM* stream) { DEBUG_TSMF("Stop with no pending eos response, so do it immediately."); tsmf_stream_flush(stream); - return stream->decoder->Control(stream->decoder, Control_Stop, NULL); + return stream->decoder->Control(stream->decoder, Control_Stop, nullptr); } } @@ -933,7 +933,7 @@ static BOOL tsmf_stream_pause(TSMF_STREAM* stream) if (!stream || !stream->decoder || !stream->decoder->Control) return TRUE; - return stream->decoder->Control(stream->decoder, Control_Pause, NULL); + return stream->decoder->Control(stream->decoder, Control_Pause, nullptr); } static BOOL tsmf_stream_restart(TSMF_STREAM* stream) @@ -942,7 +942,7 @@ static BOOL tsmf_stream_restart(TSMF_STREAM* stream) return TRUE; stream->eos = 0; - return stream->decoder->Control(stream->decoder, Control_Restart, NULL); + return stream->decoder->Control(stream->decoder, Control_Restart, nullptr); } static BOOL tsmf_stream_change_volume(TSMF_STREAM* stream, UINT32 newVolume, UINT32 muted) @@ -950,11 +950,11 @@ static BOOL tsmf_stream_change_volume(TSMF_STREAM* stream, UINT32 newVolume, UIN if (!stream || !stream->decoder) return TRUE; - if (stream->decoder != NULL && stream->decoder->ChangeVolume) + if (stream->decoder != nullptr && stream->decoder->ChangeVolume) { return stream->decoder->ChangeVolume(stream->decoder, newVolume, muted); } - else if (stream->audio != NULL && stream->audio->ChangeVolume) + else if (stream->audio != nullptr && stream->audio->ChangeVolume) { return stream->audio->ChangeVolume(stream->audio, newVolume, muted); } @@ -965,7 +965,7 @@ static BOOL tsmf_stream_change_volume(TSMF_STREAM* stream, UINT32 newVolume, UIN BOOL tsmf_presentation_volume_changed(TSMF_PRESENTATION* presentation, UINT32 newVolume, UINT32 muted) { - TSMF_STREAM* stream = NULL; + TSMF_STREAM* stream = nullptr; BOOL ret = TRUE; presentation->volume = newVolume; presentation->muted = muted; @@ -984,7 +984,7 @@ BOOL tsmf_presentation_volume_changed(TSMF_PRESENTATION* presentation, UINT32 ne BOOL tsmf_presentation_paused(TSMF_PRESENTATION* presentation) { - TSMF_STREAM* stream = NULL; + TSMF_STREAM* stream = nullptr; BOOL ret = TRUE; ArrayList_Lock(presentation->stream_list); size_t count = ArrayList_Count(presentation->stream_list); @@ -1001,7 +1001,7 @@ BOOL tsmf_presentation_paused(TSMF_PRESENTATION* presentation) BOOL tsmf_presentation_restarted(TSMF_PRESENTATION* presentation) { - TSMF_STREAM* stream = NULL; + TSMF_STREAM* stream = nullptr; BOOL ret = TRUE; ArrayList_Lock(presentation->stream_list); size_t count = ArrayList_Count(presentation->stream_list); @@ -1018,7 +1018,7 @@ BOOL tsmf_presentation_restarted(TSMF_PRESENTATION* presentation) BOOL tsmf_presentation_start(TSMF_PRESENTATION* presentation) { - TSMF_STREAM* stream = NULL; + TSMF_STREAM* stream = nullptr; BOOL ret = TRUE; ArrayList_Lock(presentation->stream_list); size_t count = ArrayList_Count(presentation->stream_list); @@ -1062,7 +1062,7 @@ UINT tsmf_presentation_sync(TSMF_PRESENTATION* presentation) BOOL tsmf_presentation_stop(TSMF_PRESENTATION* presentation) { - TSMF_STREAM* stream = NULL; + TSMF_STREAM* stream = nullptr; BOOL ret = TRUE; ArrayList_Lock(presentation->stream_list); size_t count = ArrayList_Count(presentation->stream_list); @@ -1083,7 +1083,7 @@ BOOL tsmf_presentation_set_geometry_info(TSMF_PRESENTATION* presentation, UINT32 UINT32 width, UINT32 height, UINT32 num_rects, const RECTANGLE_32* rects) { - TSMF_STREAM* stream = NULL; + TSMF_STREAM* stream = nullptr; BOOL ret = TRUE; /* The server may send messages with invalid width / height. @@ -1148,7 +1148,7 @@ BOOL tsmf_stream_flush(TSMF_STREAM* stream) stream->eos = 0; stream->eos_message_id = 0; - stream->eos_channel_callback = NULL; + stream->eos_channel_callback = nullptr; stream->delayed_stop = 0; stream->last_end_time = 0; stream->next_start_time = 0; @@ -1185,14 +1185,14 @@ void tsmf_presentation_free(TSMF_PRESENTATION* presentation) TSMF_STREAM* tsmf_stream_new(TSMF_PRESENTATION* presentation, UINT32 stream_id, rdpContext* rdpcontext) { - wObject* obj = NULL; - TSMF_STREAM* stream = NULL; + wObject* obj = nullptr; + TSMF_STREAM* stream = nullptr; stream = tsmf_stream_find_by_id(presentation, stream_id); if (stream) { WLog_ERR(TAG, "duplicated stream id %" PRIu32 "!", stream_id); - return NULL; + return nullptr; } stream = (TSMF_STREAM*)calloc(1, sizeof(TSMF_STREAM)); @@ -1200,7 +1200,7 @@ TSMF_STREAM* tsmf_stream_new(TSMF_PRESENTATION* presentation, UINT32 stream_id, if (!stream) { WLog_ERR(TAG, "Calloc failed"); - return NULL; + return nullptr; } stream->minBufferLevel = VIDEO_MIN_BUFFER_LEVEL; @@ -1209,15 +1209,15 @@ TSMF_STREAM* tsmf_stream_new(TSMF_PRESENTATION* presentation, UINT32 stream_id, stream->seeking = FALSE; stream->eos = 0; stream->eos_message_id = 0; - stream->eos_channel_callback = NULL; + stream->eos_channel_callback = nullptr; stream->stream_id = stream_id; stream->presentation = presentation; - stream->stopEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + stream->stopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!stream->stopEvent) goto error_stopEvent; - stream->ready = CreateEvent(NULL, TRUE, TRUE, NULL); + stream->ready = CreateEvent(nullptr, TRUE, TRUE, nullptr); if (!stream->ready) goto error_ready; @@ -1243,13 +1243,13 @@ TSMF_STREAM* tsmf_stream_new(TSMF_PRESENTATION* presentation, UINT32 stream_id, obj->fnObjectFree = tsmf_sample_free; stream->play_thread = - CreateThread(NULL, 0, tsmf_stream_playback_func, stream, CREATE_SUSPENDED, NULL); + CreateThread(nullptr, 0, tsmf_stream_playback_func, stream, CREATE_SUSPENDED, nullptr); if (!stream->play_thread) goto error_play_thread; stream->ack_thread = - CreateThread(NULL, 0, tsmf_stream_ack_func, stream, CREATE_SUSPENDED, NULL); + CreateThread(nullptr, 0, tsmf_stream_ack_func, stream, CREATE_SUSPENDED, nullptr); if (!stream->ack_thread) goto error_ack_thread; @@ -1281,7 +1281,7 @@ error_ready: (void)CloseHandle(stream->stopEvent); error_stopEvent: free(stream); - return NULL; + return nullptr; } void tsmf_stream_start_threads(TSMF_STREAM* stream) @@ -1293,7 +1293,7 @@ void tsmf_stream_start_threads(TSMF_STREAM* stream) TSMF_STREAM* tsmf_stream_find_by_id(TSMF_PRESENTATION* presentation, UINT32 stream_id) { BOOL found = FALSE; - TSMF_STREAM* stream = NULL; + TSMF_STREAM* stream = nullptr; ArrayList_Lock(presentation->stream_list); size_t count = ArrayList_Count(presentation->stream_list); @@ -1309,7 +1309,7 @@ TSMF_STREAM* tsmf_stream_find_by_id(TSMF_PRESENTATION* presentation, UINT32 stre } ArrayList_Unlock(presentation->stream_list); - return (found) ? stream : NULL; + return (found) ? stream : nullptr; } static void tsmf_stream_resync(void* arg) @@ -1412,7 +1412,7 @@ void s_tsmf_stream_free(void* obj) } (void)CloseHandle(stream->play_thread); - stream->play_thread = NULL; + stream->play_thread = nullptr; } if (stream->ack_thread) @@ -1424,7 +1424,7 @@ void s_tsmf_stream_free(void* obj) } (void)CloseHandle(stream->ack_thread); - stream->ack_thread = NULL; + stream->ack_thread = nullptr; } Queue_Free(stream->sample_list); @@ -1433,7 +1433,7 @@ void s_tsmf_stream_free(void* obj) if (stream->decoder && stream->decoder->Free) { stream->decoder->Free(stream->decoder); - stream->decoder = NULL; + stream->decoder = nullptr; } (void)CloseHandle(stream->stopEvent); @@ -1520,7 +1520,7 @@ static void tsmf_signal_handler(int s) BOOL tsmf_media_init(void) { - wObject* obj = NULL; + wObject* obj = nullptr; #ifndef _WIN32 struct sigaction sigtrap; sigtrap.sa_handler = tsmf_signal_handler; diff --git a/channels/urbdrc/client/data_transfer.c b/channels/urbdrc/client/data_transfer.c index c9531bcd1..89350ad99 100644 --- a/channels/urbdrc/client/data_transfer.c +++ b/channels/urbdrc/client/data_transfer.c @@ -72,7 +72,7 @@ static wStream* create_urb_completion_message(UINT32 InterfaceId, UINT32 Message wStream* out = create_shared_message_header_with_functionid(InterfaceId, MessageId, FunctionId, 4); if (!out) - return NULL; + return nullptr; Stream_Write_UINT32(out, RequestId); return out; @@ -148,13 +148,13 @@ static wStream* urb_create_iocompletion(UINT32 InterfaceField, UINT32 MessageId, #if UINT32_MAX >= SIZE_MAX if (OutputBufferSize > UINT32_MAX - 28ull) - return NULL; + return nullptr; #endif wStream* out = create_shared_message_header_with_functionid( InterfaceId, MessageId, IOCONTROL_COMPLETION, OutputBufferSize + 16ull); if (!out) - return NULL; + return nullptr; Stream_Write_UINT32(out, RequestId); /** RequestId */ Stream_Write_UINT32(out, USBD_STATUS_SUCCESS); /** HResult */ @@ -201,7 +201,7 @@ static UINT urbdrc_process_register_request_callback(IUDEVICE* pdev, static UINT urbdrc_process_cancel_request(IUDEVICE* pdev, wStream* s, IUDEVMAN* udevman) { UINT32 CancelId = 0; - URBDRC_PLUGIN* urbdrc = NULL; + URBDRC_PLUGIN* urbdrc = nullptr; if (!s || !udevman || !pdev) return ERROR_INVALID_PARAMETER; @@ -224,7 +224,7 @@ static UINT urbdrc_process_retract_device_request(WINPR_ATTR_UNUSED IUDEVICE* pd IUDEVMAN* udevman) { UINT32 Reason = 0; - URBDRC_PLUGIN* urbdrc = NULL; + URBDRC_PLUGIN* urbdrc = nullptr; if (!s || !udevman) return ERROR_INVALID_PARAMETER; @@ -264,9 +264,9 @@ static UINT urbdrc_process_io_control(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* UINT32 OutputBufferSize = 0; UINT32 RequestId = 0; UINT32 usbd_status = USBD_STATUS_SUCCESS; - wStream* out = NULL; + wStream* out = nullptr; int success = 0; - URBDRC_PLUGIN* urbdrc = NULL; + URBDRC_PLUGIN* urbdrc = nullptr; if (!callback || !s || !udevman || !pdev) return ERROR_INVALID_PARAMETER; @@ -506,7 +506,7 @@ static UINT send_urb_select_configuration_result(GENERIC_CHANNEL_CALLBACK* callb Stream_Write_UINT32(out, 0); /** NumInterfaces */ } - return send_urb_completion_message(callback, out, 0, 0, NULL); + return send_urb_completion_message(callback, out, 0, 0, nullptr); fail: Stream_Free(out, TRUE); @@ -517,11 +517,11 @@ static UINT urb_select_configuration(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* c UINT32 RequestField, UINT32 MessageId, IUDEVMAN* udevman, int transferDir) { - MSUSB_CONFIG_DESCRIPTOR* MsConfig = NULL; + MSUSB_CONFIG_DESCRIPTOR* MsConfig = nullptr; UINT32 NumInterfaces = 0; UINT32 usbd_status = 0; BYTE ConfigurationDescriptorIsValid = 0; - URBDRC_PLUGIN* urbdrc = NULL; + URBDRC_PLUGIN* urbdrc = nullptr; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -561,7 +561,7 @@ static UINT urb_select_configuration(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* c if (lrc != 0) { msusb_msconfig_free(MsConfig); - MsConfig = NULL; + MsConfig = nullptr; return ERROR_INTERNAL_ERROR; } @@ -571,7 +571,7 @@ static UINT urb_select_configuration(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* c if (!pdev->complete_msconfig_setup(pdev, MsConfig)) { msusb_msconfig_free(MsConfig); - MsConfig = NULL; + MsConfig = nullptr; } } @@ -609,7 +609,7 @@ static UINT urb_select_interface_result(GENERIC_CHANNEL_CALLBACK* callback, UINT if (!msusb_msinterface_write(MsInterface, out)) goto fail; - return send_urb_completion_message(callback, out, 0, 0, NULL); + return send_urb_completion_message(callback, out, 0, 0, nullptr); fail: Stream_Free(out, TRUE); @@ -703,9 +703,9 @@ static UINT urb_control_transfer(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* callb UINT16 Value = 0; UINT16 Index = 0; UINT16 length = 0; - BYTE* buffer = NULL; - wStream* out = NULL; - URBDRC_PLUGIN* urbdrc = NULL; + BYTE* buffer = nullptr; + wStream* out = nullptr; + URBDRC_PLUGIN* urbdrc = nullptr; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -759,7 +759,7 @@ static UINT urb_control_transfer(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* callb } out_size = 36 + OutputBufferSize; - out = Stream_New(NULL, out_size); + out = Stream_New(nullptr, out_size); if (!out) return ERROR_OUTOFMEMORY; @@ -838,7 +838,8 @@ static UINT urb_bulk_or_interrupt_transfer(IUDEVICE* pdev, GENERIC_CHANNEL_CALLB /** process TS_URB_BULK_OR_INTERRUPT_TRANSFER */ const int rc = pdev->bulk_or_interrupt_transfer( pdev, callback, MessageId, RequestId, EndpointAddress, TransferFlags, noAck, - OutputBufferSize, (transferDir == USBD_TRANSFER_DIRECTION_OUT) ? Stream_Pointer(s) : NULL, + OutputBufferSize, + (transferDir == USBD_TRANSFER_DIRECTION_OUT) ? Stream_Pointer(s) : nullptr, urb_bulk_transfer_cb, 10000); return (uint32_t)rc; @@ -908,7 +909,7 @@ static UINT urb_isoch_transfer(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* callbac UINT32 NumberOfPackets = 0; UINT32 ErrorCount = 0; UINT32 OutputBufferSize = 0; - BYTE* packetDescriptorData = NULL; + BYTE* packetDescriptorData = nullptr; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -944,7 +945,7 @@ static UINT urb_isoch_transfer(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* callbac rc = pdev->isoch_transfer( pdev, callback, MessageId, RequestId, EndpointAddress, TransferFlags, StartFrame, ErrorCount, noAck, packetDescriptorData, NumberOfPackets, OutputBufferSize, - (transferDir == USBD_TRANSFER_DIRECTION_OUT) ? Stream_Pointer(s) : NULL, + (transferDir == USBD_TRANSFER_DIRECTION_OUT) ? Stream_Pointer(s) : nullptr, urb_isoch_transfer_cb, 2000); if (rc < 0) @@ -964,8 +965,8 @@ static UINT urb_control_descriptor_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALLB BYTE desc_index = 0; BYTE desc_type = 0; UINT16 langId = 0; - wStream* out = NULL; - URBDRC_PLUGIN* urbdrc = NULL; + wStream* out = nullptr; + URBDRC_PLUGIN* urbdrc = nullptr; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -994,7 +995,7 @@ static UINT urb_control_descriptor_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALLB } out_size = 36ULL + OutputBufferSize; - out = Stream_New(NULL, out_size); + out = Stream_New(nullptr, out_size); if (!out) return ERROR_OUTOFMEMORY; @@ -1046,8 +1047,8 @@ static UINT urb_control_get_status_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALLB UINT32 usbd_status = 0; UINT16 Index = 0; BYTE bmRequestType = 0; - wStream* out = NULL; - URBDRC_PLUGIN* urbdrc = NULL; + wStream* out = nullptr; + URBDRC_PLUGIN* urbdrc = nullptr; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -1076,7 +1077,7 @@ static UINT urb_control_get_status_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALLB if (OutputBufferSize > UINT32_MAX - 36) return ERROR_INVALID_DATA; out_size = 36ULL + OutputBufferSize; - out = Stream_New(NULL, out_size); + out = Stream_New(nullptr, out_size); if (!out) return ERROR_OUTOFMEMORY; @@ -1112,8 +1113,8 @@ static UINT urb_control_vendor_or_class_request(IUDEVICE* pdev, GENERIC_CHANNEL_ BYTE bmRequestType = 0; UINT16 Value = 0; UINT16 Index = 0; - wStream* out = NULL; - URBDRC_PLUGIN* urbdrc = NULL; + wStream* out = nullptr; + URBDRC_PLUGIN* urbdrc = nullptr; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -1146,7 +1147,7 @@ static UINT urb_control_vendor_or_class_request(IUDEVICE* pdev, GENERIC_CHANNEL_ } out_size = 36ULL + OutputBufferSize; - out = Stream_New(NULL, out_size); + out = Stream_New(nullptr, out_size); if (!out) return ERROR_OUTOFMEMORY; @@ -1198,9 +1199,9 @@ static UINT urb_os_feature_descriptor_request(IUDEVICE* pdev, GENERIC_CHANNEL_CA BYTE InterfaceNumber = 0; BYTE Ms_PageIndex = 0; UINT16 Ms_featureDescIndex = 0; - wStream* out = NULL; + wStream* out = nullptr; int ret = 0; - URBDRC_PLUGIN* urbdrc = NULL; + URBDRC_PLUGIN* urbdrc = nullptr; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -1240,7 +1241,7 @@ static UINT urb_os_feature_descriptor_request(IUDEVICE* pdev, GENERIC_CHANNEL_CA InterfaceId = ((STREAM_ID_PROXY << 30) | pdev->get_ReqCompletion(pdev)); out_size = 36ULL + OutputBufferSize; - out = Stream_New(NULL, out_size); + out = Stream_New(nullptr, out_size); if (!out) return ERROR_OUTOFMEMORY; @@ -1352,7 +1353,7 @@ static UINT urb_pipe_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* callback, /** send data */ - wStream* out = Stream_New(NULL, 36); + wStream* out = Stream_New(nullptr, 36); if (!out) return ERROR_OUTOFMEMORY; @@ -1382,7 +1383,7 @@ static UINT urb_send_current_frame_number_result(GENERIC_CHANNEL_CALLBACK* callb } Stream_Write_UINT32(out, FrameNumber); /** FrameNumber */ - return send_urb_completion_message(callback, out, 0, 0, NULL); + return send_urb_completion_message(callback, out, 0, 0, nullptr); } static UINT urb_get_current_frame_number(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* callback, @@ -1437,8 +1438,8 @@ static UINT urb_control_get_configuration_request(IUDEVICE* pdev, UINT32 InterfaceId = 0; UINT32 OutputBufferSize = 0; UINT32 usbd_status = 0; - wStream* out = NULL; - URBDRC_PLUGIN* urbdrc = NULL; + wStream* out = nullptr; + URBDRC_PLUGIN* urbdrc = nullptr; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -1465,7 +1466,7 @@ static UINT urb_control_get_configuration_request(IUDEVICE* pdev, if (OutputBufferSize > UINT32_MAX - 36) return ERROR_INVALID_DATA; out_size = 36ULL + OutputBufferSize; - out = Stream_New(NULL, out_size); + out = Stream_New(nullptr, out_size); if (!out) return ERROR_OUTOFMEMORY; @@ -1496,8 +1497,8 @@ static UINT urb_control_get_interface_request(IUDEVICE* pdev, GENERIC_CHANNEL_CA UINT32 OutputBufferSize = 0; UINT32 usbd_status = 0; UINT16 InterfaceNr = 0; - wStream* out = NULL; - URBDRC_PLUGIN* urbdrc = NULL; + wStream* out = nullptr; + URBDRC_PLUGIN* urbdrc = nullptr; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -1526,7 +1527,7 @@ static UINT urb_control_get_interface_request(IUDEVICE* pdev, GENERIC_CHANNEL_CA if (OutputBufferSize > UINT32_MAX - 36) return ERROR_INVALID_DATA; out_size = 36ULL + OutputBufferSize; - out = Stream_New(NULL, out_size); + out = Stream_New(nullptr, out_size); if (!out) return ERROR_OUTOFMEMORY; @@ -1558,8 +1559,8 @@ static UINT urb_control_feature_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK UINT16 Index = 0; BYTE bmRequestType = 0; BYTE bmRequest = 0; - wStream* out = NULL; - URBDRC_PLUGIN* urbdrc = NULL; + wStream* out = nullptr; + URBDRC_PLUGIN* urbdrc = nullptr; const BOOL noAck = (RequestField & 0x80000000U) != 0; const UINT32 RequestId = RequestField & 0x7FFFFFFF; @@ -1592,7 +1593,7 @@ static UINT urb_control_feature_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK break; } - out = Stream_New(NULL, 36ULL + OutputBufferSize); + out = Stream_New(nullptr, 36ULL + OutputBufferSize); if (!out) return ERROR_OUTOFMEMORY; @@ -1655,7 +1656,7 @@ static UINT urbdrc_process_transfer_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALL UINT16 URB_Function = 0; UINT32 RequestId = 0; UINT error = ERROR_INTERNAL_ERROR; - URBDRC_PLUGIN* urbdrc = NULL; + URBDRC_PLUGIN* urbdrc = nullptr; if (!callback || !s || !udevman || !pdev) return ERROR_INVALID_PARAMETER; @@ -1958,7 +1959,7 @@ UINT urbdrc_process_udev_data_transfer(GENERIC_CHANNEL_CALLBACK* callback, URBDR UINT32 InterfaceId = 0; UINT32 MessageId = 0; UINT32 FunctionId = 0; - IUDEVICE* pdev = NULL; + IUDEVICE* pdev = nullptr; UINT error = ERROR_INTERNAL_ERROR; if (!urbdrc || !data || !callback || !udevman) @@ -1976,7 +1977,7 @@ UINT urbdrc_process_udev_data_transfer(GENERIC_CHANNEL_CALLBACK* callback, URBDR pdev = udevman->get_udevice_by_UsbDevice(udevman, InterfaceId); /* Device does not exist, ignore this request. */ - if (pdev == NULL) + if (pdev == nullptr) { error = ERROR_SUCCESS; goto fail; diff --git a/channels/urbdrc/client/libusb/libusb_udevice.c b/channels/urbdrc/client/libusb/libusb_udevice.c index 81297de52..d70fab4e9 100644 --- a/channels/urbdrc/client/libusb/libusb_udevice.c +++ b/channels/urbdrc/client/libusb/libusb_udevice.c @@ -89,7 +89,7 @@ static struct libusb_transfer* list_contains(wArrayList* list, UINT32 streamID) { size_t count = 0; if (!list) - return NULL; + return nullptr; count = ArrayList_Count(list); for (size_t x = 0; x < count; x++) { @@ -104,7 +104,7 @@ static struct libusb_transfer* list_contains(wArrayList* list, UINT32 streamID) if (currentID == streamID) return transfer; } - return NULL; + return nullptr; } static UINT32 stream_id_from_buffer(struct libusb_transfer* transfer) @@ -208,22 +208,22 @@ static ASYNC_TRANSFER_USER_DATA* async_transfer_user_data_new(IUDEVICE* idev, UI BOOL NoAck, t_isoch_transfer_cb cb, GENERIC_CHANNEL_CALLBACK* callback) { - ASYNC_TRANSFER_USER_DATA* user_data = NULL; + ASYNC_TRANSFER_USER_DATA* user_data = nullptr; UDEVICE* pdev = (UDEVICE*)idev; if (BufferSize > UINT32_MAX) - return NULL; + return nullptr; user_data = calloc(1, sizeof(ASYNC_TRANSFER_USER_DATA)); if (!user_data) - return NULL; + return nullptr; - user_data->data = Stream_New(NULL, offset + BufferSize + packetSize); + user_data->data = Stream_New(nullptr, offset + BufferSize + packetSize); if (!user_data->data) { free(user_data); - return NULL; + return nullptr; } Stream_Seek(user_data->data, offset); /* Skip header offset */ @@ -314,7 +314,7 @@ static void LIBUSB_CALL func_iso_callback(struct libusb_transfer* transfer) WINPR_ASSERTING_INT_CAST(uint32_t, transfer->num_iso_packets), transfer->status, user_data->StartFrame, user_data->ErrorCount, user_data->OutputBufferSize); - user_data->data = NULL; + user_data->data = nullptr; } ArrayList_Remove(list, transfer); } @@ -347,14 +347,14 @@ static const LIBUSB_ENDPOINT_DESCEIPTOR* func_get_ep_desc(LIBUSB_CONFIG_DESCRIPT } } - return NULL; + return nullptr; } static void LIBUSB_CALL func_bulk_transfer_cb(struct libusb_transfer* transfer) { - ASYNC_TRANSFER_USER_DATA* user_data = NULL; + ASYNC_TRANSFER_USER_DATA* user_data = nullptr; uint32_t streamID = 0; - wArrayList* list = NULL; + wArrayList* list = nullptr; user_data = (ASYNC_TRANSFER_USER_DATA*)transfer->user_data; if (!user_data) @@ -377,7 +377,7 @@ static void LIBUSB_CALL func_bulk_transfer_cb(struct libusb_transfer* transfer) WINPR_ASSERTING_INT_CAST(uint32_t, transfer->num_iso_packets), transfer->status, user_data->StartFrame, user_data->ErrorCount, WINPR_ASSERTING_INT_CAST(uint32_t, transfer->actual_length)); - user_data->data = NULL; + user_data->data = nullptr; ArrayList_Remove(list, transfer); } ArrayList_Unlock(list); @@ -498,8 +498,8 @@ static int func_claim_all_interface(URBDRC_PLUGIN* urbdrc, LIBUSB_DEVICE_HANDLE* static LIBUSB_DEVICE* udev_get_libusb_dev(libusb_context* context, uint8_t bus_number, uint8_t dev_number) { - LIBUSB_DEVICE** libusb_list = NULL; - LIBUSB_DEVICE* device = NULL; + LIBUSB_DEVICE** libusb_list = nullptr; + LIBUSB_DEVICE* device = nullptr; const ssize_t total_device = libusb_get_device_list(context, &libusb_list); for (ssize_t i = 0; i < total_device; i++) @@ -522,13 +522,13 @@ static LIBUSB_DEVICE_DESCRIPTOR* udev_new_descript(URBDRC_PLUGIN* urbdrc, LIBUSB LIBUSB_DEVICE_DESCRIPTOR* descriptor = (LIBUSB_DEVICE_DESCRIPTOR*)calloc(1, sizeof(LIBUSB_DEVICE_DESCRIPTOR)); if (!descriptor) - return NULL; + return nullptr; ret = libusb_get_device_descriptor(libusb_dev, descriptor); if (log_libusb_result(urbdrc->log, WLOG_ERROR, "libusb_get_device_descriptor", ret)) { free(descriptor); - return NULL; + return nullptr; } return descriptor; @@ -588,7 +588,7 @@ libusb_udev_complete_msconfig_setup(IUDEVICE* idev, MSUSB_CONFIG_DESCRIPTOR* MsC UINT32 MsOutSize = 0; if (!pdev || !pdev->LibusbConfig || !pdev->urbdrc || !MsConfig) - return NULL; + return nullptr; URBDRC_PLUGIN* urbdrc = pdev->urbdrc; LIBUSB_CONFIG_DESCRIPTOR* LibusbConfig = pdev->LibusbConfig; @@ -599,7 +599,7 @@ libusb_udev_complete_msconfig_setup(IUDEVICE* idev, MSUSB_CONFIG_DESCRIPTOR* MsC "Select Configuration: Libusb NumberInterfaces(%" PRIu8 ") is different " "with MsConfig NumberInterfaces(%" PRIu32 ")", LibusbConfig->bNumInterfaces, MsConfig->NumInterfaces); - return NULL; + return nullptr; } /* replace MsPipes for libusb */ @@ -614,7 +614,7 @@ libusb_udev_complete_msconfig_setup(IUDEVICE* idev, MSUSB_CONFIG_DESCRIPTOR* MsC "MSUSB_CONFIG_DESCRIPTOR::NumInterfaces (%" PRIu32 " <= MSUSB_INTERFACE_DESCRIPTOR::InterfaceNumber( %" PRIu8 ")", MsConfig->NumInterfaces, MsInterface->InterfaceNumber); - return NULL; + return nullptr; } const LIBUSB_INTERFACE* LibusbInterface = @@ -625,7 +625,7 @@ libusb_udev_complete_msconfig_setup(IUDEVICE* idev, MSUSB_CONFIG_DESCRIPTOR* MsC "LIBUSB_INTERFACE::num_altsetting (%" PRId32 " <= MSUSB_INTERFACE_DESCRIPTOR::AlternateSetting( %" PRIu8 ")", LibusbInterface->num_altsetting, MsInterface->AlternateSetting); - return NULL; + return nullptr; } } @@ -762,11 +762,11 @@ libusb_udev_complete_msconfig_setup(IUDEVICE* idev, MSUSB_CONFIG_DESCRIPTOR* MsC static int libusb_udev_select_configuration(IUDEVICE* idev, UINT32 bConfigurationValue) { UDEVICE* pdev = (UDEVICE*)idev; - MSUSB_CONFIG_DESCRIPTOR* MsConfig = NULL; - LIBUSB_DEVICE_HANDLE* libusb_handle = NULL; - LIBUSB_DEVICE* libusb_dev = NULL; - URBDRC_PLUGIN* urbdrc = NULL; - LIBUSB_CONFIG_DESCRIPTOR** LibusbConfig = NULL; + MSUSB_CONFIG_DESCRIPTOR* MsConfig = nullptr; + LIBUSB_DEVICE_HANDLE* libusb_handle = nullptr; + LIBUSB_DEVICE* libusb_dev = nullptr; + URBDRC_PLUGIN* urbdrc = nullptr; + LIBUSB_CONFIG_DESCRIPTOR** LibusbConfig = nullptr; int ret = 0; if (!pdev || !pdev->MsConfig || !pdev->LibusbConfig || !pdev->urbdrc) @@ -819,7 +819,7 @@ static int libusb_udev_control_pipe_request(IUDEVICE* idev, WINPR_ATTR_UNUSED UI WINPR_ASSERT(EndpointAddress <= UINT8_MAX); /* - pdev->request_queue->register_request(pdev->request_queue, RequestId, NULL, 0); + pdev->request_queue->register_request(pdev->request_queue, RequestId, nullptr, 0); */ switch (command) { @@ -835,7 +835,7 @@ static int libusb_udev_control_pipe_request(IUDEVICE* idev, WINPR_ATTR_UNUSED UI (uint8_t)LIBUSB_ENDPOINT_OUT | (uint8_t)LIBUSB_RECIPIENT_ENDPOINT, LIBUSB_REQUEST_SET_FEATURE, ENDPOINT_HALT, - (uint16_t)EndpointAddress, NULL, 0, 1000); + (uint16_t)EndpointAddress, nullptr, 0, 1000); break; case PIPE_RESET: @@ -858,14 +858,14 @@ static UINT32 libusb_udev_control_query_device_text(IUDEVICE* idev, UINT32 TextT BYTE* Buffer) { UDEVICE* pdev = (UDEVICE*)idev; - LIBUSB_DEVICE_DESCRIPTOR* devDescriptor = NULL; + LIBUSB_DEVICE_DESCRIPTOR* devDescriptor = nullptr; const char strDesc[] = "Generic Usb String"; char deviceLocation[25] = WINPR_C_ARRAY_INIT; BYTE bus_number = 0; BYTE device_address = 0; int ret = 0; size_t len = 0; - URBDRC_PLUGIN* urbdrc = NULL; + URBDRC_PLUGIN* urbdrc = nullptr; WCHAR* text = (WCHAR*)Buffer; BYTE slen = 0; BYTE locale = 0; @@ -972,7 +972,7 @@ static int libusb_udev_os_feature_descriptor_request(IUDEVICE* idev, WINPR_ASSERT(*BufferSize <= UINT16_MAX); /* - pdev->request_queue->register_request(pdev->request_queue, RequestId, NULL, 0); + pdev->request_queue->register_request(pdev->request_queue, RequestId, nullptr, 0); */ error = libusb_control_transfer(pdev->libusb_handle, LIBUSB_ENDPOINT_IN | Recipient, LIBUSB_REQUEST_GET_DESCRIPTOR, 0x03ee, 0, ms_string_desc, 0x12, @@ -1060,7 +1060,7 @@ static BOOL libusb_udev_detach_kernel_driver(IUDEVICE* idev) { int err = 0; UDEVICE* pdev = (UDEVICE*)idev; - URBDRC_PLUGIN* urbdrc = NULL; + URBDRC_PLUGIN* urbdrc = nullptr; if (!pdev || !pdev->LibusbConfig || !pdev->libusb_handle || !pdev->urbdrc) return FALSE; @@ -1133,7 +1133,7 @@ static int libusb_udev_is_exist(IUDEVICE* idev) static int libusb_udev_is_channel_closed(IUDEVICE* idev) { UDEVICE* pdev = (UDEVICE*)idev; - IUDEVMAN* udevman = NULL; + IUDEVMAN* udevman = nullptr; if (!pdev || !pdev->urbdrc) return 1; @@ -1187,17 +1187,17 @@ static void libusb_udev_channel_closed(IUDEVICE* idev) URBDRC_PLUGIN* urbdrc = pdev->urbdrc; const uint8_t busNr = idev->get_bus_number(idev); const uint8_t devNr = idev->get_dev_number(idev); - IWTSVirtualChannel* channel = NULL; + IWTSVirtualChannel* channel = nullptr; if (pdev->channelManager) - channel = IFCALLRESULT(NULL, pdev->channelManager->FindChannelById, + channel = IFCALLRESULT(nullptr, pdev->channelManager->FindChannelById, pdev->channelManager, pdev->channelID); pdev->status |= URBDRC_DEVICE_CHANNEL_CLOSED; if (channel) { - const UINT rc = channel->Write(channel, 0, NULL, NULL); + const UINT rc = channel->Write(channel, 0, nullptr, nullptr); if (rc != CHANNEL_RC_OK) WLog_Print(urbdrc->log, WLOG_WARN, "channel->Write failed with %" PRIu32, rc); } @@ -1226,14 +1226,14 @@ static int libusb_udev_query_device_port_status(IUDEVICE* idev, UINT32* UsbdStat UDEVICE* pdev = (UDEVICE*)idev; int success = 0; int ret = 0; - URBDRC_PLUGIN* urbdrc = NULL; + URBDRC_PLUGIN* urbdrc = nullptr; if (!pdev || !pdev->urbdrc) return -1; urbdrc = pdev->urbdrc; - if (pdev->hub_handle != NULL) + if (pdev->hub_handle != nullptr) { ret = idev->control_transfer( idev, 0xffff, 0, 0, @@ -1266,9 +1266,9 @@ static int libusb_udev_isoch_transfer(IUDEVICE* idev, GENERIC_CHANNEL_CALLBACK* int rc = 0; UINT32 iso_packet_size = 0; UDEVICE* pdev = (UDEVICE*)idev; - ASYNC_TRANSFER_USER_DATA* user_data = NULL; - struct libusb_transfer* iso_transfer = NULL; - URBDRC_PLUGIN* urbdrc = NULL; + ASYNC_TRANSFER_USER_DATA* user_data = nullptr; + struct libusb_transfer* iso_transfer = nullptr; + URBDRC_PLUGIN* urbdrc = nullptr; size_t outSize = (12ULL * NumberOfPackets); uint32_t streamID = 0x40000000 | RequestId; @@ -1294,7 +1294,7 @@ static int libusb_udev_isoch_transfer(IUDEVICE* idev, GENERIC_CHANNEL_CALLBACK* iso_transfer = libusb_alloc_transfer((int)NumberOfPackets); } - if (iso_transfer == NULL) + if (iso_transfer == nullptr) { WLog_Print(urbdrc->log, WLOG_ERROR, "Error: libusb_alloc_transfer [NumberOfPackets=%" PRIu32 ", BufferSize=%" PRIu32 @@ -1366,10 +1366,10 @@ static int libusb_udev_bulk_or_interrupt_transfer(IUDEVICE* idev, int rc = 0; UINT32 transfer_type = 0; UDEVICE* pdev = (UDEVICE*)idev; - const LIBUSB_ENDPOINT_DESCEIPTOR* ep_desc = NULL; - struct libusb_transfer* transfer = NULL; - URBDRC_PLUGIN* urbdrc = NULL; - ASYNC_TRANSFER_USER_DATA* user_data = NULL; + const LIBUSB_ENDPOINT_DESCEIPTOR* ep_desc = nullptr; + struct libusb_transfer* transfer = nullptr; + URBDRC_PLUGIN* urbdrc = nullptr; + ASYNC_TRANSFER_USER_DATA* user_data = nullptr; uint32_t streamID = 0x80000000 | RequestId; if (!pdev || !pdev->LibusbConfig || !pdev->urbdrc) @@ -1493,7 +1493,7 @@ static int libusb_udev_cancel_transfer_request(IUDEVICE* idev, UINT32 RequestId) { int rc = -1; UDEVICE* pdev = (UDEVICE*)idev; - struct libusb_transfer* transfer = NULL; + struct libusb_transfer* transfer = nullptr; uint32_t cancelID1 = 0x40000000 | RequestId; uint32_t cancelID2 = 0x80000000 | RequestId; @@ -1551,7 +1551,7 @@ static void udev_free(IUDEVICE* idev) { int rc = 0; UDEVICE* udev = (UDEVICE*)idev; - URBDRC_PLUGIN* urbdrc = NULL; + URBDRC_PLUGIN* urbdrc = nullptr; if (!idev || !udev->urbdrc) return; @@ -1633,7 +1633,7 @@ static int udev_get_device_handle(URBDRC_PLUGIN* urbdrc, libusb_context* ctx, UD { int error = -1; uint8_t port_numbers[16] = WINPR_C_ARRAY_INIT; - LIBUSB_DEVICE** libusb_list = NULL; + LIBUSB_DEVICE** libusb_list = nullptr; const ssize_t total_device = libusb_get_device_list(ctx, &libusb_list); WINPR_ASSERT(urbdrc); @@ -1687,8 +1687,8 @@ static int udev_get_hub_handle(URBDRC_PLUGIN* urbdrc, libusb_context* ctx, UDEVI UINT16 bus_number, WINPR_ATTR_UNUSED UINT16 dev_number) { int error = -1; - LIBUSB_DEVICE** libusb_list = NULL; - LIBUSB_DEVICE_HANDLE* handle = NULL; + LIBUSB_DEVICE** libusb_list = nullptr; + LIBUSB_DEVICE_HANDLE* handle = nullptr; const ssize_t total_device = libusb_get_device_list(ctx, &libusb_list); WINPR_ASSERT(urbdrc); @@ -1723,24 +1723,24 @@ static int udev_get_hub_handle(URBDRC_PLUGIN* urbdrc, libusb_context* ctx, UDEVI static void request_free(void* value) { - ASYNC_TRANSFER_USER_DATA* user_data = NULL; + ASYNC_TRANSFER_USER_DATA* user_data = nullptr; struct libusb_transfer* transfer = (struct libusb_transfer*)value; if (!transfer) return; user_data = (ASYNC_TRANSFER_USER_DATA*)transfer->user_data; async_transfer_user_data_free(user_data); - transfer->user_data = NULL; + transfer->user_data = nullptr; libusb_free_transfer(transfer); } static IUDEVICE* udev_init(URBDRC_PLUGIN* urbdrc, libusb_context* context, LIBUSB_DEVICE* device, BYTE bus_number, BYTE dev_number) { - UDEVICE* pdev = NULL; + UDEVICE* pdev = nullptr; int status = LIBUSB_ERROR_OTHER; - LIBUSB_DEVICE_DESCRIPTOR* devDescriptor = NULL; - LIBUSB_CONFIG_DESCRIPTOR* config_temp = NULL; + LIBUSB_DEVICE_DESCRIPTOR* devDescriptor = nullptr; + LIBUSB_CONFIG_DESCRIPTOR* config_temp = nullptr; LIBUSB_INTERFACE_DESCRIPTOR interface_temp; WINPR_ASSERT(urbdrc); @@ -1748,7 +1748,7 @@ static IUDEVICE* udev_init(URBDRC_PLUGIN* urbdrc, libusb_context* context, LIBUS pdev = (PUDEVICE)calloc(1, sizeof(UDEVICE)); if (!pdev) - return NULL; + return nullptr; pdev->urbdrc = urbdrc; udev_load_interface(pdev); @@ -1758,7 +1758,7 @@ static IUDEVICE* udev_init(URBDRC_PLUGIN* urbdrc, libusb_context* context, LIBUS else pdev->libusb_dev = udev_get_libusb_dev(context, bus_number, dev_number); - if (pdev->libusb_dev == NULL) + if (pdev->libusb_dev == nullptr) goto fail; if (urbdrc->listener_callback) @@ -1782,7 +1782,7 @@ static IUDEVICE* udev_init(URBDRC_PLUGIN* urbdrc, libusb_context* context, LIBUS status = udev_get_hub_handle(urbdrc, context, pdev, bus_number, dev_number); if (status < 0) - pdev->hub_handle = NULL; + pdev->hub_handle = nullptr; pdev->devDescriptor = udev_new_descript(urbdrc, pdev->libusb_dev); @@ -1849,7 +1849,7 @@ static IUDEVICE* udev_init(URBDRC_PLUGIN* urbdrc, libusb_context* context, LIBUS return &pdev->iface; fail: pdev->iface.free(&pdev->iface); - return NULL; + return nullptr; } size_t udev_new_by_id(URBDRC_PLUGIN* urbdrc, libusb_context* ctx, UINT16 idVendor, UINT16 idProduct, @@ -1859,9 +1859,9 @@ size_t udev_new_by_id(URBDRC_PLUGIN* urbdrc, libusb_context* ctx, UINT16 idVendo WINPR_ASSERT(devArray); size_t num = 0; - LIBUSB_DEVICE** libusb_list = NULL; + LIBUSB_DEVICE** libusb_list = nullptr; - *devArray = NULL; + *devArray = nullptr; WLog_Print(urbdrc->log, WLOG_INFO, "VID: 0x%04" PRIX16 ", PID: 0x%04" PRIX16 "", idVendor, idProduct); @@ -1893,7 +1893,7 @@ size_t udev_new_by_id(URBDRC_PLUGIN* urbdrc, libusb_context* ctx, UINT16 idVendo const uint8_t addr = libusb_get_device_address(dev); array[num] = (PUDEVICE)udev_init(urbdrc, ctx, dev, nr, addr); - if (array[num] != NULL) + if (array[num] != nullptr) num++; else { @@ -1917,5 +1917,5 @@ IUDEVICE* udev_new_by_addr(URBDRC_PLUGIN* urbdrc, libusb_context* context, BYTE BYTE dev_number) { WLog_Print(urbdrc->log, WLOG_DEBUG, "bus:%d dev:%d", bus_number, dev_number); - return udev_init(urbdrc, context, NULL, bus_number, dev_number); + return udev_init(urbdrc, context, nullptr, bus_number, dev_number); } diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c index 1b2abccf0..13aed81d9 100644 --- a/channels/urbdrc/client/libusb/libusb_udevman.c +++ b/channels/urbdrc/client/libusb/libusb_udevman.c @@ -103,7 +103,7 @@ static BOOL udevman_has_next(IUDEVMAN* idevman) static IUDEVICE* udevman_get_next(IUDEVMAN* idevman) { UDEVMAN* udevman = (UDEVMAN*)idevman; - IUDEVICE* pdev = NULL; + IUDEVICE* pdev = nullptr; pdev = udevman->idev; udevman->idev = (IUDEVICE*)((UDEVICE*)udevman->idev)->next; return pdev; @@ -111,10 +111,10 @@ static IUDEVICE* udevman_get_next(IUDEVMAN* idevman) static IUDEVICE* udevman_get_udevice_by_addr(IUDEVMAN* idevman, BYTE bus_number, BYTE dev_number) { - IUDEVICE* dev = NULL; + IUDEVICE* dev = nullptr; if (!idevman) - return NULL; + return nullptr; idevman->loading_lock(idevman); idevman->rewind(idevman); @@ -139,9 +139,9 @@ static size_t udevman_register_udevice(IUDEVMAN* idevman, BYTE bus_number, BYTE UINT16 idVendor, UINT16 idProduct, UINT32 flag) { UDEVMAN* udevman = (UDEVMAN*)idevman; - IUDEVICE* pdev = NULL; - IUDEVICE** devArray = NULL; - URBDRC_PLUGIN* urbdrc = NULL; + IUDEVICE* pdev = nullptr; + IUDEVICE** devArray = nullptr; + URBDRC_PLUGIN* urbdrc = nullptr; size_t num = 0; size_t addnum = 0; @@ -151,7 +151,7 @@ static size_t udevman_register_udevice(IUDEVMAN* idevman, BYTE bus_number, BYTE urbdrc = (URBDRC_PLUGIN*)idevman->plugin; pdev = udevman_get_udevice_by_addr(idevman, bus_number, dev_number); - if (pdev != NULL) + if (pdev != nullptr) return 0; if (flag & UDEVMAN_FLAG_ADD_BY_ADDR) @@ -159,14 +159,14 @@ static size_t udevman_register_udevice(IUDEVMAN* idevman, BYTE bus_number, BYTE UINT32 id = 0; IUDEVICE* tdev = udev_new_by_addr(urbdrc, udevman->context, bus_number, dev_number); - if (tdev == NULL) + if (tdev == nullptr) return 0; id = idevman->get_next_device_id(idevman); tdev->set_UsbDevice(tdev, id); idevman->loading_lock(idevman); - if (udevman->head == NULL) + if (udevman->head == nullptr) { /* linked list is empty */ udevman->head = tdev; @@ -202,10 +202,10 @@ static size_t udevman_register_udevice(IUDEVMAN* idevman, BYTE bus_number, BYTE IUDEVICE* tdev = devArray[i]; if (udevman_get_udevice_by_addr(idevman, tdev->get_bus_number(tdev), - tdev->get_dev_number(tdev)) != NULL) + tdev->get_dev_number(tdev)) != nullptr) { tdev->free(tdev); - devArray[i] = NULL; + devArray[i] = nullptr; continue; } @@ -213,7 +213,7 @@ static size_t udevman_register_udevice(IUDEVMAN* idevman, BYTE bus_number, BYTE tdev->set_UsbDevice(tdev, id); idevman->loading_lock(idevman); - if (udevman->head == NULL) + if (udevman->head == nullptr) { /* linked list is empty */ udevman->head = tdev; @@ -248,7 +248,7 @@ static size_t udevman_register_udevice(IUDEVMAN* idevman, BYTE bus_number, BYTE static BOOL udevman_unregister_udevice(IUDEVMAN* idevman, BYTE bus_number, BYTE dev_number) { UDEVMAN* udevman = (UDEVMAN*)idevman; - UDEVICE* pdev = NULL; + UDEVICE* pdev = nullptr; UDEVICE* dev = (UDEVICE*)udevman_get_udevice_by_addr(idevman, bus_number, dev_number); if (!dev || !idevman) @@ -264,7 +264,7 @@ static BOOL udevman_unregister_udevice(IUDEVMAN* idevman, BYTE bus_number, BYTE if (pdev == dev) /* device exists */ { /* set previous device to point to next device */ - if (dev->prev != NULL) + if (dev->prev != nullptr) { /* unregistered device is not the head */ pdev = dev->prev; @@ -278,7 +278,7 @@ static BOOL udevman_unregister_udevice(IUDEVMAN* idevman, BYTE bus_number, BYTE /* set next device to point to previous device */ - if (dev->next != NULL) + if (dev->next != nullptr) { /* unregistered device is not the tail */ pdev = (UDEVICE*)dev->next; @@ -328,7 +328,7 @@ static BOOL udevman_unregister_all_udevices(IUDEVMAN* idevman) continue; /* set previous device to point to next device */ - if (dev->prev != NULL) + if (dev->prev != nullptr) { /* unregistered device is not the head */ UDEVICE* pdev = dev->prev; @@ -342,7 +342,7 @@ static BOOL udevman_unregister_all_udevices(IUDEVMAN* idevman) /* set next device to point to previous device */ - if (dev->next != NULL) + if (dev->next != nullptr) { /* unregistered device is not the tail */ UDEVICE* pdev = (UDEVICE*)dev->next; @@ -371,11 +371,11 @@ static int udevman_is_auto_add(IUDEVMAN* idevman) static IUDEVICE* udevman_get_udevice_by_UsbDevice(IUDEVMAN* idevman, UINT32 UsbDevice) { - UDEVICE* pdev = NULL; - URBDRC_PLUGIN* urbdrc = NULL; + UDEVICE* pdev = nullptr; + URBDRC_PLUGIN* urbdrc = nullptr; if (!idevman || !idevman->plugin) - return NULL; + return nullptr; /* Mask highest 2 bits, must be ignored */ UsbDevice = UsbDevice & INTERFACE_ID_MASK; @@ -397,16 +397,16 @@ static IUDEVICE* udevman_get_udevice_by_UsbDevice(IUDEVMAN* idevman, UINT32 UsbD idevman->loading_unlock(idevman); WLog_Print(urbdrc->log, WLOG_WARN, "Failed to find a USB device mapped to deviceId=%08" PRIx32, UsbDevice); - return NULL; + return nullptr; } static IUDEVICE* udevman_get_udevice_by_ChannelID(IUDEVMAN* idevman, UINT32 channelID) { - UDEVICE* pdev = NULL; - URBDRC_PLUGIN* urbdrc = NULL; + UDEVICE* pdev = nullptr; + URBDRC_PLUGIN* urbdrc = nullptr; if (!idevman || !idevman->plugin) - return NULL; + return nullptr; /* Mask highest 2 bits, must be ignored */ urbdrc = (URBDRC_PLUGIN*)idevman->plugin; @@ -427,7 +427,7 @@ static IUDEVICE* udevman_get_udevice_by_ChannelID(IUDEVMAN* idevman, UINT32 chan idevman->loading_unlock(idevman); WLog_Print(urbdrc->log, WLOG_WARN, "Failed to find a USB device mapped to channelID=%08" PRIx32, channelID); - return NULL; + return nullptr; } static void udevman_loading_lock(IUDEVMAN* idevman) @@ -506,7 +506,7 @@ static BOOL filter_by_class(uint8_t bDeviceClass, uint8_t bDeviceSubClass) static BOOL append(char* dst, size_t length, const char* src) { - return winpr_str_append(src, dst, length, NULL); + return winpr_str_append(src, dst, length, nullptr); } static BOOL device_is_filtered(struct libusb_device* dev, @@ -514,7 +514,7 @@ static BOOL device_is_filtered(struct libusb_device* dev, libusb_hotplug_event event) { char buffer[8192] = WINPR_C_ARRAY_INIT; - char* what = NULL; + char* what = nullptr; BOOL filtered = FALSE; append(buffer, sizeof(buffer), usb_interface_class_to_string(desc->bDeviceClass)); if (filter_by_class(desc->bDeviceClass, desc->bDeviceSubClass)) @@ -524,7 +524,7 @@ static BOOL device_is_filtered(struct libusb_device* dev, { case LIBUSB_CLASS_PER_INTERFACE: { - struct libusb_config_descriptor* config = NULL; + struct libusb_config_descriptor* config = nullptr; int rc = libusb_get_active_config_descriptor(dev, &config); if (rc == LIBUSB_SUCCESS) { @@ -637,8 +637,8 @@ static BOOL udevman_vid_pid_pair_equals(const void* objA, const void* objB) static BOOL udevman_parse_device_id_addr(const char** str, UINT16* id1, UINT16* id2, UINT16 max, char split_sign, char delimiter) { - char* mid = NULL; - char* end = NULL; + char* mid = nullptr; + char* end = nullptr; unsigned long rc = 0; rc = strtoul(*str, &mid, 16); @@ -716,7 +716,7 @@ static UINT urbdrc_udevman_register_devices(UDEVMAN* udevman, const char* device static UINT urbdrc_udevman_parse_addin_args(UDEVMAN* udevman, const ADDIN_ARGV* args) { - LPCSTR devices = NULL; + LPCSTR devices = nullptr; for (int x = 0; x < args->argc; x++) { @@ -895,9 +895,9 @@ static DWORD WINAPI poll_thread(LPVOID lpThreadParameter) FREERDP_ENTRY_POINT(UINT VCAPITYPE libusb_freerdp_urbdrc_client_subsystem_entry( PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints)) { - wObject* obj = NULL; + wObject* obj = nullptr; UINT status = 0; - UDEVMAN* udevman = NULL; + UDEVMAN* udevman = nullptr; const ADDIN_ARGV* args = pEntryPoints->args; udevman = (PUDEVMAN)calloc(1, sizeof(UDEVMAN)); @@ -940,7 +940,7 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE libusb_freerdp_urbdrc_client_subsystem_entry( #endif udevman->flags = UDEVMAN_FLAG_ADD_BY_VID_PID; - udevman->devman_loading = CreateMutexA(NULL, FALSE, "devman_loading"); + udevman->devman_loading = CreateMutexA(nullptr, FALSE, "devman_loading"); if (!udevman->devman_loading) goto fail; @@ -953,7 +953,7 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE libusb_freerdp_urbdrc_client_subsystem_entry( goto fail; udevman->running = TRUE; - udevman->thread = CreateThread(NULL, 0, poll_thread, udevman, 0, NULL); + udevman->thread = CreateThread(nullptr, 0, poll_thread, udevman, 0, nullptr); if (!udevman->thread) goto fail; diff --git a/channels/urbdrc/client/urbdrc_main.c b/channels/urbdrc/client/urbdrc_main.c index b4fca250a..7cc437aa0 100644 --- a/channels/urbdrc/client/urbdrc_main.c +++ b/channels/urbdrc/client/urbdrc_main.c @@ -45,29 +45,29 @@ static IWTSVirtualChannel* get_channel(IUDEVMAN* idevman) { - IWTSVirtualChannelManager* channel_mgr = NULL; - URBDRC_PLUGIN* urbdrc = NULL; + IWTSVirtualChannelManager* channel_mgr = nullptr; + URBDRC_PLUGIN* urbdrc = nullptr; if (!idevman) - return NULL; + return nullptr; urbdrc = (URBDRC_PLUGIN*)idevman->plugin; if (!urbdrc || !urbdrc->listener_callback) - return NULL; + return nullptr; channel_mgr = urbdrc->listener_callback->channel_mgr; if (!channel_mgr) - return NULL; + return nullptr; return channel_mgr->FindChannelById(channel_mgr, idevman->controlChannelId); } static int func_container_id_generate(IUDEVICE* pdev, char* strContainerId) { - char* p = NULL; - char* path = NULL; + char* p = nullptr; + char* path = nullptr; UINT8 containerId[17] = WINPR_C_ARRAY_INIT; UINT16 idVendor = 0; UINT16 idProduct = 0; @@ -186,7 +186,7 @@ static UINT urbdrc_process_channel_create(GENERIC_CHANNEL_CALLBACK* callback, wS UINT32 MajorVersion = 0; UINT32 MinorVersion = 0; UINT32 Capabilities = 0; - URBDRC_PLUGIN* urbdrc = NULL; + URBDRC_PLUGIN* urbdrc = nullptr; if (!callback || !s || !callback->plugin) return ERROR_INVALID_PARAMETER; @@ -497,7 +497,7 @@ static UINT urbdrc_device_control_channel(GENERIC_CHANNEL_CALLBACK* callback, URBDRC_PLUGIN* urbdrc = (URBDRC_PLUGIN*)callback->plugin; IUDEVMAN* udevman = urbdrc->udevman; IWTSVirtualChannel* channel = callback->channel; - IUDEVICE* pdev = NULL; + IUDEVICE* pdev = nullptr; BOOL found = FALSE; UINT error = ERROR_INTERNAL_ERROR; UINT32 channelId = callback->channel_mgr->GetChannelId(channel); @@ -566,7 +566,7 @@ static UINT urbdrc_process_channel_notification(GENERIC_CHANNEL_CALLBACK* callba UINT32 FunctionId = 0; UINT32 InterfaceId = 0; UINT error = CHANNEL_RC_OK; - URBDRC_PLUGIN* urbdrc = NULL; + URBDRC_PLUGIN* urbdrc = nullptr; if (!callback || !data) return ERROR_INVALID_PARAMETER; @@ -613,20 +613,20 @@ 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; - URBDRC_PLUGIN* urbdrc = NULL; - IUDEVMAN* udevman = NULL; + URBDRC_PLUGIN* urbdrc = nullptr; + IUDEVMAN* udevman = nullptr; UINT32 InterfaceId = 0; UINT error = ERROR_INTERNAL_ERROR; - if (callback == NULL) + if (callback == nullptr) return ERROR_INVALID_PARAMETER; - if (callback->plugin == NULL) + if (callback->plugin == nullptr) return error; urbdrc = (URBDRC_PLUGIN*)callback->plugin; - if (urbdrc->udevman == NULL) + if (urbdrc->udevman == nullptr) return error; udevman = urbdrc->udevman; @@ -702,7 +702,7 @@ static UINT urbdrc_on_new_channel_connection(IWTSListenerCallback* pListenerCall IWTSVirtualChannelCallback** ppCallback) { GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; - GENERIC_CHANNEL_CALLBACK* callback = NULL; + GENERIC_CHANNEL_CALLBACK* callback = nullptr; if (!ppCallback) return ERROR_INVALID_PARAMETER; @@ -730,7 +730,7 @@ static UINT urbdrc_plugin_initialize(IWTSPlugin* pPlugin, IWTSVirtualChannelMana { UINT status = 0; URBDRC_PLUGIN* urbdrc = (URBDRC_PLUGIN*)pPlugin; - IUDEVMAN* udevman = NULL; + IUDEVMAN* udevman = nullptr; char channelName[sizeof(URBDRC_CHANNEL_NAME)] = { URBDRC_CHANNEL_NAME }; if (!urbdrc || !urbdrc->udevman) @@ -775,7 +775,7 @@ static UINT urbdrc_plugin_initialize(IWTSPlugin* pPlugin, IWTSVirtualChannelMana static UINT urbdrc_plugin_terminated(IWTSPlugin* pPlugin) { URBDRC_PLUGIN* urbdrc = (URBDRC_PLUGIN*)pPlugin; - IUDEVMAN* udevman = NULL; + IUDEVMAN* udevman = nullptr; if (!urbdrc) return ERROR_INVALID_DATA; @@ -790,7 +790,7 @@ static UINT urbdrc_plugin_terminated(IWTSPlugin* pPlugin) if (udevman) { udevman->free(udevman); - udevman = NULL; + udevman = nullptr; } free(urbdrc->subsystem); @@ -825,7 +825,7 @@ static UINT urbdrc_load_udevman_addin(IWTSPlugin* pPlugin, LPCSTR name, const AD FREERDP_URBDRC_SERVICE_ENTRY_POINTS entryPoints = WINPR_C_ARRAY_INIT; PVIRTUALCHANNELENTRY pvce = - freerdp_load_channel_addin_entry(URBDRC_CHANNEL_NAME, name, NULL, 0); + freerdp_load_channel_addin_entry(URBDRC_CHANNEL_NAME, name, nullptr, 0); PFREERDP_URBDRC_DEVICE_ENTRY entry = WINPR_FUNC_PTR_CAST(pvce, PFREERDP_URBDRC_DEVICE_ENTRY); if (!entry) @@ -849,7 +849,7 @@ static BOOL urbdrc_set_subsystem(URBDRC_PLUGIN* urbdrc, const char* subsystem) { free(urbdrc->subsystem); urbdrc->subsystem = _strdup(subsystem); - return (urbdrc->subsystem != NULL); + return (urbdrc->subsystem != nullptr); } /** @@ -861,20 +861,22 @@ static UINT urbdrc_process_addin_args(URBDRC_PLUGIN* urbdrc, const ADDIN_ARGV* a { int status = 0; COMMAND_LINE_ARGUMENT_A urbdrc_args[] = { - { "dbg", COMMAND_LINE_VALUE_FLAG, "", NULL, BoolValueFalse, -1, NULL, "debug" }, - { "sys", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "subsystem" }, - { "dev", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "devices" }, - { "encode", COMMAND_LINE_VALUE_FLAG, "", NULL, NULL, -1, NULL, "encode" }, - { "quality", COMMAND_LINE_VALUE_REQUIRED, "<[0-2] -> [high-medium-low]>", NULL, NULL, -1, - NULL, "quality" }, - { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } + { "dbg", COMMAND_LINE_VALUE_FLAG, "", nullptr, BoolValueFalse, -1, nullptr, "debug" }, + { "sys", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, + "subsystem" }, + { "dev", COMMAND_LINE_VALUE_REQUIRED, "", nullptr, nullptr, -1, nullptr, + "devices" }, + { "encode", COMMAND_LINE_VALUE_FLAG, "", nullptr, nullptr, -1, nullptr, "encode" }, + { "quality", COMMAND_LINE_VALUE_REQUIRED, "<[0-2] -> [high-medium-low]>", nullptr, nullptr, + -1, nullptr, "quality" }, + { nullptr, 0, nullptr, nullptr, nullptr, -1, nullptr, nullptr } }; const DWORD flags = COMMAND_LINE_SIGIL_NONE | COMMAND_LINE_SEPARATOR_COLON | COMMAND_LINE_IGN_UNKNOWN_KEYWORD; - const COMMAND_LINE_ARGUMENT_A* arg = NULL; - status = - CommandLineParseArgumentsA(args->argc, args->argv, urbdrc_args, flags, urbdrc, NULL, NULL); + const COMMAND_LINE_ARGUMENT_A* arg = nullptr; + status = CommandLineParseArgumentsA(args->argc, args->argv, urbdrc_args, flags, urbdrc, nullptr, + nullptr); if (status < 0) return ERROR_INVALID_DATA; @@ -899,7 +901,7 @@ static UINT urbdrc_process_addin_args(URBDRC_PLUGIN* urbdrc, const ADDIN_ARGV* a { } CommandLineSwitchEnd(arg) - } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); + } while ((arg = CommandLineFindNextArgumentA(arg)) != nullptr); return CHANNEL_RC_OK; } @@ -939,8 +941,8 @@ BOOL add_device(IUDEVMAN* idevman, UINT32 flags, BYTE busnum, BYTE devnum, UINT1 BOOL del_device(IUDEVMAN* idevman, UINT32 flags, BYTE busnum, BYTE devnum, UINT16 idVendor, UINT16 idProduct) { - IUDEVICE* pdev = NULL; - URBDRC_PLUGIN* urbdrc = NULL; + IUDEVICE* pdev = nullptr; + URBDRC_PLUGIN* urbdrc = nullptr; if (!idevman) return FALSE; @@ -1006,12 +1008,12 @@ BOOL del_device(IUDEVMAN* idevman, UINT32 flags, BYTE busnum, BYTE devnum, UINT1 FREERDP_ENTRY_POINT(UINT VCAPITYPE urbdrc_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)) { UINT status = 0; - const ADDIN_ARGV* args = NULL; - URBDRC_PLUGIN* urbdrc = NULL; + const ADDIN_ARGV* args = nullptr; + URBDRC_PLUGIN* urbdrc = nullptr; urbdrc = (URBDRC_PLUGIN*)pEntryPoints->GetPlugin(pEntryPoints, URBDRC_CHANNEL_NAME); args = pEntryPoints->GetPluginData(pEntryPoints); - if (urbdrc == NULL) + if (urbdrc == nullptr) { urbdrc = (URBDRC_PLUGIN*)calloc(1, sizeof(URBDRC_PLUGIN)); @@ -1072,7 +1074,7 @@ UINT stream_write_and_free(IWTSPlugin* plugin, IWTSVirtualChannel* channel, wStr const size_t len = Stream_GetPosition(out); UINT rc = ERROR_INTERNAL_ERROR; if (len <= UINT32_MAX) - rc = channel->Write(channel, (UINT32)len, Stream_Buffer(out), NULL); + rc = channel->Write(channel, (UINT32)len, Stream_Buffer(out), nullptr); Stream_Free(out, TRUE); return rc; } diff --git a/channels/urbdrc/common/msusb.c b/channels/urbdrc/common/msusb.c index ab976902a..f5bc2c84e 100644 --- a/channels/urbdrc/common/msusb.c +++ b/channels/urbdrc/common/msusb.c @@ -58,15 +58,15 @@ void msusb_mspipes_replace(MSUSB_INTERFACE_DESCRIPTOR* MsInterface, static MSUSB_PIPE_DESCRIPTOR** msusb_mspipes_read(wStream* s, UINT32 NumberOfPipes) { - MSUSB_PIPE_DESCRIPTOR** MsPipes = NULL; + MSUSB_PIPE_DESCRIPTOR** MsPipes = nullptr; if (!Stream_CheckAndLogRequiredCapacityOfSize(TAG, (s), NumberOfPipes, 12ull)) - return NULL; + return nullptr; MsPipes = (MSUSB_PIPE_DESCRIPTOR**)calloc(NumberOfPipes, sizeof(MSUSB_PIPE_DESCRIPTOR*)); if (!MsPipes) - return NULL; + return nullptr; for (UINT32 pnum = 0; pnum < NumberOfPipes; pnum++) { @@ -96,7 +96,7 @@ out_error: free(MsPipes[pnum]); free((void*)MsPipes); - return NULL; + return nullptr; } WINPR_ATTR_MALLOC(msusb_msinterface_free, 1) @@ -110,7 +110,7 @@ void msusb_msinterface_free(MSUSB_INTERFACE_DESCRIPTOR* MsInterface) if (MsInterface) { msusb_mspipes_free(MsInterface->MsPipes, MsInterface->NumberOfPipes); - MsInterface->MsPipes = NULL; + MsInterface->MsPipes = nullptr; free(MsInterface); } } @@ -142,32 +142,32 @@ BOOL msusb_msinterface_replace(MSUSB_CONFIG_DESCRIPTOR* MsConfig, BYTE Interface return TRUE; } -MSUSB_INTERFACE_DESCRIPTOR* msusb_msinterface_read(wStream* out) +MSUSB_INTERFACE_DESCRIPTOR* msusb_msinterface_read(wStream* s) { - if (!Stream_CheckAndLogRequiredCapacity(TAG, (out), 12)) - return NULL; + if (!Stream_CheckAndLogRequiredCapacity(TAG, (s), 12)) + return nullptr; MSUSB_INTERFACE_DESCRIPTOR* MsInterface = msusb_msinterface_new(); if (!MsInterface) - return NULL; + return nullptr; - Stream_Read_UINT16(out, MsInterface->Length); - Stream_Read_UINT16(out, MsInterface->NumberOfPipesExpected); - Stream_Read_UINT8(out, MsInterface->InterfaceNumber); - Stream_Read_UINT8(out, MsInterface->AlternateSetting); - Stream_Seek(out, 2); - Stream_Read_UINT32(out, MsInterface->NumberOfPipes); + Stream_Read_UINT16(s, MsInterface->Length); + Stream_Read_UINT16(s, MsInterface->NumberOfPipesExpected); + Stream_Read_UINT8(s, MsInterface->InterfaceNumber); + Stream_Read_UINT8(s, MsInterface->AlternateSetting); + Stream_Seek(s, 2); + Stream_Read_UINT32(s, MsInterface->NumberOfPipes); MsInterface->InterfaceHandle = 0; MsInterface->bInterfaceClass = 0; MsInterface->bInterfaceSubClass = 0; MsInterface->bInterfaceProtocol = 0; MsInterface->InitCompleted = 0; - MsInterface->MsPipes = NULL; + MsInterface->MsPipes = nullptr; if (MsInterface->NumberOfPipes > 0) { - MsInterface->MsPipes = msusb_mspipes_read(out, MsInterface->NumberOfPipes); + MsInterface->MsPipes = msusb_mspipes_read(s, MsInterface->NumberOfPipes); if (!MsInterface->MsPipes) goto out_error; @@ -176,13 +176,13 @@ MSUSB_INTERFACE_DESCRIPTOR* msusb_msinterface_read(wStream* out) return MsInterface; out_error: msusb_msinterface_free(MsInterface); - return NULL; + return nullptr; } BOOL msusb_msinterface_write(const MSUSB_INTERFACE_DESCRIPTOR* MsInterface, wStream* out) { - MSUSB_PIPE_DESCRIPTOR** MsPipes = NULL; - MSUSB_PIPE_DESCRIPTOR* MsPipe = NULL; + MSUSB_PIPE_DESCRIPTOR** MsPipes = nullptr; + MSUSB_PIPE_DESCRIPTOR* MsPipe = nullptr; if (!MsInterface) return FALSE; @@ -235,12 +235,12 @@ BOOL msusb_msinterface_write(const MSUSB_INTERFACE_DESCRIPTOR* MsInterface, wStr static MSUSB_INTERFACE_DESCRIPTOR** msusb_msinterface_read_list(wStream* s, UINT32 NumInterfaces) { - MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces = NULL; + MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces = nullptr; MsInterfaces = (MSUSB_INTERFACE_DESCRIPTOR**)calloc(NumInterfaces, sizeof(MSUSB_INTERFACE_DESCRIPTOR*)); if (!MsInterfaces) - return NULL; + return nullptr; for (UINT32 inum = 0; inum < NumInterfaces; inum++) { @@ -257,7 +257,7 @@ fail: msusb_msinterface_free(MsInterfaces[inum]); free((void*)MsInterfaces); - return NULL; + return nullptr; } BOOL msusb_msconfig_write(const MSUSB_CONFIG_DESCRIPTOR* MsConfig, wStream* out) @@ -296,19 +296,19 @@ void msusb_msconfig_free(MSUSB_CONFIG_DESCRIPTOR* MsConfig) if (MsConfig) { msusb_msinterface_free_list(MsConfig->MsInterfaces, MsConfig->NumInterfaces); - MsConfig->MsInterfaces = NULL; + MsConfig->MsInterfaces = nullptr; free(MsConfig); } } MSUSB_CONFIG_DESCRIPTOR* msusb_msconfig_read(wStream* s, UINT32 NumInterfaces) { - MSUSB_CONFIG_DESCRIPTOR* MsConfig = NULL; + MSUSB_CONFIG_DESCRIPTOR* MsConfig = nullptr; BYTE lenConfiguration = 0; BYTE typeConfiguration = 0; if (!Stream_CheckAndLogRequiredCapacityOfSize(TAG, (s), 3ULL + NumInterfaces, 2ULL)) - return NULL; + return nullptr; MsConfig = msusb_msconfig_new(); @@ -337,15 +337,15 @@ MSUSB_CONFIG_DESCRIPTOR* msusb_msconfig_read(wStream* s, UINT32 NumInterfaces) return MsConfig; fail: msusb_msconfig_free(MsConfig); - return NULL; + return nullptr; } void msusb_msconfig_dump(const MSUSB_CONFIG_DESCRIPTOR* MsConfig) { - MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces = NULL; - MSUSB_INTERFACE_DESCRIPTOR* MsInterface = NULL; - MSUSB_PIPE_DESCRIPTOR** MsPipes = NULL; - MSUSB_PIPE_DESCRIPTOR* MsPipe = NULL; + MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces = nullptr; + MSUSB_INTERFACE_DESCRIPTOR* MsInterface = nullptr; + MSUSB_PIPE_DESCRIPTOR** MsPipes = nullptr; + MSUSB_PIPE_DESCRIPTOR* MsPipe = nullptr; WLog_INFO(TAG, "=================MsConfig:========================"); WLog_INFO(TAG, "wTotalLength:%" PRIu16 "", MsConfig->wTotalLength); diff --git a/channels/urbdrc/common/msusb.h b/channels/urbdrc/common/msusb.h index ff68a6747..cbe4e3dad 100644 --- a/channels/urbdrc/common/msusb.h +++ b/channels/urbdrc/common/msusb.h @@ -98,7 +98,7 @@ extern "C" WINPR_ATTR_MALLOC(msusb_msinterface_free, 1) WINPR_ATTR_NODISCARD - FREERDP_LOCAL MSUSB_INTERFACE_DESCRIPTOR* msusb_msinterface_read(wStream* out); + FREERDP_LOCAL MSUSB_INTERFACE_DESCRIPTOR* msusb_msinterface_read(wStream* s); WINPR_ATTR_NODISCARD FREERDP_LOCAL BOOL msusb_msinterface_write(const MSUSB_INTERFACE_DESCRIPTOR* MsInterface, diff --git a/channels/urbdrc/common/urbdrc_helpers.c b/channels/urbdrc/common/urbdrc_helpers.c index e623f85c6..85dbe7950 100644 --- a/channels/urbdrc/common/urbdrc_helpers.c +++ b/channels/urbdrc/common/urbdrc_helpers.c @@ -442,13 +442,13 @@ BOOL write_shared_message_header_with_functionid(wStream* s, UINT32 InterfaceId, wStream* create_shared_message_header_with_functionid(UINT32 InterfaceId, UINT32 MessageId, UINT32 FunctionId, size_t OutputSize) { - wStream* out = Stream_New(NULL, 12ULL + OutputSize); + wStream* out = Stream_New(nullptr, 12ULL + OutputSize); if (!out) - return NULL; + return nullptr; if (!write_shared_message_header_with_functionid(out, InterfaceId, MessageId, FunctionId)) { Stream_Free(out, TRUE); - return NULL; + return nullptr; } return out; } diff --git a/channels/video/client/video_main.c b/channels/video/client/video_main.c index 2584fe5ef..ef9718846 100644 --- a/channels/video/client/video_main.c +++ b/channels/video/client/video_main.c @@ -136,12 +136,12 @@ static void video_client_context_set_geometry(VideoClientContext* video, static VideoClientContextPriv* VideoClientContextPriv_new(VideoClientContext* video) { - VideoClientContextPriv* ret = NULL; + VideoClientContextPriv* ret = nullptr; WINPR_ASSERT(video); ret = calloc(1, sizeof(*ret)); if (!ret) - return NULL; + return nullptr; ret->frames = Queue_New(TRUE, 10, 2); if (!ret->frames) @@ -173,7 +173,7 @@ static VideoClientContextPriv* VideoClientContextPriv_new(VideoClientContext* vi fail: VideoClientContextPriv_free(ret); - return NULL; + return nullptr; } static BOOL PresentationContext_ref(PresentationContext* presentation) @@ -188,16 +188,16 @@ static PresentationContext* PresentationContext_new(VideoClientContext* video, B UINT32 x, UINT32 y, UINT32 width, UINT32 height) { size_t s = 4ULL * width * height; - PresentationContext* ret = NULL; + PresentationContext* ret = nullptr; WINPR_ASSERT(video); if (s > INT32_MAX) - return NULL; + return nullptr; ret = calloc(1, sizeof(*ret)); if (!ret) - return NULL; + return nullptr; ret->video = video; ret->PresentationId = PresentationId; @@ -211,7 +211,7 @@ static PresentationContext* PresentationContext_new(VideoClientContext* video, B if (!h264_context_reset(ret->h264, width, height)) goto fail; - ret->currentSample = Stream_New(NULL, 4096); + ret->currentSample = Stream_New(nullptr, 4096); if (!ret->currentSample) { WLog_ERR(TAG, "unable to create current packet stream"); @@ -232,13 +232,13 @@ static PresentationContext* PresentationContext_new(VideoClientContext* video, B fail: PresentationContext_unref(&ret); - return NULL; + return nullptr; } static void PresentationContext_unref(PresentationContext** ppresentation) { - PresentationContext* presentation = NULL; - MAPPED_GEOMETRY* geometry = NULL; + PresentationContext* presentation = nullptr; + MAPPED_GEOMETRY* geometry = nullptr; WINPR_ASSERT(ppresentation); @@ -252,9 +252,9 @@ static void PresentationContext_unref(PresentationContext** ppresentation) geometry = presentation->geometry; if (geometry) { - geometry->MappedGeometryUpdate = NULL; - geometry->MappedGeometryClear = NULL; - geometry->custom = NULL; + geometry->MappedGeometryUpdate = nullptr; + geometry->MappedGeometryClear = nullptr; + geometry->custom = nullptr; mappedGeometryUnref(geometry); } @@ -262,12 +262,12 @@ static void PresentationContext_unref(PresentationContext** ppresentation) Stream_Free(presentation->currentSample, TRUE); presentation->video->deleteSurface(presentation->video, presentation->surface); free(presentation); - *ppresentation = NULL; + *ppresentation = nullptr; } static void VideoFrame_free(VideoFrame** pframe) { - VideoFrame* frame = NULL; + VideoFrame* frame = nullptr; WINPR_ASSERT(pframe); frame = *pframe; @@ -282,14 +282,14 @@ static void VideoFrame_free(VideoFrame** pframe) BufferPool_Return(frame->presentation->video->priv->surfacePool, frame->surfaceData); PresentationContext_unref(&frame->presentation); free(frame); - *pframe = NULL; + *pframe = nullptr; } static VideoFrame* VideoFrame_new(VideoClientContextPriv* priv, PresentationContext* presentation, MAPPED_GEOMETRY* geom) { - VideoFrame* frame = NULL; - const VideoSurface* surface = NULL; + VideoFrame* frame = nullptr; + const VideoSurface* surface = nullptr; WINPR_ASSERT(priv); WINPR_ASSERT(presentation); @@ -322,7 +322,7 @@ static VideoFrame* VideoFrame_new(VideoClientContextPriv* priv, PresentationCont fail: VideoFrame_free(&frame); - return NULL; + return nullptr; } void VideoClientContextPriv_free(VideoClientContextPriv* priv) @@ -358,9 +358,9 @@ static UINT video_control_send_presentation_response(VideoClientContext* context TSMM_PRESENTATION_RESPONSE* resp) { BYTE buf[12] = WINPR_C_ARRAY_INIT; - wStream* s = NULL; - VIDEO_PLUGIN* video = NULL; - IWTSVirtualChannel* channel = NULL; + wStream* s = nullptr; + VIDEO_PLUGIN* video = nullptr; + IWTSVirtualChannel* channel = nullptr; UINT ret = 0; WINPR_ASSERT(context); @@ -380,7 +380,7 @@ static UINT video_control_send_presentation_response(VideoClientContext* context Stream_SealLength(s); channel = video->control_callback->channel_callback->channel; - ret = channel->Write(channel, 12, buf, NULL); + ret = channel->Write(channel, 12, buf, nullptr); Stream_Free(s, FALSE); return ret; @@ -388,8 +388,8 @@ static UINT video_control_send_presentation_response(VideoClientContext* context static BOOL video_onMappedGeometryUpdate(MAPPED_GEOMETRY* geometry) { - PresentationContext* presentation = NULL; - RDP_RECT* r = NULL; + PresentationContext* presentation = nullptr; + RDP_RECT* r = nullptr; WINPR_ASSERT(geometry); @@ -420,7 +420,7 @@ static BOOL video_onMappedGeometryUpdate(MAPPED_GEOMETRY* geometry) static BOOL video_onMappedGeometryClear(MAPPED_GEOMETRY* geometry) { - PresentationContext* presentation = NULL; + PresentationContext* presentation = nullptr; WINPR_ASSERT(geometry); @@ -428,7 +428,7 @@ static BOOL video_onMappedGeometryClear(MAPPED_GEOMETRY* geometry) WINPR_ASSERT(presentation); mappedGeometryUnref(presentation->geometry); - presentation->geometry = NULL; + presentation->geometry = nullptr; return TRUE; } @@ -445,7 +445,7 @@ static UINT video_PresentationRequest(VideoClientContext* video, if (req->Command == TSMM_START_PRESENTATION) { - MAPPED_GEOMETRY* geom = NULL; + MAPPED_GEOMETRY* geom = nullptr; TSMM_PRESENTATION_RESPONSE resp; if (memcmp(req->VideoSubtypeId, MFVideoFormat_H264, 16) != 0) @@ -576,8 +576,8 @@ 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; - VIDEO_PLUGIN* video = NULL; - VideoClientContext* context = NULL; + VIDEO_PLUGIN* video = nullptr; + VideoClientContext* context = nullptr; UINT ret = CHANNEL_RC_OK; UINT32 cbSize = 0; UINT32 packetType = 0; @@ -622,9 +622,9 @@ static UINT video_control_send_client_notification(VideoClientContext* context, const TSMM_CLIENT_NOTIFICATION* notif) { BYTE buf[100]; - wStream* s = NULL; - VIDEO_PLUGIN* video = NULL; - IWTSVirtualChannel* channel = NULL; + wStream* s = nullptr; + VIDEO_PLUGIN* video = nullptr; + IWTSVirtualChannel* channel = nullptr; UINT ret = 0; UINT32 cbSize = 0; @@ -672,15 +672,15 @@ static UINT video_control_send_client_notification(VideoClientContext* context, WINPR_ASSERT(channel); WINPR_ASSERT(channel->Write); - ret = channel->Write(channel, cbSize, buf, NULL); + ret = channel->Write(channel, cbSize, buf, nullptr); return ret; } static void video_timer(VideoClientContext* video, UINT64 now) { - PresentationContext* presentation = NULL; - VideoFrame* frame = NULL; + PresentationContext* presentation = nullptr; + VideoFrame* frame = nullptr; WINPR_ASSERT(video); @@ -804,8 +804,8 @@ static void video_timer(VideoClientContext* video, UINT64 now) static UINT video_VideoData(VideoClientContext* context, const TSMM_VIDEO_DATA* data) { - VideoClientContextPriv* priv = NULL; - PresentationContext* presentation = NULL; + VideoClientContextPriv* priv = nullptr; + PresentationContext* presentation = nullptr; int status = 0; WINPR_ASSERT(context); @@ -942,8 +942,8 @@ static UINT video_VideoData(VideoClientContext* context, const TSMM_VIDEO_DATA* static UINT video_data_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, wStream* s) { GENERIC_CHANNEL_CALLBACK* callback = (GENERIC_CHANNEL_CALLBACK*)pChannelCallback; - VIDEO_PLUGIN* video = NULL; - VideoClientContext* context = NULL; + VIDEO_PLUGIN* video = nullptr; + VideoClientContext* context = nullptr; UINT32 cbSize = 0; UINT32 packetType = 0; TSMM_VIDEO_DATA data; @@ -1060,7 +1060,7 @@ static UINT video_data_on_new_channel_connection(IWTSListenerCallback* pListener IWTSVirtualChannelCallback** ppCallback) // NOLINTEND(readability-non-const-parameter) { - GENERIC_CHANNEL_CALLBACK* callback = NULL; + GENERIC_CHANNEL_CALLBACK* callback = nullptr; GENERIC_LISTENER_CALLBACK* listener_callback = (GENERIC_LISTENER_CALLBACK*)pListenerCallback; WINPR_UNUSED(Data); @@ -1109,7 +1109,7 @@ static UINT video_plugin_initialize(IWTSPlugin* plugin, IWTSVirtualChannelManage { UINT status = 0; VIDEO_PLUGIN* video = (VIDEO_PLUGIN*)plugin; - GENERIC_LISTENER_CALLBACK* callback = NULL; + GENERIC_LISTENER_CALLBACK* callback = nullptr; if (video->initialized) { @@ -1210,9 +1210,9 @@ static UINT video_plugin_terminated(IWTSPlugin* pPlugin) FREERDP_ENTRY_POINT(UINT VCAPITYPE video_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)) { UINT error = ERROR_INTERNAL_ERROR; - VIDEO_PLUGIN* videoPlugin = NULL; - VideoClientContext* videoContext = NULL; - VideoClientContextPriv* priv = NULL; + VIDEO_PLUGIN* videoPlugin = nullptr; + VideoClientContext* videoContext = nullptr; + VideoClientContextPriv* priv = nullptr; videoPlugin = (VIDEO_PLUGIN*)pEntryPoints->GetPlugin(pEntryPoints, "video"); if (!videoPlugin) @@ -1225,8 +1225,8 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE video_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* p } videoPlugin->wtsPlugin.Initialize = video_plugin_initialize; - videoPlugin->wtsPlugin.Connected = NULL; - videoPlugin->wtsPlugin.Disconnected = NULL; + videoPlugin->wtsPlugin.Connected = nullptr; + videoPlugin->wtsPlugin.Disconnected = nullptr; videoPlugin->wtsPlugin.Terminated = video_plugin_terminated; videoContext = (VideoClientContext*)calloc(1, sizeof(VideoClientContext));