From 5c510af4776696b0330ad39f8608f4db7f21cc74 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Thu, 26 Feb 2026 15:06:27 +0100 Subject: [PATCH] [c23,freerdp] replace NULL with nullptr --- libfreerdp/cache/bitmap.c | 44 +- libfreerdp/cache/brush.c | 30 +- libfreerdp/cache/cache.c | 12 +- libfreerdp/cache/glyph.c | 38 +- libfreerdp/cache/nine_grid.c | 12 +- libfreerdp/cache/offscreen.c | 26 +- libfreerdp/cache/palette.c | 6 +- libfreerdp/cache/persistent.c | 6 +- libfreerdp/cache/pointer.c | 54 +- libfreerdp/codec/audio.c | 2 +- libfreerdp/codec/bitmap.c | 12 +- libfreerdp/codec/bulk.c | 10 +- libfreerdp/codec/clear.c | 34 +- libfreerdp/codec/color.c | 55 ++- libfreerdp/codec/dsp.c | 22 +- libfreerdp/codec/dsp_fdk_impl.c | 12 +- libfreerdp/codec/dsp_ffmpeg.c | 26 +- libfreerdp/codec/h264.c | 20 +- libfreerdp/codec/h264_ffmpeg.c | 36 +- libfreerdp/codec/h264_mediacodec.c | 34 +- libfreerdp/codec/h264_mf.c | 36 +- libfreerdp/codec/h264_openh264.c | 36 +- libfreerdp/codec/include/bitmap.h | 8 +- libfreerdp/codec/interleaved.c | 14 +- libfreerdp/codec/mppc.c | 26 +- libfreerdp/codec/ncrush.c | 22 +- libfreerdp/codec/nsc.c | 14 +- libfreerdp/codec/nsc_encode.c | 10 +- libfreerdp/codec/planar.c | 60 +-- libfreerdp/codec/progressive.c | 90 ++-- libfreerdp/codec/region.c | 40 +- libfreerdp/codec/rfx.c | 96 ++-- libfreerdp/codec/rfx_decode.c | 8 +- libfreerdp/codec/rfx_dwt.c | 18 +- libfreerdp/codec/rfx_encode.c | 8 +- libfreerdp/codec/rfx_rlgr.c | 8 +- libfreerdp/codec/sse/nsc_sse2.c | 12 +- libfreerdp/codec/test/TestFreeRDPCodecClear.c | 2 +- libfreerdp/codec/test/TestFreeRDPCodecCopy.c | 8 +- libfreerdp/codec/test/TestFreeRDPCodecH264.c | 12 +- .../codec/test/TestFreeRDPCodecInterleaved.c | 38 +- libfreerdp/codec/test/TestFreeRDPCodecMppc.c | 26 +- .../codec/test/TestFreeRDPCodecNCrush.c | 6 +- .../codec/test/TestFreeRDPCodecPlanar.c | 10 +- .../codec/test/TestFreeRDPCodecProgressive.c | 66 +-- .../codec/test/TestFreeRDPCodecRemoteFX.c | 4 +- .../codec/test/TestFreeRDPCodecXCrush.c | 2 +- libfreerdp/codec/test/TestFreeRDPCodecZGfx.c | 26 +- libfreerdp/codec/test/TestFreeRDPHelpers.c | 10 +- libfreerdp/codec/test/TestFreeRDPRegion.c | 28 +- libfreerdp/codec/test/TestFuzzCodecs.c | 28 +- .../codec/test/cursor/cursor_dump_00000000.c | 12 +- .../codec/test/cursor/cursor_dump_00000001.c | 12 +- .../codec/test/cursor/cursor_dump_00000002.c | 12 +- .../codec/test/cursor/cursor_dump_00000003.c | 12 +- .../codec/test/cursor/cursor_dump_00000004.c | 12 +- .../codec/test/cursor/cursor_dump_00000005.c | 12 +- libfreerdp/codec/xcrush.c | 70 +-- libfreerdp/codec/yuv.c | 30 +- libfreerdp/codec/zgfx.c | 12 +- libfreerdp/common/addin.c | 64 +-- libfreerdp/common/assistance.c | 127 ++--- libfreerdp/common/settings.c | 244 ++++----- libfreerdp/common/settings_getters.c | 16 +- libfreerdp/common/settings_str.c | 10 +- libfreerdp/common/test/TestAddinArgv.c | 62 +-- libfreerdp/common/test/TestCommonAssistance.c | 12 +- .../TestFuzzCommonAssistanceHexStringToBin.c | 2 +- .../TestFuzzCommonAssistanceParseFileBuffer.c | 2 +- libfreerdp/core/aad.c | 124 ++--- libfreerdp/core/activation.c | 10 +- libfreerdp/core/autodetect.c | 20 +- libfreerdp/core/capabilities.c | 8 +- libfreerdp/core/channels.c | 6 +- libfreerdp/core/childsession.c | 31 +- libfreerdp/core/client.c | 186 +++---- libfreerdp/core/codecs.c | 18 +- libfreerdp/core/connection.c | 66 +-- libfreerdp/core/credssp_auth.c | 74 +-- libfreerdp/core/display.c | 2 +- libfreerdp/core/errconnect.c | 6 +- libfreerdp/core/errinfo.c | 8 +- libfreerdp/core/fastpath.c | 52 +- libfreerdp/core/freerdp.c | 108 ++-- libfreerdp/core/gateway/arm.c | 89 ++-- libfreerdp/core/gateway/http.c | 130 ++--- libfreerdp/core/gateway/ncacn_http.c | 48 +- libfreerdp/core/gateway/rdg.c | 141 +++--- libfreerdp/core/gateway/rpc.c | 30 +- libfreerdp/core/gateway/rpc_bind.c | 39 +- libfreerdp/core/gateway/rpc_client.c | 73 +-- libfreerdp/core/gateway/rts.c | 106 ++-- libfreerdp/core/gateway/rts_signature.c | 8 +- libfreerdp/core/gateway/tsg.c | 96 ++-- libfreerdp/core/gateway/websocket.c | 12 +- libfreerdp/core/gateway/wst.c | 72 +-- libfreerdp/core/gcc.c | 14 +- libfreerdp/core/graphics.c | 32 +- libfreerdp/core/info.c | 58 +-- libfreerdp/core/input.c | 66 +-- libfreerdp/core/license.c | 104 ++-- libfreerdp/core/listener.c | 20 +- libfreerdp/core/mcs.c | 69 +-- libfreerdp/core/message.c | 464 +++++++++--------- libfreerdp/core/metrics.c | 2 +- libfreerdp/core/multitransport.c | 4 +- libfreerdp/core/nego.c | 44 +- libfreerdp/core/nla.c | 88 ++-- libfreerdp/core/orders.c | 74 +-- libfreerdp/core/peer.c | 96 ++-- libfreerdp/core/proxy.c | 22 +- libfreerdp/core/rdp.c | 96 ++-- libfreerdp/core/rdstls.c | 32 +- libfreerdp/core/redirection.c | 48 +- libfreerdp/core/security.c | 36 +- libfreerdp/core/server.c | 172 +++---- libfreerdp/core/settings.c | 61 +-- libfreerdp/core/smartcardlogon.c | 73 +-- libfreerdp/core/state.c | 2 +- libfreerdp/core/streamdump.c | 16 +- libfreerdp/core/tcp.c | 96 ++-- libfreerdp/core/tcp.h | 10 +- libfreerdp/core/test/TestConnect.c | 55 ++- .../TestFuzzCryptoCertificateDataSetPEM.c | 4 +- libfreerdp/core/test/TestSettings.c | 90 ++-- libfreerdp/core/test/TestStreamDump.c | 12 +- libfreerdp/core/test/TestUtils.c | 49 +- libfreerdp/core/test/TestVersion.c | 6 +- libfreerdp/core/timer.c | 14 +- libfreerdp/core/tpkt.c | 2 +- libfreerdp/core/transport.c | 110 ++--- libfreerdp/core/update.c | 74 +-- libfreerdp/core/utils.c | 20 +- libfreerdp/core/utils.h | 4 +- libfreerdp/core/window.c | 46 +- libfreerdp/crypto/base64.c | 12 +- libfreerdp/crypto/ber.c | 14 +- libfreerdp/crypto/cert_common.c | 18 +- libfreerdp/crypto/certificate.c | 146 +++--- libfreerdp/crypto/certificate_data.c | 24 +- libfreerdp/crypto/certificate_store.c | 16 +- libfreerdp/crypto/crypto.c | 22 +- libfreerdp/crypto/er.c | 2 +- libfreerdp/crypto/opensslcompat.c | 8 +- libfreerdp/crypto/opensslcompat.h | 4 +- libfreerdp/crypto/per.c | 6 +- libfreerdp/crypto/privatekey.c | 105 ++-- libfreerdp/crypto/test/TestBase64.c | 6 +- libfreerdp/crypto/test/TestKnownHosts.c | 18 +- libfreerdp/crypto/test/Test_x509_utils.c | 10 +- libfreerdp/crypto/tls.c | 108 ++-- libfreerdp/crypto/x509_utils.c | 176 +++---- libfreerdp/emu/scard/smartcard_emulate.c | 70 +-- libfreerdp/emu/scard/smartcard_virtual_gids.c | 98 ++-- libfreerdp/gdi/bitmap.c | 16 +- libfreerdp/gdi/brush.c | 6 +- libfreerdp/gdi/clipping.c | 8 +- libfreerdp/gdi/dc.c | 28 +- libfreerdp/gdi/gdi.c | 94 ++-- libfreerdp/gdi/gdi.h | 4 +- libfreerdp/gdi/gfx.c | 128 ++--- libfreerdp/gdi/graphics.c | 36 +- libfreerdp/gdi/line.c | 8 +- libfreerdp/gdi/pen.c | 2 +- libfreerdp/gdi/region.c | 24 +- libfreerdp/gdi/shape.c | 6 +- libfreerdp/gdi/test/TestGdiBitBlt.c | 96 ++-- libfreerdp/gdi/test/TestGdiClip.c | 30 +- libfreerdp/gdi/test/TestGdiCreate.c | 44 +- libfreerdp/gdi/test/TestGdiEllipse.c | 12 +- libfreerdp/gdi/test/TestGdiLine.c | 44 +- libfreerdp/gdi/test/TestGdiRect.c | 12 +- libfreerdp/gdi/test/TestGdiRegion.c | 18 +- libfreerdp/gdi/test/TestGdiRop3.c | 6 +- libfreerdp/gdi/test/helpers.c | 10 +- libfreerdp/gdi/video.c | 12 +- libfreerdp/locale/keyboard.c | 18 +- libfreerdp/locale/keyboard_apple.c | 2 +- libfreerdp/locale/keyboard_layout.c | 44 +- libfreerdp/locale/keyboard_sun.c | 10 +- libfreerdp/locale/keyboard_x11.c | 8 +- libfreerdp/locale/keyboard_xkbfile.c | 14 +- libfreerdp/locale/locale.c | 14 +- libfreerdp/locale/test/TestLocaleKeyboard.c | 16 +- libfreerdp/locale/xkb_layout_ids.c | 34 +- libfreerdp/primitives/neon/prim_YCoCg_neon.c | 2 +- libfreerdp/primitives/neon/prim_YUV_neon.c | 2 +- libfreerdp/primitives/neon/prim_colors_neon.c | 2 +- .../primitives/opencl/prim_YUV_opencl.c | 34 +- libfreerdp/primitives/prim_YUV.c | 62 +-- libfreerdp/primitives/prim_copy.c | 2 +- libfreerdp/primitives/prim_set.c | 2 +- libfreerdp/primitives/primitives.c | 39 +- libfreerdp/primitives/sse/prim_YCoCg_ssse3.c | 2 +- libfreerdp/primitives/sse/prim_YUV_sse4.1.c | 26 +- libfreerdp/primitives/sse/prim_add_sse3.c | 2 +- .../primitives/sse/prim_alphaComp_sse3.c | 2 +- libfreerdp/primitives/sse/prim_andor_sse3.c | 2 +- libfreerdp/primitives/sse/prim_colors_sse2.c | 10 +- libfreerdp/primitives/sse/prim_set_sse2.c | 4 +- libfreerdp/primitives/sse/prim_shift_sse3.c | 2 +- libfreerdp/primitives/sse/prim_sign_ssse3.c | 2 +- .../primitives/test/TestPrimitivesAlphaComp.c | 4 +- .../primitives/test/TestPrimitivesColors.c | 10 +- .../primitives/test/TestPrimitivesCopy.c | 16 +- .../primitives/test/TestPrimitivesYCbCr.c | 10 +- .../primitives/test/TestPrimitivesYCoCg.c | 6 +- .../primitives/test/TestPrimitivesYUV.c | 46 +- libfreerdp/primitives/test/prim_test.c | 4 +- libfreerdp/utils/cliprdr_utils.c | 6 +- libfreerdp/utils/encoded_types.c | 2 +- libfreerdp/utils/helpers.c | 32 +- libfreerdp/utils/http.c | 24 +- libfreerdp/utils/passphrase.c | 40 +- libfreerdp/utils/pcap.c | 16 +- libfreerdp/utils/profiler.c | 4 +- libfreerdp/utils/rdpdr_utils.c | 12 +- libfreerdp/utils/ringbuffer.c | 6 +- libfreerdp/utils/signal_posix.c | 14 +- libfreerdp/utils/smartcard_call.c | 130 ++--- libfreerdp/utils/smartcard_pack.c | 96 ++-- libfreerdp/utils/stopwatch.c | 2 +- libfreerdp/utils/string.c | 8 +- libfreerdp/utils/test/TestPodArrays.c | 8 +- libfreerdp/utils/test/TestRingBuffer.c | 4 +- 225 files changed, 4115 insertions(+), 4083 deletions(-) diff --git a/libfreerdp/cache/bitmap.c b/libfreerdp/cache/bitmap.c index d38fa4c60..352917339 100644 --- a/libfreerdp/cache/bitmap.c +++ b/libfreerdp/cache/bitmap.c @@ -46,8 +46,8 @@ static BOOL bitmap_cache_put(rdpBitmapCache* bitmapCache, UINT32 id, UINT32 inde static BOOL update_gdi_memblt(rdpContext* context, MEMBLT_ORDER* memblt) { - rdpBitmap* bitmap = NULL; - rdpCache* cache = NULL; + rdpBitmap* bitmap = nullptr; + rdpCache* cache = nullptr; cache = context->cache; @@ -57,7 +57,7 @@ static BOOL update_gdi_memblt(rdpContext* context, MEMBLT_ORDER* memblt) bitmap = bitmap_cache_get(cache->bitmap, (BYTE)memblt->cacheId, memblt->cacheIndex); /* XP-SP2 servers sometimes ask for cached bitmaps they've never defined. */ - if (bitmap == NULL) + if (bitmap == nullptr) return TRUE; memblt->bitmap = bitmap; @@ -66,7 +66,7 @@ static BOOL update_gdi_memblt(rdpContext* context, MEMBLT_ORDER* memblt) static BOOL update_gdi_mem3blt(rdpContext* context, MEM3BLT_ORDER* mem3blt) { - rdpBitmap* bitmap = NULL; + rdpBitmap* bitmap = nullptr; rdpCache* cache = context->cache; rdpBrush* brush = &mem3blt->brush; BOOL ret = TRUE; @@ -100,8 +100,8 @@ static BOOL update_gdi_mem3blt(rdpContext* context, MEM3BLT_ORDER* mem3blt) static BOOL update_gdi_cache_bitmap(rdpContext* context, const CACHE_BITMAP_ORDER* cacheBitmap) { - rdpBitmap* bitmap = NULL; - rdpBitmap* prevBitmap = NULL; + rdpBitmap* bitmap = nullptr; + rdpBitmap* prevBitmap = nullptr; rdpCache* cache = context->cache; bitmap = Bitmap_Alloc(context); @@ -133,7 +133,7 @@ fail: static BOOL update_gdi_cache_bitmap_v2(rdpContext* context, CACHE_BITMAP_V2_ORDER* cacheBitmapV2) { - rdpBitmap* prevBitmap = NULL; + rdpBitmap* prevBitmap = nullptr; rdpCache* cache = context->cache; rdpSettings* settings = context->settings; rdpBitmap* bitmap = Bitmap_Alloc(context); @@ -176,8 +176,8 @@ fail: static BOOL update_gdi_cache_bitmap_v3(rdpContext* context, CACHE_BITMAP_V3_ORDER* cacheBitmapV3) { - rdpBitmap* bitmap = NULL; - rdpBitmap* prevBitmap = NULL; + rdpBitmap* bitmap = nullptr; + rdpBitmap* prevBitmap = nullptr; BOOL compressed = TRUE; rdpCache* cache = context->cache; rdpSettings* settings = context->settings; @@ -219,12 +219,12 @@ fail: rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmapCache, UINT32 id, UINT32 index) { - rdpBitmap* bitmap = NULL; + rdpBitmap* bitmap = nullptr; if (id >= bitmapCache->maxCells) { WLog_ERR(TAG, "get invalid bitmap cell id: %" PRIu32 "", id); - return NULL; + return nullptr; } if (index == BITMAP_CACHE_WAITING_LIST_INDEX) @@ -234,7 +234,7 @@ rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmapCache, UINT32 id, UINT32 index else if (index > bitmapCache->cells[id].number) { WLog_ERR(TAG, "get invalid bitmap index %" PRIu32 " in cell id: %" PRIu32 "", index, id); - return NULL; + return nullptr; } bitmap = bitmapCache->cells[id].entries[index]; @@ -265,7 +265,7 @@ BOOL bitmap_cache_put(rdpBitmapCache* bitmapCache, UINT32 id, UINT32 index, rdpB void bitmap_cache_register_callbacks(rdpUpdate* update) { - rdpCache* cache = NULL; + rdpCache* cache = nullptr; WINPR_ASSERT(update); WINPR_ASSERT(update->context); @@ -357,8 +357,8 @@ end: rdpBitmapCache* bitmap_cache_new(rdpContext* context) { - rdpSettings* settings = NULL; - rdpBitmapCache* bitmapCache = NULL; + rdpSettings* settings = nullptr; + rdpBitmapCache* bitmapCache = nullptr; WINPR_ASSERT(context); @@ -368,7 +368,7 @@ rdpBitmapCache* bitmap_cache_new(rdpContext* context) bitmapCache = (rdpBitmapCache*)calloc(1, sizeof(rdpBitmapCache)); if (!bitmapCache) - return NULL; + return nullptr; const UINT32 BitmapCacheV2NumCells = freerdp_settings_get_uint32(settings, FreeRDP_BitmapCacheV2NumCells); @@ -399,7 +399,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC bitmap_cache_free(bitmapCache); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void bitmap_cache_free(rdpBitmapCache* bitmapCache) @@ -472,7 +472,7 @@ static BITMAP_DATA* copy_bitmap_data(const BITMAP_DATA* data, size_t count) return dst; fail: free_bitmap_data(dst, count); - return NULL; + return nullptr; } void free_bitmap_update(WINPR_ATTR_UNUSED rdpContext* context, @@ -504,7 +504,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_bitmap_update(context, dst); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } CACHE_BITMAP_ORDER* copy_cache_bitmap_order(rdpContext* context, const CACHE_BITMAP_ORDER* order) @@ -532,7 +532,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_cache_bitmap_order(context, dst); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void free_cache_bitmap_order(WINPR_ATTR_UNUSED rdpContext* context, CACHE_BITMAP_ORDER* order) @@ -569,7 +569,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_cache_bitmap_v2_order(context, dst); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void free_cache_bitmap_v2_order(WINPR_ATTR_UNUSED rdpContext* context, @@ -607,7 +607,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_cache_bitmap_v3_order(context, dst); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void free_cache_bitmap_v3_order(WINPR_ATTR_UNUSED rdpContext* context, CACHE_BITMAP_V3_ORDER* order) diff --git a/libfreerdp/cache/brush.c b/libfreerdp/cache/brush.c index 243ed1d87..5f50de5a1 100644 --- a/libfreerdp/cache/brush.c +++ b/libfreerdp/cache/brush.c @@ -84,7 +84,7 @@ static BOOL update_gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt) static BOOL update_gdi_polygon_sc(rdpContext* context, const POLYGON_SC_ORDER* polygon_sc) { - rdpCache* cache = NULL; + rdpCache* cache = nullptr; WINPR_ASSERT(context); cache = context->cache; WINPR_ASSERT(cache); @@ -121,8 +121,8 @@ static BOOL update_gdi_polygon_cb(rdpContext* context, POLYGON_CB_ORDER* polygon static BOOL update_gdi_cache_brush(rdpContext* context, const CACHE_BRUSH_ORDER* cacheBrush) { UINT32 length = 0; - void* data = NULL; - rdpCache* cache = NULL; + void* data = nullptr; + rdpCache* cache = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(cacheBrush); @@ -143,20 +143,20 @@ static BOOL update_gdi_cache_brush(rdpContext* context, const CACHE_BRUSH_ORDER* void* brush_cache_get(rdpBrushCache* brushCache, UINT32 index, UINT32* bpp) { - void* entry = NULL; + void* entry = nullptr; if (!brushCache) - return NULL; + return nullptr; if (!bpp) - return NULL; + return nullptr; if (*bpp == 1) { if (index >= brushCache->maxMonoEntries) { WLog_ERR(TAG, "invalid brush (%" PRIu32 " bpp) index: 0x%08" PRIX32 "", *bpp, index); - return NULL; + return nullptr; } *bpp = brushCache->monoEntries[index].bpp; @@ -167,17 +167,17 @@ void* brush_cache_get(rdpBrushCache* brushCache, UINT32 index, UINT32* bpp) if (index >= brushCache->maxEntries) { WLog_ERR(TAG, "invalid brush (%" PRIu32 " bpp) index: 0x%08" PRIX32 "", *bpp, index); - return NULL; + return nullptr; } *bpp = brushCache->entries[index].bpp; entry = brushCache->entries[index].entry; } - if (entry == NULL) + if (entry == nullptr) { WLog_ERR(TAG, "invalid brush (%" PRIu32 " bpp) at index: 0x%08" PRIX32 "", *bpp, index); - return NULL; + return nullptr; } return entry; @@ -242,14 +242,14 @@ void brush_cache_register_callbacks(rdpUpdate* update) rdpBrushCache* brush_cache_new(rdpContext* context) { - rdpBrushCache* brushCache = NULL; + rdpBrushCache* brushCache = nullptr; WINPR_ASSERT(context); brushCache = (rdpBrushCache*)calloc(1, sizeof(rdpBrushCache)); if (!brushCache) - return NULL; + return nullptr; brushCache->context = context; brushCache->maxEntries = 64; @@ -270,7 +270,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC brush_cache_free(brushCache); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void brush_cache_free(rdpBrushCache* brushCache) @@ -305,7 +305,7 @@ void free_cache_brush_order(rdpContext* context, CACHE_BRUSH_ORDER* order) CACHE_BRUSH_ORDER* copy_cache_brush_order(rdpContext* context, const CACHE_BRUSH_ORDER* order) { - CACHE_BRUSH_ORDER* dst = NULL; + CACHE_BRUSH_ORDER* dst = nullptr; WINPR_ASSERT(context); @@ -318,5 +318,5 @@ CACHE_BRUSH_ORDER* copy_cache_brush_order(rdpContext* context, const CACHE_BRUSH return dst; fail: free_cache_brush_order(context, dst); - return NULL; + return nullptr; } diff --git a/libfreerdp/cache/cache.c b/libfreerdp/cache/cache.c index 8269b8467..d93e96591 100644 --- a/libfreerdp/cache/cache.c +++ b/libfreerdp/cache/cache.c @@ -27,14 +27,14 @@ rdpCache* cache_new(rdpContext* context) { - rdpCache* cache = NULL; + rdpCache* cache = nullptr; WINPR_ASSERT(context); cache = (rdpCache*)calloc(1, sizeof(rdpCache)); if (!cache) - return NULL; + return nullptr; cache->glyph = glyph_cache_new(context); @@ -77,12 +77,12 @@ error: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC cache_free(cache); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void cache_free(rdpCache* cache) { - if (cache != NULL) + if (cache != nullptr) { glyph_cache_free(cache->glyph); brush_cache_free(cache->brush); @@ -110,7 +110,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_cache_color_table_order(context, dst); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void free_cache_color_table_order(WINPR_ATTR_UNUSED rdpContext* context, @@ -142,7 +142,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_surface_bits_command(context, dst); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void free_surface_bits_command(WINPR_ATTR_UNUSED rdpContext* context, SURFACE_BITS_COMMAND* order) diff --git a/libfreerdp/cache/glyph.c b/libfreerdp/cache/glyph.c index b4f87f36d..374c6151f 100644 --- a/libfreerdp/cache/glyph.c +++ b/libfreerdp/cache/glyph.c @@ -138,7 +138,7 @@ static BOOL update_process_glyph_fragments(rdpContext* context, const BYTE* data UINT32 id = 0; UINT32 size = 0; UINT32 index = 0; - const BYTE* fragments = NULL; + const BYTE* fragments = nullptr; RDP_RECT bound = WINPR_C_ARRAY_INIT; BOOL rc = FALSE; @@ -250,7 +250,7 @@ static BOOL update_process_glyph_fragments(rdpContext* context, const BYTE* data id = data[index++]; fragments = (const BYTE*)glyph_cache_fragment_get(glyph_cache, id, &size); - if (fragments == NULL) + if (fragments == nullptr) goto fail; for (UINT32 n = 0; n < size;) @@ -414,7 +414,7 @@ static BOOL update_gdi_fast_glyph(rdpContext* context, const FAST_GLYPH_ORDER* f INT32 opHeight = 0; INT32 bkWidth = 0; INT32 bkHeight = 0; - rdpCache* cache = NULL; + rdpCache* cache = nullptr; if (!context || !fastGlyph || !context->cache) return FALSE; @@ -463,7 +463,7 @@ static BOOL update_gdi_fast_glyph(rdpContext* context, const FAST_GLYPH_ORDER* f if ((fastGlyph->cbData > 1) && (fastGlyph->glyphData.aj)) { /* got option font that needs to go into cache */ - rdpGlyph* glyph = NULL; + rdpGlyph* glyph = nullptr; const GLYPH_DATA_V2* glyphData = &fastGlyph->glyphData; glyph = Glyph_Alloc(context, glyphData->x, glyphData->y, glyphData->cx, glyphData->cy, @@ -561,14 +561,14 @@ rdpGlyph* glyph_cache_get(rdpGlyphCache* glyphCache, UINT32 id, UINT32 index) if (id >= ARRAYSIZE(glyphCache->glyphCache)) { WLog_ERR(TAG, "invalid glyph cache id: %" PRIu32 "", id); - return NULL; + return nullptr; } GLYPH_CACHE* cache = &glyphCache->glyphCache[id]; if (index > cache->number) { WLog_ERR(TAG, "index %" PRIu32 " out of range for cache id: %" PRIu32 "", index, id); - return NULL; + return nullptr; } rdpGlyph* glyph = cache->entries[index]; @@ -612,7 +612,7 @@ BOOL glyph_cache_put(rdpGlyphCache* glyphCache, UINT32 id, UINT32 index, rdpGlyp const void* glyph_cache_fragment_get(rdpGlyphCache* glyphCache, UINT32 index, UINT32* size) { - void* fragment = NULL; + void* fragment = nullptr; WINPR_ASSERT(glyphCache); WINPR_ASSERT(glyphCache->fragCache.entries); @@ -620,7 +620,7 @@ const void* glyph_cache_fragment_get(rdpGlyphCache* glyphCache, UINT32 index, UI if (index > 255) { WLog_ERR(TAG, "invalid glyph cache fragment index: %" PRIu32 "", index); - return NULL; + return nullptr; } fragment = glyphCache->fragCache.entries[index].fragment; @@ -684,8 +684,8 @@ void glyph_cache_register_callbacks(rdpUpdate* update) rdpGlyphCache* glyph_cache_new(rdpContext* context) { - rdpGlyphCache* glyphCache = NULL; - rdpSettings* settings = NULL; + rdpGlyphCache* glyphCache = nullptr; + rdpSettings* settings = nullptr; WINPR_ASSERT(context); @@ -695,7 +695,7 @@ rdpGlyphCache* glyph_cache_new(rdpContext* context) glyphCache = (rdpGlyphCache*)calloc(1, sizeof(rdpGlyphCache)); if (!glyphCache) - return NULL; + return nullptr; glyphCache->log = WLog_Get("com.freerdp.cache.glyph"); glyphCache->context = context; @@ -719,7 +719,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC glyph_cache_free(glyphCache); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void glyph_cache_free(rdpGlyphCache* glyphCache) @@ -742,18 +742,18 @@ void glyph_cache_free(rdpGlyphCache* glyphCache) if (glyph) { glyph->Free(glyphCache->context, glyph); - entries[j] = NULL; + entries[j] = nullptr; } } free((void*)entries); - cache[i].entries = NULL; + cache[i].entries = nullptr; } for (size_t i = 0; i < ARRAYSIZE(glyphCache->fragCache.entries); i++) { free(glyphCache->fragCache.entries[i].fragment); - glyphCache->fragCache.entries[i].fragment = NULL; + glyphCache->fragCache.entries[i].fragment = nullptr; } free(glyphCache); @@ -762,7 +762,7 @@ void glyph_cache_free(rdpGlyphCache* glyphCache) CACHE_GLYPH_ORDER* copy_cache_glyph_order(rdpContext* context, const CACHE_GLYPH_ORDER* glyph) { - CACHE_GLYPH_ORDER* dst = NULL; + CACHE_GLYPH_ORDER* dst = nullptr; WINPR_ASSERT(context); @@ -806,7 +806,7 @@ CACHE_GLYPH_ORDER* copy_cache_glyph_order(rdpContext* context, const CACHE_GLYPH return dst; fail: free_cache_glyph_order(context, dst); - return NULL; + return nullptr; } void free_cache_glyph_order(WINPR_ATTR_UNUSED rdpContext* context, CACHE_GLYPH_ORDER* glyph) @@ -825,7 +825,7 @@ void free_cache_glyph_order(WINPR_ATTR_UNUSED rdpContext* context, CACHE_GLYPH_O CACHE_GLYPH_V2_ORDER* copy_cache_glyph_v2_order(rdpContext* context, const CACHE_GLYPH_V2_ORDER* glyph) { - CACHE_GLYPH_V2_ORDER* dst = NULL; + CACHE_GLYPH_V2_ORDER* dst = nullptr; WINPR_ASSERT(context); @@ -869,7 +869,7 @@ CACHE_GLYPH_V2_ORDER* copy_cache_glyph_v2_order(rdpContext* context, return dst; fail: free_cache_glyph_v2_order(context, dst); - return NULL; + return nullptr; } void free_cache_glyph_v2_order(WINPR_ATTR_UNUSED rdpContext* context, CACHE_GLYPH_V2_ORDER* glyph) diff --git a/libfreerdp/cache/nine_grid.c b/libfreerdp/cache/nine_grid.c index 32ad249e4..dc46c385e 100644 --- a/libfreerdp/cache/nine_grid.c +++ b/libfreerdp/cache/nine_grid.c @@ -76,8 +76,8 @@ void nine_grid_cache_register_callbacks(rdpUpdate* update) rdpNineGridCache* nine_grid_cache_new(rdpContext* context) { - rdpNineGridCache* nine_grid = NULL; - rdpSettings* settings = NULL; + rdpNineGridCache* nine_grid = nullptr; + rdpSettings* settings = nullptr; WINPR_ASSERT(context); @@ -86,7 +86,7 @@ rdpNineGridCache* nine_grid_cache_new(rdpContext* context) nine_grid = (rdpNineGridCache*)calloc(1, sizeof(rdpNineGridCache)); if (!nine_grid) - return NULL; + return nullptr; nine_grid->context = context; @@ -110,14 +110,14 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC nine_grid_cache_free(nine_grid); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void nine_grid_cache_free(rdpNineGridCache* nine_grid) { - if (nine_grid != NULL) + if (nine_grid != nullptr) { - if (nine_grid->entries != NULL) + if (nine_grid->entries != nullptr) { for (size_t i = 0; i < nine_grid->maxEntries; i++) free(nine_grid->entries[i].entry); diff --git a/libfreerdp/cache/offscreen.c b/libfreerdp/cache/offscreen.c index 545735f1a..df8ec6fcb 100644 --- a/libfreerdp/cache/offscreen.c +++ b/libfreerdp/cache/offscreen.c @@ -105,14 +105,14 @@ static BOOL update_gdi_switch_surface(rdpContext* context, if (switchSurface->bitmapId == SCREEN_BITMAP_SURFACE) { - if (!bitmap->SetSurface(context, NULL, TRUE)) + if (!bitmap->SetSurface(context, nullptr, TRUE)) return FALSE; } else { - rdpBitmap* bmp = NULL; + rdpBitmap* bmp = nullptr; bmp = offscreen_cache_get(cache->offscreen, switchSurface->bitmapId); - if (bmp == NULL) + if (bmp == nullptr) return FALSE; if (!bitmap->SetSurface(context, bmp, FALSE)) @@ -125,14 +125,14 @@ static BOOL update_gdi_switch_surface(rdpContext* context, rdpBitmap* offscreen_cache_get(rdpOffscreenCache* offscreenCache, UINT32 index) { - rdpBitmap* bitmap = NULL; + rdpBitmap* bitmap = nullptr; WINPR_ASSERT(offscreenCache); if (index >= offscreenCache->maxEntries) { WLog_ERR(TAG, "invalid offscreen bitmap index: 0x%08" PRIX32 "", index); - return NULL; + return nullptr; } bitmap = offscreenCache->entries[index]; @@ -140,7 +140,7 @@ rdpBitmap* offscreen_cache_get(rdpOffscreenCache* offscreenCache, UINT32 index) if (!bitmap) { WLog_ERR(TAG, "invalid offscreen bitmap at index: 0x%08" PRIX32 "", index); - return NULL; + return nullptr; } return bitmap; @@ -172,21 +172,21 @@ void offscreen_cache_delete(rdpOffscreenCache* offscreenCache, UINT32 index) rdpBitmap* prevBitmap = offscreenCache->entries[index]; - if (prevBitmap != NULL) + if (prevBitmap != nullptr) { WINPR_ASSERT(offscreenCache->context); /* Ensure that the bitmap is no longer used in GDI */ if (prevBitmap->SetSurface) { - if (!prevBitmap->SetSurface(offscreenCache->context, NULL, FALSE)) + if (!prevBitmap->SetSurface(offscreenCache->context, nullptr, FALSE)) WLog_WARN(TAG, "prevBitmap->SetSurface failed"); } Bitmap_Free(offscreenCache->context, prevBitmap); } - offscreenCache->entries[index] = NULL; + offscreenCache->entries[index] = nullptr; } void offscreen_cache_register_callbacks(rdpUpdate* update) @@ -200,8 +200,8 @@ void offscreen_cache_register_callbacks(rdpUpdate* update) rdpOffscreenCache* offscreen_cache_new(rdpContext* context) { - rdpOffscreenCache* offscreenCache = NULL; - rdpSettings* settings = NULL; + rdpOffscreenCache* offscreenCache = nullptr; + rdpSettings* settings = nullptr; WINPR_ASSERT(context); @@ -211,7 +211,7 @@ rdpOffscreenCache* offscreen_cache_new(rdpContext* context) offscreenCache = (rdpOffscreenCache*)calloc(1, sizeof(rdpOffscreenCache)); if (!offscreenCache) - return NULL; + return nullptr; offscreenCache->context = context; offscreenCache->currentSurface = SCREEN_BITMAP_SURFACE; @@ -233,7 +233,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC offscreen_cache_free(offscreenCache); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void offscreen_cache_free(rdpOffscreenCache* offscreenCache) diff --git a/libfreerdp/cache/palette.c b/libfreerdp/cache/palette.c index e4031e624..94c7aba31 100644 --- a/libfreerdp/cache/palette.c +++ b/libfreerdp/cache/palette.c @@ -35,7 +35,7 @@ static void palette_cache_put(rdpPaletteCache* palette, UINT32 index, void* entr static BOOL update_gdi_cache_color_table(rdpContext* context, const CACHE_COLOR_TABLE_ORDER* cacheColorTable) { - UINT32* colorTable = NULL; + UINT32* colorTable = nullptr; rdpCache* cache = context->cache; colorTable = (UINT32*)malloc(sizeof(UINT32) * 256); @@ -69,7 +69,7 @@ void palette_cache_register_callbacks(rdpUpdate* update) rdpPaletteCache* palette_cache_new(rdpContext* context) { - rdpPaletteCache* paletteCache = NULL; + rdpPaletteCache* paletteCache = nullptr; WINPR_ASSERT(context); @@ -117,5 +117,5 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_palette_update(context, dst); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } diff --git a/libfreerdp/cache/persistent.c b/libfreerdp/cache/persistent.c index c2ab50072..c68f5c295 100644 --- a/libfreerdp/cache/persistent.c +++ b/libfreerdp/cache/persistent.c @@ -336,7 +336,7 @@ int persistent_cache_close(rdpPersistentCache* persistent) if (persistent->fp) { (void)fclose(persistent->fp); - persistent->fp = NULL; + persistent->fp = nullptr; } return 1; @@ -347,7 +347,7 @@ rdpPersistentCache* persistent_cache_new(void) rdpPersistentCache* persistent = calloc(1, sizeof(rdpPersistentCache)); if (!persistent) - return NULL; + return nullptr; persistent->bmpSize = 0x4000; persistent->bmpData = calloc(1, persistent->bmpSize); @@ -355,7 +355,7 @@ rdpPersistentCache* persistent_cache_new(void) if (!persistent->bmpData) { free(persistent); - return NULL; + return nullptr; } return persistent; diff --git a/libfreerdp/cache/pointer.c b/libfreerdp/cache/pointer.c index 192dd3406..354cf050b 100644 --- a/libfreerdp/cache/pointer.c +++ b/libfreerdp/cache/pointer.c @@ -42,11 +42,11 @@ static void pointer_clear(rdpPointer* pointer) { pointer->lengthAndMask = 0; free(pointer->andMaskData); - pointer->andMaskData = NULL; + pointer->andMaskData = nullptr; pointer->lengthXorMask = 0; free(pointer->xorMaskData); - pointer->xorMaskData = NULL; + pointer->xorMaskData = nullptr; } } @@ -80,7 +80,7 @@ static BOOL update_pointer_position(rdpContext* context, static BOOL update_pointer_system(rdpContext* context, const POINTER_SYSTEM_UPDATE* pointer_system) { - rdpPointer* pointer = NULL; + rdpPointer* pointer = nullptr; if (!context || !context->graphics || !context->graphics->Pointer_Prototype || !pointer_system) return FALSE; @@ -137,8 +137,8 @@ static BOOL upate_pointer_copy_andxor(rdpPointer* pointer, const BYTE* andMaskDa static BOOL update_pointer_color(rdpContext* context, const POINTER_COLOR_UPDATE* pointer_color) { - rdpPointer* pointer = NULL; - rdpCache* cache = NULL; + rdpPointer* pointer = nullptr; + rdpCache* cache = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(pointer_color); @@ -148,7 +148,7 @@ static BOOL update_pointer_color(rdpContext* context, const POINTER_COLOR_UPDATE pointer = Pointer_Alloc(context); - if (pointer == NULL) + if (pointer == nullptr) return FALSE; pointer->xorBpp = 24; pointer->xPos = pointer_color->hotSpotX; @@ -176,8 +176,8 @@ out_fail: static BOOL update_pointer_large(rdpContext* context, const POINTER_LARGE_UPDATE* pointer_large) { - rdpPointer* pointer = NULL; - rdpCache* cache = NULL; + rdpPointer* pointer = nullptr; + rdpCache* cache = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(pointer_large); @@ -186,7 +186,7 @@ static BOOL update_pointer_large(rdpContext* context, const POINTER_LARGE_UPDATE WINPR_ASSERT(cache); pointer = Pointer_Alloc(context); - if (pointer == NULL) + if (pointer == nullptr) return FALSE; pointer->xorBpp = pointer_large->xorBpp; pointer->xPos = pointer_large->hotSpotX; @@ -248,8 +248,8 @@ out_fail: static BOOL update_pointer_cached(rdpContext* context, const POINTER_CACHED_UPDATE* pointer_cached) { - rdpPointer* pointer = NULL; - rdpCache* cache = NULL; + rdpPointer* pointer = nullptr; + rdpCache* cache = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(pointer_cached); @@ -259,7 +259,7 @@ static BOOL update_pointer_cached(rdpContext* context, const POINTER_CACHED_UPDA pointer = pointer_cache_get(cache->pointer, pointer_cached->cacheIndex); - if (pointer != NULL) + if (pointer != nullptr) return IFCALLRESULT(TRUE, pointer->Set, context, pointer); return FALSE; @@ -267,7 +267,7 @@ static BOOL update_pointer_cached(rdpContext* context, const POINTER_CACHED_UPDA rdpPointer* pointer_cache_get(rdpPointerCache* pointer_cache, UINT32 index) { - rdpPointer* pointer = NULL; + rdpPointer* pointer = nullptr; WINPR_ASSERT(pointer_cache); @@ -275,7 +275,7 @@ rdpPointer* pointer_cache_get(rdpPointerCache* pointer_cache, UINT32 index) { WLog_ERR(TAG, "invalid pointer index:%" PRIu32 " [%" PRIu32 "]", index, pointer_cache->cacheSize); - return NULL; + return nullptr; } WINPR_ASSERT(pointer_cache->entries); @@ -286,7 +286,7 @@ rdpPointer* pointer_cache_get(rdpPointerCache* pointer_cache, UINT32 index) BOOL pointer_cache_put(rdpPointerCache* pointer_cache, UINT32 index, rdpPointer* pointer, BOOL colorCache) { - rdpPointer* prevPointer = NULL; + rdpPointer* prevPointer = nullptr; const FreeRDP_Settings_Keys_UInt32 id = colorCache ? FreeRDP_ColorPointerCacheSize : FreeRDP_PointerCacheSize; @@ -320,7 +320,7 @@ BOOL pointer_cache_put(rdpPointerCache* pointer_cache, UINT32 index, rdpPointer* void pointer_cache_register_callbacks(rdpUpdate* update) { - rdpPointerUpdate* pointer = NULL; + rdpPointerUpdate* pointer = nullptr; WINPR_ASSERT(update); WINPR_ASSERT(update->context); @@ -341,8 +341,8 @@ void pointer_cache_register_callbacks(rdpUpdate* update) rdpPointerCache* pointer_cache_new(rdpContext* context) { - rdpPointerCache* pointer_cache = NULL; - rdpSettings* settings = NULL; + rdpPointerCache* pointer_cache = nullptr; + rdpSettings* settings = nullptr; WINPR_ASSERT(context); @@ -352,7 +352,7 @@ rdpPointerCache* pointer_cache_new(rdpContext* context) pointer_cache = (rdpPointerCache*)calloc(1, sizeof(rdpPointerCache)); if (!pointer_cache) - return NULL; + return nullptr; pointer_cache->context = context; @@ -367,7 +367,7 @@ rdpPointerCache* pointer_cache_new(rdpContext* context) if (!pointer_cache->entries) { free(pointer_cache); - return NULL; + return nullptr; } return pointer_cache; @@ -375,7 +375,7 @@ rdpPointerCache* pointer_cache_new(rdpContext* context) void pointer_cache_free(rdpPointerCache* pointer_cache) { - if (pointer_cache != NULL) + if (pointer_cache != nullptr) { if (pointer_cache->entries) { @@ -424,7 +424,7 @@ POINTER_COLOR_UPDATE* copy_pointer_color_update(rdpContext* context, return dst; fail: free_pointer_color_update(context, dst); - return NULL; + return nullptr; } void free_pointer_color_update(rdpContext* context, POINTER_COLOR_UPDATE* pointer) @@ -472,7 +472,7 @@ POINTER_LARGE_UPDATE* copy_pointer_large_update(rdpContext* context, return dst; fail: free_pointer_large_update(context, dst); - return NULL; + return nullptr; } void free_pointer_large_update(rdpContext* context, POINTER_LARGE_UPDATE* pointer) @@ -520,7 +520,7 @@ POINTER_NEW_UPDATE* copy_pointer_new_update(rdpContext* context, const POINTER_N return dst; fail: free_pointer_new_update(context, dst); - return NULL; + return nullptr; } void free_pointer_new_update(WINPR_ATTR_UNUSED rdpContext* context, POINTER_NEW_UPDATE* pointer) @@ -545,7 +545,7 @@ POINTER_CACHED_UPDATE* copy_pointer_cached_update(rdpContext* context, return dst; fail: free_pointer_cached_update(context, dst); - return NULL; + return nullptr; } void free_pointer_cached_update(rdpContext* context, POINTER_CACHED_UPDATE* pointer) @@ -572,7 +572,7 @@ POINTER_POSITION_UPDATE* copy_pointer_position_update(rdpContext* context, return dst; fail: free_pointer_position_update(context, dst); - return NULL; + return nullptr; } void free_pointer_system_update(rdpContext* context, POINTER_SYSTEM_UPDATE* pointer) @@ -593,5 +593,5 @@ POINTER_SYSTEM_UPDATE* copy_pointer_system_update(rdpContext* context, return dst; fail: free_pointer_system_update(context, dst); - return NULL; + return nullptr; } diff --git a/libfreerdp/codec/audio.c b/libfreerdp/codec/audio.c index 681c68623..590f967dc 100644 --- a/libfreerdp/codec/audio.c +++ b/libfreerdp/codec/audio.c @@ -164,7 +164,7 @@ BOOL audio_format_read(wStream* s, AUDIO_FORMAT* format) if (!Stream_CheckAndLogRequiredLength(TAG, s, format->cbSize)) return FALSE; - format->data = NULL; + format->data = nullptr; if (format->cbSize > 0) { diff --git a/libfreerdp/codec/bitmap.c b/libfreerdp/codec/bitmap.c index 34d1ea8d5..31a91f027 100644 --- a/libfreerdp/codec/bitmap.c +++ b/libfreerdp/codec/bitmap.c @@ -60,7 +60,7 @@ static inline UINT32 GETPIXEL32(const void* WINPR_RESTRICT d, UINT32 x, UINT32 y static inline UINT16 IN_PIXEL16(const void* WINPR_RESTRICT in_ptr, UINT32 in_x, UINT32 in_y, UINT32 in_w, UINT16 in_last_pixel) { - if (in_ptr == 0) + if (in_ptr == nullptr) return 0; else if (in_x < in_w) return GETPIXEL16(in_ptr, in_x, in_y, in_w); @@ -72,7 +72,7 @@ static inline UINT16 IN_PIXEL16(const void* WINPR_RESTRICT in_ptr, UINT32 in_x, static inline UINT32 IN_PIXEL32(const void* WINPR_RESTRICT in_ptr, UINT32 in_x, UINT32 in_y, UINT32 in_w, UINT32 in_last_pixel) { - if (in_ptr == 0) + if (in_ptr == nullptr) return 0; else if (in_x < in_w) return GETPIXEL32(in_ptr, in_x, in_y, in_w); @@ -467,7 +467,7 @@ static inline SSIZE_T freerdp_bitmap_compress_24(const void* WINPR_RESTRICT srcD const UINT32 mix = 0xFFFFFF; const char* start = (const char*)srcData; const char* line = start + 4ULL * width * start_line; - const char* last_line = NULL; + const char* last_line = nullptr; while ((line >= start) && (out_count < 32768)) { @@ -640,7 +640,7 @@ static inline SSIZE_T freerdp_bitmap_compress_24(const void* WINPR_RESTRICT srcD } /* can't take fix, mix, or fom past first line */ - if (last_line == 0) + if (last_line == nullptr) { if (counts.fill_count > 3 && counts.fill_count >= counts.color_count && counts.fill_count >= counts.bicolor_count && @@ -790,7 +790,7 @@ static inline SSIZE_T freerdp_bitmap_compress_16(const void* WINPR_RESTRICT srcD const UINT32 mix = (bpp == 15) ? 0xBA1F : 0xFFFF; const char* start = (const char*)srcData; const char* line = start + 2ULL * width * start_line; - const char* last_line = NULL; + const char* last_line = nullptr; while ((line >= start) && (out_count < 32768)) { @@ -961,7 +961,7 @@ static inline SSIZE_T freerdp_bitmap_compress_16(const void* WINPR_RESTRICT srcD } /* can't take fix, mix, or fom past first line */ - if (last_line == 0) + if (last_line == nullptr) { if (counts.fill_count > 3 && counts.fill_count >= counts.color_count && counts.fill_count >= counts.bicolor_count && diff --git a/libfreerdp/codec/bulk.c b/libfreerdp/codec/bulk.c index e2e2e6a73..875d2dd70 100644 --- a/libfreerdp/codec/bulk.c +++ b/libfreerdp/codec/bulk.c @@ -78,7 +78,7 @@ static UINT32 bulk_compression_level(rdpBulk* WINPR_RESTRICT bulk) { WINPR_ASSERT(bulk); WINPR_ASSERT(bulk->context); - rdpSettings* settings = bulk->context->settings; + const rdpSettings* settings = bulk->context->settings; WINPR_ASSERT(settings); bulk->CompressionLevel = (settings->CompressionLevel >= PACKET_COMPR_TYPE_RDP61) ? PACKET_COMPR_TYPE_RDP61 @@ -104,8 +104,8 @@ static inline int bulk_compress_validate(rdpBulk* bulk, const BYTE* pSrcData, UI const BYTE* pDstData, UINT32 DstSize, UINT32 Flags) { int status; - const BYTE* v_pSrcData = NULL; - const BYTE* v_pDstData = NULL; + const BYTE* v_pSrcData = nullptr; + const BYTE* v_pDstData = nullptr; UINT32 v_SrcSize = 0; UINT32 v_DstSize = 0; UINT32 v_Flags = 0; @@ -338,7 +338,7 @@ void bulk_reset(rdpBulk* WINPR_RESTRICT bulk) rdpBulk* bulk_new(rdpContext* context) { - rdpBulk* bulk = NULL; + rdpBulk* bulk = nullptr; WINPR_ASSERT(context); bulk = (rdpBulk*)calloc(1, sizeof(rdpBulk)); @@ -373,7 +373,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC bulk_free(bulk); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void bulk_free(rdpBulk* bulk) diff --git a/libfreerdp/codec/clear.c b/libfreerdp/codec/clear.c index c33b5e415..67ae4f365 100644 --- a/libfreerdp/codec/clear.c +++ b/libfreerdp/codec/clear.c @@ -365,7 +365,7 @@ static BOOL clear_decompress_residual_data(CLEAR_CONTEXT* WINPR_RESTRICT clear, { UINT32 nSrcStep = 0; UINT32 suboffset = 0; - BYTE* dstBuffer = NULL; + BYTE* dstBuffer = nullptr; UINT32 pixelIndex = 0; UINT32 pixelCount = 0; @@ -584,7 +584,7 @@ static BOOL resize_vbar_entry(CLEAR_CONTEXT* WINPR_RESTRICT clear, if (!vBarEntry->pixels && vBarEntry->size) { - WLog_ERR(TAG, "vBarEntry->pixels is NULL but vBarEntry->size is %" PRIu32 "", + WLog_ERR(TAG, "vBarEntry->pixels is nullptr but vBarEntry->size is %" PRIu32 "", vBarEntry->size); return FALSE; } @@ -651,10 +651,10 @@ static BOOL clear_decompress_bands_data(CLEAR_CONTEXT* WINPR_RESTRICT clear, for (UINT32 i = 0; i < vBarCount; i++) { UINT32 vBarHeight = 0; - CLEAR_VBAR_ENTRY* vBarEntry = NULL; - CLEAR_VBAR_ENTRY* vBarShortEntry = NULL; + CLEAR_VBAR_ENTRY* vBarEntry = nullptr; + CLEAR_VBAR_ENTRY* vBarShortEntry = nullptr; BOOL vBarUpdate = FALSE; - const BYTE* cpSrcPixel = NULL; + const BYTE* cpSrcPixel = nullptr; if (!Stream_CheckAndLogRequiredLength(TAG, s, 2)) return FALSE; @@ -770,8 +770,8 @@ static BOOL clear_decompress_bands_data(CLEAR_CONTEXT* WINPR_RESTRICT clear, if (vBarUpdate) { - BYTE* pSrcPixel = NULL; - BYTE* dstBuffer = NULL; + BYTE* pSrcPixel = nullptr; + BYTE* dstBuffer = nullptr; if (clear->VBarStorageCursor >= CLEARCODEC_VBAR_SIZE) { @@ -891,7 +891,7 @@ static BOOL clear_decompress_bands_data(CLEAR_CONTEXT* WINPR_RESTRICT clear, &pDstData[((nYDstRel + y) * nDstStep) + ((nXDstRel + i) * FreeRDPGetBytesPerPixel(DstFormat))]; UINT32 color = FreeRDPReadColor(cpSrcPixel, clear->format); - color = FreeRDPConvertColor(color, clear->format, DstFormat, NULL); + color = FreeRDPConvertColor(color, clear->format, DstFormat, nullptr); if (!FreeRDPWriteColor(pDstPixel8, DstFormat, color)) return FALSE; @@ -916,7 +916,7 @@ static BOOL clear_decompress_glyph_data(CLEAR_CONTEXT* WINPR_RESTRICT clear, UINT16 glyphIndex = 0; if (ppGlyphData) - *ppGlyphData = NULL; + *ppGlyphData = nullptr; if ((glyphFlags & CLEARCODEC_FLAG_GLYPH_HIT) && !(glyphFlags & CLEARCODEC_FLAG_GLYPH_INDEX)) { @@ -948,11 +948,11 @@ static BOOL clear_decompress_glyph_data(CLEAR_CONTEXT* WINPR_RESTRICT clear, { UINT32 nSrcStep = 0; CLEAR_GLYPH_ENTRY* glyphEntry = &(clear->GlyphCache[glyphIndex]); - BYTE* glyphData = NULL; + BYTE* glyphData = nullptr; if (!glyphEntry) { - WLog_ERR(TAG, "clear->GlyphCache[%" PRIu16 "]=NULL", glyphIndex); + WLog_ERR(TAG, "clear->GlyphCache[%" PRIu16 "]=nullptr", glyphIndex); return FALSE; } @@ -960,7 +960,7 @@ static BOOL clear_decompress_glyph_data(CLEAR_CONTEXT* WINPR_RESTRICT clear, if (!glyphData) { - WLog_ERR(TAG, "clear->GlyphCache[%" PRIu16 "]->pixels=NULL", glyphIndex); + WLog_ERR(TAG, "clear->GlyphCache[%" PRIu16 "]->pixels=nullptr", glyphIndex); return FALSE; } @@ -1001,7 +1001,7 @@ static BOOL clear_decompress_glyph_data(CLEAR_CONTEXT* WINPR_RESTRICT clear, if (!glyphEntry->pixels) { - WLog_ERR(TAG, "glyphEntry->pixels=NULL"); + WLog_ERR(TAG, "glyphEntry->pixels=nullptr"); return FALSE; } @@ -1036,8 +1036,8 @@ INT32 clear_decompress(CLEAR_CONTEXT* WINPR_RESTRICT clear, const BYTE* WINPR_RE UINT32 bandsByteCount = 0; UINT32 subcodecByteCount = 0; wStream sbuffer = WINPR_C_ARRAY_INIT; - wStream* s = NULL; - BYTE* glyphData = NULL; + wStream* s = nullptr; + BYTE* glyphData = nullptr; if (!pDstData) return -1002; @@ -1242,7 +1242,7 @@ CLEAR_CONTEXT* clear_context_new(BOOL Compressor) CLEAR_CONTEXT* clear = (CLEAR_CONTEXT*)winpr_aligned_calloc(1, sizeof(CLEAR_CONTEXT), 32); if (!clear) - return NULL; + return nullptr; clear->Compressor = Compressor; clear->nsc = nsc_context_new(); @@ -1268,7 +1268,7 @@ error_nsc: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC clear_context_free(clear); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void clear_context_free(CLEAR_CONTEXT* WINPR_RESTRICT clear) diff --git a/libfreerdp/codec/color.c b/libfreerdp/codec/color.c index aa1095705..10fe3be24 100644 --- a/libfreerdp/codec/color.c +++ b/libfreerdp/codec/color.c @@ -82,7 +82,7 @@ static void dump_uint_data(FILE* fp, const uint32_t* data, size_t len) static void dump_write_header(const char* path, const char* prefix) { - char* header = NULL; + char* header = nullptr; size_t headerlen = 0; winpr_asprintf(&header, &headerlen, "%s.h", path); if (!header) @@ -119,7 +119,7 @@ static void dump_write_c_file(const char* path, const char* prefix, UINT32 nXDst const uint32_t bpp = FreeRDPGetBytesPerPixel(format); const uint32_t step = nWidth * bpp; - char* header = NULL; + char* header = nullptr; size_t headerlen = 0; winpr_asprintf(&header, &headerlen, "%s.c", path); if (!header) @@ -162,12 +162,12 @@ static void dump_write_c_file(const char* path, const char* prefix, UINT32 nXDst (void)fprintf(fp, "\n"); (void)fprintf(fp, "const rdpPointer %s_pointer = {\n", prefix); (void)fprintf(fp, ".size = 0,\n"); - (void)fprintf(fp, ".New = NULL,\n"); - (void)fprintf(fp, ".Free = NULL,\n"); - (void)fprintf(fp, ".Set = NULL,\n"); - (void)fprintf(fp, ".SetNull = NULL,\n"); - (void)fprintf(fp, ".SetDefault = NULL,\n"); - (void)fprintf(fp, ".SetPosition = NULL,\n"); + (void)fprintf(fp, ".New = nullptr,\n"); + (void)fprintf(fp, ".Free = nullptr,\n"); + (void)fprintf(fp, ".Set = nullptr,\n"); + (void)fprintf(fp, ".SetNull = nullptr,\n"); + (void)fprintf(fp, ".SetDefault = nullptr,\n"); + (void)fprintf(fp, ".SetPosition = nullptr,\n"); (void)fprintf(fp, ".paddingA = {0},\n"); (void)fprintf(fp, ".xPos = %" PRIu32 ",\n", nXDst); (void)fprintf(fp, ".yPos = %" PRIu32 ",\n", nYDst); @@ -197,7 +197,7 @@ static void dump_write_c_file(const char* path, const char* prefix, UINT32 nXDst img->width = nWidth; img->scanline = step; img->type = WINPR_IMAGE_PNG; - char* imgname = NULL; + char* imgname = nullptr; size_t imgnamesize = 0; winpr_asprintf(&imgname, &imgnamesize, "%s.png", path); if (imgname) @@ -262,17 +262,17 @@ BYTE* freerdp_glyph_convert_ex(UINT32 width, UINT32 height, const BYTE* WINPR_RE const size_t scanline = (width + 7ull) / 8ull; const size_t required = scanline * height; if (len < required) - return NULL; + return nullptr; if ((len == 0) || (width == 0) || (height == 0)) - return NULL; + return nullptr; WINPR_ASSERT(data); BYTE* dstData = (BYTE*)winpr_aligned_malloc(1ull * width * height, 16); if (!dstData) - return NULL; + return nullptr; ZeroMemory(dstData, 1ULL * width * height); BYTE* dstp = dstData; @@ -499,7 +499,7 @@ BOOL freerdp_image_copy_from_icon_data(BYTE* WINPR_RESTRICT pDstData, UINT32 Dst /* read color back, add alpha and write it back */ UINT32 color = FreeRDPReadColor_int(dstBuf, DstFormat); - FreeRDPSplitColor(color, DstFormat, &r, &g, &b, NULL, &palette); + FreeRDPSplitColor(color, DstFormat, &r, &g, &b, nullptr, &palette); color = FreeRDPGetColor(DstFormat, r, g, b, alpha); if (!FreeRDPWriteColor_int(dstBuf, DstFormat, color)) return FALSE; @@ -551,8 +551,8 @@ static BOOL freerdp_image_copy_from_pointer_data_1bpp( for (UINT32 y = 0; y < nHeight; y++) { - const BYTE* andBits = NULL; - const BYTE* xorBits = NULL; + const BYTE* andBits = nullptr; + const BYTE* xorBits = nullptr; BYTE* pDstPixel = &pDstData[((1ULL * nYDst + y) * nDstStep) + (1ULL * nXDst * FreeRDPGetBytesPerPixel(DstFormat))]; xorBit = andBit = 0x80; @@ -650,8 +650,8 @@ static BOOL freerdp_image_copy_from_pointer_data_xbpp( for (UINT32 y = 0; y < nHeight; y++) { - const BYTE* xorBits = NULL; - const BYTE* andBits = NULL; + const BYTE* xorBits = nullptr; + const BYTE* andBits = nullptr; BYTE* pDstPixel = &pDstData[((1ULL * nYDst + y) * nDstStep) + (1ULL * nXDst * FreeRDPGetBytesPerPixel(DstFormat))]; andBit = 0x80; @@ -1150,8 +1150,8 @@ BOOL freerdp_image_fill(BYTE* WINPR_RESTRICT pDstData, DWORD DstFormat, UINT32 n if ((nWidth == 0) || (nHeight == 0)) return TRUE; const UINT32 bpp = FreeRDPGetBytesPerPixel(DstFormat); - BYTE* WINPR_RESTRICT pFirstDstLine = NULL; - BYTE* WINPR_RESTRICT pFirstDstLineXOffset = NULL; + BYTE* WINPR_RESTRICT pFirstDstLine = nullptr; + BYTE* WINPR_RESTRICT pFirstDstLineXOffset = nullptr; if (nDstStep == 0) nDstStep = (nXDst + nWidth) * FreeRDPGetBytesPerPixel(DstFormat); @@ -1185,7 +1185,7 @@ BOOL freerdp_image_fill_ex(BYTE* WINPR_RESTRICT pDstData, DWORD DstFormat, UINT3 BYTE r = 0; BYTE g = 0; BYTE b = 0; - FreeRDPSplitColor(color, DstFormat, &r, &g, &b, NULL, NULL); + FreeRDPSplitColor(color, DstFormat, &r, &g, &b, nullptr, nullptr); for (size_t y = 0; y < nHeight; y++) { @@ -1196,7 +1196,7 @@ BOOL freerdp_image_fill_ex(BYTE* WINPR_RESTRICT pDstData, DWORD DstFormat, UINT3 BYTE* WINPR_RESTRICT dst = &line[x * bpp]; const UINT32 dcolor = FreeRDPReadColor_int(dst, DstFormat); BYTE a = 0; - FreeRDPSplitColor(dcolor, DstFormat, NULL, NULL, NULL, &a, NULL); + FreeRDPSplitColor(dcolor, DstFormat, nullptr, nullptr, nullptr, &a, nullptr); const UINT32 scolor = FreeRDPGetColor(DstFormat, r, g, b, a); if (!FreeRDPWriteColor_int(dst, DstFormat, scolor)) return FALSE; @@ -1253,13 +1253,13 @@ BOOL freerdp_image_scale(BYTE* WINPR_RESTRICT pDstData, DWORD DstFormat, UINT32 { return freerdp_image_copy_no_overlap(pDstData, DstFormat, nDstStep, nXDst, nYDst, nDstWidth, nDstHeight, pSrcData, SrcFormat, nSrcStep, nXSrc, - nYSrc, NULL, FREERDP_FLIP_NONE); + nYSrc, nullptr, FREERDP_FLIP_NONE); } else #if defined(WITH_SWSCALE) { int res = 0; - struct SwsContext* resize = NULL; + struct SwsContext* resize = nullptr; enum AVPixelFormat srcFormat = av_format_for_buffer(SrcFormat); enum AVPixelFormat dstFormat = av_format_for_buffer(DstFormat); const int srcStep[1] = { (int)nSrcStep }; @@ -1268,8 +1268,9 @@ BOOL freerdp_image_scale(BYTE* WINPR_RESTRICT pDstData, DWORD DstFormat, UINT32 if ((srcFormat == AV_PIX_FMT_NONE) || (dstFormat == AV_PIX_FMT_NONE)) return FALSE; - resize = sws_getContext((int)nSrcWidth, (int)nSrcHeight, srcFormat, (int)nDstWidth, - (int)nDstHeight, dstFormat, SWS_BILINEAR, NULL, NULL, NULL); + resize = + sws_getContext((int)nSrcWidth, (int)nSrcHeight, srcFormat, (int)nDstWidth, + (int)nDstHeight, dstFormat, SWS_BILINEAR, nullptr, nullptr, nullptr); if (!resize) goto fail; @@ -1729,7 +1730,7 @@ void FreeRDPSplitColor(UINT32 color, UINT32 format, BYTE* _r, BYTE* _g, BYTE* _b if (color <= 0xFF) { tmp = palette->palette[color]; - FreeRDPSplitColor(tmp, palette->format, _r, _g, _b, _a, NULL); + FreeRDPSplitColor(tmp, palette->format, _r, _g, _b, _a, nullptr); } else { @@ -1897,7 +1898,7 @@ BOOL freerdp_image_copy_no_overlap(BYTE* WINPR_RESTRICT pDstData, DWORD DstForma UINT32 nSrcStep, UINT32 nXSrc, UINT32 nYSrc, const gdiPalette* WINPR_RESTRICT palette, UINT32 flags) { - static primitives_t* prims = NULL; + static primitives_t* prims = nullptr; if (!prims) prims = primitives_get(); diff --git a/libfreerdp/codec/dsp.c b/libfreerdp/codec/dsp.c index ca5ec6c17..8ba3d502d 100644 --- a/libfreerdp/codec/dsp.c +++ b/libfreerdp/codec/dsp.c @@ -1126,7 +1126,7 @@ FREERDP_DSP_CONTEXT* freerdp_dsp_context_new(BOOL encoder) FREERDP_DSP_CONTEXT* context = calloc(1, sizeof(FREERDP_DSP_CONTEXT)); if (!context) - return NULL; + return nullptr; if (!freerdp_dsp_common_context_init(&context->common, encoder)) goto fail; @@ -1178,7 +1178,7 @@ FREERDP_DSP_CONTEXT* freerdp_dsp_context_new(BOOL encoder) return context; fail: freerdp_dsp_context_free(context); - return NULL; + return nullptr; #endif } @@ -1262,7 +1262,7 @@ BOOL freerdp_dsp_encode(FREERDP_DSP_CONTEXT* WINPR_RESTRICT context, return FALSE; AUDIO_FORMAT format = *srcFormat; - const BYTE* resampleData = NULL; + const BYTE* resampleData = nullptr; size_t resampleLength = 0; if (!freerdp_dsp_channel_mix(context, pdata, length, srcFormat, &resampleData, &resampleLength)) @@ -1270,7 +1270,7 @@ BOOL freerdp_dsp_encode(FREERDP_DSP_CONTEXT* WINPR_RESTRICT context, format.nChannels = context->common.format.nChannels; - const BYTE* data = NULL; + const BYTE* data = nullptr; if (!freerdp_dsp_resample(context, resampleData, resampleLength, &format, &data, &length)) return FALSE; @@ -1570,7 +1570,7 @@ BOOL freerdp_dsp_context_reset(FREERDP_DSP_CONTEXT* WINPR_RESTRICT context, soxr_delete(context->sox); context->sox = soxr_create(context->common.format.nSamplesPerSec, targetFormat->nSamplesPerSec, - targetFormat->nChannels, &error, &iospec, NULL, NULL); + targetFormat->nChannels, &error, &iospec, nullptr, nullptr); if (!context->sox || (error != 0)) return FALSE; @@ -1584,15 +1584,15 @@ BOOL freerdp_dsp_common_context_init(FREERDP_DSP_COMMON_CONTEXT* context, BOOL e { WINPR_ASSERT(context); context->encoder = encode; - context->buffer = Stream_New(NULL, 1024); + context->buffer = Stream_New(nullptr, 1024); if (!context->buffer) goto fail; - context->channelmix = Stream_New(NULL, 1024); + context->channelmix = Stream_New(nullptr, 1024); if (!context->channelmix) goto fail; - context->resample = Stream_New(NULL, 1024); + context->resample = Stream_New(nullptr, 1024); if (!context->resample) goto fail; @@ -1611,7 +1611,7 @@ void freerdp_dsp_common_context_uninit(FREERDP_DSP_COMMON_CONTEXT* context) Stream_Free(context->channelmix, TRUE); Stream_Free(context->resample, TRUE); - context->buffer = NULL; - context->channelmix = NULL; - context->resample = NULL; + context->buffer = nullptr; + context->channelmix = nullptr; + context->resample = nullptr; } diff --git a/libfreerdp/codec/dsp_fdk_impl.c b/libfreerdp/codec/dsp_fdk_impl.c index d2f3442f7..d3d7e7f21 100644 --- a/libfreerdp/codec/dsp_fdk_impl.c +++ b/libfreerdp/codec/dsp_fdk_impl.c @@ -29,6 +29,10 @@ #include "dsp_fdk_impl.h" +#if (defined(__STDC_VERSION__) && (__STDC_VERSION__ < 202003L)) +#define nullptr NULL +#endif + #define WLOG_TRACE 0 #define WLOG_DEBUG 1 #define WLOG_INFO 2 @@ -319,7 +323,7 @@ int fdk_aac_dsp_impl_init(void** handle, int encoder, fdk_log_fkt_t log) else { HANDLE_AACDECODER* h = (HANDLE_AACDECODER*)handle; - assert(NULL == *h); + assert(nullptr == *h); *h = aacDecoder_Open(TT_MP4_RAW, 1); if (!*h) @@ -350,7 +354,7 @@ void fdk_aac_dsp_impl_uninit(void** handle, int encoder, fdk_log_fkt_t log) aacDecoder_Close(*h); } - *handle = NULL; + *handle = nullptr; } ssize_t fdk_aac_dsp_impl_decode_read(void* handle, void* dst, size_t dstSize, fdk_log_fkt_t log) @@ -427,7 +431,7 @@ int fdk_aac_dsp_impl_config(void* handle, size_t* pbuffersize, int encoder, unsi { AACENC_BITRATE, bytes_per_second * 8 }, { AACENC_TRANSMUX, 0 }, { AACENC_AFTERBURNER, 1 } }; - HANDLE_AACENCODER self = NULL; + HANDLE_AACENCODER self = nullptr; if (encoder) self = (HANDLE_AACENCODER)handle; else @@ -453,7 +457,7 @@ int fdk_aac_dsp_impl_config(void* handle, size_t* pbuffersize, int encoder, unsi } } - AACENC_ERROR err = aacEncEncode(self, NULL, NULL, NULL, NULL); + AACENC_ERROR err = aacEncEncode(self, nullptr, nullptr, nullptr, nullptr); if (err != AACENC_OK) { log(WLOG_ERROR, "aacEncEncode failed with %s", enc_err_str(err)); diff --git a/libfreerdp/codec/dsp_ffmpeg.c b/libfreerdp/codec/dsp_ffmpeg.c index dd15c48e7..98f74db48 100644 --- a/libfreerdp/codec/dsp_ffmpeg.c +++ b/libfreerdp/codec/dsp_ffmpeg.c @@ -209,20 +209,20 @@ static void ffmpeg_close_context(FREERDP_DSP_CONTEXT* WINPR_RESTRICT context) } context->id = AV_CODEC_ID_NONE; - context->codec = NULL; + context->codec = nullptr; context->isOpen = FALSE; - context->context = NULL; - context->frame = NULL; - context->resampled = NULL; - context->packet = NULL; - context->rcontext = NULL; + context->context = nullptr; + context->frame = nullptr; + context->resampled = nullptr; + context->packet = nullptr; + context->rcontext = nullptr; } } static void ffmpeg_setup_resample_frame(FREERDP_DSP_CONTEXT* WINPR_RESTRICT context, const AUDIO_FORMAT* WINPR_RESTRICT format) { - if (context->resampled->buf[0] != NULL) + if (context->resampled->buf[0] != nullptr) av_frame_unref(context->resampled); if (context->common.encoder) @@ -313,7 +313,7 @@ static BOOL ffmpeg_open_context(FREERDP_DSP_CONTEXT* WINPR_RESTRICT context) context->context->sample_fmt = ffmpeg_sample_format(format); context->context->time_base = av_make_q(1, context->context->sample_rate); - if ((ret = avcodec_open2(context->context, context->codec, NULL)) < 0) + if ((ret = avcodec_open2(context->context, context->codec, nullptr)) < 0) { const char* err = av_err2str(ret); WLog_ERR(TAG, "Error avcodec_open2 %s [%d]", err, ret); @@ -662,14 +662,14 @@ BOOL freerdp_dsp_ffmpeg_supports_format(const AUDIO_FORMAT* WINPR_RESTRICT forma return FALSE; if (encode) - return avcodec_find_encoder(id) != NULL; + return avcodec_find_encoder(id) != nullptr; else - return avcodec_find_decoder(id) != NULL; + return avcodec_find_decoder(id) != nullptr; } FREERDP_DSP_CONTEXT* freerdp_dsp_ffmpeg_context_new(BOOL encode) { - FREERDP_DSP_CONTEXT* context = NULL; + FREERDP_DSP_CONTEXT* context = nullptr; #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100) avcodec_register_all(); #endif @@ -688,7 +688,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC freerdp_dsp_ffmpeg_context_free(context); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void freerdp_dsp_ffmpeg_context_free(FREERDP_DSP_CONTEXT* context) @@ -817,7 +817,7 @@ BOOL freerdp_dsp_ffmpeg_encode(FREERDP_DSP_CONTEXT* WINPR_RESTRICT context, * * we get noisy data with channel transformation, so do it ourselves. */ - const BYTE* data = NULL; + const BYTE* data = nullptr; if (!freerdp_dsp_channel_mix(context, sdata, length, format, &data, &length, &fmt)) return FALSE; diff --git a/libfreerdp/codec/h264.c b/libfreerdp/codec/h264.c index bb9c44179..171e53892 100644 --- a/libfreerdp/codec/h264.c +++ b/libfreerdp/codec/h264.c @@ -212,7 +212,7 @@ static BOOL detect_changes(BOOL firstFrameDone, const UINT32 QP, const RECTANGLE size_t count = 0; size_t wc = 0; size_t hc = 0; - RECTANGLE_16* rectangles = NULL; + RECTANGLE_16* rectangles = nullptr; if (!regionRect || !pYUVData || !pOldYUVData || !iStride || !meta) return FALSE; @@ -348,12 +348,12 @@ INT32 avc444_compress(H264_CONTEXT* h264, const BYTE* pSrcData, DWORD SrcFormat, RDPGFX_H264_METABLOCK* auxMeta) { int rc = -1; - BYTE* coded = NULL; + BYTE* coded = nullptr; UINT32 codedSize = 0; - BYTE** pYUV444Data = NULL; - BYTE** pOldYUV444Data = NULL; - BYTE** pYUVData = NULL; - BYTE** pOldYUVData = NULL; + BYTE** pYUV444Data = nullptr; + BYTE** pOldYUV444Data = nullptr; + BYTE** pYUVData = nullptr; + BYTE** pOldYUVData = nullptr; if (!h264 || !h264->Compressor) return -1; @@ -677,8 +677,8 @@ static BOOL h264_context_init(H264_CONTEXT* h264) if (!h264) return FALSE; - h264->subsystem = NULL; - InitOnceExecuteOnce(&subsystems_once, h264_register_subsystems, NULL, NULL); + h264->subsystem = nullptr; + InitOnceExecuteOnce(&subsystems_once, h264_register_subsystems, nullptr, nullptr); for (size_t i = 0; i < MAX_SUBSYSTEMS; i++) { @@ -717,7 +717,7 @@ H264_CONTEXT* h264_context_new(BOOL Compressor) { H264_CONTEXT* h264 = (H264_CONTEXT*)calloc(1, sizeof(H264_CONTEXT)); if (!h264) - return NULL; + return nullptr; h264->log = WLog_Get(TAG); @@ -746,7 +746,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC h264_context_free(h264); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void h264_context_free(H264_CONTEXT* h264) diff --git a/libfreerdp/codec/h264_ffmpeg.c b/libfreerdp/codec/h264_ffmpeg.c index fb901a4ed..98b8b5e66 100644 --- a/libfreerdp/codec/h264_ffmpeg.c +++ b/libfreerdp/codec/h264_ffmpeg.c @@ -93,7 +93,7 @@ typedef struct static void libavcodec_destroy_encoder_context(H264_CONTEXT* WINPR_RESTRICT h264) { - H264_CONTEXT_LIBAVCODEC* sys = NULL; + H264_CONTEXT_LIBAVCODEC* sys = nullptr; if (!h264 || !h264->subsystem) return; @@ -110,15 +110,15 @@ static void libavcodec_destroy_encoder_context(H264_CONTEXT* WINPR_RESTRICT h264 #endif } - sys->codecEncoderContext = NULL; + sys->codecEncoderContext = nullptr; } #ifdef WITH_VAAPI_H264_ENCODING static int set_hw_frames_ctx(H264_CONTEXT* WINPR_RESTRICT h264) { H264_CONTEXT_LIBAVCODEC* sys = (H264_CONTEXT_LIBAVCODEC*)h264->pSystemData; - AVBufferRef* hw_frames_ref = NULL; - AVHWFramesContext* frames_ctx = NULL; + AVBufferRef* hw_frames_ref = nullptr; + AVHWFramesContext* frames_ctx = nullptr; int err = 0; if (!(hw_frames_ref = av_hwframe_ctx_alloc(sys->hwctx))) @@ -153,7 +153,7 @@ static int set_hw_frames_ctx(H264_CONTEXT* WINPR_RESTRICT h264) static BOOL libavcodec_create_encoder_context(H264_CONTEXT* WINPR_RESTRICT h264) { BOOL recreate = FALSE; - H264_CONTEXT_LIBAVCODEC* sys = NULL; + H264_CONTEXT_LIBAVCODEC* sys = nullptr; if (!h264 || !h264->subsystem) return FALSE; @@ -232,7 +232,7 @@ static BOOL libavcodec_create_encoder_context(H264_CONTEXT* WINPR_RESTRICT h264) sys->codecEncoderContext->pix_fmt = AV_PIX_FMT_YUV420P; } - if (avcodec_open2(sys->codecEncoderContext, sys->codecEncoder, NULL) < 0) + if (avcodec_open2(sys->codecEncoderContext, sys->codecEncoder, nullptr) < 0) goto EXCEPTION; return TRUE; @@ -252,7 +252,7 @@ static int libavcodec_decompress(H264_CONTEXT* WINPR_RESTRICT h264, int rc = -1; int status = 0; int gotFrame = 0; - AVPacket* packet = NULL; + AVPacket* packet = nullptr; WINPR_ASSERT(h264); WINPR_ASSERT(pSrcData || (SrcSize == 0)); @@ -411,7 +411,7 @@ static int libavcodec_compress(H264_CONTEXT* WINPR_RESTRICT h264, } WINPR_ASSERT(sys->packet); - sys->packet->data = NULL; + sys->packet->data = nullptr; sys->packet->size = 0; WINPR_ASSERT(sys->videoFrame); @@ -598,7 +598,7 @@ static void libavcodec_uninit(H264_CONTEXT* h264) libavcodec_destroy_encoder_context(h264); free(sys); - h264->pSystemData = NULL; + h264->pSystemData = nullptr; } #ifdef WITH_VAAPI @@ -659,7 +659,7 @@ static enum AVPixelFormat libavcodec_get_format(struct AVCodecContext* ctx, static BOOL libavcodec_init(H264_CONTEXT* h264) { - H264_CONTEXT_LIBAVCODEC* sys = NULL; + H264_CONTEXT_LIBAVCODEC* sys = nullptr; WINPR_ASSERT(h264); sys = (H264_CONTEXT_LIBAVCODEC*)calloc(1, sizeof(H264_CONTEXT_LIBAVCODEC)); @@ -704,15 +704,15 @@ static BOOL libavcodec_init(H264_CONTEXT* h264) if (!sys->hwctx) { - int ret = - av_hwdevice_ctx_create(&sys->hwctx, AV_HWDEVICE_TYPE_VAAPI, VAAPI_DEVICE, NULL, 0); + int ret = av_hwdevice_ctx_create(&sys->hwctx, AV_HWDEVICE_TYPE_VAAPI, VAAPI_DEVICE, + nullptr, 0); if (ret < 0) { WLog_Print(h264->log, WLOG_ERROR, "Could not initialize hardware decoder, falling back to software: %s", av_err2str(ret)); - sys->hwctx = NULL; + sys->hwctx = nullptr; goto fail_hwdevice_create; } } @@ -727,7 +727,7 @@ static BOOL libavcodec_init(H264_CONTEXT* h264) fail_hwdevice_create: #endif - if (avcodec_open2(sys->codecDecoderContext, sys->codecDecoder, NULL) < 0) + if (avcodec_open2(sys->codecDecoderContext, sys->codecDecoder, nullptr) < 0) { WLog_Print(h264->log, WLOG_ERROR, "Failed to open libav codec"); goto EXCEPTION; @@ -751,12 +751,12 @@ static BOOL libavcodec_init(H264_CONTEXT* h264) { WLog_Print(h264->log, WLOG_ERROR, "H264 VAAPI encoder not found"); } - else if (av_hwdevice_ctx_create(&sys->hwctx, AV_HWDEVICE_TYPE_VAAPI, VAAPI_DEVICE, NULL, - 0) < 0) + else if (av_hwdevice_ctx_create(&sys->hwctx, AV_HWDEVICE_TYPE_VAAPI, VAAPI_DEVICE, + nullptr, 0) < 0) { WLog_Print(h264->log, WLOG_ERROR, "av_hwdevice_ctx_create failed"); - sys->codecEncoder = NULL; - sys->hwctx = NULL; + sys->codecEncoder = nullptr; + sys->hwctx = nullptr; } else { diff --git a/libfreerdp/codec/h264_mediacodec.c b/libfreerdp/codec/h264_mediacodec.c index ae6d76a2f..ee84f6b84 100644 --- a/libfreerdp/codec/h264_mediacodec.c +++ b/libfreerdp/codec/h264_mediacodec.c @@ -54,10 +54,10 @@ static AMediaFormat* mediacodec_format_new(wLog* log, int width, int height) { const char* media_format; AMediaFormat* format = AMediaFormat_new(); - if (format == NULL) + if (format == nullptr) { WLog_Print(log, WLOG_ERROR, "AMediaFormat_new failed"); - return NULL; + return nullptr; } AMediaFormat_setString(format, AMEDIAFORMAT_KEY_MIME, CODEC_NAME); @@ -66,11 +66,11 @@ static AMediaFormat* mediacodec_format_new(wLog* log, int width, int height) AMediaFormat_setInt32(format, AMEDIAFORMAT_KEY_COLOR_FORMAT, COLOR_FormatYUV420Planar); media_format = AMediaFormat_toString(format); - if (media_format == NULL) + if (media_format == nullptr) { WLog_Print(log, WLOG_ERROR, "AMediaFormat_toString failed"); AMediaFormat_delete(format); - return NULL; + return nullptr; } WLog_Print(log, WLOG_DEBUG, "MediaCodec configuring with desired output format [%s]", @@ -94,7 +94,7 @@ static void set_mediacodec_format(H264_CONTEXT* h264, AMediaFormat** formatVaria if (*formatVariable == newFormat) return; - if (*formatVariable != NULL) + if (*formatVariable != nullptr) { status = AMediaFormat_delete(*formatVariable); if (status != AMEDIA_OK) @@ -119,7 +119,7 @@ static int update_mediacodec_inputformat(H264_CONTEXT* h264) #if __ANDROID__ >= 21 inputFormat = AMediaCodec_getInputFormat(sys->decoder); - if (inputFormat == NULL) + if (inputFormat == nullptr) { WLog_Print(h264->log, WLOG_ERROR, "AMediaCodec_getInputFormat failed"); return -1; @@ -130,7 +130,7 @@ static int update_mediacodec_inputformat(H264_CONTEXT* h264) set_mediacodec_format(h264, &sys->inputFormat, inputFormat); mediaFormatName = AMediaFormat_toString(sys->inputFormat); - if (mediaFormatName == NULL) + if (mediaFormatName == nullptr) { WLog_Print(h264->log, WLOG_ERROR, "AMediaFormat_toString failed"); return -1; @@ -154,7 +154,7 @@ static int update_mediacodec_outputformat(H264_CONTEXT* h264) WINPR_ASSERT(sys); outputFormat = AMediaCodec_getOutputFormat(sys->decoder); - if (outputFormat == NULL) + if (outputFormat == nullptr) { WLog_Print(h264->log, WLOG_ERROR, "AMediaCodec_getOutputFormat failed"); return -1; @@ -162,7 +162,7 @@ static int update_mediacodec_outputformat(H264_CONTEXT* h264) set_mediacodec_format(h264, &sys->outputFormat, outputFormat); mediaFormatName = AMediaFormat_toString(sys->outputFormat); - if (mediaFormatName == NULL) + if (mediaFormatName == nullptr) { WLog_Print(h264->log, WLOG_ERROR, "AMediaFormat_toString failed"); return -1; @@ -302,7 +302,7 @@ static int mediacodec_decompress(H264_CONTEXT* h264, const BYTE* pSrcData, UINT3 } inputBuffer = AMediaCodec_getInputBuffer(sys->decoder, inputBufferId, &inputBufferSize); - if (inputBuffer == NULL) + if (inputBuffer == nullptr) { WLog_Print(h264->log, WLOG_ERROR, "AMediaCodec_getInputBuffer failed"); return -1; @@ -412,7 +412,7 @@ static void mediacodec_uninit(H264_CONTEXT* h264) if (!sys) return; - if (sys->decoder != NULL) + if (sys->decoder != nullptr) { release_current_outputbuffer(h264); status = AMediaCodec_stop(sys->decoder); @@ -427,14 +427,14 @@ static void mediacodec_uninit(H264_CONTEXT* h264) WLog_Print(h264->log, WLOG_ERROR, "Error AMediaCodec_delete %d", status); } - sys->decoder = NULL; + sys->decoder = nullptr; } - set_mediacodec_format(h264, &sys->inputFormat, NULL); - set_mediacodec_format(h264, &sys->outputFormat, NULL); + set_mediacodec_format(h264, &sys->inputFormat, nullptr); + set_mediacodec_format(h264, &sys->outputFormat, nullptr); free(sys); - h264->pSystemData = NULL; + h264->pSystemData = nullptr; } static BOOL mediacodec_init(H264_CONTEXT* h264) @@ -467,7 +467,7 @@ static BOOL mediacodec_init(H264_CONTEXT* h264) sys->width = sys->outputWidth = MEDIACODEC_MINIMUM_WIDTH; sys->height = sys->outputHeight = MEDIACODEC_MINIMUM_HEIGHT; sys->decoder = AMediaCodec_createDecoderByType(CODEC_NAME); - if (sys->decoder == NULL) + if (sys->decoder == nullptr) { WLog_Print(h264->log, WLOG_ERROR, "AMediaCodec_createCodecByName failed"); goto EXCEPTION; @@ -489,7 +489,7 @@ static BOOL mediacodec_init(H264_CONTEXT* h264) set_mediacodec_format(h264, &sys->inputFormat, mediacodec_format_new(h264->log, sys->width, sys->height)); - status = AMediaCodec_configure(sys->decoder, sys->inputFormat, NULL, NULL, 0); + status = AMediaCodec_configure(sys->decoder, sys->inputFormat, nullptr, nullptr, 0); if (status != AMEDIA_OK) { WLog_Print(h264->log, WLOG_ERROR, "AMediaCodec_configure failed: %d", status); diff --git a/libfreerdp/codec/h264_mf.c b/libfreerdp/codec/h264_mf.c index 61b900d08..ca2eaca68 100644 --- a/libfreerdp/codec/h264_mf.c +++ b/libfreerdp/codec/h264_mf.c @@ -98,7 +98,7 @@ static HRESULT mf_find_output_type(H264_CONTEXT_MF* sys, const GUID* guid, DWORD idx = 0; GUID mediaGuid; HRESULT hr = S_OK; - IMFMediaType* pMediaType = NULL; + IMFMediaType* pMediaType = nullptr; while (1) { @@ -130,7 +130,7 @@ static HRESULT mf_create_output_sample(H264_CONTEXT* h264, H264_CONTEXT_MF* sys) if (sys->outputSample) { sys->outputSample->lpVtbl->Release(sys->outputSample); - sys->outputSample = NULL; + sys->outputSample = nullptr; } hr = sys->MFCreateSample(&sys->outputSample); @@ -173,13 +173,13 @@ error: static int mf_decompress(H264_CONTEXT* h264, const BYTE* pSrcData, UINT32 SrcSize) { HRESULT hr; - BYTE* pbBuffer = NULL; + BYTE* pbBuffer = nullptr; DWORD cbMaxLength = 0; DWORD cbCurrentLength = 0; DWORD outputStatus = 0; - IMFSample* inputSample = NULL; - IMFMediaBuffer* inputBuffer = NULL; - IMFMediaBuffer* outputBuffer = NULL; + IMFSample* inputSample = nullptr; + IMFMediaBuffer* inputBuffer = nullptr; + IMFMediaBuffer* outputBuffer = nullptr; MFT_OUTPUT_DATA_BUFFER outputDataBuffer; H264_CONTEXT_MF* sys = (H264_CONTEXT_MF*)h264->pSystemData; UINT32* iStride = h264->iStride; @@ -252,7 +252,7 @@ static int mf_decompress(H264_CONTEXT* h264, const BYTE* pSrcData, UINT32 SrcSiz outputDataBuffer.dwStreamID = 0; outputDataBuffer.dwStatus = 0; - outputDataBuffer.pEvents = NULL; + outputDataBuffer.pEvents = nullptr; outputDataBuffer.pSample = sys->outputSample; hr = sys->transform->lpVtbl->ProcessOutput(sys->transform, 0, 1, &outputDataBuffer, &outputStatus); @@ -265,7 +265,7 @@ static int mf_decompress(H264_CONTEXT* h264, const BYTE* pSrcData, UINT32 SrcSiz if (sys->outputType) { sys->outputType->lpVtbl->Release(sys->outputType); - sys->outputType = NULL; + sys->outputType = nullptr; } hr = mf_find_output_type(sys, &sMFVideoFormat_IYUV, &sys->outputType); @@ -327,7 +327,7 @@ static int mf_decompress(H264_CONTEXT* h264, const BYTE* pSrcData, UINT32 SrcSiz else { int offset = 0; - BYTE* buffer = NULL; + BYTE* buffer = nullptr; DWORD bufferCount = 0; DWORD cbMaxLength = 0; DWORD cbCurrentLength = 0; @@ -401,31 +401,31 @@ static void mf_uninit(H264_CONTEXT* h264) if (sys->transform) { sys->transform->lpVtbl->Release(sys->transform); - sys->transform = NULL; + sys->transform = nullptr; } if (sys->codecApi) { sys->codecApi->lpVtbl->Release(sys->codecApi); - sys->codecApi = NULL; + sys->codecApi = nullptr; } if (sys->inputType) { sys->inputType->lpVtbl->Release(sys->inputType); - sys->inputType = NULL; + sys->inputType = nullptr; } if (sys->outputType) { sys->outputType->lpVtbl->Release(sys->outputType); - sys->outputType = NULL; + sys->outputType = nullptr; } if (sys->outputSample) { sys->outputSample->lpVtbl->Release(sys->outputSample); - sys->outputSample = NULL; + sys->outputSample = nullptr; } if (sys->mfplat) @@ -434,7 +434,7 @@ static void mf_uninit(H264_CONTEXT* h264) sys->MFShutdown(); FreeLibrary(sys->mfplat); - sys->mfplat = NULL; + sys->mfplat = nullptr; if (mf_plat_loaded(sys)) CoUninitialize(); @@ -447,7 +447,7 @@ static void mf_uninit(H264_CONTEXT* h264) memset(h264->iStride, 0, sizeof(h264->iStride)); free(sys); - h264->pSystemData = NULL; + h264->pSystemData = nullptr; } } @@ -478,7 +478,7 @@ static BOOL mf_init(H264_CONTEXT* h264) if (!mf_plat_loaded(sys)) goto error; - CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); if (h264->Compressor) { @@ -494,7 +494,7 @@ static BOOL mf_init(H264_CONTEXT* h264) goto error; } - hr = CoCreateInstance(&sCLSID_CMSH264DecoderMFT, NULL, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&sCLSID_CMSH264DecoderMFT, nullptr, CLSCTX_INPROC_SERVER, &sIID_IMFTransform, (void**)&sys->transform); if (FAILED(hr)) diff --git a/libfreerdp/codec/h264_openh264.c b/libfreerdp/codec/h264_openh264.c index dc32e6c4d..2bbb0efb4 100644 --- a/libfreerdp/codec/h264_openh264.c +++ b/libfreerdp/codec/h264_openh264.c @@ -84,10 +84,10 @@ static int openh264_decompress(H264_CONTEXT* WINPR_RESTRICT h264, { DECODING_STATE state = dsInvalidArgument; SBufferInfo sBufferInfo = WINPR_C_ARRAY_INIT; - SSysMEMBuffer* pSystemBuffer = NULL; - H264_CONTEXT_OPENH264* sys = NULL; - UINT32* iStride = NULL; - BYTE** pYUVData = NULL; + SSysMEMBuffer* pSystemBuffer = nullptr; + H264_CONTEXT_OPENH264* sys = nullptr; + UINT32* iStride = nullptr; + BYTE** pYUVData = nullptr; WINPR_ASSERT(h264); WINPR_ASSERT(pSrcData || (SrcSize == 0)); @@ -107,9 +107,9 @@ static int openh264_decompress(H264_CONTEXT* WINPR_RESTRICT h264, /* * Decompress the image. The RDP host only seems to send I420 format. */ - pYUVData[0] = NULL; - pYUVData[1] = NULL; - pYUVData[2] = NULL; + pYUVData[0] = nullptr; + pYUVData[1] = nullptr; + pYUVData[2] = nullptr; WINPR_ASSERT(sys->pDecoder); state = (*sys->pDecoder) @@ -121,12 +121,14 @@ static int openh264_decompress(H264_CONTEXT* WINPR_RESTRICT h264, if (state == dsNoParamSets) { /* this happens on the first frame due to missing parameter sets */ - state = (*sys->pDecoder)->DecodeFrame2(sys->pDecoder, NULL, 0, pYUVData, &sBufferInfo); + state = + (*sys->pDecoder)->DecodeFrame2(sys->pDecoder, nullptr, 0, pYUVData, &sBufferInfo); } else if (state == dsErrorFree) { /* call DecodeFrame2 again to decode without delay */ - state = (*sys->pDecoder)->DecodeFrame2(sys->pDecoder, NULL, 0, pYUVData, &sBufferInfo); + state = + (*sys->pDecoder)->DecodeFrame2(sys->pDecoder, nullptr, 0, pYUVData, &sBufferInfo); } else { @@ -187,7 +189,7 @@ static int openh264_compress(H264_CONTEXT* WINPR_RESTRICT h264, SFrameBSInfo info = WINPR_C_ARRAY_INIT; SSourcePicture pic = WINPR_C_ARRAY_INIT; - H264_CONTEXT_OPENH264* sys = NULL; + H264_CONTEXT_OPENH264* sys = nullptr; WINPR_ASSERT(h264); WINPR_ASSERT(pYUVData); @@ -413,7 +415,7 @@ static int openh264_compress(H264_CONTEXT* WINPR_RESTRICT h264, static void openh264_uninit(H264_CONTEXT* h264) { - H264_CONTEXT_OPENH264* sysContexts = NULL; + H264_CONTEXT_OPENH264* sysContexts = nullptr; WINPR_ASSERT(h264); @@ -429,14 +431,14 @@ static void openh264_uninit(H264_CONTEXT* h264) { (*sys->pDecoder)->Uninitialize(sys->pDecoder); sysContexts->WelsDestroyDecoder(sys->pDecoder); - sys->pDecoder = NULL; + sys->pDecoder = nullptr; } if (sys->pEncoder) { (*sys->pEncoder)->Uninitialize(sys->pEncoder); sysContexts->WelsDestroySVCEncoder(sys->pEncoder); - sys->pEncoder = NULL; + sys->pEncoder = nullptr; } } @@ -445,7 +447,7 @@ static void openh264_uninit(H264_CONTEXT* h264) FreeLibrary(sysContexts->lib); #endif free(h264->pSystemData); - h264->pSystemData = NULL; + h264->pSystemData = nullptr; } } @@ -485,7 +487,7 @@ static BOOL openh264_load_functionpointers(H264_CONTEXT* h264, const char* name) !sysContexts->WelsGetCodecVersionEx) { FreeLibrary(sysContexts->lib); - sysContexts->lib = NULL; + sysContexts->lib = nullptr; return FALSE; } @@ -502,7 +504,7 @@ static BOOL openh264_load_functionpointers(H264_CONTEXT* h264, const char* name) name, sysContexts->version.uMajor, sysContexts->version.uMinor, sysContexts->version.uRevision); FreeLibrary(sysContexts->lib); - sysContexts->lib = NULL; + sysContexts->lib = nullptr; return FALSE; } @@ -516,7 +518,7 @@ static BOOL openh264_init(H264_CONTEXT* h264) BOOL success = FALSE; #endif long status = 0; - H264_CONTEXT_OPENH264* sysContexts = NULL; + H264_CONTEXT_OPENH264* sysContexts = nullptr; static int traceLevel = WELS_LOG_DEBUG; #if (OPENH264_MAJOR == 1) && (OPENH264_MINOR <= 5) static EVideoFormatType videoFormat = videoFormatI420; diff --git a/libfreerdp/codec/include/bitmap.h b/libfreerdp/codec/include/bitmap.h index 5f4157edf..07874dade 100644 --- a/libfreerdp/codec/include/bitmap.h +++ b/libfreerdp/codec/include/bitmap.h @@ -39,11 +39,11 @@ static inline BYTE* WRITEFGBGIMAGE(BYTE* WINPR_RESTRICT pbDest, if (cBits > 8) { WLog_ERR(TAG, "cBits %" PRIu32 " > 8", cBits); - return NULL; + return nullptr; } if (!ENSURE_CAPACITY(pbDest, pbDestEnd, cBits)) - return NULL; + return nullptr; UNROLL(cBits, { PIXEL data = 0; @@ -74,11 +74,11 @@ static inline BYTE* WRITEFIRSTLINEFGBGIMAGE(BYTE* WINPR_RESTRICT pbDest, if (cBits > 8) { WLog_ERR(TAG, "cBits %" PRIu32 " > 8", cBits); - return NULL; + return nullptr; } if (!ENSURE_CAPACITY(pbDest, pbDestEnd, cBits)) - return NULL; + return nullptr; UNROLL(cBits, { PIXEL data; diff --git a/libfreerdp/codec/interleaved.c b/libfreerdp/codec/interleaved.c index ccbdb0ad3..ec0a6fcf1 100644 --- a/libfreerdp/codec/interleaved.c +++ b/libfreerdp/codec/interleaved.c @@ -586,7 +586,7 @@ BOOL interleaved_decompress(BITMAP_INTERLEAVED_CONTEXT* WINPR_RESTRICT interleav if (!interleaved->TempBuffer) { - WLog_ERR(TAG, "interleaved->TempBuffer=NULL"); + WLog_ERR(TAG, "interleaved->TempBuffer=nullptr"); return FALSE; } @@ -645,7 +645,7 @@ BOOL interleaved_compress(BITMAP_INTERLEAVED_CONTEXT* WINPR_RESTRICT interleaved const gdiPalette* WINPR_RESTRICT palette, UINT32 bpp) { BOOL status = 0; - wStream* s = NULL; + wStream* s = nullptr; UINT32 DstFormat = 0; const UINT32 maxSize = 64 * 64 * 4; @@ -711,14 +711,14 @@ BOOL interleaved_compress(BITMAP_INTERLEAVED_CONTEXT* WINPR_RESTRICT interleaved BOOL bitmap_interleaved_context_reset(BITMAP_INTERLEAVED_CONTEXT* WINPR_RESTRICT interleaved) { - return (interleaved != NULL); + return (interleaved != nullptr); } BITMAP_INTERLEAVED_CONTEXT* bitmap_interleaved_context_new(WINPR_ATTR_UNUSED BOOL Compressor) { - BITMAP_INTERLEAVED_CONTEXT* interleaved = NULL; + BITMAP_INTERLEAVED_CONTEXT* interleaved = nullptr; interleaved = (BITMAP_INTERLEAVED_CONTEXT*)winpr_aligned_recalloc( - NULL, 1, sizeof(BITMAP_INTERLEAVED_CONTEXT), 32); + nullptr, 1, sizeof(BITMAP_INTERLEAVED_CONTEXT), 32); if (interleaved) { @@ -728,7 +728,7 @@ BITMAP_INTERLEAVED_CONTEXT* bitmap_interleaved_context_new(WINPR_ATTR_UNUSED BOO if (!interleaved->TempBuffer) goto fail; - interleaved->bts = Stream_New(NULL, interleaved->TempSize); + interleaved->bts = Stream_New(nullptr, interleaved->TempSize); if (!interleaved->bts) goto fail; @@ -741,7 +741,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC bitmap_interleaved_context_free(interleaved); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void bitmap_interleaved_context_free(BITMAP_INTERLEAVED_CONTEXT* WINPR_RESTRICT interleaved) diff --git a/libfreerdp/codec/mppc.c b/libfreerdp/codec/mppc.c index 446651ba3..67b4aa38d 100644 --- a/libfreerdp/codec/mppc.c +++ b/libfreerdp/codec/mppc.c @@ -89,16 +89,16 @@ int mppc_decompress(MPPC_CONTEXT* mppc, const BYTE* pSrcData, UINT32 SrcSize, const BYTE** ppDstData, UINT32* pDstSize, UINT32 flags) { BYTE Literal = 0; - BYTE* SrcPtr = NULL; + BYTE* SrcPtr = nullptr; UINT32 CopyOffset = 0; UINT32 LengthOfMatch = 0; UINT32 accumulator = 0; - BYTE* HistoryPtr = NULL; - BYTE* HistoryBuffer = NULL; - BYTE* HistoryBufferEnd = NULL; + BYTE* HistoryPtr = nullptr; + BYTE* HistoryBuffer = nullptr; + BYTE* HistoryBufferEnd = nullptr; UINT32 HistoryBufferSize = 0; UINT32 CompressionLevel = 0; - wBitStream* bs = NULL; + wBitStream* bs = nullptr; WINPR_ASSERT(mppc); WINPR_ASSERT(pSrcData); @@ -435,26 +435,26 @@ int mppc_decompress(MPPC_CONTEXT* mppc, const BYTE* pSrcData, UINT32 SrcSize, int mppc_compress(MPPC_CONTEXT* mppc, const BYTE* pSrcData, UINT32 SrcSize, BYTE* pDstBuffer, const BYTE** ppDstData, UINT32* pDstSize, UINT32* pFlags) { - const BYTE* pSrcPtr = NULL; - const BYTE* pSrcEnd = NULL; - BYTE* MatchPtr = NULL; + const BYTE* pSrcPtr = nullptr; + const BYTE* pSrcEnd = nullptr; + BYTE* MatchPtr = nullptr; UINT32 DstSize = 0; - BYTE* pDstData = NULL; + BYTE* pDstData = nullptr; UINT32 MatchIndex = 0; UINT32 accumulator = 0; BOOL PacketFlushed = 0; BOOL PacketAtFront = 0; DWORD CopyOffset = 0; DWORD LengthOfMatch = 0; - BYTE* HistoryBuffer = NULL; - BYTE* HistoryPtr = NULL; + BYTE* HistoryBuffer = nullptr; + BYTE* HistoryPtr = nullptr; UINT32 HistoryOffset = 0; UINT32 HistoryBufferSize = 0; BYTE Sym1 = 0; BYTE Sym2 = 0; BYTE Sym3 = 0; UINT32 CompressionLevel = 0; - wBitStream* bs = NULL; + wBitStream* bs = nullptr; WINPR_ASSERT(mppc); WINPR_ASSERT(pSrcData); @@ -847,7 +847,7 @@ MPPC_CONTEXT* mppc_context_new(DWORD CompressionLevel, BOOL Compressor) fail: mppc_context_free(mppc); - return NULL; + return nullptr; } void mppc_context_free(MPPC_CONTEXT* mppc) diff --git a/libfreerdp/codec/ncrush.c b/libfreerdp/codec/ncrush.c index b83463c58..5d24db1b4 100644 --- a/libfreerdp/codec/ncrush.c +++ b/libfreerdp/codec/ncrush.c @@ -2024,7 +2024,7 @@ int ncrush_decompress(NCRUSH_CONTEXT* ncrush, const BYTE* pSrcData, UINT32 SrcSi UINT32 CopyOffset = 0; UINT32 CopyLength = 0; UINT32 OldCopyOffset = 0; - const BYTE* CopyOffsetPtr = NULL; + const BYTE* CopyOffsetPtr = nullptr; UINT32 LengthOfMatch = 0; UINT32 CopyOffsetIndex = 0; UINT32 OffsetCacheIndex = 0; @@ -2523,16 +2523,16 @@ int ncrush_compress(NCRUSH_CONTEXT* ncrush, const BYTE* pSrcData, UINT32 SrcSize const BYTE** ppDstData, UINT32* pDstSize, UINT32* pFlags) { BYTE Literal = 0; - const BYTE* SrcPtr = NULL; - BYTE* DstPtr = NULL; + const BYTE* SrcPtr = nullptr; + BYTE* DstPtr = nullptr; UINT32 bits = 0; UINT32 offset = 0; UINT32 MaskedBits = 0; UINT32 accumulator = 0; - const BYTE* SrcEndPtr = NULL; - BYTE* DstEndPtr = NULL; - BYTE* HistoryPtr = NULL; - BYTE* pDstData = NULL; + const BYTE* SrcEndPtr = nullptr; + BYTE* DstEndPtr = nullptr; + BYTE* HistoryPtr = nullptr; + BYTE* pDstData = nullptr; UINT32 DstSize = 0; BOOL PacketAtFront = FALSE; BOOL PacketFlushed = FALSE; @@ -2545,12 +2545,12 @@ int ncrush_compress(NCRUSH_CONTEXT* ncrush, const BYTE* pSrcData, UINT32 SrcSize UINT32 CopyOffset = 0; UINT32 MatchOffset = 0; UINT32 OldCopyOffset = 0; - UINT32* OffsetCache = NULL; + UINT32* OffsetCache = nullptr; UINT32 OffsetCacheIndex = 0; UINT32 HistoryOffset = 0; - BYTE* HistoryBuffer = NULL; + BYTE* HistoryBuffer = nullptr; UINT32 HistoryBufferSize = 0; - BYTE* HistoryBufferEndPtr = NULL; + BYTE* HistoryBufferEndPtr = nullptr; UINT32 CopyOffsetIndex = 0; UINT32 CopyOffsetBits = 0; UINT32 CompressionLevel = 2; @@ -3032,7 +3032,7 @@ NCRUSH_CONTEXT* ncrush_context_new(BOOL Compressor) return ncrush; fail: ncrush_context_free(ncrush); - return NULL; + return nullptr; } void ncrush_context_free(NCRUSH_CONTEXT* ncrush) diff --git a/libfreerdp/codec/nsc.c b/libfreerdp/codec/nsc.c index 8e45dd532..55e797c69 100644 --- a/libfreerdp/codec/nsc.c +++ b/libfreerdp/codec/nsc.c @@ -59,9 +59,9 @@ static BOOL nsc_decode(NSC_CONTEXT* WINPR_RESTRICT context) for (size_t y = 0; y < context->height; y++) { - const BYTE* yplane = NULL; - const BYTE* coplane = NULL; - const BYTE* cgplane = NULL; + const BYTE* yplane = nullptr; + const BYTE* coplane = nullptr; + const BYTE* cgplane = nullptr; const BYTE* aplane = context->priv->PlaneBuffers[3] + y * context->width; /* A */ if (context->ChromaSubsamplingLevel) @@ -343,7 +343,7 @@ NSC_CONTEXT* nsc_context_new(void) NSC_CONTEXT* context = (NSC_CONTEXT*)winpr_aligned_calloc(1, sizeof(NSC_CONTEXT), 32); if (!context) - return NULL; + return nullptr; context->priv = (NSC_CONTEXT_PRIV*)winpr_aligned_calloc(1, sizeof(NSC_CONTEXT_PRIV), 32); @@ -352,7 +352,7 @@ NSC_CONTEXT* nsc_context_new(void) context->priv->log = WLog_Get("com.freerdp.codec.nsc"); WLog_OpenAppender(context->priv->log); - context->BitmapData = NULL; + context->BitmapData = nullptr; context->decode = nsc_decode; context->encode = nsc_encode; @@ -372,7 +372,7 @@ error: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC nsc_context_free(context); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void nsc_context_free(NSC_CONTEXT* context) @@ -530,5 +530,5 @@ BOOL nsc_process_message(NSC_CONTEXT* WINPR_RESTRICT context, UINT16 bpp, UINT32 return (freerdp_image_copy_no_overlap(pDstData, DstFormat, nDstStride, nXDst, nYDst, width, height, context->BitmapData, PIXEL_FORMAT_BGRA32, 0, 0, 0, - NULL, flip)); + nullptr, flip)); } diff --git a/libfreerdp/codec/nsc_encode.c b/libfreerdp/codec/nsc_encode.c index 087383927..98f4aa32f 100644 --- a/libfreerdp/codec/nsc_encode.c +++ b/libfreerdp/codec/nsc_encode.c @@ -116,11 +116,11 @@ static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* WINPR_RESTRICT context, const BYTE* WINPR_RESTRICT data, UINT32 scanline) { size_t y = 0; - const BYTE* src = NULL; - BYTE* yplane = NULL; - BYTE* coplane = NULL; - BYTE* cgplane = NULL; - BYTE* aplane = NULL; + const BYTE* src = nullptr; + BYTE* yplane = nullptr; + BYTE* coplane = nullptr; + BYTE* cgplane = nullptr; + BYTE* aplane = nullptr; INT16 r_val = 0; INT16 g_val = 0; INT16 b_val = 0; diff --git a/libfreerdp/codec/planar.c b/libfreerdp/codec/planar.c index 14154acff..ff161bfb7 100644 --- a/libfreerdp/codec/planar.c +++ b/libfreerdp/codec/planar.c @@ -250,7 +250,7 @@ static inline INT32 planar_decompress_plane_rle_only(const BYTE* WINPR_RESTRICT UINT32 SrcSize, BYTE* WINPR_RESTRICT pDstData, UINT32 nWidth, UINT32 nHeight) { - BYTE* previousScanline = NULL; + BYTE* previousScanline = nullptr; const BYTE* srcp = pSrcData; WINPR_ASSERT(nHeight <= INT32_MAX); @@ -368,7 +368,7 @@ static inline INT32 planar_decompress_plane_rle(const BYTE* WINPR_RESTRICT pSrcD INT32 beg = 0; INT32 end = 0; INT32 inc = 0; - BYTE* previousScanline = NULL; + BYTE* previousScanline = nullptr; const BYTE* srcp = pSrcData; WINPR_ASSERT(nHeight <= INT32_MAX); @@ -637,7 +637,7 @@ static inline BOOL planar_decompress_planes_raw(const BYTE* WINPR_RESTRICT pSrcD for (INT32 y = beg; y != end; y += inc) { - BYTE* pRGB = NULL; + BYTE* pRGB = nullptr; if (y > WINPR_ASSERTING_INT_CAST(INT64, nHeight)) { @@ -740,13 +740,13 @@ BOOL freerdp_bitmap_decompress_planar(BITMAP_PLANAR_CONTEXT* WINPR_RESTRICT plan if (!pSrcData) { - WLog_ERR(TAG, "Invalid argument pSrcData=NULL"); + WLog_ERR(TAG, "Invalid argument pSrcData=nullptr"); return FALSE; } if (!pDstData) { - WLog_ERR(TAG, "Invalid argument pDstData=NULL"); + WLog_ERR(TAG, "Invalid argument pDstData=nullptr"); return FALSE; } @@ -1017,8 +1017,8 @@ BOOL freerdp_bitmap_decompress_planar(BITMAP_PLANAR_CONTEXT* WINPR_RESTRICT plan if (pTempData != pDstData) { if (!freerdp_image_copy_no_overlap(pDstData, DstFormat, nDstStep, nXDst, nYDst, w, h, - pTempData, TempFormat, nTempStep, nXDst, nYDst, NULL, - FREERDP_FLIP_NONE)) + pTempData, TempFormat, nTempStep, nXDst, nYDst, + nullptr, FREERDP_FLIP_NONE)) { WLog_ERR(TAG, "planar image copy failed"); return FALSE; @@ -1170,7 +1170,7 @@ static inline BOOL freerdp_split_color_planes(BITMAP_PLANAR_CONTEXT* WINPR_RESTR const UINT32 color = FreeRDPReadColor(pixel, format); pixel += FreeRDPGetBytesPerPixel(format); FreeRDPSplitColor(color, format, &planes[1][k], &planes[2][k], &planes[3][k], - &planes[0][k], NULL); + &planes[0][k], nullptr); k++; } } @@ -1188,7 +1188,7 @@ static inline BOOL freerdp_split_color_planes(BITMAP_PLANAR_CONTEXT* WINPR_RESTR const UINT32 color = FreeRDPReadColor(pixel, format); pixel += FreeRDPGetBytesPerPixel(format); FreeRDPSplitColor(color, format, &planes[1][k], &planes[2][k], &planes[3][k], - &planes[0][k], NULL); + &planes[0][k], nullptr); k++; } } @@ -1320,7 +1320,7 @@ static inline UINT32 freerdp_bitmap_planar_encode_rle_bytes(const BYTE* WINPR_RE BYTE symbol = 0; const BYTE* pInput = pInBuffer; BYTE* pOutput = pOutBuffer; - const BYTE* pBytes = NULL; + const BYTE* pBytes = nullptr; UINT32 cRawBytes = 0; UINT32 nRunLength = 0; UINT32 nBytesWritten = 0; @@ -1476,11 +1476,11 @@ BYTE* freerdp_bitmap_planar_delta_encode_plane(const BYTE* WINPR_RESTRICT inPlan if (!outPlane) { if (width * height == 0) - return NULL; + return nullptr; outPlane = (BYTE*)calloc(height, width); if (!outPlane) - return NULL; + return nullptr; } // first line is copied as is @@ -1528,12 +1528,12 @@ BYTE* freerdp_bitmap_compress_planar(BITMAP_PLANAR_CONTEXT* WINPR_RESTRICT conte UINT32* WINPR_RESTRICT pDstSize) { UINT32 size = 0; - BYTE* dstp = NULL; + BYTE* dstp = nullptr; UINT32 dstSizes[4] = WINPR_C_ARRAY_INIT; BYTE FormatHeader = 0; if (!context || !context->rlePlanesBuffer) - return NULL; + return nullptr; if (context->AllowSkipAlpha) FormatHeader |= PLANAR_FORMAT_HEADER_NA; @@ -1545,18 +1545,18 @@ BYTE* freerdp_bitmap_compress_planar(BITMAP_PLANAR_CONTEXT* WINPR_RESTRICT conte if (!freerdp_split_color_planes(context, data, format, width, height, scanline, context->planes)) - return NULL; + return nullptr; if (context->AllowRunLengthEncoding) { if (!freerdp_bitmap_planar_delta_encode_planes(context->planes, width, height, context->deltaPlanes)) - return NULL; + return nullptr; if (!freerdp_bitmap_planar_compress_planes_rle(context->deltaPlanes, width, height, context->rlePlanesBuffer, dstSizes, context->AllowSkipAlpha)) - return NULL; + return nullptr; { uint32_t offset = 0; @@ -1581,19 +1581,19 @@ BYTE* freerdp_bitmap_compress_planar(BITMAP_PLANAR_CONTEXT* WINPR_RESTRICT conte if (FormatHeader & PLANAR_FORMAT_HEADER_RLE) { if (!context->AllowRunLengthEncoding) - return NULL; + return nullptr; - if (context->rlePlanes[0] == NULL) - return NULL; + if (context->rlePlanes[0] == nullptr) + return nullptr; - if (context->rlePlanes[1] == NULL) - return NULL; + if (context->rlePlanes[1] == nullptr) + return nullptr; - if (context->rlePlanes[2] == NULL) - return NULL; + if (context->rlePlanes[2] == nullptr) + return nullptr; - if (context->rlePlanes[3] == NULL) - return NULL; + if (context->rlePlanes[3] == nullptr) + return nullptr; } if (!dstData) @@ -1619,7 +1619,7 @@ BYTE* freerdp_bitmap_compress_planar(BITMAP_PLANAR_CONTEXT* WINPR_RESTRICT conte dstData = malloc(size); if (!dstData) - return NULL; + return nullptr; *pDstSize = size; } @@ -1695,7 +1695,7 @@ BYTE* freerdp_bitmap_compress_planar(BITMAP_PLANAR_CONTEXT* WINPR_RESTRICT conte if ((diff < 0) || (diff > UINT32_MAX)) { free(dstData); - return NULL; + return nullptr; } size = (UINT32)diff; *pDstSize = size; @@ -1767,7 +1767,7 @@ BITMAP_PLANAR_CONTEXT* freerdp_bitmap_planar_context_new(DWORD flags, UINT32 max (BITMAP_PLANAR_CONTEXT*)winpr_aligned_calloc(1, sizeof(BITMAP_PLANAR_CONTEXT), 32); if (!context) - return NULL; + return nullptr; if (flags & PLANAR_FORMAT_HEADER_NA) context->AllowSkipAlpha = TRUE; @@ -1789,7 +1789,7 @@ BITMAP_PLANAR_CONTEXT* freerdp_bitmap_planar_context_new(DWORD flags, UINT32 max WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC freerdp_bitmap_planar_context_free(context); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } return context; diff --git a/libfreerdp/codec/progressive.c b/libfreerdp/codec/progressive.c index bd91a879a..5e52f7cb1 100644 --- a/libfreerdp/codec/progressive.c +++ b/libfreerdp/codec/progressive.c @@ -253,7 +253,7 @@ progressive_get_surface_data(PROGRESSIVE_CONTEXT* WINPR_RESTRICT progressive, UI void* key = (void*)(((ULONG_PTR)surfaceId) + 1); if (!progressive) - return NULL; + return nullptr; return HashTable_GetItemValue(progressive->SurfaceContexts, key); } @@ -327,7 +327,7 @@ static inline RFX_PROGRESSIVE_TILE* progressive_tile_new(void) fail: progressive_tile_free(tile); - return NULL; + return nullptr; } static inline BOOL @@ -376,7 +376,7 @@ static PROGRESSIVE_SURFACE_CONTEXT* progressive_surface_context_new(UINT16 surfa 1, sizeof(PROGRESSIVE_SURFACE_CONTEXT), 32); if (!surface) - return NULL; + return nullptr; surface->id = surfaceId; surface->width = width; @@ -388,7 +388,7 @@ static PROGRESSIVE_SURFACE_CONTEXT* progressive_surface_context_new(UINT16 surfa if (!progressive_allocate_tile_cache(surface, surface->gridSize)) { progressive_surface_context_free(surface); - return NULL; + return nullptr; } return surface; @@ -399,7 +399,7 @@ progressive_surface_tile_replace(PROGRESSIVE_SURFACE_CONTEXT* WINPR_RESTRICT sur PROGRESSIVE_BLOCK_REGION* WINPR_RESTRICT region, const RFX_PROGRESSIVE_TILE* WINPR_RESTRICT tile, BOOL upgrade) { - RFX_PROGRESSIVE_TILE* t = NULL; + RFX_PROGRESSIVE_TILE* t = nullptr; size_t zIdx = 0; if (!surface || !tile) @@ -502,7 +502,7 @@ INT32 progressive_create_surface_context(PROGRESSIVE_CONTEXT* WINPR_RESTRICT pro int progressive_delete_surface_context(PROGRESSIVE_CONTEXT* WINPR_RESTRICT progressive, UINT16 surfaceId) { - progressive_set_surface_data(progressive, surfaceId, NULL); + progressive_set_surface_data(progressive, surfaceId, nullptr); return 1; } @@ -696,13 +696,13 @@ static inline void progressive_rfx_dwt_2d_decode_block(INT16* WINPR_RESTRICT buf { size_t nDstStepX = 0; size_t nDstStepY = 0; - const INT16* WINPR_RESTRICT HL = NULL; - const INT16* WINPR_RESTRICT LH = NULL; - const INT16* WINPR_RESTRICT HH = NULL; - INT16* WINPR_RESTRICT LL = NULL; - INT16* WINPR_RESTRICT L = NULL; - INT16* WINPR_RESTRICT H = NULL; - INT16* WINPR_RESTRICT LLx = NULL; + const INT16* WINPR_RESTRICT HL = nullptr; + const INT16* WINPR_RESTRICT LH = nullptr; + const INT16* WINPR_RESTRICT HH = nullptr; + INT16* WINPR_RESTRICT LL = nullptr; + INT16* WINPR_RESTRICT L = nullptr; + INT16* WINPR_RESTRICT H = nullptr; + INT16* WINPR_RESTRICT LLx = nullptr; const size_t nBandL = progressive_rfx_get_band_l_count(level); const size_t nBandH = progressive_rfx_get_band_h_count(level); @@ -873,20 +873,20 @@ progressive_decompress_tile_first(PROGRESSIVE_CONTEXT* WINPR_RESTRICT progressiv BOOL diff = 0; BOOL sub = 0; BOOL extrapolate = 0; - BYTE* pBuffer = NULL; + BYTE* pBuffer = nullptr; INT16* pSign[3]; INT16* pSrcDst[3]; INT16* pCurrent[3]; RFX_COMPONENT_CODEC_QUANT shiftY = WINPR_C_ARRAY_INIT; RFX_COMPONENT_CODEC_QUANT shiftCb = WINPR_C_ARRAY_INIT; RFX_COMPONENT_CODEC_QUANT shiftCr = WINPR_C_ARRAY_INIT; - RFX_COMPONENT_CODEC_QUANT* quantY = NULL; - RFX_COMPONENT_CODEC_QUANT* quantCb = NULL; - RFX_COMPONENT_CODEC_QUANT* quantCr = NULL; - RFX_COMPONENT_CODEC_QUANT* quantProgY = NULL; - RFX_COMPONENT_CODEC_QUANT* quantProgCb = NULL; - RFX_COMPONENT_CODEC_QUANT* quantProgCr = NULL; - RFX_PROGRESSIVE_CODEC_QUANT* quantProgVal = NULL; + RFX_COMPONENT_CODEC_QUANT* quantY = nullptr; + RFX_COMPONENT_CODEC_QUANT* quantCb = nullptr; + RFX_COMPONENT_CODEC_QUANT* quantCr = nullptr; + RFX_COMPONENT_CODEC_QUANT* quantProgY = nullptr; + RFX_COMPONENT_CODEC_QUANT* quantProgCb = nullptr; + RFX_COMPONENT_CODEC_QUANT* quantProgCr = nullptr; + RFX_PROGRESSIVE_CODEC_QUANT* quantProgVal = nullptr; static const prim_size_t roi_64x64 = { 64, 64 }; const primitives_t* prims = primitives_get(); @@ -1099,8 +1099,8 @@ static inline int progressive_rfx_upgrade_state_finish(RFX_PROGRESSIVE_UPGRADE_STATE* WINPR_RESTRICT state) { UINT32 pad = 0; - wBitStream* srl = NULL; - wBitStream* raw = NULL; + wBitStream* srl = nullptr; + wBitStream* raw = nullptr; if (!state) return -1; @@ -1297,7 +1297,7 @@ progressive_decompress_tile_upgrade(PROGRESSIVE_CONTEXT* WINPR_RESTRICT progress BOOL coeffDiff = 0; BOOL sub = 0; BOOL extrapolate = 0; - BYTE* pBuffer = NULL; + BYTE* pBuffer = nullptr; INT16* pSign[3] = WINPR_C_ARRAY_INIT; INT16* pSrcDst[3] = WINPR_C_ARRAY_INIT; INT16* pCurrent[3] = WINPR_C_ARRAY_INIT; @@ -1310,13 +1310,13 @@ progressive_decompress_tile_upgrade(PROGRESSIVE_CONTEXT* WINPR_RESTRICT progress RFX_COMPONENT_CODEC_QUANT yNumBits = WINPR_C_ARRAY_INIT; RFX_COMPONENT_CODEC_QUANT cbNumBits = WINPR_C_ARRAY_INIT; RFX_COMPONENT_CODEC_QUANT crNumBits = WINPR_C_ARRAY_INIT; - RFX_COMPONENT_CODEC_QUANT* quantY = NULL; - RFX_COMPONENT_CODEC_QUANT* quantCb = NULL; - RFX_COMPONENT_CODEC_QUANT* quantCr = NULL; - RFX_COMPONENT_CODEC_QUANT* quantProgY = NULL; - RFX_COMPONENT_CODEC_QUANT* quantProgCb = NULL; - RFX_COMPONENT_CODEC_QUANT* quantProgCr = NULL; - RFX_PROGRESSIVE_CODEC_QUANT* quantProg = NULL; + RFX_COMPONENT_CODEC_QUANT* quantY = nullptr; + RFX_COMPONENT_CODEC_QUANT* quantCb = nullptr; + RFX_COMPONENT_CODEC_QUANT* quantCr = nullptr; + RFX_COMPONENT_CODEC_QUANT* quantProgY = nullptr; + RFX_COMPONENT_CODEC_QUANT* quantProgCb = nullptr; + RFX_COMPONENT_CODEC_QUANT* quantProgCr = nullptr; + RFX_PROGRESSIVE_CODEC_QUANT* quantProg = nullptr; static const prim_size_t roi_64x64 = { 64, 64 }; const primitives_t* prims = primitives_get(); @@ -1741,7 +1741,7 @@ progressive_process_tiles(PROGRESSIVE_CONTEXT* WINPR_RESTRICT progressive, if (progressive->rfx_context->priv->UseThreads) { progressive->work_objects[idx] = CreateThreadpoolWork( - progressive_process_tiles_tile_work_callback, (void*)param, NULL); + progressive_process_tiles_tile_work_callback, (void*)param, nullptr); if (!progressive->work_objects[idx]) { WLog_Print(progressive->log, WLOG_ERROR, @@ -1756,7 +1756,7 @@ progressive_process_tiles(PROGRESSIVE_CONTEXT* WINPR_RESTRICT progressive, } else { - progressive_process_tiles_tile_work_callback(0, param, 0); + progressive_process_tiles_tile_work_callback(nullptr, param, nullptr); } if (status < 0) @@ -2299,7 +2299,7 @@ static inline BOOL update_tiles(PROGRESSIVE_CONTEXT* WINPR_RESTRICT progressive, for (UINT32 i = 0; i < surface->numUpdatedTiles; i++) { UINT32 nbUpdateRects = 0; - const RECTANGLE_16* updateRects = NULL; + const RECTANGLE_16* updateRects = nullptr; RECTANGLE_16 updateRect = WINPR_C_ARRAY_INIT; WINPR_ASSERT(surface->updatedTileIndices); @@ -2343,7 +2343,7 @@ static inline BOOL update_tiles(PROGRESSIVE_CONTEXT* WINPR_RESTRICT progressive, break; rc = freerdp_image_copy_no_overlap( pDstData, DstFormat, nDstStep, rect->left, rect->top, width, height, tile->data, - progressive->format, tile->stride, nXSrc, nYSrc, NULL, FREERDP_KEEP_DST_ALPHA); + progressive->format, tile->stride, nXSrc, nYSrc, nullptr, FREERDP_KEEP_DST_ALPHA); if (!rc) break; @@ -2443,7 +2443,7 @@ BOOL progressive_rfx_write_message_progressive_simple( PROGRESSIVE_CONTEXT* WINPR_RESTRICT progressive, wStream* WINPR_RESTRICT s, const RFX_MESSAGE* WINPR_RESTRICT msg) { - RFX_CONTEXT* context = NULL; + RFX_CONTEXT* context = nullptr; WINPR_ASSERT(progressive); WINPR_ASSERT(s); @@ -2460,10 +2460,10 @@ int progressive_compress(PROGRESSIVE_CONTEXT* WINPR_RESTRICT progressive, { BOOL rc = FALSE; int res = -6; - wStream* s = NULL; + wStream* s = nullptr; UINT32 numRects = 0; - RFX_RECT* rects = NULL; - RFX_MESSAGE* message = NULL; + RFX_RECT* rects = nullptr; + RFX_MESSAGE* message = nullptr; if (!progressive || !pSrcData || !ppDstData || !pDstSize) { @@ -2511,7 +2511,7 @@ int progressive_compress(PROGRESSIVE_CONTEXT* WINPR_RESTRICT progressive, rects = Stream_BufferAs(progressive->rects, RFX_RECT); if (invalidRegion) { - const RECTANGLE_16* region_rects = region16_rects(invalidRegion, NULL); + const RECTANGLE_16* region_rects = region16_rects(invalidRegion, nullptr); for (UINT32 idx = 0; idx < numRects; idx++) { const RECTANGLE_16* r = ®ion_rects[idx]; @@ -2587,7 +2587,7 @@ fail: BOOL progressive_context_reset(PROGRESSIVE_CONTEXT* WINPR_RESTRICT progressive) { - return (progressive != NULL); + return (progressive != nullptr); } PROGRESSIVE_CONTEXT* progressive_context_new(BOOL Compressor) @@ -2601,7 +2601,7 @@ PROGRESSIVE_CONTEXT* progressive_context_new_ex(BOOL Compressor, UINT32 Threadin (PROGRESSIVE_CONTEXT*)winpr_aligned_calloc(1, sizeof(PROGRESSIVE_CONTEXT), 32); if (!progressive) - return NULL; + return nullptr; progressive->Compressor = Compressor; progressive->quantProgValFull.quality = 100; @@ -2611,10 +2611,10 @@ PROGRESSIVE_CONTEXT* progressive_context_new_ex(BOOL Compressor, UINT32 Threadin progressive->rfx_context = rfx_context_new_ex(Compressor, ThreadingFlags); if (!progressive->rfx_context) goto fail; - progressive->buffer = Stream_New(NULL, 1024); + progressive->buffer = Stream_New(nullptr, 1024); if (!progressive->buffer) goto fail; - progressive->rects = Stream_New(NULL, 1024); + progressive->rects = Stream_New(nullptr, 1024); if (!progressive->rects) goto fail; progressive->bufferPool = BufferPool_New(TRUE, (8192LL + 32LL) * 3LL, 16); @@ -2635,7 +2635,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC progressive_context_free(progressive); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void progressive_context_free(PROGRESSIVE_CONTEXT* progressive) diff --git a/libfreerdp/codec/region.c b/libfreerdp/codec/region.c index b2d644531..df44d0a25 100644 --- a/libfreerdp/codec/region.c +++ b/libfreerdp/codec/region.c @@ -97,11 +97,11 @@ const RECTANGLE_16* region16_rects(const REGION16* region, UINT32* nbRects) *nbRects = 0; if (!region) - return NULL; + return nullptr; REGION16_DATA* data = region->data; if (!data) - return NULL; + return nullptr; if (nbRects) *nbRects = WINPR_ASSERTING_INT_CAST(UINT32, data->nbRects); @@ -116,7 +116,7 @@ static inline RECTANGLE_16* region16_rects_noconst(REGION16* region) REGION16_DATA* data = region->data; if (!data) - return NULL; + return nullptr; return data->rects; } @@ -124,7 +124,7 @@ static inline RECTANGLE_16* region16_rects_noconst(REGION16* region) const RECTANGLE_16* region16_extents(const REGION16* region) { if (!region) - return NULL; + return nullptr; return ®ion->extents; } @@ -132,7 +132,7 @@ const RECTANGLE_16* region16_extents(const REGION16* region) static RECTANGLE_16* region16_extents_noconst(REGION16* region) { if (!region) - return NULL; + return nullptr; return ®ion->extents; } @@ -195,7 +195,7 @@ void region16_clear(REGION16* region) WINPR_ASSERT(region); freeRegion(region->data); - region->data = NULL; + region->data = nullptr; const RECTANGLE_16 empty = WINPR_C_ARRAY_INIT; region->extents = empty; @@ -207,7 +207,7 @@ static REGION16_DATA* allocateRegion(size_t nbItems) { REGION16_DATA* data = calloc(1, sizeof(REGION16_DATA)); if (!data) - return NULL; + return nullptr; if (nbItems > 0) { @@ -215,7 +215,7 @@ static REGION16_DATA* allocateRegion(size_t nbItems) if (!data->rects) { free(data); - return NULL; + return nullptr; } } @@ -232,7 +232,7 @@ static inline RECTANGLE_16* nextRect(REGION16_DATA* data, size_t index) if (!rects) { freeRegion(data); - return NULL; + return nullptr; } const RECTANGLE_16 empty = WINPR_C_ARRAY_INIT; @@ -249,14 +249,14 @@ static BOOL resizeRegion(REGION16* region, size_t nbItems) if (nbItems == 0) { freeRegion(region->data); - region->data = NULL; + region->data = nullptr; return TRUE; } if (!region->data) { region->data = allocateRegion(nbItems); - return region->data != NULL; + return region->data != nullptr; } RECTANGLE_16* rects = realloc(region->data->rects, nbItems * sizeof(RECTANGLE_16)); @@ -264,7 +264,7 @@ static BOOL resizeRegion(REGION16* region, size_t nbItems) { free(region->data->rects); region->data->nbRects = 0; - region->data->rects = NULL; + region->data->rects = nullptr; return FALSE; } @@ -284,7 +284,7 @@ static inline BOOL region16_copy_data(REGION16* dst, const REGION16* src) WINPR_ASSERT(src); freeRegion(dst->data); - dst->data = NULL; + dst->data = nullptr; if (src->data && (src->data->nbRects > 0)) { @@ -574,7 +574,7 @@ static BOOL region16_simplify_bands(REGION16* region) BOOL region16_union_rect(REGION16* dst, const REGION16* src, const RECTANGLE_16* rect) { - const RECTANGLE_16* nextBand = NULL; + const RECTANGLE_16* nextBand = nullptr; UINT32 srcNbRects = 0; UINT16 topInterBand = 0; WINPR_ASSERT(src); @@ -647,7 +647,7 @@ BOOL region16_union_rect(REGION16* dst, const REGION16* src, const RECTANGLE_16* +----+ */ if (!region16_copy_band_with_union(newItems, currentBand, endSrcRect, currentBand->top, - currentBand->bottom, NULL, &usedRects, &nextBand)) + currentBand->bottom, nullptr, &usedRects, &nextBand)) return FALSE; topInterBand = rect->top; } @@ -682,7 +682,7 @@ BOOL region16_union_rect(REGION16* dst, const REGION16* src, const RECTANGLE_16* if (rect->top > currentBand->top) { if (!region16_copy_band_with_union(newItems, currentBand, endSrcRect, - currentBand->top, rect->top, NULL, &usedRects, + currentBand->top, rect->top, nullptr, &usedRects, &nextBand)) return FALSE; mergeTop = rect->top; @@ -700,7 +700,7 @@ BOOL region16_union_rect(REGION16* dst, const REGION16* src, const RECTANGLE_16* if (rect->bottom < currentBand->bottom) { if (!region16_copy_band_with_union(newItems, currentBand, endSrcRect, mergeBottom, - currentBand->bottom, NULL, &usedRects, + currentBand->bottom, nullptr, &usedRects, &nextBand)) return FALSE; } @@ -766,7 +766,7 @@ BOOL region16_union_rect(REGION16* dst, const REGION16* src, const RECTANGLE_16* BOOL region16_intersects_rect(const REGION16* src, const RECTANGLE_16* arg2) { - const RECTANGLE_16* endPtr = NULL; + const RECTANGLE_16* endPtr = nullptr; UINT32 nbRects = 0; if (!src || !src->data || !arg2) @@ -796,7 +796,7 @@ BOOL region16_intersects_rect(const REGION16* src, const RECTANGLE_16* arg2) BOOL region16_intersect_rect(REGION16* dst, const REGION16* src, const RECTANGLE_16* rect) { - const RECTANGLE_16* endPtr = NULL; + const RECTANGLE_16* endPtr = nullptr; UINT32 nbRects = 0; RECTANGLE_16 common = WINPR_C_ARRAY_INIT; @@ -881,5 +881,5 @@ void region16_uninit(REGION16* region) WINPR_ASSERT(region); freeRegion(region->data); - region->data = NULL; + region->data = nullptr; } diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c index b674d3b34..6caeb1623 100644 --- a/libfreerdp/codec/rfx.c +++ b/libfreerdp/codec/rfx.c @@ -148,27 +148,27 @@ static inline void rfx_tile_init(void* obj) tile->x = 0; tile->y = 0; tile->YLen = 0; - tile->YData = NULL; + tile->YData = nullptr; tile->CbLen = 0; - tile->CbData = NULL; + tile->CbData = nullptr; tile->CrLen = 0; - tile->CrData = NULL; + tile->CrData = nullptr; } } static inline void* rfx_decoder_tile_new(const void* val) { const size_t size = 4ULL * 64ULL * 64ULL; - RFX_TILE* tile = NULL; + RFX_TILE* tile = nullptr; WINPR_UNUSED(val); if (!(tile = (RFX_TILE*)winpr_aligned_calloc(1, sizeof(RFX_TILE), 32))) - return NULL; + return nullptr; if (!(tile->data = (BYTE*)winpr_aligned_malloc(size, 16))) { winpr_aligned_free(tile); - return NULL; + return nullptr; } memset(tile->data, 0xff, size); tile->allocated = TRUE; @@ -206,11 +206,11 @@ RFX_CONTEXT* rfx_context_new(BOOL encoder) RFX_CONTEXT* rfx_context_new_ex(BOOL encoder, UINT32 ThreadingFlags) { - RFX_CONTEXT_PRIV* priv = NULL; + RFX_CONTEXT_PRIV* priv = nullptr; RFX_CONTEXT* context = (RFX_CONTEXT*)winpr_aligned_calloc(1, sizeof(RFX_CONTEXT), 32); if (!context) - return NULL; + return nullptr; context->encoder = encoder; context->currentMessage.freeArray = TRUE; @@ -268,7 +268,7 @@ RFX_CONTEXT* rfx_context_new_ex(BOOL encoder, UINT32 ThreadingFlags) char* key = freerdp_getApplicatonDetailsRegKey(RFX_KEY); if (key) { - HKEY hKey = NULL; + HKEY hKey = nullptr; const LONG status = RegOpenKeyExA(HKEY_LOCAL_MACHINE, RFX_KEY, 0, KEY_READ | KEY_WOW64_64KEY, &hKey); free(key); @@ -279,7 +279,7 @@ RFX_CONTEXT* rfx_context_new_ex(BOOL encoder, UINT32 ThreadingFlags) DWORD dwValue = 0; DWORD dwSize = sizeof(dwValue); - if (RegQueryValueEx(hKey, _T("UseThreads"), NULL, &dwType, (BYTE*)&dwValue, + if (RegQueryValueEx(hKey, _T("UseThreads"), nullptr, &dwType, (BYTE*)&dwValue, &dwSize) == ERROR_SUCCESS) priv->UseThreads = dwValue ? 1 : 0; @@ -319,22 +319,22 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC rfx_context_free(context); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void rfx_context_free(RFX_CONTEXT* context) { - RFX_CONTEXT_PRIV* priv = NULL; + RFX_CONTEXT_PRIV* priv = nullptr; if (!context) return; - WINPR_ASSERT(NULL != context); + WINPR_ASSERT(nullptr != context); priv = context->priv; - WINPR_ASSERT(NULL != priv); - WINPR_ASSERT(NULL != priv->TilePool); - WINPR_ASSERT(NULL != priv->BufferPool); + WINPR_ASSERT(nullptr != priv); + WINPR_ASSERT(nullptr != priv->TilePool); + WINPR_ASSERT(nullptr != priv->BufferPool); /* coverity[address_free] */ rfx_message_free(context, &context->currentMessage); @@ -817,16 +817,16 @@ static inline BOOL rfx_process_message_tileset(RFX_CONTEXT* WINPR_RESTRICT conte BOOL rc = 0; size_t close_cnt = 0; BYTE quant = 0; - RFX_TILE* tile = NULL; - UINT32* quants = NULL; + RFX_TILE* tile = nullptr; + UINT32* quants = nullptr; UINT16 subtype = 0; UINT16 numTiles = 0; UINT32 blockLen = 0; UINT32 blockType = 0; UINT32 tilesDataSize = 0; - PTP_WORK* work_objects = NULL; - RFX_TILE_PROCESS_WORK_PARAM* params = NULL; - void* pmem = NULL; + PTP_WORK* work_objects = nullptr; + RFX_TILE_PROCESS_WORK_PARAM* params = nullptr; + void* pmem = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(context->priv); @@ -912,7 +912,7 @@ static inline BOOL rfx_process_message_tileset(RFX_CONTEXT* WINPR_RESTRICT conte for (size_t i = 0; i < message->numTiles; i++) { ObjectPool_Return(context->priv->TilePool, message->tiles[i]); - message->tiles[i] = NULL; + message->tiles[i] = nullptr; } if (!rfx_allocate_tiles(message, numTiles, FALSE)) @@ -922,7 +922,7 @@ static inline BOOL rfx_process_message_tileset(RFX_CONTEXT* WINPR_RESTRICT conte { work_objects = (PTP_WORK*)winpr_aligned_calloc(message->numTiles, sizeof(PTP_WORK), 32); params = (RFX_TILE_PROCESS_WORK_PARAM*)winpr_aligned_recalloc( - NULL, message->numTiles, sizeof(RFX_TILE_PROCESS_WORK_PARAM), 32); + nullptr, message->numTiles, sizeof(RFX_TILE_PROCESS_WORK_PARAM), 32); if (!work_objects) { @@ -947,7 +947,7 @@ static inline BOOL rfx_process_message_tileset(RFX_CONTEXT* WINPR_RESTRICT conte for (size_t i = 0; i < message->numTiles; i++) { wStream subBuffer; - wStream* sub = NULL; + wStream* sub = nullptr; if (!(tile = (RFX_TILE*)ObjectPool_Take(context->priv->TilePool))) { @@ -1065,7 +1065,7 @@ static inline BOOL rfx_process_message_tileset(RFX_CONTEXT* WINPR_RESTRICT conte params[i].tile = message->tiles[i]; if (!(work_objects[i] = CreateThreadpoolWork(rfx_process_message_tile_work_callback, - (void*)¶ms[i], NULL))) + (void*)¶ms[i], nullptr))) { WLog_Print(context->priv->log, WLOG_ERROR, "CreateThreadpoolWork failed."); rc = FALSE; @@ -1104,7 +1104,7 @@ static inline BOOL rfx_process_message_tileset(RFX_CONTEXT* WINPR_RESTRICT conte continue; tile->YLen = tile->CbLen = tile->CrLen = 0; - tile->YData = tile->CbData = tile->CrData = NULL; + tile->YData = tile->CbData = tile->CrData = nullptr; } return rc; @@ -1272,7 +1272,7 @@ BOOL rfx_process_message(RFX_CONTEXT* WINPR_RESTRICT context, const BYTE* WINPR_ { UINT32 nbUpdateRects = 0; REGION16 clippingRects = WINPR_C_ARRAY_INIT; - const RECTANGLE_16* updateRects = NULL; + const RECTANGLE_16* updateRects = nullptr; const DWORD formatSize = FreeRDPGetBytesPerPixel(context->pixel_format); const UINT32 dstWidth = dstStride / FreeRDPGetBytesPerPixel(dstFormat); region16_init(&clippingRects); @@ -1338,9 +1338,9 @@ BOOL rfx_process_message(RFX_CONTEXT* WINPR_RESTRICT context, const BYTE* WINPR_ const UINT32 nWidth = cur->right - cur->left; const UINT32 nHeight = cur->bottom - cur->top; - if (!freerdp_image_copy_no_overlap(dst, dstFormat, dstStride, nXDst, nYDst, nWidth, - nHeight, tile->data, context->pixel_format, - stride, nXSrc, nYSrc, NULL, FREERDP_FLIP_NONE)) + if (!freerdp_image_copy_no_overlap( + dst, dstFormat, dstStride, nXDst, nYDst, nWidth, nHeight, tile->data, + context->pixel_format, stride, nXSrc, nYSrc, nullptr, FREERDP_FLIP_NONE)) { region16_uninit(&updateRegion); region16_uninit(&clippingRects); @@ -1441,7 +1441,7 @@ void rfx_message_free(RFX_CONTEXT* WINPR_RESTRICT context, RFX_MESSAGE* WINPR_RE if (tile->YCbCrData) { BufferPool_Return(context->priv->BufferPool, tile->YCbCrData); - tile->YCbCrData = NULL; + tile->YCbCrData = nullptr; } ObjectPool_Return(context->priv->TilePool, (void*)tile); @@ -1628,7 +1628,7 @@ static inline BOOL setupWorkers(RFX_CONTEXT* WINPR_RESTRICT context, size_t nbTi RFX_CONTEXT_PRIV* priv = context->priv; WINPR_ASSERT(priv); - void* pmem = NULL; + void* pmem = nullptr; if (!context->priv->UseThreads) return TRUE; @@ -1664,14 +1664,14 @@ RFX_MESSAGE* rfx_encode_message(RFX_CONTEXT* WINPR_RESTRICT context, const UINT32 width = w; const UINT32 height = h; const UINT32 scanline = (UINT32)s; - RFX_MESSAGE* message = NULL; - PTP_WORK* workObject = NULL; - RFX_TILE_COMPOSE_WORK_PARAM* workParam = NULL; + RFX_MESSAGE* message = nullptr; + PTP_WORK* workObject = nullptr; + RFX_TILE_COMPOSE_WORK_PARAM* workParam = nullptr; BOOL success = FALSE; REGION16 rectsRegion = WINPR_C_ARRAY_INIT; REGION16 tilesRegion = WINPR_C_ARRAY_INIT; RECTANGLE_16 currentTileRect = WINPR_C_ARRAY_INIT; - const RECTANGLE_16* regionRect = NULL; + const RECTANGLE_16* regionRect = nullptr; WINPR_ASSERT(data); WINPR_ASSERT(rects); @@ -1681,7 +1681,7 @@ RFX_MESSAGE* rfx_encode_message(RFX_CONTEXT* WINPR_RESTRICT context, WINPR_ASSERT(s > 0); if (!(message = (RFX_MESSAGE*)winpr_aligned_calloc(1, sizeof(RFX_MESSAGE), 32))) - return NULL; + return nullptr; region16_init(&tilesRegion); region16_init(&rectsRegion); @@ -1693,7 +1693,7 @@ RFX_MESSAGE* rfx_encode_message(RFX_CONTEXT* WINPR_RESTRICT context, if (!context->numQuant) { - WINPR_ASSERT(context->quants == NULL); + WINPR_ASSERT(context->quants == nullptr); if (!(context->quants = (UINT32*)winpr_aligned_malloc(sizeof(rfx_default_quantization_values), 32))) goto skip_encoding_loop; @@ -1839,7 +1839,7 @@ RFX_MESSAGE* rfx_encode_message(RFX_CONTEXT* WINPR_RESTRICT context, if (!(*workObject = CreateThreadpoolWork(rfx_compose_message_tile_work_callback, - (void*)workParam, NULL))) + (void*)workParam, nullptr))) { goto skip_encoding_loop; } @@ -1900,7 +1900,7 @@ skip_encoding_loop: rfx_message_free(context, message); region16_uninit(&tilesRegion); region16_uninit(&rectsRegion); - return NULL; + return nullptr; } static inline BOOL rfx_clone_rects(RFX_MESSAGE* WINPR_RESTRICT dst, @@ -1909,7 +1909,7 @@ static inline BOOL rfx_clone_rects(RFX_MESSAGE* WINPR_RESTRICT dst, WINPR_ASSERT(dst); WINPR_ASSERT(src); - WINPR_ASSERT(dst->rects == NULL); + WINPR_ASSERT(dst->rects == nullptr); WINPR_ASSERT(dst->numRects == 0); if (src->numRects == 0) @@ -1932,7 +1932,7 @@ static inline BOOL rfx_clone_quants(RFX_MESSAGE* WINPR_RESTRICT dst, WINPR_ASSERT(dst); WINPR_ASSERT(src); - WINPR_ASSERT(dst->quantVals == NULL); + WINPR_ASSERT(dst->quantVals == nullptr); WINPR_ASSERT(dst->numQuant == 0); if (src->numQuant == 0) @@ -1959,7 +1959,7 @@ static inline RFX_MESSAGE* rfx_split_message(RFX_CONTEXT* WINPR_RESTRICT context RFX_MESSAGE* messages = (RFX_MESSAGE*)winpr_aligned_calloc((*numMessages), sizeof(RFX_MESSAGE), 32); if (!messages) - return NULL; + return nullptr; UINT32 j = 0; for (UINT16 i = 0; i < message->numTiles; i++) @@ -1991,7 +1991,7 @@ static inline RFX_MESSAGE* rfx_split_message(RFX_CONTEXT* WINPR_RESTRICT context WINPR_ASSERT(msg->numTiles < msg->allocatedTiles); msg->tiles[msg->numTiles++] = message->tiles[i]; - message->tiles[i] = NULL; + message->tiles[i] = nullptr; } *numMessages = j + 1ULL; @@ -2004,14 +2004,14 @@ free_messages: rfx_allocate_tiles(&messages[i], 0, FALSE); winpr_aligned_free(messages); - return NULL; + return nullptr; } const RFX_MESSAGE* rfx_message_list_get(const RFX_MESSAGE_LIST* WINPR_RESTRICT messages, size_t idx) { WINPR_ASSERT(messages); if (idx >= messages->count) - return NULL; + return nullptr; WINPR_ASSERT(messages->list); return &messages->list[idx]; } @@ -2051,12 +2051,12 @@ RFX_MESSAGE_LIST* rfx_encode_messages(RFX_CONTEXT* WINPR_RESTRICT context, RFX_MESSAGE* message = rfx_encode_message(context, rects, numRects, data, width, height, scanline); if (!message) - return NULL; + return nullptr; RFX_MESSAGE* list = rfx_split_message(context, message, numMessages, maxDataSize); rfx_message_free(context, message); if (!list) - return NULL; + return nullptr; return rfx_message_list_new(context, list, *numMessages); } diff --git a/libfreerdp/codec/rfx_decode.c b/libfreerdp/codec/rfx_decode.c index 17b10d55d..2da5ae4b9 100644 --- a/libfreerdp/codec/rfx_decode.c +++ b/libfreerdp/codec/rfx_decode.c @@ -79,11 +79,11 @@ BOOL rfx_decode_rgb(RFX_CONTEXT* WINPR_RESTRICT context, const RFX_TILE* WINPR_R INT16** pv; } cnv; BOOL rc = TRUE; - BYTE* pBuffer = NULL; + BYTE* pBuffer = nullptr; INT16* pSrcDst[3]; - UINT32* y_quants = NULL; - UINT32* cb_quants = NULL; - UINT32* cr_quants = NULL; + UINT32* y_quants = nullptr; + UINT32* cb_quants = nullptr; + UINT32* cr_quants = nullptr; static const prim_size_t roi_64x64 = { 64, 64 }; const primitives_t* prims = primitives_get(); PROFILER_ENTER(context->priv->prof_rfx_decode_rgb) diff --git a/libfreerdp/codec/rfx_dwt.c b/libfreerdp/codec/rfx_dwt.c index 014e3abe6..d332a6843 100644 --- a/libfreerdp/codec/rfx_dwt.c +++ b/libfreerdp/codec/rfx_dwt.c @@ -132,15 +132,15 @@ void rfx_dwt_2d_decode(INT16* WINPR_RESTRICT buffer, INT16* WINPR_RESTRICT dwt_b static void rfx_dwt_2d_encode_block(INT16* WINPR_RESTRICT buffer, INT16* WINPR_RESTRICT dwt, UINT32 subband_width) { - INT16* src = NULL; - INT16* l = NULL; - INT16* h = NULL; - INT16* l_src = NULL; - INT16* h_src = NULL; - INT16* hl = NULL; - INT16* lh = NULL; - INT16* hh = NULL; - INT16* ll = NULL; + INT16* src = nullptr; + INT16* l = nullptr; + INT16* h = nullptr; + INT16* l_src = nullptr; + INT16* h_src = nullptr; + INT16* hl = nullptr; + INT16* lh = nullptr; + INT16* hh = nullptr; + INT16* ll = nullptr; const UINT32 total_width = subband_width << 1; diff --git a/libfreerdp/codec/rfx_encode.c b/libfreerdp/codec/rfx_encode.c index 745488625..b4cf28522 100644 --- a/libfreerdp/codec/rfx_encode.c +++ b/libfreerdp/codec/rfx_encode.c @@ -42,13 +42,13 @@ static void rfx_encode_format_rgb(const BYTE* WINPR_RESTRICT rgb_data, uint32_t const BYTE* WINPR_RESTRICT palette, INT16* WINPR_RESTRICT r_buf, INT16* WINPR_RESTRICT g_buf, INT16* WINPR_RESTRICT b_buf) { - const BYTE* src = NULL; + const BYTE* src = nullptr; INT16 r = 0; INT16 g = 0; INT16 b = 0; - INT16* r_last = NULL; - INT16* g_last = NULL; - INT16* b_last = NULL; + INT16* r_last = nullptr; + INT16* g_last = nullptr; + INT16* b_last = nullptr; uint32_t x_exceed = 64 - width; uint32_t y_exceed = 64 - height; diff --git a/libfreerdp/codec/rfx_rlgr.c b/libfreerdp/codec/rfx_rlgr.c index 447c2e3f9..b089864ba 100644 --- a/libfreerdp/codec/rfx_rlgr.c +++ b/libfreerdp/codec/rfx_rlgr.c @@ -167,12 +167,12 @@ int rfx_rlgr_decode(RLGR_MODE mode, const BYTE* WINPR_RESTRICT pSrcData, UINT32 UINT32 nIdx = 0; UINT32 val1 = 0; UINT32 val2 = 0; - INT16* pOutput = NULL; - wBitStream* bs = NULL; + INT16* pOutput = nullptr; + wBitStream* bs = nullptr; wBitStream s_bs = WINPR_C_ARRAY_INIT; const SSIZE_T DstSize = rDstSize; - InitOnceExecuteOnce(&rfx_rlgr_init_once, rfx_rlgr_init, NULL, NULL); + InitOnceExecuteOnce(&rfx_rlgr_init_once, rfx_rlgr_init, nullptr, nullptr); k = 1; kp = k << LSGR; @@ -658,7 +658,7 @@ int rfx_rlgr_encode(RLGR_MODE mode, const INT16* WINPR_RESTRICT data, UINT32 dat uint32_t k = 0; uint32_t kp = 0; uint32_t krp = 0; - RFX_BITSTREAM* bs = NULL; + RFX_BITSTREAM* bs = nullptr; if (!(bs = (RFX_BITSTREAM*)winpr_aligned_calloc(1, sizeof(RFX_BITSTREAM), 32))) return 0; diff --git a/libfreerdp/codec/sse/nsc_sse2.c b/libfreerdp/codec/sse/nsc_sse2.c index 4305e1a51..d72579800 100644 --- a/libfreerdp/codec/sse/nsc_sse2.c +++ b/libfreerdp/codec/sse/nsc_sse2.c @@ -382,12 +382,12 @@ static BOOL nsc_encode_argb_to_aycocg_sse2(NSC_CONTEXT* context, const BYTE* dat static void nsc_encode_subsampling_sse2(NSC_CONTEXT* context) { - BYTE* co_dst = NULL; - BYTE* cg_dst = NULL; - INT8* co_src0 = NULL; - INT8* co_src1 = NULL; - INT8* cg_src0 = NULL; - INT8* cg_src1 = NULL; + BYTE* co_dst = nullptr; + BYTE* cg_dst = nullptr; + INT8* co_src0 = nullptr; + INT8* co_src1 = nullptr; + INT8* cg_src0 = nullptr; + INT8* cg_src1 = nullptr; UINT32 tempWidth = 0; UINT32 tempHeight = 0; __m128i t; diff --git a/libfreerdp/codec/test/TestFreeRDPCodecClear.c b/libfreerdp/codec/test/TestFreeRDPCodecClear.c index 7bb3a9d54..9986fc3f6 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecClear.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecClear.c @@ -58,7 +58,7 @@ static BOOL test_ClearDecompressExample(UINT32 nr, UINT32 width, UINT32 height, goto fail; status = clear_decompress(clear, pSrcData, SrcSize, width, height, pDstData, - PIXEL_FORMAT_XRGB32, 0, 0, 0, width, height, NULL); + PIXEL_FORMAT_XRGB32, 0, 0, 0, width, height, nullptr); (void)printf("clear_decompress example %" PRIu32 " status: %d\n", nr, status); (void)fflush(stdout); rc = (status == 0); diff --git a/libfreerdp/codec/test/TestFreeRDPCodecCopy.c b/libfreerdp/codec/test/TestFreeRDPCodecCopy.c index e8891b1e3..fdd81df9e 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecCopy.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecCopy.c @@ -29,7 +29,7 @@ static BOOL TestFreeRDPImageCopy(UINT32 w, UINT32 h, UINT32 srcFormat, UINT32 ds winpr_RAND_pseudo(src, h * srcStep); const UINT64 start = winpr_GetUnixTimeNS(); rc = freerdp_image_copy(dst, dstFormat, dstStep, 0, 0, w, h, src, srcFormat, srcStep, 0, 0, - NULL, 0); + nullptr, 0); const UINT64 end = winpr_GetUnixTimeNS(); double ms = (double)(end - start); @@ -67,7 +67,7 @@ static BOOL TestFreeRDPImageCopy_no_overlap(UINT32 w, UINT32 h, UINT32 srcFormat winpr_RAND_pseudo(src, h * srcStep); const UINT64 start = winpr_GetUnixTimeNS(); rc = freerdp_image_copy_no_overlap(dst, dstFormat, dstStep, 0, 0, w, h, src, srcFormat, - srcStep, 0, 0, NULL, 0); + srcStep, 0, 0, nullptr, 0); const UINT64 end = winpr_GetUnixTimeNS(); double ms = (double)(end - start); @@ -103,8 +103,8 @@ int TestFreeRDPCodecCopy(int argc, char* argv[]) if (argc == 3) { errno = 0; - width = strtoul(argv[1], NULL, 0); - height = strtoul(argv[2], NULL, 0); + width = strtoul(argv[1], nullptr, 0); + height = strtoul(argv[2], nullptr, 0); if ((errno != 0) || (width == 0) || (height == 0)) { char buffer[128] = WINPR_C_ARRAY_INIT; diff --git a/libfreerdp/codec/test/TestFreeRDPCodecH264.c b/libfreerdp/codec/test/TestFreeRDPCodecH264.c index fca845e95..c2803bbd3 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecH264.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecH264.c @@ -67,7 +67,7 @@ static void* allocRGB(uint32_t format, uint32_t width, uint32_t height, uint32_t uint8_t* rgb = calloc(stride, height); if (!rgb) - return NULL; + return nullptr; for (size_t x = 0; x < height; x++) { @@ -98,8 +98,8 @@ static BOOL compareRGB(const uint8_t* src, const uint8_t* dst, uint32_t format, static BOOL testEncode(uint32_t format, uint32_t width, uint32_t height) { BOOL rc = FALSE; - void* src = NULL; - void* out = NULL; + void* src = nullptr; + void* out = nullptr; RDPGFX_H264_METABLOCK meta = WINPR_C_ARRAY_INIT; H264_CONTEXT* h264 = h264_context_new(TRUE); H264_CONTEXT* h264dec = h264_context_new(FALSE); @@ -120,7 +120,7 @@ static BOOL testEncode(uint32_t format, uint32_t width, uint32_t height) const RECTANGLE_16 rect = { .left = 0, .top = 0, .right = width, .bottom = height }; uint32_t dstsize = 0; - uint8_t* dst = NULL; + uint8_t* dst = nullptr; if (avc420_compress(h264, src, format, stride, width, height, &rect, &dst, &dstsize, &meta) < 0) goto fail; if ((dstsize == 0) || !dst) @@ -156,8 +156,8 @@ int TestFreeRDPCodecH264(int argc, char* argv[]) if (argc == 3) { errno = 0; - width = strtoul(argv[1], NULL, 0); - height = strtoul(argv[2], NULL, 0); + width = strtoul(argv[1], nullptr, 0); + height = strtoul(argv[2], nullptr, 0); if ((errno != 0) || (width == 0) || (height == 0)) { char buffer[128] = WINPR_C_ARRAY_INIT; diff --git a/libfreerdp/codec/test/TestFreeRDPCodecInterleaved.c b/libfreerdp/codec/test/TestFreeRDPCodecInterleaved.c index 18abc5f2c..954b50e72 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecInterleaved.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecInterleaved.c @@ -52,8 +52,8 @@ static bool run_encode_decode_single(UINT16 bpp, BITMAP_INTERLEAVED_CONTEXT* enc goto fail; PROFILER_ENTER(profiler_comp) - rc = - interleaved_compress(encoder, tmp, &DstSize, w, h, pSrcData, format, step, x, y, NULL, bpp); + rc = interleaved_compress(encoder, tmp, &DstSize, w, h, pSrcData, format, step, x, y, nullptr, + bpp); PROFILER_EXIT(profiler_comp) if (!rc) @@ -61,7 +61,7 @@ static bool run_encode_decode_single(UINT16 bpp, BITMAP_INTERLEAVED_CONTEXT* enc PROFILER_ENTER(profiler_decomp) rc = interleaved_decompress(decoder, tmp, DstSize, w, h, bpp, pDstData, format, step, x, y, w, - h, NULL); + h, nullptr); PROFILER_EXIT(profiler_decomp) if (!rc) @@ -82,8 +82,8 @@ static bool run_encode_decode_single(UINT16 bpp, BITMAP_INTERLEAVED_CONTEXT* enc BYTE db = 0; const UINT32 srcColor = FreeRDPReadColor(&srcLine[1ULL * j * bstep], format); const UINT32 dstColor = FreeRDPReadColor(&dstLine[1ULL * j * bstep], format); - FreeRDPSplitColor(srcColor, format, &r, &g, &b, NULL, NULL); - FreeRDPSplitColor(dstColor, format, &dr, &dg, &db, NULL, NULL); + FreeRDPSplitColor(srcColor, format, &r, &g, &b, nullptr, nullptr); + FreeRDPSplitColor(dstColor, format, &dr, &dg, &db, nullptr, nullptr); if (abs(r - dr) > maxDiff) goto fail; @@ -174,17 +174,17 @@ static bool TestColorConversion(void) const UINT32 format = formats[x]; const UINT32 colorLow = FreeRDPGetColor(format, 0, 0, 0, 255); const UINT32 colorHigh = FreeRDPGetColor(format, 255, 255, 255, 255); - const UINT32 colorLow32 = FreeRDPConvertColor(colorLow, format, dstFormat, NULL); - const UINT32 colorHigh32 = FreeRDPConvertColor(colorHigh, format, dstFormat, NULL); + const UINT32 colorLow32 = FreeRDPConvertColor(colorLow, format, dstFormat, nullptr); + const UINT32 colorHigh32 = FreeRDPConvertColor(colorHigh, format, dstFormat, nullptr); BYTE r = 0; BYTE g = 0; BYTE b = 0; BYTE a = 0; - FreeRDPSplitColor(colorLow32, dstFormat, &r, &g, &b, &a, NULL); + FreeRDPSplitColor(colorLow32, dstFormat, &r, &g, &b, &a, nullptr); if ((r != 0) || (g != 0) || (b != 0)) return false; - FreeRDPSplitColor(colorHigh32, dstFormat, &r, &g, &b, &a, NULL); + FreeRDPSplitColor(colorHigh32, dstFormat, &r, &g, &b, &a, nullptr); if ((r != 255) || (g != 255) || (b != 255)) return false; } @@ -196,8 +196,8 @@ static bool RunEncoderTest(const char* name, uint32_t format, uint32_t width, ui uint32_t step, uint32_t bpp) { bool rc = false; - void* data = NULL; - void* encdata = NULL; + void* data = nullptr; + void* encdata = nullptr; BITMAP_INTERLEAVED_CONTEXT* encoder = bitmap_interleaved_context_new(true); if (!encoder) goto fail; @@ -215,7 +215,7 @@ static bool RunEncoderTest(const char* name, uint32_t format, uint32_t width, ui { uint32_t enclen = WINPR_ASSERTING_INT_CAST(uint32_t, srclen); if (!interleaved_compress(encoder, encdata, &enclen, width, height, data, format, step, 0, - 0, NULL, bpp)) + 0, nullptr, bpp)) goto fail; char encname[128] = WINPR_C_ARRAY_INIT; @@ -241,8 +241,8 @@ static bool RunDecoderTest(const char* name, uint32_t format, uint32_t width, ui uint32_t step, uint32_t bpp) { bool rc = false; - void* data = NULL; - void* decdata = NULL; + void* data = nullptr; + void* decdata = nullptr; BITMAP_INTERLEAVED_CONTEXT* decoder = bitmap_interleaved_context_new(false); if (!decoder) goto fail; @@ -264,7 +264,7 @@ static bool RunDecoderTest(const char* name, uint32_t format, uint32_t width, ui { if (!interleaved_decompress(decoder, data, WINPR_ASSERTING_INT_CAST(uint32_t, srclen), width, height, bpp, decdata, format, step, 0, 0, width, height, - NULL)) + nullptr)) goto fail; char decname[128] = WINPR_C_ARRAY_INIT; @@ -364,8 +364,8 @@ static bool isObjectValid(const WINPR_JSON* obj) static bool TestEncoder(void) { bool rc = false; - WINPR_JSON* json = NULL; - char* file = NULL; + WINPR_JSON* json = nullptr; + char* file = nullptr; char* path = GetCombinedPath(CMAKE_CURRENT_SOURCE_DIR, "interleaved"); if (!path) goto fail; @@ -419,8 +419,8 @@ fail: int TestFreeRDPCodecInterleaved(int argc, char* argv[]) { - BITMAP_INTERLEAVED_CONTEXT* encoder = NULL; - BITMAP_INTERLEAVED_CONTEXT* decoder = NULL; + BITMAP_INTERLEAVED_CONTEXT* encoder = nullptr; + BITMAP_INTERLEAVED_CONTEXT* decoder = nullptr; int rc = -1; WINPR_UNUSED(argc); WINPR_UNUSED(argv); diff --git a/libfreerdp/codec/test/TestFreeRDPCodecMppc.c b/libfreerdp/codec/test/TestFreeRDPCodecMppc.c index f168647e5..94dab1451 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecMppc.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecMppc.c @@ -744,7 +744,7 @@ static int test_MppcCompressBellsRdp5(void) const UINT32 SrcSize = sizeof(TEST_MPPC_BELLS) - 1; const BYTE* pSrcData = (const BYTE*)TEST_MPPC_BELLS; UINT32 DstSize = sizeof(OutputBuffer); - const BYTE* pDstData = NULL; + const BYTE* pDstData = nullptr; const UINT32 expectedSize = sizeof(TEST_MPPC_BELLS_RDP5) - 1; MPPC_CONTEXT* mppc = mppc_context_new(1, TRUE); @@ -792,7 +792,7 @@ static int test_MppcCompressBellsRdp4(void) const BYTE* pSrcData = (const BYTE*)TEST_MPPC_BELLS; const UINT32 SrcSize = sizeof(TEST_MPPC_BELLS) - 1; UINT32 DstSize = sizeof(OutputBuffer); - const BYTE* pDstData = NULL; + const BYTE* pDstData = nullptr; const UINT32 expectedSize = sizeof(TEST_MPPC_BELLS_RDP4) - 1; MPPC_CONTEXT* mppc = mppc_context_new(0, TRUE); @@ -835,12 +835,12 @@ static int test_MppcDecompressBellsRdp5(void) int rc = -1; int status = 0; UINT32 Flags = 0; - const BYTE* pSrcData = NULL; + const BYTE* pSrcData = nullptr; UINT32 SrcSize = 0; UINT32 DstSize = 0; - MPPC_CONTEXT* mppc = NULL; + MPPC_CONTEXT* mppc = nullptr; UINT32 expectedSize = 0; - const BYTE* pDstData = NULL; + const BYTE* pDstData = nullptr; mppc = mppc_context_new(1, FALSE); if (!mppc) @@ -882,12 +882,12 @@ static int test_MppcDecompressBellsRdp4(void) int rc = -1; int status = 0; UINT32 Flags = 0; - const BYTE* pSrcData = NULL; + const BYTE* pSrcData = nullptr; UINT32 SrcSize = 0; UINT32 DstSize = 0; - MPPC_CONTEXT* mppc = NULL; + MPPC_CONTEXT* mppc = nullptr; UINT32 expectedSize = 0; - const BYTE* pDstData = NULL; + const BYTE* pDstData = nullptr; mppc = mppc_context_new(0, FALSE); if (!mppc) @@ -934,7 +934,7 @@ static int test_MppcCompressIslandRdp5(void) const BYTE* pSrcData = (const BYTE*)TEST_ISLAND_DATA; const UINT32 expectedSize = sizeof(TEST_ISLAND_DATA_RDP5) - 1; UINT32 DstSize = sizeof(OutputBuffer); - const BYTE* pDstData = NULL; + const BYTE* pDstData = nullptr; MPPC_CONTEXT* mppc = mppc_context_new(1, TRUE); if (!mppc) @@ -982,7 +982,7 @@ static int test_MppcCompressBufferRdp5(void) const UINT32 expectedSize = sizeof(TEST_RDP5_COMPRESSED_DATA); UINT32 DstSize = sizeof(OutputBuffer); - const BYTE* pDstData = NULL; + const BYTE* pDstData = nullptr; MPPC_CONTEXT* mppc = mppc_context_new(1, TRUE); if (!mppc) @@ -1021,12 +1021,12 @@ static int test_MppcDecompressBufferRdp5(void) int rc = -1; int status = 0; UINT32 Flags = 0; - const BYTE* pSrcData = NULL; + const BYTE* pSrcData = nullptr; UINT32 SrcSize = 0; UINT32 DstSize = 0; - MPPC_CONTEXT* mppc = NULL; + MPPC_CONTEXT* mppc = nullptr; UINT32 expectedSize = 0; - const BYTE* pDstData = NULL; + const BYTE* pDstData = nullptr; mppc = mppc_context_new(1, FALSE); if (!mppc) diff --git a/libfreerdp/codec/test/TestFreeRDPCodecNCrush.c b/libfreerdp/codec/test/TestFreeRDPCodecNCrush.c index 72aa09771..4be9464cf 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecNCrush.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecNCrush.c @@ -15,7 +15,7 @@ static BOOL test_NCrushCompressBells(void) BOOL rc = FALSE; int status = 0; UINT32 Flags = 0; - const BYTE* pDstData = NULL; + const BYTE* pDstData = nullptr; BYTE OutputBuffer[65536] = WINPR_C_ARRAY_INIT; const UINT32 SrcSize = sizeof(TEST_BELLS_DATA) - 1; const BYTE* pSrcData = TEST_BELLS_DATA; @@ -66,11 +66,11 @@ static BOOL test_NCrushDecompressBells(void) BOOL rc = FALSE; int status = 0; UINT32 Flags = 0; - const BYTE* pSrcData = NULL; + const BYTE* pSrcData = nullptr; UINT32 SrcSize = 0; UINT32 DstSize = 0; UINT32 expectedSize = 0; - const BYTE* pDstData = NULL; + const BYTE* pDstData = nullptr; NCRUSH_CONTEXT* ncrush = ncrush_context_new(FALSE); if (!ncrush) diff --git a/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c b/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c index a772d0488..d29118cb8 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c @@ -82,8 +82,8 @@ static BOOL CompareBitmap(const BYTE* srcA, UINT32 srcAFormat, const BYTE* srcB, const BYTE* b = &lineB[x * FreeRDPGetBytesPerPixel(srcBFormat)]; UINT32 colorA = FreeRDPReadColor(a, srcAFormat); UINT32 colorB = FreeRDPReadColor(b, srcBFormat); - FreeRDPSplitColor(colorA, srcAFormat, &sR, &sG, &sB, &sA, NULL); - FreeRDPSplitColor(colorB, srcBFormat, &dR, &dG, &dB, &dA, NULL); + FreeRDPSplitColor(colorA, srcAFormat, &sR, &sG, &sB, &sA, nullptr); + FreeRDPSplitColor(colorB, srcBFormat, &dR, &dG, &dB, &dA, nullptr); if (fabs((double)sR - dR) > maxDiff) return FALSE; @@ -117,7 +117,7 @@ static BOOL RunTestPlanar(BITMAP_PLANAR_CONTEXT* encplanar, BITMAP_PLANAR_CONTEX return FALSE; BYTE* compressedBitmap = freerdp_bitmap_compress_planar(encplanar, srcBitmap, srcFormat, width, - height, 0, NULL, &dstSize); + height, 0, nullptr, &dstSize); BYTE* decompressedBitmap = (BYTE*)calloc(height, 1ULL * width * FreeRDPGetBytesPerPixel(dstFormat)); @@ -187,7 +187,7 @@ static BOOL RunTestPlanarSingleColor(BITMAP_PLANAR_CONTEXT* planar, const UINT32 BOOL failed = TRUE; const UINT32 srcSize = width * height * FreeRDPGetBytesPerPixel(srcFormat); const UINT32 dstSize = width * height * FreeRDPGetBytesPerPixel(dstFormat); - BYTE* compressedBitmap = NULL; + BYTE* compressedBitmap = nullptr; BYTE* bmp = malloc(srcSize); BYTE* decompressedBitmap = (BYTE*)malloc(dstSize); @@ -206,7 +206,7 @@ static BOOL RunTestPlanarSingleColor(BITMAP_PLANAR_CONTEXT* planar, const UINT32 } compressedBitmap = freerdp_bitmap_compress_planar(planar, bmp, srcFormat, width, height, - 0, NULL, &compressedSize); + 0, nullptr, &compressedSize); if (!compressedBitmap) goto fail_loop; diff --git a/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c b/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c index 30f8b9f60..79b5a1f01 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c @@ -144,7 +144,7 @@ typedef struct static int g_Width = 0; static int g_Height = 0; static int g_DstStep = 0; -static BYTE* g_DstData = NULL; +static BYTE* g_DstData = nullptr; static void sample_file_free(EGFX_SAMPLE_FILE* file) { @@ -152,13 +152,13 @@ static void sample_file_free(EGFX_SAMPLE_FILE* file) return; free(file->buffer); - file->buffer = NULL; + file->buffer = nullptr; file->size = 0; } static void test_fill_image_alpha_channel(BYTE* data, UINT32 width, UINT32 height, BYTE value) { - UINT32* pixel = NULL; + UINT32* pixel = nullptr; for (UINT32 i = 0; i < height; i++) { @@ -183,7 +183,7 @@ static void* test_image_memset32(UINT32* ptr, UINT32 fill, size_t length) static int test_image_fill(BYTE* pDstData, UINT32 nDstStep, UINT32 nXDst, UINT32 nYDst, UINT32 nWidth, UINT32 nHeight, UINT32 color) { - UINT32* pDstPixel = NULL; + UINT32* pDstPixel = nullptr; if (nDstStep < 0) nDstStep = 4 * nWidth; @@ -280,13 +280,13 @@ static BYTE* test_progressive_load_file(const char* path, const char* file, size char* filename = GetCombinedPath(path, file); if (!filename) - return NULL; + return nullptr; FILE* fp = winpr_fopen(filename, "r"); free(filename); if (!fp) - return NULL; + return nullptr; (void)_fseeki64(fp, 0, SEEK_END); const INT64 pos = _ftelli64(fp); @@ -299,14 +299,14 @@ static BYTE* test_progressive_load_file(const char* path, const char* file, size if (!buffer) { (void)fclose(fp); - return NULL; + return nullptr; } if (fread(buffer, *size, 1, fp) != 1) { free(buffer); (void)fclose(fp); - return NULL; + return nullptr; } (void)fclose(fp); @@ -544,23 +544,23 @@ static int test_progressive_load_files(char* ms_sample_path, EGFX_SAMPLE_FILE fi static BYTE* test_progressive_load_bitmap(char* path, char* file, size_t* size, int quarter) { int status = 0; - BYTE* buffer = NULL; - wImage* image = NULL; - char* filename = NULL; + BYTE* buffer = nullptr; + wImage* image = nullptr; + char* filename = nullptr; filename = GetCombinedPath(path, file); if (!filename) - return NULL; + return nullptr; image = winpr_image_new(); if (!image) - return NULL; + return nullptr; status = winpr_image_read(image, filename); if (status < 0) - return NULL; + return nullptr; buffer = image->data; *size = 1ULL * image->height * image->scanline; @@ -835,7 +835,7 @@ static int test_progressive_decode(PROGRESSIVE_CONTEXT* progressive, EGFX_SAMPLE { const int status = progressive_decompress(progressive, files[pass].buffer, files[pass].size, g_DstData, - PIXEL_FORMAT_XRGB32, g_DstStep, 0, 0, NULL, 0, 0); + PIXEL_FORMAT_XRGB32, g_DstStep, 0, 0, nullptr, 0, 0); printf("ProgressiveDecompress: status: %d pass: %d\n", status, pass + 1); PROGRESSIVE_BLOCK_REGION* region = &(progressive->region); @@ -891,8 +891,8 @@ static int test_progressive_decode(PROGRESSIVE_CONTEXT* progressive, EGFX_SAMPLE nXSrc = nXDst - WINPR_ASSERTING_INT_CAST(int, tile->x); nYSrc = nYDst - WINPR_ASSERTING_INT_CAST(int, tile->y); freerdp_image_copy(g_DstData, PIXEL_FORMAT_XRGB32, g_DstStep, nXDst, nYDst, nWidth, - nHeight, tile->data, PIXEL_FORMAT_XRGB32, 64 * 4, nXSrc, nYSrc, NULL, - FREERDP_FLIP_NONE); + nHeight, tile->data, PIXEL_FORMAT_XRGB32, 64 * 4, nXSrc, nYSrc, + nullptr, FREERDP_FLIP_NONE); } const size_t size = bitmaps[pass].size; @@ -917,7 +917,7 @@ static int test_progressive_ms_sample(char* ms_sample_path) int status = 0; EGFX_SAMPLE_FILE files[3][4][4] = WINPR_C_ARRAY_INIT; EGFX_SAMPLE_FILE bitmaps[3][4][4] = WINPR_C_ARRAY_INIT; - PROGRESSIVE_CONTEXT* progressive = NULL; + PROGRESSIVE_CONTEXT* progressive = nullptr; g_Width = 1920; g_Height = 1080; g_DstStep = g_Width * 4; @@ -1029,8 +1029,8 @@ static BOOL colordiff(UINT32 format, UINT32 a, UINT32 b) BYTE bg = 0; BYTE bb = 0; BYTE ba = 0; - FreeRDPSplitColor(a, format, &ar, &ag, &ab, &aa, NULL); - FreeRDPSplitColor(b, format, &br, &bg, &bb, &ba, NULL); + FreeRDPSplitColor(a, format, &ar, &ag, &ab, &aa, nullptr); + FreeRDPSplitColor(b, format, &br, &bg, &bb, &ba, nullptr); return !(!diff(aa, ba) || !diff(ar, br) || !diff(ag, bg) || !diff(ab, bb)); } @@ -1038,8 +1038,8 @@ static BOOL test_encode_decode(const char* path) { BOOL res = FALSE; int rc = 0; - BYTE* resultData = NULL; - BYTE* dstData = NULL; + BYTE* resultData = nullptr; + BYTE* dstData = nullptr; UINT32 dstSize = 0; UINT32 ColorFormat = PIXEL_FORMAT_BGRX32; REGION16 invalidRegion = WINPR_C_ARRAY_INIT; @@ -1063,7 +1063,7 @@ static BOOL test_encode_decode(const char* path) // Progressive encode rc = progressive_compress(progressiveEnc, image->data, image->scanline * image->height, - ColorFormat, image->width, image->height, image->scanline, NULL, + ColorFormat, image->width, image->height, image->scanline, nullptr, &dstData, &dstSize); if (rc < 0) goto fail; @@ -1127,7 +1127,7 @@ static BOOL readUInt(FILE* fp, const char* prefix, const char* postfix, UINT32* const size_t plen = strlen(prefix); const size_t polen = strlen(postfix); - char* str = NULL; + char* str = nullptr; size_t len = SIZE_MAX; const INT64 res = GetLine(&str, &len, fp); if ((res < plen + polen) || !str) @@ -1143,7 +1143,7 @@ static BOOL readUInt(FILE* fp, const char* prefix, const char* postfix, UINT32* *end = '\0'; errno = 0; - unsigned long val = strtoul(start, NULL, 0); + unsigned long val = strtoul(start, nullptr, 0); if ((errno != 0) || (val > UINT32_MAX)) goto fail; @@ -1186,7 +1186,7 @@ static BOOL read_cmd(FILE* fp, RDPGFX_SURFACE_COMMAND* cmd, UINT32* frameId) if (!readUInt(fp, "length: ", "\n", &cmd->length)) return FALSE; - char* data = NULL; + char* data = nullptr; size_t dlen = SIZE_MAX; INT64 slen = GetLine(&data, &dlen, fp); if (slen < 0) @@ -1252,10 +1252,10 @@ static int test_dump(int argc, char* argv[]) const char* path = argv[1]; errno = 0; - const unsigned long width = strtoul(argv[2], NULL, 0); + const unsigned long width = strtoul(argv[2], nullptr, 0); if ((errno != 0) || (width <= 0)) usage(argv[0]); - const unsigned long height = strtoul(argv[3], NULL, 0); + const unsigned long height = strtoul(argv[3], nullptr, 0); if ((errno != 0) || (height <= 0)) usage(argv[0]); @@ -1277,7 +1277,7 @@ static int test_dump(int argc, char* argv[]) success = 0; while (success >= 0) { - char* fname = NULL; + char* fname = nullptr; size_t flen = 0; winpr_asprintf(&fname, &flen, "%s/%08" PRIx32 ".raw", path, count++); FILE* fp = fopen(fname, "r"); @@ -1315,7 +1315,7 @@ static int test_dump(int argc, char* argv[]) const UINT64 start = winpr_GetTickCount64NS(); if (!freerdp_image_copy_no_overlap(dst, DstFormat, stride, cmd.left, cmd.top, cmd.width, cmd.height, cmd.data, cmd.format, - 0, 0, 0, NULL, FREERDP_FLIP_NONE)) + 0, 0, 0, nullptr, FREERDP_FLIP_NONE)) success = -1; RECTANGLE_16 invalidRect = { .left = (UINT16)MIN(UINT16_MAX, cmd.left), @@ -1341,7 +1341,7 @@ static int test_dump(int argc, char* argv[]) const UINT64 start = winpr_GetTickCount64NS(); success = clear_decompress(codecs->clear, cmd.data, cmd.length, cmd.width, cmd.height, dst, DstFormat, stride, cmd.left, - cmd.top, width, height, NULL); + cmd.top, width, height, nullptr); const RECTANGLE_16 invalidRect = { .left = (UINT16)MIN(UINT16_MAX, cmd.left), .top = (UINT16)MIN(UINT16_MAX, cmd.top), @@ -1423,7 +1423,7 @@ static int test_dump(int argc, char* argv[]) const UINT32 h = rect->bottom - rect->top; if (!freerdp_image_copy_no_overlap(output, DstFormat, stride, rect->left, rect->top, w, h, dst, DstFormat, stride, - rect->left, rect->top, NULL, 0)) + rect->left, rect->top, nullptr, 0)) success = -42; } copytime += measure_diff_and_print(cname, frameId, start); @@ -1467,7 +1467,7 @@ int TestFreeRDPCodecProgressive(int argc, char* argv[]) return test_dump(argc, argv); int rc = -1; - char* ms_sample_path = NULL; + char* ms_sample_path = nullptr; char name[8192]; SYSTEMTIME systemTime; WINPR_UNUSED(argc); diff --git a/libfreerdp/codec/test/TestFreeRDPCodecRemoteFX.c b/libfreerdp/codec/test/TestFreeRDPCodecRemoteFX.c index b584e9de6..387f92339 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecRemoteFX.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecRemoteFX.c @@ -846,8 +846,8 @@ int TestFreeRDPCodecRemoteFX(int argc, char* argv[]) { int rc = -1; REGION16 region = WINPR_C_ARRAY_INIT; - RFX_CONTEXT* context = NULL; - BYTE* dest = NULL; + RFX_CONTEXT* context = nullptr; + BYTE* dest = nullptr; size_t stride = FORMAT_SIZE * IMG_WIDTH; WINPR_UNUSED(argc); diff --git a/libfreerdp/codec/test/TestFreeRDPCodecXCrush.c b/libfreerdp/codec/test/TestFreeRDPCodecXCrush.c index ff8ab0c60..33111f150 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecXCrush.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecXCrush.c @@ -77,7 +77,7 @@ static BOOL test_run(const char* fkt, const void* src, UINT32 src_size, const vo BOOL rc = FALSE; int status = -1; UINT32 Flags = 0; - const BYTE* pDstData = NULL; + const BYTE* pDstData = nullptr; BYTE OutputBuffer[65536] = WINPR_C_ARRAY_INIT; UINT32 DstSize = sizeof(OutputBuffer); XCRUSH_CONTEXT* xcrush = xcrush_context_new(TRUE); diff --git a/libfreerdp/codec/test/TestFreeRDPCodecZGfx.c b/libfreerdp/codec/test/TestFreeRDPCodecZGfx.c index 68db553dd..108ceb106 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecZGfx.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecZGfx.c @@ -28,11 +28,11 @@ static int test_ZGfxCompressFox(void) int rc = -1; int status = 0; UINT32 Flags = 0; - const BYTE* pSrcData = NULL; + const BYTE* pSrcData = nullptr; UINT32 SrcSize = 0; UINT32 DstSize = 0; - BYTE* pDstData = NULL; - ZGFX_CONTEXT* zgfx = NULL; + BYTE* pDstData = nullptr; + ZGFX_CONTEXT* zgfx = nullptr; UINT32 expectedSize = 0; zgfx = zgfx_context_new(TRUE); @@ -80,11 +80,11 @@ static int test_ZGfxDecompressFoxSingle(void) int rc = -1; int status = 0; UINT32 Flags = 0; - const BYTE* pSrcData = NULL; + const BYTE* pSrcData = nullptr; UINT32 SrcSize = 0; UINT32 DstSize = 0; - BYTE* pDstData = NULL; - ZGFX_CONTEXT* zgfx = NULL; + BYTE* pDstData = nullptr; + ZGFX_CONTEXT* zgfx = nullptr; UINT32 expectedSize = 0; zgfx = zgfx_context_new(TRUE); @@ -132,11 +132,11 @@ static int test_ZGfxDecompressFoxMultipart(void) int rc = -1; int status = 0; UINT32 Flags = 0; - const BYTE* pSrcData = NULL; + const BYTE* pSrcData = nullptr; UINT32 SrcSize = 0; UINT32 DstSize = 0; - BYTE* pDstData = NULL; - ZGFX_CONTEXT* zgfx = NULL; + BYTE* pDstData = nullptr; + ZGFX_CONTEXT* zgfx = nullptr; UINT32 expectedSize = 0; zgfx = zgfx_context_new(TRUE); @@ -185,13 +185,13 @@ static int test_ZGfxCompressConsistent(void) int status = 0; UINT32 Flags = 0; - const BYTE* pSrcData = NULL; + const BYTE* pSrcData = nullptr; UINT32 SrcSize = 0; UINT32 DstSize = 0; - BYTE* pDstData = NULL; + BYTE* pDstData = nullptr; UINT32 DstSize2 = 0; - BYTE* pDstData2 = NULL; - ZGFX_CONTEXT* zgfx = NULL; + BYTE* pDstData2 = nullptr; + ZGFX_CONTEXT* zgfx = nullptr; UINT32 expectedSize = 0; BYTE BigBuffer[65536]; memset(BigBuffer, 0xaa, sizeof(BigBuffer)); diff --git a/libfreerdp/codec/test/TestFreeRDPHelpers.c b/libfreerdp/codec/test/TestFreeRDPHelpers.c index 11e03220b..1656fc051 100644 --- a/libfreerdp/codec/test/TestFreeRDPHelpers.c +++ b/libfreerdp/codec/test/TestFreeRDPHelpers.c @@ -33,7 +33,7 @@ static char* get_path(const char* codec, const char* type, const char* name) (void)snprintf(path, sizeof(path), "%s-%s-%s.bin", codec, type, name); char* s1 = GetCombinedPath(CMAKE_CURRENT_SOURCE_DIR, codec); if (!s1) - return NULL; + return nullptr; char* s2 = GetCombinedPath(s1, path); free(s1); @@ -50,7 +50,7 @@ static FILE* open_path(const char* codec, const char* type, const char* name, co if (!path) { (void)printf("%s: get_path %s %s failed\n", __func__, type, name); - return NULL; + return nullptr; } FILE* fp = winpr_fopen(path, mode); @@ -71,8 +71,8 @@ void* test_codec_helper_read_data(const char* codec, const char* type, const cha WINPR_ASSERT(name); WINPR_ASSERT(plength); - void* rc = NULL; - void* cmp = NULL; + void* rc = nullptr; + void* cmp = nullptr; *plength = 0; FILE* fp = open_path(codec, type, name, "rb"); @@ -96,7 +96,7 @@ void* test_codec_helper_read_data(const char* codec, const char* type, const cha *plength = pos; rc = cmp; - cmp = NULL; + cmp = nullptr; fail: (void)printf("%s: [%s] %s %s -> %p\n", __func__, codec, type, name, rc); diff --git a/libfreerdp/codec/test/TestFreeRDPRegion.c b/libfreerdp/codec/test/TestFreeRDPRegion.c index 91f0eebb0..61b6d5274 100644 --- a/libfreerdp/codec/test/TestFreeRDPRegion.c +++ b/libfreerdp/codec/test/TestFreeRDPRegion.c @@ -44,7 +44,7 @@ static int test_basic(void) { REGION16 region = WINPR_C_ARRAY_INIT; int retCode = -1; - const RECTANGLE_16* rects = NULL; + const RECTANGLE_16* rects = nullptr; UINT32 nbRects = 0; /* R1 + R2 ==> disjointed rects */ RECTANGLE_16 r1 = { 0, 101, 200, 201 }; @@ -88,7 +88,7 @@ static int test_r1_r3(void) { REGION16 region; int retCode = -1; - const RECTANGLE_16* rects = NULL; + const RECTANGLE_16* rects = nullptr; UINT32 nbRects = 0; RECTANGLE_16 r1 = { 0, 101, 200, 201 }; RECTANGLE_16 r3 = { 150, 151, 250, 251 }; @@ -144,7 +144,7 @@ static int test_r9_r10(void) { REGION16 region; int retCode = -1; - const RECTANGLE_16* rects = NULL; + const RECTANGLE_16* rects = nullptr; UINT32 nbRects = 0; /* * +=============================================================== @@ -190,7 +190,7 @@ static int test_r1_r5(void) { REGION16 region; int retCode = -1; - const RECTANGLE_16* rects = NULL; + const RECTANGLE_16* rects = nullptr; UINT32 nbRects = 0; RECTANGLE_16 r1 = { 0, 101, 200, 201 }; RECTANGLE_16 r5 = { 150, 121, 300, 131 }; @@ -232,7 +232,7 @@ static int test_r1_r6(void) { REGION16 region = WINPR_C_ARRAY_INIT; int retCode = -1; - const RECTANGLE_16* rects = NULL; + const RECTANGLE_16* rects = nullptr; UINT32 nbRects = 0; RECTANGLE_16 r1 = { 0, 101, 200, 201 }; RECTANGLE_16 r6 = { 150, 121, 170, 131 }; @@ -273,7 +273,7 @@ static int test_r1_r2_r4(void) { REGION16 region; int retCode = -1; - const RECTANGLE_16* rects = NULL; + const RECTANGLE_16* rects = nullptr; UINT32 nbRects = 0; RECTANGLE_16 r1 = { 0, 101, 200, 201 }; RECTANGLE_16 r2 = { 150, 301, 250, 401 }; @@ -323,7 +323,7 @@ static int test_r1_r7_r8(void) { REGION16 region; int retCode = -1; - const RECTANGLE_16* rects = NULL; + const RECTANGLE_16* rects = nullptr; UINT32 nbRects = 0; RECTANGLE_16 r1 = { 0, 101, 200, 201 }; RECTANGLE_16 r7 = { 300, 101, 500, 201 }; @@ -405,7 +405,7 @@ static int test_r1_r2_r3_r4(void) { REGION16 region; int retCode = -1; - const RECTANGLE_16* rects = NULL; + const RECTANGLE_16* rects = nullptr; UINT32 nbRects = 0; RECTANGLE_16 r1 = { 0, 101, 200, 201 }; RECTANGLE_16 r2 = { 150, 301, 250, 401 }; @@ -487,7 +487,7 @@ static int test_from_weston(void) */ REGION16 region; int retCode = -1; - const RECTANGLE_16* rects = NULL; + const RECTANGLE_16* rects = nullptr; UINT32 nbRects = 0; RECTANGLE_16 r1 = { 0, 0, 640, 32 }; RECTANGLE_16 r2 = { 236, 169, 268, 201 }; @@ -535,7 +535,7 @@ static int test_r1_inter_r3(void) REGION16 region; REGION16 intersection; int retCode = -1; - const RECTANGLE_16* rects = NULL; + const RECTANGLE_16* rects = nullptr; UINT32 nbRects = 0; RECTANGLE_16 r1 = { 0, 101, 200, 201 }; RECTANGLE_16 r3 = { 150, 151, 250, 251 }; @@ -583,7 +583,7 @@ static int test_r1_r3_inter_r11(void) REGION16 region; REGION16 intersection; int retCode = -1; - const RECTANGLE_16* rects = NULL; + const RECTANGLE_16* rects = nullptr; UINT32 nbRects = 0; RECTANGLE_16 r1 = { 0, 101, 200, 201 }; RECTANGLE_16 r3 = { 150, 151, 250, 251 }; @@ -644,7 +644,7 @@ static int test_norbert_case(void) REGION16 region; REGION16 intersection; int retCode = -1; - const RECTANGLE_16* rects = NULL; + const RECTANGLE_16* rects = nullptr; UINT32 nbRects = 0; RECTANGLE_16 inRectangles[5] = { { 1680, 0, 1920, 242 }, { 294, 242, 971, 776 }, @@ -714,7 +714,7 @@ static int test_norbert2_case(void) { REGION16 region; int retCode = -1; - const RECTANGLE_16* rects = NULL; + const RECTANGLE_16* rects = nullptr; UINT32 nbRects = 0; RECTANGLE_16 rect1 = { 464, 696, 476, 709 }; RECTANGLE_16 rect2 = { 0, 0, 1024, 32 }; @@ -850,7 +850,7 @@ static struct UnitaryTest tests[] = { { "Basic trivial tests", test_basic }, { "norbert's case 2", test_norbert2_case }, { "empty rectangle case", test_empty_rectangle }, - { NULL, NULL } }; + { nullptr, nullptr } }; int TestFreeRDPRegion(int argc, char* argv[]) { diff --git a/libfreerdp/codec/test/TestFuzzCodecs.c b/libfreerdp/codec/test/TestFuzzCodecs.c index 5c5ae3e83..60e6cd5c1 100644 --- a/libfreerdp/codec/test/TestFuzzCodecs.c +++ b/libfreerdp/codec/test/TestFuzzCodecs.c @@ -58,7 +58,7 @@ static BOOL test_ClearDecompressExample(UINT32 nr, UINT32 width, UINT32 height, goto fail; status = clear_decompress(clear, pSrcData, SrcSize, width, height, pDstData, - PIXEL_FORMAT_XRGB32, 0, 0, 0, width, height, NULL); + PIXEL_FORMAT_XRGB32, 0, 0, 0, width, height, nullptr); // printf("clear_decompress example %" PRIu32 " status: %d\n", nr, status); // fflush(stdout); rc = (status == 0); @@ -83,7 +83,7 @@ static int TestFreeRDPCodecXCrush(const uint8_t* Data, size_t Size) if (Size > UINT32_MAX) return -1; - const BYTE* OutputBuffer = NULL; + const BYTE* OutputBuffer = nullptr; UINT32 DstSize = 0; XCRUSH_CONTEXT* xcrush = xcrush_context_new(TRUE); if (!xcrush) @@ -103,7 +103,7 @@ static int test_ZGfxDecompressFoxSingle(const uint8_t* Data, size_t Size) const BYTE* pSrcData = (const BYTE*)Data; UINT32 SrcSize = (UINT32)Size; UINT32 DstSize = 0; - BYTE* pDstData = NULL; + BYTE* pDstData = nullptr; ZGFX_CONTEXT* zgfx = zgfx_context_new(TRUE); if (!zgfx) @@ -137,7 +137,7 @@ static BOOL test_NCrushDecompressBells(const uint8_t* Data, size_t Size) const BYTE* pSrcData = (const BYTE*)Data; UINT32 SrcSize = (UINT32)Size; UINT32 DstSize = 0; - const BYTE* pDstData = NULL; + const BYTE* pDstData = nullptr; NCRUSH_CONTEXT* ncrush = ncrush_context_new(FALSE); if (!ncrush) @@ -207,7 +207,7 @@ static int test_MppcDecompressBellsRdp5(const uint8_t* Data, size_t Size) const BYTE* pSrcData = Data; UINT32 SrcSize = (UINT32)Size; UINT32 DstSize = 0; - const BYTE* pDstData = NULL; + const BYTE* pDstData = nullptr; MPPC_CONTEXT* mppc = mppc_context_new(1, FALSE); if (!mppc) @@ -235,7 +235,7 @@ static int test_MppcDecompressBellsRdp4(const uint8_t* Data, size_t Size) const BYTE* pSrcData = (const BYTE*)Data; UINT32 SrcSize = (UINT32)Size; UINT32 DstSize = 0; - const BYTE* pDstData = NULL; + const BYTE* pDstData = nullptr; MPPC_CONTEXT* mppc = mppc_context_new(0, FALSE); if (!mppc) @@ -262,7 +262,7 @@ static int test_MppcDecompressBufferRdp5(const uint8_t* Data, size_t Size) const BYTE* pSrcData = (const BYTE*)Data; UINT32 SrcSize = (UINT32)Size; UINT32 DstSize = 0; - const BYTE* pDstData = NULL; + const BYTE* pDstData = nullptr; MPPC_CONTEXT* mppc = mppc_context_new(1, FALSE); if (!mppc) @@ -291,7 +291,7 @@ static BOOL progressive_decode(const uint8_t* Data, size_t Size) { BOOL res = FALSE; int rc = 0; - BYTE* resultData = NULL; + BYTE* resultData = nullptr; UINT32 ColorFormat = PIXEL_FORMAT_BGRX32; REGION16 invalidRegion = WINPR_C_ARRAY_INIT; UINT32 scanline = 4240; @@ -363,7 +363,7 @@ static BOOL i_run_encode_decode(UINT16 bpp, BITMAP_INTERLEAVED_CONTEXT* encoder, goto fail; rc = interleaved_decompress(decoder, Data, (UINT32)Size, w, h, bpp, pDstData, format, step, x, - y, w, h, NULL); + y, w, h, nullptr); if (!rc) goto fail; @@ -384,9 +384,9 @@ static int TestFreeRDPCodecInterleaved(const uint8_t* Data, size_t Size) if (!decoder) goto fail; - i_run_encode_decode(24, NULL, decoder, Data, Size); - i_run_encode_decode(16, NULL, decoder, Data, Size); - i_run_encode_decode(15, NULL, decoder, Data, Size); + i_run_encode_decode(24, nullptr, decoder, Data, Size); + i_run_encode_decode(16, nullptr, decoder, Data, Size); + i_run_encode_decode(15, nullptr, decoder, Data, Size); rc = 0; fail: bitmap_interleaved_context_free(decoder); @@ -432,9 +432,9 @@ static BOOL TestPlanar(const UINT32 format, const uint8_t* Data, size_t Size) if (!planar) goto fail; - RunTestPlanar(planar, NULL, PIXEL_FORMAT_RGBX32, format, 64, 64, Data, Size); + RunTestPlanar(planar, nullptr, PIXEL_FORMAT_RGBX32, format, 64, 64, Data, Size); - RunTestPlanar(planar, NULL, PIXEL_FORMAT_RGB16, format, 32, 32, Data, Size); + RunTestPlanar(planar, nullptr, PIXEL_FORMAT_RGB16, format, 32, 32, Data, Size); rc = TRUE; fail: diff --git a/libfreerdp/codec/test/cursor/cursor_dump_00000000.c b/libfreerdp/codec/test/cursor/cursor_dump_00000000.c index b9acebfa8..25bce9f65 100644 --- a/libfreerdp/codec/test/cursor/cursor_dump_00000000.c +++ b/libfreerdp/codec/test/cursor/cursor_dump_00000000.c @@ -82,12 +82,12 @@ const gdiPalette cursor_dump_00000000_palette = { }; const rdpPointer cursor_dump_00000000_pointer = { .size = 0, - .New = NULL, - .Free = NULL, - .Set = NULL, - .SetNull = NULL, - .SetDefault = NULL, - .SetPosition = NULL, + .New = nullptr, + .Free = nullptr, + .Set = nullptr, + .SetNull = nullptr, + .SetDefault = nullptr, + .SetPosition = nullptr, .paddingA = { 0 }, .xPos = 0, .yPos = 0, diff --git a/libfreerdp/codec/test/cursor/cursor_dump_00000001.c b/libfreerdp/codec/test/cursor/cursor_dump_00000001.c index 7d8778de2..d7f6dc5b5 100644 --- a/libfreerdp/codec/test/cursor/cursor_dump_00000001.c +++ b/libfreerdp/codec/test/cursor/cursor_dump_00000001.c @@ -167,12 +167,12 @@ const gdiPalette cursor_dump_00000001_palette = { }; const rdpPointer cursor_dump_00000001_pointer = { .size = 0, - .New = NULL, - .Free = NULL, - .Set = NULL, - .SetNull = NULL, - .SetDefault = NULL, - .SetPosition = NULL, + .New = nullptr, + .Free = nullptr, + .Set = nullptr, + .SetNull = nullptr, + .SetDefault = nullptr, + .SetPosition = nullptr, .paddingA = { 0 }, .xPos = 0, .yPos = 0, diff --git a/libfreerdp/codec/test/cursor/cursor_dump_00000002.c b/libfreerdp/codec/test/cursor/cursor_dump_00000002.c index 14dfa02b6..e22201c6c 100644 --- a/libfreerdp/codec/test/cursor/cursor_dump_00000002.c +++ b/libfreerdp/codec/test/cursor/cursor_dump_00000002.c @@ -167,12 +167,12 @@ const gdiPalette cursor_dump_00000002_palette = { }; const rdpPointer cursor_dump_00000002_pointer = { .size = 0, - .New = NULL, - .Free = NULL, - .Set = NULL, - .SetNull = NULL, - .SetDefault = NULL, - .SetPosition = NULL, + .New = nullptr, + .Free = nullptr, + .Set = nullptr, + .SetNull = nullptr, + .SetDefault = nullptr, + .SetPosition = nullptr, .paddingA = { 0 }, .xPos = 0, .yPos = 0, diff --git a/libfreerdp/codec/test/cursor/cursor_dump_00000003.c b/libfreerdp/codec/test/cursor/cursor_dump_00000003.c index 6b979a70c..ddbee900c 100644 --- a/libfreerdp/codec/test/cursor/cursor_dump_00000003.c +++ b/libfreerdp/codec/test/cursor/cursor_dump_00000003.c @@ -167,12 +167,12 @@ const gdiPalette cursor_dump_00000003_palette = { }; const rdpPointer cursor_dump_00000003_pointer = { .size = 0, - .New = NULL, - .Free = NULL, - .Set = NULL, - .SetNull = NULL, - .SetDefault = NULL, - .SetPosition = NULL, + .New = nullptr, + .Free = nullptr, + .Set = nullptr, + .SetNull = nullptr, + .SetDefault = nullptr, + .SetPosition = nullptr, .paddingA = { 0 }, .xPos = 0, .yPos = 0, diff --git a/libfreerdp/codec/test/cursor/cursor_dump_00000004.c b/libfreerdp/codec/test/cursor/cursor_dump_00000004.c index bde34b7e3..bfdd544ba 100644 --- a/libfreerdp/codec/test/cursor/cursor_dump_00000004.c +++ b/libfreerdp/codec/test/cursor/cursor_dump_00000004.c @@ -167,12 +167,12 @@ const gdiPalette cursor_dump_00000004_palette = { }; const rdpPointer cursor_dump_00000004_pointer = { .size = 0, - .New = NULL, - .Free = NULL, - .Set = NULL, - .SetNull = NULL, - .SetDefault = NULL, - .SetPosition = NULL, + .New = nullptr, + .Free = nullptr, + .Set = nullptr, + .SetNull = nullptr, + .SetDefault = nullptr, + .SetPosition = nullptr, .paddingA = { 0 }, .xPos = 0, .yPos = 0, diff --git a/libfreerdp/codec/test/cursor/cursor_dump_00000005.c b/libfreerdp/codec/test/cursor/cursor_dump_00000005.c index 27f041c27..258ee4cb3 100644 --- a/libfreerdp/codec/test/cursor/cursor_dump_00000005.c +++ b/libfreerdp/codec/test/cursor/cursor_dump_00000005.c @@ -167,12 +167,12 @@ const gdiPalette cursor_dump_00000005_palette = { }; const rdpPointer cursor_dump_00000005_pointer = { .size = 0, - .New = NULL, - .Free = NULL, - .Set = NULL, - .SetNull = NULL, - .SetDefault = NULL, - .SetPosition = NULL, + .New = nullptr, + .Free = nullptr, + .Set = nullptr, + .SetNull = nullptr, + .SetDefault = nullptr, + .SetPosition = nullptr, .paddingA = { 0 }, .xPos = 0, .yPos = 0, diff --git a/libfreerdp/codec/xcrush.c b/libfreerdp/codec/xcrush.c index 8ddc6761d..eedb7352b 100644 --- a/libfreerdp/codec/xcrush.c +++ b/libfreerdp/codec/xcrush.c @@ -163,7 +163,7 @@ static const char* xcrush_get_level_1_compression_flags_string(UINT32 flags) static UINT16 xcrush_update_hash(const BYTE* WINPR_RESTRICT data, UINT32 size) { - const BYTE* end = NULL; + const BYTE* end = nullptr; UINT16 seed = 5381; /* same value as in djb2 */ WINPR_ASSERT(data); @@ -334,7 +334,7 @@ static int xcrush_find_next_matching_chunk(XCRUSH_CONTEXT* WINPR_RESTRICT xcrush XCRUSH_CHUNK* WINPR_RESTRICT chunk, XCRUSH_CHUNK** WINPR_RESTRICT pNextChunk) { - XCRUSH_CHUNK* next = NULL; + XCRUSH_CHUNK* next = nullptr; WINPR_ASSERT(xcrush); @@ -413,18 +413,18 @@ static int xcrush_find_match_length(XCRUSH_CONTEXT* WINPR_RESTRICT xcrush, UINT3 { UINT32 MatchSymbol = 0; UINT32 ChunkSymbol = 0; - BYTE* ChunkBuffer = NULL; - BYTE* MatchBuffer = NULL; - BYTE* MatchStartPtr = NULL; - BYTE* ForwardChunkPtr = NULL; - BYTE* ReverseChunkPtr = NULL; - BYTE* ForwardMatchPtr = NULL; - BYTE* ReverseMatchPtr = NULL; - BYTE* HistoryBufferEnd = NULL; + BYTE* ChunkBuffer = nullptr; + BYTE* MatchBuffer = nullptr; + BYTE* MatchStartPtr = nullptr; + BYTE* ForwardChunkPtr = nullptr; + BYTE* ReverseChunkPtr = nullptr; + BYTE* ForwardMatchPtr = nullptr; + BYTE* ReverseMatchPtr = nullptr; + BYTE* HistoryBufferEnd = nullptr; UINT32 ReverseMatchLength = 0; UINT32 ForwardMatchLength = 0; UINT32 TotalMatchLength = 0; - BYTE* HistoryBuffer = NULL; + BYTE* HistoryBuffer = nullptr; UINT32 HistoryBufferSize = 0; WINPR_ASSERT(xcrush); @@ -513,11 +513,11 @@ static int xcrush_find_all_matches(XCRUSH_CONTEXT* WINPR_RESTRICT xcrush, UINT32 int status = 0; UINT32 ChunkIndex = 0; UINT32 ChunkCount = 0; - XCRUSH_CHUNK* chunk = NULL; + XCRUSH_CHUNK* chunk = nullptr; UINT32 MatchLength = 0; UINT32 MaxMatchLength = 0; UINT32 PrevMatchEnd = 0; - XCRUSH_SIGNATURE* Signatures = NULL; + XCRUSH_SIGNATURE* Signatures = nullptr; XCRUSH_MATCH_INFO MaxMatchInfo = WINPR_C_ARRAY_INIT; WINPR_ASSERT(xcrush); @@ -616,10 +616,10 @@ static int xcrush_optimize_matches(XCRUSH_CONTEXT* WINPR_RESTRICT xcrush) UINT32 TotalMatchLength = 0; UINT32 OriginalMatchCount = 0; UINT32 OptimizedMatchCount = 0; - XCRUSH_MATCH_INFO* OriginalMatch = NULL; - XCRUSH_MATCH_INFO* OptimizedMatch = NULL; - XCRUSH_MATCH_INFO* OriginalMatches = NULL; - XCRUSH_MATCH_INFO* OptimizedMatches = NULL; + XCRUSH_MATCH_INFO* OriginalMatch = nullptr; + XCRUSH_MATCH_INFO* OptimizedMatch = nullptr; + XCRUSH_MATCH_INFO* OriginalMatches = nullptr; + XCRUSH_MATCH_INFO* OptimizedMatches = nullptr; WINPR_ASSERT(xcrush); @@ -678,15 +678,15 @@ static int xcrush_generate_output(XCRUSH_CONTEXT* WINPR_RESTRICT xcrush, BYTE* WINPR_RESTRICT OutputBuffer, UINT32 OutputSize, UINT32 HistoryOffset, UINT32* WINPR_RESTRICT pDstSize) { - BYTE* Literals = NULL; - BYTE* OutputEnd = NULL; + BYTE* Literals = nullptr; + BYTE* OutputEnd = nullptr; UINT32 MatchIndex = 0; UINT32 MatchOffset = 0; UINT16 MatchLength = 0; UINT32 CurrentOffset = 0; UINT32 MatchOffsetDiff = 0; UINT32 HistoryOffsetDiff = 0; - RDP61_MATCH_DETAILS* MatchDetails = NULL; + RDP61_MATCH_DETAILS* MatchDetails = nullptr; WINPR_ASSERT(xcrush); WINPR_ASSERT(OutputBuffer); @@ -804,21 +804,21 @@ static int xcrush_decompress_l1(XCRUSH_CONTEXT* WINPR_RESTRICT xcrush, const BYTE** WINPR_RESTRICT ppDstData, UINT32* WINPR_RESTRICT pDstSize, UINT32 flags) { - const BYTE* pSrcEnd = NULL; - const BYTE* Literals = NULL; + const BYTE* pSrcEnd = nullptr; + const BYTE* Literals = nullptr; UINT16 MatchCount = 0; UINT16 MatchIndex = 0; - BYTE* OutputPtr = NULL; + BYTE* OutputPtr = nullptr; size_t OutputLength = 0; size_t OutputOffset = 0; - BYTE* HistoryPtr = NULL; - BYTE* HistoryBuffer = NULL; - BYTE* HistoryBufferEnd = NULL; + BYTE* HistoryPtr = nullptr; + BYTE* HistoryBuffer = nullptr; + BYTE* HistoryBufferEnd = nullptr; UINT32 HistoryBufferSize = 0; UINT16 MatchLength = 0; UINT16 MatchOutputOffset = 0; UINT32 MatchHistoryOffset = 0; - const RDP61_MATCH_DETAILS* MatchDetails = NULL; + const RDP61_MATCH_DETAILS* MatchDetails = nullptr; WINPR_ASSERT(xcrush); @@ -936,7 +936,7 @@ int xcrush_decompress(XCRUSH_CONTEXT* WINPR_RESTRICT xcrush, const BYTE* WINPR_R { int status = 0; UINT32 DstSize = 0; - const BYTE* pDstData = NULL; + const BYTE* pDstData = nullptr; BYTE Level1ComprFlags = 0; BYTE Level2ComprFlags = 0; @@ -985,8 +985,8 @@ static int xcrush_compress_l1(XCRUSH_CONTEXT* WINPR_RESTRICT xcrush, int status = 0; UINT32 Flags = 0; UINT32 HistoryOffset = 0; - BYTE* HistoryPtr = NULL; - BYTE* HistoryBuffer = NULL; + BYTE* HistoryPtr = nullptr; + BYTE* HistoryBuffer = nullptr; UINT32 SignatureIndex = 0; WINPR_ASSERT(xcrush); @@ -1059,10 +1059,10 @@ int xcrush_compress(XCRUSH_CONTEXT* WINPR_RESTRICT xcrush, const BYTE* WINPR_RES { int status = 0; UINT32 DstSize = 0; - BYTE* pDstData = NULL; - const BYTE* CompressedData = NULL; + BYTE* pDstData = nullptr; + const BYTE* CompressedData = nullptr; UINT32 CompressedDataSize = 0; - BYTE* OriginalData = NULL; + BYTE* OriginalData = nullptr; UINT32 OriginalDataSize = 0; UINT32 Level1ComprFlags = 0; UINT32 Level2ComprFlags = 0; @@ -1113,7 +1113,7 @@ int xcrush_compress(XCRUSH_CONTEXT* WINPR_RESTRICT xcrush, const BYTE* WINPR_RES if (CompressedDataSize > 50) { - const BYTE* pUnusedDstData = NULL; + const BYTE* pUnusedDstData = nullptr; status = mppc_compress(xcrush->mppc, CompressedData, CompressedDataSize, pDstData, &pUnusedDstData, &DstSize, &Level2ComprFlags); } @@ -1203,7 +1203,7 @@ XCRUSH_CONTEXT* xcrush_context_new(BOOL Compressor) fail: xcrush_context_free(xcrush); - return NULL; + return nullptr; } void xcrush_context_free(XCRUSH_CONTEXT* xcrush) diff --git a/libfreerdp/codec/yuv.c b/libfreerdp/codec/yuv.c index 2d5da96b2..9aefeff68 100644 --- a/libfreerdp/codec/yuv.c +++ b/libfreerdp/codec/yuv.c @@ -222,11 +222,11 @@ YUV_CONTEXT* yuv_context_new(BOOL encoder, UINT32 ThreadingFlags) SYSTEM_INFO sysInfos = WINPR_C_ARRAY_INIT; /** do it here to avoid a race condition between threads */ if (!primitives_get()) - return NULL; + return nullptr; YUV_CONTEXT* ret = winpr_aligned_calloc(1, sizeof(*ret), 32); if (!ret) - return NULL; + return nullptr; ret->encoder = encoder; if (!(ThreadingFlags & THREADING_FLAGS_DISABLE_THREADS)) @@ -294,12 +294,12 @@ static BOOL submit_object(PTP_WORK* WINPR_RESTRICT work_object, PTP_WORK_CALLBAC if (!work_object) return FALSE; - *work_object = NULL; + *work_object = nullptr; if (!param || !context) return FALSE; - *work_object = CreateThreadpoolWork(cb, cnv.pv, NULL); + *work_object = CreateThreadpoolWork(cb, cnv.pv, nullptr); if (!*work_object) return FALSE; @@ -314,7 +314,7 @@ static void free_objects(PTP_WORK* work_objects, UINT32 waitCount) for (UINT32 i = 0; i < waitCount; i++) { PTP_WORK cur = work_objects[i]; - work_objects[i] = NULL; + work_objects[i] = nullptr; if (!cur) continue; @@ -389,7 +389,7 @@ static BOOL pool_decode(YUV_CONTEXT* WINPR_RESTRICT context, PTP_WORK_CALLBACK c const RECTANGLE_16 rect = clamp(context, ®ionRects[y], yuvHeight); YUV_PROCESS_WORK_PARAM current = pool_decode_param(&rect, context, pYUVData, iStride, DstFormat, dest, nDstStep); - cb(NULL, ¤t, NULL); + cb(nullptr, ¤t, nullptr); } return TRUE; } @@ -545,7 +545,7 @@ static BOOL pool_decode_rect(YUV_CONTEXT* WINPR_RESTRICT context, BYTE type, { YUV_COMBINE_WORK_PARAM current = pool_decode_rect_param( ®ionRects[y], context, type, pYUVData, iStride, pYUVDstData, iDstStride); - cb(NULL, ¤t, NULL); + cb(nullptr, ¤t, nullptr); } return TRUE; } @@ -553,7 +553,7 @@ static BOOL pool_decode_rect(YUV_CONTEXT* WINPR_RESTRICT context, BYTE type, /* case where we use threads */ for (waitCount = 0; waitCount < numRegionRects; waitCount++) { - YUV_COMBINE_WORK_PARAM* current = NULL; + YUV_COMBINE_WORK_PARAM* current = nullptr; if (context->work_object_count <= waitCount) { @@ -624,7 +624,7 @@ static void CALLBACK yuv420_encode_work_callback(PTP_CALLBACK_INSTANCE instance, YUV_ENCODE_WORK_PARAM* param = (YUV_ENCODE_WORK_PARAM*)context; primitives_t* prims = primitives_get(); BYTE* pYUVData[3]; - const BYTE* src = NULL; + const BYTE* src = nullptr; WINPR_UNUSED(instance); WINPR_UNUSED(work); @@ -656,7 +656,7 @@ static void CALLBACK yuv444v1_encode_work_callback(PTP_CALLBACK_INSTANCE instanc primitives_t* prims = primitives_get(); BYTE* pYUVLumaData[3]; BYTE* pYUVChromaData[3]; - const BYTE* src = NULL; + const BYTE* src = nullptr; WINPR_UNUSED(instance); WINPR_UNUSED(work); @@ -693,7 +693,7 @@ static void CALLBACK yuv444v2_encode_work_callback(PTP_CALLBACK_INSTANCE instanc primitives_t* prims = primitives_get(); BYTE* pYUVLumaData[3]; BYTE* pYUVChromaData[3]; - const BYTE* src = NULL; + const BYTE* src = nullptr; WINPR_UNUSED(instance); WINPR_UNUSED(work); @@ -797,7 +797,7 @@ static BOOL pool_encode(YUV_CONTEXT* WINPR_RESTRICT context, PTP_WORK_CALLBACK c YUV_ENCODE_WORK_PARAM current = pool_encode_fill(®ionRects[x], context, pSrcData, nSrcStep, SrcFormat, iStride, pYUVLumaData, pYUVChromaData); - cb(NULL, ¤t, NULL); + cb(nullptr, ¤t, nullptr); } return TRUE; } @@ -821,7 +821,7 @@ static BOOL pool_encode(YUV_CONTEXT* WINPR_RESTRICT context, PTP_WORK_CALLBACK c for (UINT32 y = 0; y < steps; y++) { RECTANGLE_16 r = *rect; - YUV_ENCODE_WORK_PARAM* current = NULL; + YUV_ENCODE_WORK_PARAM* current = nullptr; if (context->work_object_count <= waitCount) { @@ -854,7 +854,7 @@ BOOL yuv420_context_encode(YUV_CONTEXT* WINPR_RESTRICT context, const BYTE* WINP return FALSE; return pool_encode(context, yuv420_encode_work_callback, pSrcData, nSrcStep, SrcFormat, iStride, - pYUVData, NULL, regionRects, numRegionRects); + pYUVData, nullptr, regionRects, numRegionRects); } BOOL yuv444_context_encode(YUV_CONTEXT* WINPR_RESTRICT context, BYTE version, @@ -863,7 +863,7 @@ BOOL yuv444_context_encode(YUV_CONTEXT* WINPR_RESTRICT context, BYTE version, BYTE* WINPR_RESTRICT pYUVChromaData[3], const RECTANGLE_16* WINPR_RESTRICT regionRects, UINT32 numRegionRects) { - PTP_WORK_CALLBACK cb = NULL; + PTP_WORK_CALLBACK cb = nullptr; switch (version) { case 1: diff --git a/libfreerdp/codec/zgfx.c b/libfreerdp/codec/zgfx.c index cbfa6ada5..7a8ed4448 100644 --- a/libfreerdp/codec/zgfx.c +++ b/libfreerdp/codec/zgfx.c @@ -231,7 +231,7 @@ static inline BOOL zgfx_decompress_segment(ZGFX_CONTEXT* WINPR_RESTRICT zgfx, UINT32 inPrefix = 0; UINT32 count = 0; UINT32 distance = 0; - BYTE* pbSegment = NULL; + BYTE* pbSegment = nullptr; WINPR_ASSERT(zgfx); WINPR_ASSERT(stream); @@ -412,7 +412,7 @@ int zgfx_decompress(ZGFX_CONTEXT* WINPR_RESTRICT zgfx, const BYTE* WINPR_RESTRIC BYTE descriptor = 0; wStream sbuffer = WINPR_C_ARRAY_INIT; size_t used = 0; - BYTE* pConcatenated = NULL; + BYTE* pConcatenated = nullptr; wStream* stream = Stream_StaticConstInit(&sbuffer, pSrcData, SrcSize); WINPR_ASSERT(zgfx); @@ -420,7 +420,7 @@ int zgfx_decompress(ZGFX_CONTEXT* WINPR_RESTRICT zgfx, const BYTE* WINPR_RESTRIC WINPR_ASSERT(ppDstData); WINPR_ASSERT(pDstSize); - *ppDstData = NULL; + *ppDstData = nullptr; *pDstSize = 0; if (!Stream_CheckAndLogRequiredLength(TAG, stream, 1)) @@ -513,7 +513,7 @@ int zgfx_compress_to_stream(ZGFX_CONTEXT* WINPR_RESTRICT zgfx, wStream* WINPR_RE UINT16 maxLength = 0; UINT32 totalLength = 0; size_t posSegmentCount = 0; - const BYTE* pSrcData = NULL; + const BYTE* pSrcData = nullptr; int status = 0; maxLength = ZGFX_SEGMENTED_MAXSIZE; totalLength = uncompressedSize; @@ -594,7 +594,7 @@ int zgfx_compress(ZGFX_CONTEXT* WINPR_RESTRICT zgfx, const BYTE* WINPR_RESTRICT UINT32* WINPR_RESTRICT pFlags) { int status = 0; - wStream* s = Stream_New(NULL, SrcSize); + wStream* s = Stream_New(nullptr, SrcSize); status = zgfx_compress_to_stream(zgfx, s, pSrcData, SrcSize, pFlags); const size_t pos = Stream_GetPosition(s); if (pos > UINT32_MAX) @@ -615,7 +615,7 @@ void zgfx_context_reset(ZGFX_CONTEXT* WINPR_RESTRICT zgfx, WINPR_ATTR_UNUSED BOO ZGFX_CONTEXT* zgfx_context_new(BOOL Compressor) { - ZGFX_CONTEXT* zgfx = NULL; + ZGFX_CONTEXT* zgfx = nullptr; zgfx = (ZGFX_CONTEXT*)calloc(1, sizeof(ZGFX_CONTEXT)); if (zgfx) diff --git a/libfreerdp/common/addin.c b/libfreerdp/common/addin.c index 13ca18815..4fc6c9891 100644 --- a/libfreerdp/common/addin.c +++ b/libfreerdp/common/addin.c @@ -47,7 +47,7 @@ static inline BOOL is_path_required(LPCSTR path, size_t len) LPSTR freerdp_get_library_install_path(void) { - LPSTR pszPath = NULL; + LPSTR pszPath = nullptr; size_t cchPath = 0; size_t cchLibraryPath = 0; size_t cchInstallPrefix = 0; @@ -62,12 +62,12 @@ LPSTR freerdp_get_library_install_path(void) needLibPath = is_path_required(pszLibraryPath, cchLibraryPath); if (!needInstallPath && !needLibPath) - return NULL; + return nullptr; pszPath = (LPSTR)malloc(cchPath + 1); if (!pszPath) - return NULL; + return nullptr; if (needInstallPath) { @@ -80,7 +80,7 @@ LPSTR freerdp_get_library_install_path(void) if (FAILED(NativePathCchAppendA(pszPath, cchPath + 1, pszLibraryPath))) { free(pszPath); - return NULL; + return nullptr; } } @@ -90,9 +90,9 @@ LPSTR freerdp_get_library_install_path(void) LPSTR freerdp_get_dynamic_addin_install_path(void) { #if defined(WITH_ADD_PLUGIN_TO_RPATH) - return NULL; + return nullptr; #else - LPSTR pszPath = NULL; + LPSTR pszPath = nullptr; size_t cchPath = 0; size_t cchAddinPath = 0; size_t cchInstallPrefix = 0; @@ -111,12 +111,12 @@ LPSTR freerdp_get_dynamic_addin_install_path(void) pszInstallPrefix, pszAddinPath); if (!needInstallPath && !needLibPath) - return NULL; + return nullptr; pszPath = (LPSTR)calloc(cchPath + 1, sizeof(CHAR)); if (!pszPath) - return NULL; + return nullptr; if (needInstallPath) { @@ -129,7 +129,7 @@ LPSTR freerdp_get_dynamic_addin_install_path(void) if (FAILED(NativePathCchAppendA(pszPath, cchPath + 1, pszAddinPath))) { free(pszPath); - return NULL; + return nullptr; } } @@ -143,16 +143,16 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_addin(LPCSTR pszFileName, LPCSTR pszPa LPCSTR pszEntryName) { LPSTR pszAddinInstallPath = freerdp_get_dynamic_addin_install_path(); - PVIRTUALCHANNELENTRY entry = NULL; + PVIRTUALCHANNELENTRY entry = nullptr; BOOL bHasExt = TRUE; - PCSTR pszExt = NULL; + PCSTR pszExt = nullptr; size_t cchExt = 0; - HINSTANCE library = NULL; + HINSTANCE library = nullptr; size_t cchFileName = 0; size_t cchFilePath = 0; - LPSTR pszAddinFile = NULL; - LPSTR pszFilePath = NULL; - LPSTR pszRelativeFilePath = NULL; + LPSTR pszAddinFile = nullptr; + LPSTR pszFilePath = nullptr; + LPSTR pszRelativeFilePath = nullptr; size_t cchAddinFile = 0; size_t cchAddinInstallPath = 0; @@ -253,8 +253,8 @@ fail: PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LPCSTR pszSubsystem, LPCSTR pszType, DWORD dwFlags) { - PVIRTUALCHANNELENTRY entry = NULL; - LPSTR pszFileName = NULL; + PVIRTUALCHANNELENTRY entry = nullptr; + LPSTR pszFileName = nullptr; const size_t cchBaseFileName = sizeof(FREERDP_SHARED_LIBRARY_PREFIX) + 32; size_t nameLen = 0; size_t subsystemLen = 0; @@ -274,7 +274,7 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LP pszFileName = (LPSTR)malloc(cchFileName); if (!pszFileName) - return NULL; + return nullptr; (void)sprintf_s(pszFileName, cchFileName, "%s-client-%s-%s", pszName, pszSubsystem, pszType); @@ -285,7 +285,7 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LP pszFileName = (LPSTR)malloc(cchFileName); if (!pszFileName) - return NULL; + return nullptr; (void)sprintf_s(pszFileName, cchFileName, "%s-client-%s", pszName, pszSubsystem); } @@ -295,13 +295,13 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LP pszFileName = (LPSTR)malloc(cchFileName); if (!pszFileName) - return NULL; + return nullptr; (void)sprintf_s(pszFileName, cchFileName, "%s-client", pszName); } else { - return NULL; + return nullptr; } { @@ -321,13 +321,13 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LP if (!pszFileName || (rc < 0)) { free(pszFileName); - return NULL; + return nullptr; } } if (pszSubsystem) { - LPSTR pszEntryName = NULL; + LPSTR pszEntryName = nullptr; size_t cchEntryName = 0; /* subsystem add-in */ cchEntryName = 64 + nameLen; @@ -336,12 +336,12 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LP if (!pszEntryName) { free(pszFileName); - return NULL; + return nullptr; } (void)sprintf_s(pszEntryName, cchEntryName + 1, "freerdp_%s_client_subsystem_entry", pszName); - entry = freerdp_load_dynamic_addin(pszFileName, NULL, pszEntryName); + entry = freerdp_load_dynamic_addin(pszFileName, nullptr, pszEntryName); free(pszEntryName); free(pszFileName); return entry; @@ -352,22 +352,22 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LP if (dwFlags & FREERDP_ADDIN_CHANNEL_STATIC) { if (dwFlags & FREERDP_ADDIN_CHANNEL_ENTRYEX) - entry = freerdp_load_dynamic_addin(pszFileName, NULL, "VirtualChannelEntryEx"); + entry = freerdp_load_dynamic_addin(pszFileName, nullptr, "VirtualChannelEntryEx"); else - entry = freerdp_load_dynamic_addin(pszFileName, NULL, "VirtualChannelEntry"); + entry = freerdp_load_dynamic_addin(pszFileName, nullptr, "VirtualChannelEntry"); } else if (dwFlags & FREERDP_ADDIN_CHANNEL_DYNAMIC) - entry = freerdp_load_dynamic_addin(pszFileName, NULL, "DVCPluginEntry"); + entry = freerdp_load_dynamic_addin(pszFileName, nullptr, "DVCPluginEntry"); else if (dwFlags & FREERDP_ADDIN_CHANNEL_DEVICE) - entry = freerdp_load_dynamic_addin(pszFileName, NULL, "DeviceServiceEntry"); + entry = freerdp_load_dynamic_addin(pszFileName, nullptr, "DeviceServiceEntry"); else - entry = freerdp_load_dynamic_addin(pszFileName, NULL, pszType); + entry = freerdp_load_dynamic_addin(pszFileName, nullptr, pszType); free(pszFileName); return entry; } -static FREERDP_LOAD_CHANNEL_ADDIN_ENTRY_FN freerdp_load_static_channel_addin_entry = NULL; +static FREERDP_LOAD_CHANNEL_ADDIN_ENTRY_FN freerdp_load_static_channel_addin_entry = nullptr; int freerdp_register_addin_provider(FREERDP_LOAD_CHANNEL_ADDIN_ENTRY_FN provider, WINPR_ATTR_UNUSED DWORD dwFlags) @@ -384,7 +384,7 @@ FREERDP_LOAD_CHANNEL_ADDIN_ENTRY_FN freerdp_get_current_addin_provider(void) PVIRTUALCHANNELENTRY freerdp_load_channel_addin_entry(LPCSTR pszName, LPCSTR pszSubsystem, LPCSTR pszType, DWORD dwFlags) { - PVIRTUALCHANNELENTRY entry = NULL; + PVIRTUALCHANNELENTRY entry = nullptr; if (freerdp_load_static_channel_addin_entry) entry = freerdp_load_static_channel_addin_entry(pszName, pszSubsystem, pszType, dwFlags); diff --git a/libfreerdp/common/assistance.c b/libfreerdp/common/assistance.c index b2385f87a..df88302ed 100644 --- a/libfreerdp/common/assistance.c +++ b/libfreerdp/common/assistance.c @@ -80,14 +80,14 @@ static const char* strrstr(const char* haystack, size_t len, const char* needle) if (*needle == '\0') return haystack; - char* result = NULL; + char* result = nullptr; for (;;) { char* p = strstr(haystack, needle); - if (p == NULL) + if (p == nullptr) break; if (p > haystack + len) - return NULL; + return nullptr; result = p; haystack = p + 1; @@ -100,14 +100,14 @@ static BOOL update_option(char** opt, const char* val, size_t len) { WINPR_ASSERT(opt); free(*opt); - *opt = NULL; + *opt = nullptr; if (!val && (len != 0)) return FALSE; else if (!val && (len == 0)) return TRUE; *opt = strndup(val, len); - return *opt != NULL; + return *opt != nullptr; } static BOOL update_name(rdpAssistanceFile* file, const char* name) @@ -122,34 +122,34 @@ static BOOL update_name(rdpAssistanceFile* file, const char* name) free(file->filename); file->filename = _strdup(name); - return file->filename != NULL; + return file->filename != nullptr; } static BOOL update_password(rdpAssistanceFile* file, const char* password) { WINPR_ASSERT(file); free(file->password); - file->password = NULL; + file->password = nullptr; if (!password) return TRUE; file->password = _strdup(password); - return file->password != NULL; + return file->password != nullptr; } static BOOL update_connectionstring2_nocopy(rdpAssistanceFile* file, char* str) { WINPR_ASSERT(file); free(file->ConnectionString2); - file->ConnectionString2 = NULL; + file->ConnectionString2 = nullptr; if (!str) return TRUE; file->ConnectionString2 = str; - return file->ConnectionString2 != NULL; + return file->ConnectionString2 != nullptr; } static BOOL update_connectionstring2(rdpAssistanceFile* file, const char* str, size_t len) { - char* strc = NULL; + char* strc = nullptr; if (!str && (len != 0)) return FALSE; @@ -164,14 +164,14 @@ static BOOL update_connectionstring2(rdpAssistanceFile* file, const char* str, s static BOOL update_connectionstring2_wchar(rdpAssistanceFile* file, const WCHAR* str, size_t len) { - char* strc = NULL; + char* strc = nullptr; if (!str && (len != 0)) return FALSE; if (str && (len > 0)) { - strc = ConvertWCharNToUtf8Alloc(str, len, NULL); + strc = ConvertWCharNToUtf8Alloc(str, len, nullptr); if (!strc) return FALSE; } @@ -253,7 +253,7 @@ fail: static BOOL append_address_to_list(wArrayList* MachineAddresses, const char* str, size_t len) { - char* copy = NULL; + char* copy = nullptr; if (len > 0) copy = strndup(str, len); if (!copy) @@ -271,7 +271,7 @@ static BOOL append_address(rdpAssistanceFile* file, const char* host, const char WINPR_ASSERT(file); errno = 0; - unsigned long p = strtoul(port, NULL, 0); + unsigned long p = strtoul(port, nullptr, 0); if ((errno != 0) || (p == 0) || (p > UINT16_MAX)) { @@ -300,11 +300,11 @@ static BOOL freerdp_assistance_parse_address_list(rdpAssistanceFile* file, char* char* s = ";"; // get the first token - char* saveptr = NULL; + char* saveptr = nullptr; char* token = strtok_s(strp, s, &saveptr); // walk through other tokens - while (token != NULL) + while (token != nullptr) { char* port = strchr(token, ':'); if (!port) @@ -315,7 +315,7 @@ static BOOL freerdp_assistance_parse_address_list(rdpAssistanceFile* file, char* if (!append_address(file, token, port)) goto out; - token = strtok_s(NULL, s, &saveptr); + token = strtok_s(nullptr, s, &saveptr); } rc = TRUE; out: @@ -425,7 +425,7 @@ static BOOL freerdp_assistance_parse_attr(const char** opt, size_t* plength, con WINPR_ASSERT(plength); WINPR_ASSERT(key); - *opt = NULL; + *opt = nullptr; *plength = 0; if (!tag) return FALSE; @@ -468,7 +468,7 @@ static BOOL freerdp_assistance_parse_attr(const char** opt, size_t* plength, con static BOOL freerdp_assistance_parse_attr_str(char** opt, const char* key, const char* tag) { - const char* copt = NULL; + const char* copt = nullptr; size_t size = 0; if (!freerdp_assistance_parse_attr(&copt, &size, key, tag)) return FALSE; @@ -477,7 +477,7 @@ static BOOL freerdp_assistance_parse_attr_str(char** opt, const char* key, const static BOOL freerdp_assistance_parse_attr_bool(BOOL* opt, const char* key, const char* tag) { - const char* copt = NULL; + const char* copt = nullptr; size_t size = 0; WINPR_ASSERT(opt); @@ -494,7 +494,7 @@ static BOOL freerdp_assistance_parse_attr_bool(BOOL* opt, const char* key, const static BOOL freerdp_assistance_parse_attr_uint32(UINT32* opt, const char* key, const char* tag) { - const char* copt = NULL; + const char* copt = nullptr; size_t size = 0; WINPR_ASSERT(opt); @@ -514,7 +514,7 @@ static BOOL freerdp_assistance_parse_attr_uint32(UINT32* opt, const char* key, c strncpy(buffer, copt, size); errno = 0; - unsigned long val = strtoul(buffer, NULL, 0); + unsigned long val = strtoul(buffer, nullptr, 0); if ((errno != 0) || (val > UINT32_MAX)) { @@ -539,11 +539,11 @@ static char* freerdp_assistance_contains_element(char* input, size_t ilen, const WINPR_ASSERT(rc > 0); WINPR_ASSERT((size_t)rc < sizeof(bkey)); if ((rc < 0) || ((size_t)rc >= sizeof(bkey))) - return NULL; + return nullptr; char* tag = strstr(input, bkey); if (!tag || (tag > input + ilen)) - return NULL; + return nullptr; char* data = tag + strnlen(bkey, sizeof(bkey)); @@ -560,7 +560,7 @@ static char* freerdp_assistance_contains_element(char* input, size_t ilen, const "Failed to parse ASSISTANCE file: ConnectionString2 missing delimiter after " "field %s", bkey); - return NULL; + return nullptr; } char* start = strstr(tag, ">"); @@ -568,7 +568,7 @@ static char* freerdp_assistance_contains_element(char* input, size_t ilen, const if (!start || (start > input + ilen)) { WLog_ERR(TAG, "Failed to parse ASSISTANCE file: ConnectionString2 missing field %s", bkey); - return NULL; + return nullptr; } const char* end = start; @@ -580,7 +580,7 @@ static char* freerdp_assistance_contains_element(char* input, size_t ilen, const WINPR_ASSERT(erc > 0); WINPR_ASSERT((size_t)erc < sizeof(ekey)); if ((erc <= 0) || ((size_t)erc >= sizeof(ekey))) - return NULL; + return nullptr; const size_t offset = WINPR_ASSERTING_INT_CAST(size_t, start - tag); dend = end = strrstr(start, ilen - offset, ekey); if (end) @@ -592,7 +592,7 @@ static char* freerdp_assistance_contains_element(char* input, size_t ilen, const WLog_ERR(TAG, "Failed to parse ASSISTANCE file: ConnectionString2 missing end tag for field %s", key); - return NULL; + return nullptr; } if (plen) *plen = WINPR_ASSERTING_INT_CAST(size_t, end - tag); @@ -619,7 +619,7 @@ static BOOL freerdp_assistance_consume_input_and_get_element(char* input, const size_t len = 0; size_t dlen = 0; - char* data = NULL; + char* data = nullptr; char* tag = freerdp_assistance_contains_element(input, strlen(input), key, &len, &data, &dlen); if (!tag) return FALSE; @@ -642,7 +642,7 @@ static BOOL freerdp_assistance_get_element(char* input, size_t ilen, const char* size_t len = 0; size_t dlen = 0; - char* data = NULL; + char* data = nullptr; char* tag = freerdp_assistance_contains_element(input, ilen, key, &len, &data, &dlen); if (!tag) return FALSE; @@ -661,7 +661,7 @@ static BOOL freerdp_assistance_parse_all_elements_of(rdpAssistanceFile* file, ch BOOL (*fkt)(rdpAssistanceFile* file, char* data, size_t len)) { - char* val = NULL; + char* val = nullptr; size_t vlen = 0; while (freerdp_assistance_get_element(data, len, key, &val, &vlen)) @@ -684,8 +684,8 @@ static BOOL freerdp_assistance_parse_all_elements_of_l(rdpAssistanceFile* file, WINPR_ATTR_UNUSED size_t len) { UINT32 p = 0; - const char* n = NULL; - const char* u = NULL; + const char* n = nullptr; + const char* u = nullptr; size_t nlen = 0; size_t ulen = 0; if (!freerdp_assistance_parse_attr_uint32(&p, "P", data)) @@ -754,7 +754,7 @@ static BOOL freerdp_assistance_parse_connection_string2(rdpAssistanceFile* file) goto out_fail; { - char* e = NULL; + char* e = nullptr; size_t elen = 0; if (!freerdp_assistance_consume_input_and_get_element(str, "E", &e, &elen)) goto out_fail; @@ -762,7 +762,7 @@ static BOOL freerdp_assistance_parse_connection_string2(rdpAssistanceFile* file) if (!e || (elen == 0)) goto out_fail; { - char* a = NULL; + char* a = nullptr; size_t alen = 0; if (!freerdp_assistance_get_element(e, elen, "A", &a, &alen)) goto out_fail; @@ -797,7 +797,7 @@ out_fail: char* freerdp_assistance_construct_expert_blob(const char* name, const char* pass) { if (!name || !pass) - return NULL; + return nullptr; const size_t nameLength = strlen(name) + strlen("NAME="); const size_t passLength = strlen(pass) + strlen("PASS="); @@ -805,7 +805,7 @@ char* freerdp_assistance_construct_expert_blob(const char* name, const char* pas char* ExpertBlob = (char*)calloc(1, size); if (!ExpertBlob) - return NULL; + return nullptr; (void)sprintf_s(ExpertBlob, size, "%" PRIuz ";NAME=%s%" PRIuz ";PASS=%s", nameLength, name, passLength, pass); @@ -829,7 +829,7 @@ char* freerdp_assistance_generate_pass_stub(WINPR_ATTR_UNUSED DWORD flags) char* passStub = calloc(15, sizeof(char)); if (!passStub) - return NULL; + return nullptr; /** * PassStub generation: @@ -861,10 +861,10 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* password, const char* pas size_t cbPasswordW = 0; size_t cbPassStubW = 0; BYTE PasswordHash[WINPR_MD5_DIGEST_LENGTH] = WINPR_C_ARRAY_INIT; - WINPR_RC4_CTX* rc4Ctx = NULL; - BYTE* pbIn = NULL; - BYTE* pbOut = NULL; - BYTE* res = NULL; + WINPR_RC4_CTX* rc4Ctx = nullptr; + BYTE* pbIn = nullptr; + BYTE* pbOut = nullptr; + BYTE* res = nullptr; WCHAR* PasswordW = ConvertUtf8ToWCharAlloc(password, &cbPasswordW); WCHAR* PassStubW = ConvertUtf8ToWCharAlloc(passStub, &cbPassStubW); @@ -922,10 +922,10 @@ static BOOL freerdp_assistance_decrypt2(rdpAssistanceFile* file) int status = 0; size_t cbPasswordW = 0; size_t cchOutW = 0; - WINPR_CIPHER_CTX* aesDec = NULL; - WCHAR* PasswordW = NULL; - BYTE* pbIn = NULL; - BYTE* pbOut = NULL; + WINPR_CIPHER_CTX* aesDec = nullptr; + WCHAR* PasswordW = nullptr; + BYTE* pbIn = nullptr; + BYTE* pbOut = nullptr; size_t cbOut = 0; size_t cbIn = 0; size_t cbFinal = 0; @@ -1011,19 +1011,19 @@ fail: BYTE* freerdp_assistance_hex_string_to_bin(const void* str, size_t* size) { - BYTE* buffer = NULL; + BYTE* buffer = nullptr; if (!str || !size) - return NULL; + return nullptr; *size = 0; const size_t length = strlen(str); buffer = calloc(length, sizeof(BYTE)); if (!buffer) - return NULL; + return nullptr; const size_t rc = winpr_HexStringToBinBuffer(str, length, buffer, length); if (rc == 0) { free(buffer); - return NULL; + return nullptr; } *size = rc; return buffer; @@ -1039,7 +1039,7 @@ static int freerdp_assistance_parse_uploadinfo(rdpAssistanceFile* file, char* up { const char escalated[9] = { 'E', 's', 'c', 'a', 'l', 'a', 't', 'e', 'd' }; const size_t esclen = sizeof(escalated); - const char* typestr = NULL; + const char* typestr = nullptr; size_t typelen = 0; if (!uploadinfo || (uploadinfosize == 0)) @@ -1063,7 +1063,7 @@ static int freerdp_assistance_parse_uploadinfo(rdpAssistanceFile* file, char* up return -1; } - char* uploaddata = NULL; + char* uploaddata = nullptr; size_t uploaddatasize = 0; if (!freerdp_assistance_consume_input_and_get_element(uploadinfo, "UPLOADDATA", &uploaddata, &uploaddatasize)) @@ -1166,14 +1166,15 @@ static int freerdp_assistance_parse_file_buffer_int(rdpAssistanceFile* file, cha if (!update_password(file, password)) return -1; - char* uploadinfo = NULL; + char* uploadinfo = nullptr; size_t uploadinfosize = 0; if (freerdp_assistance_consume_input_and_get_element(buffer, "UPLOADINFO", &uploadinfo, &uploadinfosize)) return freerdp_assistance_parse_uploadinfo(file, uploadinfo, uploadinfosize); size_t elen = 0; - const char* estr = freerdp_assistance_contains_element(buffer, size, "E", &elen, NULL, NULL); + const char* estr = + freerdp_assistance_contains_element(buffer, size, "E", &elen, nullptr, nullptr); if (!estr || (elen == 0)) { WLog_ERR(TAG, "Failed to parse ASSISTANCE file: Neither UPLOADINFO nor found"); @@ -1220,8 +1221,8 @@ int freerdp_assistance_parse_file_buffer(rdpAssistanceFile* file, const char* cb int freerdp_assistance_parse_file(rdpAssistanceFile* file, const char* name, const char* password) { int status = 0; - BYTE* buffer = NULL; - FILE* fp = NULL; + BYTE* buffer = nullptr; + FILE* fp = nullptr; size_t readSize = 0; union { @@ -1273,7 +1274,7 @@ int freerdp_assistance_parse_file(rdpAssistanceFile* file, const char* name, con { WLog_ERR(TAG, "Failed to read ASSISTANCE file %s ", name); free(buffer); - buffer = NULL; + buffer = nullptr; return -1; } @@ -1394,7 +1395,7 @@ rdpAssistanceFile* freerdp_assistance_file_new(void) winpr_InitializeSSL(WINPR_SSL_INIT_DEFAULT); rdpAssistanceFile* file = calloc(1, sizeof(rdpAssistanceFile)); if (!file) - return NULL; + return nullptr; file->MachineAddresses = ArrayList_New(FALSE); file->MachinePorts = ArrayList_New(FALSE); @@ -1413,7 +1414,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC freerdp_assistance_file_free(file); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void freerdp_assistance_file_free(rdpAssistanceFile* file) @@ -1421,8 +1422,8 @@ void freerdp_assistance_file_free(rdpAssistanceFile* file) if (!file) return; - update_password(file, NULL); - update_connectionstring2(file, NULL, 0); + update_password(file, nullptr); + update_connectionstring2(file, nullptr, 0); free(file->filename); free(file->Username); free(file->LHTicket); @@ -1460,7 +1461,7 @@ void freerdp_assistance_print_file(rdpAssistanceFile* file, wLog* log, DWORD lev for (size_t x = 0; x < ArrayList_Count(file->MachineAddresses); x++) { UINT32 port = 0; - const char* uri = NULL; + const char* uri = nullptr; const char* addr = ArrayList_GetItem(file->MachineAddresses, x); if (x < ArrayList_Count(file->MachinePorts)) { diff --git a/libfreerdp/common/settings.c b/libfreerdp/common/settings.c index 4d048bdfd..60cf0ea5d 100644 --- a/libfreerdp/common/settings.c +++ b/libfreerdp/common/settings.c @@ -85,7 +85,7 @@ BOOL freerdp_addin_argv_del_argument(ADDIN_ARGV* args, const char* argument) (WINPR_ASSERTING_INT_CAST(uint32_t, args->argc - x)) * sizeof(char*), (void*)&args->argv[x + 1], (WINPR_ASSERTING_INT_CAST(uint32_t, args->argc - x - 1)) * sizeof(char*)); - args->argv[args->argc - 1] = NULL; + args->argv[args->argc - 1] = nullptr; args->argc--; return TRUE; } @@ -137,8 +137,8 @@ int freerdp_addin_replace_argument(ADDIN_ARGV* args, const char* previous, const int freerdp_addin_set_argument_value(ADDIN_ARGV* args, const char* option, const char* value) { BOOL rc = 0; - char* p = NULL; - char* str = NULL; + char* p = nullptr; + char* str = nullptr; size_t length = 0; if (!args || !option || !value) return -2; @@ -177,7 +177,7 @@ int freerdp_addin_replace_argument_value(ADDIN_ARGV* args, const char* previous, const char* value) { BOOL rc = 0; - char* str = NULL; + char* str = nullptr; size_t length = 0; if (!args || !previous || !option || !value) return -2; @@ -226,7 +226,7 @@ BOOL freerdp_device_collection_add(rdpSettings* settings, RDPDR_DEVICE* device) settings->DeviceArray = new_array; for (size_t x = old; x < new_size; x++) - settings->DeviceArray[x] = NULL; + settings->DeviceArray[x] = nullptr; if (!freerdp_settings_set_uint32(settings, FreeRDP_DeviceArraySize, WINPR_ASSERTING_INT_CAST(uint32_t, new_size))) @@ -255,7 +255,7 @@ BOOL freerdp_device_collection_del(rdpSettings* settings, const RDPDR_DEVICE* de RDPDR_DEVICE* next = settings->DeviceArray[y]; settings->DeviceArray[y - 1] = next; } - settings->DeviceArray[count - 1] = NULL; + settings->DeviceArray[count - 1] = nullptr; settings->DeviceCount--; return TRUE; } @@ -266,7 +266,7 @@ BOOL freerdp_device_collection_del(rdpSettings* settings, const RDPDR_DEVICE* de RDPDR_DEVICE* freerdp_device_collection_find(rdpSettings* settings, const char* name) { - RDPDR_DEVICE* device = NULL; + RDPDR_DEVICE* device = nullptr; WINPR_ASSERT(settings); WINPR_ASSERT(name); @@ -281,12 +281,12 @@ RDPDR_DEVICE* freerdp_device_collection_find(rdpSettings* settings, const char* return device; } - return NULL; + return nullptr; } RDPDR_DEVICE* freerdp_device_collection_find_type(rdpSettings* settings, UINT32 type) { - RDPDR_DEVICE* device = NULL; + RDPDR_DEVICE* device = nullptr; WINPR_ASSERT(settings); for (UINT32 index = 0; index < settings->DeviceCount; index++) @@ -297,7 +297,7 @@ RDPDR_DEVICE* freerdp_device_collection_find_type(rdpSettings* settings, UINT32 return device; } - return NULL; + return nullptr; } RDPDR_DEVICE* freerdp_device_new(UINT32 Type, size_t count, const char* const args[]) @@ -313,7 +313,7 @@ RDPDR_DEVICE* freerdp_device_new(UINT32 Type, size_t count, const char* const ar RDPDR_SMARTCARD* smartcard; } device; - device.base = NULL; + device.base = nullptr; WINPR_ASSERT(args || (count == 0)); switch (Type) @@ -404,7 +404,7 @@ RDPDR_DEVICE* freerdp_device_new(UINT32 Type, size_t count, const char* const ar goto fail; } if (count > 2) - device.drive->automount = (args[2] == NULL); + device.drive->automount = (args[2] == nullptr); break; default: goto fail; @@ -414,7 +414,7 @@ RDPDR_DEVICE* freerdp_device_new(UINT32 Type, size_t count, const char* const ar fail: freerdp_device_free(device.base); - return NULL; + return nullptr; } void freerdp_device_free(RDPDR_DEVICE* device) @@ -483,11 +483,11 @@ RDPDR_DEVICE* freerdp_device_clone(const RDPDR_DEVICE* device) size_t count = 0; const char* args[4] = WINPR_C_ARRAY_INIT; - copy.dev = NULL; + copy.dev = nullptr; src.dev = device; if (!device) - return NULL; + return nullptr; if (device->Name) { @@ -500,7 +500,7 @@ RDPDR_DEVICE* freerdp_device_clone(const RDPDR_DEVICE* device) if (src.drive->Path) { args[count++] = src.drive->Path; - args[count++] = src.drive->automount ? NULL : src.drive->Path; + args[count++] = src.drive->automount ? nullptr : src.drive->Path; } break; @@ -534,7 +534,7 @@ RDPDR_DEVICE* freerdp_device_clone(const RDPDR_DEVICE* device) copy.dev = freerdp_device_new(device->Type, count, args); if (!copy.dev) - return NULL; + return nullptr; copy.dev->Id = device->Id; @@ -548,12 +548,12 @@ void freerdp_device_collection_free(rdpSettings* settings) if (settings->DeviceArray) { for (UINT32 index = 0; index < settings->DeviceArraySize; index++) - freerdp_settings_set_pointer_array(settings, FreeRDP_DeviceArray, index, NULL); + freerdp_settings_set_pointer_array(settings, FreeRDP_DeviceArray, index, nullptr); } free((void*)settings->DeviceArray); - freerdp_settings_set_pointer(settings, FreeRDP_DeviceArray, NULL); + freerdp_settings_set_pointer(settings, FreeRDP_DeviceArray, nullptr); freerdp_settings_set_uint32(settings, FreeRDP_DeviceArraySize, 0); freerdp_settings_set_uint32(settings, FreeRDP_DeviceCount, 0); } @@ -576,7 +576,7 @@ BOOL freerdp_static_channel_collection_del(rdpSettings* settings, const char* na (void*)&settings->StaticChannelArray[x + 1], (count - x - 1) * sizeof(ADDIN_ARGV*)); for (size_t y = count - 1; y < settings->StaticChannelArraySize; y++) - settings->StaticChannelArray[y] = NULL; + settings->StaticChannelArray[y] = nullptr; freerdp_addin_argv_free(cur); return freerdp_settings_set_uint32(settings, FreeRDP_StaticChannelCount, count - 1); @@ -585,7 +585,7 @@ BOOL freerdp_static_channel_collection_del(rdpSettings* settings, const char* na } { for (size_t x = count; x < settings->StaticChannelArraySize; x++) - settings->StaticChannelArray[x] = NULL; + settings->StaticChannelArray[x] = nullptr; } return FALSE; } @@ -612,7 +612,7 @@ BOOL freerdp_static_channel_collection_add(rdpSettings* settings, ADDIN_ARGV* ch settings->StaticChannelArray = new_array; { for (size_t x = oldSize; x < new_size; x++) - settings->StaticChannelArray[x] = NULL; + settings->StaticChannelArray[x] = nullptr; } if (!freerdp_settings_set_uint32(settings, FreeRDP_StaticChannelArraySize, WINPR_ASSERTING_INT_CAST(uint32_t, new_size))) @@ -629,7 +629,7 @@ BOOL freerdp_static_channel_collection_add(rdpSettings* settings, ADDIN_ARGV* ch ADDIN_ARGV* freerdp_static_channel_collection_find(rdpSettings* settings, const char* name) { - ADDIN_ARGV* channel = NULL; + ADDIN_ARGV* channel = nullptr; WINPR_ASSERT(settings); WINPR_ASSERT(name); @@ -643,7 +643,7 @@ ADDIN_ARGV* freerdp_static_channel_collection_find(rdpSettings* settings, const return channel; } - return NULL; + return nullptr; } void freerdp_static_channel_collection_free(rdpSettings* settings) @@ -660,7 +660,7 @@ void freerdp_static_channel_collection_free(rdpSettings* settings) free((void*)settings->StaticChannelArray); freerdp_settings_set_uint32(settings, FreeRDP_StaticChannelArraySize, 0); - settings->StaticChannelArray = NULL; + settings->StaticChannelArray = nullptr; freerdp_settings_set_uint32(settings, FreeRDP_StaticChannelCount, 0); } @@ -682,7 +682,7 @@ BOOL freerdp_dynamic_channel_collection_del(rdpSettings* settings, const char* n (void*)&settings->DynamicChannelArray[x + 1], (count - x - 1) * sizeof(ADDIN_ARGV*)); for (size_t y = count - 1; y < settings->DynamicChannelArraySize; y++) - settings->DynamicChannelArray[y] = NULL; + settings->DynamicChannelArray[y] = nullptr; freerdp_addin_argv_free(cur); return freerdp_settings_set_uint32(settings, FreeRDP_DynamicChannelCount, @@ -717,7 +717,7 @@ BOOL freerdp_dynamic_channel_collection_add(rdpSettings* settings, ADDIN_ARGV* c settings->DynamicChannelArray = new_array; { for (size_t x = oldSize; x < size; x++) - settings->DynamicChannelArray[x] = NULL; + settings->DynamicChannelArray[x] = nullptr; } if (!freerdp_settings_set_uint32(settings, FreeRDP_DynamicChannelArraySize, WINPR_ASSERTING_INT_CAST(uint32_t, size))) @@ -743,7 +743,7 @@ ADDIN_ARGV* freerdp_dynamic_channel_collection_find(const rdpSettings* settings, return channel; } - return NULL; + return nullptr; } void freerdp_addin_argv_free(ADDIN_ARGV* args) @@ -764,11 +764,11 @@ void freerdp_addin_argv_free(ADDIN_ARGV* args) ADDIN_ARGV* freerdp_addin_argv_new(size_t argc, const char* const argv[]) { if (argc > INT32_MAX) - return NULL; + return nullptr; ADDIN_ARGV* args = calloc(1, sizeof(ADDIN_ARGV)); if (!args) - return NULL; + return nullptr; if (argc == 0) return args; @@ -793,7 +793,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC freerdp_addin_argv_free(args); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } ADDIN_ARGV* freerdp_addin_argv_clone(const ADDIN_ARGV* args) @@ -804,7 +804,7 @@ ADDIN_ARGV* freerdp_addin_argv_clone(const ADDIN_ARGV* args) const char** cc; } cnv; if (!args) - return NULL; + return nullptr; cnv.c = args->argv; return freerdp_addin_argv_new(WINPR_ASSERTING_INT_CAST(uint32_t, args->argc), cnv.cc); } @@ -822,7 +822,7 @@ void freerdp_dynamic_channel_collection_free(rdpSettings* settings) free((void*)settings->DynamicChannelArray); freerdp_settings_set_uint32(settings, FreeRDP_DynamicChannelArraySize, 0); - settings->DynamicChannelArray = NULL; + settings->DynamicChannelArray = nullptr; freerdp_settings_set_uint32(settings, FreeRDP_DynamicChannelCount, 0); } @@ -835,12 +835,12 @@ static void freerdp_capability_data_free(rdpSettings* settings, size_t offset, B for (size_t x = offset; x < settings->ReceivedCapabilitiesSize; x++) { free(settings->ReceivedCapabilityData[x]); - settings->ReceivedCapabilityData[x] = NULL; + settings->ReceivedCapabilityData[x] = nullptr; } if (full) { free((void*)settings->ReceivedCapabilityData); - settings->ReceivedCapabilityData = NULL; + settings->ReceivedCapabilityData = nullptr; } } } @@ -852,10 +852,10 @@ void freerdp_capability_buffer_free(rdpSettings* settings) freerdp_capability_data_free(settings, 0, TRUE); free(settings->ReceivedCapabilityDataSizes); - settings->ReceivedCapabilityDataSizes = NULL; + settings->ReceivedCapabilityDataSizes = nullptr; free(settings->ReceivedCapabilities); - settings->ReceivedCapabilities = NULL; + settings->ReceivedCapabilities = nullptr; settings->ReceivedCapabilitiesSize = 0; } @@ -900,7 +900,7 @@ static BOOL resize_setting_ptr(rdpSettings* settings, FreeRDP_Settings_Keys_Poin uint8_t** optr = WINPR_REINTERPRET_CAST(ptr, uint8_t*, uint8_t**); for (size_t x = oldsize; x < size; x++) { - optr[x] = NULL; + optr[x] = nullptr; } // NOLINTNEXTLINE(clang-analyzer-unix.Malloc @@ -972,7 +972,7 @@ BOOL freerdp_capability_buffer_copy(rdpSettings* settings, const rdpSettings* sr else { free(settings->ReceivedCapabilityData[x]); - settings->ReceivedCapabilityData[x] = NULL; + settings->ReceivedCapabilityData[x] = nullptr; } } return TRUE; @@ -987,7 +987,7 @@ static void target_net_addresses_free(rdpSettings* settings, size_t offset) for (size_t index = offset; index < settings->TargetNetAddressCount; index++) { free(settings->TargetNetAddresses[index]); - settings->TargetNetAddresses[index] = NULL; + settings->TargetNetAddresses[index] = nullptr; } } } @@ -999,10 +999,10 @@ void freerdp_target_net_addresses_free(rdpSettings* settings) target_net_addresses_free(settings, 0); free((void*)settings->TargetNetAddresses); - settings->TargetNetAddresses = NULL; + settings->TargetNetAddresses = nullptr; free(settings->TargetNetPorts); - settings->TargetNetPorts = NULL; + settings->TargetNetPorts = nullptr; settings->TargetNetAddressCount = 0; } @@ -1037,7 +1037,7 @@ void freerdp_server_license_issuers_free(rdpSettings* settings) free(settings->ServerLicenseProductIssuers[x]); } free((void*)settings->ServerLicenseProductIssuers); - settings->ServerLicenseProductIssuers = NULL; + settings->ServerLicenseProductIssuers = nullptr; settings->ServerLicenseProductIssuersCount = 0; } @@ -1046,7 +1046,7 @@ BOOL freerdp_server_license_issuers_copy(rdpSettings* settings, char** issuers, WINPR_ASSERT(settings); WINPR_ASSERT(issuers || (count == 0)); - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ServerLicenseProductIssuers, NULL, + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ServerLicenseProductIssuers, nullptr, count)) return FALSE; @@ -1221,7 +1221,7 @@ int freerdp_set_param_string(rdpSettings* settings, int id, const char* param) static BOOL value_to_uint(const char* value, ULONGLONG* result, ULONGLONG min, ULONGLONG max) { - char* endptr = NULL; + char* endptr = nullptr; unsigned long long rc = 0; if (!value || !result) @@ -1245,7 +1245,7 @@ static BOOL value_to_uint(const char* value, ULONGLONG* result, ULONGLONG min, U static BOOL value_to_int(const char* value, LONGLONG* result, LONGLONG min, LONGLONG max) { - char* endptr = NULL; + char* endptr = nullptr; long long rc = 0; if (!value || !result) @@ -1377,10 +1377,10 @@ BOOL freerdp_settings_set_pointer_len_(rdpSettings* settings, FreeRDP_Settings_K size_t len, size_t size) { BOOL rc = FALSE; - void* copy = NULL; + void* copy = nullptr; void* old = freerdp_settings_get_pointer_writable(settings, id); free(old); - if (!freerdp_settings_set_pointer(settings, id, NULL)) + if (!freerdp_settings_set_pointer(settings, id, nullptr)) return FALSE; if (lenId != FreeRDP_UINT32_UNUSED) { @@ -1509,25 +1509,25 @@ BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, FreeRDP_Settings_Ke case FreeRDP_TargetNetAddresses: if (!freerdp_target_net_addresses_resize(settings, len)) return FALSE; - if (data == NULL) + if (data == nullptr) target_net_addresses_free(settings, 0); return TRUE; case FreeRDP_ServerLicenseProductIssuers: - if (data == NULL) + if (data == nullptr) freerdp_server_license_issuers_free(settings); return freerdp_settings_set_pointer_len_( settings, id, FreeRDP_ServerLicenseProductIssuersCount, data, len, sizeof(char*)); case FreeRDP_TargetNetPorts: if (!freerdp_target_net_addresses_resize(settings, len)) return FALSE; - if (data == NULL) + if (data == nullptr) { for (size_t x = 0; x < len; x++) settings->TargetNetPorts[x] = 0; } return TRUE; case FreeRDP_DeviceArray: - if (data == NULL) + if (data == nullptr) freerdp_device_collection_free(settings); return freerdp_settings_set_pointer_len_(settings, id, FreeRDP_DeviceArraySize, data, len, sizeof(RDPDR_DEVICE*)); @@ -1576,19 +1576,19 @@ BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, FreeRDP_Settings_Ke return freerdp_settings_set_pointer_len_(settings, id, FreeRDP_UINT32_UNUSED, data, len, sizeof(GLYPH_CACHE_DEFINITION)); case FreeRDP_StaticChannelArray: - if (data == NULL) + if (data == nullptr) freerdp_static_channel_collection_free(settings); return freerdp_settings_set_pointer_len_(settings, id, FreeRDP_StaticChannelArraySize, data, len, sizeof(ADDIN_ARGV*)); case FreeRDP_DynamicChannelArray: - if (data == NULL) + if (data == nullptr) freerdp_dynamic_channel_collection_free(settings); return freerdp_settings_set_pointer_len_(settings, id, FreeRDP_DynamicChannelArraySize, data, len, sizeof(ADDIN_ARGV*)); case FreeRDP_ReceivedCapabilityData: if (!freerdp_capability_buffer_resize(settings, len, FALSE)) return FALSE; - if (data == NULL) + if (data == nullptr) { freerdp_capability_data_free(settings, 0, FALSE); } @@ -1596,7 +1596,7 @@ BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, FreeRDP_Settings_Ke case FreeRDP_ReceivedCapabilities: if (!freerdp_capability_buffer_resize(settings, len, FALSE)) return FALSE; - if (data == NULL) + if (data == nullptr) { for (size_t x = 0; x < settings->ReceivedCapabilitiesSize; x++) { @@ -1615,7 +1615,7 @@ BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, FreeRDP_Settings_Ke case FreeRDP_ReceivedCapabilityDataSizes: if (!freerdp_capability_buffer_resize(settings, len, FALSE)) return FALSE; - if (data == NULL) + if (data == nullptr) { for (size_t x = 0; x < settings->ReceivedCapabilitiesSize; x++) settings->ReceivedCapabilityDataSizes[x] = 0; @@ -1626,9 +1626,9 @@ BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, FreeRDP_Settings_Ke return freerdp_settings_set_pointer_len_(settings, id, FreeRDP_Password51Length, data, len, sizeof(char)); default: - if ((data == NULL) && (len == 0)) + if ((data == nullptr) && (len == 0)) { - freerdp_settings_set_pointer(settings, id, NULL); + freerdp_settings_set_pointer(settings, id, nullptr); } else WLog_WARN(TAG, "Invalid id %d", id); @@ -1641,7 +1641,7 @@ void* freerdp_settings_get_pointer_array_writable(const rdpSettings* settings, { size_t max = 0; if (!settings) - return NULL; + return nullptr; switch (id) { case FreeRDP_ClientAutoReconnectCookie: @@ -1789,13 +1789,13 @@ void* freerdp_settings_get_pointer_array_writable(const rdpSettings* settings, return &settings->ReceivedCapabilityDataSizes[offset]; default: WLog_WARN(TAG, "Invalid id %s [%d]", freerdp_settings_get_name_for_key(id), id); - return NULL; + return nullptr; } fail: WLog_WARN(TAG, "Invalid offset for %s [%d]: size=%" PRIuz ", offset=%" PRIuz, freerdp_settings_get_name_for_key(id), id, max, offset); - return NULL; + return nullptr; } BOOL freerdp_settings_set_pointer_array(rdpSettings* settings, FreeRDP_Settings_Keys_Pointer id, @@ -1838,7 +1838,7 @@ BOOL freerdp_settings_set_pointer_array(rdpSettings* settings, FreeRDP_Settings_ WINPR_ASSERT(settings->TargetNetAddresses); free(settings->TargetNetAddresses[offset]); settings->TargetNetAddresses[offset] = _strdup((const char*)data); - return settings->TargetNetAddresses[offset] != NULL; + return settings->TargetNetAddresses[offset] != nullptr; case FreeRDP_TargetNetPorts: maxOffset = freerdp_settings_get_uint32(settings, FreeRDP_TargetNetAddressCount); if ((offset >= maxOffset) || !data) @@ -1955,7 +1955,7 @@ BOOL freerdp_settings_set_pointer_array(rdpSettings* settings, FreeRDP_Settings_ if ((offset >= maxOffset) || !settings->ServerLicenseProductIssuers) goto fail; free(settings->ServerLicenseProductIssuers[offset]); - settings->ServerLicenseProductIssuers[offset] = NULL; + settings->ServerLicenseProductIssuers[offset] = nullptr; if (data) settings->ServerLicenseProductIssuers[offset] = _strdup((const char*)data); return TRUE; @@ -1980,7 +1980,7 @@ BOOL freerdp_settings_set_pointer_array(rdpSettings* settings, FreeRDP_Settings_ } fail: - WLog_WARN(TAG, "[%s] Invalid offset=%" PRIuz " [%" PRIuz "] or NULL data=%p", + WLog_WARN(TAG, "[%s] Invalid offset=%" PRIuz " [%" PRIuz "] or nullptr data=%p", freerdp_settings_get_name_for_key(id), offset, maxOffset, data); return FALSE; } @@ -2244,7 +2244,7 @@ BOOL freerdp_settings_set_string_from_utf16(rdpSettings* settings, FreeRDP_Setti WINPR_ASSERT(settings); if (!param) - return freerdp_settings_set_string_copy_(settings, id, NULL, 0, TRUE); + return freerdp_settings_set_string_copy_(settings, id, nullptr, 0, TRUE); size_t len = 0; @@ -2263,7 +2263,7 @@ BOOL freerdp_settings_set_string_from_utf16N(rdpSettings* settings, FreeRDP_Sett WINPR_ASSERT(settings); if (!param) - return freerdp_settings_set_string_copy_(settings, id, NULL, length, TRUE); + return freerdp_settings_set_string_copy_(settings, id, nullptr, length, TRUE); char* str = ConvertWCharNToUtf8Alloc(param, length, &len); if (!str && (length != 0)) @@ -2285,7 +2285,7 @@ WCHAR* freerdp_settings_get_string_as_utf16(const rdpSettings* settings, if (pCharLen) *pCharLen = 0; if (!str) - return NULL; + return nullptr; return ConvertUtf8ToWCharAlloc(str, pCharLen); } @@ -2386,7 +2386,7 @@ BOOL freerdp_settings_append_string(rdpSettings* settings, FreeRDP_Settings_Keys const char* old = freerdp_settings_get_string(settings, id); size_t len = 0; - char* str = NULL; + char* str = nullptr; if (!old) winpr_asprintf(&str, &len, "%s", param); @@ -2402,7 +2402,7 @@ BOOL freerdp_settings_append_string(rdpSettings* settings, FreeRDP_Settings_Keys BOOL freerdp_settings_are_valid(const rdpSettings* settings) { - return settings != NULL; + return settings != nullptr; } /* Function to sort rdpMonitor arrays: @@ -2439,13 +2439,13 @@ BOOL freerdp_settings_set_monitor_def_array_sorted(rdpSettings* settings, return FALSE; if (!freerdp_settings_set_int32(settings, FreeRDP_MonitorLocalShiftY, 0)) return FALSE; - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorDefArray, NULL, 0)) + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorDefArray, nullptr, 0)) return FALSE; return freerdp_settings_set_uint32(settings, FreeRDP_MonitorCount, 0); } // Find primary or alternatively the monitor at 0/0 - const rdpMonitor* primary = NULL; + const rdpMonitor* primary = nullptr; for (size_t x = 0; x < count; x++) { const rdpMonitor* cur = &monitors[x]; @@ -2474,7 +2474,7 @@ BOOL freerdp_settings_set_monitor_def_array_sorted(rdpSettings* settings, return FALSE; } - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorDefArray, NULL, count)) + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorDefArray, nullptr, count)) return FALSE; rdpMonitor* sorted = freerdp_settings_get_pointer_writable(settings, FreeRDP_MonitorDefArray); WINPR_ASSERT(sorted); @@ -2556,7 +2556,7 @@ static WINPR_JSON* json_from_addin_item(const ADDIN_ARGV* val) { const char* str = val->argv[x]; - WINPR_JSON* item = NULL; + WINPR_JSON* item = nullptr; if (!str) { item = WINPR_JSON_CreateNull(); @@ -2574,7 +2574,7 @@ static WINPR_JSON* json_from_addin_item(const ADDIN_ARGV* val) fail: WINPR_JSON_Delete(obj); - return NULL; + return nullptr; } static BOOL json_from_addin_item_array(WINPR_JSON* json, const rdpSettings* settings, @@ -2595,7 +2595,7 @@ static BOOL json_from_addin_item_array(WINPR_JSON* json, const rdpSettings* sett static BOOL add_string_or_null(WINPR_JSON* json, const char* key, const char* value) { if (value) - return WINPR_JSON_AddStringToObject(json, key, value) != NULL; + return WINPR_JSON_AddStringToObject(json, key, value) != nullptr; (void)WINPR_JSON_AddNullToObject(json, key); return TRUE; @@ -2663,7 +2663,7 @@ static WINPR_JSON* json_from_device_item(const RDPDR_DEVICE* val) fail: WINPR_JSON_Delete(obj); - return NULL; + return nullptr; } static BOOL json_from_device_item_array(WINPR_JSON* json, const rdpSettings* settings, @@ -2688,7 +2688,7 @@ static BOOL string_array_to_json(WINPR_JSON* json, const rdpSettings* settings, { const char* cval = freerdp_settings_get_pointer_array(settings, key, x); - WINPR_JSON* item = NULL; + WINPR_JSON* item = nullptr; if (!cval) item = WINPR_JSON_CreateNull(); else @@ -2702,19 +2702,19 @@ static BOOL string_array_to_json(WINPR_JSON* json, const rdpSettings* settings, static BOOL wchar_to_json(WINPR_JSON* obj, const char* key, const WCHAR* wstr, size_t len) { if (len == 0) - return WINPR_JSON_AddStringToObject(obj, key, "") != NULL; + return WINPR_JSON_AddStringToObject(obj, key, "") != nullptr; const size_t slen = len * 6; char* str = calloc(1, slen); if (!str) return FALSE; - WINPR_JSON* jstr = NULL; + WINPR_JSON* jstr = nullptr; SSIZE_T rc = ConvertWCharNToUtf8(wstr, len, str, slen); if (rc >= 0) jstr = WINPR_JSON_AddStringToObject(obj, key, str); free(str); - return jstr != NULL; + return jstr != nullptr; } static BOOL wchar_from_json(WCHAR* wstr, size_t len, const WINPR_JSON* obj, const char* key) @@ -2814,7 +2814,7 @@ static WINPR_JSON* systemtime_to_json(WINPR_JSON* parent, const char* key, const WINPR_JSON* obj = WINPR_JSON_AddObjectToObject(parent, key); if (!obj) - return NULL; + return nullptr; if (!WINPR_JSON_AddNumberToObject(obj, "wYear", st->wYear)) goto fail; @@ -2836,7 +2836,7 @@ static WINPR_JSON* systemtime_to_json(WINPR_JSON* parent, const char* key, const return obj; fail: WINPR_JSON_Delete(obj); - return NULL; + return nullptr; } static BOOL systemtime_from_json(const WINPR_JSON* pobj, const char* key, SYSTEMTIME* st) @@ -2896,7 +2896,7 @@ static BOOL ts_info_array_from_json(rdpSettings* settings, FreeRDP_Settings_Keys return FALSE; const size_t count = WINPR_JSON_GetArraySize(json); - if (!freerdp_settings_set_pointer_len(settings, key, NULL, count)) + if (!freerdp_settings_set_pointer_len(settings, key, nullptr, count)) return FALSE; for (size_t x = 0; x < count; x++) @@ -2998,7 +2998,7 @@ static BOOL glyph_cache_def_array_from_json(rdpSettings* settings, FreeRDP_Setti return FALSE; const size_t count = WINPR_JSON_GetArraySize(json); - if (!freerdp_settings_set_pointer_len(settings, id, NULL, count)) + if (!freerdp_settings_set_pointer_len(settings, id, nullptr, count)) return FALSE; for (size_t x = 0; x < count; x++) @@ -3039,7 +3039,7 @@ static BOOL bitmap_cache_v2_array_from_json(rdpSettings* settings, FreeRDP_Setti return FALSE; const size_t count = WINPR_JSON_GetArraySize(json); - if (!freerdp_settings_set_pointer_len(settings, id, NULL, count)) + if (!freerdp_settings_set_pointer_len(settings, id, nullptr, count)) return FALSE; for (size_t x = 0; x < count; x++) @@ -3093,7 +3093,7 @@ static BOOL client_cookie_array_from_json(rdpSettings* settings, FreeRDP_Setting return FALSE; const size_t count = WINPR_JSON_GetArraySize(json); - if (!freerdp_settings_set_pointer_len(settings, id, NULL, count)) + if (!freerdp_settings_set_pointer_len(settings, id, nullptr, count)) return FALSE; for (size_t x = 0; x < count; x++) @@ -3144,7 +3144,7 @@ static BOOL server_cookie_array_from_json(rdpSettings* settings, FreeRDP_Setting return FALSE; const size_t count = WINPR_JSON_GetArraySize(json); - if (!freerdp_settings_set_pointer_len(settings, id, NULL, count)) + if (!freerdp_settings_set_pointer_len(settings, id, nullptr, count)) return FALSE; for (size_t x = 0; x < count; x++) @@ -3191,7 +3191,7 @@ static BOOL channel_def_array_from_json(rdpSettings* settings, FreeRDP_Settings_ return FALSE; const size_t count = WINPR_JSON_GetArraySize(json); - if (!freerdp_settings_set_pointer_len(settings, id, NULL, count)) + if (!freerdp_settings_set_pointer_len(settings, id, nullptr, count)) return FALSE; for (size_t x = 0; x < count; x++) @@ -3257,7 +3257,7 @@ static BOOL monitor_def_array_from_json(rdpSettings* settings, FreeRDP_Settings_ return FALSE; const size_t count = WINPR_JSON_GetArraySize(json); - if (!freerdp_settings_set_pointer_len(settings, id, NULL, count)) + if (!freerdp_settings_set_pointer_len(settings, id, nullptr, count)) return FALSE; for (size_t x = 0; x < count; x++) @@ -3630,7 +3630,7 @@ static BOOL serialize_pointer(const rdpSettings* settings, WINPR_JSON* json, case FreeRDP_RedirectionTargetCertificate: case FreeRDP_RdpServerCertificate: { - WINPR_JSON* item = NULL; + WINPR_JSON* item = nullptr; size_t len = 0; char* pem = freerdp_certificate_get_pem(val, &len); if (pem) @@ -3647,9 +3647,9 @@ static BOOL serialize_pointer(const rdpSettings* settings, WINPR_JSON* json, } case FreeRDP_RdpServerRsaKey: { - WINPR_JSON* item = NULL; + WINPR_JSON* item = nullptr; size_t len = 0; - char* pem = freerdp_key_get_pem(val, &len, NULL); + char* pem = freerdp_key_get_pem(val, &len, nullptr); if (pem) item = WINPR_JSON_CreateString(pem); free(pem); @@ -3683,17 +3683,17 @@ static BOOL serialize_pointer(const rdpSettings* settings, WINPR_JSON* json, char* freerdp_settings_serialize(const rdpSettings* settings, BOOL pretty, size_t* plength) { - char* str = NULL; + char* str = nullptr; if (plength) *plength = 0; if (!settings) - return NULL; + return nullptr; WINPR_JSON* json = WINPR_JSON_CreateObject(); if (!json) - return NULL; + return nullptr; WINPR_JSON* jbool = WINPR_JSON_AddObjectToObject( json, freerdp_settings_get_type_name_for_type(RDP_SETTINGS_TYPE_BOOL)); @@ -3830,19 +3830,19 @@ static BOOL val_from_array(rdpSettings* settings, const WINPR_JSON* json, FreeRDP_Settings_Keys_Pointer key, size_t esize) { if (WINPR_JSON_IsNull(json)) - return freerdp_settings_set_pointer(settings, key, NULL); + return freerdp_settings_set_pointer(settings, key, nullptr); if (!WINPR_JSON_IsArray(json)) return FALSE; size_t len = WINPR_JSON_GetArraySize(json); if (len == 0) - return freerdp_settings_set_pointer(settings, key, NULL); + return freerdp_settings_set_pointer(settings, key, nullptr); size_t count = len / esize; if (count * esize != len) return FALSE; - if (!freerdp_settings_set_pointer_len(settings, key, NULL, count)) + if (!freerdp_settings_set_pointer_len(settings, key, nullptr, count)) return FALSE; BYTE* data = freerdp_settings_get_pointer_writable(settings, key); @@ -3870,7 +3870,7 @@ static BOOL uintptr_from_array(rdpSettings* settings, const WINPR_JSON* json) return FALSE; if (len == 0) - return freerdp_settings_set_pointer(settings, key, NULL); + return freerdp_settings_set_pointer(settings, key, nullptr); union { @@ -3894,14 +3894,14 @@ static BOOL val_from_uint32_array(rdpSettings* settings, const WINPR_JSON* json, FreeRDP_Settings_Keys_UInt32 keyId) { if (WINPR_JSON_IsNull(json)) - return freerdp_settings_set_pointer(settings, key, NULL); + return freerdp_settings_set_pointer(settings, key, nullptr); if (!WINPR_JSON_IsArray(json)) return FALSE; const size_t len = WINPR_JSON_GetArraySize(json); if ((FreeRDP_UINT32_UNUSED != keyId) && (freerdp_settings_get_uint32(settings, keyId) != len)) { - if (!freerdp_settings_set_pointer_len(settings, key, NULL, len)) + if (!freerdp_settings_set_pointer_len(settings, key, nullptr, len)) return FALSE; } @@ -3927,7 +3927,7 @@ static BOOL caps_data_entry_from_json(rdpSettings* settings, size_t offset, cons if (size == 0) { return freerdp_settings_set_pointer_array(settings, FreeRDP_ReceivedCapabilityData, offset, - NULL); + nullptr); } uint8_t* data = calloc(size, sizeof(uint8_t)); @@ -3957,7 +3957,7 @@ static BOOL caps_data_array_from_json(rdpSettings* settings, const WINPR_JSON* j return FALSE; const size_t count = WINPR_JSON_GetArraySize(json); - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ReceivedCapabilityData, NULL, count)) + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ReceivedCapabilityData, nullptr, count)) return FALSE; for (uint32_t x = 0; x < count; x++) @@ -3973,12 +3973,12 @@ static BOOL str_array_from_json(rdpSettings* settings, const WINPR_JSON* json, FreeRDP_Settings_Keys_Pointer key) { if (WINPR_JSON_IsNull(json)) - return freerdp_settings_set_pointer_len(settings, key, NULL, 0); + return freerdp_settings_set_pointer_len(settings, key, nullptr, 0); if (!WINPR_JSON_IsArray(json)) return FALSE; size_t len = WINPR_JSON_GetArraySize(json); - if (!freerdp_settings_set_pointer_len(settings, key, NULL, len)) + if (!freerdp_settings_set_pointer_len(settings, key, nullptr, len)) return FALSE; for (size_t x = 0; x < len; x++) @@ -4000,13 +4000,13 @@ static BOOL addin_argv_from_json(rdpSettings* settings, const WINPR_JSON* json, FreeRDP_Settings_Keys_Pointer key) { if (WINPR_JSON_IsNull(json)) - return freerdp_settings_set_pointer(settings, key, NULL); + return freerdp_settings_set_pointer(settings, key, nullptr); if (!WINPR_JSON_IsArray(json)) return FALSE; size_t len = WINPR_JSON_GetArraySize(json); - if (!freerdp_settings_set_pointer_len(settings, key, NULL, len)) + if (!freerdp_settings_set_pointer_len(settings, key, nullptr, len)) return FALSE; for (size_t x = 0; x < len; x++) @@ -4061,7 +4061,7 @@ static char* get_string(const WINPR_JSON* json, const char* key) { WINPR_JSON* item = WINPR_JSON_GetObjectItemCaseSensitive(json, key); if (!item || !WINPR_JSON_IsString(item)) - return NULL; + return nullptr; const char* str = WINPR_JSON_GetStringValue(item); return WINPR_CAST_CONST_PTR_AWAY(str, char*); } @@ -4131,13 +4131,13 @@ static BOOL device_array_from_json(rdpSettings* settings, const WINPR_JSON* json FreeRDP_Settings_Keys_Pointer key) { if (WINPR_JSON_IsNull(json)) - return freerdp_settings_set_pointer(settings, key, NULL); + return freerdp_settings_set_pointer(settings, key, nullptr); if (!WINPR_JSON_IsArray(json)) return FALSE; size_t len = WINPR_JSON_GetArraySize(json); - if (!freerdp_settings_set_pointer_len(settings, key, NULL, len)) + if (!freerdp_settings_set_pointer_len(settings, key, nullptr, len)) return FALSE; for (size_t x = 0; x < len; x++) @@ -4159,20 +4159,20 @@ static const char* pem_from_json(const WINPR_JSON* jval, size_t* plen, BOOL* pva *plen = 0; if (WINPR_JSON_IsNull(jval)) - return NULL; + return nullptr; size_t len = WINPR_JSON_GetArraySize(jval); if (len == 0) { *pvalid = TRUE; - return NULL; + return nullptr; } WINPR_JSON* item = WINPR_JSON_GetArrayItem(jval, 0); if (!item) - return NULL; + return nullptr; if (!WINPR_JSON_IsString(item)) - return NULL; + return nullptr; *plen = len; *pvalid = TRUE; @@ -4244,10 +4244,10 @@ static BOOL deserialize_pointer(const WINPR_JSON* json, rdpSettings* settings, const char* pem = pem_from_json(jval, &len, &valid); if (!valid) return FALSE; - if (!freerdp_settings_set_pointer_len(settings, id, NULL, len)) + if (!freerdp_settings_set_pointer_len(settings, id, nullptr, len)) return FALSE; - rdpCertificate* cert = NULL; + rdpCertificate* cert = nullptr; if (!pem) return TRUE; @@ -4266,12 +4266,12 @@ static BOOL deserialize_pointer(const WINPR_JSON* json, rdpSettings* settings, const char* pem = pem_from_json(jval, &len, &valid); if (!valid) return FALSE; - if (!freerdp_settings_set_pointer_len(settings, id, NULL, len)) + if (!freerdp_settings_set_pointer_len(settings, id, nullptr, len)) return FALSE; if (!pem) return TRUE; - rdpPrivateKey* key = freerdp_key_new_from_pem_enc(pem, NULL); + rdpPrivateKey* key = freerdp_key_new_from_pem_enc(pem, nullptr); if (!key) return FALSE; return freerdp_settings_set_pointer_len(settings, id, key, 1); @@ -4291,7 +4291,7 @@ rdpSettings* freerdp_settings_deserialize(const char* jstr, size_t length) { WINPR_JSON* json = WINPR_JSON_ParseWithLength(jstr, length); if (!json) - return NULL; + return nullptr; WINPR_JSON* jbool = WINPR_JSON_GetObjectItemCaseSensitive( json, freerdp_settings_get_type_name_for_type(RDP_SETTINGS_TYPE_BOOL)); @@ -4443,7 +4443,7 @@ rdpSettings* freerdp_settings_deserialize(const char* jstr, size_t length) break; case RDP_SETTINGS_TYPE_STRING: { - const char* val = NULL; + const char* val = nullptr; WINPR_JSON* item = WINPR_JSON_GetObjectItemCaseSensitive(jstring, name); if (item && !WINPR_JSON_IsNull(item)) { @@ -4469,5 +4469,5 @@ rdpSettings* freerdp_settings_deserialize(const char* jstr, size_t length) fail: freerdp_settings_free(settings); WINPR_JSON_Delete(json); - return NULL; + return nullptr; } diff --git a/libfreerdp/common/settings_getters.c b/libfreerdp/common/settings_getters.c index 102fda28f..0622edeaa 100644 --- a/libfreerdp/common/settings_getters.c +++ b/libfreerdp/common/settings_getters.c @@ -15,7 +15,7 @@ static void free_string(char** current, BOOL cleanup) if (*current) memset(*current, 0, strlen(*current)); free(*current); - (*current) = NULL; + (*current) = nullptr; } } @@ -24,7 +24,7 @@ static BOOL alloc_empty_string(char** current, const char* next, size_t next_len if (!next && (next_len > 0)) { *current = calloc(next_len, 1); - return (*current != NULL); + return (*current != nullptr); } return FALSE; } @@ -36,8 +36,8 @@ static BOOL update_string_copy_(char** current, const char* next, size_t next_le if (alloc_empty_string(current, next, next_len)) return TRUE; - *current = (next ? strndup(next, next_len) : NULL); - return !next || (*current != NULL); + *current = (next ? strndup(next, next_len) : nullptr); + return !next || (*current != nullptr); } static BOOL update_string_(char** current, char* next, size_t next_len) @@ -48,7 +48,7 @@ static BOOL update_string_(char** current, char* next, size_t next_len) return TRUE; *current = next; - return !next || (*current != NULL); + return !next || (*current != nullptr); } BOOL freerdp_settings_get_bool(WINPR_ATTR_UNUSED const rdpSettings* settings, @@ -3041,7 +3041,7 @@ const char* freerdp_settings_get_string(WINPR_ATTR_UNUSED const rdpSettings* set WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); - return NULL; + return nullptr; } } @@ -3373,7 +3373,7 @@ char* freerdp_settings_get_string_writable(rdpSettings* settings, FreeRDP_Settin WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); - return NULL; + return nullptr; } } @@ -4188,7 +4188,7 @@ void* freerdp_settings_get_pointer_writable(rdpSettings* settings, FreeRDP_Setti WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); - return NULL; + return nullptr; } } diff --git a/libfreerdp/common/settings_str.c b/libfreerdp/common/settings_str.c index 1017077e5..836f03ae5 100644 --- a/libfreerdp/common/settings_str.c +++ b/libfreerdp/common/settings_str.c @@ -335,12 +335,12 @@ void freerdp_settings_free_keys(rdpSettings* dst, BOOL cleanup) switch (cur->type) { case FREERDP_SETTINGS_TYPE_STRING: /* strings */ - freerdp_settings_set_string_copy_(dst, (FreeRDP_Settings_Keys_String)cur->id, NULL, - 0, cleanup); + freerdp_settings_set_string_copy_(dst, (FreeRDP_Settings_Keys_String)cur->id, + nullptr, 0, cleanup); break; case FREERDP_SETTINGS_TYPE_POINTER: /* pointer */ - freerdp_settings_set_pointer_len(dst, (FreeRDP_Settings_Keys_Pointer)cur->id, NULL, - 0); + freerdp_settings_set_pointer_len(dst, (FreeRDP_Settings_Keys_Pointer)cur->id, + nullptr, 0); break; default: break; @@ -426,7 +426,7 @@ const char* freerdp_settings_get_name_for_key(SSIZE_T key) if (cur->id == key) return cur->str; } - return NULL; + return nullptr; } BOOL freerdp_settings_copy_item(rdpSettings* dst, const rdpSettings* src, SSIZE_T id) diff --git a/libfreerdp/common/test/TestAddinArgv.c b/libfreerdp/common/test/TestAddinArgv.c index f9a1f8bc5..510e64275 100644 --- a/libfreerdp/common/test/TestAddinArgv.c +++ b/libfreerdp/common/test/TestAddinArgv.c @@ -7,14 +7,14 @@ static BOOL test_alloc(void) { BOOL rc = FALSE; int rng = 0; - const char* param[] = { "foo:", "bar", "bla", "rdp", NULL }; - ADDIN_ARGV* arg1 = NULL; - ADDIN_ARGV* arg2 = NULL; - ADDIN_ARGV* arg3 = NULL; - ADDIN_ARGV* arg4 = NULL; + const char* param[] = { "foo:", "bar", "bla", "rdp", nullptr }; + ADDIN_ARGV* arg1 = nullptr; + ADDIN_ARGV* arg2 = nullptr; + ADDIN_ARGV* arg3 = nullptr; + ADDIN_ARGV* arg4 = nullptr; /* Test empty allocation */ - arg1 = freerdp_addin_argv_new(0, NULL); + arg1 = freerdp_addin_argv_new(0, nullptr); if (!arg1 || (arg1->argc != 0) || (arg1->argv)) goto fail; @@ -22,7 +22,7 @@ static BOOL test_alloc(void) winpr_RAND(&rng, sizeof(rng)); rng = abs(rng % 8192) + 1; - arg2 = freerdp_addin_argv_new(rng, NULL); + arg2 = freerdp_addin_argv_new(rng, nullptr); if (!arg2 || (arg2->argc != rng) || (!arg2->argv)) goto fail; for (int x = 0; x < arg2->argc; x++) @@ -42,7 +42,7 @@ static BOOL test_alloc(void) goto fail; } - /* Input lists with NULL elements are not allowed */ + /* Input lists with nullptr elements are not allowed */ arg4 = freerdp_addin_argv_new(ARRAYSIZE(param), param); if (arg4) goto fail; @@ -60,9 +60,9 @@ static BOOL test_clone(void) { BOOL rc = FALSE; const char* param[] = { "foo:", "bar", "bla", "rdp" }; - ADDIN_ARGV* arg = NULL; - ADDIN_ARGV* clone = NULL; - ADDIN_ARGV* clone2 = NULL; + ADDIN_ARGV* arg = nullptr; + ADDIN_ARGV* clone = nullptr; + ADDIN_ARGV* clone2 = nullptr; arg = freerdp_addin_argv_new(ARRAYSIZE(param), param); if (!arg || (arg->argc != ARRAYSIZE(param))) @@ -79,7 +79,7 @@ static BOOL test_clone(void) goto fail; } - clone2 = freerdp_addin_argv_clone(NULL); + clone2 = freerdp_addin_argv_clone(nullptr); if (clone2) goto fail; rc = TRUE; @@ -95,7 +95,7 @@ static BOOL test_add_remove(void) { const char* args[] = { "foo", "bar", "bla", "gaga" }; BOOL rc = FALSE; - ADDIN_ARGV* arg = freerdp_addin_argv_new(0, NULL); + ADDIN_ARGV* arg = freerdp_addin_argv_new(0, nullptr); if (!arg || (arg->argc != 0) || arg->argv) goto fail; @@ -117,11 +117,11 @@ static BOOL test_add_remove(void) goto fail; /* Invalid parameters, must return FALSE */ - if (freerdp_addin_argv_del_argument(NULL, "foobar")) + if (freerdp_addin_argv_del_argument(nullptr, "foobar")) goto fail; /* Invalid parameters, must return FALSE */ - if (freerdp_addin_argv_del_argument(arg, NULL)) + if (freerdp_addin_argv_del_argument(arg, nullptr)) goto fail; /* Remove elements one by one to test argument index move */ @@ -149,17 +149,17 @@ static BOOL test_set_argument(void) const char* newarg = "foobar"; const char* args[] = { "foo", "bar", "bla", "gaga" }; BOOL rc = FALSE; - ADDIN_ARGV* arg = NULL; + ADDIN_ARGV* arg = nullptr; arg = freerdp_addin_argv_new(ARRAYSIZE(args), args); if (!arg || (arg->argc != ARRAYSIZE(args)) || !arg->argv) goto fail; /* Check invalid parameters */ - ret = freerdp_addin_set_argument(NULL, "foo"); + ret = freerdp_addin_set_argument(nullptr, "foo"); if (ret >= 0) goto fail; - ret = freerdp_addin_set_argument(arg, NULL); + ret = freerdp_addin_set_argument(arg, nullptr); if (ret >= 0) goto fail; @@ -187,20 +187,20 @@ static BOOL test_replace_argument(void) const char* newarg = "foobar"; const char* args[] = { "foo", "bar", "bla", "gaga" }; BOOL rc = FALSE; - ADDIN_ARGV* arg = NULL; + ADDIN_ARGV* arg = nullptr; arg = freerdp_addin_argv_new(ARRAYSIZE(args), args); if (!arg || (arg->argc != ARRAYSIZE(args)) || !arg->argv) goto fail; /* Check invalid parameters */ - ret = freerdp_addin_replace_argument(NULL, "foo", newarg); + ret = freerdp_addin_replace_argument(nullptr, "foo", newarg); if (ret >= 0) goto fail; - ret = freerdp_addin_replace_argument(arg, NULL, newarg); + ret = freerdp_addin_replace_argument(arg, nullptr, newarg); if (ret >= 0) goto fail; - ret = freerdp_addin_replace_argument(arg, "foo", NULL); + ret = freerdp_addin_replace_argument(arg, "foo", nullptr); if (ret >= 0) goto fail; @@ -232,20 +232,20 @@ static BOOL test_set_argument_value(void) const char* fullnewvalue = "lalala:foobar"; const char* args[] = { "foo", "foo:", "bar", "bla", "gaga" }; BOOL rc = FALSE; - ADDIN_ARGV* arg = NULL; + ADDIN_ARGV* arg = nullptr; arg = freerdp_addin_argv_new(ARRAYSIZE(args), args); if (!arg || (arg->argc != ARRAYSIZE(args)) || !arg->argv) goto fail; /* Check invalid parameters */ - ret = freerdp_addin_set_argument_value(NULL, "foo", newarg1); + ret = freerdp_addin_set_argument_value(nullptr, "foo", newarg1); if (ret >= 0) goto fail; - ret = freerdp_addin_set_argument_value(arg, NULL, newarg1); + ret = freerdp_addin_set_argument_value(arg, nullptr, newarg1); if (ret >= 0) goto fail; - ret = freerdp_addin_set_argument_value(arg, "foo", NULL); + ret = freerdp_addin_set_argument_value(arg, "foo", nullptr); if (ret >= 0) goto fail; @@ -280,23 +280,23 @@ static BOOL test_replace_argument_value(void) const char* fullnewvalue = "lalala:foobar"; const char* args[] = { "foo", "foo:", "bar", "bla", "gaga" }; BOOL rc = FALSE; - ADDIN_ARGV* arg = NULL; + ADDIN_ARGV* arg = nullptr; arg = freerdp_addin_argv_new(ARRAYSIZE(args), args); if (!arg || (arg->argc != ARRAYSIZE(args)) || !arg->argv) goto fail; /* Check invalid parameters */ - ret = freerdp_addin_replace_argument_value(NULL, "bar", "foo", newarg1); + ret = freerdp_addin_replace_argument_value(nullptr, "bar", "foo", newarg1); if (ret >= 0) goto fail; - ret = freerdp_addin_replace_argument_value(arg, NULL, "foo", newarg1); + ret = freerdp_addin_replace_argument_value(arg, nullptr, "foo", newarg1); if (ret >= 0) goto fail; - ret = freerdp_addin_replace_argument_value(arg, "foo", NULL, newarg1); + ret = freerdp_addin_replace_argument_value(arg, "foo", nullptr, newarg1); if (ret >= 0) goto fail; - ret = freerdp_addin_replace_argument_value(arg, "bar", "foo", NULL); + ret = freerdp_addin_replace_argument_value(arg, "bar", "foo", nullptr); if (ret >= 0) goto fail; diff --git a/libfreerdp/common/test/TestCommonAssistance.c b/libfreerdp/common/test/TestCommonAssistance.c index 0dba986cb..4a6ce2557 100644 --- a/libfreerdp/common/test/TestCommonAssistance.c +++ b/libfreerdp/common/test/TestCommonAssistance.c @@ -210,9 +210,9 @@ static BOOL test_file_from_buffer(wLog* log, const char* data, size_t size, cons { BOOL rc = FALSE; int status = 0; - char* pass = NULL; - char* expertBlob = NULL; - const char* EncryptedPassStub = NULL; + char* pass = nullptr; + char* expertBlob = nullptr; + const char* EncryptedPassStub = nullptr; size_t EncryptedPassStubLength = 0; rdpAssistanceFile* file = freerdp_assistance_file_new(); @@ -271,7 +271,7 @@ static BOOL test_msrsc_incident_file_type1(wLog* log) static BOOL test_msrsc_incident_file_type2(wLog* log) { if (!test_file_from_buffer(log, connectionstr2, sizeof(connectionstr2), - TEST_MSRC_INCIDENT_PASSWORD_TYPE2, NULL, 0)) + TEST_MSRC_INCIDENT_PASSWORD_TYPE2, nullptr, 0)) return FALSE; if (!test_file_from_buffer(log, connectionstr3, sizeof(connectionstr3), connectionpwd3, connectionpwd3_enc, sizeof(connectionpwd3_enc))) @@ -286,7 +286,7 @@ static BOOL test_msrsc_incident_file_type2(wLog* log) int TestCommonAssistance(int argc, char* argv[]) { - wLog* log = NULL; + wLog* log = nullptr; WINPR_UNUSED(argc); WINPR_UNUSED(argv); log = WLog_Get(__func__); @@ -297,7 +297,7 @@ int TestCommonAssistance(int argc, char* argv[]) const char* test = fail_tests[x]; const size_t len = strlen(test); - if (!run_test_parse(log, test, len + 1, NULL, FALSE)) + if (!run_test_parse(log, test, len + 1, nullptr, FALSE)) return -1; } diff --git a/libfreerdp/common/test/TestFuzzCommonAssistanceHexStringToBin.c b/libfreerdp/common/test/TestFuzzCommonAssistanceHexStringToBin.c index b0847d87f..6917be359 100644 --- a/libfreerdp/common/test/TestFuzzCommonAssistanceHexStringToBin.c +++ b/libfreerdp/common/test/TestFuzzCommonAssistanceHexStringToBin.c @@ -3,7 +3,7 @@ int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) { char* buf = calloc(Size + 1, sizeof(char)); - if (buf == NULL) + if (buf == nullptr) return 0; memcpy(buf, Data, Size); buf[Size] = '\0'; diff --git a/libfreerdp/common/test/TestFuzzCommonAssistanceParseFileBuffer.c b/libfreerdp/common/test/TestFuzzCommonAssistanceParseFileBuffer.c index 03856e489..c94411bbc 100644 --- a/libfreerdp/common/test/TestFuzzCommonAssistanceParseFileBuffer.c +++ b/libfreerdp/common/test/TestFuzzCommonAssistanceParseFileBuffer.c @@ -9,7 +9,7 @@ static int parse_file_buffer(const uint8_t* Data, size_t Size) return -1; char* buf = calloc(Size + 1, sizeof(char)); - if (buf == NULL) + if (buf == nullptr) goto err; memcpy(buf, Data, Size); buf[Size] = '\0'; diff --git a/libfreerdp/core/aad.c b/libfreerdp/core/aad.c index ea316f87b..412f58332 100644 --- a/libfreerdp/core/aad.c +++ b/libfreerdp/core/aad.c @@ -60,7 +60,7 @@ static SSIZE_T stream_sprintf(wStream* s, WINPR_FORMAT_ARG const char* fmt, ...) { va_list ap = WINPR_C_ARRAY_INIT; va_start(ap, fmt); - const int rc = vsnprintf(NULL, 0, fmt, ap); + const int rc = vsnprintf(nullptr, 0, fmt, ap); va_end(ap); if (rc < 0) @@ -94,7 +94,7 @@ static BOOL json_get_object(wLog* wlog, WINPR_JSON* json, const char* key, WINPR WINPR_JSON* prop = WINPR_JSON_GetObjectItemCaseSensitive(json, key); if (!prop) { - WLog_Print(wlog, WLOG_ERROR, "[json] object for key '%s' is NULL", key); + WLog_Print(wlog, WLOG_ERROR, "[json] object for key '%s' is nullptr", key); return FALSE; } *obj = prop; @@ -104,7 +104,7 @@ static BOOL json_get_object(wLog* wlog, WINPR_JSON* json, const char* key, WINPR static BOOL json_get_number(wLog* wlog, WINPR_JSON* json, const char* key, double* result) { BOOL rc = FALSE; - WINPR_JSON* prop = NULL; + WINPR_JSON* prop = nullptr; if (!json_get_object(wlog, json, key, &prop)) return FALSE; @@ -127,9 +127,9 @@ static BOOL json_get_const_string(wLog* wlog, WINPR_JSON* json, const char* key, BOOL rc = FALSE; WINPR_ASSERT(result); - *result = NULL; + *result = nullptr; - WINPR_JSON* prop = NULL; + WINPR_JSON* prop = nullptr; if (!json_get_object(wlog, json, key, &prop)) return FALSE; @@ -142,9 +142,9 @@ static BOOL json_get_const_string(wLog* wlog, WINPR_JSON* json, const char* key, { const char* str = WINPR_JSON_GetStringValue(prop); if (!str) - WLog_Print(wlog, WLOG_ERROR, "[json] object for key '%s' is NULL", key); + WLog_Print(wlog, WLOG_ERROR, "[json] object for key '%s' is nullptr", key); *result = str; - rc = str != NULL; + rc = str != nullptr; } fail: @@ -153,14 +153,14 @@ fail: static BOOL json_get_string_alloc(wLog* wlog, WINPR_JSON* json, const char* key, char** result) { - const char* str = NULL; + const char* str = nullptr; if (!json_get_const_string(wlog, json, key, &str)) return FALSE; free(*result); *result = _strdup(str); if (!*result) - WLog_Print(wlog, WLOG_ERROR, "[json] object for key '%s' strdup is NULL", key); - return *result != NULL; + WLog_Print(wlog, WLOG_ERROR, "[json] object for key '%s' strdup is nullptr", key); + return *result != nullptr; } static inline const char* aad_auth_result_to_string(DWORD code) @@ -192,16 +192,16 @@ static BOOL ensure_wellknown(rdpContext* context) if (!aad_fetch_wellknown(aad->log, context)) return FALSE; - return context->rdp->wellknown != NULL; + return context->rdp->wellknown != nullptr; } static BOOL aad_get_nonce(rdpAad* aad) { BOOL ret = FALSE; - BYTE* response = NULL; + BYTE* response = nullptr; long resp_code = 0; size_t response_length = 0; - WINPR_JSON* json = NULL; + WINPR_JSON* json = nullptr; WINPR_ASSERT(aad); WINPR_ASSERT(aad->rdpcontext); @@ -222,7 +222,7 @@ static BOOL aad_get_nonce(rdpAad* aad) if (!url) { WLog_Print(aad->log, WLOG_ERROR, - "wellknown does have 'token_endpoint=NULL' value, aborting"); + "wellknown does have 'token_endpoint=nullptr' value, aborting"); return FALSE; } @@ -277,14 +277,14 @@ int aad_client_begin(rdpAad* aad) hostname = freerdp_settings_get_server_name(settings); if (!hostname) { - WLog_Print(aad->log, WLOG_ERROR, "hostname == NULL"); + WLog_Print(aad->log, WLOG_ERROR, "hostname == nullptr"); return -1; } aad->hostname = _strdup(hostname); if (!aad->hostname) { - WLog_Print(aad->log, WLOG_ERROR, "_strdup(hostname) == NULL"); + WLog_Print(aad->log, WLOG_ERROR, "_strdup(hostname) == nullptr"); return -1; } @@ -305,7 +305,7 @@ int aad_client_begin(rdpAad* aad) pGetCommonAccessToken GetCommonAccessToken = freerdp_get_common_access_token(aad->rdpcontext); if (!GetCommonAccessToken) { - WLog_Print(aad->log, WLOG_ERROR, "GetCommonAccessToken == NULL"); + WLog_Print(aad->log, WLOG_ERROR, "GetCommonAccessToken == nullptr"); return -1; } @@ -335,12 +335,12 @@ static char* aad_create_jws_header(rdpAad* aad) WINPR_ASSERT(aad); /* Construct the base64url encoded JWS header */ - char* buffer = NULL; + char* buffer = nullptr; size_t bufferlen = 0; const int length = winpr_asprintf(&buffer, &bufferlen, "{\"alg\":\"RS256\",\"kid\":\"%s\"}", aad->kid); if (length < 0) - return NULL; + return nullptr; char* jws_header = crypto_base64url_encode((const BYTE*)buffer, bufferlen); free(buffer); @@ -349,17 +349,17 @@ static char* aad_create_jws_header(rdpAad* aad) static char* aad_create_jws_payload(rdpAad* aad, const char* ts_nonce) { - const time_t ts = time(NULL); + const time_t ts = time(nullptr); WINPR_ASSERT(aad); - char* e = NULL; - char* n = NULL; + char* e = nullptr; + char* n = nullptr; if (!get_encoded_rsa_params(aad->log, aad->key, &e, &n)) - return NULL; + return nullptr; /* Construct the base64url encoded JWS payload */ - char* buffer = NULL; + char* buffer = nullptr; size_t bufferlen = 0; const int length = winpr_asprintf(&buffer, &bufferlen, @@ -376,7 +376,7 @@ static char* aad_create_jws_payload(rdpAad* aad, const char* ts_nonce) free(n); if (length < 0) - return NULL; + return nullptr; char* jws_payload = crypto_base64url_encode((BYTE*)buffer, bufferlen); free(buffer); @@ -400,17 +400,17 @@ static BOOL aad_update_digest(rdpAad* aad, WINPR_DIGEST_CTX* ctx, const char* wh static char* aad_final_digest(rdpAad* aad, WINPR_DIGEST_CTX* ctx) { - char* jws_signature = NULL; + char* jws_signature = nullptr; WINPR_ASSERT(aad); WINPR_ASSERT(ctx); size_t siglen = 0; - const int dsf = winpr_DigestSign_Final(ctx, NULL, &siglen); + const int dsf = winpr_DigestSign_Final(ctx, nullptr, &siglen); if (dsf <= 0) { WLog_Print(aad->log, WLOG_ERROR, "winpr_DigestSign_Final failed with %d", dsf); - return NULL; + return nullptr; } char* buffer = calloc(siglen + 1, sizeof(char)); @@ -447,7 +447,7 @@ fail: static char* aad_create_jws_signature(rdpAad* aad, const char* jws_header, const char* jws_payload) { - char* jws_signature = NULL; + char* jws_signature = nullptr; WINPR_ASSERT(aad); @@ -474,14 +474,14 @@ fail: static int aad_send_auth_request(rdpAad* aad, const char* ts_nonce) { int ret = -1; - char* jws_header = NULL; - char* jws_payload = NULL; - char* jws_signature = NULL; + char* jws_header = nullptr; + char* jws_payload = nullptr; + char* jws_signature = nullptr; WINPR_ASSERT(aad); WINPR_ASSERT(ts_nonce); - wStream* s = Stream_New(NULL, 1024); + wStream* s = Stream_New(nullptr, 1024); if (!s) goto fail; @@ -537,9 +537,9 @@ static int aad_parse_state_initial(rdpAad* aad, wStream* s) { const char* jstr = Stream_PointerAs(s, char); const size_t jlen = Stream_GetRemainingLength(s); - const char* ts_nonce = NULL; + const char* ts_nonce = nullptr; int ret = -1; - WINPR_JSON* json = NULL; + WINPR_JSON* json = nullptr; if (!Stream_SafeSeek(s, jlen)) goto fail; @@ -566,7 +566,7 @@ static int aad_parse_state_auth(rdpAad* aad, wStream* s) int rc = -1; double result = 0; DWORD error_code = 0; - WINPR_JSON* json = NULL; + WINPR_JSON* json = nullptr; const char* jstr = Stream_PointerAs(s, char); const size_t jlength = Stream_GetRemainingLength(s); @@ -624,7 +624,7 @@ static BOOL generate_rsa_2048(rdpAad* aad) static char* generate_rsa_digest_base64_str(rdpAad* aad, const char* input, size_t ilen) { - char* b64 = NULL; + char* b64 = nullptr; WINPR_DIGEST_CTX* digest = winpr_Digest_New(); if (!digest) { @@ -665,7 +665,7 @@ static BOOL generate_json_base64_str(rdpAad* aad, const char* b64_hash) { WINPR_ASSERT(aad); - char* buffer = NULL; + char* buffer = nullptr; size_t blen = 0; const int length = winpr_asprintf(&buffer, &blen, "{\"kid\":\"%s\"}", b64_hash); if (length < 0) @@ -676,16 +676,16 @@ static BOOL generate_json_base64_str(rdpAad* aad, const char* b64_hash) aad->kid = crypto_base64url_encode((const BYTE*)buffer, (size_t)length); free(buffer); - return aad->kid != NULL; + return aad->kid != nullptr; } BOOL generate_pop_key(rdpAad* aad) { BOOL ret = FALSE; - char* buffer = NULL; - char* b64_hash = NULL; - char* e = NULL; - char* n = NULL; + char* buffer = nullptr; + char* b64_hash = nullptr; + char* e = nullptr; + char* n = nullptr; WINPR_ASSERT(aad); @@ -729,7 +729,7 @@ static char* bn_to_base64_url(wLog* wlog, rdpPrivateKey* key, enum FREERDP_KEY_P size_t len = 0; BYTE* bn = freerdp_key_get_param(key, param, &len); if (!bn) - return NULL; + return nullptr; char* b64 = crypto_base64url_encode(bn, len); free(bn); @@ -743,16 +743,16 @@ static char* bn_to_base64_url(wLog* wlog, rdpPrivateKey* key, enum FREERDP_KEY_P BOOL get_encoded_rsa_params(wLog* wlog, rdpPrivateKey* key, char** pe, char** pn) { BOOL rc = FALSE; - char* e = NULL; - char* n = NULL; + char* e = nullptr; + char* n = nullptr; WINPR_ASSERT(wlog); WINPR_ASSERT(key); WINPR_ASSERT(pe); WINPR_ASSERT(pn); - *pe = NULL; - *pn = NULL; + *pe = nullptr; + *pn = nullptr; e = bn_to_base64_url(wlog, key, FREERDP_KEY_PARAM_RSA_E); if (!e) @@ -811,7 +811,7 @@ rdpAad* aad_new(rdpContext* context) rdpAad* aad = (rdpAad*)calloc(1, sizeof(rdpAad)); if (!aad) - return NULL; + return nullptr; aad->log = WLog_Get(FREERDP_TAG("aad")); aad->key = freerdp_key_new(); @@ -825,7 +825,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC aad_free(aad); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void aad_free(rdpAad* aad) @@ -860,9 +860,9 @@ BOOL aad_is_supported(void) char* freerdp_utils_aad_get_access_token(wLog* log, const char* data, size_t length) { - char* token = NULL; - WINPR_JSON* access_token_prop = NULL; - const char* access_token_str = NULL; + char* token = nullptr; + WINPR_JSON* access_token_prop = nullptr; + const char* access_token_str = nullptr; WINPR_JSON* json = WINPR_JSON_ParseWithLength(data, length); if (!json) @@ -912,7 +912,7 @@ BOOL aad_fetch_wellknown(wLog* log, rdpContext* context) if (useTenant) tenantid = freerdp_settings_get_string(context->settings, FreeRDP_GatewayAvdAadtenantid); rdp->wellknown = freerdp_utils_aad_get_wellknown(log, base, tenantid); - return rdp->wellknown != NULL; + return rdp->wellknown != nullptr; } const char* freerdp_utils_aad_get_wellknown_string(rdpContext* context, AAD_WELLKNOWN_VALUES which) @@ -927,11 +927,11 @@ const char* freerdp_utils_aad_get_wellknown_custom_string(rdpContext* context, c WINPR_ASSERT(context->rdp); if (!ensure_wellknown(context)) - return NULL; + return nullptr; WINPR_JSON* obj = WINPR_JSON_GetObjectItemCaseSensitive(context->rdp->wellknown, which); if (!obj) - return NULL; + return nullptr; return WINPR_JSON_GetStringValue(obj); } @@ -1003,7 +1003,7 @@ WINPR_JSON* freerdp_utils_aad_get_wellknown_custom_object(rdpContext* context, c WINPR_ASSERT(context->rdp); if (!ensure_wellknown(context)) - return NULL; + return nullptr; return WINPR_JSON_GetObjectItemCaseSensitive(context->rdp->wellknown, which); } @@ -1015,7 +1015,7 @@ WINPR_JSON* freerdp_utils_aad_get_wellknown(wLog* log, const char* base, const c WINPR_ASSERT(base); WINPR_ASSERT(tenantid); - char* str = NULL; + char* str = nullptr; size_t len = 0; winpr_asprintf(&str, &len, "https://%s/%s/v2.0/.well-known/openid-configuration", base, tenantid); @@ -1023,20 +1023,20 @@ WINPR_JSON* freerdp_utils_aad_get_wellknown(wLog* log, const char* base, const c if (!str) { WLog_Print(log, WLOG_ERROR, "failed to create request URL for tenantid='%s'", tenantid); - return NULL; + return nullptr; } - BYTE* response = NULL; + BYTE* response = nullptr; long resp_code = 0; size_t response_length = 0; - const BOOL rc = freerdp_http_request(str, NULL, &resp_code, &response, &response_length); + const BOOL rc = freerdp_http_request(str, nullptr, &resp_code, &response, &response_length); if (!rc || (resp_code != HTTP_STATUS_OK)) { WLog_Print(log, WLOG_ERROR, "request for '%s' failed with: %s", str, freerdp_http_status_string(resp_code)); free(str); free(response); - return NULL; + return nullptr; } free(str); diff --git a/libfreerdp/core/activation.c b/libfreerdp/core/activation.c index 5d0f209d2..00e12861b 100644 --- a/libfreerdp/core/activation.c +++ b/libfreerdp/core/activation.c @@ -283,11 +283,11 @@ static BOOL rdp_write_client_persistent_key_list_pdu(wStream* s, static UINT16 rdp_load_persistent_key_list(rdpRdp* rdp, UINT64** pKeyList) { UINT16 keyCount = 0; - UINT64* keyList = NULL; - rdpPersistentCache* persistent = NULL; + UINT64* keyList = nullptr; + rdpPersistentCache* persistent = nullptr; rdpSettings* settings = rdp->settings; - *pKeyList = NULL; + *pKeyList = nullptr; if (!freerdp_settings_get_bool(settings, FreeRDP_BitmapCachePersistEnabled)) return 0; @@ -341,7 +341,7 @@ error: BOOL rdp_send_client_persistent_key_list_pdu(rdpRdp* rdp) { UINT16 keyMaxFrag = 2042; - UINT64* keyList = NULL; + UINT64* keyList = nullptr; RDP_BITMAP_PERSISTENT_INFO info = WINPR_C_ARRAY_INIT; WINPR_ASSERT(rdp); rdpSettings* settings = rdp->settings; @@ -809,7 +809,7 @@ BOOL rdp_server_accept_client_persistent_key_list_pdu(rdpRdp* rdp, wStream* s) const char* rdp_ctrlaction_string(UINT16 action, char* buffer, size_t size) { - const char* actstr = NULL; + const char* actstr = nullptr; switch (action) { case CTRLACTION_COOPERATE: diff --git a/libfreerdp/core/autodetect.c b/libfreerdp/core/autodetect.c index 81eed0418..cc3952950 100644 --- a/libfreerdp/core/autodetect.c +++ b/libfreerdp/core/autodetect.c @@ -64,7 +64,7 @@ typedef struct static const char* autodetect_header_type_string(UINT8 headerType, char* buffer, size_t size) { - const char* str = NULL; + const char* str = nullptr; switch (headerType) { case TYPE_ID_AUTODETECT_REQUEST: @@ -135,7 +135,7 @@ static BOOL autodetect_send_rtt_measure_request(rdpAutoDetect* autodetect, { UINT16 requestType = 0; UINT16 sec_flags = 0; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(autodetect); WINPR_ASSERT(autodetect->context); @@ -162,7 +162,7 @@ static BOOL autodetect_send_rtt_measure_request(rdpAutoDetect* autodetect, static BOOL autodetect_send_rtt_measure_response(rdpAutoDetect* autodetect, UINT16 sequenceNumber) { UINT16 sec_flags = 0; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(autodetect); WINPR_ASSERT(autodetect->context); @@ -189,7 +189,7 @@ static BOOL autodetect_send_bandwidth_measure_start(rdpAutoDetect* autodetect, { UINT16 requestType = 0; UINT16 sec_flags = 0; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(autodetect); WINPR_ASSERT(autodetect->context); @@ -219,7 +219,7 @@ autodetect_send_bandwidth_measure_payload(rdpAutoDetect* autodetect, UINT16 sequenceNumber, UINT16 payloadLength) { UINT16 sec_flags = 0; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(autodetect); WINPR_ASSERT(autodetect->context); @@ -261,7 +261,7 @@ static BOOL autodetect_send_bandwidth_measure_stop(rdpAutoDetect* autodetect, { UINT16 requestType = 0; UINT16 sec_flags = 0; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(autodetect); WINPR_ASSERT(autodetect->context); @@ -374,7 +374,7 @@ static BOOL autodetect_send_netchar_result(rdpAutoDetect* autodetect, const rdpNetworkCharacteristicsResult* result) { UINT16 sec_flags = 0; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(autodetect); WINPR_ASSERT(autodetect->context); @@ -797,7 +797,7 @@ state_run_t autodetect_recv_request_packet(rdpAutoDetect* autodetect, RDP_TRANSP wStream* s) { AUTODETECT_REQ_PDU autodetectReqPdu = WINPR_C_ARRAY_INIT; - const rdpSettings* settings = NULL; + const rdpSettings* settings = nullptr; BOOL success = FALSE; WINPR_ASSERT(autodetect); @@ -920,7 +920,7 @@ state_run_t autodetect_recv_response_packet(rdpAutoDetect* autodetect, RDP_TRANS wStream* s) { AUTODETECT_RSP_PDU autodetectRspPdu = WINPR_C_ARRAY_INIT; - const rdpSettings* settings = NULL; + const rdpSettings* settings = nullptr; BOOL success = FALSE; WINPR_ASSERT(autodetect); @@ -1047,7 +1047,7 @@ rdpAutoDetect* autodetect_new(rdpContext* context) { rdpAutoDetect* autoDetect = (rdpAutoDetect*)calloc(1, sizeof(rdpAutoDetect)); if (!autoDetect) - return NULL; + return nullptr; autoDetect->context = context; autoDetect->log = WLog_Get(AUTODETECT_TAG); diff --git a/libfreerdp/core/capabilities.c b/libfreerdp/core/capabilities.c index 49bf12b75..eaa4b2665 100644 --- a/libfreerdp/core/capabilities.c +++ b/libfreerdp/core/capabilities.c @@ -2037,7 +2037,7 @@ static BOOL rdp_apply_bitmap_cache_v2_capability_set(rdpSettings* settings, cons { const UINT32 BitmapCacheV2NumCells = freerdp_settings_get_uint32(src, FreeRDP_BitmapCacheV2NumCells); - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_BitmapCacheV2CellInfo, NULL, + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_BitmapCacheV2CellInfo, nullptr, BitmapCacheV2NumCells)) return FALSE; @@ -3965,7 +3965,7 @@ BOOL rdp_print_capability_sets(wLog* log, wStream* s, size_t start, BOOL receivi { size_t rest = 0; wStream subBuffer; - wStream* sub = NULL; + wStream* sub = nullptr; if (!rdp_read_capability_set_header(log, s, &length, &type)) goto fail; @@ -4521,7 +4521,7 @@ static BOOL rdp_read_capability_sets(wLog* log, wStream* s, rdpSettings* setting UINT16 type = 0; UINT16 length = 0; wStream subbuffer; - wStream* sub = NULL; + wStream* sub = nullptr; if (!rdp_read_capability_set_header(log, s, &length, &type)) goto fail; @@ -4726,7 +4726,7 @@ BOOL rdp_send_demand_active(rdpRdp* rdp) BOOL rdp_recv_confirm_active(rdpRdp* rdp, wStream* s, UINT16 pduLength) { - rdpSettings* settings = NULL; + rdpSettings* settings = nullptr; UINT16 lengthSourceDescriptor = 0; UINT16 lengthCombinedCapabilities = 0; diff --git a/libfreerdp/core/channels.c b/libfreerdp/core/channels.c index f6e86ff19..9d1bffd76 100644 --- a/libfreerdp/core/channels.c +++ b/libfreerdp/core/channels.c @@ -55,8 +55,8 @@ BOOL freerdp_channel_send(rdpRdp* rdp, UINT16 channelId, const BYTE* data, size_ size_t left = 0; UINT32 flags = 0; size_t chunkSize = 0; - rdpMcs* mcs = NULL; - const rdpMcsChannel* channel = NULL; + rdpMcs* mcs = nullptr; + const rdpMcsChannel* channel = nullptr; WINPR_ASSERT(rdp); WINPR_ASSERT(data || (size == 0)); @@ -176,7 +176,7 @@ BOOL freerdp_channel_peer_process(freerdp_peer* client, wStream* s, UINT16 chann { int rc = 0; BOOL found = FALSE; - HANDLE hChannel = 0; + HANDLE hChannel = nullptr; rdpContext* context = client->context; rdpMcs* mcs = context->rdp->mcs; diff --git a/libfreerdp/core/childsession.c b/libfreerdp/core/childsession.c index d16cdec05..1724645ec 100644 --- a/libfreerdp/core/childsession.c +++ b/libfreerdp/core/childsession.c @@ -59,7 +59,8 @@ static int transport_bio_named_write(BIO* bio, const char* buf, int size) DWORD written = 0; const UINT64 start = GetTickCount64(); - BOOL ret = WriteFile(ptr->hFile, buf, WINPR_ASSERTING_INT_CAST(uint32_t, size), &written, NULL); + BOOL ret = + WriteFile(ptr->hFile, buf, WINPR_ASSERTING_INT_CAST(uint32_t, size), &written, nullptr); // winpr_HexDump(TAG, WLOG_DEBUG, buf, size); if (!ret) @@ -357,13 +358,13 @@ static void BIO_NAMED_free(WINPR_BIO_NAMED* ptr) if (ptr->hFile) { (void)CloseHandle(ptr->hFile); - ptr->hFile = NULL; + ptr->hFile = nullptr; } if (ptr->readEvent) { (void)CloseHandle(ptr->readEvent); - ptr->readEvent = NULL; + ptr->readEvent = nullptr; } ringbuffer_destroy(&ptr->readBuffer); @@ -393,7 +394,7 @@ static int transport_bio_named_new(BIO* bio) if (!ringbuffer_init(&ptr->readBuffer, 0xfffff)) goto error; - ptr->readEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + ptr->readEvent = CreateEventA(nullptr, TRUE, FALSE, nullptr); if (!ptr->readEvent || ptr->readEvent == INVALID_HANDLE_VALUE) goto error; @@ -410,7 +411,7 @@ error: static int transport_bio_named_free(BIO* bio) { - WINPR_BIO_NAMED* ptr = NULL; + WINPR_BIO_NAMED* ptr = nullptr; if (!bio) return 0; @@ -419,19 +420,19 @@ static int transport_bio_named_free(BIO* bio) ptr = (WINPR_BIO_NAMED*)BIO_get_data(bio); if (ptr) - BIO_set_data(bio, NULL); + BIO_set_data(bio, nullptr); return 1; } static BIO_METHOD* BIO_s_namedpipe(void) { - static BIO_METHOD* bio_methods = NULL; + static BIO_METHOD* bio_methods = nullptr; - if (bio_methods == NULL) + if (bio_methods == nullptr) { if (!(bio_methods = BIO_meth_new(BIO_TYPE_NAMEDPIPE, "NamedPipe"))) - return NULL; + return nullptr; BIO_meth_set_write(bio_methods, transport_bio_named_write); BIO_meth_set_read(bio_methods, transport_bio_named_read); @@ -450,7 +451,7 @@ static BOOL createChildSessionTransport(HANDLE* pFile) { WINPR_ASSERT(pFile); - HANDLE hModule = NULL; + HANDLE hModule = nullptr; BOOL ret = FALSE; *pFile = INVALID_HANDLE_VALUE; @@ -524,8 +525,8 @@ static BOOL createChildSessionTransport(HANDLE* pFile) WLog_DBG(TAG, "child session is at '%s'", pipePathA); { - HANDLE f = CreateFileW(pipePath, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, - FILE_FLAG_OVERLAPPED, NULL); + HANDLE f = CreateFileW(pipePath, GENERIC_READ | GENERIC_WRITE, 0, nullptr, + OPEN_EXISTING, FILE_FLAG_OVERLAPPED, nullptr); if (f == INVALID_HANDLE_VALUE) { WLog_ERR(TAG, "error when connecting to local named pipe"); @@ -547,13 +548,13 @@ BIO* createChildSessionBio(void) { HANDLE f = INVALID_HANDLE_VALUE; if (!createChildSessionTransport(&f)) - return NULL; + return nullptr; BIO* lowLevelBio = BIO_new(BIO_s_namedpipe()); if (!lowLevelBio) { (void)CloseHandle(f); - return NULL; + return nullptr; } BIO_set_handle(lowLevelBio, f); @@ -562,7 +563,7 @@ BIO* createChildSessionBio(void) if (!bufferedBio) { BIO_free_all(lowLevelBio); - return NULL; + return nullptr; } bufferedBio = BIO_push(bufferedBio, lowLevelBio); diff --git a/libfreerdp/core/client.c b/libfreerdp/core/client.c index c2cee78f8..9ef50a826 100644 --- a/libfreerdp/core/client.c +++ b/libfreerdp/core/client.c @@ -42,14 +42,14 @@ typedef struct /* Use this instance to get access to channels in VirtualChannelInit. It is set during * freerdp_connect so channels that use VirtualChannelInit must be initialized from the same thread * as freerdp_connect was called */ -static WINPR_TLS freerdp* g_Instance = NULL; +static WINPR_TLS freerdp* g_Instance = nullptr; /* use global counter to ensure uniqueness across channel manager instances */ static volatile LONG g_OpenHandleSeq = 1; /* HashTable mapping channel handles to CHANNEL_OPEN_DATA */ static INIT_ONCE g_ChannelHandlesOnce = INIT_ONCE_STATIC_INIT; -static wHashTable* g_ChannelHandles = NULL; +static wHashTable* g_ChannelHandles = nullptr; static BOOL freerdp_channels_process_message_free(wMessage* message, DWORD type); @@ -64,16 +64,16 @@ static CHANNEL_OPEN_DATA* freerdp_channels_find_channel_open_data_by_name(rdpCha return pChannelOpenData; } - return NULL; + return nullptr; } /* returns rdpChannel for the channel name passed in */ static rdpMcsChannel* freerdp_channels_find_channel_by_name(rdpRdp* rdp, const char* name) { - rdpMcs* mcs = NULL; + rdpMcs* mcs = nullptr; if (!rdp) - return NULL; + return nullptr; mcs = rdp->mcs; @@ -87,16 +87,16 @@ static rdpMcsChannel* freerdp_channels_find_channel_by_name(rdpRdp* rdp, const c } } - return NULL; + return nullptr; } static rdpMcsChannel* freerdp_channels_find_channel_by_id(rdpRdp* rdp, UINT16 channel_id) { - rdpMcsChannel* channel = NULL; - rdpMcs* mcs = NULL; + rdpMcsChannel* channel = nullptr; + rdpMcs* mcs = nullptr; if (!rdp) - return NULL; + return nullptr; mcs = rdp->mcs; @@ -110,12 +110,12 @@ static rdpMcsChannel* freerdp_channels_find_channel_by_id(rdpRdp* rdp, UINT16 ch } } - return NULL; + return nullptr; } static void channel_queue_message_free(wMessage* msg) { - CHANNEL_OPEN_EVENT* ev = NULL; + CHANNEL_OPEN_EVENT* ev = nullptr; if (!msg || (msg->id != 0)) return; @@ -143,25 +143,25 @@ static void* channel_event_entry_clone(const void* data) { const ChannelEventEntry* entry = data; if (!entry) - return NULL; + return nullptr; ChannelEventEntry* copy = calloc(1, sizeof(ChannelEventEntry)); if (!copy) - return NULL; + return nullptr; *copy = *entry; return copy; } rdpChannels* freerdp_channels_new(freerdp* instance) { - wObject* obj = NULL; - rdpChannels* channels = NULL; + wObject* obj = nullptr; + rdpChannels* channels = nullptr; channels = (rdpChannels*)calloc(1, sizeof(rdpChannels)); if (!channels) - return NULL; + return nullptr; - InitOnceExecuteOnce(&g_ChannelHandlesOnce, init_channel_handles_table, NULL, NULL); + InitOnceExecuteOnce(&g_ChannelHandlesOnce, init_channel_handles_table, nullptr, nullptr); if (!g_ChannelHandles) goto error; @@ -169,7 +169,7 @@ rdpChannels* freerdp_channels_new(freerdp* instance) goto error; channels->instance = instance; - channels->queue = MessageQueue_New(NULL); + channels->queue = MessageQueue_New(nullptr); if (!channels->queue) goto error; @@ -191,7 +191,7 @@ error: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC freerdp_channels_free(channels); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void freerdp_channels_free(rdpChannels* channels) @@ -206,7 +206,7 @@ void freerdp_channels_free(rdpChannels* channels) if (channels->queue) { MessageQueue_Free(channels->queue); - channels->queue = NULL; + channels->queue = nullptr; } free(channels); @@ -291,7 +291,7 @@ void freerdp_channels_register_instance(WINPR_ATTR_UNUSED rdpChannels* channels, UINT freerdp_channels_pre_connect(rdpChannels* channels, freerdp* instance) { UINT error = CHANNEL_RC_OK; - CHANNEL_CLIENT_DATA* pChannelClientData = NULL; + CHANNEL_CLIENT_DATA* pChannelClientData = nullptr; MessageQueue_Clear(channels->queue); @@ -302,13 +302,13 @@ UINT freerdp_channels_pre_connect(rdpChannels* channels, freerdp* instance) if (pChannelClientData->pChannelInitEventProc) { pChannelClientData->pChannelInitEventProc(pChannelClientData->pInitHandle, - CHANNEL_EVENT_INITIALIZED, 0, 0); + CHANNEL_EVENT_INITIALIZED, nullptr, 0); } else if (pChannelClientData->pChannelInitEventProcEx) { pChannelClientData->pChannelInitEventProcEx(pChannelClientData->lpUserParam, pChannelClientData->pInitHandle, - CHANNEL_EVENT_INITIALIZED, 0, 0); + CHANNEL_EVENT_INITIALIZED, nullptr, 0); } if (CHANNEL_RC_OK != getChannelError(instance->context)) @@ -321,10 +321,10 @@ UINT freerdp_channels_pre_connect(rdpChannels* channels, freerdp* instance) UINT freerdp_channels_attach(freerdp* instance) { UINT error = CHANNEL_RC_OK; - const char* hostname = NULL; + const char* hostname = nullptr; size_t hostnameLength = 0; - rdpChannels* channels = NULL; - CHANNEL_CLIENT_DATA* pChannelClientData = NULL; + rdpChannels* channels = nullptr; + CHANNEL_CLIENT_DATA* pChannelClientData = nullptr; WINPR_ASSERT(instance); WINPR_ASSERT(instance->context); @@ -343,7 +343,7 @@ UINT freerdp_channels_attach(freerdp* instance) void* pv; } cnv; ChannelAttachedEventArgs e = WINPR_C_ARRAY_INIT; - CHANNEL_OPEN_DATA* pChannelOpenData = NULL; + CHANNEL_OPEN_DATA* pChannelOpenData = nullptr; cnv.cpv = hostname; pChannelClientData = &channels->clientDataList[index]; @@ -379,11 +379,11 @@ fail: UINT freerdp_channels_detach(freerdp* instance) { UINT error = CHANNEL_RC_OK; - const char* hostname = NULL; + const char* hostname = nullptr; size_t hostnameLength = 0; - rdpChannels* channels = NULL; - rdpContext* context = NULL; - CHANNEL_CLIENT_DATA* pChannelClientData = NULL; + rdpChannels* channels = nullptr; + rdpContext* context = nullptr; + CHANNEL_CLIENT_DATA* pChannelClientData = nullptr; WINPR_ASSERT(instance); @@ -407,7 +407,7 @@ UINT freerdp_channels_detach(freerdp* instance) } cnv; ChannelDetachedEventArgs e = WINPR_C_ARRAY_INIT; - CHANNEL_OPEN_DATA* pChannelOpenData = NULL; + CHANNEL_OPEN_DATA* pChannelOpenData = nullptr; cnv.cpv = hostname; pChannelClientData = &channels->clientDataList[index]; @@ -447,9 +447,9 @@ fail: UINT freerdp_channels_post_connect(rdpChannels* channels, freerdp* instance) { UINT error = CHANNEL_RC_OK; - const char* hostname = NULL; + const char* hostname = nullptr; size_t hostnameLength = 0; - CHANNEL_CLIENT_DATA* pChannelClientData = NULL; + CHANNEL_CLIENT_DATA* pChannelClientData = nullptr; WINPR_ASSERT(channels); WINPR_ASSERT(instance); @@ -469,7 +469,7 @@ UINT freerdp_channels_post_connect(rdpChannels* channels, freerdp* instance) void* pb; } cnv; ChannelConnectedEventArgs e = WINPR_C_ARRAY_INIT; - CHANNEL_OPEN_DATA* pChannelOpenData = NULL; + CHANNEL_OPEN_DATA* pChannelOpenData = nullptr; pChannelClientData = &channels->clientDataList[index]; cnv.pcb = hostname; @@ -516,10 +516,10 @@ fail: BOOL freerdp_channels_data(freerdp* instance, UINT16 channelId, const BYTE* cdata, size_t dataSize, UINT32 flags, size_t totalSize) { - rdpMcs* mcs = NULL; - rdpChannels* channels = NULL; - rdpMcsChannel* channel = NULL; - CHANNEL_OPEN_DATA* pChannelOpenData = NULL; + rdpMcs* mcs = nullptr; + rdpChannels* channels = nullptr; + rdpMcsChannel* channel = nullptr; + CHANNEL_OPEN_DATA* pChannelOpenData = nullptr; union { const BYTE* pcb; @@ -597,13 +597,13 @@ UINT16 freerdp_channels_get_id_by_name(freerdp* instance, const char* channel_na const char* freerdp_channels_get_name_by_id(freerdp* instance, UINT16 channelId) { - rdpMcsChannel* mcsChannel = NULL; + rdpMcsChannel* mcsChannel = nullptr; if (!instance) - return NULL; + return nullptr; mcsChannel = freerdp_channels_find_channel_by_id(instance->context->rdp, channelId); if (!mcsChannel) - return NULL; + return nullptr; return mcsChannel->Name; } @@ -617,7 +617,7 @@ BOOL freerdp_channels_process_message_free(wMessage* message, DWORD type) if (message->id == 0) { - CHANNEL_OPEN_DATA* pChannelOpenData = NULL; + CHANNEL_OPEN_DATA* pChannelOpenData = nullptr; CHANNEL_OPEN_EVENT* item = (CHANNEL_OPEN_EVENT*)message->wParam; if (!item) @@ -654,8 +654,8 @@ static BOOL freerdp_channels_process_message(freerdp* instance, wMessage* messag goto fail; else if (message->id == 0) { - rdpMcsChannel* channel = NULL; - CHANNEL_OPEN_DATA* pChannelOpenData = NULL; + rdpMcsChannel* channel = nullptr; + CHANNEL_OPEN_DATA* pChannelOpenData = nullptr; CHANNEL_OPEN_EVENT* item = (CHANNEL_OPEN_EVENT*)message->wParam; if (!item) @@ -712,7 +712,7 @@ BOOL freerdp_channels_get_fds(rdpChannels* channels, WINPR_ATTR_UNUSED freerdp* void** read_fds, int* read_count, WINPR_ATTR_UNUSED void** write_fds, WINPR_ATTR_UNUSED int* write_count) { - void* pfd = NULL; + void* pfd = nullptr; pfd = GetEventWaitObject(MessageQueue_Event(channels->queue)); if (pfd) @@ -727,7 +727,7 @@ BOOL freerdp_channels_get_fds(rdpChannels* channels, WINPR_ATTR_UNUSED freerdp* void* freerdp_channels_get_static_channel_interface(rdpChannels* channels, const char* name) { - void* pInterface = NULL; + void* pInterface = nullptr; CHANNEL_OPEN_DATA* pChannelOpenData = freerdp_channels_find_channel_open_data_by_name(channels, name); @@ -836,7 +836,7 @@ SSIZE_T freerdp_client_channel_get_registered_event_handles(rdpChannels* channel size_t len = HashTable_Count(channels->channelEvents); if (len <= count) { - ULONG_PTR* keys = NULL; + ULONG_PTR* keys = nullptr; const size_t nrKeys = HashTable_GetKeys(channels->channelEvents, &keys); if ((nrKeys <= SSIZE_MAX) && (nrKeys == len)) { @@ -856,8 +856,8 @@ SSIZE_T freerdp_client_channel_get_registered_event_handles(rdpChannels* channel UINT freerdp_channels_disconnect(rdpChannels* channels, freerdp* instance) { UINT error = CHANNEL_RC_OK; - CHANNEL_OPEN_DATA* pChannelOpenData = NULL; - CHANNEL_CLIENT_DATA* pChannelClientData = NULL; + CHANNEL_OPEN_DATA* pChannelOpenData = nullptr; + CHANNEL_CLIENT_DATA* pChannelClientData = nullptr; WINPR_ASSERT(channels); @@ -875,13 +875,13 @@ UINT freerdp_channels_disconnect(rdpChannels* channels, freerdp* instance) if (pChannelClientData->pChannelInitEventProc) { pChannelClientData->pChannelInitEventProc(pChannelClientData->pInitHandle, - CHANNEL_EVENT_DISCONNECTED, 0, 0); + CHANNEL_EVENT_DISCONNECTED, nullptr, 0); } else if (pChannelClientData->pChannelInitEventProcEx) { pChannelClientData->pChannelInitEventProcEx(pChannelClientData->lpUserParam, pChannelClientData->pInitHandle, - CHANNEL_EVENT_DISCONNECTED, 0, 0); + CHANNEL_EVENT_DISCONNECTED, nullptr, 0); } pChannelOpenData = &channels->openDataList[index]; @@ -900,8 +900,8 @@ UINT freerdp_channels_disconnect(rdpChannels* channels, freerdp* instance) void freerdp_channels_close(rdpChannels* channels, freerdp* instance) { - CHANNEL_OPEN_DATA* pChannelOpenData = NULL; - CHANNEL_CLIENT_DATA* pChannelClientData = NULL; + CHANNEL_OPEN_DATA* pChannelOpenData = nullptr; + CHANNEL_CLIENT_DATA* pChannelClientData = nullptr; WINPR_ASSERT(channels); WINPR_ASSERT(instance); @@ -917,13 +917,13 @@ void freerdp_channels_close(rdpChannels* channels, freerdp* instance) if (pChannelClientData->pChannelInitEventProc) { pChannelClientData->pChannelInitEventProc(pChannelClientData->pInitHandle, - CHANNEL_EVENT_TERMINATED, 0, 0); + CHANNEL_EVENT_TERMINATED, nullptr, 0); } else if (pChannelClientData->pChannelInitEventProcEx) { pChannelClientData->pChannelInitEventProcEx(pChannelClientData->lpUserParam, pChannelClientData->pInitHandle, - CHANNEL_EVENT_TERMINATED, 0, 0); + CHANNEL_EVENT_TERMINATED, nullptr, 0); } } @@ -940,17 +940,17 @@ void freerdp_channels_close(rdpChannels* channels, freerdp* instance) WINPR_ASSERT(instance->context); WINPR_ASSERT(instance->context->settings); instance->context->settings->ChannelCount = 0; - g_Instance = NULL; + g_Instance = nullptr; } static UINT VCAPITYPE FreeRDP_VirtualChannelInitEx( LPVOID lpUserParam, LPVOID clientContext, LPVOID pInitHandle, PCHANNEL_DEF pChannel, INT channelCount, ULONG versionRequested, PCHANNEL_INIT_EVENT_EX_FN pChannelInitEventProcEx) { - rdpSettings* settings = NULL; - CHANNEL_INIT_DATA* pChannelInitData = NULL; - CHANNEL_CLIENT_DATA* pChannelClientData = NULL; - rdpChannels* channels = NULL; + rdpSettings* settings = nullptr; + CHANNEL_INIT_DATA* pChannelInitData = nullptr; + CHANNEL_CLIENT_DATA* pChannelClientData = nullptr; + rdpChannels* channels = nullptr; if (!pInitHandle) return CHANNEL_RC_BAD_INIT_HANDLE; @@ -984,7 +984,7 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelInitEx( { const PCHANNEL_DEF pChannelDef = &pChannel[index]; - if (freerdp_channels_find_channel_open_data_by_name(channels, pChannelDef->name) != 0) + if (freerdp_channels_find_channel_open_data_by_name(channels, pChannelDef->name) != nullptr) { return CHANNEL_RC_BAD_CHANNEL; } @@ -1016,7 +1016,7 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelInitEx( if (!HashTable_Insert(g_ChannelHandles, (void*)(UINT_PTR)pChannelOpenData->OpenHandle, (void*)pChannelOpenData)) { - pChannelInitData->pInterface = NULL; + pChannelInitData->pInterface = nullptr; return CHANNEL_RC_INITIALIZATION_ERROR; } pChannelOpenData->flags = 1; /* init */ @@ -1046,13 +1046,13 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelInit(LPVOID* ppInitHandle, PCHANNEL_ INT channelCount, ULONG versionRequested, PCHANNEL_INIT_EVENT_FN pChannelInitEventProc) { - CHANNEL_DEF* channel = NULL; - rdpSettings* settings = NULL; - PCHANNEL_DEF pChannelDef = NULL; - CHANNEL_INIT_DATA* pChannelInitData = NULL; - CHANNEL_OPEN_DATA* pChannelOpenData = NULL; - CHANNEL_CLIENT_DATA* pChannelClientData = NULL; - rdpChannels* channels = NULL; + CHANNEL_DEF* channel = nullptr; + rdpSettings* settings = nullptr; + PCHANNEL_DEF pChannelDef = nullptr; + CHANNEL_INIT_DATA* pChannelInitData = nullptr; + CHANNEL_OPEN_DATA* pChannelOpenData = nullptr; + CHANNEL_CLIENT_DATA* pChannelClientData = nullptr; + rdpChannels* channels = nullptr; /* g_Instance should have been set during freerdp_connect - otherwise VirtualChannelInit was * called from a different thread */ @@ -1074,7 +1074,7 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelInit(LPVOID* ppInitHandle, PCHANNEL_ *ppInitHandle = pChannelInitData; channels->initDataCount++; pChannelInitData->channels = channels; - pChannelInitData->pInterface = NULL; + pChannelInitData->pInterface = nullptr; if (!channels->can_call_init) return CHANNEL_RC_NOT_IN_VIRTUALCHANNELENTRY; @@ -1093,7 +1093,7 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelInit(LPVOID* ppInitHandle, PCHANNEL_ { pChannelDef = &pChannel[index]; - if (freerdp_channels_find_channel_open_data_by_name(channels, pChannelDef->name) != 0) + if (freerdp_channels_find_channel_open_data_by_name(channels, pChannelDef->name) != nullptr) { return CHANNEL_RC_BAD_CHANNEL; } @@ -1143,10 +1143,10 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelOpenEx(LPVOID pInitHandle, LPDWORD pOpenHandle, PCHAR pChannelName, PCHANNEL_OPEN_EVENT_EX_FN pChannelOpenEventProcEx) { - void* pInterface = NULL; - rdpChannels* channels = NULL; - CHANNEL_INIT_DATA* pChannelInitData = NULL; - CHANNEL_OPEN_DATA* pChannelOpenData = NULL; + void* pInterface = nullptr; + rdpChannels* channels = nullptr; + CHANNEL_INIT_DATA* pChannelInitData = nullptr; + CHANNEL_OPEN_DATA* pChannelOpenData = nullptr; pChannelInitData = (CHANNEL_INIT_DATA*)pInitHandle; channels = pChannelInitData->channels; pInterface = pChannelInitData->pInterface; @@ -1179,10 +1179,10 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelOpen(LPVOID pInitHandle, LPDWORD pOp PCHAR pChannelName, PCHANNEL_OPEN_EVENT_FN pChannelOpenEventProc) { - void* pInterface = NULL; - rdpChannels* channels = NULL; - CHANNEL_INIT_DATA* pChannelInitData = NULL; - CHANNEL_OPEN_DATA* pChannelOpenData = NULL; + void* pInterface = nullptr; + rdpChannels* channels = nullptr; + CHANNEL_INIT_DATA* pChannelInitData = nullptr; + CHANNEL_OPEN_DATA* pChannelOpenData = nullptr; pChannelInitData = (CHANNEL_INIT_DATA*)pInitHandle; channels = pChannelInitData->channels; pInterface = pChannelInitData->pInterface; @@ -1213,7 +1213,7 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelOpen(LPVOID pInitHandle, LPDWORD pOp static UINT VCAPITYPE FreeRDP_VirtualChannelCloseEx(LPVOID pInitHandle, DWORD openHandle) { - CHANNEL_OPEN_DATA* pChannelOpenData = NULL; + CHANNEL_OPEN_DATA* pChannelOpenData = nullptr; if (!pInitHandle) return CHANNEL_RC_BAD_INIT_HANDLE; @@ -1232,7 +1232,7 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelCloseEx(LPVOID pInitHandle, DWORD op static UINT VCAPITYPE FreeRDP_VirtualChannelClose(DWORD openHandle) { - CHANNEL_OPEN_DATA* pChannelOpenData = NULL; + CHANNEL_OPEN_DATA* pChannelOpenData = nullptr; pChannelOpenData = HashTable_GetItemValue(g_ChannelHandles, (void*)(UINT_PTR)openHandle); @@ -1250,10 +1250,10 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelWriteEx(LPVOID pInitHandle, DWORD op LPVOID pData, ULONG dataLength, LPVOID pUserData) { - rdpChannels* channels = NULL; - CHANNEL_INIT_DATA* pChannelInitData = NULL; - CHANNEL_OPEN_DATA* pChannelOpenData = NULL; - CHANNEL_OPEN_EVENT* pChannelOpenEvent = NULL; + rdpChannels* channels = nullptr; + CHANNEL_INIT_DATA* pChannelInitData = nullptr; + CHANNEL_OPEN_DATA* pChannelOpenData = nullptr; + CHANNEL_OPEN_EVENT* pChannelOpenEvent = nullptr; wMessage message = WINPR_C_ARRAY_INIT; if (!pInitHandle) @@ -1294,7 +1294,7 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelWriteEx(LPVOID pInitHandle, DWORD op message.context = channels; message.id = 0; message.wParam = pChannelOpenEvent; - message.lParam = NULL; + message.lParam = nullptr; message.Free = channel_queue_message_free; if (!MessageQueue_Dispatch(channels->queue, &message)) @@ -1310,9 +1310,9 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelWrite(DWORD openHandle, LPVOID pData LPVOID pUserData) { wMessage message = WINPR_C_ARRAY_INIT; - CHANNEL_OPEN_DATA* pChannelOpenData = NULL; - CHANNEL_OPEN_EVENT* pChannelOpenEvent = NULL; - rdpChannels* channels = NULL; + CHANNEL_OPEN_DATA* pChannelOpenData = nullptr; + CHANNEL_OPEN_EVENT* pChannelOpenEvent = nullptr; + rdpChannels* channels = nullptr; pChannelOpenData = HashTable_GetItemValue(g_ChannelHandles, (void*)(UINT_PTR)openHandle); @@ -1347,7 +1347,7 @@ static UINT VCAPITYPE FreeRDP_VirtualChannelWrite(DWORD openHandle, LPVOID pData message.context = channels; message.id = 0; message.wParam = pChannelOpenEvent; - message.lParam = NULL; + message.lParam = nullptr; message.Free = channel_queue_message_free; if (!MessageQueue_Dispatch(channels->queue, &message)) @@ -1388,7 +1388,7 @@ static BOOL freerdp_channels_is_loaded_ex(rdpChannels* channels, PVIRTUALCHANNEL int freerdp_channels_client_load(rdpChannels* channels, WINPR_ATTR_UNUSED rdpSettings* settings, PVIRTUALCHANNELENTRY entry, void* data) { - CHANNEL_CLIENT_DATA* pChannelClientData = NULL; + CHANNEL_CLIENT_DATA* pChannelClientData = nullptr; WINPR_ASSERT(channels); WINPR_ASSERT(channels->instance); @@ -1518,7 +1518,7 @@ int freerdp_channels_load_plugin(rdpChannels* channels, rdpSettings* settings, c void* data) { PVIRTUALCHANNELENTRY entry = - freerdp_load_channel_addin_entry(name, NULL, NULL, FREERDP_ADDIN_CHANNEL_STATIC); + freerdp_load_channel_addin_entry(name, nullptr, nullptr, FREERDP_ADDIN_CHANNEL_STATIC); if (!entry) return 1; diff --git a/libfreerdp/core/codecs.c b/libfreerdp/core/codecs.c index 0d5bd8682..212d54412 100644 --- a/libfreerdp/core/codecs.c +++ b/libfreerdp/core/codecs.c @@ -36,7 +36,7 @@ static void codecs_free_int(rdpCodecs* codecs, UINT32 flags) if (codecs->rfx) { rfx_context_free(codecs->rfx); - codecs->rfx = NULL; + codecs->rfx = nullptr; } } @@ -45,7 +45,7 @@ static void codecs_free_int(rdpCodecs* codecs, UINT32 flags) if (codecs->nsc) { nsc_context_free(codecs->nsc); - codecs->nsc = NULL; + codecs->nsc = nullptr; } } @@ -55,7 +55,7 @@ static void codecs_free_int(rdpCodecs* codecs, UINT32 flags) if (codecs->h264) { h264_context_free(codecs->h264); - codecs->h264 = NULL; + codecs->h264 = nullptr; } } #endif @@ -65,7 +65,7 @@ static void codecs_free_int(rdpCodecs* codecs, UINT32 flags) if (codecs->clear) { clear_context_free(codecs->clear); - codecs->clear = NULL; + codecs->clear = nullptr; } } @@ -74,7 +74,7 @@ static void codecs_free_int(rdpCodecs* codecs, UINT32 flags) if (codecs->progressive) { progressive_context_free(codecs->progressive); - codecs->progressive = NULL; + codecs->progressive = nullptr; } } @@ -83,7 +83,7 @@ static void codecs_free_int(rdpCodecs* codecs, UINT32 flags) if (codecs->planar) { freerdp_bitmap_planar_context_free(codecs->planar); - codecs->planar = NULL; + codecs->planar = nullptr; } } @@ -92,7 +92,7 @@ static void codecs_free_int(rdpCodecs* codecs, UINT32 flags) if (codecs->interleaved) { bitmap_interleaved_context_free(codecs->interleaved); - codecs->interleaved = NULL; + codecs->interleaved = nullptr; } } } @@ -243,7 +243,7 @@ BOOL freerdp_client_codecs_reset(rdpCodecs* codecs, UINT32 flags, UINT32 width, rdpCodecs* codecs_new(rdpContext* context) { if (!context || !context->settings) - return NULL; + return nullptr; const UINT32 flags = freerdp_settings_get_uint32(context->settings, FreeRDP_ThreadingFlags); return freerdp_client_codecs_new(flags); @@ -260,7 +260,7 @@ rdpCodecs* freerdp_client_codecs_new(UINT32 ThreadingFlags) rdpCodecs* codecs = (rdpCodecs*)calloc(1, sizeof(rdpCodecs)); if (!codecs) - return NULL; + return nullptr; codecs->ThreadingFlags = ThreadingFlags; diff --git a/libfreerdp/core/connection.c b/libfreerdp/core/connection.c index aa45cdfb7..c561a4e1d 100644 --- a/libfreerdp/core/connection.c +++ b/libfreerdp/core/connection.c @@ -198,7 +198,7 @@ static BOOL rdp_set_state(rdpRdp* rdp, CONNECTION_STATE state); static BOOL rdp_client_reset_codecs(rdpContext* context) { - rdpSettings* settings = NULL; + rdpSettings* settings = nullptr; if (!context || !context->settings) return FALSE; @@ -302,7 +302,7 @@ BOOL rdp_client_connect(rdpRdp* rdp) { UINT32 SelectedProtocol = 0; BOOL status = 0; - rdpSettings* settings = NULL; + rdpSettings* settings = nullptr; /* make sure SSL is initialize for earlier enough for crypto, by taking advantage of winpr SSL * FIPS flag for openssl initialization */ DWORD flags = WINPR_SSL_INIT_DEFAULT; @@ -346,7 +346,7 @@ BOOL rdp_client_connect(rdpRdp* rdp) const char* hostname = settings->ServerHostname; if (!hostname) { - WLog_ERR(TAG, "Missing hostname, can not connect to NULL target"); + WLog_ERR(TAG, "Missing hostname, can not connect to nullptr target"); return FALSE; } @@ -358,8 +358,8 @@ BOOL rdp_client_connect(rdpRdp* rdp) if (settings->GatewayEnabled) { - char* user = NULL; - char* domain = NULL; + char* user = nullptr; + char* domain = nullptr; size_t user_length = 0; if (settings->Username) @@ -452,9 +452,9 @@ BOOL rdp_client_connect(rdpRdp* rdp) { wStream s = WINPR_C_ARRAY_INIT; - if ((settings->Username != NULL) && - ((freerdp_settings_get_string(settings, FreeRDP_Password) != NULL) || - (settings->RedirectionPassword != NULL && + if ((settings->Username != nullptr) && + ((freerdp_settings_get_string(settings, FreeRDP_Password) != nullptr) || + (settings->RedirectionPassword != nullptr && settings->RedirectionPasswordLength > 0))) settings->AutoLogonEnabled = TRUE; @@ -480,7 +480,7 @@ BOOL rdp_client_connect(rdpRdp* rdp) BOOL rdp_client_disconnect(rdpRdp* rdp) { - rdpContext* context = NULL; + rdpContext* context = nullptr; if (!rdp || !rdp->settings || !rdp->context) return FALSE; @@ -506,13 +506,13 @@ BOOL rdp_client_disconnect(rdpRdp* rdp) return FALSE; freerdp_client_codecs_free(context->codecs); - context->codecs = NULL; + context->codecs = nullptr; return TRUE; } BOOL rdp_client_disconnect_and_clear(rdpRdp* rdp) { - rdpContext* context = NULL; + rdpContext* context = nullptr; if (!rdp_client_disconnect(rdp)) return FALSE; @@ -533,7 +533,7 @@ BOOL rdp_client_disconnect_and_clear(rdpRdp* rdp) static BOOL rdp_client_reconnect_channels(rdpRdp* rdp, BOOL redirect) { BOOL status = FALSE; - rdpContext* context = NULL; + rdpContext* context = nullptr; if (!rdp || !rdp->context || !rdp->context->channels) return FALSE; @@ -618,7 +618,7 @@ static BOOL rdp_client_redirect_try_netbios(rdpSettings* settings) BOOL rdp_client_redirect(rdpRdp* rdp) { BOOL status = 0; - rdpSettings* settings = NULL; + rdpSettings* settings = nullptr; if (!rdp_client_disconnect_and_clear(rdp)) return FALSE; @@ -714,12 +714,12 @@ static const BYTE fips_ivec[8] = { 0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xE static BOOL rdp_client_establish_keys(rdpRdp* rdp) { - wStream* s = NULL; + wStream* s = nullptr; BOOL ret = FALSE; WINPR_ASSERT(rdp); rdpSettings* settings = rdp->settings; - BYTE* crypt_client_random = NULL; + BYTE* crypt_client_random = nullptr; WINPR_ASSERT(settings); if (!settings->UseRdpSecurityLayer) @@ -732,7 +732,7 @@ static BOOL rdp_client_establish_keys(rdpRdp* rdp) return FALSE; /* encrypt client random */ - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ClientRandom, NULL, + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ClientRandom, nullptr, CLIENT_RANDOM_LENGTH)) return FALSE; winpr_RAND(settings->ClientRandom, settings->ClientRandomLength); @@ -762,7 +762,7 @@ static BOOL rdp_client_establish_keys(rdpRdp* rdp) if (length > UINT16_MAX) return FALSE; - s = Stream_New(NULL, length); + s = Stream_New(nullptr, length); if (!s) { @@ -842,8 +842,8 @@ end: { winpr_Cipher_Free(rdp->fips_decrypt); winpr_Cipher_Free(rdp->fips_encrypt); - rdp->fips_decrypt = NULL; - rdp->fips_encrypt = NULL; + rdp->fips_decrypt = nullptr; + rdp->fips_encrypt = nullptr; rdp_free_rc4_decrypt_keys(rdp); rdp_free_rc4_encrypt_keys(rdp); @@ -869,7 +869,7 @@ static BOOL rdp_update_client_random(rdpSettings* settings, const BYTE* crypt_ra WLog_ERR(TAG, "invalid encrypted client random length"); return FALSE; } - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ClientRandom, NULL, length)) + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ClientRandom, nullptr, length)) return FALSE; BYTE* client_random = freerdp_settings_get_pointer_writable(settings, FreeRDP_ClientRandom); @@ -897,7 +897,7 @@ BOOL rdp_server_establish_keys(rdpRdp* rdp, wStream* s) if (!rdp_read_header(rdp, s, &length, &channel_id)) return FALSE; - if (!rdp_read_security_header(rdp, s, &sec_flags, NULL)) + if (!rdp_read_security_header(rdp, s, &sec_flags, nullptr)) { WLog_Print(rdp->log, WLOG_ERROR, "invalid security header"); return FALSE; @@ -971,8 +971,8 @@ end: { winpr_Cipher_Free(rdp->fips_encrypt); winpr_Cipher_Free(rdp->fips_decrypt); - rdp->fips_encrypt = NULL; - rdp->fips_decrypt = NULL; + rdp->fips_encrypt = nullptr; + rdp->fips_decrypt = nullptr; rdp_free_rc4_encrypt_keys(rdp); rdp_free_rc4_decrypt_keys(rdp); @@ -1310,10 +1310,10 @@ state_run_t rdp_client_connect_demand_active(rdpRdp* rdp, wStream* s) return rdp_handle_message_channel(rdp, s, channelId, length); } - if (!rdp_handle_optional_rdp_decryption(rdp, s, &length, NULL)) + if (!rdp_handle_optional_rdp_decryption(rdp, s, &length, nullptr)) return STATE_RUN_FAILED; - if (!rdp_read_share_control_header(rdp, s, NULL, NULL, &pduType, &pduSource)) + if (!rdp_read_share_control_header(rdp, s, nullptr, nullptr, &pduType, &pduSource)) return STATE_RUN_FAILED; switch (pduType) @@ -1431,8 +1431,8 @@ BOOL rdp_server_accept_nego(rdpRdp* rdp, wStream* s) UINT32 SelectedProtocol = 0; UINT32 RequestedProtocols = 0; BOOL status = 0; - rdpSettings* settings = NULL; - rdpNego* nego = NULL; + rdpSettings* settings = nullptr; + rdpNego* nego = nullptr; WINPR_ASSERT(rdp); WINPR_ASSERT(s); @@ -1713,7 +1713,7 @@ BOOL rdp_server_accept_mcs_connect_initial(rdpRdp* rdp, wStream* s) WINPR_ASSERT(mcs->channels || (mcs->channelCount == 0)); for (UINT32 i = 0; i < mcs->channelCount; i++) { - ADDIN_ARGV* arg = NULL; + ADDIN_ARGV* arg = nullptr; rdpMcsChannel* cur = &mcs->channels[i]; const char* params[1] = { cur->Name }; WLog_DBG(TAG, " %s [%" PRIu16 "]", cur->Name, cur->ChannelId); @@ -1792,7 +1792,7 @@ BOOL rdp_server_accept_mcs_channel_join_request(rdpRdp* rdp, wStream* s) { UINT16 channelId = 0; BOOL allJoined = TRUE; - rdpMcs* mcs = NULL; + rdpMcs* mcs = nullptr; WINPR_ASSERT(rdp); WINPR_ASSERT(rdp->context); @@ -1895,7 +1895,7 @@ BOOL rdp_server_accept_confirm_active(rdpRdp* rdp, wStream* s, UINT16 pduLength) BOOL rdp_server_reactivate(rdpRdp* rdp) { - freerdp_peer* client = NULL; + freerdp_peer* client = nullptr; if (rdp->context && rdp->context->peer) client = rdp->context->peer; @@ -1972,7 +1972,7 @@ BOOL rdp_is_active_state(const rdpRdp* rdp) BOOL rdp_server_transition_to_state(rdpRdp* rdp, CONNECTION_STATE state) { BOOL status = FALSE; - freerdp_peer* client = NULL; + freerdp_peer* client = nullptr; const CONNECTION_STATE cstate = rdp_get_state(rdp); if (cstate >= CONNECTION_STATE_RDP_SECURITY_COMMENCEMENT) @@ -2104,14 +2104,14 @@ const char* rdp_get_state_string(const rdpRdp* rdp) BOOL rdp_channels_from_mcs(rdpSettings* settings, const rdpRdp* rdp) { - const rdpMcs* mcs = NULL; + const rdpMcs* mcs = nullptr; WINPR_ASSERT(rdp); mcs = rdp->mcs; WINPR_ASSERT(mcs); - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ChannelDefArray, NULL, + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ChannelDefArray, nullptr, CHANNEL_MAX_COUNT)) return FALSE; diff --git a/libfreerdp/core/credssp_auth.c b/libfreerdp/core/credssp_auth.c index 316102695..f28721ef7 100644 --- a/libfreerdp/core/credssp_auth.c +++ b/libfreerdp/core/credssp_auth.c @@ -101,7 +101,7 @@ WINPR_ATTR_FORMAT_ARG(6, 7) static BOOL log_status_(SECURITY_STATUS status, DWORD level, const char* file, const char* fkt, size_t line, WINPR_FORMAT_ARG const char* what, ...) { - static wLog* log = NULL; + static wLog* log = nullptr; if (!log) log = WLog_Get(TAG); @@ -126,10 +126,10 @@ static BOOL credssp_auth_update_name_cache(rdpCredsspAuth* auth, TCHAR* name) WINPR_ASSERT(auth); free(auth->pkgNameA); - auth->pkgNameA = NULL; + auth->pkgNameA = nullptr; if (name) #if defined(UNICODE) - auth->pkgNameA = ConvertWCharToUtf8Alloc(name, NULL); + auth->pkgNameA = ConvertWCharToUtf8Alloc(name, nullptr); #else auth->pkgNameA = _strdup(name); #endif @@ -231,7 +231,7 @@ static BOOL credssp_auth_client_init_cred_attributes(rdpCredsspAuth* auth) SECURITY_STATUS status = ERROR_INTERNAL_ERROR; SSIZE_T str_size = 0; - str_size = ConvertUtf8ToWChar(auth->kerberosSettings.kdcUrl, NULL, 0); + str_size = ConvertUtf8ToWChar(auth->kerberosSettings.kdcUrl, nullptr, 0); if ((str_size <= 0) || (str_size >= UINT16_MAX / 2)) return FALSE; str_size++; @@ -287,7 +287,7 @@ BOOL credssp_auth_setup_client(rdpCredsspAuth* auth, const char* target_service, const char* target_hostname, const SEC_WINNT_AUTH_IDENTITY* identity, const char* pkinit) { - void* pAuthData = NULL; + void* pAuthData = nullptr; SEC_WINNT_AUTH_IDENTITY_WINPR winprAuthData = WINPR_C_ARRAY_INIT; WINPR_ASSERT(auth); @@ -318,9 +318,9 @@ BOOL credssp_auth_setup_client(rdpCredsspAuth* auth, const char* target_service, } WINPR_ASSERT(auth->table->AcquireCredentialsHandle); - const SECURITY_STATUS status = - auth->table->AcquireCredentialsHandle(NULL, auth->info->Name, SECPKG_CRED_OUTBOUND, NULL, - pAuthData, NULL, NULL, &auth->credentials, NULL); + const SECURITY_STATUS status = auth->table->AcquireCredentialsHandle( + nullptr, auth->info->Name, SECPKG_CRED_OUTBOUND, nullptr, pAuthData, nullptr, nullptr, + &auth->credentials, nullptr); if (status != SEC_E_OK) return log_status(status, WLOG_ERROR, "AcquireCredentialsHandleA"); @@ -339,7 +339,7 @@ BOOL credssp_auth_setup_client(rdpCredsspAuth* auth, const char* target_service, BOOL credssp_auth_setup_server(rdpCredsspAuth* auth) { - void* pAuthData = NULL; + void* pAuthData = nullptr; SEC_WINNT_AUTH_IDENTITY_WINPR winprAuthData = WINPR_C_ARRAY_INIT; WINPR_ASSERT(auth); @@ -355,9 +355,9 @@ BOOL credssp_auth_setup_server(rdpCredsspAuth* auth) } WINPR_ASSERT(auth->table->AcquireCredentialsHandle); - const SECURITY_STATUS status = - auth->table->AcquireCredentialsHandle(NULL, auth->info->Name, SECPKG_CRED_INBOUND, NULL, - pAuthData, NULL, NULL, &auth->credentials, NULL); + const SECURITY_STATUS status = auth->table->AcquireCredentialsHandle( + nullptr, auth->info->Name, SECPKG_CRED_INBOUND, nullptr, pAuthData, nullptr, nullptr, + &auth->credentials, nullptr); if (status != SEC_E_OK) return log_status(status, WLOG_ERROR, "AcquireCredentialsHandleA"); @@ -418,7 +418,7 @@ int credssp_auth_authenticate(rdpCredsspAuth* auth) SECURITY_STATUS status = ERROR_INTERNAL_ERROR; SecBuffer input_buffers[2] = WINPR_C_ARRAY_INIT; SecBufferDesc input_buffer_desc = { SECBUFFER_VERSION, 1, input_buffers }; - CtxtHandle* context = NULL; + CtxtHandle* context = nullptr; WINPR_ASSERT(auth); WINPR_ASSERT(auth->table); @@ -439,10 +439,10 @@ int credssp_auth_authenticate(rdpCredsspAuth* auth) } /* input buffer will be null on first call, - * context MUST be NULL on first call */ + * context MUST be nullptr on first call */ context = &auth->context; if (!auth->context.dwLower && !auth->context.dwUpper) - context = NULL; + context = nullptr; input_buffers[0] = auth->input_buffer; @@ -466,14 +466,14 @@ int credssp_auth_authenticate(rdpCredsspAuth* auth) WINPR_ASSERT(auth->table->AcceptSecurityContext); status = auth->table->AcceptSecurityContext( &auth->credentials, context, &input_buffer_desc, auth->flags, SECURITY_NATIVE_DREP, - &auth->context, &output_buffer_desc, &auth->flags, NULL); + &auth->context, &output_buffer_desc, &auth->flags, nullptr); } else { WINPR_ASSERT(auth->table->InitializeSecurityContext); status = auth->table->InitializeSecurityContext( &auth->credentials, context, auth->spn, auth->flags, 0, SECURITY_NATIVE_DREP, - &input_buffer_desc, 0, &auth->context, &output_buffer_desc, &auth->flags, NULL); + &input_buffer_desc, 0, &auth->context, &output_buffer_desc, &auth->flags, nullptr); } if (status == SEC_E_OK) @@ -516,7 +516,7 @@ BOOL credssp_auth_encrypt(rdpCredsspAuth* auth, const SecBuffer* plaintext, SecB SECURITY_STATUS status = ERROR_INTERNAL_ERROR; SecBuffer buffers[2] = WINPR_C_ARRAY_INIT; SecBufferDesc buffer_desc = { SECBUFFER_VERSION, 2, buffers }; - BYTE* buf = NULL; + BYTE* buf = nullptr; WINPR_ASSERT(auth && auth->table); WINPR_ASSERT(plaintext); @@ -727,8 +727,8 @@ void credssp_auth_tableAndContext(rdpCredsspAuth* auth, SecurityFunctionTable** void credssp_auth_free(rdpCredsspAuth* auth) { - SEC_WINPR_KERBEROS_SETTINGS* krb_settings = NULL; - SEC_WINPR_NTLM_SETTINGS* ntlm_settings = NULL; + SEC_WINPR_KERBEROS_SETTINGS* krb_settings = nullptr; + SEC_WINPR_NTLM_SETTINGS* ntlm_settings = nullptr; if (!auth) return; @@ -776,18 +776,18 @@ void credssp_auth_free(rdpCredsspAuth* auth) free(auth->spn); sspi_SecBufferFree(&auth->input_buffer); sspi_SecBufferFree(&auth->output_buffer); - credssp_auth_update_name_cache(auth, NULL); + credssp_auth_update_name_cache(auth, nullptr); free(auth); } static void auth_get_sspi_module_from_reg(char** sspi_module) { - HKEY hKey = NULL; + HKEY hKey = nullptr; DWORD dwType = 0; DWORD dwSize = 0; WINPR_ASSERT(sspi_module); - *sspi_module = NULL; + *sspi_module = nullptr; char* key = freerdp_getApplicatonDetailsRegKey(SERVER_KEY); if (!key) @@ -799,7 +799,7 @@ static void auth_get_sspi_module_from_reg(char** sspi_module) if (rc != ERROR_SUCCESS) return; - if (RegQueryValueExA(hKey, "SspiModule", NULL, &dwType, NULL, &dwSize) != ERROR_SUCCESS) + if (RegQueryValueExA(hKey, "SspiModule", nullptr, &dwType, nullptr, &dwSize) != ERROR_SUCCESS) { RegCloseKey(hKey); return; @@ -812,7 +812,7 @@ static void auth_get_sspi_module_from_reg(char** sspi_module) return; } - if (RegQueryValueExA(hKey, "SspiModule", NULL, &dwType, (BYTE*)module, &dwSize) != + if (RegQueryValueExA(hKey, "SspiModule", nullptr, &dwType, (BYTE*)module, &dwSize) != ERROR_SUCCESS) { RegCloseKey(hKey); @@ -826,7 +826,7 @@ static void auth_get_sspi_module_from_reg(char** sspi_module) static SecurityFunctionTable* auth_resolve_sspi_table(const rdpSettings* settings) { - char* sspi_module = NULL; + char* sspi_module = nullptr; WINPR_ASSERT(settings); @@ -848,7 +848,7 @@ static SecurityFunctionTable* auth_resolve_sspi_table(const rdpSettings* setting { WLog_ERR(TAG, "Failed to load SSPI module: %s", module_name); free(sspi_module); - return NULL; + return nullptr; } WLog_INFO(TAG, "Using SSPI Module: %s", module_name); @@ -859,7 +859,7 @@ static SecurityFunctionTable* auth_resolve_sspi_table(const rdpSettings* setting { WLog_ERR(TAG, "Failed to load SSPI module: %s, no function %s", module_name, proc_name); free(sspi_module); - return NULL; + return nullptr; } free(sspi_module); return InitSecurityInterface_ptr(); @@ -870,10 +870,10 @@ static SecurityFunctionTable* auth_resolve_sspi_table(const rdpSettings* setting static BOOL credssp_auth_setup_identity(rdpCredsspAuth* auth) { - const rdpSettings* settings = NULL; - SEC_WINPR_KERBEROS_SETTINGS* krb_settings = NULL; - SEC_WINPR_NTLM_SETTINGS* ntlm_settings = NULL; - freerdp_peer* peer = NULL; + const rdpSettings* settings = nullptr; + SEC_WINPR_KERBEROS_SETTINGS* krb_settings = nullptr; + SEC_WINPR_NTLM_SETTINGS* ntlm_settings = nullptr; + freerdp_peer* peer = nullptr; WINPR_ASSERT(auth); WINPR_ASSERT(auth->rdp_ctx); @@ -961,7 +961,7 @@ static BOOL credssp_auth_setup_identity(rdpCredsspAuth* auth) if (settings->AuthenticationPackageList) { - auth->package_list = ConvertUtf8ToWCharAlloc(settings->AuthenticationPackageList, NULL); + auth->package_list = ConvertUtf8ToWCharAlloc(settings->AuthenticationPackageList, nullptr); if (!auth->package_list) return FALSE; } @@ -975,7 +975,7 @@ static BOOL credssp_auth_setup_identity(rdpCredsspAuth* auth) BOOL credssp_auth_set_spn(rdpCredsspAuth* auth, const char* service, const char* hostname) { size_t length = 0; - char* spn = NULL; + char* spn = nullptr; WINPR_ASSERT(auth); @@ -997,7 +997,7 @@ BOOL credssp_auth_set_spn(rdpCredsspAuth* auth, const char* service, const char* return FALSE; #if defined(UNICODE) - auth->spn = ConvertUtf8ToWCharAlloc(spn, NULL); + auth->spn = ConvertUtf8ToWCharAlloc(spn, nullptr); free(spn); #else auth->spn = spn; @@ -1012,7 +1012,7 @@ static const char* parseInt(const char* v, INT32* r) /* check that we have at least a digit */ if (!*v || !((*v >= '0') && (*v <= '9'))) - return NULL; + return nullptr; for (; *v && (*v >= '0') && (*v <= '9'); v++) { @@ -1025,7 +1025,7 @@ static const char* parseInt(const char* v, INT32* r) static BOOL parseKerberosDeltat(const char* value, INT32* dest, const char* message) { INT32 v = 0; - const char* ptr = NULL; + const char* ptr = nullptr; WINPR_ASSERT(value); WINPR_ASSERT(dest); diff --git a/libfreerdp/core/display.c b/libfreerdp/core/display.c index ba122965f..3ba2d903b 100644 --- a/libfreerdp/core/display.c +++ b/libfreerdp/core/display.c @@ -45,7 +45,7 @@ BOOL display_convert_rdp_monitor_to_monitor_def(UINT32 monitorCount, const rdpMonitor* monitorDefArray, MONITOR_DEF** result) { - MONITOR_DEF* mdef = NULL; + MONITOR_DEF* mdef = nullptr; if (!monitorDefArray || !result || (*result)) return FALSE; diff --git a/libfreerdp/core/errconnect.c b/libfreerdp/core/errconnect.c index 333f0fa50..8b34132eb 100644 --- a/libfreerdp/core/errconnect.c +++ b/libfreerdp/core/errconnect.c @@ -138,7 +138,7 @@ static const ERRINFO ERRCONNECT_CODES[] = { const char* freerdp_get_error_connect_string(UINT32 code) { - const ERRINFO* errInfo = NULL; + const ERRINFO* errInfo = nullptr; errInfo = &ERRCONNECT_CODES[0]; while (errInfo->code != ERRCONNECT_NONE) @@ -156,7 +156,7 @@ const char* freerdp_get_error_connect_string(UINT32 code) const char* freerdp_get_error_connect_category(UINT32 code) { - const ERRINFO* errInfo = NULL; + const ERRINFO* errInfo = nullptr; errInfo = &ERRCONNECT_CODES[0]; while (errInfo->code != ERRCONNECT_NONE) @@ -174,7 +174,7 @@ const char* freerdp_get_error_connect_category(UINT32 code) const char* freerdp_get_error_connect_name(UINT32 code) { - const ERRINFO* errInfo = NULL; + const ERRINFO* errInfo = nullptr; errInfo = &ERRCONNECT_CODES[0]; while (errInfo->code != ERRCONNECT_NONE) diff --git a/libfreerdp/core/errinfo.c b/libfreerdp/core/errinfo.c index 4c2baa326..04c418189 100644 --- a/libfreerdp/core/errinfo.c +++ b/libfreerdp/core/errinfo.c @@ -626,7 +626,7 @@ static const ERRINFO ERRINFO_CODES[] = { const char* freerdp_get_error_info_string(UINT32 code) { - const ERRINFO* errInfo = NULL; + const ERRINFO* errInfo = nullptr; errInfo = &ERRINFO_CODES[0]; while (errInfo->code != ERRINFO_NONE) @@ -644,7 +644,7 @@ const char* freerdp_get_error_info_string(UINT32 code) const char* freerdp_get_error_info_category(UINT32 code) { - const ERRINFO* errInfo = NULL; + const ERRINFO* errInfo = nullptr; errInfo = &ERRINFO_CODES[0]; while (errInfo->code != ERRINFO_NONE) @@ -662,7 +662,7 @@ const char* freerdp_get_error_info_category(UINT32 code) const char* freerdp_get_error_info_name(UINT32 code) { - const ERRINFO* errInfo = NULL; + const ERRINFO* errInfo = nullptr; errInfo = &ERRINFO_CODES[0]; while (errInfo->code != ERRINFO_NONE) @@ -680,7 +680,7 @@ const char* freerdp_get_error_info_name(UINT32 code) void rdp_print_errinfo(UINT32 code) { - const ERRINFO* errInfo = NULL; + const ERRINFO* errInfo = nullptr; errInfo = &ERRINFO_CODES[0]; while (errInfo->code != ERRINFO_NONE) diff --git a/libfreerdp/core/fastpath.c b/libfreerdp/core/fastpath.c index 26b0a0037..1cba90c92 100644 --- a/libfreerdp/core/fastpath.c +++ b/libfreerdp/core/fastpath.c @@ -243,7 +243,7 @@ BOOL fastpath_read_header_rdp(rdpFastPath* fastpath, wStream* s, UINT16* length) static BOOL fastpath_recv_orders(rdpFastPath* fastpath, wStream* s) { - rdpUpdate* update = NULL; + rdpUpdate* update = nullptr; UINT16 numberOrders = 0; if (!fastpath || !fastpath->rdp || !s) @@ -280,8 +280,8 @@ static BOOL fastpath_recv_update_common(rdpFastPath* fastpath, wStream* s) { BOOL rc = FALSE; UINT16 updateType = 0; - rdpUpdate* update = NULL; - rdpContext* context = NULL; + rdpUpdate* update = nullptr; + rdpContext* context = nullptr; BOOL defaultReturn = 0; if (!fastpath || !s || !fastpath->rdp) @@ -498,7 +498,7 @@ static int fastpath_recv_update_data(rdpFastPath* fastpath, wStream* s) BYTE compression = 0; BYTE compressionFlags = 0; UINT32 DstSize = 0; - const BYTE* pDstData = NULL; + const BYTE* pDstData = nullptr; if (!fastpath || !s) return -1; @@ -567,7 +567,7 @@ static int fastpath_recv_update_data(rdpFastPath* fastpath, wStream* s) } else { - rdpContext* context = NULL; + rdpContext* context = nullptr; const size_t totalSize = Stream_GetPosition(fastpath->updateData); context = transport_get_context(transport); @@ -707,7 +707,7 @@ static BOOL fastpath_recv_input_event_scancode(rdpFastPath* fastpath, wStream* s static BOOL fastpath_recv_input_event_mouse(rdpFastPath* fastpath, wStream* s, WINPR_ATTR_UNUSED BYTE eventFlags) { - rdpInput* input = NULL; + rdpInput* input = nullptr; UINT16 pointerFlags = 0; UINT16 xPos = 0; UINT16 yPos = 0; @@ -730,7 +730,7 @@ static BOOL fastpath_recv_input_event_mouse(rdpFastPath* fastpath, wStream* s, static BOOL fastpath_recv_input_event_relmouse(rdpFastPath* fastpath, wStream* s, WINPR_ATTR_UNUSED BYTE eventFlags) { - rdpInput* input = NULL; + rdpInput* input = nullptr; UINT16 pointerFlags = 0; INT16 xDelta = 0; INT16 yDelta = 0; @@ -793,7 +793,7 @@ static BOOL fastpath_recv_input_event_qoe(rdpFastPath* fastpath, wStream* s, static BOOL fastpath_recv_input_event_mousex(rdpFastPath* fastpath, wStream* s, WINPR_ATTR_UNUSED BYTE eventFlags) { - rdpInput* input = NULL; + rdpInput* input = nullptr; UINT16 pointerFlags = 0; UINT16 xPos = 0; UINT16 yPos = 0; @@ -828,7 +828,7 @@ static BOOL fastpath_recv_input_event_mousex(rdpFastPath* fastpath, wStream* s, static BOOL fastpath_recv_input_event_sync(rdpFastPath* fastpath, WINPR_ATTR_UNUSED wStream* s, BYTE eventFlags) { - rdpInput* input = NULL; + rdpInput* input = nullptr; WINPR_ASSERT(fastpath); WINPR_ASSERT(fastpath->rdp); @@ -973,13 +973,13 @@ static UINT32 fastpath_get_sec_bytes(rdpRdp* rdp) wStream* fastpath_input_pdu_init_header(rdpFastPath* fastpath, UINT16* sec_flags) { if (!fastpath || !fastpath->rdp) - return NULL; + return nullptr; rdpRdp* rdp = fastpath->rdp; wStream* s = transport_send_stream_init(rdp->transport, 256); if (!s) - return NULL; + return nullptr; Stream_Seek(s, 3); /* fpInputHeader, length1 and length2 */ @@ -998,11 +998,11 @@ wStream* fastpath_input_pdu_init_header(rdpFastPath* fastpath, UINT16* sec_flags wStream* fastpath_input_pdu_init(rdpFastPath* fastpath, BYTE eventFlags, BYTE eventCode, UINT16* sec_flags) { - wStream* s = NULL; + wStream* s = nullptr; s = fastpath_input_pdu_init_header(fastpath, sec_flags); if (!s) - return NULL; + return nullptr; WINPR_ASSERT(eventCode < 8); WINPR_ASSERT(eventFlags < 0x20); @@ -1016,7 +1016,7 @@ BOOL fastpath_send_multiple_input_pdu(rdpFastPath* fastpath, wStream* s, size_t BOOL rc = FALSE; BYTE eventHeader = 0; BOOL should_unlock = FALSE; - rdpRdp* rdp = NULL; + rdpRdp* rdp = nullptr; WINPR_ASSERT(iNumEvents > 0); if (!s) @@ -1160,8 +1160,8 @@ wStream* fastpath_update_pdu_init(rdpFastPath* fastpath) wStream* fastpath_update_pdu_init_new(WINPR_ATTR_UNUSED rdpFastPath* fastpath) { - wStream* s = NULL; - s = Stream_New(NULL, FASTPATH_MAX_PACKET_SIZE); + wStream* s = nullptr; + s = Stream_New(nullptr, FASTPATH_MAX_PACKET_SIZE); return s; } @@ -1169,9 +1169,9 @@ BOOL fastpath_send_update_pdu(rdpFastPath* fastpath, BYTE updateCode, wStream* s BOOL skipCompression) { BOOL status = TRUE; - wStream* fs = NULL; - rdpSettings* settings = NULL; - rdpRdp* rdp = NULL; + wStream* fs = nullptr; + rdpSettings* settings = nullptr; + rdpRdp* rdp = nullptr; UINT32 fpHeaderSize = 6; UINT32 fpUpdatePduHeaderSize = 0; UINT32 fpUpdateHeaderSize = 0; @@ -1229,10 +1229,10 @@ BOOL fastpath_send_update_pdu(rdpFastPath* fastpath, BYTE updateCode, wStream* s for (int fragment = 0; (totalLength > 0) || (fragment == 0); fragment++) { UINT32 DstSize = 0; - const BYTE* pDstData = NULL; + const BYTE* pDstData = nullptr; UINT32 compressionFlags = 0; BYTE pad = 0; - BYTE* pSignature = NULL; + BYTE* pSignature = nullptr; fpUpdatePduHeader.action = 0; fpUpdatePduHeader.secFlags = 0; fpUpdateHeader.compression = 0; @@ -1376,19 +1376,19 @@ BOOL fastpath_send_update_pdu(rdpFastPath* fastpath, BYTE updateCode, wStream* s rdpFastPath* fastpath_new(rdpRdp* rdp) { - rdpFastPath* fastpath = NULL; + rdpFastPath* fastpath = nullptr; WINPR_ASSERT(rdp); fastpath = (rdpFastPath*)calloc(1, sizeof(rdpFastPath)); if (!fastpath) - return NULL; + return nullptr; fastpath->rdp = rdp; fastpath->fragmentation = -1; - fastpath->fs = Stream_New(NULL, FASTPATH_MAX_PACKET_SIZE); - fastpath->updateData = Stream_New(NULL, FASTPATH_MAX_PACKET_SIZE); + fastpath->fs = Stream_New(nullptr, FASTPATH_MAX_PACKET_SIZE); + fastpath->updateData = Stream_New(nullptr, FASTPATH_MAX_PACKET_SIZE); if (!fastpath->fs || !fastpath->updateData) goto out_free; @@ -1396,7 +1396,7 @@ rdpFastPath* fastpath_new(rdpRdp* rdp) return fastpath; out_free: fastpath_free(fastpath); - return NULL; + return nullptr; } void fastpath_free(rdpFastPath* fastpath) diff --git a/libfreerdp/core/freerdp.c b/libfreerdp/core/freerdp.c index 40e8a4ee6..6f5d64071 100644 --- a/libfreerdp/core/freerdp.c +++ b/libfreerdp/core/freerdp.c @@ -86,9 +86,9 @@ static void sig_abort_connect(int signum, const char* signame, void* ctx) static int freerdp_connect_begin(freerdp* instance) { BOOL rc = 0; - rdpRdp* rdp = NULL; + rdpRdp* rdp = nullptr; BOOL status = TRUE; - rdpSettings* settings = NULL; + rdpSettings* settings = nullptr; if (!instance) return -1; @@ -187,7 +187,7 @@ BOOL freerdp_connect(freerdp* instance) BOOL status = FALSE; ConnectionResultEventArgs e = WINPR_C_ARRAY_INIT; const int rc = freerdp_connect_begin(instance); - rdpRdp* rdp = NULL; + rdpRdp* rdp = nullptr; UINT status2 = ERROR_INTERNAL_ERROR; WINPR_ASSERT(instance); @@ -241,7 +241,7 @@ BOOL freerdp_connect(freerdp* instance) if (rdp->settings->PlayRemoteFx) { - wStream* s = NULL; + wStream* s = nullptr; rdp_update_internal* update = update_cast(instance->context->update); pcap_record record = WINPR_C_ARRAY_INIT; @@ -286,7 +286,7 @@ BOOL freerdp_connect(freerdp* instance) } pcap_close(update->pcap_rfx); - update->pcap_rfx = NULL; + update->pcap_rfx = nullptr; goto freerdp_connect_finally; } @@ -330,7 +330,7 @@ BOOL freerdp_abort_connect_context(rdpContext* context) BOOL freerdp_get_fds(freerdp* instance, void** rfds, int* rcount, WINPR_ATTR_UNUSED void** wfds, WINPR_ATTR_UNUSED int* wcount) { - rdpRdp* rdp = NULL; + rdpRdp* rdp = nullptr; WINPR_ASSERT(instance); WINPR_ASSERT(instance->context); @@ -346,7 +346,7 @@ BOOL freerdp_get_fds(freerdp* instance, void** rfds, int* rcount, WINPR_ATTR_UNU BOOL freerdp_check_fds(freerdp* instance) { int status = 0; - rdpRdp* rdp = NULL; + rdpRdp* rdp = nullptr; if (!instance) return FALSE; @@ -417,7 +417,7 @@ static BOOL freerdp_prevent_session_lock(rdpContext* context) freerdp_settings_get_uint32(context->settings, FreeRDP_FakeMouseMotionInterval); if (FakeMouseMotionInterval && in->lastInputTimestamp) { - const time_t now = time(NULL); + const time_t now = time(nullptr); if (WINPR_ASSERTING_INT_CAST(size_t, now) - in->lastInputTimestamp > FakeMouseMotionInterval) { @@ -488,7 +488,7 @@ BOOL freerdp_check_event_handles(rdpContext* context) wMessageQueue* freerdp_get_message_queue(freerdp* instance, DWORD id) { - wMessageQueue* queue = NULL; + wMessageQueue* queue = nullptr; WINPR_ASSERT(instance); @@ -519,7 +519,7 @@ wMessageQueue* freerdp_get_message_queue(freerdp* instance, DWORD id) HANDLE freerdp_get_message_queue_event_handle(freerdp* instance, DWORD id) { - HANDLE event = NULL; + HANDLE event = nullptr; wMessageQueue* queue = freerdp_get_message_queue(instance, id); if (queue) @@ -531,7 +531,7 @@ HANDLE freerdp_get_message_queue_event_handle(freerdp* instance, DWORD id) int freerdp_message_queue_process_message(freerdp* instance, DWORD id, wMessage* message) { int status = -1; - rdpContext* context = NULL; + rdpContext* context = nullptr; WINPR_ASSERT(instance); @@ -557,7 +557,7 @@ int freerdp_message_queue_process_message(freerdp* instance, DWORD id, wMessage* int freerdp_message_queue_process_pending_messages(freerdp* instance, DWORD id) { int status = -1; - rdpContext* context = NULL; + rdpContext* context = nullptr; WINPR_ASSERT(instance); @@ -623,7 +623,7 @@ BOOL freerdp_disconnect(freerdp* instance) if (!rdp_client_disconnect(rdp)) rc = FALSE; - rdp_update_internal* up = NULL; + rdp_update_internal* up = nullptr; if (rdp && rdp->update) { up = update_cast(rdp->update); @@ -639,7 +639,7 @@ BOOL freerdp_disconnect(freerdp* instance) { up->dump_rfx = FALSE; pcap_close(up->pcap_rfx); - up->pcap_rfx = NULL; + up->pcap_rfx = nullptr; } } @@ -661,7 +661,7 @@ BOOL freerdp_disconnect_before_reconnect(freerdp* instance) BOOL freerdp_disconnect_before_reconnect_context(rdpContext* context) { - rdpRdp* rdp = NULL; + rdpRdp* rdp = nullptr; WINPR_ASSERT(context); @@ -671,7 +671,7 @@ BOOL freerdp_disconnect_before_reconnect_context(rdpContext* context) BOOL freerdp_reconnect(freerdp* instance) { - rdpRdp* rdp = NULL; + rdpRdp* rdp = nullptr; WINPR_ASSERT(instance); WINPR_ASSERT(instance->context); @@ -706,7 +706,7 @@ BOOL freerdp_shall_disconnect_context(const rdpContext* context) BOOL freerdp_focus_required(freerdp* instance) { - rdpRdp* rdp = NULL; + rdpRdp* rdp = nullptr; BOOL bRetCode = FALSE; WINPR_ASSERT(instance); @@ -726,7 +726,7 @@ BOOL freerdp_focus_required(freerdp* instance) void freerdp_set_focus(freerdp* instance) { - rdpRdp* rdp = NULL; + rdpRdp* rdp = nullptr; WINPR_ASSERT(instance); WINPR_ASSERT(instance->context); @@ -739,13 +739,13 @@ void freerdp_set_focus(freerdp* instance) void freerdp_get_version(int* major, int* minor, int* revision) { - if (major != NULL) + if (major != nullptr) *major = FREERDP_VERSION_MAJOR; - if (minor != NULL) + if (minor != nullptr) *minor = FREERDP_VERSION_MINOR; - if (revision != NULL) + if (revision != nullptr) *revision = FREERDP_VERSION_REVISION; } @@ -796,7 +796,7 @@ static wEventType FreeRDP_Events[] = { */ BOOL freerdp_context_new(freerdp* instance) { - return freerdp_context_new_ex(instance, NULL); + return freerdp_context_new_ex(instance, nullptr); } static BOOL freerdp_common_context(rdpContext* context, AccessTokenType tokenType, char** token, @@ -854,8 +854,8 @@ static BOOL freerdp_common_context(rdpContext* context, AccessTokenType tokenTyp BOOL freerdp_context_new_ex(freerdp* instance, rdpSettings* settings) { - rdpRdp* rdp = NULL; - rdpContext* context = NULL; + rdpRdp* rdp = nullptr; + rdpContext* context = nullptr; BOOL ret = TRUE; WINPR_ASSERT(instance); @@ -917,7 +917,7 @@ BOOL freerdp_context_new_ex(freerdp* instance, rdpSettings* settings) goto fail; } - if (!(context->channelErrorEvent = CreateEvent(NULL, TRUE, FALSE, NULL))) + if (!(context->channelErrorEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr))) { WLog_Print(context->log, WLOG_ERROR, "CreateEvent failed!"); goto fail; @@ -972,7 +972,7 @@ BOOL freerdp_context_reset(freerdp* instance) */ void freerdp_context_free(freerdp* instance) { - rdpContext* ctx = NULL; + rdpContext* ctx = nullptr; if (!instance) return; @@ -984,45 +984,45 @@ void freerdp_context_free(freerdp* instance) IFCALL(instance->ContextFree, instance, ctx); rdp_free(ctx->rdp); - ctx->rdp = NULL; - ctx->settings = NULL; /* owned by rdpRdp */ + ctx->rdp = nullptr; + ctx->settings = nullptr; /* owned by rdpRdp */ graphics_free(ctx->graphics); - ctx->graphics = NULL; + ctx->graphics = nullptr; metrics_free(ctx->metrics); - ctx->metrics = NULL; + ctx->metrics = nullptr; if (ctx->channelErrorEvent) (void)CloseHandle(ctx->channelErrorEvent); - ctx->channelErrorEvent = NULL; + ctx->channelErrorEvent = nullptr; free(ctx->errorDescription); - ctx->errorDescription = NULL; + ctx->errorDescription = nullptr; freerdp_channels_free(ctx->channels); - ctx->channels = NULL; + ctx->channels = nullptr; freerdp_client_codecs_free(ctx->codecs); - ctx->codecs = NULL; + ctx->codecs = nullptr; stream_dump_free(ctx->dump); - ctx->dump = NULL; + ctx->dump = nullptr; - ctx->input = NULL; /* owned by rdpRdp */ - ctx->update = NULL; /* owned by rdpRdp */ - ctx->settings = NULL; /* owned by rdpRdp */ - ctx->autodetect = NULL; /* owned by rdpRdp */ + ctx->input = nullptr; /* owned by rdpRdp */ + ctx->update = nullptr; /* owned by rdpRdp */ + ctx->settings = nullptr; /* owned by rdpRdp */ + ctx->autodetect = nullptr; /* owned by rdpRdp */ free(ctx); - instance->context = NULL; + instance->context = nullptr; #if defined(WITH_FREERDP_DEPRECATED) - instance->input = NULL; /* owned by rdpRdp */ - instance->update = NULL; /* owned by rdpRdp */ - instance->settings = NULL; /* owned by rdpRdp */ - instance->autodetect = NULL; /* owned by rdpRdp */ + instance->input = nullptr; /* owned by rdpRdp */ + instance->update = nullptr; /* owned by rdpRdp */ + instance->settings = nullptr; /* owned by rdpRdp */ + instance->autodetect = nullptr; /* owned by rdpRdp */ #endif - instance->heartbeat = NULL; /* owned by rdpRdp */ + instance->heartbeat = nullptr; /* owned by rdpRdp */ } int freerdp_get_disconnect_ultimatum(const rdpContext* context) @@ -1063,7 +1063,7 @@ UINT32 freerdp_get_last_error(const rdpContext* context) const char* freerdp_get_last_error_name(UINT32 code) { - const char* name = NULL; + const char* name = nullptr; const UINT32 cls = GET_FREERDP_ERROR_CLASS(code); const UINT32 type = GET_FREERDP_ERROR_TYPE(code); @@ -1091,7 +1091,7 @@ const char* freerdp_get_last_error_name(UINT32 code) const char* freerdp_get_last_error_string(UINT32 code) { - const char* string = NULL; + const char* string = nullptr; const UINT32 cls = GET_FREERDP_ERROR_CLASS(code); const UINT32 type = GET_FREERDP_ERROR_TYPE(code); @@ -1119,7 +1119,7 @@ const char* freerdp_get_last_error_string(UINT32 code) const char* freerdp_get_last_error_category(UINT32 code) { - const char* string = NULL; + const char* string = nullptr; const UINT32 cls = GET_FREERDP_ERROR_CLASS(code); const UINT32 type = GET_FREERDP_ERROR_TYPE(code); @@ -1242,11 +1242,11 @@ const char* freerdp_get_logon_error_info_data_ex(UINT32 data, char* buffer, size */ freerdp* freerdp_new(void) { - freerdp* instance = NULL; + freerdp* instance = nullptr; instance = (freerdp*)calloc(1, sizeof(freerdp)); if (!instance) - return NULL; + return nullptr; instance->ContextSize = sizeof(rdpContext); instance->SendChannelData = freerdp_send_channel_data; @@ -1274,7 +1274,7 @@ ULONG freerdp_get_transport_sent(const rdpContext* context, BOOL resetCount) BOOL freerdp_nla_impersonate(rdpContext* context) { - rdpNla* nla = NULL; + rdpNla* nla = nullptr; if (!context) return FALSE; @@ -1291,7 +1291,7 @@ BOOL freerdp_nla_impersonate(rdpContext* context) BOOL freerdp_nla_revert_to_self(rdpContext* context) { - rdpNla* nla = NULL; + rdpNla* nla = nullptr; if (!context) return FALSE; @@ -1424,7 +1424,7 @@ void setChannelError(rdpContext* context, UINT errorNum, WINPR_FORMAT_ARG const const char* freerdp_nego_get_routing_token(const rdpContext* context, DWORD* length) { if (!context || !context->rdp) - return NULL; + return nullptr; return (const char*)nego_get_routing_token(context->rdp->nego, length); } @@ -1522,7 +1522,7 @@ fail: free(context); freerdp_settings_free(settings); - return NULL; + return nullptr; } BOOL freerdp_is_valid_mcs_create_request(const BYTE* data, size_t size) diff --git a/libfreerdp/core/gateway/arm.c b/libfreerdp/core/gateway/arm.c index 54c8a5629..fe335c52b 100644 --- a/libfreerdp/core/gateway/arm.c +++ b/libfreerdp/core/gateway/arm.c @@ -79,8 +79,8 @@ static BOOL arm_tls_connect(rdpArm* arm, rdpTls* tls, UINT32 timeout) WINPR_ASSERT(tls); int sockfd = 0; long status = 0; - BIO* socketBio = NULL; - BIO* bufferedBio = NULL; + BIO* socketBio = nullptr; + BIO* bufferedBio = nullptr; rdpSettings* settings = arm->context->settings; if (!settings) return FALSE; @@ -90,8 +90,8 @@ static BOOL arm_tls_connect(rdpArm* arm, rdpTls* tls, UINT32 timeout) return FALSE; UINT16 peerPort = (UINT16)freerdp_settings_get_uint32(settings, FreeRDP_GatewayPort); - const char* proxyUsername = NULL; - const char* proxyPassword = NULL; + const char* proxyUsername = nullptr; + const char* proxyPassword = nullptr; BOOL isProxyConnection = proxy_prepare(settings, &peerHostname, &peerPort, &proxyUsername, &proxyPassword); @@ -178,14 +178,14 @@ static BOOL arm_fetch_wellknown(rdpArm* arm) freerdp_settings_get_string(arm->context->settings, FreeRDP_GatewayAvdAadtenantid); rdp->wellknown = freerdp_utils_aad_get_wellknown(arm->log, base, tenantid); - return (rdp->wellknown != NULL); + return (rdp->wellknown != nullptr); } static wStream* arm_build_http_request(rdpArm* arm, const char* method, TRANSFER_ENCODING transferEncoding, const char* content_type, size_t content_length) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(arm); WINPR_ASSERT(method); @@ -198,7 +198,7 @@ static wStream* arm_build_http_request(rdpArm* arm, const char* method, HttpRequest* request = http_request_new(); if (!request) - return NULL; + return nullptr; rdpSettings* settings = arm->context->settings; @@ -207,7 +207,7 @@ static wStream* arm_build_http_request(rdpArm* arm, const char* method, if (!freerdp_settings_get_string(settings, FreeRDP_GatewayHttpExtAuthBearer)) { - char* token = NULL; + char* token = nullptr; pGetCommonAccessToken GetCommonAccessToken = freerdp_get_common_access_token(arm->context); if (!GetCommonAccessToken) @@ -309,13 +309,13 @@ static rdpArm* arm_new(rdpContext* context) fail: arm_free(arm); - return NULL; + return nullptr; } static char* arm_create_request_json(rdpArm* arm) { - char* lbi = NULL; - char* message = NULL; + char* lbi = nullptr; + char* message = nullptr; WINPR_ASSERT(arm); @@ -363,12 +363,12 @@ arm_create_cleanup: * * @param pbInput the raw auth blob (base64 and utf16 decoded) * @param cbInput size of pbInput - * @return the corresponding WINPR_CIPHER_CTX if success, NULL otherwise + * @return the corresponding WINPR_CIPHER_CTX if success, nullptr otherwise */ static WINPR_CIPHER_CTX* treatAuthBlob(wLog* log, const BYTE* pbInput, size_t cbInput, size_t* pBlockSize) { - WINPR_CIPHER_CTX* ret = NULL; + WINPR_CIPHER_CTX* ret = nullptr; char algoName[100] = WINPR_C_ARRAY_INIT; WINPR_ASSERT(pBlockSize); @@ -377,13 +377,13 @@ static WINPR_CIPHER_CTX* treatAuthBlob(wLog* log, const BYTE* pbInput, size_t cb if (algoSz <= 0) { WLog_Print(log, WLOG_ERROR, "invalid algoName"); - return NULL; + return nullptr; } if (strcmp(algoName, "AES") != 0) { WLog_Print(log, WLOG_ERROR, "only AES is supported for now"); - return NULL; + return nullptr; } *pBlockSize = WINPR_AES_BLOCK_SIZE; @@ -391,7 +391,7 @@ static WINPR_CIPHER_CTX* treatAuthBlob(wLog* log, const BYTE* pbInput, size_t cb if (cbInput < algoLen) { WLog_Print(log, WLOG_ERROR, "invalid AuthBlob size"); - return NULL; + return nullptr; } cbInput -= algoLen; @@ -401,13 +401,13 @@ static WINPR_CIPHER_CTX* treatAuthBlob(wLog* log, const BYTE* pbInput, size_t cb wStream* s = Stream_StaticConstInit(&staticStream, &pbInput[algoLen], cbInput); if (!Stream_CheckAndLogRequiredLengthWLog(log, s, 12)) - return NULL; + return nullptr; const UINT32 dwMagic = Stream_Get_UINT32(s); if (dwMagic != BCRYPT_KEY_DATA_BLOB_MAGIC) { WLog_Print(log, WLOG_ERROR, "unsupported authBlob type"); - return NULL; + return nullptr; } const UINT32 dwVersion = Stream_Get_UINT32(s); @@ -415,14 +415,14 @@ static WINPR_CIPHER_CTX* treatAuthBlob(wLog* log, const BYTE* pbInput, size_t cb { WLog_Print(log, WLOG_ERROR, "unsupported authBlob version %" PRIu32 ", expecting %d", dwVersion, BCRYPT_KEY_DATA_BLOB_VERSION1); - return NULL; + return nullptr; } const UINT32 cbKeyData = Stream_Get_UINT32(s); if (!Stream_CheckAndLogRequiredLengthWLog(log, s, cbKeyData)) { WLog_Print(log, WLOG_ERROR, "invalid authBlob size"); - return NULL; + return nullptr; } WINPR_CIPHER_TYPE cipherType = WINPR_CIPHER_NONE; @@ -439,21 +439,21 @@ static WINPR_CIPHER_CTX* treatAuthBlob(wLog* log, const BYTE* pbInput, size_t cb break; default: WLog_Print(log, WLOG_ERROR, "invalid authBlob cipher size"); - return NULL; + return nullptr; } - ret = winpr_Cipher_NewEx(cipherType, WINPR_ENCRYPT, Stream_Pointer(s), cbKeyData, NULL, 0); + ret = winpr_Cipher_NewEx(cipherType, WINPR_ENCRYPT, Stream_Pointer(s), cbKeyData, nullptr, 0); if (!ret) { WLog_Print(log, WLOG_ERROR, "error creating cipher"); - return NULL; + return nullptr; } if (!winpr_Cipher_SetPadding(ret, TRUE)) { WLog_Print(log, WLOG_ERROR, "unable to enable padding on cipher"); winpr_Cipher_Free(ret); - return NULL; + return nullptr; } return ret; @@ -461,7 +461,7 @@ static WINPR_CIPHER_CTX* treatAuthBlob(wLog* log, const BYTE* pbInput, size_t cb static BOOL arm_stringEncodeW(const BYTE* pin, size_t cbIn, BYTE** ppOut, size_t* pcbOut) { - *ppOut = NULL; + *ppOut = nullptr; *pcbOut = 0; /* encode to base64 with crlf */ @@ -485,8 +485,8 @@ static BOOL arm_encodeRedirectPasswd(wLog* log, rdpSettings* settings, const rdp WINPR_CIPHER_CTX* cipher, size_t blockSize) { BOOL ret = FALSE; - BYTE* output = NULL; - BYTE* finalOutput = NULL; + BYTE* output = nullptr; + BYTE* finalOutput = nullptr; /* let's prepare the encrypted password, first we do a * cipheredPass = AES(redirectedAuthBlob, toUtf16(passwd)) @@ -575,7 +575,7 @@ out: static BOOL arm_pick_base64Utf16Field(wLog* log, const WINPR_JSON* json, const char* name, BYTE** poutput, size_t* plen) { - *poutput = NULL; + *poutput = nullptr; *plen = 0; WINPR_JSON* node = WINPR_JSON_GetObjectItemCaseSensitive(json, name); @@ -586,7 +586,7 @@ static BOOL arm_pick_base64Utf16Field(wLog* log, const WINPR_JSON* json, const c if (!nodeValue) return TRUE; - BYTE* output1 = NULL; + BYTE* output1 = nullptr; size_t len1 = 0; crypto_base64_decode(nodeValue, strlen(nodeValue), &output1, &len1); if (!output1 || !len1) @@ -606,7 +606,7 @@ static BOOL arm_pick_base64Utf16Field(wLog* log, const WINPR_JSON* json, const c return FALSE; } - BYTE* output = NULL; + BYTE* output = nullptr; crypto_base64_decode(output2, len2, &output, plen); free(output2); if (!output || !*plen) @@ -859,8 +859,8 @@ static BOOL arm_fill_rdstls(rdpArm* arm, rdpSettings* settings, const WINPR_JSON { WINPR_ASSERT(arm); BOOL ret = FALSE; - BYTE* authBlob = NULL; - WCHAR* wGUID = NULL; + BYTE* authBlob = nullptr; + WCHAR* wGUID = nullptr; const char* redirUser = freerdp_settings_get_string(settings, FreeRDP_RedirectionUsername); if (redirUser) @@ -891,9 +891,9 @@ static BOOL arm_fill_rdstls(rdpArm* arm, rdpSettings* settings, const WINPR_JSON WINPR_ASSERT(arm->context); WINPR_ASSERT(arm->context->instance); - char* username = NULL; - char* password = NULL; - char* domain = NULL; + char* username = nullptr; + char* password = nullptr; + char* domain = nullptr; if (ddomain) domain = _strdup(ddomain); @@ -988,7 +988,7 @@ static BOOL arm_fill_gateway_parameters(rdpArm* arm, const char* message, size_t WINPR_ASSERT(arm->context); WINPR_ASSERT(message); - rdpCertificate* redirectedServerCert = NULL; + rdpCertificate* redirectedServerCert = nullptr; WINPR_JSON* json = WINPR_JSON_ParseWithLength(message, len); BOOL status = FALSE; if (!json) @@ -1010,7 +1010,7 @@ static BOOL arm_fill_gateway_parameters(rdpArm* arm, const char* message, size_t if (!gwurl) gwurl = WINPR_JSON_GetObjectItemCaseSensitive(json, "gatewayLocation"); const char* gwurlstr = WINPR_JSON_GetStringValue(gwurl); - if (gwurlstr != NULL) + if (gwurlstr != nullptr) { WLog_Print(arm->log, WLOG_DEBUG, "extracted target url %s", gwurlstr); if (!freerdp_settings_set_string(settings, FreeRDP_GatewayUrl, gwurlstr)) @@ -1035,7 +1035,7 @@ static BOOL arm_fill_gateway_parameters(rdpArm* arm, const char* message, size_t const char key[] = "redirectedUsername"; if (WINPR_JSON_HasObjectItem(json, key)) { - const char* userName = NULL; + const char* userName = nullptr; WINPR_JSON* userNameNode = WINPR_JSON_GetObjectItemCaseSensitive(json, key); if (userNameNode) userName = WINPR_JSON_GetStringValue(userNameNode); @@ -1062,7 +1062,7 @@ static BOOL arm_fill_gateway_parameters(rdpArm* arm, const char* message, size_t /* redirectedServerCert */ { size_t certLen = 0; - BYTE* cert = NULL; + BYTE* cert = nullptr; if (arm_pick_base64Utf16Field(arm->log, json, "redirectedServerCert", &cert, &certLen)) { const BOOL rc = rdp_redirection_read_target_cert(&redirectedServerCert, cert, certLen); @@ -1122,7 +1122,7 @@ static BOOL arm_handle_bad_request(rdpArm* arm, const HttpResponse* response, BO WLog_Print(arm->log, WLOG_DEBUG, "Got HTTP Response data: %s", msg); WINPR_JSON* json = WINPR_JSON_ParseWithLength(msg, len); - if (json == NULL) + if (json == nullptr) { const char* error_ptr = WINPR_JSON_GetErrorPtr(); WLog_Print(arm->log, WLOG_ERROR, "WINPR_JSON_ParseWithLength: %s", error_ptr); @@ -1133,7 +1133,7 @@ static BOOL arm_handle_bad_request(rdpArm* arm, const HttpResponse* response, BO { WINPR_JSON* gateway_code_obj = WINPR_JSON_GetObjectItemCaseSensitive(json, "Code"); const char* gw_code_str = WINPR_JSON_GetStringValue(gateway_code_obj); - if (gw_code_str == NULL) + if (gw_code_str == nullptr) { WLog_Print(arm->log, WLOG_ERROR, "Response has no \"Code\" property"); goto fail; @@ -1174,10 +1174,10 @@ static BOOL arm_handle_request(rdpArm* arm, BOOL* retry, DWORD timeout) *retry = FALSE; - char* message = NULL; + char* message = nullptr; BOOL rc = FALSE; - HttpResponse* response = NULL; + HttpResponse* response = nullptr; long StatusCode = 0; const char* useragent = @@ -1249,7 +1249,8 @@ BOOL arm_resolve_endpoint(wLog* log, rdpContext* context, DWORD timeout) return FALSE; if ((freerdp_settings_get_uint32(context->settings, FreeRDP_LoadBalanceInfoLength) == 0) || - (freerdp_settings_get_string(context->settings, FreeRDP_RemoteApplicationProgram) == NULL)) + (freerdp_settings_get_string(context->settings, FreeRDP_RemoteApplicationProgram) == + nullptr)) { WLog_Print(log, WLOG_ERROR, "loadBalanceInfo and RemoteApplicationProgram needed"); return FALSE; diff --git a/libfreerdp/core/gateway/http.c b/libfreerdp/core/gateway/http.c index 63e766ab1..e488b5a4c 100644 --- a/libfreerdp/core/gateway/http.c +++ b/libfreerdp/core/gateway/http.c @@ -112,11 +112,11 @@ static const char* string_strnstr(const char* str1, const char* str2, size_t sle do { if (slen-- < 1 || (sc = *str1++) == '\0') - return NULL; + return nullptr; } while (sc != c); if (len > slen) - return NULL; + return nullptr; } while (strncmp(str1, str2, len) != 0); str1--; @@ -137,7 +137,7 @@ HttpContext* http_context_new(void) { HttpContext* context = (HttpContext*)calloc(1, sizeof(HttpContext)); if (!context) - return NULL; + return nullptr; context->headers = HashTable_New_String(); if (!context->headers) @@ -166,7 +166,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC http_context_free(context); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } BOOL http_context_set_method(HttpContext* context, const char* Method) @@ -177,7 +177,7 @@ BOOL http_context_set_method(HttpContext* context, const char* Method) free(context->Method); context->Method = _strdup(Method); - return (context->Method != NULL); + return (context->Method != nullptr); } BOOL http_request_set_content_type(HttpRequest* request, const char* ContentType) @@ -191,7 +191,7 @@ BOOL http_request_set_content_type(HttpRequest* request, const char* ContentType const char* http_context_get_uri(HttpContext* context) { if (!context) - return NULL; + return nullptr; return context->URI; } @@ -204,7 +204,7 @@ BOOL http_context_set_uri(HttpContext* context, const char* URI) free(context->URI); context->URI = _strdup(URI); - return (context->URI != NULL); + return (context->URI != nullptr); } BOOL http_context_set_user_agent(HttpContext* context, const char* UserAgent) @@ -255,7 +255,7 @@ BOOL http_context_set_connection(HttpContext* context, const char* Connection) free(context->Connection); context->Connection = _strdup(Connection); - return (context->Connection != NULL); + return (context->Connection != nullptr); } WINPR_ATTR_FORMAT_ARG(2, 0) @@ -263,7 +263,7 @@ static BOOL list_append(HttpContext* context, WINPR_FORMAT_ARG const char* str, { BOOL rc = FALSE; va_list vat = WINPR_C_ARRAY_INIT; - char* Pragma = NULL; + char* Pragma = nullptr; size_t PragmaSize = 0; va_copy(vat, ap); @@ -274,7 +274,7 @@ static BOOL list_append(HttpContext* context, WINPR_FORMAT_ARG const char* str, goto fail; { - char* sstr = NULL; + char* sstr = nullptr; size_t slen = 0; if (context->Pragma) { @@ -283,7 +283,7 @@ static BOOL list_append(HttpContext* context, WINPR_FORMAT_ARG const char* str, } else sstr = Pragma; - Pragma = NULL; + Pragma = nullptr; free(context->Pragma); context->Pragma = sstr; @@ -303,7 +303,7 @@ BOOL http_context_set_pragma(HttpContext* context, WINPR_FORMAT_ARG const char* return FALSE; free(context->Pragma); - context->Pragma = NULL; + context->Pragma = nullptr; va_list ap = WINPR_C_ARRAY_INIT; va_start(ap, Pragma); @@ -324,13 +324,13 @@ BOOL http_context_append_pragma(HttpContext* context, const char* Pragma, ...) static char* guid2str(const GUID* guid, char* buffer, size_t len) { if (!guid) - return NULL; - RPC_CSTR strguid = NULL; + return nullptr; + RPC_CSTR strguid = nullptr; RPC_STATUS rpcStatus = UuidToStringA(guid, &strguid); if (rpcStatus != RPC_S_OK) - return NULL; + return nullptr; (void)sprintf_s(buffer, len, "{%s}", strguid); RpcStringFreeA(&strguid); @@ -430,7 +430,7 @@ BOOL http_request_set_method(HttpRequest* request, const char* Method) free(request->Method); request->Method = _strdup(Method); - return (request->Method != NULL); + return (request->Method != nullptr); } BOOL http_request_set_uri(HttpRequest* request, const char* URI) @@ -441,7 +441,7 @@ BOOL http_request_set_uri(HttpRequest* request, const char* URI) free(request->URI); request->URI = _strdup(URI); - return (request->URI != NULL); + return (request->URI != nullptr); } BOOL http_request_set_auth_scheme(HttpRequest* request, const char* AuthScheme) @@ -452,7 +452,7 @@ BOOL http_request_set_auth_scheme(HttpRequest* request, const char* AuthScheme) free(request->AuthScheme); request->AuthScheme = _strdup(AuthScheme); - return (request->AuthScheme != NULL); + return (request->AuthScheme != nullptr); } BOOL http_request_set_auth_param(HttpRequest* request, const char* AuthParam) @@ -463,7 +463,7 @@ BOOL http_request_set_auth_param(HttpRequest* request, const char* AuthParam) free(request->AuthParam); request->AuthParam = _strdup(AuthParam); - return (request->AuthParam != NULL); + return (request->AuthParam != nullptr); } BOOL http_request_set_transfer_encoding(HttpRequest* request, TRANSFER_ENCODING TransferEncoding) @@ -479,7 +479,7 @@ BOOL http_request_set_transfer_encoding(HttpRequest* request, TRANSFER_ENCODING WINPR_ATTR_FORMAT_ARG(2, 3) static BOOL http_encode_print(wStream* s, WINPR_FORMAT_ARG const char* fmt, ...) { - char* str = NULL; + char* str = nullptr; va_list ap = WINPR_C_ARRAY_INIT; int length = 0; int used = 0; @@ -488,7 +488,7 @@ static BOOL http_encode_print(wStream* s, WINPR_FORMAT_ARG const char* fmt, ...) return FALSE; va_start(ap, fmt); - length = vsnprintf(NULL, 0, fmt, ap) + 1; + length = vsnprintf(nullptr, 0, fmt, ap) + 1; va_end(ap); if (!Stream_EnsureRemainingCapacity(s, (size_t)length)) @@ -539,7 +539,7 @@ static BOOL http_encode_authorization_line(wStream* s, const char* AuthScheme, static BOOL http_encode_cookie_line(wStream* s, wListDictionary* cookies) { - ULONG_PTR* keys = NULL; + ULONG_PTR* keys = nullptr; BOOL status = TRUE; if (!s && !cookies) @@ -594,15 +594,15 @@ static BOOL write_headers(const void* pkey, void* pvalue, void* arg) wStream* http_request_write(HttpContext* context, HttpRequest* request) { - wStream* s = NULL; + wStream* s = nullptr; if (!context || !request) - return NULL; + return nullptr; - s = Stream_New(NULL, 1024); + s = Stream_New(nullptr, 1024); if (!s) - return NULL; + return nullptr; if (!http_encode_header_line(s, request->Method, request->URI) || @@ -666,14 +666,14 @@ wStream* http_request_write(HttpContext* context, HttpRequest* request) return s; fail: Stream_Free(s, TRUE); - return NULL; + return nullptr; } HttpRequest* http_request_new(void) { HttpRequest* request = (HttpRequest*)calloc(1, sizeof(HttpRequest)); if (!request) - return NULL; + return nullptr; request->headers = HashTable_New_String(); if (!request->headers) @@ -682,7 +682,7 @@ HttpRequest* http_request_new(void) return request; fail: http_request_free(request); - return NULL; + return nullptr; } void http_request_free(HttpRequest* request) @@ -702,8 +702,8 @@ void http_request_free(HttpRequest* request) static BOOL http_response_parse_header_status_line(HttpResponse* response, const char* status_line) { BOOL rc = FALSE; - char* separator = NULL; - char* status_code = NULL; + char* separator = nullptr; + char* status_code = nullptr; if (!response) goto fail; @@ -725,7 +725,7 @@ static BOOL http_response_parse_header_status_line(HttpResponse* response, const *separator = '\0'; errno = 0; { - long val = strtol(status_code, NULL, 0); + long val = strtol(status_code, nullptr, 0); if ((errno != 0) || (val < 0) || (val > INT16_MAX)) goto fail; @@ -761,7 +761,7 @@ static BOOL http_response_parse_header_field(HttpResponse* response, const char* { unsigned long long val = 0; errno = 0; - val = _strtoui64(value, NULL, 0); + val = _strtoui64(value, nullptr, 0); if ((errno != 0) || (val > INT32_MAX)) return FALSE; @@ -775,7 +775,7 @@ static BOOL http_response_parse_header_field(HttpResponse* response, const char* free(response->ContentType); response->ContentType = _strdup(value); - return response->ContentType != NULL; + return response->ContentType != nullptr; } if (_stricmp(name, "Transfer-Encoding") == 0) @@ -795,7 +795,7 @@ static BOOL http_response_parse_header_field(HttpResponse* response, const char* free(response->SecWebsocketVersion); response->SecWebsocketVersion = _strdup(value); - return response->SecWebsocketVersion != NULL; + return response->SecWebsocketVersion != nullptr; } if (_stricmp(name, "Sec-WebSocket-Accept") == 0) @@ -803,7 +803,7 @@ static BOOL http_response_parse_header_field(HttpResponse* response, const char* free(response->SecWebsocketAccept); response->SecWebsocketAccept = _strdup(value); - return response->SecWebsocketAccept != NULL; + return response->SecWebsocketAccept != nullptr; } if (_stricmp(name, "WWW-Authenticate") == 0) @@ -873,10 +873,10 @@ static BOOL http_response_parse_header(HttpResponse* response) { BOOL rc = FALSE; char c = 0; - char* line = NULL; - char* name = NULL; - char* colon_pos = NULL; - char* end_of_header = NULL; + char* line = nullptr; + char* name = nullptr; + char* colon_pos = nullptr; + char* end_of_header = nullptr; char end_of_header_char = 0; if (!response) @@ -904,9 +904,9 @@ static BOOL http_response_parse_header(HttpResponse* response) if (line) colon_pos = strchr(line, ':'); else - colon_pos = NULL; + colon_pos = nullptr; - if ((colon_pos == NULL) || (colon_pos == line)) + if ((colon_pos == nullptr) || (colon_pos == line)) return FALSE; /* retrieve the position just after header name */ @@ -1035,7 +1035,7 @@ int http_chuncked_read(BIO* bio, BYTE* pBuffer, size_t size, int effectiveDataLen = 0; WINPR_ASSERT(bio); WINPR_ASSERT(pBuffer); - WINPR_ASSERT(encodingContext != NULL); + WINPR_ASSERT(encodingContext != nullptr); WINPR_ASSERT(size <= INT32_MAX); while (TRUE) { @@ -1111,7 +1111,7 @@ int http_chuncked_read(BIO* bio, BYTE* pBuffer, size_t size, /* strtoul is tricky, error are reported via errno, we also need * to ensure the result does not overflow */ errno = 0; - size_t tmp = strtoul(encodingContext->lenBuffer, NULL, 16); + size_t tmp = strtoul(encodingContext->lenBuffer, nullptr, 16); if ((errno != 0) || (tmp > SIZE_MAX)) { /* denote end of stream if something bad happens */ @@ -1188,7 +1188,7 @@ static SSIZE_T http_response_recv_line(rdpTls* tls, HttpResponse* response) size_t position = 0; int status = -1; size_t s = 0; - char* end = NULL; + char* end = nullptr; /* Read until we encounter \r\n\r\n */ ERR_clear_error(); @@ -1223,7 +1223,7 @@ static SSIZE_T http_response_recv_line(rdpTls* tls, HttpResponse* response) s = (position > 8) ? 8 : position; end = (char*)Stream_Pointer(response->data) - s; - if (string_strnstr(end, "\r\n\r\n", s) != NULL) + if (string_strnstr(end, "\r\n\r\n", s) != nullptr) payloadOffset = WINPR_ASSERTING_INT_CAST(SSIZE_T, Stream_GetPosition(response->data)); } @@ -1340,7 +1340,7 @@ static void clear_lines(HttpResponse* response) } free((void*)response->lines); - response->lines = NULL; + response->lines = nullptr; response->count = 0; } @@ -1350,7 +1350,7 @@ HttpResponse* http_response_recv(rdpTls* tls, BOOL readContentLength) HttpResponse* response = http_response_new(); if (!response) - return NULL; + return nullptr; response->ContentLength = 0; @@ -1363,7 +1363,7 @@ HttpResponse* http_response_recv(rdpTls* tls, BOOL readContentLength) size_t count = 0; char* buffer = Stream_BufferAs(response->data, char); const char* line = Stream_BufferAs(response->data, char); - char* context = NULL; + char* context = nullptr; while ((line = string_strnstr(line, "\r\n", WINPR_ASSERTING_INT_CAST(size_t, payloadOffset) - @@ -1394,7 +1394,7 @@ HttpResponse* http_response_recv(rdpTls* tls, BOOL readContentLength) response->lines[count] = _strdup(line); if (!response->lines[count]) goto out_error; - line = strtok_s(NULL, "\r\n", &context); + line = strtok_s(nullptr, "\r\n", &context); count++; } @@ -1411,7 +1411,7 @@ HttpResponse* http_response_recv(rdpTls* tls, BOOL readContentLength) { const char* cur = response->ContentType; - while (cur != NULL) + while (cur != nullptr) { if (http_use_content_length(cur)) { @@ -1450,13 +1450,13 @@ HttpResponse* http_response_recv(rdpTls* tls, BOOL readContentLength) out_error: WLog_ERR(TAG, "No response"); http_response_free(response); - return NULL; + return nullptr; } const char* http_response_get_body(const HttpResponse* response) { if (!response) - return NULL; + return nullptr; return response->BodyContent; } @@ -1465,12 +1465,12 @@ wHashTable* HashTable_New_String(void) { wHashTable* table = HashTable_New(FALSE); if (!table) - return NULL; + return nullptr; if (!HashTable_SetupForStringData(table, TRUE)) { HashTable_Free(table); - return NULL; + return nullptr; } HashTable_KeyObject(table)->fnObjectEquals = strings_equals_nocase; HashTable_ValueObject(table)->fnObjectEquals = strings_equals_nocase; @@ -1482,7 +1482,7 @@ HttpResponse* http_response_new(void) HttpResponse* response = (HttpResponse*)calloc(1, sizeof(HttpResponse)); if (!response) - return NULL; + return nullptr; response->Authenticates = HashTable_New_String(); @@ -1494,7 +1494,7 @@ HttpResponse* http_response_new(void) if (!response->SetCookie) goto fail; - response->data = Stream_New(NULL, 2048); + response->data = Stream_New(nullptr, 2048); if (!response->data) goto fail; @@ -1506,7 +1506,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC http_response_free(response); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void http_response_free(HttpResponse* response) @@ -1528,7 +1528,7 @@ void http_response_free(HttpResponse* response) const char* http_request_get_uri(HttpRequest* request) { if (!request) - return NULL; + return nullptr; return request->URI; } @@ -1567,7 +1567,7 @@ size_t http_response_get_body_length(const HttpResponse* response) const char* http_response_get_auth_token(const HttpResponse* response, const char* method) { if (!response || !method) - return NULL; + return nullptr; return HashTable_GetItemValue(response->Authenticates, method); } @@ -1575,7 +1575,7 @@ const char* http_response_get_auth_token(const HttpResponse* response, const cha const char* http_response_get_setcookie(const HttpResponse* response, const char* cookie) { if (!response || !cookie) - return NULL; + return nullptr; return HashTable_GetItemValue(response->SetCookie, cookie); } @@ -1591,8 +1591,8 @@ TRANSFER_ENCODING http_response_get_transfer_encoding(const HttpResponse* respon BOOL http_response_is_websocket(const HttpContext* http, const HttpResponse* response) { BOOL isWebsocket = FALSE; - WINPR_DIGEST_CTX* sha1 = NULL; - char* base64accept = NULL; + WINPR_DIGEST_CTX* sha1 = nullptr; + char* base64accept = nullptr; BYTE sha1_digest[WINPR_SHA1_DIGEST_LENGTH]; if (!http || !response) @@ -1691,7 +1691,7 @@ FREERDP_LOCAL BOOL http_context_set_header(HttpContext* context, const char* key BOOL http_request_set_header(HttpRequest* request, const char* key, const char* value, ...) { WINPR_ASSERT(request); - char* v = NULL; + char* v = nullptr; size_t vlen = 0; va_list ap = WINPR_C_ARRAY_INIT; va_start(ap, value); @@ -1705,7 +1705,7 @@ BOOL http_request_set_header(HttpRequest* request, const char* key, const char* BOOL http_context_set_header_va(HttpContext* context, const char* key, const char* value, va_list ap) { - char* v = NULL; + char* v = nullptr; size_t vlen = 0; winpr_vasprintf(&v, &vlen, value, ap); const BOOL rc = HashTable_Insert(context->headers, key, v); diff --git a/libfreerdp/core/gateway/ncacn_http.c b/libfreerdp/core/gateway/ncacn_http.c index aff223ba5..1720e366b 100644 --- a/libfreerdp/core/gateway/ncacn_http.c +++ b/libfreerdp/core/gateway/ncacn_http.c @@ -36,10 +36,10 @@ static wStream* rpc_auth_http_request(HttpContext* http, const char* method, size_t contentLength, const SecBuffer* authToken, const char* auth_scheme) { - wStream* s = NULL; - HttpRequest* request = NULL; - char* base64AuthToken = NULL; - const char* uri = NULL; + wStream* s = nullptr; + HttpRequest* request = nullptr; + char* base64AuthToken = nullptr; + const char* uri = nullptr; if (!http || !method) goto fail; @@ -75,11 +75,11 @@ fail: BOOL rpc_ncacn_http_send_in_channel_request(RpcChannel* inChannel) { - wStream* s = NULL; + wStream* s = nullptr; SSIZE_T status = 0; - rdpCredsspAuth* auth = NULL; - HttpContext* http = NULL; - const SecBuffer* buffer = NULL; + rdpCredsspAuth* auth = nullptr; + HttpContext* http = nullptr; + const SecBuffer* buffer = nullptr; int rc = 0; if (!inChannel || !inChannel->auth || !inChannel->http) @@ -93,7 +93,7 @@ BOOL rpc_ncacn_http_send_in_channel_request(RpcChannel* inChannel) return FALSE; const size_t contentLength = (rc == 0) ? 0 : 0x40000000; - buffer = credssp_auth_have_output_token(auth) ? credssp_auth_get_output_buffer(auth) : NULL; + buffer = credssp_auth_have_output_token(auth) ? credssp_auth_get_output_buffer(auth) : nullptr; s = rpc_auth_http_request(http, "RPC_IN_DATA", contentLength, buffer, credssp_auth_pkg_name(auth)); @@ -108,7 +108,7 @@ BOOL rpc_ncacn_http_send_in_channel_request(RpcChannel* inChannel) BOOL rpc_ncacn_http_recv_in_channel_response(RpcChannel* inChannel, HttpResponse* response) { size_t authTokenLength = 0; - BYTE* authTokenData = NULL; + BYTE* authTokenData = nullptr; if (!inChannel || !response || !inChannel->auth) return FALSE; @@ -139,10 +139,10 @@ BOOL rpc_ncacn_http_recv_in_channel_response(RpcChannel* inChannel, HttpResponse BOOL rpc_ncacn_http_auth_init(rdpContext* context, RpcChannel* channel) { - rdpTls* tls = NULL; - rdpCredsspAuth* auth = NULL; - rdpSettings* settings = NULL; - freerdp* instance = NULL; + rdpTls* tls = nullptr; + rdpCredsspAuth* auth = nullptr; + rdpSettings* settings = nullptr; + freerdp* instance = nullptr; auth_status rc = AUTH_FAILED; SEC_WINNT_AUTH_IDENTITY identity = WINPR_C_ARRAY_INIT; @@ -167,7 +167,7 @@ BOOL rpc_ncacn_http_auth_init(rdpContext* context, RpcChannel* channel) freerdp_set_last_error_log(instance->context, FREERDP_ERROR_CONNECT_CANCELLED); return FALSE; case AUTH_NO_CREDENTIALS: - WLog_INFO(TAG, "No credentials provided - using NULL identity"); + WLog_INFO(TAG, "No credentials provided - using nullptr identity"); break; case AUTH_FAILED: default: @@ -181,9 +181,9 @@ BOOL rpc_ncacn_http_auth_init(rdpContext* context, RpcChannel* channel) FreeRDP_GatewayDomain, FreeRDP_GatewayPassword)) return FALSE; - SEC_WINNT_AUTH_IDENTITY* identityArg = (settings->GatewayUsername ? &identity : NULL); + SEC_WINNT_AUTH_IDENTITY* identityArg = (settings->GatewayUsername ? &identity : nullptr); const BOOL res = - credssp_auth_setup_client(auth, "HTTP", settings->GatewayHostname, identityArg, NULL); + credssp_auth_setup_client(auth, "HTTP", settings->GatewayHostname, identityArg, nullptr); sspi_FreeAuthIdentity(&identity); @@ -198,17 +198,17 @@ void rpc_ncacn_http_auth_uninit(RpcChannel* channel) return; credssp_auth_free(channel->auth); - channel->auth = NULL; + channel->auth = nullptr; } BOOL rpc_ncacn_http_send_out_channel_request(RpcChannel* outChannel, BOOL replacement) { BOOL status = TRUE; - wStream* s = NULL; + wStream* s = nullptr; size_t contentLength = 0; - rdpCredsspAuth* auth = NULL; - HttpContext* http = NULL; - const SecBuffer* buffer = NULL; + rdpCredsspAuth* auth = nullptr; + HttpContext* http = nullptr; + const SecBuffer* buffer = nullptr; int rc = 0; if (!outChannel || !outChannel->auth || !outChannel->http) @@ -226,7 +226,7 @@ BOOL rpc_ncacn_http_send_out_channel_request(RpcChannel* outChannel, BOOL replac else contentLength = (rc == 0) ? 0 : 120; - buffer = credssp_auth_have_output_token(auth) ? credssp_auth_get_output_buffer(auth) : NULL; + buffer = credssp_auth_have_output_token(auth) ? credssp_auth_get_output_buffer(auth) : nullptr; s = rpc_auth_http_request(http, "RPC_OUT_DATA", contentLength, buffer, credssp_auth_pkg_name(auth)); @@ -243,7 +243,7 @@ BOOL rpc_ncacn_http_send_out_channel_request(RpcChannel* outChannel, BOOL replac BOOL rpc_ncacn_http_recv_out_channel_response(RpcChannel* outChannel, HttpResponse* response) { size_t authTokenLength = 0; - BYTE* authTokenData = NULL; + BYTE* authTokenData = nullptr; if (!outChannel || !response || !outChannel->auth) return FALSE; diff --git a/libfreerdp/core/gateway/rdg.c b/libfreerdp/core/gateway/rdg.c index 2443640e9..832ebba0d 100644 --- a/libfreerdp/core/gateway/rdg.c +++ b/libfreerdp/core/gateway/rdg.c @@ -252,7 +252,7 @@ static const char* flags_to_string(UINT32 flags, const t_flag_mapping* map, size } (void)sprintf_s(fields, ARRAYSIZE(fields), " [%04" PRIx32 "]", flags); - winpr_str_append(fields, buffer, sizeof(buffer), NULL); + winpr_str_append(fields, buffer, sizeof(buffer), nullptr); return buffer; } @@ -327,10 +327,11 @@ static BOOL rdg_write_chunked(BIO* bio, wStream* sPacket) { size_t len = 0; int status = 0; - wStream* sChunk = NULL; + wStream* sChunk = nullptr; char chunkSize[11]; (void)sprintf_s(chunkSize, sizeof(chunkSize), "%" PRIXz "\r\n", Stream_Length(sPacket)); - sChunk = Stream_New(NULL, strnlen(chunkSize, sizeof(chunkSize)) + Stream_Length(sPacket) + 2); + sChunk = + Stream_New(nullptr, strnlen(chunkSize, sizeof(chunkSize)) + Stream_Length(sPacket) + 2); if (!sChunk) return FALSE; @@ -366,7 +367,7 @@ static BOOL rdg_write_packet(rdpRdg* rdg, wStream* sPacket) static int rdg_socket_read(BIO* bio, BYTE* pBuffer, size_t size, rdg_http_encoding_context* encodingContext) { - WINPR_ASSERT(encodingContext != NULL); + WINPR_ASSERT(encodingContext != nullptr); if (size > INT32_MAX) return -1; @@ -423,15 +424,15 @@ static wStream* rdg_receive_packet(rdpRdg* rdg) { const size_t header = sizeof(RdgPacketHeader); size_t packetLength = 0; - wStream* s = Stream_New(NULL, 1024); + wStream* s = Stream_New(nullptr, 1024); if (!s) - return NULL; + return nullptr; if (!rdg_read_all(rdg->context, rdg->tlsOut, Stream_Buffer(s), header, &rdg->transferEncoding)) { Stream_Free(s, TRUE); - return NULL; + return nullptr; } Stream_Seek(s, 4); @@ -441,14 +442,14 @@ static wStream* rdg_receive_packet(rdpRdg* rdg) (packetLength < header)) { Stream_Free(s, TRUE); - return NULL; + return nullptr; } if (!rdg_read_all(rdg->context, rdg->tlsOut, Stream_Buffer(s) + header, packetLength - header, &rdg->transferEncoding)) { Stream_Free(s, TRUE); - return NULL; + return nullptr; } Stream_SetLength(s, packetLength); @@ -458,7 +459,7 @@ static wStream* rdg_receive_packet(rdpRdg* rdg) static BOOL rdg_send_handshake(rdpRdg* rdg) { BOOL status = FALSE; - wStream* s = Stream_New(NULL, 14); + wStream* s = Stream_New(nullptr, 14); if (!s) return FALSE; @@ -484,7 +485,7 @@ static BOOL rdg_send_handshake(rdpRdg* rdg) static BOOL rdg_send_extauth_sspi(rdpRdg* rdg) { - wStream* s = NULL; + wStream* s = nullptr; BOOL status = 0; UINT32 packetSize = 8 + 4 + 2; @@ -495,7 +496,7 @@ static BOOL rdg_send_extauth_sspi(rdpRdg* rdg) return FALSE; packetSize += authToken->cbBuffer; - s = Stream_New(NULL, packetSize); + s = Stream_New(nullptr, packetSize); if (!s) return FALSE; @@ -516,11 +517,11 @@ static BOOL rdg_send_extauth_sspi(rdpRdg* rdg) static BOOL rdg_send_tunnel_request(rdpRdg* rdg) { - wStream* s = NULL; + wStream* s = nullptr; BOOL status = 0; UINT32 packetSize = 16; UINT16 fieldsPresent = 0; - WCHAR* PAACookie = NULL; + WCHAR* PAACookie = nullptr; size_t PAACookieLen = 0; const UINT32 capabilities = HTTP_CAPABILITY_TYPE_QUAR_SOH | HTTP_CAPABILITY_MESSAGING_CONSENT_SIGN | @@ -542,7 +543,7 @@ static BOOL rdg_send_tunnel_request(rdpRdg* rdg) fieldsPresent = HTTP_TUNNEL_PACKET_FIELD_PAA_COOKIE; } - s = Stream_New(NULL, packetSize); + s = Stream_New(nullptr, packetSize); if (!s) { @@ -578,7 +579,7 @@ static BOOL rdg_send_tunnel_request(rdpRdg* rdg) static BOOL rdg_send_tunnel_authorization(rdpRdg* rdg) { - wStream* s = NULL; + wStream* s = nullptr; BOOL status = 0; WINPR_ASSERT(rdg); size_t clientNameLen = 0; @@ -594,7 +595,7 @@ static BOOL rdg_send_tunnel_authorization(rdpRdg* rdg) return FALSE; } - s = Stream_New(NULL, packetSize); + s = Stream_New(nullptr, packetSize); if (!s) { @@ -623,9 +624,9 @@ static BOOL rdg_send_tunnel_authorization(rdpRdg* rdg) static BOOL rdg_send_channel_create(rdpRdg* rdg) { - wStream* s = NULL; + wStream* s = nullptr; BOOL status = FALSE; - WCHAR* serverName = NULL; + WCHAR* serverName = nullptr; size_t serverNameLen = 0; WINPR_ASSERT(rdg); @@ -637,7 +638,7 @@ static BOOL rdg_send_channel_create(rdpRdg* rdg) if (!serverName || (serverNameLen >= UINT16_MAX / sizeof(WCHAR)) || (packetSize > UINT32_MAX)) goto fail; - s = Stream_New(NULL, packetSize); + s = Stream_New(nullptr, packetSize); if (!s) goto fail; @@ -667,7 +668,7 @@ fail: static BOOL rdg_set_auth_header(rdpCredsspAuth* auth, HttpRequest* request) { const SecBuffer* authToken = credssp_auth_get_output_buffer(auth); - char* base64AuthToken = NULL; + char* base64AuthToken = nullptr; if (authToken) { @@ -693,18 +694,18 @@ static BOOL rdg_set_auth_header(rdpCredsspAuth* auth, HttpRequest* request) static wStream* rdg_build_http_request(rdpRdg* rdg, const char* method, TRANSFER_ENCODING transferEncoding) { - wStream* s = NULL; - HttpRequest* request = NULL; - const char* uri = NULL; + wStream* s = nullptr; + HttpRequest* request = nullptr; + const char* uri = nullptr; if (!rdg || !method) - return NULL; + return nullptr; uri = http_context_get_uri(rdg->http); request = http_request_new(); if (!request) - return NULL; + return nullptr; if (!http_request_set_method(request, method) || !http_request_set_uri(request, uri)) goto out; @@ -740,7 +741,7 @@ static BOOL rdg_recv_auth_token(wLog* log, rdpCredsspAuth* auth, HttpResponse* r { size_t len = 0; size_t authTokenLength = 0; - BYTE* authTokenData = NULL; + BYTE* authTokenData = nullptr; SecBuffer authToken = WINPR_C_ARRAY_INIT; int rc = 0; @@ -807,7 +808,7 @@ static BOOL rdg_process_handshake_response(rdpRdg* rdg, wStream* s) UINT16 extendedAuth = 0; BYTE verMajor = 0; BYTE verMinor = 0; - const char* error = NULL; + const char* error = nullptr; WLog_Print(rdg->log, WLOG_DEBUG, "Handshake response received"); if (rdg->state != RDG_CLIENT_STATE_HANDSHAKE) @@ -876,7 +877,7 @@ static BOOL rdg_process_tunnel_response_optional(rdpRdg* rdg, wStream* s, UINT16 } /* Read serverCert */ - if (!rdg_read_http_unicode_string(rdg->log, s, NULL, NULL)) + if (!rdg_read_http_unicode_string(rdg->log, s, nullptr, nullptr)) { WLog_Print(rdg->log, WLOG_ERROR, "Failed to read server certificate"); return FALSE; @@ -885,7 +886,7 @@ static BOOL rdg_process_tunnel_response_optional(rdpRdg* rdg, wStream* s, UINT16 if (fieldsPresent & HTTP_TUNNEL_RESPONSE_FIELD_CONSENT_MSG) { - const WCHAR* msg = NULL; + const WCHAR* msg = nullptr; UINT16 msgLenBytes = 0; rdpContext* context = rdg->context; @@ -911,7 +912,7 @@ static BOOL rdg_process_tunnel_response(rdpRdg* rdg, wStream* s) UINT16 serverVersion = 0; UINT16 fieldsPresent = 0; UINT32 errorCode = 0; - const char* error = NULL; + const char* error = nullptr; WLog_Print(rdg->log, WLOG_DEBUG, "Tunnel response received"); if (rdg->state != RDG_CLIENT_STATE_TUNNEL_CREATE) @@ -947,7 +948,7 @@ static BOOL rdg_process_tunnel_authorization_response(rdpRdg* rdg, wStream* s) { UINT32 errorCode = 0; UINT16 fieldsPresent = 0; - const char* error = NULL; + const char* error = nullptr; WLog_Print(rdg->log, WLOG_DEBUG, "Tunnel authorization received"); if (rdg->state != RDG_CLIENT_STATE_TUNNEL_AUTHORIZE) @@ -1016,7 +1017,7 @@ static BOOL rdg_process_extauth_sspi(rdpRdg* rdg, wStream* s) INT32 errorCode = 0; UINT16 authBlobLen = 0; SecBuffer authToken = WINPR_C_ARRAY_INIT; - BYTE* authTokenData = NULL; + BYTE* authTokenData = nullptr; WINPR_ASSERT(rdg); @@ -1035,14 +1036,14 @@ static BOOL rdg_process_extauth_sspi(rdpRdg* rdg, wStream* s) if (credssp_auth_is_complete(rdg->auth)) { credssp_auth_free(rdg->auth); - rdg->auth = NULL; + rdg->auth = nullptr; return rdg_send_tunnel_request(rdg); } return FALSE; } authTokenData = malloc(authBlobLen); - if (authTokenData == NULL) + if (authTokenData == nullptr) return FALSE; Stream_Read(s, authTokenData, authBlobLen); @@ -1095,7 +1096,7 @@ static BOOL rdg_process_channel_response(rdpRdg* rdg, wStream* s) { UINT16 fieldsPresent = 0; UINT32 errorCode = 0; - const char* error = NULL; + const char* error = nullptr; WLog_Print(rdg->log, WLOG_DEBUG, "Channel response received"); if (rdg->state != RDG_CLIENT_STATE_CHANNEL_CREATE) @@ -1195,7 +1196,7 @@ static BOOL rdg_process_packet(rdpRdg* rdg, wStream* s) DWORD rdg_get_event_handles(rdpRdg* rdg, HANDLE* events, DWORD count) { DWORD nCount = 0; - WINPR_ASSERT(rdg != NULL); + WINPR_ASSERT(rdg != nullptr); if (rdg->tlsOut && rdg->tlsOut->bio) { @@ -1227,7 +1228,7 @@ static BOOL rdg_get_gateway_credentials(rdpContext* context, rdp_auth_reason rea freerdp_set_last_error_log(instance->context, FREERDP_ERROR_CONNECT_CANCELLED); return FALSE; case AUTH_NO_CREDENTIALS: - WLog_INFO(TAG, "No credentials provided - using NULL identity"); + WLog_INFO(TAG, "No credentials provided - using nullptr identity"); return TRUE; case AUTH_FAILED: default: @@ -1285,11 +1286,11 @@ static BOOL rdg_auth_init(rdpRdg* rdg, rdpTls* tls, TCHAR* authPkg) return FALSE; if (!settings->GatewayUsername) - identityArg = NULL; + identityArg = nullptr; } if (!credssp_auth_setup_client(rdg->auth, "HTTP", settings->GatewayHostname, identityArg, - rdg->smartcard ? rdg->smartcard->pkinitArgs : NULL)) + rdg->smartcard ? rdg->smartcard->pkinitArgs : nullptr)) { sspi_FreeAuthIdentity(&identity); return FALSE; @@ -1321,15 +1322,15 @@ static BOOL rdg_send_http_request(rdpRdg* rdg, rdpTls* tls, const char* method, static BOOL rdg_tls_connect(rdpRdg* rdg, rdpTls* tls, const char* peerAddress, UINT32 timeout) { long status = 0; - BIO* layerBio = NULL; - BIO* bufferedBio = NULL; - rdpTransportLayer* layer = NULL; + BIO* layerBio = nullptr; + BIO* bufferedBio = nullptr; + rdpTransportLayer* layer = nullptr; rdpSettings* settings = rdg->context->settings; rdpTransport* transport = freerdp_get_transport(rdg->context); const char* peerHostname = settings->GatewayHostname; UINT16 peerPort = (UINT16)settings->GatewayPort; - const char* proxyUsername = NULL; - const char* proxyPassword = NULL; + const char* proxyUsername = nullptr; + const char* proxyPassword = nullptr; BOOL isProxyConnection = proxy_prepare(settings, &peerHostname, &peerPort, &proxyUsername, &proxyPassword); @@ -1404,7 +1405,7 @@ static BOOL rdg_establish_data_connection(rdpRdg* rdg, rdpTls* tls, const char* BOOL* rpcFallback) { char buffer[64] = WINPR_C_ARRAY_INIT; - HttpResponse* response = NULL; + HttpResponse* response = nullptr; if (!rdg_tls_connect(rdg, tls, peerAddress, timeout)) return FALSE; @@ -1484,12 +1485,12 @@ static BOOL rdg_establish_data_connection(rdpRdg* rdg, rdpTls* tls, const char* } } credssp_auth_free(rdg->auth); - rdg->auth = NULL; + rdg->auth = nullptr; } else { credssp_auth_free(rdg->auth); - rdg->auth = NULL; + rdg->auth = nullptr; if (!rdg_send_http_request(rdg, tls, method, TransferEncodingIdentity)) return FALSE; @@ -1535,7 +1536,7 @@ static BOOL rdg_establish_data_connection(rdpRdg* rdg, rdpTls* tls, const char* */ if (http_context_is_websocket_upgrade_enabled(rdg->http)) { - long fd = BIO_get_fd(tls->bio, NULL); + long fd = BIO_get_fd(tls->bio, nullptr); if (fd >= 0) closesocket((SOCKET)fd); http_context_enable_websocket_upgrade(rdg->http, FALSE); @@ -1597,7 +1598,7 @@ static BOOL rdg_establish_data_connection(rdpRdg* rdg, rdpTls* tls, const char* static BOOL rdg_tunnel_connect(rdpRdg* rdg) { BOOL status = 0; - wStream* s = NULL; + wStream* s = nullptr; rdg_send_handshake(rdg); while (rdg->state < RDG_CLIENT_STATE_OPENED) @@ -1628,12 +1629,12 @@ BOOL rdg_connect(rdpRdg* rdg, DWORD timeout, BOOL* rpcFallback) { BOOL status = 0; SOCKET outConnSocket = 0; - char* peerAddress = NULL; + char* peerAddress = nullptr; BOOL rpcFallbackLocal = FALSE; - WINPR_ASSERT(rdg != NULL); + WINPR_ASSERT(rdg != nullptr); freerdp_set_last_error(rdg->context, ERROR_SUCCESS); - status = rdg_establish_data_connection(rdg, rdg->tlsOut, "RDG_OUT_DATA", NULL, timeout, + status = rdg_establish_data_connection(rdg, rdg->tlsOut, "RDG_OUT_DATA", nullptr, timeout, &rpcFallbackLocal); if (status) @@ -1667,7 +1668,7 @@ BOOL rdg_connect(rdpRdg* rdg, DWORD timeout, BOOL* rpcFallback) { http_context_enable_websocket_upgrade(rdg->http, FALSE); credssp_auth_free(rdg->auth); - rdg->auth = NULL; + rdg->auth = nullptr; } transport_set_layer(rdg->context->rdp->transport, TRANSPORT_LAYER_CLOSED); @@ -1725,7 +1726,7 @@ static int rdg_write_chunked_data_packet(rdpRdg* rdg, const BYTE* buf, int isize { int status = 0; size_t len = 0; - wStream* sChunk = NULL; + wStream* sChunk = nullptr; if (isize > UINT16_MAX) return -1; @@ -1737,7 +1738,7 @@ static int rdg_write_chunked_data_packet(rdpRdg* rdg, const BYTE* buf, int isize const size_t packetSize = size + 10; char chunkSize[11] = WINPR_C_ARRAY_INIT; (void)sprintf_s(chunkSize, sizeof(chunkSize), "%" PRIxz "\r\n", packetSize); - sChunk = Stream_New(NULL, strnlen(chunkSize, sizeof(chunkSize)) + packetSize + 2); + sChunk = Stream_New(nullptr, strnlen(chunkSize, sizeof(chunkSize)) + packetSize + 2); if (!sChunk) return -1; @@ -1773,7 +1774,7 @@ static int rdg_write_data_packet(rdpRdg* rdg, const BYTE* buf, int isize) static BOOL rdg_process_close_packet(rdpRdg* rdg, wStream* s) { int status = -1; - wStream* sClose = NULL; + wStream* sClose = nullptr; UINT32 errorCode = 0; UINT32 packetSize = 12; @@ -1785,7 +1786,7 @@ static BOOL rdg_process_close_packet(rdpRdg* rdg, wStream* s) if (errorCode != 0) freerdp_set_last_error_log(rdg->context, errorCode); - sClose = Stream_New(NULL, packetSize); + sClose = Stream_New(nullptr, packetSize); if (!sClose) return FALSE; @@ -1803,10 +1804,10 @@ static BOOL rdg_process_close_packet(rdpRdg* rdg, wStream* s) static BOOL rdg_process_keep_alive_packet(rdpRdg* rdg) { int status = -1; - wStream* sKeepAlive = NULL; + wStream* sKeepAlive = nullptr; size_t packetSize = 8; - sKeepAlive = Stream_New(NULL, packetSize); + sKeepAlive = Stream_New(nullptr, packetSize); if (!sKeepAlive) return FALSE; @@ -1823,7 +1824,7 @@ static BOOL rdg_process_keep_alive_packet(rdpRdg* rdg) static BOOL rdg_process_service_message(rdpRdg* rdg, wStream* s) { - const WCHAR* msg = NULL; + const WCHAR* msg = nullptr; UINT16 msgLenBytes = 0; rdpContext* context = rdg->context; WINPR_ASSERT(context); @@ -1851,7 +1852,7 @@ static BOOL rdg_process_unknown_packet(rdpRdg* rdg, int type) static BOOL rdg_process_control_packet(rdpRdg* rdg, int type, size_t packetLength) { - wStream* s = NULL; + wStream* s = nullptr; size_t readCount = 0; int status = 0; size_t payloadSize = packetLength - sizeof(RdgPacketHeader); @@ -1864,7 +1865,7 @@ static BOOL rdg_process_control_packet(rdpRdg* rdg, int type, size_t packetLengt if (payloadSize) { - s = Stream_New(NULL, payloadSize); + s = Stream_New(nullptr, payloadSize); if (!s) return FALSE; @@ -2204,12 +2205,12 @@ static int rdg_bio_free(BIO* bio) static BIO_METHOD* BIO_s_rdg(void) { - static BIO_METHOD* bio_methods = NULL; + static BIO_METHOD* bio_methods = nullptr; - if (bio_methods == NULL) + if (bio_methods == nullptr) { if (!(bio_methods = BIO_meth_new(BIO_TYPE_TSG, "RDGateway"))) - return NULL; + return nullptr; BIO_meth_set_write(bio_methods, rdg_bio_write); BIO_meth_set_read(bio_methods, rdg_bio_read); @@ -2226,11 +2227,11 @@ static BIO_METHOD* BIO_s_rdg(void) rdpRdg* rdg_new(rdpContext* context) { if (!context) - return NULL; + return nullptr; rdpRdg* rdg = (rdpRdg*)calloc(1, sizeof(rdpRdg)); if (!rdg) - return NULL; + return nullptr; rdg->log = WLog_Get(TAG); rdg->state = RDG_CLIENT_STATE_INITIAL; @@ -2318,7 +2319,7 @@ rdg_alloc_error: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC rdg_free(rdg); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void rdg_free(rdpRdg* rdg) @@ -2346,7 +2347,7 @@ void rdg_free(rdpRdg* rdg) BIO* rdg_get_front_bio_and_take_ownership(rdpRdg* rdg) { if (!rdg) - return NULL; + return nullptr; rdg->attached = TRUE; return rdg->frontBio; diff --git a/libfreerdp/core/gateway/rpc.c b/libfreerdp/core/gateway/rpc.c index 897e66f9b..67326bac4 100644 --- a/libfreerdp/core/gateway/rpc.c +++ b/libfreerdp/core/gateway/rpc.c @@ -385,7 +385,7 @@ BOOL rpc_get_stub_data_info(rdpRpc* rpc, const rpcconn_hdr_t* header, size_t* po UINT32 auth_length = 0; UINT32 auth_pad_length = 0; UINT32 sec_trailer_offset = 0; - const rpc_sec_trailer* sec_trailer = NULL; + const rpc_sec_trailer* sec_trailer = nullptr; WINPR_ASSERT(rpc); WINPR_ASSERT(header); @@ -509,8 +509,8 @@ BOOL rpc_in_channel_transition_to_state(RpcInChannel* inChannel, CLIENT_IN_CHANN static int rpc_channel_rpch_init(RpcClient* client, RpcChannel* channel, const char* inout, const GUID* guid) { - HttpContext* http = NULL; - rdpSettings* settings = NULL; + HttpContext* http = nullptr; + rdpSettings* settings = nullptr; UINT32 timeout = 0; if (!client || !channel || !inout || !client->context || !client->context->settings) @@ -537,7 +537,7 @@ static int rpc_channel_rpch_init(RpcClient* client, RpcChannel* channel, const c if (guid) { - RPC_CSTR strguid = NULL; + RPC_CSTR strguid = nullptr; RPC_STATUS rpcStatus = UuidToStringA(guid, &strguid); if (rpcStatus != RPC_S_OK) @@ -687,7 +687,7 @@ static RpcVirtualConnection* rpc_virtual_connection_new(rdpRpc* rpc) (RpcVirtualConnection*)calloc(1, sizeof(RpcVirtualConnection)); if (!connection) - return NULL; + return nullptr; rts_generate_cookie((BYTE*)&(connection->Cookie)); rts_generate_cookie((BYTE*)&(connection->AssociationGroupId)); @@ -706,7 +706,7 @@ static RpcVirtualConnection* rpc_virtual_connection_new(rdpRpc* rpc) return connection; fail: rpc_virtual_connection_free(connection); - return NULL; + return nullptr; } static BOOL rpc_channel_tls_connect(RpcChannel* channel, UINT32 timeout) @@ -795,7 +795,7 @@ static BOOL rpc_channel_tls_connect(RpcChannel* channel, UINT32 timeout) static int rpc_in_channel_connect(RpcInChannel* inChannel, UINT32 timeout) { - rdpContext* context = NULL; + rdpContext* context = nullptr; if (!inChannel || !inChannel->common.client || !inChannel->common.client->context) return -1; @@ -829,7 +829,7 @@ static int rpc_in_channel_connect(RpcInChannel* inChannel, UINT32 timeout) static int rpc_out_channel_connect(RpcOutChannel* outChannel, UINT32 timeout) { - rdpContext* context = NULL; + rdpContext* context = nullptr; if (!outChannel || !outChannel->common.client || !outChannel->common.client->context) return -1; @@ -861,7 +861,7 @@ static int rpc_out_channel_connect(RpcOutChannel* outChannel, UINT32 timeout) int rpc_out_channel_replacement_connect(RpcOutChannel* outChannel, uint32_t timeout) { - rdpContext* context = NULL; + rdpContext* context = nullptr; if (!outChannel || !outChannel->common.client || !outChannel->common.client->context) return -1; @@ -893,9 +893,9 @@ int rpc_out_channel_replacement_connect(RpcOutChannel* outChannel, uint32_t time BOOL rpc_connect(rdpRpc* rpc, UINT32 timeout) { - RpcInChannel* inChannel = NULL; - RpcOutChannel* outChannel = NULL; - RpcVirtualConnection* connection = NULL; + RpcInChannel* inChannel = nullptr; + RpcOutChannel* outChannel = nullptr; + RpcVirtualConnection* connection = nullptr; rpc->VirtualConnection = rpc_virtual_connection_new(rpc); if (!rpc->VirtualConnection) @@ -918,14 +918,14 @@ BOOL rpc_connect(rdpRpc* rpc, UINT32 timeout) rdpRpc* rpc_new(rdpTransport* transport) { rdpContext* context = transport_get_context(transport); - rdpRpc* rpc = NULL; + rdpRpc* rpc = nullptr; WINPR_ASSERT(context); rpc = (rdpRpc*)calloc(1, sizeof(rdpRpc)); if (!rpc) - return NULL; + return nullptr; rpc->log = WLog_Get(TAG); rpc->State = RPC_CLIENT_STATE_INITIAL; @@ -965,7 +965,7 @@ out_free: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC rpc_free(rpc); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void rpc_free(rdpRpc* rpc) diff --git a/libfreerdp/core/gateway/rpc_bind.c b/libfreerdp/core/gateway/rpc_bind.c index 25febeca4..b0d1deb57 100644 --- a/libfreerdp/core/gateway/rpc_bind.c +++ b/libfreerdp/core/gateway/rpc_bind.c @@ -139,22 +139,23 @@ static int rpc_bind_setup(rdpRpc* rpc) freerdp_set_last_error_log(instance->context, FREERDP_ERROR_CONNECT_CANCELLED); return -1; case AUTH_NO_CREDENTIALS: - WLog_INFO(TAG, "No credentials provided - using NULL identity"); + WLog_INFO(TAG, "No credentials provided - using nullptr identity"); break; case AUTH_FAILED: default: return -1; } - if (!credssp_auth_init(rpc->auth, AUTH_PKG, NULL)) + if (!credssp_auth_init(rpc->auth, AUTH_PKG, nullptr)) return -1; if (!identity_set_from_settings(&identity, settings, FreeRDP_GatewayUsername, FreeRDP_GatewayDomain, FreeRDP_GatewayPassword)) return -1; - SEC_WINNT_AUTH_IDENTITY* identityArg = (settings->GatewayUsername ? &identity : NULL); - if (!credssp_auth_setup_client(rpc->auth, NULL, settings->GatewayHostname, identityArg, NULL)) + SEC_WINNT_AUTH_IDENTITY* identityArg = (settings->GatewayUsername ? &identity : nullptr); + if (!credssp_auth_setup_client(rpc->auth, nullptr, settings->GatewayHostname, identityArg, + nullptr)) { sspi_FreeAuthIdentity(&identity); return -1; @@ -173,14 +174,14 @@ static int rpc_bind_setup(rdpRpc* rpc) int rpc_send_bind_pdu(rdpRpc* rpc, BOOL initial) { int status = -1; - wStream* buffer = NULL; + wStream* buffer = nullptr; UINT32 offset = 0; - RpcClientCall* clientCall = NULL; - p_cont_elem_t* p_cont_elem = NULL; + RpcClientCall* clientCall = nullptr; + p_cont_elem_t* p_cont_elem = nullptr; rpcconn_bind_hdr_t bind_pdu = WINPR_C_ARRAY_INIT; - RpcVirtualConnection* connection = NULL; - RpcInChannel* inChannel = NULL; - const SecBuffer* sbuffer = NULL; + RpcVirtualConnection* connection = nullptr; + RpcInChannel* inChannel = nullptr; + const SecBuffer* sbuffer = nullptr; WINPR_ASSERT(rpc); @@ -257,7 +258,7 @@ int rpc_send_bind_pdu(rdpRpc* rpc, BOOL initial) WINPR_ASSERT(offset <= UINT16_MAX); bind_pdu.header.frag_length = (UINT16)offset; - buffer = Stream_New(NULL, bind_pdu.header.frag_length); + buffer = Stream_New(nullptr, bind_pdu.header.frag_length); if (!buffer) goto fail; @@ -287,7 +288,7 @@ fail: } free(bind_pdu.p_context_elem.p_cont_elem); - bind_pdu.p_context_elem.p_cont_elem = NULL; + bind_pdu.p_context_elem.p_cont_elem = nullptr; Stream_Free(buffer, TRUE); return (status > 0) ? 1 : -1; @@ -322,7 +323,7 @@ fail: BOOL rpc_recv_bind_ack_pdu(rdpRpc* rpc, wStream* s) { BOOL rc = FALSE; - const BYTE* auth_data = NULL; + const BYTE* auth_data = nullptr; size_t pos = 0; size_t end = 0; rpcconn_hdr_t header = WINPR_C_ARRAY_INIT; @@ -375,13 +376,13 @@ fail: int rpc_send_rpc_auth_3_pdu(rdpRpc* rpc) { int status = -1; - wStream* buffer = NULL; + wStream* buffer = nullptr; size_t offset = 0; - const SecBuffer* sbuffer = NULL; - RpcClientCall* clientCall = NULL; + const SecBuffer* sbuffer = nullptr; + RpcClientCall* clientCall = nullptr; rpcconn_rpc_auth_3_hdr_t auth_3_pdu = WINPR_C_ARRAY_INIT; - RpcVirtualConnection* connection = NULL; - RpcInChannel* inChannel = NULL; + RpcVirtualConnection* connection = nullptr; + RpcInChannel* inChannel = nullptr; WINPR_ASSERT(rpc); @@ -421,7 +422,7 @@ int rpc_send_rpc_auth_3_pdu(rdpRpc* rpc) WINPR_ASSERT(offset <= UINT16_MAX); auth_3_pdu.header.frag_length = (UINT16)offset; - buffer = Stream_New(NULL, auth_3_pdu.header.frag_length); + buffer = Stream_New(nullptr, auth_3_pdu.header.frag_length); if (!buffer) return -1; diff --git a/libfreerdp/core/gateway/rpc_client.c b/libfreerdp/core/gateway/rpc_client.c index f6c3f985a..384ef47ab 100644 --- a/libfreerdp/core/gateway/rpc_client.c +++ b/libfreerdp/core/gateway/rpc_client.c @@ -99,18 +99,18 @@ static void rpc_pdu_reset(RPC_PDU* pdu) static RPC_PDU* rpc_pdu_new(void) { - RPC_PDU* pdu = NULL; + RPC_PDU* pdu = nullptr; pdu = (RPC_PDU*)malloc(sizeof(RPC_PDU)); if (!pdu) - return NULL; + return nullptr; - pdu->s = Stream_New(NULL, 4096); + pdu->s = Stream_New(nullptr, 4096); if (!pdu->s) { free(pdu); - return NULL; + return nullptr; } rpc_pdu_reset(pdu); @@ -198,7 +198,8 @@ static int rpc_client_recv_pdu_int(rdpRpc* rpc, RPC_PDU* pdu) WLog_Print(rpc->log, WLOG_TRACE, "client state %s, vc state %s", rpc_client_state_str(rpc->State), rpc_vc_state_str(rpc->VirtualConnection->State)); - const BOOL rc = rts_match_pdu_signature_ex(&RTS_PDU_PING_SIGNATURE, pdu->s, NULL, &found, TRUE); + const BOOL rc = + rts_match_pdu_signature_ex(&RTS_PDU_PING_SIGNATURE, pdu->s, nullptr, &found, TRUE); rts_print_pdu_signature(rpc->log, WLOG_TRACE, &found); if (rc) return rts_recv_ping_pdu(rpc, pdu->s); @@ -366,10 +367,10 @@ static int rpc_client_recv_pdu(rdpRpc* rpc, RPC_PDU* pdu) static int rpc_client_recv_fragment(rdpRpc* rpc, wStream* fragment) { int rc = -1; - RPC_PDU* pdu = NULL; + RPC_PDU* pdu = nullptr; size_t StubOffset = 0; size_t StubLength = 0; - RpcClientCall* call = NULL; + RpcClientCall* call = nullptr; rpcconn_hdr_t header = WINPR_C_ARRAY_INIT; WINPR_ASSERT(rpc); @@ -568,10 +569,10 @@ fail: static SSIZE_T rpc_client_default_out_channel_recv(rdpRpc* rpc) { SSIZE_T status = -1; - HttpResponse* response = NULL; - RpcInChannel* inChannel = NULL; - RpcOutChannel* outChannel = NULL; - HANDLE outChannelEvent = NULL; + HttpResponse* response = nullptr; + RpcInChannel* inChannel = nullptr; + RpcOutChannel* outChannel = nullptr; + HANDLE outChannelEvent = nullptr; RpcVirtualConnection* connection = rpc->VirtualConnection; inChannel = connection->DefaultInChannel; outChannel = connection->DefaultOutChannel; @@ -735,7 +736,7 @@ static SSIZE_T rpc_client_default_out_channel_recv(rdpRpc* rpc) { rpc_channel_free(&connection->DefaultOutChannel->common); connection->DefaultOutChannel = connection->NonDefaultOutChannel; - connection->NonDefaultOutChannel = NULL; + connection->NonDefaultOutChannel = nullptr; rpc_out_channel_transition_to_state(connection->DefaultOutChannel, CLIENT_OUT_CHANNEL_STATE_OPENED); rpc_virtual_connection_transition_to_state( @@ -754,9 +755,9 @@ static SSIZE_T rpc_client_default_out_channel_recv(rdpRpc* rpc) static SSIZE_T rpc_client_nondefault_out_channel_recv(rdpRpc* rpc) { SSIZE_T status = -1; - HttpResponse* response = NULL; - RpcOutChannel* nextOutChannel = NULL; - HANDLE nextOutChannelEvent = NULL; + HttpResponse* response = nullptr; + RpcOutChannel* nextOutChannel = nullptr; + HANDLE nextOutChannelEvent = nullptr; nextOutChannel = rpc->VirtualConnection->NonDefaultOutChannel; BIO_get_event(nextOutChannel->common.tls->bio, &nextOutChannelEvent); @@ -849,10 +850,10 @@ int rpc_client_out_channel_recv(rdpRpc* rpc) int rpc_client_in_channel_recv(rdpRpc* rpc) { int status = 1; - HttpResponse* response = NULL; - RpcInChannel* inChannel = NULL; - RpcOutChannel* outChannel = NULL; - HANDLE InChannelEvent = NULL; + HttpResponse* response = nullptr; + RpcInChannel* inChannel = nullptr; + RpcOutChannel* outChannel = nullptr; + HANDLE InChannelEvent = nullptr; RpcVirtualConnection* connection = rpc->VirtualConnection; inChannel = connection->DefaultInChannel; outChannel = connection->DefaultOutChannel; @@ -935,10 +936,10 @@ int rpc_client_in_channel_recv(rdpRpc* rpc) RpcClientCall* rpc_client_call_find_by_id(RpcClient* client, UINT32 CallId) { - RpcClientCall* clientCall = NULL; + RpcClientCall* clientCall = nullptr; if (!client) - return NULL; + return nullptr; ArrayList_Lock(client->ClientCallList); const size_t count = ArrayList_Count(client->ClientCallList); @@ -957,11 +958,11 @@ RpcClientCall* rpc_client_call_find_by_id(RpcClient* client, UINT32 CallId) RpcClientCall* rpc_client_call_new(UINT32 CallId, UINT32 OpNum) { - RpcClientCall* clientCall = NULL; + RpcClientCall* clientCall = nullptr; clientCall = (RpcClientCall*)calloc(1, sizeof(RpcClientCall)); if (!clientCall) - return NULL; + return nullptr; clientCall->CallId = CallId; clientCall->OpNum = OpNum; @@ -981,7 +982,7 @@ static void rpc_array_client_call_free(void* call) int rpc_in_channel_send_pdu(RpcInChannel* inChannel, const BYTE* buffer, size_t length) { - RpcClientCall* clientCall = NULL; + RpcClientCall* clientCall = nullptr; wStream s = Stream_Init(); rpcconn_common_hdr_t header = WINPR_C_ARRAY_INIT; @@ -1023,15 +1024,15 @@ int rpc_in_channel_send_pdu(RpcInChannel* inChannel, const BYTE* buffer, size_t BOOL rpc_client_write_call(rdpRpc* rpc, wStream* s, UINT16 opnum) { size_t offset = 0; - BYTE* buffer = NULL; + BYTE* buffer = nullptr; size_t stub_data_pad = 0; SecBuffer plaintext; SecBuffer ciphertext = WINPR_C_ARRAY_INIT; - RpcClientCall* clientCall = NULL; - rdpCredsspAuth* auth = NULL; + RpcClientCall* clientCall = nullptr; + rdpCredsspAuth* auth = nullptr; rpcconn_request_hdr_t request_pdu = WINPR_C_ARRAY_INIT; - RpcVirtualConnection* connection = NULL; - RpcInChannel* inChannel = NULL; + RpcVirtualConnection* connection = nullptr; + RpcInChannel* inChannel = nullptr; BOOL rc = FALSE; if (!s) @@ -1163,7 +1164,7 @@ fail: static BOOL rpc_client_resolve_gateway(rdpSettings* settings, char** host, UINT16* port, BOOL* isProxy) { - struct addrinfo* result = NULL; + struct addrinfo* result = nullptr; if (!settings || !host || !port || !isProxy) return FALSE; @@ -1180,7 +1181,7 @@ static BOOL rpc_client_resolve_gateway(rdpSettings* settings, char** host, UINT1 return FALSE; *host = - freerdp_tcp_address_to_string((const struct sockaddr_storage*)result->ai_addr, NULL); + freerdp_tcp_address_to_string((const struct sockaddr_storage*)result->ai_addr, nullptr); freeaddrinfo(result); return TRUE; } @@ -1188,11 +1189,11 @@ static BOOL rpc_client_resolve_gateway(rdpSettings* settings, char** host, UINT1 RpcClient* rpc_client_new(rdpContext* context, UINT32 max_recv_frag) { - wObject* obj = NULL; + wObject* obj = nullptr; RpcClient* client = (RpcClient*)calloc(1, sizeof(RpcClient)); if (!client) - return NULL; + return nullptr; if (!rpc_client_resolve_gateway(context->settings, &client->host, &client->port, &client->isProxy)) @@ -1208,12 +1209,12 @@ RpcClient* rpc_client_new(rdpContext* context, UINT32 max_recv_frag) if (!client->pdu) goto fail; - client->ReceiveFragment = Stream_New(NULL, max_recv_frag); + client->ReceiveFragment = Stream_New(nullptr, max_recv_frag); if (!client->ReceiveFragment) goto fail; - client->PipeEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + client->PipeEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!client->PipeEvent) goto fail; @@ -1237,7 +1238,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC rpc_client_free(client); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void rpc_client_free(RpcClient* client) diff --git a/libfreerdp/core/gateway/rts.c b/libfreerdp/core/gateway/rts.c index 91ccdd4ea..6ee751c20 100644 --- a/libfreerdp/core/gateway/rts.c +++ b/libfreerdp/core/gateway/rts.c @@ -71,7 +71,7 @@ static int rts_destination_command_read(rdpRpc* rpc, wStream* buffer, UINT32* De static const char* rts_command_to_string(UINT32 cmd, char* buffer, size_t len) { - const char* str = NULL; + const char* str = nullptr; #undef ENTRY #define ENTRY(x) \ @@ -191,14 +191,14 @@ static BOOL rts_align_stream(wStream* s, size_t alignment, BOOL silent) static char* sdup(const void* src, size_t length) { - char* dst = NULL; + char* dst = nullptr; WINPR_ASSERT(src || (length == 0)); if (length == 0) - return NULL; + return nullptr; dst = calloc(length + 1, sizeof(char)); if (!dst) - return NULL; + return nullptr; memcpy(dst, src, length); return dst; } @@ -305,7 +305,7 @@ static BOOL rts_read_auth_verifier_no_checks(wStream* s, auth_verifier_co_t* aut if (!Stream_ConditionalSafeSeek(s, header->auth_length, silent)) return FALSE; auth->auth_value = (BYTE*)sdup(ptr, header->auth_length); - if (auth->auth_value == NULL) + if (auth->auth_value == nullptr) return FALSE; } @@ -333,7 +333,7 @@ static BOOL rts_read_auth_verifier_with_stub(wStream* s, auth_verifier_co_t* aut { size_t pos = 0; size_t alloc_hint = 0; - BYTE** ptr = NULL; + BYTE** ptr = nullptr; if (!rts_read_auth_verifier_no_checks(s, auth, header, &pos, silent)) return FALSE; @@ -378,7 +378,7 @@ static BOOL rts_read_auth_verifier_with_stub(wStream* s, auth_verifier_co_t* aut alloc_hint, rts_pdu_ptype_to_string(header->ptype), size, header->frag_length, off); - *ptr = NULL; + *ptr = nullptr; if (size > 0) { *ptr = (BYTE*)sdup(src, size); @@ -459,7 +459,7 @@ static void rts_free_supported_versions(p_rt_versions_supported_t* versions) if (!versions) return; free(versions->p_protocols); - versions->p_protocols = NULL; + versions->p_protocols = nullptr; } static BOOL rts_read_supported_versions(wStream* s, p_rt_versions_supported_t* versions, @@ -508,7 +508,7 @@ static BOOL rts_read_port_any(wStream* s, port_any_t* port, BOOL silent) if (!Stream_ConditionalSafeSeek(s, port->length, silent)) return FALSE; port->port_spec = sdup(ptr, port->length); - return port->port_spec != NULL; + return port->port_spec != nullptr; } static void rts_free_port_any(port_any_t* port) @@ -1622,13 +1622,13 @@ fail: BOOL rts_send_CONN_A1_pdu(rdpRpc* rpc) { BOOL status = FALSE; - wStream* buffer = NULL; + wStream* buffer = nullptr; rpcconn_rts_hdr_t header = rts_pdu_header_init(); UINT32 ReceiveWindowSize = 0; - BYTE* OUTChannelCookie = NULL; - BYTE* VirtualConnectionCookie = NULL; - RpcVirtualConnection* connection = NULL; - RpcOutChannel* outChannel = NULL; + BYTE* OUTChannelCookie = nullptr; + BYTE* VirtualConnectionCookie = nullptr; + RpcVirtualConnection* connection = nullptr; + RpcOutChannel* outChannel = nullptr; WINPR_ASSERT(rpc); @@ -1647,7 +1647,7 @@ BOOL rts_send_CONN_A1_pdu(rdpRpc* rpc) OUTChannelCookie = (BYTE*)&(outChannel->common.Cookie); ReceiveWindowSize = outChannel->ReceiveWindow; - buffer = Stream_New(NULL, header.header.frag_length); + buffer = Stream_New(nullptr, header.header.frag_length); if (!buffer) return -1; @@ -1724,13 +1724,13 @@ fail: BOOL rts_send_CONN_B1_pdu(rdpRpc* rpc) { BOOL status = FALSE; - wStream* buffer = NULL; + wStream* buffer = nullptr; rpcconn_rts_hdr_t header = rts_pdu_header_init(); - BYTE* INChannelCookie = NULL; - BYTE* AssociationGroupId = NULL; - BYTE* VirtualConnectionCookie = NULL; - RpcVirtualConnection* connection = NULL; - RpcInChannel* inChannel = NULL; + BYTE* INChannelCookie = nullptr; + BYTE* AssociationGroupId = nullptr; + BYTE* VirtualConnectionCookie = nullptr; + RpcVirtualConnection* connection = nullptr; + RpcInChannel* inChannel = nullptr; WINPR_ASSERT(rpc); @@ -1749,7 +1749,7 @@ BOOL rts_send_CONN_B1_pdu(rdpRpc* rpc) VirtualConnectionCookie = (BYTE*)&(connection->Cookie); INChannelCookie = (BYTE*)&(inChannel->common.Cookie); AssociationGroupId = (BYTE*)&(connection->AssociationGroupId); - buffer = Stream_New(NULL, header.header.frag_length); + buffer = Stream_New(nullptr, header.header.frag_length); if (!buffer) goto fail; @@ -1808,7 +1808,7 @@ BOOL rts_recv_CONN_C2_pdu(rdpRpc* rpc, wStream* buffer) header.rts.NumberOfCommands); goto fail; } - if (!rts_version_command_read(rpc, buffer, NULL)) + if (!rts_version_command_read(rpc, buffer, nullptr)) goto fail; if (!rts_receive_window_size_command_read(rpc, buffer, &ReceiveWindowSize)) @@ -1841,14 +1841,14 @@ fail: BOOL rts_send_flow_control_ack_pdu(rdpRpc* rpc) { BOOL status = FALSE; - wStream* buffer = NULL; + wStream* buffer = nullptr; rpcconn_rts_hdr_t header = rts_pdu_header_init(); UINT32 BytesReceived = 0; UINT32 AvailableWindow = 0; - BYTE* ChannelCookie = NULL; - RpcVirtualConnection* connection = NULL; - RpcInChannel* inChannel = NULL; - RpcOutChannel* outChannel = NULL; + BYTE* ChannelCookie = nullptr; + RpcVirtualConnection* connection = nullptr; + RpcInChannel* inChannel = nullptr; + RpcOutChannel* outChannel = nullptr; WINPR_ASSERT(rpc); @@ -1871,7 +1871,7 @@ BOOL rts_send_flow_control_ack_pdu(rdpRpc* rpc) AvailableWindow = outChannel->AvailableWindowAdvertised; ChannelCookie = (BYTE*)&(outChannel->common.Cookie); outChannel->ReceiverAvailableWindow = outChannel->AvailableWindowAdvertised; - buffer = Stream_New(NULL, header.header.frag_length); + buffer = Stream_New(nullptr, header.header.frag_length); if (!buffer) goto fail; @@ -2025,9 +2025,9 @@ fail: static int rts_send_ping_pdu(rdpRpc* rpc) { BOOL status = FALSE; - wStream* buffer = NULL; + wStream* buffer = nullptr; rpcconn_rts_hdr_t header = rts_pdu_header_init(); - RpcInChannel* inChannel = NULL; + RpcInChannel* inChannel = nullptr; WINPR_ASSERT(rpc); WINPR_ASSERT(rpc->VirtualConnection); @@ -2040,7 +2040,7 @@ static int rts_send_ping_pdu(rdpRpc* rpc) header.NumberOfCommands = 0; WLog_DBG(TAG, "Sending Ping RTS PDU"); - buffer = Stream_New(NULL, header.header.frag_length); + buffer = Stream_New(nullptr, header.header.frag_length); if (!buffer) goto fail; @@ -2141,11 +2141,11 @@ BOOL rts_command_length(UINT32 CommandType, wStream* s, size_t* length, BOOL sil static int rts_send_OUT_R2_A7_pdu(rdpRpc* rpc) { BOOL status = FALSE; - wStream* buffer = NULL; + wStream* buffer = nullptr; rpcconn_rts_hdr_t header = rts_pdu_header_init(); - BYTE* SuccessorChannelCookie = NULL; - RpcInChannel* inChannel = NULL; - RpcOutChannel* nextOutChannel = NULL; + BYTE* SuccessorChannelCookie = nullptr; + RpcInChannel* inChannel = nullptr; + RpcOutChannel* nextOutChannel = nullptr; WINPR_ASSERT(rpc); WINPR_ASSERT(rpc->VirtualConnection); @@ -2163,7 +2163,7 @@ static int rts_send_OUT_R2_A7_pdu(rdpRpc* rpc) WLog_DBG(TAG, "Sending OUT_R2/A7 RTS PDU"); SuccessorChannelCookie = (BYTE*)&(nextOutChannel->common.Cookie); - buffer = Stream_New(NULL, header.header.frag_length); + buffer = Stream_New(nullptr, header.header.frag_length); if (!buffer) return -1; @@ -2186,9 +2186,9 @@ fail: static int rts_send_OUT_R2_C1_pdu(rdpRpc* rpc) { BOOL status = FALSE; - wStream* buffer = NULL; + wStream* buffer = nullptr; rpcconn_rts_hdr_t header = rts_pdu_header_init(); - RpcOutChannel* nextOutChannel = NULL; + RpcOutChannel* nextOutChannel = nullptr; WINPR_ASSERT(rpc); WINPR_ASSERT(rpc->VirtualConnection); @@ -2201,7 +2201,7 @@ static int rts_send_OUT_R2_C1_pdu(rdpRpc* rpc) header.NumberOfCommands = 1; WLog_DBG(TAG, "Sending OUT_R2/C1 RTS PDU"); - buffer = Stream_New(NULL, header.header.frag_length); + buffer = Stream_New(nullptr, header.header.frag_length); if (!buffer) return -1; @@ -2220,15 +2220,15 @@ fail: BOOL rts_send_OUT_R1_A3_pdu(rdpRpc* rpc) { BOOL status = FALSE; - wStream* buffer = NULL; + wStream* buffer = nullptr; rpcconn_rts_hdr_t header = rts_pdu_header_init(); UINT32 ReceiveWindowSize = 0; - BYTE* VirtualConnectionCookie = NULL; - BYTE* PredecessorChannelCookie = NULL; - BYTE* SuccessorChannelCookie = NULL; - RpcVirtualConnection* connection = NULL; - RpcOutChannel* outChannel = NULL; - RpcOutChannel* nextOutChannel = NULL; + BYTE* VirtualConnectionCookie = nullptr; + BYTE* PredecessorChannelCookie = nullptr; + BYTE* SuccessorChannelCookie = nullptr; + RpcVirtualConnection* connection = nullptr; + RpcOutChannel* outChannel = nullptr; + RpcOutChannel* nextOutChannel = nullptr; WINPR_ASSERT(rpc); @@ -2251,7 +2251,7 @@ BOOL rts_send_OUT_R1_A3_pdu(rdpRpc* rpc) PredecessorChannelCookie = (BYTE*)&(outChannel->common.Cookie); SuccessorChannelCookie = (BYTE*)&(nextOutChannel->common.Cookie); ReceiveWindowSize = outChannel->ReceiveWindow; - buffer = Stream_New(NULL, header.header.frag_length); + buffer = Stream_New(nullptr, header.header.frag_length); if (!buffer) return -1; @@ -2283,7 +2283,7 @@ static int rts_recv_OUT_R1_A2_pdu(rdpRpc* rpc, wStream* buffer) { int status = 0; UINT32 Destination = 0; - RpcVirtualConnection* connection = NULL; + RpcVirtualConnection* connection = nullptr; WINPR_ASSERT(rpc); WINPR_ASSERT(buffer); @@ -2317,7 +2317,7 @@ static int rts_recv_OUT_R1_A2_pdu(rdpRpc* rpc, wStream* buffer) static int rts_recv_OUT_R2_A6_pdu(rdpRpc* rpc, WINPR_ATTR_UNUSED wStream* buffer) { int status = 0; - RpcVirtualConnection* connection = NULL; + RpcVirtualConnection* connection = nullptr; WINPR_ASSERT(rpc); WINPR_ASSERT(buffer); @@ -2351,7 +2351,7 @@ static int rts_recv_OUT_R2_A6_pdu(rdpRpc* rpc, WINPR_ATTR_UNUSED wStream* buffer static int rts_recv_OUT_R2_B3_pdu(rdpRpc* rpc, WINPR_ATTR_UNUSED wStream* buffer) { - RpcVirtualConnection* connection = NULL; + RpcVirtualConnection* connection = nullptr; WINPR_ASSERT(rpc); WINPR_ASSERT(buffer); @@ -2370,7 +2370,7 @@ BOOL rts_recv_out_of_sequence_pdu(rdpRpc* rpc, wStream* buffer, const rpcconn_hd BOOL status = FALSE; size_t length = 0; RtsPduSignature signature = WINPR_C_ARRAY_INIT; - RpcVirtualConnection* connection = NULL; + RpcVirtualConnection* connection = nullptr; WINPR_ASSERT(rpc); WINPR_ASSERT(buffer); @@ -2440,7 +2440,7 @@ BOOL rts_recv_out_of_sequence_pdu(rdpRpc* rpc, wStream* buffer, const rpcconn_hd if (!status) { - const UINT32 SignatureId = rts_identify_pdu_signature(&signature, NULL); + const UINT32 SignatureId = rts_identify_pdu_signature(&signature, nullptr); WLog_Print(log, WLOG_ERROR, "error parsing RTS PDU with signature id: 0x%08" PRIX32 "", SignatureId); rts_print_pdu_signature(log, WLOG_ERROR, &signature); diff --git a/libfreerdp/core/gateway/rts_signature.c b/libfreerdp/core/gateway/rts_signature.c index bc88f1ba3..38f9953cb 100644 --- a/libfreerdp/core/gateway/rts_signature.c +++ b/libfreerdp/core/gateway/rts_signature.c @@ -285,7 +285,7 @@ static const RTS_PDU_SIGNATURE_ENTRY RTS_PDU_SIGNATURE_TABLE[] = { BOOL rts_match_pdu_signature(const RtsPduSignature* signature, wStream* src, const rpcconn_hdr_t* header) { - return rts_match_pdu_signature_ex(signature, src, header, NULL, FALSE); + return rts_match_pdu_signature_ex(signature, src, header, nullptr, FALSE); } BOOL rts_match_pdu_signature_ex(const RtsPduSignature* signature, wStream* src, @@ -317,7 +317,7 @@ BOOL rts_extract_pdu_signature_ex(RtsPduSignature* signature, wStream* src, BOOL rc = FALSE; wStream sbuffer = WINPR_C_ARRAY_INIT; rpcconn_hdr_t rheader = WINPR_C_ARRAY_INIT; - const rpcconn_rts_hdr_t* rts = NULL; + const rpcconn_rts_hdr_t* rts = nullptr; WINPR_ASSERT(signature); WINPR_ASSERT(src); @@ -366,7 +366,7 @@ UINT32 rts_identify_pdu_signature(const RtsPduSignature* signature, const RTS_PDU_SIGNATURE_ENTRY** entry) { if (entry) - *entry = NULL; + *entry = nullptr; for (size_t i = 0; i < ARRAYSIZE(RTS_PDU_SIGNATURE_TABLE); i++) { @@ -400,7 +400,7 @@ UINT32 rts_identify_pdu_signature(const RtsPduSignature* signature, BOOL rts_print_pdu_signature(wLog* log, DWORD level, const RtsPduSignature* signature) { UINT32 SignatureId = 0; - const RTS_PDU_SIGNATURE_ENTRY* entry = NULL; + const RTS_PDU_SIGNATURE_ENTRY* entry = nullptr; WINPR_ASSERT(signature); diff --git a/libfreerdp/core/gateway/tsg.c b/libfreerdp/core/gateway/tsg.c index d3f898745..5ec1b3f48 100644 --- a/libfreerdp/core/gateway/tsg.c +++ b/libfreerdp/core/gateway/tsg.c @@ -301,7 +301,7 @@ static const char* tsg_packet_id_to_string(UINT32 packetId) static const char* tsg_component_id_to_string(UINT16 ComponentId, char* buffer, size_t bytelen) { - const char* str = NULL; + const char* str = nullptr; #define ENTRY(x) \ case x: \ @@ -921,8 +921,8 @@ static BOOL tsg_packet_quarrequest_to_string(char** buffer, size_t* length, const TSG_PACKET_QUARREQUEST* caps) { BOOL rc = FALSE; - char* name = NULL; - char* strdata = NULL; + char* name = nullptr; + char* strdata = nullptr; WINPR_ASSERT(buffer); WINPR_ASSERT(length); @@ -938,7 +938,7 @@ static BOOL tsg_packet_quarrequest_to_string(char** buffer, size_t* length, { if (caps->nameLength > INT_MAX) return FALSE; - name = ConvertWCharNToUtf8Alloc(caps->machineName, caps->nameLength, NULL); + name = ConvertWCharNToUtf8Alloc(caps->machineName, caps->nameLength, nullptr); if (!name) return FALSE; } @@ -988,7 +988,7 @@ static BOOL tsg_packet_response_to_string(char** buffer, size_t* length, const TSG_PACKET_RESPONSE* caps) { BOOL rc = FALSE; - char* strdata = NULL; + char* strdata = nullptr; char tbuffer[8192] = WINPR_C_ARRAY_INIT; WINPR_ASSERT(buffer); @@ -1020,8 +1020,8 @@ static BOOL tsg_packet_quarenc_response_to_string(char** buffer, size_t* length, const TSG_PACKET_QUARENC_RESPONSE* caps) { BOOL rc = FALSE; - char* strdata = NULL; - RPC_CSTR uuid = NULL; + char* strdata = nullptr; + RPC_CSTR uuid = nullptr; char tbuffer[8192] = WINPR_C_ARRAY_INIT; size_t size = ARRAYSIZE(tbuffer); char* ptbuffer = tbuffer; @@ -1040,7 +1040,7 @@ static BOOL tsg_packet_quarenc_response_to_string(char** buffer, size_t* length, { if (caps->certChainLen > INT_MAX) return FALSE; - strdata = ConvertWCharNToUtf8Alloc(caps->certChainData, caps->certChainLen, NULL); + strdata = ConvertWCharNToUtf8Alloc(caps->certChainData, caps->certChainLen, nullptr); if (!strdata) return FALSE; } @@ -1116,7 +1116,7 @@ static BOOL tsg_packet_message_request_to_string(char** buffer, size_t* length, static BOOL tsg_packet_auth_to_string(char** buffer, size_t* length, const TSG_PACKET_AUTH* caps) { BOOL rc = FALSE; - char* strdata = NULL; + char* strdata = nullptr; WINPR_ASSERT(buffer); WINPR_ASSERT(length); WINPR_ASSERT(caps); @@ -1308,12 +1308,12 @@ static BIO_METHOD* BIO_s_tsg(void); static int TsProxySendToServer(handle_t IDL_handle, const byte pRpcMessage[], UINT32 count, const UINT32* lengths) { - wStream* s = NULL; - rdpTsg* tsg = NULL; + wStream* s = nullptr; + rdpTsg* tsg = nullptr; size_t length = 0; - const byte* buffer1 = NULL; - const byte* buffer2 = NULL; - const byte* buffer3 = NULL; + const byte* buffer1 = nullptr; + const byte* buffer2 = nullptr; + const byte* buffer3 = nullptr; UINT32 buffer1Length = 0; UINT32 buffer2Length = 0; UINT32 buffer3Length = 0; @@ -1349,7 +1349,7 @@ static int TsProxySendToServer(handle_t IDL_handle, const byte pRpcMessage[], UI length = 28ull + totalDataBytes; if (length > INT_MAX) return -1; - s = Stream_New(NULL, length); + s = Stream_New(nullptr, length); if (!s) { @@ -1406,15 +1406,15 @@ static BOOL TsProxyCreateTunnelWriteRequest(rdpTsg* tsg, const TSG_PACKET* tsgPa BOOL rc = FALSE; BOOL write = TRUE; UINT16 opnum = 0; - wStream* s = NULL; - rdpRpc* rpc = NULL; + wStream* s = nullptr; + rdpRpc* rpc = nullptr; if (!tsg || !tsg->rpc) return FALSE; rpc = tsg->rpc; WLog_Print(tsg->log, WLOG_DEBUG, "%s", tsg_packet_to_string(tsgPacket)); - s = Stream_New(NULL, 108); + s = Stream_New(nullptr, 108); if (!s) return FALSE; @@ -1655,7 +1655,7 @@ static BOOL TsProxyCreateTunnelReadResponse(rdpTsg* tsg, const RPC_PDU* pdu, UINT32 index = 0; TSG_PACKET packet = WINPR_C_ARRAY_INIT; UINT32 SwitchValue = 0; - rdpContext* context = NULL; + rdpContext* context = nullptr; UINT32 PacketPtr = 0; WINPR_ASSERT(tsg); @@ -1750,8 +1750,8 @@ static BOOL TsProxyAuthorizeTunnelWriteRequest(rdpTsg* tsg, CONTEXT_HANDLE* tunn rdpRpc* rpc = tsg->rpc; WLog_Print(tsg->log, WLOG_DEBUG, "TsProxyAuthorizeTunnelWriteRequest"); - wStream* s = Stream_New(NULL, 1024 + sizeof(WCHAR) * tsg->QuarreQuest.nameLength + - tsg->QuarreQuest.dataLen); + wStream* s = Stream_New(nullptr, 1024 + sizeof(WCHAR) * tsg->QuarreQuest.nameLength + + tsg->QuarreQuest.dataLen); if (!s) return FALSE; @@ -2002,7 +2002,7 @@ static BOOL TsProxyAuthorizeTunnelReadResponse(rdpTsg* tsg, const RPC_PDU* pdu) goto fail; } - if (!tsg_ndr_pointer_read(log, pdu->s, &index, NULL, TRUE)) + if (!tsg_ndr_pointer_read(log, pdu->s, &index, nullptr, TRUE)) goto fail; if (!Stream_CheckAndLogRequiredLengthWLog(log, pdu->s, 8)) @@ -2020,7 +2020,7 @@ static BOOL TsProxyAuthorizeTunnelReadResponse(rdpTsg* tsg, const RPC_PDU* pdu) packet.tsgPacket.packetResponse.reserved = Stream_Get_UINT32(pdu->s); - packet.tsgPacket.packetResponse.responseData = NULL; + packet.tsgPacket.packetResponse.responseData = nullptr; if (!tsg_ndr_pointer_read(log, pdu->s, &index, &PacketResponseDataPtr, FALSE)) goto fail; @@ -2036,7 +2036,7 @@ static BOOL TsProxyAuthorizeTunnelReadResponse(rdpTsg* tsg, const RPC_PDU* pdu) { WLog_Print(log, WLOG_ERROR, "2.2.9.2.1.5 TSG_PACKET_RESPONSE::responseDataLen %" PRIu32 - " but responseData = NULL", + " but responseData = nullptr", packet.tsgPacket.packetResponse.responseDataLen); goto fail; } @@ -2069,15 +2069,15 @@ fail: static BOOL TsProxyMakeTunnelCallWriteRequest(rdpTsg* tsg, CONTEXT_HANDLE* tunnelContext, UINT32 procId) { - wStream* s = NULL; - rdpRpc* rpc = NULL; + wStream* s = nullptr; + rdpRpc* rpc = nullptr; if (!tsg || !tsg->rpc || !tunnelContext) return FALSE; rpc = tsg->rpc; WLog_Print(tsg->log, WLOG_DEBUG, "TsProxyMakeTunnelCallWriteRequest"); - s = Stream_New(NULL, 40); + s = Stream_New(nullptr, 40); if (!s) return FALSE; @@ -2139,7 +2139,7 @@ static BOOL TsProxyMakeTunnelCallReadResponse(rdpTsg* tsg, const RPC_PDU* pdu) BOOL rc = FALSE; UINT32 index = 0; TSG_PACKET packet = WINPR_C_ARRAY_INIT; - rdpContext* context = NULL; + rdpContext* context = nullptr; TSG_PACKET_MSG_RESPONSE packetMsgResponse = WINPR_C_ARRAY_INIT; UINT32 PacketPtr = 0; UINT32 PacketMsgResponsePtr = 0; @@ -2224,7 +2224,7 @@ static BOOL TsProxyCreateChannelWriteRequest(rdpTsg* tsg, CONTEXT_HANDLE* tunnel if (count > UINT32_MAX) return FALSE; - wStream* s = Stream_New(NULL, 60 + count * 2); + wStream* s = Stream_New(nullptr, 60 + count * 2); if (!s) return FALSE; @@ -2304,7 +2304,7 @@ static BOOL TsProxyCloseChannelWriteRequest(rdpTsg* tsg, CONTEXT_HANDLE* context rdpRpc* rpc = tsg->rpc; WINPR_ASSERT(rpc); - wStream* s = Stream_New(NULL, 20); + wStream* s = Stream_New(nullptr, 20); if (!s) return FALSE; @@ -2360,7 +2360,7 @@ static BOOL TsProxyCloseTunnelWriteRequest(rdpTsg* tsg, const CONTEXT_HANDLE* co rdpRpc* rpc = tsg->rpc; WINPR_ASSERT(rpc); - wStream* s = Stream_New(NULL, 20); + wStream* s = Stream_New(nullptr, 20); if (!s) return FALSE; @@ -2411,8 +2411,8 @@ fail: static BOOL TsProxySetupReceivePipeWriteRequest(rdpTsg* tsg, const CONTEXT_HANDLE* channelContext) { - wStream* s = NULL; - rdpRpc* rpc = NULL; + wStream* s = nullptr; + rdpRpc* rpc = nullptr; WLog_Print(tsg->log, WLOG_DEBUG, "TsProxySetupReceivePipeWriteRequest"); WINPR_ASSERT(tsg); @@ -2422,7 +2422,7 @@ static BOOL TsProxySetupReceivePipeWriteRequest(rdpTsg* tsg, const CONTEXT_HANDL return FALSE; rpc = tsg->rpc; - s = Stream_New(NULL, 20); + s = Stream_New(nullptr, 20); if (!s) return FALSE; @@ -2542,8 +2542,8 @@ static BOOL tsg_proxy_reauth(rdpTsg* tsg) BOOL tsg_recv_pdu(rdpTsg* tsg, const RPC_PDU* pdu) { BOOL rc = FALSE; - RpcClientCall* call = NULL; - rdpRpc* rpc = NULL; + RpcClientCall* call = nullptr; + rdpRpc* rpc = nullptr; WINPR_ASSERT(tsg); WINPR_ASSERT(pdu); @@ -2564,7 +2564,7 @@ BOOL tsg_recv_pdu(rdpTsg* tsg, const RPC_PDU* pdu) { case TSG_STATE_INITIAL: { - CONTEXT_HANDLE* TunnelContext = NULL; + CONTEXT_HANDLE* TunnelContext = nullptr; TunnelContext = (tsg->reauthSequence) ? &tsg->NewTunnelContext : &tsg->TunnelContext; if (!TsProxyCreateTunnelReadResponse(tsg, pdu, TunnelContext, &tsg->TunnelId)) @@ -2751,7 +2751,7 @@ BOOL tsg_recv_pdu(rdpTsg* tsg, const RPC_PDU* pdu) if (!tsg_transition_to_state(tsg, TSG_STATE_CHANNEL_CLOSE_PENDING)) return FALSE; - if (!TsProxyCloseChannelWriteRequest(tsg, NULL)) + if (!TsProxyCloseChannelWriteRequest(tsg, nullptr)) { WLog_Print(tsg->log, WLOG_ERROR, "TsProxyCloseChannelWriteRequest failure"); return FALSE; @@ -2876,8 +2876,8 @@ static BOOL tsg_set_hostname(rdpTsg* tsg, const char* hostname) { WINPR_ASSERT(tsg); free(tsg->Hostname); - tsg->Hostname = ConvertUtf8ToWCharAlloc(hostname, NULL); - return tsg->Hostname != NULL; + tsg->Hostname = ConvertUtf8ToWCharAlloc(hostname, nullptr); + return tsg->Hostname != nullptr; } static BOOL tsg_set_machine_name(rdpTsg* tsg, const char* machineName) @@ -2885,7 +2885,7 @@ static BOOL tsg_set_machine_name(rdpTsg* tsg, const char* machineName) WINPR_ASSERT(tsg); free(tsg->QuarreQuest.machineName); - tsg->QuarreQuest.machineName = NULL; + tsg->QuarreQuest.machineName = nullptr; tsg->QuarreQuest.nameLength = 0; if (!machineName) return FALSE; @@ -3020,7 +3020,7 @@ BOOL tsg_disconnect(rdpTsg* tsg) static int tsg_read(rdpTsg* tsg, BYTE* data, size_t length) { - rdpRpc* rpc = NULL; + rdpRpc* rpc = nullptr; int status = 0; if (!tsg || !data) @@ -3094,7 +3094,7 @@ rdpTsg* tsg_new(rdpTransport* transport) rdpTsg* tsg = (rdpTsg*)calloc(1, sizeof(rdpTsg)); if (!tsg) - return NULL; + return nullptr; tsg->log = WLog_Get(TAG); tsg->transport = transport; tsg->rpc = rpc_new(tsg->transport); @@ -3105,7 +3105,7 @@ rdpTsg* tsg_new(rdpTransport* transport) return tsg; out_free: free(tsg); - return NULL; + return nullptr; } void tsg_free(rdpTsg* tsg) @@ -3298,12 +3298,12 @@ static int transport_bio_tsg_free(BIO* bio) BIO_METHOD* BIO_s_tsg(void) { - static BIO_METHOD* bio_methods = NULL; + static BIO_METHOD* bio_methods = nullptr; - if (bio_methods == NULL) + if (bio_methods == nullptr) { if (!(bio_methods = BIO_meth_new(BIO_TYPE_TSG, "TSGateway"))) - return NULL; + return nullptr; BIO_meth_set_write(bio_methods, transport_bio_tsg_write); BIO_meth_set_read(bio_methods, transport_bio_tsg_read); @@ -3328,7 +3328,7 @@ TSG_STATE tsg_get_state(rdpTsg* tsg) BIO* tsg_get_bio(rdpTsg* tsg) { if (!tsg) - return NULL; + return nullptr; return tsg->bio; } diff --git a/libfreerdp/core/gateway/websocket.c b/libfreerdp/core/gateway/websocket.c index bd1b6b4d0..70f69a7a7 100644 --- a/libfreerdp/core/gateway/websocket.c +++ b/libfreerdp/core/gateway/websocket.c @@ -78,7 +78,7 @@ wStream* websocket_context_packet_new(size_t len, WEBSOCKET_OPCODE opcode, UINT3 { WINPR_ASSERT(pMaskingKey); if (len > INT_MAX) - return NULL; + return nullptr; size_t fullLen = 0; if (len < 126) @@ -88,9 +88,9 @@ wStream* websocket_context_packet_new(size_t len, WEBSOCKET_OPCODE opcode, UINT3 else fullLen = len + 14; /* 2 byte "mini header" + 8 byte length + 4 byte masking key */ - wStream* sWS = Stream_New(NULL, fullLen); + wStream* sWS = Stream_New(nullptr, fullLen); if (!sWS) - return NULL; + return nullptr; UINT32 maskingKey = 0; winpr_RAND(&maskingKey, sizeof(maskingKey)); @@ -272,7 +272,7 @@ static BOOL websocket_reply_pong(BIO* bio, websocket_context* context, wStream* if (Stream_GetPosition(s) != 0) return websocket_context_write_wstream(context, bio, s, WebsocketPongOpcode); - return websocket_reply_close(bio, context, NULL); + return websocket_reply_close(bio, context, nullptr); } static int websocket_handle_payload(BIO* bio, BYTE* pBuffer, size_t size, @@ -463,7 +463,7 @@ websocket_context* websocket_context_new(void) if (!context) goto fail; - context->responseStreamBuffer = Stream_New(NULL, 1024); + context->responseStreamBuffer = Stream_New(nullptr, 1024); if (!context->responseStreamBuffer) goto fail; @@ -473,7 +473,7 @@ websocket_context* websocket_context_new(void) return context; fail: websocket_context_free(context); - return NULL; + return nullptr; } void websocket_context_free(websocket_context* context) diff --git a/libfreerdp/core/gateway/wst.c b/libfreerdp/core/gateway/wst.c index a85897401..7f290f3c9 100644 --- a/libfreerdp/core/gateway/wst.c +++ b/libfreerdp/core/gateway/wst.c @@ -86,7 +86,7 @@ static BOOL wst_get_gateway_credentials(wLog* log, rdpContext* context, rdp_auth freerdp_set_last_error_log(instance->context, FREERDP_ERROR_CONNECT_CANCELLED); return FALSE; case AUTH_NO_CREDENTIALS: - WLog_Print(log, WLOG_INFO, "No credentials provided - using NULL identity"); + WLog_Print(log, WLOG_INFO, "No credentials provided - using nullptr identity"); return TRUE; case AUTH_FAILED: default: @@ -116,8 +116,8 @@ static BOOL wst_auth_init(rdpWst* wst, rdpTls* tls, TCHAR* authPkg) FreeRDP_GatewayDomain, FreeRDP_GatewayPassword)) return FALSE; - SEC_WINNT_AUTH_IDENTITY* identityArg = (settings->GatewayUsername ? &identity : NULL); - if (!credssp_auth_setup_client(wst->auth, "HTTP", wst->gwhostname, identityArg, NULL)) + SEC_WINNT_AUTH_IDENTITY* identityArg = (settings->GatewayUsername ? &identity : nullptr); + if (!credssp_auth_setup_client(wst->auth, "HTTP", wst->gwhostname, identityArg, nullptr)) { sspi_FreeAuthIdentity(&identity); return FALSE; @@ -136,7 +136,7 @@ static BOOL wst_set_auth_header(rdpCredsspAuth* auth, HttpRequest* request) WINPR_ASSERT(request); const SecBuffer* authToken = credssp_auth_get_output_buffer(auth); - char* base64AuthToken = NULL; + char* base64AuthToken = nullptr; if (authToken) { @@ -163,7 +163,7 @@ static BOOL wst_recv_auth_token(rdpCredsspAuth* auth, HttpResponse* response) { size_t len = 0; size_t authTokenLength = 0; - BYTE* authTokenData = NULL; + BYTE* authTokenData = nullptr; SecBuffer authToken = WINPR_C_ARRAY_INIT; int rc = 0; @@ -209,13 +209,13 @@ static BOOL wst_tls_connect(rdpWst* wst, rdpTls* tls, UINT32 timeout) WINPR_ASSERT(tls); int sockfd = 0; long status = 0; - BIO* socketBio = NULL; - BIO* bufferedBio = NULL; + BIO* socketBio = nullptr; + BIO* bufferedBio = nullptr; rdpSettings* settings = wst->context->settings; const char* peerHostname = wst->gwhostname; UINT16 peerPort = wst->gwport; - const char* proxyUsername = NULL; - const char* proxyPassword = NULL; + const char* proxyUsername = nullptr; + const char* proxyPassword = nullptr; BOOL isProxyConnection = proxy_prepare(settings, &peerHostname, &peerPort, &proxyUsername, &proxyPassword); @@ -286,18 +286,18 @@ static BOOL wst_tls_connect(rdpWst* wst, rdpTls* tls, UINT32 timeout) static wStream* wst_build_http_request(rdpWst* wst) { - wStream* s = NULL; - HttpRequest* request = NULL; - const char* uri = NULL; + wStream* s = nullptr; + HttpRequest* request = nullptr; + const char* uri = nullptr; if (!wst) - return NULL; + return nullptr; uri = http_context_get_uri(wst->http); request = http_request_new(); if (!request) - return NULL; + return nullptr; if (!http_request_set_method(request, "GET") || !http_request_set_uri(request, uri)) goto out; @@ -371,9 +371,9 @@ static BOOL wst_handle_ok_or_forbidden(rdpWst* wst, HttpResponse** ppresponse, D return FALSE; } http_response_free(*ppresponse); - *ppresponse = NULL; + *ppresponse = nullptr; /* Terminate this connection and make a new one with the Loadbalancing Cookie */ - const long fd = BIO_get_fd(wst->tls->bio, NULL); + const long fd = BIO_get_fd(wst->tls->bio, nullptr); if ((fd >= 0) && (fd <= INT32_MAX)) closesocket((SOCKET)fd); freerdp_tls_free(wst->tls); @@ -385,9 +385,9 @@ static BOOL wst_handle_ok_or_forbidden(rdpWst* wst, HttpResponse** ppresponse, D if (freerdp_settings_get_string(wst->context->settings, FreeRDP_GatewayHttpExtAuthBearer) && freerdp_settings_get_bool(wst->context->settings, FreeRDP_GatewayArmTransport)) { - char* urlWithAuth = NULL; + char* urlWithAuth = nullptr; size_t urlLen = 0; - char firstParam = (strchr(wst->gwpath, '?') != NULL) ? '&' : '?'; + char firstParam = (strchr(wst->gwpath, '?') != nullptr) ? '&' : '?'; const char* bearer = freerdp_settings_get_string(wst->context->settings, FreeRDP_GatewayHttpExtAuthBearer); const char* ua = @@ -401,7 +401,7 @@ static BOOL wst_handle_ok_or_forbidden(rdpWst* wst, HttpResponse** ppresponse, D if (!utils_str_is_empty(ua)) { size_t ualen = 0; - char* uastr = NULL; + char* uastr = nullptr; winpr_asprintf(&uastr, &ualen, "%s&X-MS-User-Agent=%s", wst->gwpath, ua); if (!uastr) return FALSE; @@ -576,7 +576,7 @@ BOOL wst_connect(rdpWst* wst, DWORD timeout) DWORD wst_get_event_handles(rdpWst* wst, HANDLE* events, DWORD count) { DWORD nCount = 0; - WINPR_ASSERT(wst != NULL); + WINPR_ASSERT(wst != nullptr); if (wst->tls) { @@ -762,12 +762,12 @@ static int wst_bio_free(BIO* bio) static BIO_METHOD* BIO_s_wst(void) { - static BIO_METHOD* bio_methods = NULL; + static BIO_METHOD* bio_methods = nullptr; - if (bio_methods == NULL) + if (bio_methods == nullptr) { if (!(bio_methods = BIO_meth_new(BIO_TYPE_TSG, "WSTransport"))) - return NULL; + return nullptr; BIO_meth_set_write(bio_methods, wst_bio_write); BIO_meth_set_read(bio_methods, wst_bio_read); @@ -783,15 +783,15 @@ static BIO_METHOD* BIO_s_wst(void) static BOOL wst_parse_url(rdpWst* wst, const char* url) { - const char* hostStart = NULL; - const char* pos = NULL; + const char* hostStart = nullptr; + const char* pos = nullptr; WINPR_ASSERT(wst); WINPR_ASSERT(url); free(wst->gwhostname); - wst->gwhostname = NULL; + wst->gwhostname = nullptr; free(wst->gwpath); - wst->gwpath = NULL; + wst->gwpath = nullptr; if (strncmp("wss://", url, 6) != 0) { @@ -811,7 +811,7 @@ static BOOL wst_parse_url(rdpWst* wst, const char* url) while (*pos != '\0' && *pos != ':' && *pos != '/') pos++; free(wst->gwhostname); - wst->gwhostname = NULL; + wst->gwhostname = nullptr; if (pos - hostStart == 0) return FALSE; wst->gwhostname = strndup(hostStart, WINPR_ASSERTING_INT_CAST(size_t, (pos - hostStart))); @@ -821,7 +821,7 @@ static BOOL wst_parse_url(rdpWst* wst, const char* url) if (*pos == ':') { char port[6] = WINPR_C_ARRAY_INIT; - char* portNumberEnd = NULL; + char* portNumberEnd = nullptr; pos++; const char* portStart = pos; while (*pos != '\0' && *pos != '/') @@ -839,24 +839,24 @@ static BOOL wst_parse_url(rdpWst* wst, const char* url) else wst->gwport = 443; wst->gwpath = _strdup(pos); - return (wst->gwpath != NULL); + return (wst->gwpath != nullptr); } rdpWst* wst_new(rdpContext* context) { if (!context) - return NULL; + return nullptr; rdpWst* wst = (rdpWst*)calloc(1, sizeof(rdpWst)); if (!wst) - return NULL; + return nullptr; wst->log = WLog_Get(TAG); wst->context = context; - wst->gwhostname = NULL; + wst->gwhostname = nullptr; wst->gwport = 443; - wst->gwpath = NULL; + wst->gwpath = nullptr; if (!wst_parse_url(wst, context->settings->GatewayUrl)) goto wst_alloc_error; @@ -910,7 +910,7 @@ wst_alloc_error: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC wst_free(wst); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void wst_free(rdpWst* wst) @@ -937,7 +937,7 @@ void wst_free(rdpWst* wst) BIO* wst_get_front_bio_and_take_ownership(rdpWst* wst) { if (!wst) - return NULL; + return nullptr; wst->attached = TRUE; return wst->frontBio; diff --git a/libfreerdp/core/gcc.c b/libfreerdp/core/gcc.c index 497cf413b..a3cf2e3d3 100644 --- a/libfreerdp/core/gcc.c +++ b/libfreerdp/core/gcc.c @@ -810,7 +810,7 @@ BOOL gcc_read_server_data_blocks(wStream* s, rdpMcs* mcs, UINT16 length) UINT16 type = 0; UINT16 offset = 0; UINT16 blockLength = 0; - BYTE* holdp = NULL; + BYTE* holdp = nullptr; WINPR_ASSERT(s); WINPR_ASSERT(mcs); @@ -820,7 +820,7 @@ BOOL gcc_read_server_data_blocks(wStream* s, rdpMcs* mcs, UINT16 length) char buffer[64] = WINPR_C_ARRAY_INIT; size_t rest = 0; wStream subbuffer; - wStream* sub = NULL; + wStream* sub = nullptr; if (!gcc_read_user_data_header(mcs->log, s, &type, &blockLength)) { @@ -1753,7 +1753,7 @@ BOOL gcc_read_server_security_data(wStream* s, rdpMcs* mcs) return FALSE; /* serverRandom */ - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ServerRandom, NULL, + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ServerRandom, nullptr, settings->ServerRandomLength)) goto fail; @@ -1763,7 +1763,7 @@ BOOL gcc_read_server_security_data(wStream* s, rdpMcs* mcs) goto fail; /* serverCertificate */ - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ServerCertificate, NULL, + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ServerCertificate, nullptr, settings->ServerCertificateLength)) goto fail; @@ -1778,8 +1778,8 @@ BOOL gcc_read_server_security_data(wStream* s, rdpMcs* mcs) } return TRUE; fail: - freerdp_settings_set_pointer_len(settings, FreeRDP_ServerRandom, NULL, 0); - freerdp_settings_set_pointer_len(settings, FreeRDP_ServerCertificate, NULL, 0); + freerdp_settings_set_pointer_len(settings, FreeRDP_ServerRandom, nullptr, 0); + freerdp_settings_set_pointer_len(settings, FreeRDP_ServerCertificate, nullptr, 0); return FALSE; } @@ -1787,7 +1787,7 @@ static BOOL gcc_update_server_random(rdpSettings* settings) { const size_t length = 32; WINPR_ASSERT(settings); - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ServerRandom, NULL, length)) + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ServerRandom, nullptr, length)) return FALSE; BYTE* data = freerdp_settings_get_pointer_writable(settings, FreeRDP_ServerRandom); if (!data) diff --git a/libfreerdp/core/graphics.c b/libfreerdp/core/graphics.c index a437f7412..f51855c22 100644 --- a/libfreerdp/core/graphics.c +++ b/libfreerdp/core/graphics.c @@ -29,15 +29,15 @@ rdpBitmap* Bitmap_Alloc(rdpContext* context) { - rdpBitmap* bitmap = NULL; - rdpGraphics* graphics = NULL; + rdpBitmap* bitmap = nullptr; + rdpGraphics* graphics = nullptr; graphics = context->graphics; bitmap = (rdpBitmap*)calloc(1, graphics->Bitmap_Prototype->size); if (bitmap) { *bitmap = *graphics->Bitmap_Prototype; - bitmap->data = NULL; + bitmap->data = nullptr; } return bitmap; @@ -85,8 +85,8 @@ void graphics_register_bitmap(rdpGraphics* graphics, const rdpBitmap* bitmap) /* Pointer Class */ rdpPointer* Pointer_Alloc(rdpContext* context) { - rdpPointer* pointer = NULL; - rdpGraphics* graphics = NULL; + rdpPointer* pointer = nullptr; + rdpGraphics* graphics = nullptr; graphics = context->graphics; pointer = (rdpPointer*)calloc(1, graphics->Pointer_Prototype->size); @@ -113,21 +113,21 @@ void graphics_register_pointer(rdpGraphics* graphics, const rdpPointer* pointer) rdpGlyph* Glyph_Alloc(rdpContext* context, INT32 x, INT32 y, UINT32 cx, UINT32 cy, UINT32 cb, const BYTE* aj) { - rdpGlyph* glyph = NULL; - rdpGraphics* graphics = NULL; + rdpGlyph* glyph = nullptr; + rdpGraphics* graphics = nullptr; if (!context || !context->graphics) - return NULL; + return nullptr; graphics = context->graphics; if (!graphics->Glyph_Prototype) - return NULL; + return nullptr; glyph = (rdpGlyph*)calloc(1, graphics->Glyph_Prototype->size); if (!glyph) - return NULL; + return nullptr; *glyph = *graphics->Glyph_Prototype; glyph->cb = cb; @@ -140,7 +140,7 @@ rdpGlyph* Glyph_Alloc(rdpContext* context, INT32 x, INT32 y, UINT32 cx, UINT32 c if (!glyph->aj) { free(glyph); - return NULL; + return nullptr; } CopyMemory(glyph->aj, aj, cb); @@ -149,7 +149,7 @@ rdpGlyph* Glyph_Alloc(rdpContext* context, INT32 x, INT32 y, UINT32 cx, UINT32 c { free(glyph->aj); free(glyph); - return NULL; + return nullptr; } return glyph; @@ -168,7 +168,7 @@ void graphics_register_glyph(rdpGraphics* graphics, const rdpGlyph* glyph) rdpGraphics* graphics_new(rdpContext* context) { - rdpGraphics* graphics = NULL; + rdpGraphics* graphics = nullptr; graphics = (rdpGraphics*)calloc(1, sizeof(rdpGraphics)); if (graphics) @@ -179,7 +179,7 @@ rdpGraphics* graphics_new(rdpContext* context) if (!graphics->Bitmap_Prototype) { free(graphics); - return NULL; + return nullptr; } graphics->Bitmap_Prototype->size = sizeof(rdpBitmap); @@ -189,7 +189,7 @@ rdpGraphics* graphics_new(rdpContext* context) { free(graphics->Bitmap_Prototype); free(graphics); - return NULL; + return nullptr; } graphics->Pointer_Prototype->size = sizeof(rdpPointer); @@ -200,7 +200,7 @@ rdpGraphics* graphics_new(rdpContext* context) free(graphics->Pointer_Prototype); free(graphics->Bitmap_Prototype); free(graphics); - return NULL; + return nullptr; } graphics->Glyph_Prototype->size = sizeof(rdpGlyph); diff --git a/libfreerdp/core/info.c b/libfreerdp/core/info.c index e04eff753..abcfeb768 100644 --- a/libfreerdp/core/info.c +++ b/libfreerdp/core/info.c @@ -80,7 +80,7 @@ static BOOL rdp_read_info_null_string(rdpSettings* settings, FreeRDP_Settings_Ke { const BOOL unicode = (flags & INFO_UNICODE) != 0; - if (!freerdp_settings_set_string(settings, id, NULL)) + if (!freerdp_settings_set_string(settings, id, nullptr)) return FALSE; if (!Stream_CheckAndLogRequiredLength(TAG, s, (size_t)(cbLen))) @@ -119,13 +119,13 @@ static BOOL rdp_read_info_null_string(rdpSettings* settings, FreeRDP_Settings_Ke static char* rdp_info_package_flags_description(UINT32 flags) { - char* result = NULL; + char* result = nullptr; size_t maximum_size = 1 + MAX_LABEL_LENGTH * ARRAYSIZE(info_flags); result = calloc(maximum_size, sizeof(char)); if (!result) - return 0; + return nullptr; for (size_t i = 0; i < ARRAYSIZE(info_flags); i++) { @@ -143,8 +143,8 @@ static BOOL rdp_compute_client_auto_reconnect_cookie(rdpRdp* rdp) { BYTE ClientRandom[CLIENT_RANDOM_LENGTH] = WINPR_C_ARRAY_INIT; BYTE AutoReconnectRandom[32] = WINPR_C_ARRAY_INIT; - ARC_SC_PRIVATE_PACKET* serverCookie = NULL; - ARC_CS_PRIVATE_PACKET* clientCookie = NULL; + ARC_SC_PRIVATE_PACKET* serverCookie = nullptr; + ARC_CS_PRIVATE_PACKET* clientCookie = nullptr; WINPR_ASSERT(rdp); rdpSettings* settings = rdp->settings; @@ -178,8 +178,8 @@ static BOOL rdp_compute_client_auto_reconnect_cookie(rdpRdp* rdp) static BOOL rdp_read_server_auto_reconnect_cookie(rdpRdp* rdp, wStream* s, logon_info_ex* info) { - BYTE* p = NULL; - ARC_SC_PRIVATE_PACKET* autoReconnectCookie = NULL; + BYTE* p = nullptr; + ARC_SC_PRIVATE_PACKET* autoReconnectCookie = nullptr; rdpSettings* settings = rdp->settings; autoReconnectCookie = settings->ServerAutoReconnectCookie; @@ -212,7 +212,7 @@ static BOOL rdp_read_server_auto_reconnect_cookie(rdpRdp* rdp, wStream* s, logon if ((settings->PrintReconnectCookie)) { - char* base64 = NULL; + char* base64 = nullptr; base64 = crypto_base64_encode((BYTE*)autoReconnectCookie, sizeof(ARC_SC_PRIVATE_PACKET)); WLog_INFO(TAG, "Reconnect-cookie: %s", base64); free(base64); @@ -228,7 +228,7 @@ static BOOL rdp_read_server_auto_reconnect_cookie(rdpRdp* rdp, wStream* s, logon static BOOL rdp_read_client_auto_reconnect_cookie(rdpRdp* rdp, wStream* s) { - ARC_CS_PRIVATE_PACKET* autoReconnectCookie = NULL; + ARC_CS_PRIVATE_PACKET* autoReconnectCookie = nullptr; rdpSettings* settings = rdp->settings; autoReconnectCookie = settings->ClientAutoReconnectCookie; @@ -249,9 +249,9 @@ static BOOL rdp_read_client_auto_reconnect_cookie(rdpRdp* rdp, wStream* s) static BOOL rdp_write_client_auto_reconnect_cookie(rdpRdp* rdp, wStream* s) { - BYTE* p = NULL; - ARC_CS_PRIVATE_PACKET* autoReconnectCookie = NULL; - rdpSettings* settings = NULL; + BYTE* p = nullptr; + ARC_CS_PRIVATE_PACKET* autoReconnectCookie = nullptr; + rdpSettings* settings = nullptr; WINPR_ASSERT(rdp); @@ -289,7 +289,7 @@ static BOOL rdp_write_client_auto_reconnect_cookie(rdpRdp* rdp, wStream* s) static size_t rdp_get_client_address_max_size(const rdpRdp* rdp) { UINT32 version = 0; - rdpSettings* settings = NULL; + rdpSettings* settings = nullptr; WINPR_ASSERT(rdp); @@ -465,7 +465,7 @@ static BOOL rdp_write_extended_info_packet(rdpRdp* rdp, wStream* s) BOOL ret = FALSE; size_t cbClientAddress = 0; const size_t cbClientAddressMax = rdp_get_client_address_max_size(rdp); - WCHAR* clientDir = NULL; + WCHAR* clientDir = nullptr; size_t cbClientDir = 0; const size_t cbClientDirMax = 512; UINT16 cbAutoReconnectCookie = 0; @@ -603,7 +603,7 @@ static BOOL rdp_read_info_string(rdpSettings* settings, FreeRDP_Settings_Keys_St const BOOL unicode = (flags & INFO_UNICODE) != 0; const size_t nullSize = unicode ? sizeof(WCHAR) : sizeof(CHAR); - if (!freerdp_settings_set_string(settings, id, NULL)) + if (!freerdp_settings_set_string(settings, id, nullptr)) return FALSE; if (!Stream_CheckAndLogRequiredLength(TAG, s, (size_t)(cbLenNonNull + nullSize))) @@ -644,7 +644,7 @@ static BOOL rdp_read_info_string(rdpSettings* settings, FreeRDP_Settings_Keys_St if (terminator.w != L'\0') { WLog_ERR(TAG, "protocol error: Domain must be null terminated"); - freerdp_settings_set_string(settings, id, NULL); + freerdp_settings_set_string(settings, id, nullptr); return FALSE; } @@ -744,18 +744,18 @@ static BOOL rdp_write_info_packet(rdpRdp* rdp, wStream* s) { BOOL ret = FALSE; UINT32 flags = 0; - WCHAR* domainW = NULL; + WCHAR* domainW = nullptr; size_t cbDomain = 0; - WCHAR* userNameW = NULL; + WCHAR* userNameW = nullptr; size_t cbUserName = 0; - WCHAR* passwordW = NULL; + WCHAR* passwordW = nullptr; size_t cbPassword = 0; - WCHAR* alternateShellW = NULL; + WCHAR* alternateShellW = nullptr; size_t cbAlternateShell = 0; - WCHAR* workingDirW = NULL; + WCHAR* workingDirW = nullptr; size_t cbWorkingDir = 0; BOOL usedPasswordCookie = FALSE; - rdpSettings* settings = NULL; + rdpSettings* settings = nullptr; WINPR_ASSERT(rdp); settings = rdp->settings; @@ -878,7 +878,7 @@ static BOOL rdp_write_info_packet(rdpRdp* rdp, wStream* s) } { - const char* altShell = NULL; + const char* altShell = nullptr; if (!settings->RemoteAssistanceMode) altShell = freerdp_settings_get_string(settings, FreeRDP_AlternateShell); else if (settings->RemoteAssistancePassStub) @@ -891,7 +891,7 @@ static BOOL rdp_write_info_packet(rdpRdp* rdp, wStream* s) alternateShellW = ConvertUtf8ToWCharAlloc(altShell, &cbAlternateShell); if (!alternateShellW) { - WLog_ERR(TAG, "alternateShellW == NULL"); + WLog_ERR(TAG, "alternateShellW == nullptr"); goto fail; } if (cbAlternateShell > (UINT16_MAX / sizeof(WCHAR))) @@ -1023,7 +1023,7 @@ BOOL rdp_recv_client_info(rdpRdp* rdp, wStream* s) BOOL rdp_send_client_info(rdpRdp* rdp) { UINT16 sec_flags = SEC_INFO_PKT; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(rdp); s = rdp_send_stream_init(rdp, &sec_flags); @@ -1056,7 +1056,7 @@ static BOOL rdp_info_read_string(const char* what, wStream* s, size_t size, size BOOL skipMax, char** dst) { WINPR_ASSERT(dst); - *dst = NULL; + *dst = nullptr; if (size == 0) { @@ -1238,7 +1238,7 @@ static BOOL rdp_recv_logon_plain_notify(rdpRdp* rdp, wStream* s) static BOOL rdp_recv_logon_error_info(rdpRdp* rdp, wStream* s, logon_info_ex* info) { - freerdp* instance = NULL; + freerdp* instance = nullptr; UINT32 errorNotificationType = 0; UINT32 errorNotificationData = 0; @@ -1377,7 +1377,7 @@ BOOL rdp_recv_save_session_info(rdpRdp* rdp, wStream* s) status = rdp_recv_logon_plain_notify(rdp, s); if (status && update->SaveSessionInfo) - status = update->SaveSessionInfo(context, infoType, NULL); + status = update->SaveSessionInfo(context, infoType, nullptr); break; @@ -1590,7 +1590,7 @@ BOOL rdp_send_save_session_info(rdpContext* context, UINT32 type, void* data) BOOL rdp_send_server_status_info(rdpContext* context, UINT32 status) { UINT16 sec_flags = 0; - wStream* s = NULL; + wStream* s = nullptr; rdpRdp* rdp = context->rdp; s = rdp_data_pdu_init(rdp, &sec_flags); diff --git a/libfreerdp/core/input.c b/libfreerdp/core/input.c index 3932ef8ff..95d8e52ef 100644 --- a/libfreerdp/core/input.c +++ b/libfreerdp/core/input.c @@ -59,10 +59,10 @@ static const char* SyncEventFlags2Str(const char* prefix, uint32_t flags, char* KBD_SYNC_KANA_LOCK }; if (len <= 2) - return NULL; + return nullptr; if (!winpr_str_append("{", buffer, len, "")) - return NULL; + return nullptr; /* Strip initial symbol so we do not get duplicate separators */ for (size_t x = 0; x < ARRAYSIZE(tflags); x++) @@ -73,11 +73,11 @@ static const char* SyncEventFlags2Str(const char* prefix, uint32_t flags, char* char ibuffer[64] = WINPR_C_ARRAY_INIT; (void)_snprintf(ibuffer, sizeof(ibuffer), "%s%s", prefix, SyncEventFlag2Str(flag)); if (!winpr_str_append(ibuffer, &buffer[1], len - 2, "|")) - return NULL; + return nullptr; } } if (!winpr_str_append("}", &buffer[1], len - 2, "")) - return NULL; + return nullptr; return buffer; } @@ -108,7 +108,7 @@ static wStream* rdp_client_input_pdu_init(rdpRdp* rdp, UINT16 type, UINT16* sec_ wStream* s = rdp_data_pdu_init(rdp, sec_flags); if (!s) - return NULL; + return nullptr; rdp_write_client_input_pdu_header(s, 1); rdp_write_input_event_header(s, 0, type); @@ -175,8 +175,8 @@ static void input_write_keyboard_event(wStream* s, UINT16 flags, UINT16 code) static BOOL input_send_keyboard_event(rdpInput* input, UINT16 flags, UINT8 code) { UINT16 sec_flags = 0; - wStream* s = NULL; - rdpRdp* rdp = NULL; + wStream* s = nullptr; + rdpRdp* rdp = nullptr; if (!input || !input->context) return FALSE; @@ -205,8 +205,8 @@ static void input_write_unicode_keyboard_event(wStream* s, UINT16 flags, UINT16 static BOOL input_send_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code) { UINT16 sec_flags = 0; - wStream* s = NULL; - rdpRdp* rdp = NULL; + wStream* s = nullptr; + rdpRdp* rdp = nullptr; if (!input || !input->context) return FALSE; @@ -273,8 +273,8 @@ static BOOL input_send_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT static BOOL input_send_relmouse_event(rdpInput* input, UINT16 flags, INT16 xDelta, INT16 yDelta) { UINT16 sec_flags = 0; - wStream* s = NULL; - rdpRdp* rdp = NULL; + wStream* s = nullptr; + rdpRdp* rdp = nullptr; if (!input || !input->context || !input->context->settings) return FALSE; @@ -384,8 +384,8 @@ static BOOL input_send_keyboard_pause_event(rdpInput* input) static BOOL input_send_fastpath_synchronize_event(rdpInput* input, UINT32 flags) { UINT16 sec_flags = 0; - wStream* s = NULL; - rdpRdp* rdp = NULL; + wStream* s = nullptr; + rdpRdp* rdp = nullptr; WINPR_ASSERT(input); WINPR_ASSERT(input->context); @@ -408,9 +408,9 @@ static BOOL input_send_fastpath_synchronize_event(rdpInput* input, UINT32 flags) static BOOL input_send_fastpath_keyboard_event(rdpInput* input, UINT16 flags, UINT8 code) { UINT16 sec_flags = 0; - wStream* s = NULL; + wStream* s = nullptr; BYTE eventFlags = 0; - rdpRdp* rdp = NULL; + rdpRdp* rdp = nullptr; WINPR_ASSERT(input); WINPR_ASSERT(input->context); @@ -438,9 +438,9 @@ static BOOL input_send_fastpath_keyboard_event(rdpInput* input, UINT16 flags, UI static BOOL input_send_fastpath_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code) { UINT16 sec_flags = 0; - wStream* s = NULL; + wStream* s = nullptr; BYTE eventFlags = 0; - rdpRdp* rdp = NULL; + rdpRdp* rdp = nullptr; WINPR_ASSERT(input); WINPR_ASSERT(input->context); @@ -472,8 +472,8 @@ static BOOL input_send_fastpath_unicode_keyboard_event(rdpInput* input, UINT16 f static BOOL input_send_fastpath_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y) { UINT16 sec_flags = 0; - wStream* s = NULL; - rdpRdp* rdp = NULL; + wStream* s = nullptr; + rdpRdp* rdp = nullptr; WINPR_ASSERT(input); WINPR_ASSERT(input->context); @@ -510,8 +510,8 @@ static BOOL input_send_fastpath_extended_mouse_event(rdpInput* input, UINT16 fla UINT16 y) { UINT16 sec_flags = 0; - wStream* s = NULL; - rdpRdp* rdp = NULL; + wStream* s = nullptr; + rdpRdp* rdp = nullptr; WINPR_ASSERT(input); WINPR_ASSERT(input->context); @@ -544,8 +544,8 @@ static BOOL input_send_fastpath_relmouse_event(rdpInput* input, UINT16 flags, IN INT16 yDelta) { UINT16 sec_flags = 0; - wStream* s = NULL; - rdpRdp* rdp = NULL; + wStream* s = nullptr; + rdpRdp* rdp = nullptr; WINPR_ASSERT(input); WINPR_ASSERT(input->context); @@ -611,9 +611,9 @@ static BOOL input_send_fastpath_qoe_event(rdpInput* input, UINT32 timestampMS) static BOOL input_send_fastpath_focus_in_event(rdpInput* input, UINT16 toggleStates) { UINT16 sec_flags = 0; - wStream* s = NULL; + wStream* s = nullptr; BYTE eventFlags = 0; - rdpRdp* rdp = NULL; + rdpRdp* rdp = nullptr; WINPR_ASSERT(input); WINPR_ASSERT(input->context); @@ -650,10 +650,10 @@ static BOOL input_send_fastpath_keyboard_pause_event(rdpInput* input) * it sending the following sequence: */ UINT16 sec_flags = 0; - wStream* s = NULL; + wStream* s = nullptr; const BYTE keyDownEvent = FASTPATH_INPUT_EVENT_SCANCODE << 5; const BYTE keyUpEvent = (FASTPATH_INPUT_EVENT_SCANCODE << 5) | FASTPATH_INPUT_KBDFLAGS_RELEASE; - rdpRdp* rdp = NULL; + rdpRdp* rdp = nullptr; WINPR_ASSERT(input); WINPR_ASSERT(input->context); @@ -912,7 +912,7 @@ BOOL input_recv(rdpInput* input, wStream* s) BOOL input_register_client_callbacks(rdpInput* input) { - rdpSettings* settings = NULL; + rdpSettings* settings = nullptr; if (!input->context) return FALSE; @@ -959,7 +959,7 @@ static BOOL input_update_last_event(rdpInput* input, BOOL mouse, UINT16 x, UINT1 if (freerdp_settings_get_uint32(input->context->settings, FreeRDP_FakeMouseMotionInterval) > 0) { - const time_t now = time(NULL); + const time_t now = time(nullptr); in->lastInputTimestamp = WINPR_ASSERTING_INT_CAST(UINT64, now); if (mouse) @@ -1122,13 +1122,13 @@ static void input_free_queued_message(void* obj) rdpInput* input_new(rdpRdp* rdp) { - const wObject cb = { NULL, NULL, NULL, input_free_queued_message, NULL }; + const wObject cb = { nullptr, nullptr, nullptr, input_free_queued_message, nullptr }; rdp_input_internal* input = (rdp_input_internal*)calloc(1, sizeof(rdp_input_internal)); WINPR_UNUSED(rdp); if (!input) - return NULL; + return nullptr; input->common.context = rdp->context; input->queue = MessageQueue_New(&cb); @@ -1137,7 +1137,7 @@ rdpInput* input_new(rdpRdp* rdp) if (!input->queue) { free(input); - return NULL; + return nullptr; } return &input->common; @@ -1145,7 +1145,7 @@ rdpInput* input_new(rdpRdp* rdp) void input_free(rdpInput* input) { - if (input != NULL) + if (input != nullptr) { rdp_input_internal* in = input_cast(input); diff --git a/libfreerdp/core/license.c b/libfreerdp/core/license.c index 8ea53f090..09381953c 100644 --- a/libfreerdp/core/license.c +++ b/libfreerdp/core/license.c @@ -227,7 +227,7 @@ static const char* license_get_state_string(LICENSE_STATE state); static const char* license_preferred_key_exchange_alg_string(UINT32 alg, char* buffer, size_t size) { - const char* name = NULL; + const char* name = nullptr; switch (alg) { @@ -369,17 +369,17 @@ static const char* state_transitions[] = { "ST_UNKNOWN", "ST_TOTAL_ABORT", "ST_N static void license_print_product_info(wLog* log, const LICENSE_PRODUCT_INFO* productInfo) { - char* CompanyName = NULL; - char* ProductId = NULL; + char* CompanyName = nullptr; + char* ProductId = nullptr; WINPR_ASSERT(productInfo); WINPR_ASSERT(productInfo->pbCompanyName); WINPR_ASSERT(productInfo->pbProductId); CompanyName = ConvertWCharNToUtf8Alloc((const WCHAR*)productInfo->pbCompanyName, - productInfo->cbCompanyName / sizeof(WCHAR), NULL); + productInfo->cbCompanyName / sizeof(WCHAR), nullptr); ProductId = ConvertWCharNToUtf8Alloc((const WCHAR*)productInfo->pbProductId, - productInfo->cbProductId / sizeof(WCHAR), NULL); + productInfo->cbProductId / sizeof(WCHAR), nullptr); WLog_Print(log, WLOG_INFO, "ProductInfo:"); WLog_Print(log, WLOG_INFO, "\tdwVersion: 0x%08" PRIX32 "", productInfo->dwVersion); WLog_Print(log, WLOG_INFO, "\tCompanyName: %s", CompanyName); @@ -396,7 +396,7 @@ static void license_print_scope_list(wLog* log, const SCOPE_LIST* scopeList) for (UINT32 index = 0; index < scopeList->count; index++) { - const LICENSE_BLOB* scope = NULL; + const LICENSE_BLOB* scope = nullptr; WINPR_ASSERT(scopeList->array); scope = scopeList->array[index]; @@ -472,7 +472,7 @@ static BOOL license_check_stream_capacity(wLog* log, wStream* s, size_t expect, static BOOL computeCalHash(wLog* log, const char* hostname, char* hashStr, size_t len) { - WINPR_DIGEST_CTX* sha1 = NULL; + WINPR_DIGEST_CTX* sha1 = nullptr; BOOL ret = FALSE; BYTE hash[20] = WINPR_C_ARRAY_INIT; @@ -506,12 +506,12 @@ static BOOL saveCal(wLog* log, const rdpSettings* settings, const BYTE* data, si const char* hostname) { char hash[41] = WINPR_C_ARRAY_INIT; - FILE* fp = NULL; - char* licenseStorePath = NULL; + FILE* fp = nullptr; + char* licenseStorePath = nullptr; char filename[MAX_PATH] = WINPR_C_ARRAY_INIT; char filenameNew[MAX_PATH] = WINPR_C_ARRAY_INIT; - char* filepath = NULL; - char* filepathNew = NULL; + char* filepath = nullptr; + char* filepathNew = nullptr; size_t written = 0; BOOL ret = FALSE; @@ -523,7 +523,7 @@ static BOOL saveCal(wLog* log, const rdpSettings* settings, const BYTE* data, si if (!winpr_PathFileExists(path)) { - if (!winpr_PathMakePath(path, 0)) + if (!winpr_PathMakePath(path, nullptr)) { WLog_Print(log, WLOG_ERROR, "error creating directory '%s'", path); goto out; @@ -540,7 +540,7 @@ static BOOL saveCal(wLog* log, const rdpSettings* settings, const BYTE* data, si if (!winpr_PathFileExists(licenseStorePath)) { - if (!winpr_PathMakePath(licenseStorePath, 0)) + if (!winpr_PathMakePath(licenseStorePath, nullptr)) { WLog_Print(log, WLOG_ERROR, "error creating directory '%s'", licenseStorePath); goto out; @@ -599,14 +599,14 @@ out: static BYTE* loadCalFile(wLog* log, const rdpSettings* settings, const char* hostname, size_t* dataLen) { - char* licenseStorePath = NULL; - char* calPath = NULL; + char* licenseStorePath = nullptr; + char* calPath = nullptr; char calFilename[MAX_PATH] = WINPR_C_ARRAY_INIT; char hash[41] = WINPR_C_ARRAY_INIT; INT64 length = 0; size_t status = 0; - FILE* fp = NULL; - BYTE* ret = NULL; + FILE* fp = nullptr; + BYTE* ret = nullptr; WINPR_ASSERT(settings); WINPR_ASSERT(hostname); @@ -615,14 +615,14 @@ static BYTE* loadCalFile(wLog* log, const rdpSettings* settings, const char* hos if (!computeCalHash(log, hostname, hash, sizeof(hash))) { WLog_Print(log, WLOG_ERROR, "loadCalFile: unable to compute hostname hash"); - return NULL; + return nullptr; } (void)sprintf_s(calFilename, sizeof(calFilename) - 1, "%s.cal", hash); if (!(licenseStorePath = GetCombinedPath( freerdp_settings_get_string(settings, FreeRDP_ConfigPath), licenseStore))) - return NULL; + return nullptr; if (!(calPath = GetCombinedPath(licenseStorePath, calFilename))) goto error_path; @@ -662,7 +662,7 @@ error_open: free(calPath); error_path: free(licenseStorePath); - return NULL; + return nullptr; } /** @@ -719,7 +719,7 @@ static BOOL license_write_preamble(wStream* s, BYTE bMsgType, BYTE flags, UINT16 * * @param license license module * - * @return stream or NULL + * @return stream or nullptr */ wStream* license_send_stream_init(rdpLicense* license, UINT16* sec_flags) @@ -748,7 +748,7 @@ wStream* license_send_stream_init(rdpLicense* license, UINT16* sec_flags) wStream* s = rdp_send_stream_init(license->rdp, sec_flags); if (!s) - return NULL; + return nullptr; license->rdp->do_crypt = do_crypt; license->PacketHeaderLength = (UINT16)Stream_GetPosition(s); @@ -758,7 +758,7 @@ wStream* license_send_stream_init(rdpLicense* license, UINT16* sec_flags) fail: Stream_Release(s); - return NULL; + return nullptr; } /** @@ -1020,7 +1020,7 @@ fail: if (state_run_failed(rc)) { if (flags & EXTENDED_ERROR_MSG_SUPPORTED) - license_send_error_alert(license, ERR_INVALID_CLIENT, ST_TOTAL_ABORT, NULL); + license_send_error_alert(license, ERR_INVALID_CLIENT, ST_TOTAL_ABORT, nullptr); license_set_state(license, LICENSE_STATE_ABORTED); } @@ -1113,7 +1113,7 @@ static BOOL license_generate_keys(rdpLicense* license) BOOL license_generate_hwid(rdpLicense* license) { - const BYTE* hashTarget = NULL; + const BYTE* hashTarget = nullptr; size_t targetLen = 0; BYTE macAddress[6] = WINPR_C_ARRAY_INIT; @@ -1152,7 +1152,7 @@ BOOL license_generate_hwid(rdpLicense* license) static BOOL license_get_server_rsa_public_key(rdpLicense* license) { - rdpSettings* settings = NULL; + rdpSettings* settings = nullptr; WINPR_ASSERT(license); WINPR_ASSERT(license->certificate); @@ -1241,7 +1241,7 @@ static BOOL license_rc4_with_licenseKey(const rdpLicense* license, const BYTE* i return FALSE; } - BYTE* buffer = NULL; + BYTE* buffer = nullptr; if (len > 0) buffer = realloc(target->data, len); if (!buffer) @@ -1351,7 +1351,7 @@ BOOL license_read_product_info(wLog* log, wStream* s, LICENSE_PRODUCT_INFO* prod "license product info::CompanyName")) return FALSE; - productInfo->pbProductId = NULL; + productInfo->pbProductId = nullptr; productInfo->pbCompanyName = (BYTE*)malloc(productInfo->cbCompanyName); if (!productInfo->pbCompanyName) goto out_fail; @@ -1382,8 +1382,8 @@ BOOL license_read_product_info(wLog* log, wStream* s, LICENSE_PRODUCT_INFO* prod out_fail: free(productInfo->pbCompanyName); free(productInfo->pbProductId); - productInfo->pbCompanyName = NULL; - productInfo->pbProductId = NULL; + productInfo->pbCompanyName = nullptr; + productInfo->pbProductId = nullptr; return FALSE; } @@ -1445,7 +1445,7 @@ LICENSE_PRODUCT_INFO* license_new_product_info(void) LICENSE_PRODUCT_INFO* productInfo = (LICENSE_PRODUCT_INFO*)calloc(1, sizeof(LICENSE_PRODUCT_INFO)); if (!productInfo) - return NULL; + return nullptr; return productInfo; } @@ -1474,7 +1474,7 @@ BOOL license_read_binary_blob_data(wLog* log, LICENSE_BLOB* blob, UINT16 wBlobTy blob->length = (UINT16)length; free(blob->data); - blob->data = NULL; + blob->data = nullptr; if ((blob->type != wBlobType) && (blob->type != BB_ANY_BLOB)) { @@ -1494,7 +1494,7 @@ BOOL license_read_binary_blob_data(wLog* log, LICENSE_BLOB* blob, UINT16 wBlobTy } blob->type = wBlobType; - blob->data = NULL; + blob->data = nullptr; if (blob->length > 0) blob->data = malloc(blob->length); if (!blob->data) @@ -1703,7 +1703,7 @@ BOOL license_scope_list_resize(SCOPE_LIST* scopeList, UINT32 count) for (UINT32 x = count; x < scopeList->count; x++) { license_free_binary_blob(scopeList->array[x]); - scopeList->array[x] = NULL; + scopeList->array[x] = nullptr; } if (count > 0) @@ -1717,7 +1717,7 @@ BOOL license_scope_list_resize(SCOPE_LIST* scopeList, UINT32 count) else { free((void*)scopeList->array); - scopeList->array = NULL; + scopeList->array = nullptr; } for (UINT32 x = scopeList->count; x < count; x++) @@ -2146,10 +2146,10 @@ BOOL license_read_new_or_upgrade_license_packet(rdpLicense* license, wStream* s) UINT32 cbProductId = 0; UINT32 cbLicenseInfo = 0; wStream sbuffer = WINPR_C_ARRAY_INIT; - wStream* licenseStream = NULL; + wStream* licenseStream = nullptr; BOOL ret = FALSE; BYTE computedMac[16] = WINPR_C_ARRAY_INIT; - const BYTE* readMac = NULL; + const BYTE* readMac = nullptr; WINPR_ASSERT(license); @@ -2434,11 +2434,11 @@ BOOL license_read_new_license_request_packet(rdpLicense* license, wStream* s) BOOL license_answer_license_request(rdpLicense* license) { UINT16 sec_flags = 0; - wStream* s = NULL; - BYTE* license_data = NULL; + wStream* s = nullptr; + BYTE* license_data = nullptr; size_t license_size = 0; BOOL status = 0; - char* username = NULL; + char* username = nullptr; WINPR_ASSERT(license); WINPR_ASSERT(license->rdp); @@ -2450,7 +2450,7 @@ BOOL license_answer_license_request(rdpLicense* license) if (license_data) { - LICENSE_BLOB* calBlob = NULL; + LICENSE_BLOB* calBlob = nullptr; BYTE signature[LICENSING_ENCRYPTION_KEY_LENGTH] = WINPR_C_ARRAY_INIT; DEBUG_LICENSE("Sending Saved License Packet"); @@ -2485,7 +2485,7 @@ BOOL license_answer_license_request(rdpLicense* license) s = license_send_stream_init(license, &sec_flags); if (!s) return FALSE; - if (license->rdp->settings->Username != NULL) + if (license->rdp->settings->Username != nullptr) username = license->rdp->settings->Username; else username = "username"; @@ -2510,11 +2510,11 @@ BOOL license_answer_license_request(rdpLicense* license) status = license_write_new_license_request_packet(license, s); WINPR_ASSERT(license->ClientUserName); - license->ClientUserName->data = NULL; + license->ClientUserName->data = nullptr; license->ClientUserName->length = 0; WINPR_ASSERT(license->ClientMachineName); - license->ClientMachineName->data = NULL; + license->ClientMachineName->data = nullptr; license->ClientMachineName->length = 0; if (!status) @@ -2534,8 +2534,8 @@ BOOL license_answer_license_request(rdpLicense* license) BOOL license_send_platform_challenge_response(rdpLicense* license) { - wStream* challengeRespData = NULL; - BYTE* buffer = NULL; + wStream* challengeRespData = nullptr; + BYTE* buffer = nullptr; BOOL status = 0; WINPR_ASSERT(license); @@ -2549,7 +2549,7 @@ BOOL license_send_platform_challenge_response(rdpLicense* license) license->EncryptedPlatformChallenge->type = BB_DATA_BLOB; /* prepare the PLATFORM_CHALLENGE_RESPONSE_DATA */ - challengeRespData = Stream_New(NULL, 8 + license->PlatformChallenge->length); + challengeRespData = Stream_New(nullptr, 8 + license->PlatformChallenge->length); if (!challengeRespData) return FALSE; Stream_Write_UINT16(challengeRespData, PLATFORM_CHALLENGE_RESPONSE_VERSION); /* wVersion */ @@ -2637,7 +2637,7 @@ BOOL license_read_platform_challenge_response(WINPR_ATTR_UNUSED rdpLicense* lice wStream sbuffer = WINPR_C_ARRAY_INIT; UINT16 wVersion = 0; UINT16 cbChallenge = 0; - const BYTE* pbChallenge = NULL; + const BYTE* pbChallenge = nullptr; LICENSE_BLOB* blob = license->EncryptedPlatformChallengeResponse; if (!license_rc4_with_licenseKey(license, blob->data, blob->length, dblob)) @@ -2743,7 +2743,7 @@ rdpLicense* license_new(rdpRdp* rdp) rdpLicense* license = (rdpLicense*)calloc(1, sizeof(rdpLicense)); if (!license) - return NULL; + return nullptr; license->log = WLog_Get(LICENSE_TAG); WINPR_ASSERT(license->log); @@ -2797,7 +2797,7 @@ out_error: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC license_free(license); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } /** @@ -2921,7 +2921,7 @@ static BOOL license_set_string(wLog* log, const char* what, const char* value, B BOOL license_server_configure(rdpLicense* license) { - wStream* s = NULL; + wStream* s = nullptr; UINT32 algs[] = { KEY_EXCHANGE_ALG_RSA }; WINPR_ASSERT(license); @@ -2968,7 +2968,7 @@ BOOL license_server_configure(rdpLicense* license) settings->ServerCertificateLength)) return FALSE; - s = Stream_New(NULL, 1024); + s = Stream_New(nullptr, 1024); if (!s) return FALSE; else diff --git a/libfreerdp/core/listener.c b/libfreerdp/core/listener.c index 1bc6ccdaf..857138f85 100644 --- a/libfreerdp/core/listener.c +++ b/libfreerdp/core/listener.c @@ -80,7 +80,7 @@ static BOOL freerdp_listener_open_from_vsock(WINPR_ATTR_UNUSED freerdp_listener* addr.svm_port = port; errno = 0; - char* ptr = NULL; + char* ptr = nullptr; unsigned long val = strtoul(bind_address, &ptr, 10); if (errno || (val > UINT32_MAX)) { @@ -140,9 +140,9 @@ static BOOL freerdp_listener_open(freerdp_listener* instance, const char* bind_a int status = 0; int sockfd = 0; char addr[64]; - void* sin_addr = NULL; + void* sin_addr = nullptr; int option_value = 0; - struct addrinfo* res = NULL; + struct addrinfo* res = nullptr; rdpListener* listener = (rdpListener*)instance->listener; #ifdef _WIN32 u_long arg; @@ -250,7 +250,7 @@ static BOOL freerdp_listener_open_local(freerdp_listener* instance, const char* int sockfd = 0; struct sockaddr_un addr = WINPR_C_ARRAY_INIT; rdpListener* listener = (rdpListener*)instance->listener; - HANDLE hevent = NULL; + HANDLE hevent = nullptr; if (listener->num_sockfds == MAX_LISTENER_HANDLES) { @@ -295,7 +295,7 @@ static BOOL freerdp_listener_open_local(freerdp_listener* instance, const char* return FALSE; } - hevent = CreateFileDescriptorEvent(NULL, FALSE, FALSE, sockfd, WINPR_FD_READ); + hevent = CreateFileDescriptorEvent(nullptr, FALSE, FALSE, sockfd, WINPR_FD_READ); if (!hevent) { @@ -398,7 +398,7 @@ static DWORD freerdp_listener_get_event_handles(freerdp_listener* instance, HAND BOOL freerdp_peer_set_local_and_hostname(freerdp_peer* client, const struct sockaddr_storage* peer_addr) { - const void* sin_addr = NULL; + const void* sin_addr = nullptr; const BYTE localhost6_bytes[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }; WINPR_ASSERT(client); @@ -520,12 +520,12 @@ static BOOL freerdp_listener_check_fds(freerdp_listener* instance) freerdp_listener* freerdp_listener_new(void) { - freerdp_listener* instance = NULL; - rdpListener* listener = NULL; + freerdp_listener* instance = nullptr; + rdpListener* listener = nullptr; instance = (freerdp_listener*)calloc(1, sizeof(freerdp_listener)); if (!instance) - return NULL; + return nullptr; instance->Open = freerdp_listener_open; instance->OpenLocal = freerdp_listener_open_local; @@ -541,7 +541,7 @@ freerdp_listener* freerdp_listener_new(void) if (!listener) { free(instance); - return NULL; + return nullptr; } listener->instance = instance; diff --git a/libfreerdp/core/mcs.c b/libfreerdp/core/mcs.c index 34c0e4752..742d85991 100644 --- a/libfreerdp/core/mcs.c +++ b/libfreerdp/core/mcs.c @@ -137,10 +137,10 @@ * * DataPriority ::= CHOICE * { - * top NULL, - * high NULL, - * medium NULL, - * low NULL, + * top nullptr, + * high nullptr, + * medium nullptr, + * low nullptr, * ... * } * @@ -455,7 +455,7 @@ static BOOL mcs_write_domain_parameters(wLog* log, wStream* s, DomainParameters* if (!s || !domainParameters) return FALSE; - wStream* tmps = Stream_New(NULL, Stream_Capacity(s)); + wStream* tmps = Stream_New(nullptr, Stream_Capacity(s)); if (!tmps) { @@ -735,13 +735,13 @@ BOOL mcs_recv_connect_initial(rdpMcs* mcs, wStream* s) BOOL mcs_write_connect_initial(wStream* s, rdpMcs* mcs, wStream* userData) { size_t length = 0; - wStream* tmps = NULL; + wStream* tmps = nullptr; BOOL ret = FALSE; if (!s || !mcs || !userData) return FALSE; - tmps = Stream_New(NULL, Stream_Capacity(s)); + tmps = Stream_New(nullptr, Stream_Capacity(s)); if (!tmps) { @@ -796,13 +796,13 @@ out: BOOL mcs_write_connect_response(wStream* s, rdpMcs* mcs, wStream* userData) { size_t length = 0; - wStream* tmps = NULL; + wStream* tmps = nullptr; BOOL ret = FALSE; if (!s || !mcs || !userData) return FALSE; - tmps = Stream_New(NULL, Stream_Capacity(s)); + tmps = Stream_New(nullptr, Stream_Capacity(s)); if (!tmps) { @@ -839,16 +839,16 @@ static BOOL mcs_send_connect_initial(rdpMcs* mcs) { int status = -1; size_t length = 0; - wStream* s = NULL; + wStream* s = nullptr; size_t bm = 0; size_t em = 0; - wStream* gcc_CCrq = NULL; + wStream* gcc_CCrq = nullptr; if (!mcs || !mcs->context) return FALSE; mcs_initialize_client_channels(mcs, mcs->context->settings); - wStream* client_data = Stream_New(NULL, 512); + wStream* client_data = Stream_New(nullptr, 512); if (!client_data) { @@ -858,7 +858,7 @@ static BOOL mcs_send_connect_initial(rdpMcs* mcs) if (!gcc_write_client_data_blocks(client_data, mcs)) goto out; - gcc_CCrq = Stream_New(NULL, 1024); + gcc_CCrq = Stream_New(nullptr, 1024); if (!gcc_CCrq) { @@ -869,7 +869,7 @@ static BOOL mcs_send_connect_initial(rdpMcs* mcs) if (!gcc_write_conference_create_request(gcc_CCrq, client_data)) goto out; length = Stream_GetPosition(gcc_CCrq) + 7; - s = Stream_New(NULL, 1024 + length); + s = Stream_New(nullptr, 1024 + length); if (!s) { @@ -961,15 +961,15 @@ BOOL mcs_send_connect_response(rdpMcs* mcs) { size_t length = 0; int status = -1; - wStream* s = NULL; + wStream* s = nullptr; size_t bm = 0; size_t em = 0; - wStream* gcc_CCrsp = NULL; + wStream* gcc_CCrsp = nullptr; if (!mcs) return FALSE; - wStream* server_data = Stream_New(NULL, 512); + wStream* server_data = Stream_New(nullptr, 512); if (!server_data) { @@ -980,7 +980,7 @@ BOOL mcs_send_connect_response(rdpMcs* mcs) if (!gcc_write_server_data_blocks(server_data, mcs)) goto out; - gcc_CCrsp = Stream_New(NULL, 512 + Stream_Capacity(server_data)); + gcc_CCrsp = Stream_New(nullptr, 512 + Stream_Capacity(server_data)); if (!gcc_CCrsp) { @@ -991,7 +991,7 @@ BOOL mcs_send_connect_response(rdpMcs* mcs) if (!gcc_write_conference_create_response(gcc_CCrsp, server_data)) goto out; length = Stream_GetPosition(gcc_CCrsp) + 7; - s = Stream_New(NULL, length + 1024); + s = Stream_New(nullptr, length + 1024); if (!s) { @@ -1045,7 +1045,8 @@ BOOL mcs_recv_erect_domain_request(rdpMcs* mcs, wStream* s) WINPR_ASSERT(mcs); WINPR_ASSERT(s); - if (!mcs_read_domain_mcspdu_header(mcs->log, s, DomainMCSPDU_ErectDomainRequest, &length, NULL)) + if (!mcs_read_domain_mcspdu_header(mcs->log, s, DomainMCSPDU_ErectDomainRequest, &length, + nullptr)) return FALSE; if (!per_read_integer(s, &subHeight)) /* subHeight (INTEGER) */ @@ -1071,7 +1072,7 @@ BOOL mcs_send_erect_domain_request(rdpMcs* mcs) if (!mcs) return FALSE; - wStream* s = Stream_New(NULL, length); + wStream* s = Stream_New(nullptr, length); if (!s) { @@ -1108,7 +1109,8 @@ BOOL mcs_recv_attach_user_request(rdpMcs* mcs, wStream* s) if (!mcs || !s) return FALSE; - if (!mcs_read_domain_mcspdu_header(mcs->log, s, DomainMCSPDU_AttachUserRequest, &length, NULL)) + if (!mcs_read_domain_mcspdu_header(mcs->log, s, DomainMCSPDU_AttachUserRequest, &length, + nullptr)) return FALSE; return tpkt_ensure_stream_consumed(mcs->log, s, length); } @@ -1127,7 +1129,7 @@ BOOL mcs_send_attach_user_request(rdpMcs* mcs) if (!mcs) return FALSE; - wStream* s = Stream_New(NULL, length); + wStream* s = Stream_New(nullptr, length); if (!s) { @@ -1162,7 +1164,8 @@ BOOL mcs_recv_attach_user_confirm(rdpMcs* mcs, wStream* s) if (!mcs || !s) return FALSE; - if (!mcs_read_domain_mcspdu_header(mcs->log, s, DomainMCSPDU_AttachUserConfirm, &length, NULL)) + if (!mcs_read_domain_mcspdu_header(mcs->log, s, DomainMCSPDU_AttachUserConfirm, &length, + nullptr)) return FALSE; if (!per_read_enumerated(s, &result, MCS_Result_enum_length)) /* result */ return FALSE; @@ -1185,7 +1188,7 @@ BOOL mcs_send_attach_user_confirm(rdpMcs* mcs) if (!mcs) return FALSE; - wStream* s = Stream_New(NULL, length); + wStream* s = Stream_New(nullptr, length); if (!s) { @@ -1225,7 +1228,8 @@ BOOL mcs_recv_channel_join_request(rdpMcs* mcs, const rdpSettings* settings, wSt if (!mcs || !s || !channelId) return FALSE; - if (!mcs_read_domain_mcspdu_header(mcs->log, s, DomainMCSPDU_ChannelJoinRequest, &length, NULL)) + if (!mcs_read_domain_mcspdu_header(mcs->log, s, DomainMCSPDU_ChannelJoinRequest, &length, + nullptr)) return FALSE; if (!per_read_integer16(s, &userId, MCS_BASE_CHANNEL_ID)) @@ -1260,7 +1264,7 @@ BOOL mcs_send_channel_join_request(rdpMcs* mcs, UINT16 channelId) WINPR_ASSERT(mcs); - wStream* s = Stream_New(NULL, length); + wStream* s = Stream_New(nullptr, length); if (!s) { @@ -1300,7 +1304,8 @@ BOOL mcs_recv_channel_join_confirm(rdpMcs* mcs, wStream* s, UINT16* channelId) WINPR_ASSERT(mcs); WINPR_ASSERT(channelId); - if (!mcs_read_domain_mcspdu_header(mcs->log, s, DomainMCSPDU_ChannelJoinConfirm, &length, NULL)) + if (!mcs_read_domain_mcspdu_header(mcs->log, s, DomainMCSPDU_ChannelJoinConfirm, &length, + nullptr)) return FALSE; if (!per_read_enumerated(s, &result, MCS_Result_enum_length)) /* result */ @@ -1328,7 +1333,7 @@ BOOL mcs_send_channel_join_confirm(rdpMcs* mcs, UINT16 channelId) if (!mcs) return FALSE; - wStream* s = Stream_New(NULL, length); + wStream* s = Stream_New(nullptr, length); if (!s) { @@ -1421,7 +1426,7 @@ BOOL mcs_send_disconnect_provider_ultimatum(rdpMcs* mcs, enum Disconnect_Ultimat WINPR_ASSERT(mcs); - wStream* s = Stream_New(NULL, length); + wStream* s = Stream_New(nullptr, length); if (!s) goto fail; @@ -1472,7 +1477,7 @@ rdpMcs* mcs_new(rdpContext* context) rdpMcs* mcs = (rdpMcs*)calloc(1, sizeof(rdpMcs)); if (!mcs) - return NULL; + return nullptr; mcs->log = WLog_Get(MCS_TAG); WINPR_ASSERT(mcs->log); @@ -1492,7 +1497,7 @@ rdpMcs* mcs_new(rdpContext* context) return mcs; out_free: free(mcs); - return NULL; + return nullptr; } /** diff --git a/libfreerdp/core/message.c b/libfreerdp/core/message.c index 7605b7e29..172bfcd64 100644 --- a/libfreerdp/core/message.c +++ b/libfreerdp/core/message.c @@ -47,32 +47,32 @@ static BOOL update_message_BeginPaint(rdpContext* context) { - rdp_update_internal* up = NULL; + rdp_update_internal* up = nullptr; if (!context || !context->update) return FALSE; up = update_cast(context->update); - return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(Update, BeginPaint), NULL, - NULL); + return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(Update, BeginPaint), nullptr, + nullptr); } static BOOL update_message_EndPaint(rdpContext* context) { - rdp_update_internal* up = NULL; + rdp_update_internal* up = nullptr; if (!context || !context->update) return FALSE; up = update_cast(context->update); - return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(Update, EndPaint), NULL, - NULL); + return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(Update, EndPaint), nullptr, + nullptr); } static BOOL update_message_SetBounds(rdpContext* context, const rdpBounds* bounds) { - rdpBounds* wParam = NULL; - rdp_update_internal* up = NULL; + rdpBounds* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update) return FALSE; @@ -89,37 +89,37 @@ static BOOL update_message_SetBounds(rdpContext* context, const rdpBounds* bound up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(Update, SetBounds), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_Synchronize(rdpContext* context) { - rdp_update_internal* up = NULL; + rdp_update_internal* up = nullptr; if (!context || !context->update) return FALSE; up = update_cast(context->update); - return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(Update, Synchronize), NULL, - NULL); + return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(Update, Synchronize), nullptr, + nullptr); } static BOOL update_message_DesktopResize(rdpContext* context) { - rdp_update_internal* up = NULL; + rdp_update_internal* up = nullptr; if (!context || !context->update) return FALSE; up = update_cast(context->update); - return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(Update, DesktopResize), NULL, - NULL); + return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(Update, DesktopResize), + nullptr, nullptr); } static BOOL update_message_BitmapUpdate(rdpContext* context, const BITMAP_UPDATE* bitmap) { - BITMAP_UPDATE* wParam = NULL; - rdp_update_internal* up = NULL; + BITMAP_UPDATE* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !bitmap) return FALSE; @@ -131,13 +131,13 @@ static BOOL update_message_BitmapUpdate(rdpContext* context, const BITMAP_UPDATE up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(Update, BitmapUpdate), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_Palette(rdpContext* context, const PALETTE_UPDATE* palette) { - PALETTE_UPDATE* wParam = NULL; - rdp_update_internal* up = NULL; + PALETTE_UPDATE* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !palette) return FALSE; @@ -149,13 +149,13 @@ static BOOL update_message_Palette(rdpContext* context, const PALETTE_UPDATE* pa up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(Update, Palette), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_PlaySound(rdpContext* context, const PLAY_SOUND_UPDATE* playSound) { - PLAY_SOUND_UPDATE* wParam = NULL; - rdp_update_internal* up = NULL; + PLAY_SOUND_UPDATE* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !playSound) return FALSE; @@ -169,12 +169,12 @@ static BOOL update_message_PlaySound(rdpContext* context, const PLAY_SOUND_UPDAT up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(Update, PlaySound), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_SetKeyboardIndicators(rdpContext* context, UINT16 led_flags) { - rdp_update_internal* up = NULL; + rdp_update_internal* up = nullptr; if (!context || !context->update) return FALSE; @@ -182,13 +182,13 @@ static BOOL update_message_SetKeyboardIndicators(rdpContext* context, UINT16 led up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(Update, SetKeyboardIndicators), (void*)(size_t)led_flags, - NULL); + nullptr); } static BOOL update_message_SetKeyboardImeStatus(rdpContext* context, UINT16 imeId, UINT32 imeState, UINT32 imeConvMode) { - rdp_update_internal* up = NULL; + rdp_update_internal* up = nullptr; if (!context || !context->update) return FALSE; @@ -201,8 +201,8 @@ static BOOL update_message_SetKeyboardImeStatus(rdpContext* context, UINT16 imeI static BOOL update_message_RefreshRect(rdpContext* context, BYTE count, const RECTANGLE_16* areas) { - RECTANGLE_16* lParam = NULL; - rdp_update_internal* up = NULL; + RECTANGLE_16* lParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !areas) return FALSE; @@ -221,8 +221,8 @@ static BOOL update_message_RefreshRect(rdpContext* context, BYTE count, const RE static BOOL update_message_SuppressOutput(rdpContext* context, BYTE allow, const RECTANGLE_16* area) { - RECTANGLE_16* lParam = NULL; - rdp_update_internal* up = NULL; + RECTANGLE_16* lParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update) return FALSE; @@ -244,13 +244,13 @@ static BOOL update_message_SuppressOutput(rdpContext* context, BYTE allow, const static BOOL update_message_SurfaceCommand(rdpContext* context, wStream* s) { - wStream* wParam = NULL; - rdp_update_internal* up = NULL; + wStream* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !s) return FALSE; - wParam = Stream_New(NULL, Stream_GetRemainingLength(s)); + wParam = Stream_New(nullptr, Stream_GetRemainingLength(s)); if (!wParam) return FALSE; @@ -260,14 +260,14 @@ static BOOL update_message_SurfaceCommand(rdpContext* context, wStream* s) up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(Update, SurfaceCommand), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_SurfaceBits(rdpContext* context, const SURFACE_BITS_COMMAND* surfaceBitsCommand) { - SURFACE_BITS_COMMAND* wParam = NULL; - rdp_update_internal* up = NULL; + SURFACE_BITS_COMMAND* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !surfaceBitsCommand) return FALSE; @@ -279,14 +279,14 @@ static BOOL update_message_SurfaceBits(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(Update, SurfaceBits), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_SurfaceFrameMarker(rdpContext* context, const SURFACE_FRAME_MARKER* surfaceFrameMarker) { - SURFACE_FRAME_MARKER* wParam = NULL; - rdp_update_internal* up = NULL; + SURFACE_FRAME_MARKER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !surfaceFrameMarker) return FALSE; @@ -300,12 +300,12 @@ static BOOL update_message_SurfaceFrameMarker(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(Update, SurfaceFrameMarker), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_SurfaceFrameAcknowledge(rdpContext* context, UINT32 frameId) { - rdp_update_internal* up = NULL; + rdp_update_internal* up = nullptr; if (!context || !context->update) return FALSE; @@ -313,15 +313,15 @@ static BOOL update_message_SurfaceFrameAcknowledge(rdpContext* context, UINT32 f up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(Update, SurfaceFrameAcknowledge), (void*)(size_t)frameId, - NULL); + nullptr); } /* Primary Update */ static BOOL update_message_DstBlt(rdpContext* context, const DSTBLT_ORDER* dstBlt) { - DSTBLT_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + DSTBLT_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !dstBlt) return FALSE; @@ -335,13 +335,13 @@ static BOOL update_message_DstBlt(rdpContext* context, const DSTBLT_ORDER* dstBl up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, DstBlt), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_PatBlt(rdpContext* context, PATBLT_ORDER* patBlt) { - PATBLT_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + PATBLT_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !patBlt) return FALSE; @@ -356,13 +356,13 @@ static BOOL update_message_PatBlt(rdpContext* context, PATBLT_ORDER* patBlt) up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, PatBlt), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_ScrBlt(rdpContext* context, const SCRBLT_ORDER* scrBlt) { - SCRBLT_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + SCRBLT_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !scrBlt) return FALSE; @@ -376,13 +376,13 @@ static BOOL update_message_ScrBlt(rdpContext* context, const SCRBLT_ORDER* scrBl up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, ScrBlt), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_OpaqueRect(rdpContext* context, const OPAQUE_RECT_ORDER* opaqueRect) { - OPAQUE_RECT_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + OPAQUE_RECT_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !opaqueRect) return FALSE; @@ -396,14 +396,14 @@ static BOOL update_message_OpaqueRect(rdpContext* context, const OPAQUE_RECT_ORD up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, OpaqueRect), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_DrawNineGrid(rdpContext* context, const DRAW_NINE_GRID_ORDER* drawNineGrid) { - DRAW_NINE_GRID_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + DRAW_NINE_GRID_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !drawNineGrid) return FALSE; @@ -417,13 +417,13 @@ static BOOL update_message_DrawNineGrid(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, DrawNineGrid), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_MultiDstBlt(rdpContext* context, const MULTI_DSTBLT_ORDER* multiDstBlt) { - MULTI_DSTBLT_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + MULTI_DSTBLT_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !multiDstBlt) return FALSE; @@ -437,13 +437,13 @@ static BOOL update_message_MultiDstBlt(rdpContext* context, const MULTI_DSTBLT_O up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, MultiDstBlt), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_MultiPatBlt(rdpContext* context, const MULTI_PATBLT_ORDER* multiPatBlt) { - MULTI_PATBLT_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + MULTI_PATBLT_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !multiPatBlt) return FALSE; @@ -458,13 +458,13 @@ static BOOL update_message_MultiPatBlt(rdpContext* context, const MULTI_PATBLT_O up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, MultiPatBlt), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_MultiScrBlt(rdpContext* context, const MULTI_SCRBLT_ORDER* multiScrBlt) { - MULTI_SCRBLT_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + MULTI_SCRBLT_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !multiScrBlt) return FALSE; @@ -478,14 +478,14 @@ static BOOL update_message_MultiScrBlt(rdpContext* context, const MULTI_SCRBLT_O up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, MultiScrBlt), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_MultiOpaqueRect(rdpContext* context, const MULTI_OPAQUE_RECT_ORDER* multiOpaqueRect) { - MULTI_OPAQUE_RECT_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + MULTI_OPAQUE_RECT_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !multiOpaqueRect) return FALSE; @@ -499,14 +499,14 @@ static BOOL update_message_MultiOpaqueRect(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, - MakeMessageId(PrimaryUpdate, MultiOpaqueRect), (void*)wParam, NULL); + MakeMessageId(PrimaryUpdate, MultiOpaqueRect), (void*)wParam, nullptr); } static BOOL update_message_MultiDrawNineGrid(rdpContext* context, const MULTI_DRAW_NINE_GRID_ORDER* multiDrawNineGrid) { - MULTI_DRAW_NINE_GRID_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + MULTI_DRAW_NINE_GRID_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !multiDrawNineGrid) return FALSE; @@ -521,13 +521,14 @@ static BOOL update_message_MultiDrawNineGrid(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, - MakeMessageId(PrimaryUpdate, MultiDrawNineGrid), (void*)wParam, NULL); + MakeMessageId(PrimaryUpdate, MultiDrawNineGrid), (void*)wParam, + nullptr); } static BOOL update_message_LineTo(rdpContext* context, const LINE_TO_ORDER* lineTo) { - LINE_TO_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + LINE_TO_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !lineTo) return FALSE; @@ -541,13 +542,13 @@ static BOOL update_message_LineTo(rdpContext* context, const LINE_TO_ORDER* line up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, LineTo), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_Polyline(rdpContext* context, const POLYLINE_ORDER* polyline) { - POLYLINE_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + POLYLINE_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !polyline) return FALSE; @@ -570,13 +571,13 @@ static BOOL update_message_Polyline(rdpContext* context, const POLYLINE_ORDER* p up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, Polyline), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_MemBlt(rdpContext* context, MEMBLT_ORDER* memBlt) { - MEMBLT_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + MEMBLT_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !memBlt) return FALSE; @@ -590,13 +591,13 @@ static BOOL update_message_MemBlt(rdpContext* context, MEMBLT_ORDER* memBlt) up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, MemBlt), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_Mem3Blt(rdpContext* context, MEM3BLT_ORDER* mem3Blt) { - MEM3BLT_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + MEM3BLT_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !mem3Blt) return FALSE; @@ -611,13 +612,13 @@ static BOOL update_message_Mem3Blt(rdpContext* context, MEM3BLT_ORDER* mem3Blt) up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, Mem3Blt), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_SaveBitmap(rdpContext* context, const SAVE_BITMAP_ORDER* saveBitmap) { - SAVE_BITMAP_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + SAVE_BITMAP_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !saveBitmap) return FALSE; @@ -631,13 +632,13 @@ static BOOL update_message_SaveBitmap(rdpContext* context, const SAVE_BITMAP_ORD up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, SaveBitmap), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_GlyphIndex(rdpContext* context, GLYPH_INDEX_ORDER* glyphIndex) { - GLYPH_INDEX_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + GLYPH_INDEX_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !glyphIndex) return FALSE; @@ -652,13 +653,13 @@ static BOOL update_message_GlyphIndex(rdpContext* context, GLYPH_INDEX_ORDER* gl up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, GlyphIndex), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_FastIndex(rdpContext* context, const FAST_INDEX_ORDER* fastIndex) { - FAST_INDEX_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + FAST_INDEX_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !fastIndex) return FALSE; @@ -672,13 +673,13 @@ static BOOL update_message_FastIndex(rdpContext* context, const FAST_INDEX_ORDER up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, FastIndex), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_FastGlyph(rdpContext* context, const FAST_GLYPH_ORDER* fastGlyph) { - FAST_GLYPH_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + FAST_GLYPH_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !fastGlyph) return FALSE; @@ -704,18 +705,18 @@ static BOOL update_message_FastGlyph(rdpContext* context, const FAST_GLYPH_ORDER } else { - wParam->glyphData.aj = NULL; + wParam->glyphData.aj = nullptr; } up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, FastGlyph), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_PolygonSC(rdpContext* context, const POLYGON_SC_ORDER* polygonSC) { - POLYGON_SC_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + POLYGON_SC_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !polygonSC) return FALSE; @@ -738,13 +739,13 @@ static BOOL update_message_PolygonSC(rdpContext* context, const POLYGON_SC_ORDER up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, PolygonSC), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_PolygonCB(rdpContext* context, POLYGON_CB_ORDER* polygonCB) { - POLYGON_CB_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + POLYGON_CB_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !polygonCB) return FALSE; @@ -768,13 +769,13 @@ static BOOL update_message_PolygonCB(rdpContext* context, POLYGON_CB_ORDER* poly up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, PolygonCB), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_EllipseSC(rdpContext* context, const ELLIPSE_SC_ORDER* ellipseSC) { - ELLIPSE_SC_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + ELLIPSE_SC_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !ellipseSC) return FALSE; @@ -788,13 +789,13 @@ static BOOL update_message_EllipseSC(rdpContext* context, const ELLIPSE_SC_ORDER up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, EllipseSC), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_EllipseCB(rdpContext* context, const ELLIPSE_CB_ORDER* ellipseCB) { - ELLIPSE_CB_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + ELLIPSE_CB_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !ellipseCB) return FALSE; @@ -809,7 +810,7 @@ static BOOL update_message_EllipseCB(rdpContext* context, const ELLIPSE_CB_ORDER up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PrimaryUpdate, EllipseCB), - (void*)wParam, NULL); + (void*)wParam, nullptr); } /* Secondary Update */ @@ -817,8 +818,8 @@ static BOOL update_message_EllipseCB(rdpContext* context, const ELLIPSE_CB_ORDER static BOOL update_message_CacheBitmap(rdpContext* context, const CACHE_BITMAP_ORDER* cacheBitmapOrder) { - CACHE_BITMAP_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + CACHE_BITMAP_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !cacheBitmapOrder) return FALSE; @@ -830,14 +831,14 @@ static BOOL update_message_CacheBitmap(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(SecondaryUpdate, CacheBitmap), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_CacheBitmapV2(rdpContext* context, CACHE_BITMAP_V2_ORDER* cacheBitmapV2Order) { - CACHE_BITMAP_V2_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + CACHE_BITMAP_V2_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !cacheBitmapV2Order) return FALSE; @@ -849,14 +850,14 @@ static BOOL update_message_CacheBitmapV2(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, - MakeMessageId(SecondaryUpdate, CacheBitmapV2), (void*)wParam, NULL); + MakeMessageId(SecondaryUpdate, CacheBitmapV2), (void*)wParam, nullptr); } static BOOL update_message_CacheBitmapV3(rdpContext* context, CACHE_BITMAP_V3_ORDER* cacheBitmapV3Order) { - CACHE_BITMAP_V3_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + CACHE_BITMAP_V3_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !cacheBitmapV3Order) return FALSE; @@ -868,14 +869,14 @@ static BOOL update_message_CacheBitmapV3(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, - MakeMessageId(SecondaryUpdate, CacheBitmapV3), (void*)wParam, NULL); + MakeMessageId(SecondaryUpdate, CacheBitmapV3), (void*)wParam, nullptr); } static BOOL update_message_CacheColorTable(rdpContext* context, const CACHE_COLOR_TABLE_ORDER* cacheColorTableOrder) { - CACHE_COLOR_TABLE_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + CACHE_COLOR_TABLE_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !cacheColorTableOrder) return FALSE; @@ -887,13 +888,14 @@ static BOOL update_message_CacheColorTable(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, - MakeMessageId(SecondaryUpdate, CacheColorTable), (void*)wParam, NULL); + MakeMessageId(SecondaryUpdate, CacheColorTable), (void*)wParam, + nullptr); } static BOOL update_message_CacheGlyph(rdpContext* context, const CACHE_GLYPH_ORDER* cacheGlyphOrder) { - CACHE_GLYPH_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + CACHE_GLYPH_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !cacheGlyphOrder) return FALSE; @@ -905,14 +907,14 @@ static BOOL update_message_CacheGlyph(rdpContext* context, const CACHE_GLYPH_ORD up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(SecondaryUpdate, CacheGlyph), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_CacheGlyphV2(rdpContext* context, const CACHE_GLYPH_V2_ORDER* cacheGlyphV2Order) { - CACHE_GLYPH_V2_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + CACHE_GLYPH_V2_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !cacheGlyphV2Order) return FALSE; @@ -924,13 +926,13 @@ static BOOL update_message_CacheGlyphV2(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, - MakeMessageId(SecondaryUpdate, CacheGlyphV2), (void*)wParam, NULL); + MakeMessageId(SecondaryUpdate, CacheGlyphV2), (void*)wParam, nullptr); } static BOOL update_message_CacheBrush(rdpContext* context, const CACHE_BRUSH_ORDER* cacheBrushOrder) { - CACHE_BRUSH_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + CACHE_BRUSH_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !cacheBrushOrder) return FALSE; @@ -942,7 +944,7 @@ static BOOL update_message_CacheBrush(rdpContext* context, const CACHE_BRUSH_ORD up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(SecondaryUpdate, CacheBrush), - (void*)wParam, NULL); + (void*)wParam, nullptr); } /* Alternate Secondary Update */ @@ -951,8 +953,8 @@ static BOOL update_message_CreateOffscreenBitmap(rdpContext* context, const CREATE_OFFSCREEN_BITMAP_ORDER* createOffscreenBitmap) { - CREATE_OFFSCREEN_BITMAP_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + CREATE_OFFSCREEN_BITMAP_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !createOffscreenBitmap) return FALSE; @@ -979,14 +981,14 @@ update_message_CreateOffscreenBitmap(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(AltSecUpdate, CreateOffscreenBitmap), (void*)wParam, - NULL); + nullptr); } static BOOL update_message_SwitchSurface(rdpContext* context, const SWITCH_SURFACE_ORDER* switchSurface) { - SWITCH_SURFACE_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + SWITCH_SURFACE_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !switchSurface) return FALSE; @@ -1000,15 +1002,15 @@ static BOOL update_message_SwitchSurface(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(AltSecUpdate, SwitchSurface), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_CreateNineGridBitmap(rdpContext* context, const CREATE_NINE_GRID_BITMAP_ORDER* createNineGridBitmap) { - CREATE_NINE_GRID_BITMAP_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + CREATE_NINE_GRID_BITMAP_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !createNineGridBitmap) return FALSE; @@ -1023,13 +1025,13 @@ update_message_CreateNineGridBitmap(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(AltSecUpdate, CreateNineGridBitmap), (void*)wParam, - NULL); + nullptr); } static BOOL update_message_FrameMarker(rdpContext* context, const FRAME_MARKER_ORDER* frameMarker) { - FRAME_MARKER_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + FRAME_MARKER_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !frameMarker) return FALSE; @@ -1043,14 +1045,14 @@ static BOOL update_message_FrameMarker(rdpContext* context, const FRAME_MARKER_O up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(AltSecUpdate, FrameMarker), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_StreamBitmapFirst(rdpContext* context, const STREAM_BITMAP_FIRST_ORDER* streamBitmapFirst) { - STREAM_BITMAP_FIRST_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + STREAM_BITMAP_FIRST_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !streamBitmapFirst) return FALSE; @@ -1065,14 +1067,15 @@ static BOOL update_message_StreamBitmapFirst(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, - MakeMessageId(AltSecUpdate, StreamBitmapFirst), (void*)wParam, NULL); + MakeMessageId(AltSecUpdate, StreamBitmapFirst), (void*)wParam, + nullptr); } static BOOL update_message_StreamBitmapNext(rdpContext* context, const STREAM_BITMAP_NEXT_ORDER* streamBitmapNext) { - STREAM_BITMAP_NEXT_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + STREAM_BITMAP_NEXT_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !streamBitmapNext) return FALSE; @@ -1087,14 +1090,14 @@ static BOOL update_message_StreamBitmapNext(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, - MakeMessageId(AltSecUpdate, StreamBitmapNext), (void*)wParam, NULL); + MakeMessageId(AltSecUpdate, StreamBitmapNext), (void*)wParam, nullptr); } static BOOL update_message_DrawGdiPlusFirst(rdpContext* context, const DRAW_GDIPLUS_FIRST_ORDER* drawGdiPlusFirst) { - DRAW_GDIPLUS_FIRST_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + DRAW_GDIPLUS_FIRST_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !drawGdiPlusFirst) return FALSE; @@ -1108,14 +1111,14 @@ static BOOL update_message_DrawGdiPlusFirst(rdpContext* context, /* TODO: complete copy */ up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, - MakeMessageId(AltSecUpdate, DrawGdiPlusFirst), (void*)wParam, NULL); + MakeMessageId(AltSecUpdate, DrawGdiPlusFirst), (void*)wParam, nullptr); } static BOOL update_message_DrawGdiPlusNext(rdpContext* context, const DRAW_GDIPLUS_NEXT_ORDER* drawGdiPlusNext) { - DRAW_GDIPLUS_NEXT_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + DRAW_GDIPLUS_NEXT_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !drawGdiPlusNext) return FALSE; @@ -1130,14 +1133,14 @@ static BOOL update_message_DrawGdiPlusNext(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, - MakeMessageId(AltSecUpdate, DrawGdiPlusNext), (void*)wParam, NULL); + MakeMessageId(AltSecUpdate, DrawGdiPlusNext), (void*)wParam, nullptr); } static BOOL update_message_DrawGdiPlusEnd(rdpContext* context, const DRAW_GDIPLUS_END_ORDER* drawGdiPlusEnd) { - DRAW_GDIPLUS_END_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + DRAW_GDIPLUS_END_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !drawGdiPlusEnd) return FALSE; @@ -1152,15 +1155,15 @@ static BOOL update_message_DrawGdiPlusEnd(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(AltSecUpdate, DrawGdiPlusEnd), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_DrawGdiPlusCacheFirst(rdpContext* context, const DRAW_GDIPLUS_CACHE_FIRST_ORDER* drawGdiPlusCacheFirst) { - DRAW_GDIPLUS_CACHE_FIRST_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + DRAW_GDIPLUS_CACHE_FIRST_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !drawGdiPlusCacheFirst) return FALSE; @@ -1176,15 +1179,15 @@ update_message_DrawGdiPlusCacheFirst(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(AltSecUpdate, DrawGdiPlusCacheFirst), (void*)wParam, - NULL); + nullptr); } static BOOL update_message_DrawGdiPlusCacheNext(rdpContext* context, const DRAW_GDIPLUS_CACHE_NEXT_ORDER* drawGdiPlusCacheNext) { - DRAW_GDIPLUS_CACHE_NEXT_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + DRAW_GDIPLUS_CACHE_NEXT_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !drawGdiPlusCacheNext) return FALSE; @@ -1200,15 +1203,15 @@ update_message_DrawGdiPlusCacheNext(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(AltSecUpdate, DrawGdiPlusCacheNext), (void*)wParam, - NULL); + nullptr); } static BOOL update_message_DrawGdiPlusCacheEnd(rdpContext* context, const DRAW_GDIPLUS_CACHE_END_ORDER* drawGdiPlusCacheEnd) { - DRAW_GDIPLUS_CACHE_END_ORDER* wParam = NULL; - rdp_update_internal* up = NULL; + DRAW_GDIPLUS_CACHE_END_ORDER* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !drawGdiPlusCacheEnd) return FALSE; @@ -1223,7 +1226,8 @@ update_message_DrawGdiPlusCacheEnd(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, - MakeMessageId(AltSecUpdate, DrawGdiPlusCacheEnd), (void*)wParam, NULL); + MakeMessageId(AltSecUpdate, DrawGdiPlusCacheEnd), (void*)wParam, + nullptr); } /* Window Update */ @@ -1231,9 +1235,9 @@ update_message_DrawGdiPlusCacheEnd(rdpContext* context, static BOOL update_message_WindowCreate(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const WINDOW_STATE_ORDER* windowState) { - WINDOW_ORDER_INFO* wParam = NULL; - WINDOW_STATE_ORDER* lParam = NULL; - rdp_update_internal* up = NULL; + WINDOW_ORDER_INFO* wParam = nullptr; + WINDOW_STATE_ORDER* lParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !orderInfo || !windowState) return FALSE; @@ -1262,9 +1266,9 @@ static BOOL update_message_WindowCreate(rdpContext* context, const WINDOW_ORDER_ static BOOL update_message_WindowUpdate(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const WINDOW_STATE_ORDER* windowState) { - WINDOW_ORDER_INFO* wParam = NULL; - WINDOW_STATE_ORDER* lParam = NULL; - rdp_update_internal* up = NULL; + WINDOW_ORDER_INFO* wParam = nullptr; + WINDOW_STATE_ORDER* lParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !orderInfo || !windowState) return FALSE; @@ -1293,9 +1297,9 @@ static BOOL update_message_WindowUpdate(rdpContext* context, const WINDOW_ORDER_ static BOOL update_message_WindowIcon(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const WINDOW_ICON_ORDER* windowIcon) { - WINDOW_ORDER_INFO* wParam = NULL; - WINDOW_ICON_ORDER* lParam = NULL; - rdp_update_internal* up = NULL; + WINDOW_ORDER_INFO* wParam = nullptr; + WINDOW_ICON_ORDER* lParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !orderInfo || !windowIcon) return FALSE; @@ -1373,9 +1377,9 @@ out_fail: static BOOL update_message_WindowCachedIcon(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const WINDOW_CACHED_ICON_ORDER* windowCachedIcon) { - WINDOW_ORDER_INFO* wParam = NULL; - WINDOW_CACHED_ICON_ORDER* lParam = NULL; - rdp_update_internal* up = NULL; + WINDOW_ORDER_INFO* wParam = nullptr; + WINDOW_CACHED_ICON_ORDER* lParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !orderInfo || !windowCachedIcon) return FALSE; @@ -1404,8 +1408,8 @@ static BOOL update_message_WindowCachedIcon(rdpContext* context, const WINDOW_OR static BOOL update_message_WindowDelete(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo) { - WINDOW_ORDER_INFO* wParam = NULL; - rdp_update_internal* up = NULL; + WINDOW_ORDER_INFO* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !orderInfo) return FALSE; @@ -1419,15 +1423,15 @@ static BOOL update_message_WindowDelete(rdpContext* context, const WINDOW_ORDER_ up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(WindowUpdate, WindowDelete), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_NotifyIconCreate(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const NOTIFY_ICON_STATE_ORDER* notifyIconState) { - WINDOW_ORDER_INFO* wParam = NULL; - NOTIFY_ICON_STATE_ORDER* lParam = NULL; - rdp_update_internal* up = NULL; + WINDOW_ORDER_INFO* wParam = nullptr; + NOTIFY_ICON_STATE_ORDER* lParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !orderInfo || !notifyIconState) return FALSE; @@ -1457,9 +1461,9 @@ static BOOL update_message_NotifyIconCreate(rdpContext* context, const WINDOW_OR static BOOL update_message_NotifyIconUpdate(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const NOTIFY_ICON_STATE_ORDER* notifyIconState) { - WINDOW_ORDER_INFO* wParam = NULL; - NOTIFY_ICON_STATE_ORDER* lParam = NULL; - rdp_update_internal* up = NULL; + WINDOW_ORDER_INFO* wParam = nullptr; + NOTIFY_ICON_STATE_ORDER* lParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !orderInfo || !notifyIconState) return FALSE; @@ -1488,8 +1492,8 @@ static BOOL update_message_NotifyIconUpdate(rdpContext* context, const WINDOW_OR static BOOL update_message_NotifyIconDelete(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo) { - WINDOW_ORDER_INFO* wParam = NULL; - rdp_update_internal* up = NULL; + WINDOW_ORDER_INFO* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !orderInfo) return FALSE; @@ -1503,15 +1507,15 @@ static BOOL update_message_NotifyIconDelete(rdpContext* context, const WINDOW_OR up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, - MakeMessageId(WindowUpdate, NotifyIconDelete), (void*)wParam, NULL); + MakeMessageId(WindowUpdate, NotifyIconDelete), (void*)wParam, nullptr); } static BOOL update_message_MonitoredDesktop(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const MONITORED_DESKTOP_ORDER* monitoredDesktop) { - WINDOW_ORDER_INFO* wParam = NULL; - MONITORED_DESKTOP_ORDER* lParam = NULL; - rdp_update_internal* up = NULL; + WINDOW_ORDER_INFO* wParam = nullptr; + MONITORED_DESKTOP_ORDER* lParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !orderInfo || !monitoredDesktop) return FALSE; @@ -1531,7 +1535,7 @@ static BOOL update_message_MonitoredDesktop(rdpContext* context, const WINDOW_OR } CopyMemory(lParam, monitoredDesktop, sizeof(MONITORED_DESKTOP_ORDER)); - lParam->windowIds = NULL; + lParam->windowIds = nullptr; if (lParam->numWindowIds) { @@ -1548,8 +1552,8 @@ static BOOL update_message_MonitoredDesktop(rdpContext* context, const WINDOW_OR static BOOL update_message_NonMonitoredDesktop(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo) { - WINDOW_ORDER_INFO* wParam = NULL; - rdp_update_internal* up = NULL; + WINDOW_ORDER_INFO* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !orderInfo) return FALSE; @@ -1563,7 +1567,8 @@ static BOOL update_message_NonMonitoredDesktop(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, - MakeMessageId(WindowUpdate, NonMonitoredDesktop), (void*)wParam, NULL); + MakeMessageId(WindowUpdate, NonMonitoredDesktop), (void*)wParam, + nullptr); } /* Pointer Update */ @@ -1571,8 +1576,8 @@ static BOOL update_message_NonMonitoredDesktop(rdpContext* context, static BOOL update_message_PointerPosition(rdpContext* context, const POINTER_POSITION_UPDATE* pointerPosition) { - POINTER_POSITION_UPDATE* wParam = NULL; - rdp_update_internal* up = NULL; + POINTER_POSITION_UPDATE* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !pointerPosition) return FALSE; @@ -1584,14 +1589,14 @@ static BOOL update_message_PointerPosition(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, - MakeMessageId(PointerUpdate, PointerPosition), (void*)wParam, NULL); + MakeMessageId(PointerUpdate, PointerPosition), (void*)wParam, nullptr); } static BOOL update_message_PointerSystem(rdpContext* context, const POINTER_SYSTEM_UPDATE* pointerSystem) { - POINTER_SYSTEM_UPDATE* wParam = NULL; - rdp_update_internal* up = NULL; + POINTER_SYSTEM_UPDATE* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !pointerSystem) return FALSE; @@ -1603,14 +1608,14 @@ static BOOL update_message_PointerSystem(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PointerUpdate, PointerSystem), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_PointerColor(rdpContext* context, const POINTER_COLOR_UPDATE* pointerColor) { - POINTER_COLOR_UPDATE* wParam = NULL; - rdp_update_internal* up = NULL; + POINTER_COLOR_UPDATE* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !pointerColor) return FALSE; @@ -1622,13 +1627,13 @@ static BOOL update_message_PointerColor(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PointerUpdate, PointerColor), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_PointerLarge(rdpContext* context, const POINTER_LARGE_UPDATE* pointer) { - POINTER_LARGE_UPDATE* wParam = NULL; - rdp_update_internal* up = NULL; + POINTER_LARGE_UPDATE* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !pointer) return FALSE; @@ -1640,13 +1645,13 @@ static BOOL update_message_PointerLarge(rdpContext* context, const POINTER_LARGE up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PointerUpdate, PointerLarge), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_PointerNew(rdpContext* context, const POINTER_NEW_UPDATE* pointerNew) { - POINTER_NEW_UPDATE* wParam = NULL; - rdp_update_internal* up = NULL; + POINTER_NEW_UPDATE* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !pointerNew) return FALSE; @@ -1658,14 +1663,14 @@ static BOOL update_message_PointerNew(rdpContext* context, const POINTER_NEW_UPD up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PointerUpdate, PointerNew), - (void*)wParam, NULL); + (void*)wParam, nullptr); } static BOOL update_message_PointerCached(rdpContext* context, const POINTER_CACHED_UPDATE* pointerCached) { - POINTER_CACHED_UPDATE* wParam = NULL; - rdp_update_internal* up = NULL; + POINTER_CACHED_UPDATE* wParam = nullptr; + rdp_update_internal* up = nullptr; if (!context || !context->update || !pointerCached) return FALSE; @@ -1677,13 +1682,13 @@ static BOOL update_message_PointerCached(rdpContext* context, up = update_cast(context->update); return MessageQueue_Post(up->queue, (void*)context, MakeMessageId(PointerUpdate, PointerCached), - (void*)wParam, NULL); + (void*)wParam, nullptr); } /* Message Queue */ static BOOL update_message_free_update_class(wMessage* msg, int type) { - rdpContext* context = NULL; + rdpContext* context = nullptr; if (!msg) return FALSE; @@ -2071,7 +2076,7 @@ static BOOL update_message_process_primary_update_class(rdpUpdateProxy* proxy, w static BOOL update_message_free_secondary_update_class(wMessage* msg, int type) { - rdpContext* context = NULL; + rdpContext* context = nullptr; if (!msg) return FALSE; @@ -2452,7 +2457,7 @@ static BOOL update_message_process_window_update_class(rdpUpdateProxy* proxy, wM static BOOL update_message_free_pointer_update_class(wMessage* msg, int type) { - rdpContext* context = NULL; + rdpContext* context = nullptr; if (!msg) return FALSE; @@ -2682,11 +2687,11 @@ int update_message_queue_process_pending_messages(rdpUpdate* update) static BOOL update_message_register_interface(rdpUpdateProxy* message, rdpUpdate* update) { - rdpPrimaryUpdate* primary = NULL; - rdpSecondaryUpdate* secondary = NULL; - rdpAltSecUpdate* altsec = NULL; - rdpWindowUpdate* window = NULL; - rdpPointerUpdate* pointer = NULL; + rdpPrimaryUpdate* primary = nullptr; + rdpSecondaryUpdate* secondary = nullptr; + rdpAltSecUpdate* altsec = nullptr; + rdpWindowUpdate* window = nullptr; + rdpPointerUpdate* pointer = nullptr; if (!message || !update) return FALSE; @@ -2878,22 +2883,23 @@ static DWORD WINAPI update_message_proxy_thread(LPVOID arg) rdpUpdateProxy* update_message_proxy_new(rdpUpdate* update) { - rdpUpdateProxy* message = NULL; + rdpUpdateProxy* message = nullptr; if (!update) - return NULL; + return nullptr; if (!(message = (rdpUpdateProxy*)calloc(1, sizeof(rdpUpdateProxy)))) - return NULL; + return nullptr; message->update = update; update_message_register_interface(message, update); - if (!(message->thread = CreateThread(NULL, 0, update_message_proxy_thread, update, 0, NULL))) + if (!(message->thread = + CreateThread(nullptr, 0, update_message_proxy_thread, update, 0, nullptr))) { WLog_ERR(TAG, "Failed to create proxy thread"); free(message); - return NULL; + return nullptr; } return message; diff --git a/libfreerdp/core/metrics.c b/libfreerdp/core/metrics.c index a1253dec6..29ec95ecd 100644 --- a/libfreerdp/core/metrics.c +++ b/libfreerdp/core/metrics.c @@ -39,7 +39,7 @@ double metrics_write_bytes(rdpMetrics* metrics, UINT32 UncompressedBytes, UINT32 rdpMetrics* metrics_new(rdpContext* context) { - rdpMetrics* metrics = NULL; + rdpMetrics* metrics = nullptr; metrics = (rdpMetrics*)calloc(1, sizeof(rdpMetrics)); diff --git a/libfreerdp/core/multitransport.c b/libfreerdp/core/multitransport.c index 3fa9afe4b..ba7e69f28 100644 --- a/libfreerdp/core/multitransport.c +++ b/libfreerdp/core/multitransport.c @@ -65,7 +65,7 @@ state_run_t multitransport_recv_request(rdpMultitransport* multi, wStream* s) UINT32 requestId = 0; UINT16 requestedProto = 0; UINT16 reserved = 0; - const BYTE* cookie = NULL; + const BYTE* cookie = nullptr; Stream_Read_UINT32(s, requestId); /* requestId (4 bytes) */ Stream_Read_UINT16(s, requestedProto); /* requestedProtocol (2 bytes) */ @@ -218,7 +218,7 @@ rdpMultitransport* multitransport_new(rdpRdp* rdp, WINPR_ATTR_UNUSED UINT16 prot rdpMultitransport* multi = calloc(1, sizeof(rdpMultitransport)); if (!multi) - return NULL; + return nullptr; if (settings->ServerMode) { diff --git a/libfreerdp/core/nego.c b/libfreerdp/core/nego.c index e83287ebc..04fcd02cf 100644 --- a/libfreerdp/core/nego.c +++ b/libfreerdp/core/nego.c @@ -117,8 +117,8 @@ BOOL nego_update_settings_from_state(rdpNego* nego, rdpSettings* settings) BOOL nego_connect(rdpNego* nego) { - rdpContext* context = NULL; - rdpSettings* settings = NULL; + rdpContext* context = nullptr; + rdpSettings* settings = nullptr; WINPR_ASSERT(nego); context = transport_get_context(nego->transport); WINPR_ASSERT(context); @@ -350,7 +350,7 @@ BOOL nego_security_connect(rdpNego* nego) static BOOL nego_tcp_connect(rdpNego* nego) { - rdpContext* context = NULL; + rdpContext* context = nullptr; WINPR_ASSERT(nego); if (!nego->TcpConnected) { @@ -447,10 +447,10 @@ BOOL nego_transport_disconnect(rdpNego* nego) BOOL nego_send_preconnection_pdu(rdpNego* nego) { - wStream* s = NULL; + wStream* s = nullptr; UINT32 cbSize = 0; UINT16 cchPCB = 0; - WCHAR* wszPCB = NULL; + WCHAR* wszPCB = nullptr; WINPR_ASSERT(nego); @@ -476,7 +476,7 @@ BOOL nego_send_preconnection_pdu(rdpNego* nego) cbSize += cchPCB * sizeof(WCHAR); } - s = Stream_New(NULL, cbSize); + s = Stream_New(nullptr, cbSize); if (!s) { @@ -746,10 +746,10 @@ static void nego_attempt_rdp(rdpNego* nego) BOOL nego_recv_response(rdpNego* nego) { int status = 0; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(nego); - s = Stream_New(NULL, 1024); + s = Stream_New(nullptr, 1024); if (!s) { @@ -1073,13 +1073,13 @@ void nego_send(rdpNego* nego) BOOL nego_send_negotiation_request(rdpNego* nego) { BOOL rc = FALSE; - wStream* s = NULL; + wStream* s = nullptr; size_t length = 0; size_t bm = 0; size_t em = 0; BYTE flags = 0; size_t cookie_length = 0; - s = Stream_New(NULL, 512); + s = Stream_New(nullptr, 512); WINPR_ASSERT(nego); if (!s) @@ -1493,10 +1493,10 @@ BOOL nego_send_negotiation_response(rdpNego* nego) size_t bm = 0; size_t em = 0; BOOL status = 0; - wStream* s = NULL; + wStream* s = nullptr; BYTE flags = 0; - rdpContext* context = NULL; - rdpSettings* settings = NULL; + rdpContext* context = nullptr; + rdpSettings* settings = nullptr; WINPR_ASSERT(nego); context = transport_get_context(nego->transport); @@ -1505,7 +1505,7 @@ BOOL nego_send_negotiation_response(rdpNego* nego) settings = context->settings; WINPR_ASSERT(settings); - s = Stream_New(NULL, 512); + s = Stream_New(nullptr, 512); if (!s) { @@ -1695,7 +1695,7 @@ void nego_init(rdpNego* nego) * * @param transport The transport to use * - * @return A pointer to the allocated NEGO instance or NULL + * @return A pointer to the allocated NEGO instance or nullptr */ rdpNego* nego_new(rdpTransport* transport) @@ -1703,7 +1703,7 @@ rdpNego* nego_new(rdpTransport* transport) rdpNego* nego = (rdpNego*)calloc(1, sizeof(rdpNego)); if (!nego) - return NULL; + return nullptr; nego->log = WLog_Get(NEGO_TAG); WINPR_ASSERT(nego->log); @@ -1945,7 +1945,7 @@ BOOL nego_set_cookie(rdpNego* nego, const char* cookie) if (nego->cookie) { free(nego->cookie); - nego->cookie = NULL; + nego->cookie = nullptr; } if (!cookie) @@ -1953,7 +1953,7 @@ BOOL nego_set_cookie(rdpNego* nego, const char* cookie) nego->cookie = _strdup(cookie); - return (nego->cookie != NULL); + return (nego->cookie != nullptr); } /** @@ -2049,9 +2049,9 @@ BOOL nego_set_state(rdpNego* nego, NEGO_STATE state) SEC_WINNT_AUTH_IDENTITY* nego_get_identity(rdpNego* nego) { - rdpNla* nla = NULL; + rdpNla* nla = nullptr; if (!nego) - return NULL; + return nullptr; nla = transport_get_nla(nego->transport); return nla_get_identity(nla); @@ -2062,13 +2062,13 @@ void nego_free_nla(rdpNego* nego) if (!nego || !nego->transport) return; - transport_set_nla(nego->transport, NULL); + transport_set_nla(nego->transport, nullptr); } const BYTE* nego_get_routing_token(const rdpNego* nego, DWORD* RoutingTokenLength) { if (!nego) - return NULL; + return nullptr; if (RoutingTokenLength) *RoutingTokenLength = nego->RoutingTokenLength; return nego->RoutingToken; diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c index c1f728ec8..ff82ecc79 100644 --- a/libfreerdp/core/nla.c +++ b/libfreerdp/core/nla.c @@ -308,12 +308,13 @@ static BOOL nla_client_setup_identity(rdpNla* nla) if (PromptPassword && !utils_str_is_empty(settings->Username)) { - WINPR_SAM* sam = SamOpen(NULL, TRUE); + WINPR_SAM* sam = SamOpen(nullptr, TRUE); if (sam) { const UINT32 userLength = (UINT32)strnlen(settings->Username, INT32_MAX); - WINPR_SAM_ENTRY* entry = SamLookupUserA( - sam, settings->Username, userLength + 1 /* ensure '\0' is checked too */, NULL, 0); + WINPR_SAM_ENTRY* entry = + SamLookupUserA(sam, settings->Username, + userLength + 1 /* ensure '\0' is checked too */, nullptr, 0); if (entry) { /** @@ -352,7 +353,7 @@ static BOOL nla_client_setup_identity(rdpNla* nla) freerdp_set_last_error_log(instance->context, FREERDP_ERROR_CONNECT_CANCELLED); return FALSE; case AUTH_NO_CREDENTIALS: - WLog_INFO(TAG, "No credentials provided - using NULL identity"); + WLog_INFO(TAG, "No credentials provided - using nullptr identity"); break; default: return FALSE; @@ -363,7 +364,7 @@ static BOOL nla_client_setup_identity(rdpNla* nla) { sspi_FreeAuthIdentity(nla->identity); free(nla->identity); - nla->identity = NULL; + nla->identity = nullptr; } else if (settings->SmartcardLogon) { @@ -436,7 +437,7 @@ static int nla_client_init(rdpNla* nla) if (!nla_adjust_settings_from_smartcard(nla)) return -1; - if (!credssp_auth_init(nla->auth, NLA_AUTH_PKG, NULL)) + if (!credssp_auth_init(nla->auth, NLA_AUTH_PKG, nullptr)) return -1; if (!nla_client_setup_identity(nla)) @@ -447,7 +448,7 @@ static int nla_client_init(rdpNla* nla) if (!credssp_auth_setup_client(nla->auth, "TERMSRV", hostname, nla->identity, nla->pkinitArgs)) return -1; - const BYTE* data = NULL; + const BYTE* data = nullptr; DWORD length = 0; if (!transport_get_public_key(nla->transport, &data, &length)) { @@ -626,7 +627,7 @@ static int nla_client_authenticate(rdpNla* nla) WINPR_ASSERT(nla); - wStream* s = Stream_New(NULL, 4096); + wStream* s = Stream_New(nullptr, 4096); if (!s) { @@ -668,7 +669,7 @@ static int nla_server_init(rdpNla* nla) { WINPR_ASSERT(nla); - const BYTE* data = NULL; + const BYTE* data = nullptr; DWORD length = 0; if (!transport_get_public_key(nla->transport, &data, &length)) { @@ -682,7 +683,7 @@ static int nla_server_init(rdpNla* nla) return -1; } - if (!credssp_auth_init(nla->auth, NLA_AUTH_PKG, NULL)) + if (!credssp_auth_init(nla->auth, NLA_AUTH_PKG, nullptr)) return -1; if (!credssp_auth_setup_server(nla->auth)) @@ -694,12 +695,12 @@ static int nla_server_init(rdpNla* nla) static wStream* nla_server_recv_stream(rdpNla* nla) { - wStream* s = NULL; + wStream* s = nullptr; int status = -1; WINPR_ASSERT(nla); - s = Stream_New(NULL, 4096); + s = Stream_New(nullptr, 4096); if (!s) goto fail; @@ -711,7 +712,7 @@ fail: { WLog_ERR(TAG, "nla_recv() error: %d", status); Stream_Free(s, TRUE); - return NULL; + return nullptr; } return s; @@ -953,12 +954,13 @@ BOOL nla_encrypt_public_key_echo(rdpNla* nla) if (!sspi_SecBufferAlloc(&buf, nla->PublicKey.cbBuffer)) return FALSE; ap_integer_increment_le(buf.pvBuffer, buf.cbBuffer); - status = credssp_auth_encrypt(nla->auth, &buf, &nla->pubKeyAuth, NULL, nla->sendSeqNum++); + status = + credssp_auth_encrypt(nla->auth, &buf, &nla->pubKeyAuth, nullptr, nla->sendSeqNum++); sspi_SecBufferFree(&buf); } else { - status = credssp_auth_encrypt(nla->auth, &nla->PublicKey, &nla->pubKeyAuth, NULL, + status = credssp_auth_encrypt(nla->auth, &nla->PublicKey, &nla->pubKeyAuth, nullptr, nla->sendSeqNum++); } @@ -968,7 +970,7 @@ BOOL nla_encrypt_public_key_echo(rdpNla* nla) BOOL nla_encrypt_public_key_hash(rdpNla* nla) { BOOL status = FALSE; - WINPR_DIGEST_CTX* sha256 = NULL; + WINPR_DIGEST_CTX* sha256 = nullptr; SecBuffer buf = WINPR_C_ARRAY_INIT; WINPR_ASSERT(nla); @@ -1002,7 +1004,7 @@ BOOL nla_encrypt_public_key_hash(rdpNla* nla) goto out; sspi_SecBufferFree(&nla->pubKeyAuth); - if (!credssp_auth_encrypt(nla->auth, &buf, &nla->pubKeyAuth, NULL, nla->sendSeqNum++)) + if (!credssp_auth_encrypt(nla->auth, &buf, &nla->pubKeyAuth, nullptr, nla->sendSeqNum++)) goto out; status = TRUE; @@ -1052,7 +1054,7 @@ fail: BOOL nla_decrypt_public_key_hash(rdpNla* nla) { - WINPR_DIGEST_CTX* sha256 = NULL; + WINPR_DIGEST_CTX* sha256 = nullptr; BYTE serverClientHash[WINPR_SHA256_DIGEST_LENGTH] = WINPR_C_ARRAY_INIT; BOOL status = FALSE; @@ -1256,21 +1258,21 @@ static MSV1_0_REMOTE_SUPPLEMENTAL_CREDENTIAL* nla_read_NtlmCreds(WINPR_ATTR_UNUS WINPR_ASSERT(s); if (!Stream_CheckAndLogRequiredLength(TAG, s, 32 + 4)) - return NULL; + return nullptr; size_t pos = Stream_GetPosition(s); Stream_Seek(s, 32); ULONG EncryptedCredsSize = Stream_Get_UINT32(s); if (!Stream_CheckAndLogRequiredLength(TAG, s, EncryptedCredsSize)) - return NULL; + return nullptr; Stream_SetPosition(s, pos); MSV1_0_REMOTE_SUPPLEMENTAL_CREDENTIAL* ret = (MSV1_0_REMOTE_SUPPLEMENTAL_CREDENTIAL*)calloc( 1, sizeof(MSV1_0_REMOTE_SUPPLEMENTAL_CREDENTIAL) - 1 + EncryptedCredsSize); if (!ret) - return NULL; + return nullptr; ret->Version = Stream_Get_UINT32(s); ret->Flags = Stream_Get_UINT32(s); @@ -1280,7 +1282,7 @@ static MSV1_0_REMOTE_SUPPLEMENTAL_CREDENTIAL* nla_read_NtlmCreds(WINPR_ATTR_UNUS if (!nla_credentialTypeValid(val)) { free(ret); - return NULL; + return nullptr; } ret->CredentialKeyType = WINPR_ASSERTING_INT_CAST(MSV1_0_CREDENTIAL_KEY_TYPE, val); } @@ -1447,8 +1449,8 @@ static BOOL nla_read_ts_credentials(rdpNla* nla, SecBuffer* data) .Flags = 0, .ServiceTicketLength = 0, .TicketGrantingTicketLength = 0, - .ServiceTicket = NULL, - .TicketGrantingTicket = NULL }; + .ServiceTicket = nullptr, + .TicketGrantingTicket = nullptr }; WinPrAsn1Decoder logonCredsSeq = WinPrAsn1Decoder_init(); @@ -1473,7 +1475,7 @@ static BOOL nla_read_ts_credentials(rdpNla* nla, SecBuffer* data) } /* supplementalCreds [1] SEQUENCE OF TSRemoteGuardPackageCred OPTIONAL, */ - MSV1_0_REMOTE_SUPPLEMENTAL_CREDENTIAL* suppCreds = NULL; + MSV1_0_REMOTE_SUPPLEMENTAL_CREDENTIAL* suppCreds = nullptr; WinPrAsn1Decoder suppCredsSeq = WinPrAsn1Decoder_init(); if (WinPrAsn1DecReadContextualSequence(&dec2, 1, &error, &suppCredsSeq) && @@ -1548,7 +1550,7 @@ static BOOL nla_get_KERB_TICKET_LOGON(rdpNla* nla, KERB_TICKET_LOGON* logonTicke WINPR_ASSERT(nla); WINPR_ASSERT(logonTicket); - SecurityFunctionTable* table = NULL; + SecurityFunctionTable* table = nullptr; CtxtHandle context = WINPR_C_ARRAY_INIT; credssp_auth_tableAndContext(nla->auth, &table, &context); return table->QueryContextAttributes(&context, SECPKG_CRED_ATTR_TICKET_LOGON, logonTicket) == @@ -1558,15 +1560,15 @@ static BOOL nla_get_KERB_TICKET_LOGON(rdpNla* nla, KERB_TICKET_LOGON* logonTicke static BOOL nla_write_TSRemoteGuardKerbCred(rdpNla* nla, WinPrAsn1Encoder* enc) { BOOL ret = FALSE; - wStream* s = NULL; + wStream* s = nullptr; char kerberos[] = { 'K', '\0', 'e', '\0', 'r', '\0', 'b', '\0', 'e', '\0', 'r', '\0', 'o', '\0', 's', '\0' }; WinPrAsn1_OctetString packageName = { sizeof(kerberos), (BYTE*)kerberos }; WinPrAsn1_OctetString credBuffer; KERB_TICKET_LOGON logonTicket; - logonTicket.ServiceTicket = NULL; - logonTicket.TicketGrantingTicket = NULL; + logonTicket.ServiceTicket = nullptr; + logonTicket.TicketGrantingTicket = nullptr; /* packageName [0] OCTET STRING */ if (!WinPrAsn1EncContextualOctetString(enc, 0, &packageName)) @@ -1576,7 +1578,7 @@ static BOOL nla_write_TSRemoteGuardKerbCred(rdpNla* nla, WinPrAsn1Encoder* enc) if (!nla_get_KERB_TICKET_LOGON(nla, &logonTicket)) goto out; - s = Stream_New(NULL, 2000); + s = Stream_New(nullptr, 2000); if (!s) goto out; @@ -1607,7 +1609,7 @@ static BOOL nla_write_TSRemoteGuardNtlmCred(rdpNla* nla, WinPrAsn1Encoder* enc, return FALSE; /* credBuffer [1] OCTET STRING */ - wStream* s = Stream_New(NULL, 300); + wStream* s = Stream_New(nullptr, 300); if (!s) goto out; @@ -1780,7 +1782,7 @@ static BOOL nla_encode_ts_remoteguard_credentials(rdpNla* nla, WinPrAsn1Encoder* return FALSE; /* TODO: compute the NTLM supplemental creds */ - MSV1_0_REMOTE_SUPPLEMENTAL_CREDENTIAL* ntlm = NULL; + MSV1_0_REMOTE_SUPPLEMENTAL_CREDENTIAL* ntlm = nullptr; if (ntlm) { /* supplementalCreds [1] SEQUENCE OF TSRemoteGuardPackageCred OPTIONAL */ @@ -1814,7 +1816,7 @@ static BOOL nla_encode_ts_remoteguard_credentials(rdpNla* nla, WinPrAsn1Encoder* static BOOL nla_encode_ts_credentials(rdpNla* nla) { BOOL ret = FALSE; - WinPrAsn1Encoder* enc = NULL; + WinPrAsn1Encoder* enc = nullptr; size_t length = 0; wStream s = WINPR_C_ARRAY_INIT; TsCredentialsType credType = TSCREDS_INVALID; @@ -1898,7 +1900,7 @@ static BOOL nla_encrypt_ts_credentials(rdpNla* nla) return FALSE; sspi_SecBufferFree(&nla->authInfo); - return (credssp_auth_encrypt(nla->auth, &nla->tsCredentials, &nla->authInfo, NULL, + return (credssp_auth_encrypt(nla->auth, &nla->tsCredentials, &nla->authInfo, nullptr, nla->sendSeqNum++)); } @@ -1966,9 +1968,9 @@ static BOOL nla_write_octet_string_free(WinPrAsn1Encoder* enc, SecBuffer* buffer BOOL nla_send(rdpNla* nla) { BOOL rc = FALSE; - wStream* s = NULL; + wStream* s = nullptr; size_t length = 0; - WinPrAsn1Encoder* enc = NULL; + WinPrAsn1Encoder* enc = nullptr; WINPR_ASSERT(nla); @@ -2042,7 +2044,7 @@ BOOL nla_send(rdpNla* nla) if (!WinPrAsn1EncStreamSize(enc, &length)) goto fail; - s = Stream_New(NULL, length); + s = Stream_New(nullptr, length); if (!s) goto fail; @@ -2290,7 +2292,7 @@ rdpNla* nla_new(rdpContext* context, rdpTransport* transport) rdpNla* nla = (rdpNla*)calloc(1, sizeof(rdpNla)); if (!nla) - return NULL; + return nullptr; nla->rdpcontext = context; nla->server = settings->ServerMode; @@ -2322,7 +2324,7 @@ cleanup: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC nla_free(nla); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } /** @@ -2349,7 +2351,7 @@ void nla_free(rdpNla* nla) SEC_WINNT_AUTH_IDENTITY* nla_get_identity(rdpNla* nla) { if (!nla) - return NULL; + return nullptr; return nla->identity; } @@ -2428,7 +2430,7 @@ BOOL nla_encrypt(rdpNla* nla, const SecBuffer* inBuffer, SecBuffer* outBuffer) WINPR_ASSERT(nla); WINPR_ASSERT(inBuffer); WINPR_ASSERT(outBuffer); - return credssp_auth_encrypt(nla->auth, inBuffer, outBuffer, NULL, nla->sendSeqNum++); + return credssp_auth_encrypt(nla->auth, inBuffer, outBuffer, nullptr, nla->sendSeqNum++); } BOOL nla_decrypt(rdpNla* nla, const SecBuffer* inBuffer, SecBuffer* outBuffer) @@ -2443,7 +2445,7 @@ SECURITY_STATUS nla_QueryContextAttributes(rdpNla* nla, DWORD ulAttr, PVOID pBuf { WINPR_ASSERT(nla); - SecurityFunctionTable* table = NULL; + SecurityFunctionTable* table = nullptr; CtxtHandle context = WINPR_C_ARRAY_INIT; credssp_auth_tableAndContext(nla->auth, &table, &context); @@ -2454,7 +2456,7 @@ SECURITY_STATUS nla_FreeContextBuffer(rdpNla* nla, PVOID pBuffer) { WINPR_ASSERT(nla); - SecurityFunctionTable* table = NULL; + SecurityFunctionTable* table = nullptr; CtxtHandle context = WINPR_C_ARRAY_INIT; credssp_auth_tableAndContext(nla->auth, &table, &context); diff --git a/libfreerdp/core/orders.c b/libfreerdp/core/orders.c index f9e8891df..77b1c200f 100644 --- a/libfreerdp/core/orders.c +++ b/libfreerdp/core/orders.c @@ -80,7 +80,7 @@ static inline BOOL check_val_fits_int16_int(INT32 value, WINPR_ATTR_UNUSED const WINPR_ATTR_UNUSED size_t line) { const DWORD level = WLOG_WARN; - static wLog* log = NULL; + static wLog* log = nullptr; if (!log) log = WLog_Get(TAG); @@ -300,7 +300,7 @@ static BOOL check_order_activated(wLog* log, const rdpSettings* settings, const static BOOL check_alt_order_supported(wLog* log, rdpSettings* settings, BYTE orderType, const char* orderName) { - const char* extendedMessage = NULL; + const char* extendedMessage = nullptr; BOOL condition = FALSE; switch (orderType) @@ -350,7 +350,7 @@ static BOOL check_alt_order_supported(wLog* log, rdpSettings* settings, BYTE ord static BOOL check_secondary_order_supported(wLog* log, rdpSettings* settings, BYTE orderType, const char* orderName) { - const char* extendedMessage = NULL; + const char* extendedMessage = nullptr; BOOL condition = FALSE; switch (orderType) @@ -410,7 +410,7 @@ static BOOL check_secondary_order_supported(wLog* log, rdpSettings* settings, BY static BOOL check_primary_order_supported(wLog* log, const rdpSettings* settings, UINT32 orderType, const char* orderName) { - const char* extendedMessage = NULL; + const char* extendedMessage = nullptr; BOOL condition = FALSE; switch (orderType) @@ -1043,7 +1043,7 @@ static inline BOOL update_read_delta_rects(wStream* s, DELTA_RECT* rectangles, c { UINT32 number = *nr; BYTE flags = 0; - BYTE* zeroBits = NULL; + BYTE* zeroBits = nullptr; UINT32 zeroBitsSize = 0; if (number > 45) @@ -1108,7 +1108,7 @@ static inline BOOL update_read_delta_points(wStream* s, DELTA_POINT** points, UI WINPR_ATTR_UNUSED INT16 x, WINPR_ATTR_UNUSED INT16 y) { BYTE flags = 0; - BYTE* zeroBits = NULL; + BYTE* zeroBits = nullptr; UINT32 zeroBitsSize = ((number + 3) / 4); WINPR_ASSERT(points); @@ -1883,7 +1883,7 @@ static BOOL update_read_memblt_order(const char* orderName, wStream* s, const OR return FALSE; memblt->colorIndex = (memblt->cacheId >> 8); memblt->cacheId = (memblt->cacheId & 0xFF); - memblt->bitmap = NULL; + memblt->bitmap = nullptr; return TRUE; } @@ -1947,7 +1947,7 @@ static BOOL update_read_mem3blt_order(const char* orderName, wStream* s, return FALSE; mem3blt->colorIndex = (mem3blt->cacheId >> 8); mem3blt->cacheId = (mem3blt->cacheId & 0xFF); - mem3blt->bitmap = NULL; + mem3blt->bitmap = nullptr; return TRUE; } static BOOL update_read_save_bitmap_order(const char* orderName, wStream* s, @@ -2137,9 +2137,9 @@ static BOOL update_read_fast_glyph_order(const char* orderName, wStream* s, if ((orderInfo->fieldFlags & ORDER_FIELD_15) != 0) { - const BYTE* src = NULL; + const BYTE* src = nullptr; wStream subbuffer; - wStream* sub = NULL; + wStream* sub = nullptr; if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) return FALSE; @@ -2186,7 +2186,7 @@ static BOOL update_read_fast_glyph_order(const char* orderName, wStream* s, else { free(glyph->aj); - glyph->aj = NULL; + glyph->aj = nullptr; } } } @@ -2315,11 +2315,11 @@ WINPR_ATTR_NODISCARD static CACHE_BITMAP_ORDER* update_read_cache_bitmap_order(rdpUpdate* update, wStream* s, BOOL compressed, UINT16 flags) { - CACHE_BITMAP_ORDER* cache_bitmap = NULL; + CACHE_BITMAP_ORDER* cache_bitmap = nullptr; rdp_update_internal* up = update_cast(update); if (!update || !s) - return NULL; + return nullptr; cache_bitmap = calloc(1, sizeof(CACHE_BITMAP_ORDER)); @@ -2377,7 +2377,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_cache_bitmap_order(update->context, cache_bitmap); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } size_t update_approximate_cache_bitmap_order(const CACHE_BITMAP_ORDER* cache_bitmap, @@ -2438,10 +2438,10 @@ static CACHE_BITMAP_V2_ORDER* update_read_cache_bitmap_v2_order(rdpUpdate* updat { BOOL rc = 0; BYTE bitsPerPixelId = 0; - CACHE_BITMAP_V2_ORDER* cache_bitmap_v2 = NULL; + CACHE_BITMAP_V2_ORDER* cache_bitmap_v2 = nullptr; if (!update || !s) - return NULL; + return nullptr; cache_bitmap_v2 = calloc(1, sizeof(CACHE_BITMAP_V2_ORDER)); @@ -2525,7 +2525,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_cache_bitmap_v2_order(update->context, cache_bitmap_v2); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } size_t update_approximate_cache_bitmap_v2_order(CACHE_BITMAP_V2_ORDER* cache_bitmap_v2, @@ -2624,14 +2624,14 @@ static CACHE_BITMAP_V3_ORDER* update_read_cache_bitmap_v3_order(rdpUpdate* updat { BOOL rc = 0; BYTE bitsPerPixelId = 0; - BITMAP_DATA_EX* bitmapData = NULL; + BITMAP_DATA_EX* bitmapData = nullptr; UINT32 new_len = 0; - BYTE* new_data = NULL; - CACHE_BITMAP_V3_ORDER* cache_bitmap_v3 = NULL; + BYTE* new_data = nullptr; + CACHE_BITMAP_V3_ORDER* cache_bitmap_v3 = nullptr; rdp_update_internal* up = update_cast(update); if (!update || !s) - return NULL; + return nullptr; cache_bitmap_v3 = calloc(1, sizeof(CACHE_BITMAP_V3_ORDER)); @@ -2684,7 +2684,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_cache_bitmap_v3_order(update->context, cache_bitmap_v3); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } size_t update_approximate_cache_bitmap_v3_order(CACHE_BITMAP_V3_ORDER* cache_bitmap_v3, @@ -2699,7 +2699,7 @@ BOOL update_write_cache_bitmap_v3_order(wStream* s, CACHE_BITMAP_V3_ORDER* cache { BOOL rc = 0; BYTE bitsPerPixelId = 0; - BITMAP_DATA_EX* bitmapData = NULL; + BITMAP_DATA_EX* bitmapData = nullptr; if (!Stream_EnsureRemainingCapacity( s, update_approximate_cache_bitmap_v3_order(cache_bitmap_v3, flags))) @@ -2731,7 +2731,7 @@ WINPR_ATTR_NODISCARD static CACHE_COLOR_TABLE_ORDER* update_read_cache_color_table_order(rdpUpdate* update, wStream* s, WINPR_ATTR_UNUSED UINT16 flags) { - UINT32* colorTable = NULL; + UINT32* colorTable = nullptr; CACHE_COLOR_TABLE_ORDER* cache_color_table = calloc(1, sizeof(CACHE_COLOR_TABLE_ORDER)); if (!cache_color_table) @@ -2763,7 +2763,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_cache_color_table_order(update->context, cache_color_table); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } size_t update_approximate_cache_color_table_order(const CACHE_COLOR_TABLE_ORDER* cache_color_table, @@ -2780,7 +2780,7 @@ BOOL update_write_cache_color_table_order(wStream* s, UINT16* flags) { size_t inf = 0; - const UINT32* colorTable = NULL; + const UINT32* colorTable = nullptr; if (cache_color_table->numberColors != 256) return FALSE; @@ -2863,7 +2863,7 @@ static CACHE_GLYPH_ORDER* update_read_cache_glyph_order(rdpUpdate* update, wStre return cache_glyph_order; fail: free_cache_glyph_order(update->context, cache_glyph_order); - return NULL; + return nullptr; } size_t update_approximate_cache_glyph_order(const CACHE_GLYPH_ORDER* cache_glyph, @@ -2876,7 +2876,7 @@ size_t update_approximate_cache_glyph_order(const CACHE_GLYPH_ORDER* cache_glyph BOOL update_write_cache_glyph_order(wStream* s, const CACHE_GLYPH_ORDER* cache_glyph, UINT16* flags) { - const GLYPH_DATA* glyph = NULL; + const GLYPH_DATA* glyph = nullptr; size_t inf = update_approximate_cache_glyph_order(cache_glyph, flags); if (!Stream_EnsureRemainingCapacity(s, inf)) @@ -2965,7 +2965,7 @@ static CACHE_GLYPH_V2_ORDER* update_read_cache_glyph_v2_order(rdpUpdate* update, return cache_glyph_v2; fail: free_cache_glyph_v2_order(update->context, cache_glyph_v2); - return NULL; + return nullptr; } size_t update_approximate_cache_glyph_v2_order(const CACHE_GLYPH_V2_ORDER* cache_glyph_v2, @@ -3135,7 +3135,7 @@ static CACHE_BRUSH_ORDER* update_read_cache_brush_order(rdpUpdate* update, wStre return cache_brush; fail: free_cache_brush_order(update->context, cache_brush); - return NULL; + return nullptr; } size_t update_approximate_cache_brush_order(const CACHE_BRUSH_ORDER* cache_brush, @@ -3220,7 +3220,7 @@ update_read_create_offscreen_bitmap_order(wStream* s, { UINT16 flags = 0; BOOL deleteListPresent = 0; - OFFSCREEN_DELETE_LIST* deleteList = NULL; + OFFSCREEN_DELETE_LIST* deleteList = nullptr; if (!Stream_CheckAndLogRequiredLength(TAG, s, 6)) return FALSE; @@ -3248,7 +3248,7 @@ update_read_create_offscreen_bitmap_order(wStream* s, if (deleteList->cIndices > deleteList->sIndices) { - UINT16* new_indices = NULL; + UINT16* new_indices = nullptr; new_indices = (UINT16*)realloc(deleteList->indices, 2ULL * deleteList->cIndices); if (!new_indices) @@ -3277,7 +3277,7 @@ update_read_create_offscreen_bitmap_order(wStream* s, size_t update_approximate_create_offscreen_bitmap_order( const CREATE_OFFSCREEN_BITMAP_ORDER* create_offscreen_bitmap) { - const OFFSCREEN_DELETE_LIST* deleteList = NULL; + const OFFSCREEN_DELETE_LIST* deleteList = nullptr; WINPR_ASSERT(create_offscreen_bitmap); @@ -3292,7 +3292,7 @@ BOOL update_write_create_offscreen_bitmap_order( { UINT16 flags = 0; BOOL deleteListPresent = 0; - const OFFSCREEN_DELETE_LIST* deleteList = NULL; + const OFFSCREEN_DELETE_LIST* deleteList = nullptr; if (!Stream_EnsureRemainingCapacity( s, update_approximate_create_offscreen_bitmap_order(create_offscreen_bitmap))) @@ -3349,7 +3349,7 @@ static BOOL update_read_create_nine_grid_bitmap_order(wStream* s, CREATE_NINE_GRID_BITMAP_ORDER* create_nine_grid_bitmap) { - NINE_GRID_BITMAP_INFO* nineGridInfo = NULL; + NINE_GRID_BITMAP_INFO* nineGridInfo = nullptr; if (!Stream_CheckAndLogRequiredLength(TAG, s, 19)) return FALSE; @@ -4061,7 +4061,7 @@ static BOOL update_recv_primary_order(rdpUpdate* update, wStream* s, BYTE flags) if (flags & ORDER_BOUNDS) { - rc = IFCALLRESULT(defaultReturn, update->SetBounds, context, NULL); + rc = IFCALLRESULT(defaultReturn, update->SetBounds, context, nullptr); } return rc; @@ -4081,7 +4081,7 @@ static BOOL update_recv_secondary_order(rdpUpdate* update, wStream* s, WINPR_ATT rdpContext* context = update->context; rdpSettings* settings = context->settings; rdpSecondaryUpdate* secondary = update->secondary; - const char* name = NULL; + const char* name = nullptr; BOOL defaultReturn = 0; defaultReturn = freerdp_settings_get_bool(settings, FreeRDP_DeactivateClientDecoding); diff --git a/libfreerdp/core/peer.c b/libfreerdp/core/peer.c index 21034f4b2..c05860496 100644 --- a/libfreerdp/core/peer.c +++ b/libfreerdp/core/peer.c @@ -50,9 +50,9 @@ static HANDLE freerdp_peer_virtual_channel_open(freerdp_peer* client, const char { UINT32 index = 0; BOOL joined = FALSE; - rdpMcsChannel* mcsChannel = NULL; - rdpPeerChannel* peerChannel = NULL; - rdpMcs* mcs = NULL; + rdpMcsChannel* mcsChannel = nullptr; + rdpPeerChannel* peerChannel = nullptr; + rdpMcs* mcs = nullptr; WINPR_ASSERT(client); WINPR_ASSERT(client->context); @@ -62,12 +62,12 @@ static HANDLE freerdp_peer_virtual_channel_open(freerdp_peer* client, const char WINPR_ASSERT(mcs); if (flags & WTS_CHANNEL_OPTION_DYNAMIC) - return NULL; /* not yet supported */ + return nullptr; /* not yet supported */ const size_t length = strnlen(name, 9); if (length > 8) - return NULL; /* SVC maximum name length is 8 */ + return nullptr; /* SVC maximum name length is 8 */ for (; index < mcs->channelCount; index++) { @@ -84,7 +84,7 @@ static HANDLE freerdp_peer_virtual_channel_open(freerdp_peer* client, const char } if (!joined) - return NULL; /* channel is not joined */ + return nullptr; /* channel is not joined */ peerChannel = (rdpPeerChannel*)mcsChannel->handle; @@ -96,7 +96,7 @@ static HANDLE freerdp_peer_virtual_channel_open(freerdp_peer* client, const char WINPR_ASSERT(index <= UINT16_MAX); peerChannel = - server_channel_common_new(client, (UINT16)index, mcsChannel->ChannelId, 128, NULL, name); + server_channel_common_new(client, (UINT16)index, mcsChannel->ChannelId, 128, nullptr, name); if (peerChannel) { @@ -111,8 +111,8 @@ static HANDLE freerdp_peer_virtual_channel_open(freerdp_peer* client, const char static BOOL freerdp_peer_virtual_channel_close(WINPR_ATTR_UNUSED freerdp_peer* client, HANDLE hChannel) { - rdpMcsChannel* mcsChannel = NULL; - rdpPeerChannel* peerChannel = NULL; + rdpMcsChannel* mcsChannel = nullptr; + rdpPeerChannel* peerChannel = nullptr; WINPR_ASSERT(client); @@ -122,7 +122,7 @@ static BOOL freerdp_peer_virtual_channel_close(WINPR_ATTR_UNUSED freerdp_peer* c peerChannel = (rdpPeerChannel*)hChannel; mcsChannel = peerChannel->mcsChannel; WINPR_ASSERT(mcsChannel); - mcsChannel->handle = NULL; + mcsChannel->handle = nullptr; server_channel_common_free(peerChannel); return TRUE; } @@ -130,14 +130,14 @@ static BOOL freerdp_peer_virtual_channel_close(WINPR_ATTR_UNUSED freerdp_peer* c static int freerdp_peer_virtual_channel_write(freerdp_peer* client, HANDLE hChannel, const BYTE* buffer, UINT32 length) { - wStream* s = NULL; + wStream* s = nullptr; UINT32 flags = 0; UINT32 chunkSize = 0; UINT32 maxChunkSize = 0; UINT32 totalLength = 0; - rdpPeerChannel* peerChannel = NULL; - rdpMcsChannel* mcsChannel = NULL; - rdpRdp* rdp = NULL; + rdpPeerChannel* peerChannel = nullptr; + rdpMcsChannel* mcsChannel = nullptr; + rdpRdp* rdp = nullptr; WINPR_ASSERT(client); WINPR_ASSERT(client->context); @@ -211,7 +211,7 @@ static void* freerdp_peer_virtual_channel_get_data(WINPR_ATTR_UNUSED freerdp_pee WINPR_ASSERT(client); if (!hChannel) - return NULL; + return nullptr; return peerChannel->extra; } @@ -238,8 +238,8 @@ static BOOL freerdp_peer_set_state(freerdp_peer* client, CONNECTION_STATE state) static BOOL freerdp_peer_initialize(freerdp_peer* client) { - rdpRdp* rdp = NULL; - rdpSettings* settings = NULL; + rdpRdp* rdp = nullptr; + rdpSettings* settings = nullptr; WINPR_ASSERT(client); WINPR_ASSERT(client->context); @@ -283,7 +283,7 @@ static BOOL freerdp_peer_initialize(freerdp_peer* client) #if defined(WITH_FREERDP_DEPRECATED) static BOOL freerdp_peer_get_fds(freerdp_peer* client, void** rfds, int* rcount) { - rdpTransport* transport = NULL; + rdpTransport* transport = nullptr; WINPR_ASSERT(client); WINPR_ASSERT(client->context); WINPR_ASSERT(client->context->rdp); @@ -297,8 +297,8 @@ static BOOL freerdp_peer_get_fds(freerdp_peer* client, void** rfds, int* rcount) static HANDLE freerdp_peer_get_event_handle(freerdp_peer* client) { - HANDLE hEvent = NULL; - rdpTransport* transport = NULL; + HANDLE hEvent = nullptr; + rdpTransport* transport = nullptr; WINPR_ASSERT(client); WINPR_ASSERT(client->context); WINPR_ASSERT(client->context->rdp); @@ -319,7 +319,7 @@ static DWORD freerdp_peer_get_event_handles(freerdp_peer* client, HANDLE* events static BOOL freerdp_peer_check_fds(freerdp_peer* peer) { int status = 0; - rdpRdp* rdp = NULL; + rdpRdp* rdp = nullptr; WINPR_ASSERT(peer); WINPR_ASSERT(peer->context); @@ -338,7 +338,7 @@ static state_run_t peer_recv_data_pdu(freerdp_peer* client, wStream* s, UINT32 share_id = 0; BYTE compressed_type = 0; UINT16 compressed_len = 0; - rdpUpdate* update = NULL; + rdpUpdate* update = nullptr; WINPR_ASSERT(s); WINPR_ASSERT(client); @@ -506,7 +506,7 @@ static state_run_t peer_recv_tpkt_pdu(freerdp_peer* client, wStream* s) { if (!settings->UseRdpSecurityLayer) { - if (!rdp_read_security_header(rdp, s, &securityFlags, NULL)) + if (!rdp_read_security_header(rdp, s, &securityFlags, nullptr)) return STATE_RUN_FAILED; } @@ -526,7 +526,7 @@ static state_run_t peer_recv_tpkt_pdu(freerdp_peer* client, wStream* s) static state_run_t peer_recv_handle_auto_detect(freerdp_peer* client, wStream* s) { state_run_t ret = STATE_RUN_FAILED; - rdpRdp* rdp = NULL; + rdpRdp* rdp = nullptr; WINPR_ASSERT(client); WINPR_ASSERT(s); @@ -600,8 +600,8 @@ static state_run_t peer_recv_handle_auto_detect(freerdp_peer* client, wStream* s static state_run_t peer_recv_handle_licensing(freerdp_peer* client, wStream* s) { state_run_t ret = STATE_RUN_FAILED; - rdpRdp* rdp = NULL; - rdpSettings* settings = NULL; + rdpRdp* rdp = nullptr; + rdpSettings* settings = nullptr; WINPR_ASSERT(client); WINPR_ASSERT(s); @@ -652,10 +652,10 @@ static state_run_t peer_recv_handle_licensing(freerdp_peer* client, wStream* s) static state_run_t peer_recv_fastpath_pdu(freerdp_peer* client, wStream* s) { - rdpRdp* rdp = NULL; + rdpRdp* rdp = nullptr; UINT16 length = 0; BOOL rc = 0; - rdpFastPath* fastpath = NULL; + rdpFastPath* fastpath = nullptr; WINPR_ASSERT(s); WINPR_ASSERT(client); @@ -997,7 +997,7 @@ static state_run_t peer_recv_callback_internal(WINPR_ATTR_UNUSED rdpTransport* t case CONNECTION_STATE_CAPABILITIES_EXCHANGE_MONITOR_LAYOUT: if (freerdp_settings_get_bool(settings, FreeRDP_SupportMonitorLayoutPdu)) { - MONITOR_DEF* monitors = NULL; + MONITOR_DEF* monitors = nullptr; if (client->AdjustMonitorsLayout) { @@ -1178,7 +1178,7 @@ static state_run_t peer_recv_callback(rdpTransport* transport, wStream* s, void* const size_t start = Stream_GetPosition(s); const rdpContext* context = transport_get_context(transport); DWORD level = WLOG_TRACE; - static wLog* log = NULL; + static wLog* log = nullptr; if (!log) log = WLog_Get(TAG); @@ -1207,7 +1207,7 @@ static state_run_t peer_recv_callback(rdpTransport* transport, wStream* s, void* static BOOL freerdp_peer_close(freerdp_peer* client) { UINT32 SelectedProtocol = 0; - rdpContext* context = NULL; + rdpContext* context = nullptr; WINPR_ASSERT(client); @@ -1244,7 +1244,7 @@ static BOOL freerdp_peer_close(freerdp_peer* client) static void freerdp_peer_disconnect(freerdp_peer* client) { - rdpTransport* transport = NULL; + rdpTransport* transport = nullptr; WINPR_ASSERT(client); transport = freerdp_get_transport(client->context); @@ -1294,7 +1294,7 @@ static BOOL freerdp_peer_send_channel_packet(freerdp_peer* client, UINT16 channe static BOOL freerdp_peer_is_write_blocked(freerdp_peer* peer) { - rdpTransport* transport = NULL; + rdpTransport* transport = nullptr; WINPR_ASSERT(peer); WINPR_ASSERT(peer->context); WINPR_ASSERT(peer->context->rdp); @@ -1305,7 +1305,7 @@ static BOOL freerdp_peer_is_write_blocked(freerdp_peer* peer) static int freerdp_peer_drain_output_buffer(freerdp_peer* peer) { - rdpTransport* transport = NULL; + rdpTransport* transport = nullptr; WINPR_ASSERT(peer); WINPR_ASSERT(peer->context); WINPR_ASSERT(peer->context->rdp); @@ -1325,7 +1325,7 @@ static BOOL freerdp_peer_has_more_to_read(freerdp_peer* peer) static LicenseCallbackResult freerdp_peer_nolicense(freerdp_peer* peer, WINPR_ATTR_UNUSED wStream* s) { - rdpRdp* rdp = NULL; + rdpRdp* rdp = nullptr; WINPR_ASSERT(peer); WINPR_ASSERT(peer->context); @@ -1343,7 +1343,7 @@ static LicenseCallbackResult freerdp_peer_nolicense(freerdp_peer* peer, BOOL freerdp_peer_context_new(freerdp_peer* client) { - return freerdp_peer_context_new_ex(client, NULL); + return freerdp_peer_context_new_ex(client, nullptr); } void freerdp_peer_context_free(freerdp_peer* client) @@ -1358,18 +1358,18 @@ void freerdp_peer_context_free(freerdp_peer* client) rdpContext* ctx = client->context; (void)CloseHandle(ctx->channelErrorEvent); - ctx->channelErrorEvent = NULL; + ctx->channelErrorEvent = nullptr; free(ctx->errorDescription); - ctx->errorDescription = NULL; + ctx->errorDescription = nullptr; rdp_free(ctx->rdp); - ctx->rdp = NULL; + ctx->rdp = nullptr; metrics_free(ctx->metrics); - ctx->metrics = NULL; + ctx->metrics = nullptr; stream_dump_free(ctx->dump); - ctx->dump = NULL; + ctx->dump = nullptr; free(ctx); } - client->context = NULL; + client->context = nullptr; } static const char* os_major_type_to_string(UINT16 osMajorType) @@ -1463,7 +1463,7 @@ freerdp_peer* freerdp_peer_new(int sockfd) freerdp_peer* client = (freerdp_peer*)calloc(1, sizeof(freerdp_peer)); if (!client) - return NULL; + return nullptr; if (sockfd >= 0) { @@ -1492,7 +1492,7 @@ freerdp_peer* freerdp_peer_new(int sockfd) client->VirtualChannelOpen = freerdp_peer_virtual_channel_open; client->VirtualChannelClose = freerdp_peer_virtual_channel_close; client->VirtualChannelWrite = freerdp_peer_virtual_channel_write; - client->VirtualChannelRead = NULL; /* must be defined by server application */ + client->VirtualChannelRead = nullptr; /* must be defined by server application */ client->VirtualChannelGetData = freerdp_peer_virtual_channel_get_data; client->VirtualChannelSetData = freerdp_peer_virtual_channel_set_data; client->SetState = freerdp_peer_set_state; @@ -1514,7 +1514,7 @@ void freerdp_peer_free(freerdp_peer* client) static BOOL freerdp_peer_transport_setup(freerdp_peer* client) { - rdpRdp* rdp = NULL; + rdpRdp* rdp = nullptr; WINPR_ASSERT(client); WINPR_ASSERT(client->context); @@ -1537,8 +1537,8 @@ static BOOL freerdp_peer_transport_setup(freerdp_peer* client) BOOL freerdp_peer_context_new_ex(freerdp_peer* client, const rdpSettings* settings) { - rdpRdp* rdp = NULL; - rdpContext* context = NULL; + rdpRdp* rdp = nullptr; + rdpContext* context = nullptr; BOOL ret = TRUE; if (!client) @@ -1586,7 +1586,7 @@ BOOL freerdp_peer_context_new_ex(freerdp_peer* client, const rdpSettings* settin update_register_server_callbacks(rdp->update); autodetect_register_server_callbacks(rdp->autodetect); - if (!(context->channelErrorEvent = CreateEvent(NULL, TRUE, FALSE, NULL))) + if (!(context->channelErrorEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr))) { WLog_ERR(TAG, "CreateEvent failed!"); goto fail; diff --git a/libfreerdp/core/proxy.c b/libfreerdp/core/proxy.c index 70c3c737c..444541b74 100644 --- a/libfreerdp/core/proxy.c +++ b/libfreerdp/core/proxy.c @@ -119,7 +119,7 @@ static BOOL value_to_int(const char* value, LONGLONG* result, LONGLONG min, LONG return FALSE; errno = 0; - rc = _strtoi64(value, NULL, 0); + rc = _strtoi64(value, nullptr, 0); if (errno != 0) return FALSE; @@ -237,7 +237,7 @@ static BOOL no_proxy_match_ip(const char* val, const char* hostname) if (sub) { - const unsigned long usub = strtoul(sub, NULL, 0); + const unsigned long usub = strtoul(sub, nullptr, 0); if ((errno == 0) && (usub <= UINT8_MAX)) return cidr4_match(&sa4.sin_addr, &mask.sin_addr, (UINT8)usub); } @@ -275,7 +275,7 @@ static BOOL no_proxy_match_ip(const char* val, const char* hostname) if (sub) { - const unsigned long usub = strtoul(sub, NULL, 0); + const unsigned long usub = strtoul(sub, nullptr, 0); if ((errno == 0) && (usub <= UINT8_MAX)) return cidr6_match(&sa6.sin6_addr, &mask.sin6_addr, (UINT8)usub); } @@ -288,7 +288,7 @@ static BOOL check_no_proxy(rdpSettings* settings, const char* no_proxy) { const char* delimiter = ", "; BOOL result = FALSE; - char* context = NULL; + char* context = nullptr; if (!no_proxy || !settings) return FALSE; @@ -314,7 +314,7 @@ static BOOL check_no_proxy(rdpSettings* settings, const char* no_proxy) result = TRUE; } - current = strtok_s(NULL, delimiter, &context); + current = strtok_s(nullptr, delimiter, &context); } free(copy); @@ -323,7 +323,7 @@ static BOOL check_no_proxy(rdpSettings* settings, const char* no_proxy) void proxy_read_environment(rdpSettings* settings, char* envname) { - const DWORD envlen = GetEnvironmentVariableA(envname, NULL, 0); + const DWORD envlen = GetEnvironmentVariableA(envname, nullptr, 0); if (!envlen || (envlen <= 1)) return; @@ -576,10 +576,10 @@ static BOOL http_proxy_connect(rdpContext* context, BIO* bufferedBio, const char { BOOL rc = FALSE; int status = 0; - wStream* s = NULL; + wStream* s = nullptr; char port_str[10] = WINPR_C_ARRAY_INIT; char recv_buf[256] = WINPR_C_ARRAY_INIT; - char* eol = NULL; + char* eol = nullptr; size_t resultsize = 0; size_t reserveSize = 0; size_t portLen = 0; @@ -598,7 +598,7 @@ static BOOL http_proxy_connect(rdpContext* context, BIO* bufferedBio, const char hostLen = strlen(hostname); portLen = strnlen(port_str, sizeof(port_str)); reserveSize = strlen(connect) + (hostLen + 1ull + portLen) * 2ull + strlen(httpheader); - s = Stream_New(NULL, reserveSize); + s = Stream_New(nullptr, reserveSize); if (!s) goto fail; @@ -624,7 +624,7 @@ static BOOL http_proxy_connect(rdpContext* context, BIO* bufferedBio, const char else { const char basic[] = CRLF "Proxy-Authorization: Basic "; - char* base64 = NULL; + char* base64 = nullptr; (void)sprintf_s(creds, size, "%s:%s", proxyUsername, proxyPassword); base64 = crypto_base64_encode((const BYTE*)creds, size - 1); @@ -668,7 +668,7 @@ static BOOL http_proxy_connect(rdpContext* context, BIO* bufferedBio, const char * Keep recv_buf a null-terminated string. */ { const UINT64 start = GetTickCount64(); - while (strstr(recv_buf, CRLF CRLF) == NULL) + while (strstr(recv_buf, CRLF CRLF) == nullptr) { if (resultsize >= sizeof(recv_buf) - 1) { diff --git a/libfreerdp/core/rdp.c b/libfreerdp/core/rdp.c index ef5770678..9a29607f6 100644 --- a/libfreerdp/core/rdp.c +++ b/libfreerdp/core/rdp.c @@ -422,7 +422,7 @@ static BOOL rdp_security_stream_init(rdpRdp* rdp, wStream* s, BOOL sec_header, U wStream* rdp_send_stream_init(rdpRdp* rdp, UINT16* sec_flags) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(rdp); WINPR_ASSERT(rdp->transport); @@ -430,7 +430,7 @@ wStream* rdp_send_stream_init(rdpRdp* rdp, UINT16* sec_flags) s = transport_send_stream_init(rdp->transport, 4096); if (!s) - return NULL; + return nullptr; if (!Stream_SafeSeek(s, RDP_PACKET_HEADER_MAX_LENGTH)) goto fail; @@ -441,7 +441,7 @@ wStream* rdp_send_stream_init(rdpRdp* rdp, UINT16* sec_flags) return s; fail: Stream_Release(s); - return NULL; + return nullptr; } wStream* rdp_send_stream_pdu_init(rdpRdp* rdp, UINT16* sec_flags) @@ -449,7 +449,7 @@ wStream* rdp_send_stream_pdu_init(rdpRdp* rdp, UINT16* sec_flags) wStream* s = rdp_send_stream_init(rdp, sec_flags); if (!s) - return NULL; + return nullptr; if (!Stream_SafeSeek(s, RDP_SHARE_CONTROL_HEADER_LENGTH)) goto fail; @@ -457,7 +457,7 @@ wStream* rdp_send_stream_pdu_init(rdpRdp* rdp, UINT16* sec_flags) return s; fail: Stream_Release(s); - return NULL; + return nullptr; } wStream* rdp_data_pdu_init(rdpRdp* rdp, UINT16* sec_flags) @@ -465,7 +465,7 @@ wStream* rdp_data_pdu_init(rdpRdp* rdp, UINT16* sec_flags) wStream* s = rdp_send_stream_pdu_init(rdp, sec_flags); if (!s) - return NULL; + return nullptr; if (!Stream_SafeSeek(s, RDP_SHARE_DATA_HEADER_LENGTH)) goto fail; @@ -473,7 +473,7 @@ wStream* rdp_data_pdu_init(rdpRdp* rdp, UINT16* sec_flags) return s; fail: Stream_Release(s); - return NULL; + return nullptr; } BOOL rdp_set_error_info(rdpRdp* rdp, UINT32 errorInfo) @@ -514,14 +514,14 @@ BOOL rdp_set_error_info(rdpRdp* rdp, UINT32 errorInfo) wStream* rdp_message_channel_pdu_init(rdpRdp* rdp, UINT16* sec_flags) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(rdp); s = transport_send_stream_init(rdp->transport, 4096); if (!s) - return NULL; + return nullptr; if (!Stream_SafeSeek(s, RDP_PACKET_HEADER_MAX_LENGTH)) goto fail; @@ -532,7 +532,7 @@ wStream* rdp_message_channel_pdu_init(rdpRdp* rdp, UINT16* sec_flags) return s; fail: Stream_Release(s); - return NULL; + return nullptr; } /** @@ -1104,7 +1104,7 @@ static BOOL rdp_recv_server_status_info_pdu(rdpRdp* rdp, wStream* s) static BOOL rdp_recv_monitor_layout_pdu(rdpRdp* rdp, wStream* s) { UINT32 monitorCount = 0; - MONITOR_DEF* monitorDefArray = NULL; + MONITOR_DEF* monitorDefArray = nullptr; BOOL ret = TRUE; WINPR_ASSERT(rdp); @@ -1141,7 +1141,7 @@ static BOOL rdp_recv_monitor_layout_pdu(rdpRdp* rdp, wStream* s) state_run_t rdp_recv_data_pdu(rdpRdp* rdp, wStream* s) { BYTE type = 0; - wStream* cs = NULL; + wStream* cs = nullptr; UINT16 length = 0; UINT32 shareId = 0; BYTE compressedType = 0; @@ -1168,7 +1168,7 @@ state_run_t rdp_recv_data_pdu(rdpRdp* rdp, wStream* s) } UINT32 DstSize = 0; - const BYTE* pDstData = NULL; + const BYTE* pDstData = nullptr; UINT16 SrcSize = compressedLength - 18; if (!Stream_CheckAndLogRequiredLengthWLog(rdp->log, s, SrcSize)) @@ -1490,7 +1490,7 @@ BOOL rdp_read_flow_control_pdu(rdpRdp* rdp, wStream* s, UINT16* type, UINT16* ch * * @param rdp RDP module * @param s stream - * @param pLength A pointer to the result variable, must not be NULL + * @param pLength A pointer to the result variable, must not be nullptr * @param securityFlags the security flags to apply * * @return \b TRUE for success, \b FALSE otherwise @@ -1603,7 +1603,7 @@ unlock: const char* pdu_type_to_str(UINT16 pduType, char* buffer, size_t length) { - const char* str = NULL; + const char* str = nullptr; switch (pduType) { case PDU_TYPE_DEMAND_ACTIVE: @@ -1713,11 +1713,11 @@ static state_run_t rdp_recv_tpkt_pdu(rdpRdp* rdp, wStream* s) while (Stream_GetRemainingLength(s) > 3) { wStream subbuffer; - wStream* sub = NULL; + wStream* sub = nullptr; size_t diff = 0; UINT16 remain = 0; - if (!rdp_read_share_control_header(rdp, s, NULL, &remain, &pduType, &pduSource)) + if (!rdp_read_share_control_header(rdp, s, nullptr, &remain, &pduType, &pduSource)) return STATE_RUN_FAILED; sub = Stream_StaticInit(&subbuffer, Stream_Pointer(s), remain); @@ -2231,7 +2231,7 @@ BOOL rdp_channel_send_packet(rdpRdp* rdp, UINT16 channelId, size_t totalSize, UI BOOL rdp_send_error_info(rdpRdp* rdp) { UINT16 sec_flags = 0; - wStream* s = NULL; + wStream* s = nullptr; BOOL status = 0; if (rdp->errorInfo == ERRINFO_SUCCESS) @@ -2250,8 +2250,8 @@ BOOL rdp_send_error_info(rdpRdp* rdp) int rdp_check_fds(rdpRdp* rdp) { int status = 0; - rdpTsg* tsg = NULL; - rdpTransport* transport = NULL; + rdpTsg* tsg = nullptr; + rdpTransport* transport = nullptr; WINPR_ASSERT(rdp); transport = rdp->transport; @@ -2354,13 +2354,13 @@ rdpRdp* rdp_new(rdpContext* context) rdpRdp* rdp = (rdpRdp*)calloc(1, sizeof(rdpRdp)); if (!rdp) - return NULL; + return nullptr; rdp->log = WLog_Get(RDP_TAG); WINPR_ASSERT(rdp->log); (void)_snprintf(rdp->log_context, sizeof(rdp->log_context), "%p", (void*)context); - WLog_SetContext(rdp->log, NULL, rdp->log_context); + WLog_SetContext(rdp->log, nullptr, rdp->log_context); InitializeCriticalSection(&rdp->critical); rdp->context = context; @@ -2450,7 +2450,7 @@ rdpRdp* rdp_new(rdpContext* context) if (!rdp->pubSub) goto fail; - rdp->abortEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + rdp->abortEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!rdp->abortEvent) goto fail; @@ -2465,7 +2465,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC rdp_free(rdp); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } static void rdp_reset_free(rdpRdp* rdp) @@ -2478,8 +2478,8 @@ static void rdp_reset_free(rdpRdp* rdp) winpr_Cipher_Free(rdp->fips_encrypt); winpr_Cipher_Free(rdp->fips_decrypt); - rdp->fips_encrypt = NULL; - rdp->fips_decrypt = NULL; + rdp->fips_encrypt = nullptr; + rdp->fips_decrypt = nullptr; security_unlock(rdp); aad_free(rdp->aad); @@ -2489,12 +2489,12 @@ static void rdp_reset_free(rdpRdp* rdp) transport_free(rdp->transport); fastpath_free(rdp->fastpath); - rdp->aad = NULL; - rdp->mcs = NULL; - rdp->nego = NULL; - rdp->license = NULL; - rdp->transport = NULL; - rdp->fastpath = NULL; + rdp->aad = nullptr; + rdp->mcs = nullptr; + rdp->nego = nullptr; + rdp->license = nullptr; + rdp->transport = nullptr; + rdp->fastpath = nullptr; } BOOL rdp_reset(rdpRdp* rdp) @@ -2510,13 +2510,13 @@ BOOL rdp_reset(rdpRdp* rdp) rdp_reset_free(rdp); - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ServerRandom, NULL, 0)) + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ServerRandom, nullptr, 0)) rc = FALSE; - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ServerCertificate, NULL, 0)) + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ServerCertificate, nullptr, 0)) rc = FALSE; - if (!freerdp_settings_set_string(settings, FreeRDP_ClientAddress, NULL)) + if (!freerdp_settings_set_string(settings, FreeRDP_ClientAddress, nullptr)) rc = FALSE; if (!rc) @@ -2581,7 +2581,7 @@ BOOL rdp_io_callback_set_event(rdpRdp* rdp, BOOL set) const rdpTransportIo* rdp_get_io_callbacks(rdpRdp* rdp) { if (!rdp) - return NULL; + return nullptr; return rdp->io; } @@ -2590,7 +2590,7 @@ BOOL rdp_set_io_callbacks(rdpRdp* rdp, const rdpTransportIo* io_callbacks) if (!rdp) return FALSE; free(rdp->io); - rdp->io = NULL; + rdp->io = nullptr; if (io_callbacks) { rdp->io = malloc(sizeof(rdpTransportIo)); @@ -2691,21 +2691,21 @@ BOOL rdp_reset_rc4_encrypt_keys(rdpRdp* rdp) rdp->rc4_encrypt_key = winpr_RC4_New(rdp->encrypt_key, rdp->rc4_key_len); rdp->encrypt_use_count = 0; - return rdp->rc4_encrypt_key != NULL; + return rdp->rc4_encrypt_key != nullptr; } void rdp_free_rc4_encrypt_keys(rdpRdp* rdp) { WINPR_ASSERT(rdp); winpr_RC4_Free(rdp->rc4_encrypt_key); - rdp->rc4_encrypt_key = NULL; + rdp->rc4_encrypt_key = nullptr; } void rdp_free_rc4_decrypt_keys(rdpRdp* rdp) { WINPR_ASSERT(rdp); winpr_RC4_Free(rdp->rc4_decrypt_key); - rdp->rc4_decrypt_key = NULL; + rdp->rc4_decrypt_key = nullptr; } BOOL rdp_reset_rc4_decrypt_keys(rdpRdp* rdp) @@ -2715,7 +2715,7 @@ BOOL rdp_reset_rc4_decrypt_keys(rdpRdp* rdp) rdp->rc4_decrypt_key = winpr_RC4_New(rdp->decrypt_key, rdp->rc4_key_len); rdp->decrypt_use_count = 0; - return rdp->rc4_decrypt_key != NULL; + return rdp->rc4_decrypt_key != nullptr; } const char* rdp_security_flag_string(UINT32 securityFlags, char* buffer, size_t size) @@ -2770,7 +2770,7 @@ static BOOL rdp_reset_remote_settings(rdpRdp* rdp) if (!freerdp_settings_get_bool(rdp->settings, FreeRDP_ServerMode)) flags |= FREERDP_SETTINGS_SERVER_MODE; rdp->remoteSettings = freerdp_settings_new(flags); - return rdp->remoteSettings != NULL; + return rdp->remoteSettings != nullptr; } BOOL rdp_set_backup_settings(rdpRdp* rdp) @@ -2827,7 +2827,7 @@ static BOOL parse_on_off_option(const char* value) return FALSE; errno = 0; - long val = strtol(value, NULL, 0); + long val = strtol(value, nullptr, 0); if (errno == 0) return (val != 0); @@ -2937,14 +2937,14 @@ static void log_build_warn(rdpRdp* rdp, const char* what, const char* msg, if (config && list) { - char* saveptr = NULL; + char* saveptr = nullptr; char* tok = strtok_s(config, " ", &saveptr); while (tok) { if (cmp(rdp->log, tok)) winpr_str_append(tok, list, len, " "); - tok = strtok_s(NULL, " ", &saveptr); + tok = strtok_s(nullptr, " ", &saveptr); } } free(config); @@ -2956,12 +2956,12 @@ static void log_build_warn(rdpRdp* rdp, const char* what, const char* msg, WLog_Print(rdp->log, WLOG_WARN, "*************************************************"); WLog_Print(rdp->log, WLOG_WARN, "This build is using [%s] build options:", what); - char* saveptr = NULL; + char* saveptr = nullptr; char* tok = strtok_s(list, " ", &saveptr); while (tok) { WLog_Print(rdp->log, WLOG_WARN, "* '%s'", tok); - tok = strtok_s(NULL, " ", &saveptr); + tok = strtok_s(nullptr, " ", &saveptr); } WLog_Print(rdp->log, WLOG_WARN, "*"); WLog_Print(rdp->log, WLOG_WARN, "[%s] build options %s", what, msg); @@ -3019,7 +3019,7 @@ static void log_build_warn_cipher(rdpRdp* rdp, log_line_t* firstLine, WINPR_CIPH if (md == WINPR_CIPHER_ARC4_128) { WINPR_RC4_CTX* enc = winpr_RC4_New(key, sizeof(key)); - haveCipher = enc != NULL; + haveCipher = enc != nullptr; winpr_RC4_Free(enc); } else diff --git a/libfreerdp/core/rdstls.c b/libfreerdp/core/rdstls.c index 852d28732..18f1c117e 100644 --- a/libfreerdp/core/rdstls.c +++ b/libfreerdp/core/rdstls.c @@ -120,7 +120,7 @@ rdpRdstls* rdstls_new(rdpContext* context, rdpTransport* transport) rdpRdstls* rdstls = (rdpRdstls*)calloc(1, sizeof(rdpRdstls)); if (!rdstls) - return NULL; + return nullptr; rdstls->log = WLog_Get(FREERDP_TAG("core.rdstls")); rdstls->context = context; rdstls->transport = transport; @@ -408,8 +408,8 @@ static BOOL rdstls_read_unicode_string(WINPR_ATTR_UNUSED wLog* log, wStream* s, return TRUE; } - *str = Stream_Read_UTF16_String_As_UTF8(s, length / sizeof(WCHAR), NULL); - return (*str) != NULL; + *str = Stream_Read_UTF16_String_As_UTF8(s, length / sizeof(WCHAR), nullptr); + return (*str) != nullptr; } static BOOL rdstls_read_data(WINPR_ATTR_UNUSED wLog* log, wStream* s, UINT16* pLength, @@ -418,7 +418,7 @@ static BOOL rdstls_read_data(WINPR_ATTR_UNUSED wLog* log, wStream* s, UINT16* pL WINPR_ASSERT(pLength); WINPR_ASSERT(pData); - *pData = NULL; + *pData = nullptr; *pLength = 0; if (!Stream_CheckAndLogRequiredLengthWLog(log, s, 2)) return FALSE; @@ -493,11 +493,11 @@ static BOOL rdstls_process_authentication_request_with_password(rdpRdstls* rdstl BOOL rc = FALSE; - const BYTE* clientRedirectionGuid = NULL; + const BYTE* clientRedirectionGuid = nullptr; UINT16 clientRedirectionGuidLength = 0; - char* clientPassword = NULL; - char* clientUsername = NULL; - char* clientDomain = NULL; + char* clientPassword = nullptr; + char* clientUsername = nullptr; + char* clientDomain = nullptr; const rdpSettings* settings = rdstls->context->settings; WINPR_ASSERT(settings); @@ -643,7 +643,7 @@ static BOOL rdstls_process_authentication_response(rdpRdstls* rdstls, wStream* s static BOOL rdstls_send(WINPR_ATTR_UNUSED rdpTransport* transport, wStream* s, void* extra) { rdpRdstls* rdstls = (rdpRdstls*)extra; - rdpSettings* settings = NULL; + rdpSettings* settings = nullptr; WINPR_ASSERT(transport); WINPR_ASSERT(s); @@ -670,7 +670,7 @@ static BOOL rdstls_send(WINPR_ATTR_UNUSED rdpTransport* transport, wStream* s, v if (!rdstls_write_authentication_request_with_password(rdstls, s)) return FALSE; } - else if (settings->ServerAutoReconnectCookie != NULL) + else if (settings->ServerAutoReconnectCookie != nullptr) { if (!rdstls_write_authentication_request_with_cookie(rdstls, s)) return FALSE; @@ -767,7 +767,7 @@ static BOOL rdstls_send_capabilities(rdpRdstls* rdstls) if (!rdstls_check_state_requirements(rdstls, RDSTLS_STATE_CAPABILITIES)) return FALSE; - wStream* s = Stream_New(NULL, 512); + wStream* s = Stream_New(nullptr, 512); if (!s) goto fail; @@ -788,7 +788,7 @@ static BOOL rdstls_recv_authentication_request(rdpRdstls* rdstls) if (!rdstls_check_state_requirements(rdstls, RDSTLS_STATE_AUTH_REQ)) return FALSE; - wStream* s = Stream_New(NULL, 4096); + wStream* s = Stream_New(nullptr, 4096); if (!s) goto fail; @@ -819,7 +819,7 @@ static BOOL rdstls_send_authentication_response(rdpRdstls* rdstls) if (!rdstls_check_state_requirements(rdstls, RDSTLS_STATE_AUTH_RSP)) return FALSE; - wStream* s = Stream_New(NULL, 512); + wStream* s = Stream_New(nullptr, 512); if (!s) goto fail; @@ -840,7 +840,7 @@ static BOOL rdstls_recv_capabilities(rdpRdstls* rdstls) if (!rdstls_check_state_requirements(rdstls, RDSTLS_STATE_CAPABILITIES)) return FALSE; - wStream* s = Stream_New(NULL, 512); + wStream* s = Stream_New(nullptr, 512); if (!s) goto fail; @@ -871,7 +871,7 @@ static BOOL rdstls_send_authentication_request(rdpRdstls* rdstls) if (!rdstls_check_state_requirements(rdstls, RDSTLS_STATE_AUTH_REQ)) return FALSE; - wStream* s = Stream_New(NULL, 4096); + wStream* s = Stream_New(nullptr, 4096); if (!s) goto fail; @@ -894,7 +894,7 @@ static BOOL rdstls_recv_authentication_response(rdpRdstls* rdstls) if (!rdstls_check_state_requirements(rdstls, RDSTLS_STATE_AUTH_RSP)) return FALSE; - wStream* s = Stream_New(NULL, 512); + wStream* s = Stream_New(nullptr, 512); if (!s) goto fail; diff --git a/libfreerdp/core/redirection.c b/libfreerdp/core/redirection.c index cb3dd8f5d..1de5d3895 100644 --- a/libfreerdp/core/redirection.c +++ b/libfreerdp/core/redirection.c @@ -71,7 +71,7 @@ static void redirection_free_array(char*** what, UINT32* count) free((void*)*what); } - *what = NULL; + *what = nullptr; *count = 0; } @@ -79,7 +79,7 @@ static void redirection_free_string(char** str) { WINPR_ASSERT(str); free(*str); - *str = NULL; + *str = nullptr; } static void redirection_free_data(BYTE** str, UINT32* length) @@ -88,7 +88,7 @@ static void redirection_free_data(BYTE** str, UINT32* length) free(*str); if (length) *length = 0; - *str = NULL; + *str = nullptr; } static BOOL redirection_copy_string(char** dst, const char* str) @@ -98,7 +98,7 @@ static BOOL redirection_copy_string(char** dst, const char* str) return TRUE; *dst = _strdup(str); - return *dst != NULL; + return *dst != nullptr; } static BOOL redirection_copy_data(BYTE** dst, UINT32* plen, const BYTE* str, size_t len) @@ -115,7 +115,7 @@ static BOOL redirection_copy_data(BYTE** dst, UINT32* plen, const BYTE* str, siz return FALSE; memcpy(*dst, str, len); *plen = (UINT32)len; - return *dst != NULL; + return *dst != nullptr; } static BOOL redirection_copy_array(char*** dst, UINT32* plen, const char** str, size_t len) @@ -144,7 +144,7 @@ static BOOL redirection_copy_array(char*** dst, UINT32* plen, const char** str, } } - return *dst != NULL; + return *dst != nullptr; } static BOOL rdp_redirection_get_data(wStream* s, UINT32* pLength, const BYTE** pData) @@ -168,7 +168,7 @@ static BOOL rdp_redirection_get_data(wStream* s, UINT32* pLength, const BYTE** p static BOOL rdp_redirection_read_unicode_string(wStream* s, char** str, size_t maxLength) { UINT32 length = 0; - const BYTE* data = NULL; + const BYTE* data = nullptr; if (!rdp_redirection_get_data(s, &length, &data)) return FALSE; @@ -188,7 +188,7 @@ static BOOL rdp_redirection_read_unicode_string(wStream* s, char** str, size_t m } redirection_free_string(str); - *str = ConvertWCharNToUtf8Alloc(wstr, length / sizeof(WCHAR), NULL); + *str = ConvertWCharNToUtf8Alloc(wstr, length / sizeof(WCHAR), nullptr); if (!*str) { WLog_ERR(TAG, "failure: string conversion failed"); @@ -240,7 +240,7 @@ static BOOL rdp_redirection_read_base64_wchar(UINT32 flag, wStream* s, UINT32* p { BOOL rc = FALSE; char buffer[64] = WINPR_C_ARRAY_INIT; - const BYTE* ptr = NULL; + const BYTE* ptr = nullptr; if (!rdp_redirection_get_data(s, pLength, &ptr)) return FALSE; @@ -251,10 +251,10 @@ static BOOL rdp_redirection_read_base64_wchar(UINT32 flag, wStream* s, UINT32* p if (!utf8) goto fail; - redirection_free_data(pData, NULL); + redirection_free_data(pData, nullptr); utf8_len = strnlen(utf8, utf8_len); - *pData = NULL; + *pData = nullptr; if (utf8_len > 0) *pData = calloc(utf8_len, sizeof(BYTE)); if (!*pData) @@ -263,7 +263,7 @@ static BOOL rdp_redirection_read_base64_wchar(UINT32 flag, wStream* s, UINT32* p { size_t rlen = utf8_len; size_t wpos = 0; - char* saveptr = NULL; + char* saveptr = nullptr; char* tok = strtok_s(utf8, "\r\n", &saveptr); while (tok) { @@ -271,7 +271,7 @@ static BOOL rdp_redirection_read_base64_wchar(UINT32 flag, wStream* s, UINT32* p rlen -= len; size_t bplen = 0; - BYTE* bptr = NULL; + BYTE* bptr = nullptr; crypto_base64_decode(tok, len, &bptr, &bplen); if (!bptr) goto fail; @@ -279,7 +279,7 @@ static BOOL rdp_redirection_read_base64_wchar(UINT32 flag, wStream* s, UINT32* p wpos += bplen; free(bptr); - tok = strtok_s(NULL, "\r\n", &saveptr); + tok = strtok_s(nullptr, "\r\n", &saveptr); } if (wpos > UINT32_MAX) goto fail; @@ -357,10 +357,10 @@ BOOL rdp_redirection_read_target_cert(rdpCertificate** ptargetCertificate, const wStream* s = Stream_StaticConstInit(&sbuffer, data, length); freerdp_certificate_free(*ptargetCertificate); - *ptargetCertificate = NULL; + *ptargetCertificate = nullptr; size_t plength = 0; - const BYTE* ptr = NULL; + const BYTE* ptr = nullptr; while (Stream_GetRemainingLength(s) > 0) { UINT32 type = 0; @@ -398,7 +398,7 @@ BOOL rdp_redirection_read_target_cert(rdpCertificate** ptargetCertificate, const } } - return *ptargetCertificate != NULL; + return *ptargetCertificate != nullptr; } static BOOL rdp_redirection_write_target_cert(wStream* s, const rdpRedirection* redirection) @@ -427,7 +427,7 @@ fail: static BOOL rdp_redireciton_write_target_cert_stream(wStream* s, const rdpRedirection* redirection) { BOOL rc = FALSE; - wStream* serialized = Stream_New(NULL, 2048); + wStream* serialized = Stream_New(nullptr, 2048); if (!serialized) goto fail; @@ -445,7 +445,7 @@ fail: static BOOL rdp_redirection_read_target_cert_stream(wStream* s, rdpRedirection* redirection) { UINT32 length = 0; - BYTE* ptr = NULL; + BYTE* ptr = nullptr; WINPR_ASSERT(redirection); @@ -479,8 +479,8 @@ BOOL rdp_set_target_certificate(rdpSettings* settings, const rdpCertificate* tce int rdp_redirection_apply_settings(rdpRdp* rdp) { - rdpSettings* settings = NULL; - rdpRedirection* redirection = NULL; + rdpSettings* settings = nullptr; + rdpRedirection* redirection = nullptr; if (!rdp_reset_runtime_settings(rdp)) return -1; @@ -615,7 +615,7 @@ int rdp_redirection_apply_settings(rdpRdp* rdp) * Free previous LoadBalanceInfo, if any, otherwise it may end up * being reused for the redirected session, which is not what we want. */ - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_LoadBalanceInfo, NULL, 0)) + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_LoadBalanceInfo, nullptr, 0)) return -1; } @@ -644,12 +644,12 @@ int rdp_redirection_apply_settings(rdpRdp* rdp) static BOOL rdp_redirection_read_data(UINT32 flag, wStream* s, UINT32* pLength, BYTE** pData) { char buffer[64] = WINPR_C_ARRAY_INIT; - const BYTE* ptr = NULL; + const BYTE* ptr = nullptr; if (!rdp_redirection_get_data(s, pLength, &ptr)) return FALSE; - redirection_free_data(pData, NULL); + redirection_free_data(pData, nullptr); *pData = (BYTE*)malloc(*pLength); if (!*pData) diff --git a/libfreerdp/core/security.c b/libfreerdp/core/security.c index e41355a13..a0fefc48c 100644 --- a/libfreerdp/core/security.c +++ b/libfreerdp/core/security.c @@ -87,8 +87,8 @@ static BOOL security_salted_hash(const BYTE* salt, size_t salt_len, const BYTE* size_t length, const BYTE* salt1, size_t salt1_len, const BYTE* salt2, size_t salt2_len, BYTE* output, size_t out_len) { - WINPR_DIGEST_CTX* sha1 = NULL; - WINPR_DIGEST_CTX* md5 = NULL; + WINPR_DIGEST_CTX* sha1 = nullptr; + WINPR_DIGEST_CTX* md5 = nullptr; BYTE sha1_digest[WINPR_SHA1_DIGEST_LENGTH] = WINPR_C_ARRAY_INIT; BOOL result = FALSE; @@ -215,7 +215,7 @@ void security_mac_salt_key(const BYTE* session_key_blob, WINPR_ATTR_UNUSED size_ static BOOL security_md5_16_32_32(const BYTE* in0, const BYTE* in1, const BYTE* in2, BYTE* output, size_t out_len) { - WINPR_DIGEST_CTX* md5 = NULL; + WINPR_DIGEST_CTX* md5 = nullptr; BOOL result = FALSE; WINPR_ASSERT(WINPR_MD5_DIGEST_LENGTH <= out_len); @@ -247,7 +247,7 @@ out: static BOOL security_md5_16_32_32_Allow_FIPS(const BYTE* in0, const BYTE* in1, const BYTE* in2, BYTE* output, size_t out_len) { - WINPR_DIGEST_CTX* md5 = NULL; + WINPR_DIGEST_CTX* md5 = nullptr; BOOL result = FALSE; WINPR_ASSERT(out_len >= WINPR_MD5_DIGEST_LENGTH); @@ -303,8 +303,8 @@ static void security_UINT32_le(BYTE* output, WINPR_ATTR_UNUSED size_t out_len, U BOOL security_mac_data(const BYTE* mac_salt_key, size_t mac_salt_key_length, const BYTE* data, size_t length, BYTE* output, size_t output_length) { - WINPR_DIGEST_CTX* sha1 = NULL; - WINPR_DIGEST_CTX* md5 = NULL; + WINPR_DIGEST_CTX* sha1 = nullptr; + WINPR_DIGEST_CTX* md5 = nullptr; BYTE length_le[4] = WINPR_C_ARRAY_INIT; BYTE sha1_digest[WINPR_SHA1_DIGEST_LENGTH] = WINPR_C_ARRAY_INIT; BOOL result = FALSE; @@ -376,8 +376,8 @@ out: BOOL security_mac_signature(rdpRdp* rdp, const BYTE* data, UINT32 length, BYTE* output, size_t out_len) { - WINPR_DIGEST_CTX* sha1 = NULL; - WINPR_DIGEST_CTX* md5 = NULL; + WINPR_DIGEST_CTX* sha1 = nullptr; + WINPR_DIGEST_CTX* md5 = nullptr; BYTE length_le[4] = WINPR_C_ARRAY_INIT; BYTE md5_digest[WINPR_MD5_DIGEST_LENGTH] = WINPR_C_ARRAY_INIT; BYTE sha1_digest[WINPR_SHA1_DIGEST_LENGTH] = WINPR_C_ARRAY_INIT; @@ -446,8 +446,8 @@ out: BOOL security_salted_mac_signature(rdpRdp* rdp, const BYTE* data, UINT32 length, BOOL encryption, BYTE* output, size_t out_len) { - WINPR_DIGEST_CTX* sha1 = NULL; - WINPR_DIGEST_CTX* md5 = NULL; + WINPR_DIGEST_CTX* sha1 = nullptr; + WINPR_DIGEST_CTX* md5 = nullptr; BYTE length_le[4] = WINPR_C_ARRAY_INIT; BYTE use_count_le[4] = WINPR_C_ARRAY_INIT; BYTE md5_digest[WINPR_MD5_DIGEST_LENGTH] = WINPR_C_ARRAY_INIT; @@ -762,9 +762,9 @@ BOOL security_establish_keys(rdpRdp* rdp) static BOOL security_key_update(BYTE* key, BYTE* update_key, size_t key_len, rdpRdp* rdp) { BYTE sha1h[WINPR_SHA1_DIGEST_LENGTH] = WINPR_C_ARRAY_INIT; - WINPR_DIGEST_CTX* sha1 = NULL; - WINPR_DIGEST_CTX* md5 = NULL; - WINPR_RC4_CTX* rc4 = NULL; + WINPR_DIGEST_CTX* sha1 = nullptr; + WINPR_DIGEST_CTX* md5 = nullptr; + WINPR_RC4_CTX* rc4 = nullptr; BYTE salt[] = { 0xD1, 0x26, 0x9E }; /* 40 bits: 3 bytes, 56 bits: 1 byte */ BOOL result = FALSE; WLog_DBG(TAG, "updating RDP key"); @@ -831,7 +831,7 @@ BOOL security_encrypt(BYTE* data, size_t length, rdpRdp* rdp) WINPR_ASSERT(rdp); if (!rdp->rc4_encrypt_key) { - WLog_ERR(TAG, "rdp->rc4_encrypt_key=NULL"); + WLog_ERR(TAG, "rdp->rc4_encrypt_key=nullptr"); goto fail; } @@ -863,7 +863,7 @@ BOOL security_decrypt(BYTE* data, size_t length, rdpRdp* rdp) if (!rdp->rc4_decrypt_key) { - WLog_ERR(TAG, "rdp->rc4_decrypt_key=NULL"); + WLog_ERR(TAG, "rdp->rc4_decrypt_key=nullptr"); goto fail; } @@ -893,7 +893,7 @@ BOOL security_hmac_signature(const BYTE* data, size_t length, BYTE* output, size { BYTE buf[WINPR_SHA1_DIGEST_LENGTH] = WINPR_C_ARRAY_INIT; BYTE use_count_le[4] = WINPR_C_ARRAY_INIT; - WINPR_HMAC_CTX* hmac = NULL; + WINPR_HMAC_CTX* hmac = nullptr; BOOL result = FALSE; WINPR_ASSERT(rdp); @@ -946,7 +946,7 @@ BOOL security_fips_decrypt(BYTE* data, size_t length, rdpRdp* rdp) if (!rdp || !rdp->fips_decrypt) { WLog_ERR(TAG, "rdp=%p, rdp->fips_decrypt=%p", WINPR_CXX_COMPAT_CAST(const void*, rdp), - WINPR_CXX_COMPAT_CAST(const void*, rdp ? rdp->fips_decrypt : NULL)); + WINPR_CXX_COMPAT_CAST(const void*, rdp ? rdp->fips_decrypt : nullptr)); return FALSE; } @@ -961,7 +961,7 @@ BOOL security_fips_check_signature(const BYTE* data, size_t length, const BYTE* { BYTE buf[WINPR_SHA1_DIGEST_LENGTH] = WINPR_C_ARRAY_INIT; BYTE use_count_le[4] = WINPR_C_ARRAY_INIT; - WINPR_HMAC_CTX* hmac = NULL; + WINPR_HMAC_CTX* hmac = nullptr; BOOL result = FALSE; security_UINT32_le(use_count_le, sizeof(use_count_le), rdp->decrypt_use_count++); diff --git a/libfreerdp/core/server.c b/libfreerdp/core/server.c index 1c3767de9..96c94c1a7 100644 --- a/libfreerdp/core/server.c +++ b/libfreerdp/core/server.c @@ -66,7 +66,7 @@ typedef struct static const DWORD g_err_oom = WINPR_CXX_COMPAT_CAST(DWORD, E_OUTOFMEMORY); static DWORD g_SessionId = 1; -static wHashTable* g_ServerHandles = NULL; +static wHashTable* g_ServerHandles = nullptr; static rdpPeerChannel* wts_get_dvc_channel_by_id(WTSVirtualChannelManager* vcm, UINT32 ChannelId) { @@ -76,8 +76,8 @@ static rdpPeerChannel* wts_get_dvc_channel_by_id(WTSVirtualChannelManager* vcm, static BOOL wts_queue_receive_data(rdpPeerChannel* channel, const BYTE* Buffer, UINT32 Length) { - BYTE* buffer = NULL; - wtsChannelMessage* messageCtx = NULL; + BYTE* buffer = nullptr; + wtsChannelMessage* messageCtx = nullptr; WINPR_ASSERT(channel); messageCtx = (wtsChannelMessage*)malloc(sizeof(wtsChannelMessage) + Length); @@ -91,12 +91,12 @@ static BOOL wts_queue_receive_data(rdpPeerChannel* channel, const BYTE* Buffer, messageCtx->offset = 0; buffer = (BYTE*)(messageCtx + 1); CopyMemory(buffer, Buffer, Length); - return MessageQueue_Post(channel->queue, messageCtx, 0, NULL, NULL); + return MessageQueue_Post(channel->queue, messageCtx, 0, nullptr, nullptr); } static BOOL wts_queue_send_item(rdpPeerChannel* channel, BYTE* Buffer, UINT32 Length) { - BYTE* buffer = NULL; + BYTE* buffer = nullptr; UINT32 length = 0; WINPR_ASSERT(channel); @@ -278,7 +278,7 @@ static BOOL wts_read_drdynvc_pdu(rdpPeerChannel* channel) UINT8 Sp = 0; UINT8 cbChId = 0; UINT32 ChannelId = 0; - rdpPeerChannel* dvc = NULL; + rdpPeerChannel* dvc = nullptr; WINPR_ASSERT(channel); WINPR_ASSERT(channel->vcm); @@ -416,7 +416,7 @@ static int wts_write_variable_uint(wStream* s, UINT32 val) static void wts_write_drdynvc_header(wStream* s, BYTE Cmd, UINT32 ChannelId) { - BYTE* bm = NULL; + BYTE* bm = nullptr; int cbChId = 0; WINPR_ASSERT(s); @@ -495,7 +495,7 @@ static BOOL WTSProcessChannelData(rdpPeerChannel* channel, UINT16 channelId, con static BOOL WTSReceiveChannelData(freerdp_peer* client, UINT16 channelId, const BYTE* data, size_t size, UINT32 flags, size_t totalSize) { - rdpMcs* mcs = NULL; + rdpMcs* mcs = nullptr; WINPR_ASSERT(client); WINPR_ASSERT(client->context); @@ -524,7 +524,7 @@ static BOOL WTSReceiveChannelData(freerdp_peer* client, UINT16 channelId, const #if defined(WITH_FREERDP_DEPRECATED) void WTSVirtualChannelManagerGetFileDescriptor(HANDLE hServer, void** fds, int* fds_count) { - void* fd = NULL; + void* fd = nullptr; WTSVirtualChannelManager* vcm = (WTSVirtualChannelManager*)hServer; WINPR_ASSERT(vcm); WINPR_ASSERT(fds); @@ -564,7 +564,7 @@ BOOL WTSVirtualChannelManagerOpen(HANDLE hServer) if (vcm->drdynvc_state == DRDYNVC_STATE_NONE) { - rdpPeerChannel* channel = NULL; + rdpPeerChannel* channel = nullptr; /* Initialize drdynvc channel once and only once. */ vcm->drdynvc_state = DRDYNVC_STATE_INITIALIZED; @@ -600,7 +600,7 @@ BOOL WTSVirtualChannelManagerCheckFileDescriptorEx(HANDLE hServer, BOOL autoOpen { wMessage message = WINPR_C_ARRAY_INIT; BOOL status = TRUE; - WTSVirtualChannelManager* vcm = NULL; + WTSVirtualChannelManager* vcm = nullptr; if (!hServer || hServer == INVALID_HANDLE_VALUE) return FALSE; @@ -615,7 +615,7 @@ BOOL WTSVirtualChannelManagerCheckFileDescriptorEx(HANDLE hServer, BOOL autoOpen while (MessageQueue_Peek(vcm->queue, &message, TRUE)) { - BYTE* buffer = NULL; + BYTE* buffer = nullptr; UINT32 length = 0; UINT16 channelId = 0; channelId = (UINT16)(UINT_PTR)message.context; @@ -653,7 +653,7 @@ HANDLE WTSVirtualChannelManagerGetEventHandle(HANDLE hServer) static rdpMcsChannel* wts_get_joined_channel_by_name(rdpMcs* mcs, const char* channel_name) { if (!mcs || !channel_name || !strnlen(channel_name, CHANNEL_NAME_LEN + 1)) - return NULL; + return nullptr; for (UINT32 index = 0; index < mcs->channelCount; index++) { @@ -665,13 +665,13 @@ static rdpMcsChannel* wts_get_joined_channel_by_name(rdpMcs* mcs, const char* ch } } - return NULL; + return nullptr; } static rdpMcsChannel* wts_get_joined_channel_by_id(rdpMcs* mcs, const UINT16 channel_id) { if (!mcs || !channel_id) - return NULL; + return nullptr; WINPR_ASSERT(mcs->channels); for (UINT32 index = 0; index < mcs->channelCount; index++) @@ -684,7 +684,7 @@ static rdpMcsChannel* wts_get_joined_channel_by_id(rdpMcs* mcs, const UINT16 cha } } - return NULL; + return nullptr; } BOOL WTSIsChannelJoinedByName(freerdp_peer* client, const char* channel_name) @@ -692,7 +692,7 @@ BOOL WTSIsChannelJoinedByName(freerdp_peer* client, const char* channel_name) if (!client || !client->context || !client->context->rdp) return FALSE; - return (wts_get_joined_channel_by_name(client->context->rdp->mcs, channel_name) != NULL); + return (wts_get_joined_channel_by_name(client->context->rdp->mcs, channel_name) != nullptr); } BOOL WTSIsChannelJoinedById(freerdp_peer* client, UINT16 channel_id) @@ -700,7 +700,7 @@ BOOL WTSIsChannelJoinedById(freerdp_peer* client, UINT16 channel_id) if (!client || !client->context || !client->context->rdp) return FALSE; - return (wts_get_joined_channel_by_id(client->context->rdp->mcs, channel_id) != NULL); + return (wts_get_joined_channel_by_id(client->context->rdp->mcs, channel_id) != nullptr); } BOOL WTSVirtualChannelManagerIsChannelJoined(HANDLE hServer, const char* name) @@ -710,7 +710,7 @@ BOOL WTSVirtualChannelManagerIsChannelJoined(HANDLE hServer, const char* name) if (!vcm || !vcm->rdp) return FALSE; - return (wts_get_joined_channel_by_name(vcm->rdp->mcs, name) != NULL); + return (wts_get_joined_channel_by_name(vcm->rdp->mcs, name) != nullptr); } BYTE WTSVirtualChannelManagerGetDrdynvcState(HANDLE hServer) @@ -733,7 +733,7 @@ void WTSVirtualChannelManagerSetDVCCreationCallback(HANDLE hServer, psDVCCreatio UINT16 WTSChannelGetId(freerdp_peer* client, const char* channel_name) { - rdpMcsChannel* channel = NULL; + rdpMcsChannel* channel = nullptr; WINPR_ASSERT(channel_name); if (!client || !client->context || !client->context->rdp) @@ -758,7 +758,7 @@ UINT32 WTSChannelGetIdByHandle(HANDLE hChannelHandle) BOOL WTSChannelSetHandleByName(freerdp_peer* client, const char* channel_name, void* handle) { - rdpMcsChannel* channel = NULL; + rdpMcsChannel* channel = nullptr; WINPR_ASSERT(channel_name); if (!client || !client->context || !client->context->rdp) @@ -775,7 +775,7 @@ BOOL WTSChannelSetHandleByName(freerdp_peer* client, const char* channel_name, v BOOL WTSChannelSetHandleById(freerdp_peer* client, UINT16 channel_id, void* handle) { - rdpMcsChannel* channel = NULL; + rdpMcsChannel* channel = nullptr; if (!client || !client->context || !client->context->rdp) return FALSE; @@ -791,57 +791,57 @@ BOOL WTSChannelSetHandleById(freerdp_peer* client, UINT16 channel_id, void* hand void* WTSChannelGetHandleByName(freerdp_peer* client, const char* channel_name) { - rdpMcsChannel* channel = NULL; + rdpMcsChannel* channel = nullptr; WINPR_ASSERT(channel_name); if (!client || !client->context || !client->context->rdp) - return NULL; + return nullptr; channel = wts_get_joined_channel_by_name(client->context->rdp->mcs, channel_name); if (!channel) - return NULL; + return nullptr; return channel->handle; } void* WTSChannelGetHandleById(freerdp_peer* client, UINT16 channel_id) { - rdpMcsChannel* channel = NULL; + rdpMcsChannel* channel = nullptr; if (!client || !client->context || !client->context->rdp) - return NULL; + return nullptr; channel = wts_get_joined_channel_by_id(client->context->rdp->mcs, channel_id); if (!channel) - return NULL; + return nullptr; return channel->handle; } const char* WTSChannelGetName(freerdp_peer* client, UINT16 channel_id) { - rdpMcsChannel* channel = NULL; + rdpMcsChannel* channel = nullptr; if (!client || !client->context || !client->context->rdp) - return NULL; + return nullptr; channel = wts_get_joined_channel_by_id(client->context->rdp->mcs, channel_id); if (!channel) - return NULL; + return nullptr; return (const char*)channel->Name; } char** WTSGetAcceptedChannelNames(freerdp_peer* client, size_t* count) { - rdpMcs* mcs = NULL; - char** names = NULL; + rdpMcs* mcs = nullptr; + char** names = nullptr; if (!client || !client->context || !count) - return NULL; + return nullptr; WINPR_ASSERT(client->context->rdp); mcs = client->context->rdp->mcs; @@ -850,7 +850,7 @@ char** WTSGetAcceptedChannelNames(freerdp_peer* client, size_t* count) names = (char**)calloc(mcs->channelCount, sizeof(char*)); if (!names) - return NULL; + return nullptr; for (UINT32 index = 0; index < mcs->channelCount; index++) { @@ -863,7 +863,7 @@ char** WTSGetAcceptedChannelNames(freerdp_peer* client, size_t* count) INT64 WTSChannelGetOptions(freerdp_peer* client, UINT16 channel_id) { - rdpMcsChannel* channel = NULL; + rdpMcsChannel* channel = nullptr; if (!client || !client->context || !client->context->rdp) return -1; @@ -1003,9 +1003,9 @@ static UINT32 channelId_Hash(const void* key) HANDLE WINAPI FreeRDP_WTSOpenServerA(LPSTR pServerName) { - rdpContext* context = NULL; - freerdp_peer* client = NULL; - WTSVirtualChannelManager* vcm = NULL; + rdpContext* context = nullptr; + freerdp_peer* client = nullptr; + WTSVirtualChannelManager* vcm = nullptr; HANDLE hServer = INVALID_HANDLE_VALUE; wObject queueCallbacks = WINPR_C_ARRAY_INIT; @@ -1095,7 +1095,7 @@ HANDLE WINAPI FreeRDP_WTSOpenServerExA(LPSTR pServerName) VOID WINAPI FreeRDP_WTSCloseServer(HANDLE hServer) { - WTSVirtualChannelManager* vcm = NULL; + WTSVirtualChannelManager* vcm = nullptr; vcm = (WTSVirtualChannelManager*)hServer; if (vcm && (vcm != INVALID_HANDLE_VALUE)) @@ -1107,7 +1107,7 @@ VOID WINAPI FreeRDP_WTSCloseServer(HANDLE hServer) if (vcm->drdynvc_channel) { (void)WTSVirtualChannelClose(vcm->drdynvc_channel); - vcm->drdynvc_channel = NULL; + vcm->drdynvc_channel = nullptr; } MessageQueue_Free(vcm->queue); @@ -1198,7 +1198,7 @@ BOOL WINAPI FreeRDP_WTSQuerySessionInformationA(HANDLE hServer, WINPR_ATTR_UNUSE DWORD* pBytesReturned) { DWORD BytesReturned = 0; - WTSVirtualChannelManager* vcm = NULL; + WTSVirtualChannelManager* vcm = nullptr; vcm = (WTSVirtualChannelManager*)hServer; if (!vcm) @@ -1206,7 +1206,7 @@ BOOL WINAPI FreeRDP_WTSQuerySessionInformationA(HANDLE hServer, WINPR_ATTR_UNUSE if (WTSInfoClass == WTSSessionId) { - ULONG* pBuffer = NULL; + ULONG* pBuffer = nullptr; BytesReturned = sizeof(ULONG); pBuffer = (ULONG*)malloc(sizeof(BytesReturned)); @@ -1325,7 +1325,7 @@ static void peer_channel_queue_free_message(void* obj) return; free(msg->context); - msg->context = NULL; + msg->context = nullptr; } static rdpPeerChannel* channel_new(WTSVirtualChannelManager* vcm, freerdp_peer* client, @@ -1352,26 +1352,26 @@ static rdpPeerChannel* channel_new(WTSVirtualChannelManager* vcm, freerdp_peer* return channel; fail: channel_free(channel); - return NULL; + return nullptr; } HANDLE WINAPI FreeRDP_WTSVirtualChannelOpen(HANDLE hServer, WINPR_ATTR_UNUSED DWORD SessionId, LPSTR pVirtualName) { size_t length = 0; - rdpMcs* mcs = NULL; - rdpMcsChannel* joined_channel = NULL; - freerdp_peer* client = NULL; - rdpPeerChannel* channel = NULL; - WTSVirtualChannelManager* vcm = NULL; - HANDLE hChannelHandle = NULL; - rdpContext* context = NULL; + rdpMcs* mcs = nullptr; + rdpMcsChannel* joined_channel = nullptr; + freerdp_peer* client = nullptr; + rdpPeerChannel* channel = nullptr; + WTSVirtualChannelManager* vcm = nullptr; + HANDLE hChannelHandle = nullptr; + rdpContext* context = nullptr; vcm = (WTSVirtualChannelManager*)hServer; if (!vcm) { SetLastError(ERROR_INVALID_DATA); - return NULL; + return nullptr; } client = vcm->client; @@ -1390,7 +1390,7 @@ HANDLE WINAPI FreeRDP_WTSVirtualChannelOpen(HANDLE hServer, WINPR_ATTR_UNUSED DW if (length > CHANNEL_NAME_LEN) { SetLastError(ERROR_NOT_FOUND); - return NULL; + return nullptr; } UINT32 index = 0; @@ -1407,7 +1407,7 @@ HANDLE WINAPI FreeRDP_WTSVirtualChannelOpen(HANDLE hServer, WINPR_ATTR_UNUSED DW if (!joined_channel) { SetLastError(ERROR_NOT_FOUND); - return NULL; + return nullptr; } channel = (rdpPeerChannel*)joined_channel->handle; @@ -1432,27 +1432,27 @@ HANDLE WINAPI FreeRDP_WTSVirtualChannelOpen(HANDLE hServer, WINPR_ATTR_UNUSED DW fail: channel_free(channel); SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; + return nullptr; } HANDLE WINAPI FreeRDP_WTSVirtualChannelOpenEx(DWORD SessionId, LPSTR pVirtualName, DWORD flags) { - wStream* s = NULL; - rdpMcs* mcs = NULL; + wStream* s = nullptr; + rdpMcs* mcs = nullptr; BOOL joined = FALSE; - freerdp_peer* client = NULL; - rdpPeerChannel* channel = NULL; + freerdp_peer* client = nullptr; + rdpPeerChannel* channel = nullptr; ULONG written = 0; - WTSVirtualChannelManager* vcm = NULL; + WTSVirtualChannelManager* vcm = nullptr; if (SessionId == WTS_CURRENT_SESSION) - return NULL; + return nullptr; vcm = (WTSVirtualChannelManager*)HashTable_GetItemValue(g_ServerHandles, (void*)(UINT_PTR)SessionId); if (!vcm) - return NULL; + return nullptr; if (!(flags & WTS_CHANNEL_OPTION_DYNAMIC)) { @@ -1476,13 +1476,13 @@ HANDLE WINAPI FreeRDP_WTSVirtualChannelOpenEx(DWORD SessionId, LPSTR pVirtualNam if (!joined) { SetLastError(ERROR_NOT_FOUND); - return NULL; + return nullptr; } if (!vcm->drdynvc_channel || (vcm->drdynvc_state != DRDYNVC_STATE_READY)) { SetLastError(ERROR_NOT_READY); - return NULL; + return nullptr; } WINPR_ASSERT(client); @@ -1496,7 +1496,7 @@ HANDLE WINAPI FreeRDP_WTSVirtualChannelOpenEx(DWORD SessionId, LPSTR pVirtualNam if (!channel) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; + return nullptr; } const LONG hdl = InterlockedIncrement(&vcm->dvc_channel_id_seq); @@ -1505,10 +1505,10 @@ HANDLE WINAPI FreeRDP_WTSVirtualChannelOpenEx(DWORD SessionId, LPSTR pVirtualNam if (!HashTable_Insert(vcm->dynamicVirtualChannels, &channel->channelId, channel)) { channel_free(channel); - channel = NULL; + channel = nullptr; goto fail; } - s = Stream_New(NULL, 64); + s = Stream_New(nullptr, 64); if (!s) goto fail; @@ -1532,13 +1532,13 @@ fail: HashTable_Remove(vcm->dynamicVirtualChannels, &channel->channelId); SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; + return nullptr; } BOOL WINAPI FreeRDP_WTSVirtualChannelClose(HANDLE hChannelHandle) { - wStream* s = NULL; - rdpMcs* mcs = NULL; + wStream* s = nullptr; + rdpMcs* mcs = nullptr; rdpPeerChannel* channel = (rdpPeerChannel*)hChannelHandle; BOOL ret = TRUE; @@ -1560,7 +1560,7 @@ BOOL WINAPI FreeRDP_WTSVirtualChannelClose(HANDLE hChannelHandle) rdpMcsChannel* cur = &mcs->channels[channel->index]; rdpPeerChannel* peerChannel = (rdpPeerChannel*)cur->handle; channel_free(peerChannel); - cur->handle = NULL; + cur->handle = nullptr; } } else @@ -1568,7 +1568,7 @@ BOOL WINAPI FreeRDP_WTSVirtualChannelClose(HANDLE hChannelHandle) if (channel->dvc_open_state == DVC_OPEN_STATE_SUCCEEDED) { ULONG written = 0; - s = Stream_New(NULL, 8); + s = Stream_New(nullptr, 8); if (!s) { @@ -1596,9 +1596,9 @@ BOOL WINAPI FreeRDP_WTSVirtualChannelClose(HANDLE hChannelHandle) BOOL WINAPI FreeRDP_WTSVirtualChannelRead(HANDLE hChannelHandle, WINPR_ATTR_UNUSED ULONG TimeOut, PCHAR Buffer, ULONG BufferSize, PULONG pBytesRead) { - BYTE* buffer = NULL; + BYTE* buffer = nullptr; wMessage message = WINPR_C_ARRAY_INIT; - wtsChannelMessage* messageCtx = NULL; + wtsChannelMessage* messageCtx = nullptr; rdpPeerChannel* channel = (rdpPeerChannel*)hChannelHandle; WINPR_ASSERT(channel); @@ -1612,13 +1612,13 @@ BOOL WINAPI FreeRDP_WTSVirtualChannelRead(HANDLE hChannelHandle, WINPR_ATTR_UNUS messageCtx = message.context; - if (messageCtx == NULL) + if (messageCtx == nullptr) return FALSE; buffer = (BYTE*)(messageCtx + 1); *pBytesRead = messageCtx->length - messageCtx->offset; - if (Buffer == NULL || BufferSize == 0) + if (Buffer == nullptr || BufferSize == 0) { return TRUE; } @@ -1641,11 +1641,11 @@ BOOL WINAPI FreeRDP_WTSVirtualChannelRead(HANDLE hChannelHandle, WINPR_ATTR_UNUS BOOL WINAPI FreeRDP_WTSVirtualChannelWrite(HANDLE hChannelHandle, PCHAR Buffer, ULONG uLength, PULONG pBytesWritten) { - wStream* s = NULL; + wStream* s = nullptr; int cbLen = 0; int cbChId = 0; int first = 0; - BYTE* buffer = NULL; + BYTE* buffer = nullptr; size_t totalWritten = 0; rdpPeerChannel* channel = (rdpPeerChannel*)hChannelHandle; BOOL ret = FALSE; @@ -1682,7 +1682,7 @@ BOOL WINAPI FreeRDP_WTSVirtualChannelWrite(HANDLE hChannelHandle, PCHAR Buffer, size_t Length = uLength; while (Length > 0) { - s = Stream_New(NULL, DVC_MAX_DATA_PDU_SIZE); + s = Stream_New(nullptr, DVC_MAX_DATA_PDU_SIZE); if (!s) { @@ -1748,10 +1748,10 @@ BOOL WINAPI FreeRDP_WTSVirtualChannelPurgeOutput(WINPR_ATTR_UNUSED HANDLE hChann BOOL WINAPI FreeRDP_WTSVirtualChannelQuery(HANDLE hChannelHandle, WTS_VIRTUAL_CLASS WtsVirtualClass, PVOID* ppBuffer, DWORD* pBytesReturned) { - void* pfd = NULL; + void* pfd = nullptr; BOOL bval = 0; void* fds[10] = WINPR_C_ARRAY_INIT; - HANDLE hEvent = NULL; + HANDLE hEvent = nullptr; int fds_count = 0; BOOL status = FALSE; rdpPeerChannel* channel = (rdpPeerChannel*)hChannelHandle; @@ -1824,7 +1824,7 @@ BOOL WINAPI FreeRDP_WTSVirtualChannelQuery(HANDLE hChannelHandle, WTS_VIRTUAL_CL break; default: - *ppBuffer = NULL; + *ppBuffer = nullptr; *pBytesReturned = 0; return FALSE; } @@ -2102,11 +2102,11 @@ rdpPeerChannel* server_channel_common_new(freerdp_peer* client, UINT16 index, UI { rdpPeerChannel* channel = (rdpPeerChannel*)calloc(1, sizeof(rdpPeerChannel)); if (!channel) - return NULL; + return nullptr; InitializeCriticalSection(&channel->writeLock); - channel->receiveData = Stream_New(NULL, chunkSize); + channel->receiveData = Stream_New(nullptr, chunkSize); if (!channel->receiveData) goto fail; @@ -2124,5 +2124,5 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC server_channel_common_free(channel); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } diff --git a/libfreerdp/core/settings.c b/libfreerdp/core/settings.c index 642f2e461..a07088f56 100644 --- a/libfreerdp/core/settings.c +++ b/libfreerdp/core/settings.c @@ -132,7 +132,7 @@ static BOOL settings_reg_query_dword_val(HKEY hKey, const TCHAR* sub, DWORD* val DWORD dwSize = 0; dwSize = sizeof(DWORD); - if (RegQueryValueEx(hKey, sub, NULL, &dwType, (BYTE*)value, &dwSize) != ERROR_SUCCESS) + if (RegQueryValueEx(hKey, sub, nullptr, &dwType, (BYTE*)value, &dwSize) != ERROR_SUCCESS) return FALSE; if (dwType != REG_DWORD) return FALSE; @@ -192,7 +192,7 @@ static void settings_client_load_hkey_local_machine(rdpSettings* settings) char* key = freerdp_getApplicatonDetailsRegKey(CLIENT_KEY); if (key) { - HKEY hKey = NULL; + HKEY hKey = nullptr; const LONG status = RegOpenKeyExA(HKEY_LOCAL_MACHINE, key, 0, KEY_READ | KEY_WOW64_64KEY, &hKey); free(key); @@ -235,7 +235,7 @@ static void settings_client_load_hkey_local_machine(rdpSettings* settings) char* key = freerdp_getApplicatonDetailsRegKey(BITMAP_CACHE_KEY); if (key) { - HKEY hKey = NULL; + HKEY hKey = nullptr; const LONG status = RegOpenKeyExA(HKEY_LOCAL_MACHINE, key, 0, KEY_READ | KEY_WOW64_64KEY, &hKey); free(key); @@ -270,7 +270,7 @@ static void settings_client_load_hkey_local_machine(rdpSettings* settings) char* key = freerdp_getApplicatonDetailsRegKey(GLYPH_CACHE_KEY); if (key) { - HKEY hKey = NULL; + HKEY hKey = nullptr; const LONG status = RegOpenKeyExA(HKEY_LOCAL_MACHINE, key, 0, KEY_READ | KEY_WOW64_64KEY, &hKey); free(key); @@ -317,7 +317,7 @@ static void settings_client_load_hkey_local_machine(rdpSettings* settings) char* key = freerdp_getApplicatonDetailsRegKey(POINTER_CACHE_KEY); if (key) { - HKEY hKey = NULL; + HKEY hKey = nullptr; const LONG status = RegOpenKeyExA(HKEY_LOCAL_MACHINE, key, 0, KEY_READ | KEY_WOW64_64KEY, &hKey); free(key); @@ -338,7 +338,7 @@ static void settings_client_load_hkey_local_machine(rdpSettings* settings) static void settings_server_load_hkey_local_machine(rdpSettings* settings) { - HKEY hKey = NULL; + HKEY hKey = nullptr; char* key = freerdp_getApplicatonDetailsRegKey(SERVER_KEY); if (!key) @@ -817,15 +817,15 @@ rdpSettings* freerdp_settings_new(DWORD flags) rdpSettings* settings = (rdpSettings*)calloc(1, sizeof(rdpSettings)); if (!settings) - return NULL; + return nullptr; { const char* vendor = freerdp_getApplicationDetailsVendor(); const char* product = freerdp_getApplicationDetailsProduct(); const char* details = freerdp_getApplicationDetailsString(); - char* issuer1 = NULL; - char* issuer2 = NULL; - char* issuer3 = NULL; + char* issuer1 = nullptr; + char* issuer2 = nullptr; + char* issuer3 = nullptr; size_t len = 0; (void)winpr_asprintf(&issuer1, &len, "%s-licenser", freerdp_getApplicationDetailsString()); (void)winpr_asprintf(&issuer2, &len, "%s-licenser", freerdp_getApplicationDetailsVendor()); @@ -910,7 +910,7 @@ rdpSettings* freerdp_settings_new(DWORD flags) { size_t len = 0; - char* val = NULL; + char* val = nullptr; (void)winpr_asprintf(&val, &len, "%s-licensing-server", freerdp_getApplicationDetailsProduct()); if (!val) @@ -1017,7 +1017,7 @@ rdpSettings* freerdp_settings_new(DWORD flags) !freerdp_settings_set_uint32(settings, FreeRDP_KeySpec, AT_KEYEXCHANGE)) goto out_fail; - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ChannelDefArray, NULL, + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ChannelDefArray, nullptr, CHANNEL_MAX_COUNT)) goto out_fail; @@ -1027,7 +1027,7 @@ rdpSettings* freerdp_settings_new(DWORD flags) if (!freerdp_settings_set_uint32(settings, FreeRDP_MonitorCount, 0)) goto out_fail; - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorDefArray, NULL, 32)) + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorDefArray, nullptr, 32)) goto out_fail; if (!freerdp_settings_set_int32(settings, FreeRDP_MonitorLocalShiftX, 0)) @@ -1036,7 +1036,7 @@ rdpSettings* freerdp_settings_new(DWORD flags) if (!freerdp_settings_set_int32(settings, FreeRDP_MonitorLocalShiftY, 0)) goto out_fail; - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorIds, NULL, 0)) + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorIds, nullptr, 0)) goto out_fail; if (!freerdp_settings_set_uint32(settings, FreeRDP_MultitransportFlags, @@ -1048,7 +1048,7 @@ rdpSettings* freerdp_settings_new(DWORD flags) if (!settings_init_computer_name(settings)) goto out_fail; - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_RdpServerCertificate, NULL, 1)) + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_RdpServerCertificate, nullptr, 1)) goto out_fail; if (!freerdp_capability_buffer_resize(settings, 32, FALSE)) @@ -1273,7 +1273,7 @@ rdpSettings* freerdp_settings_new(DWORD flags) if (!freerdp_settings_get_bool(settings, FreeRDP_ServerMode)) { BOOL rc = FALSE; - char* path = NULL; + char* path = nullptr; if (!freerdp_settings_set_bool(settings, FreeRDP_RedirectClipboard, TRUE)) goto out_fail; /* these values are used only by the client part */ @@ -1344,7 +1344,7 @@ out_fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC freerdp_settings_free(settings); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } static void freerdp_settings_free_internal(rdpSettings* settings) @@ -1357,14 +1357,14 @@ static void freerdp_settings_free_internal(rdpSettings* settings) freerdp_capability_buffer_free(settings); - /* Free all strings, set other pointers NULL */ + /* Free all strings, set other pointers nullptr */ freerdp_settings_free_keys(settings, TRUE); } static void freerdp_settings_free_internal_ensure_reset(rdpSettings* settings) { settings->ServerLicenseProductIssuersCount = 0; - settings->ServerLicenseProductIssuers = NULL; + settings->ServerLicenseProductIssuers = nullptr; settings->ReceivedCapabilitiesSize = 0; } @@ -1430,7 +1430,7 @@ static BOOL freerdp_settings_int_buffer_copy(rdpSettings* dst, const rdpSettings } else { - if (!freerdp_settings_set_pointer_len(dst, FreeRDP_RdpServerCertificate, NULL, 0)) + if (!freerdp_settings_set_pointer_len(dst, FreeRDP_RdpServerCertificate, nullptr, 0)) goto out_fail; } @@ -1444,7 +1444,7 @@ static BOOL freerdp_settings_int_buffer_copy(rdpSettings* dst, const rdpSettings } else { - if (!freerdp_settings_set_pointer_len(dst, FreeRDP_RdpServerRsaKey, NULL, 0)) + if (!freerdp_settings_set_pointer_len(dst, FreeRDP_RdpServerRsaKey, nullptr, 0)) goto out_fail; } @@ -1521,7 +1521,7 @@ static BOOL freerdp_settings_int_buffer_copy(rdpSettings* dst, const rdpSettings if (len < count) goto out_fail; - if (!freerdp_settings_set_pointer_len(dst, FreeRDP_DeviceArray, NULL, len)) + if (!freerdp_settings_set_pointer_len(dst, FreeRDP_DeviceArray, nullptr, len)) goto out_fail; if (!freerdp_settings_set_uint32(dst, FreeRDP_DeviceCount, count)) goto out_fail; @@ -1543,7 +1543,7 @@ static BOOL freerdp_settings_int_buffer_copy(rdpSettings* dst, const rdpSettings if (len < count) goto out_fail; - if (!freerdp_settings_set_pointer_len(dst, FreeRDP_StaticChannelArray, NULL, len)) + if (!freerdp_settings_set_pointer_len(dst, FreeRDP_StaticChannelArray, nullptr, len)) goto out_fail; if (!freerdp_settings_set_uint32(dst, FreeRDP_StaticChannelCount, count)) goto out_fail; @@ -1563,7 +1563,7 @@ static BOOL freerdp_settings_int_buffer_copy(rdpSettings* dst, const rdpSettings if (len < count) goto out_fail; - if (!freerdp_settings_set_pointer_len(dst, FreeRDP_DynamicChannelArray, NULL, len)) + if (!freerdp_settings_set_pointer_len(dst, FreeRDP_DynamicChannelArray, nullptr, len)) goto out_fail; if (!freerdp_settings_set_uint32(dst, FreeRDP_DynamicChannelCount, count)) goto out_fail; @@ -1596,7 +1596,7 @@ BOOL freerdp_settings_copy(rdpSettings* dst, const rdpSettings* src) freerdp_settings_free_internal(dst); /* This copies everything except allocated non string buffers. reset all allocated buffers to - * NULL to fix issues during cleanup */ + * nullptr to fix issues during cleanup */ rc = freerdp_settings_clone_keys(dst, src); if (!rc) goto out_fail; @@ -1624,7 +1624,7 @@ out_fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC freerdp_settings_free(dst); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } #ifdef _MSC_VER #pragma warning(pop) @@ -1687,7 +1687,7 @@ BOOL identity_set_from_smartcard_hash(SEC_WINNT_AUTH_IDENTITY_W* identity, { #ifdef _WIN32 CERT_CREDENTIAL_INFO certInfo = { sizeof(CERT_CREDENTIAL_INFO), { 0 } }; - LPWSTR marshalledCredentials = NULL; + LPWSTR marshalledCredentials = nullptr; memcpy(certInfo.rgbHashOfCert, certSha1, MIN(sha1len, sizeof(certInfo.rgbHashOfCert))); @@ -1699,8 +1699,9 @@ BOOL identity_set_from_smartcard_hash(SEC_WINNT_AUTH_IDENTITY_W* identity, size_t pwdLen = 0; WCHAR* Password = freerdp_settings_get_string_as_utf16(settings, pwdId, &pwdLen); - const int rc = sspi_SetAuthIdentityWithLengthW( - identity, marshalledCredentials, _wcslen(marshalledCredentials), NULL, 0, Password, pwdLen); + const int rc = sspi_SetAuthIdentityWithLengthW(identity, marshalledCredentials, + _wcslen(marshalledCredentials), nullptr, 0, + Password, pwdLen); zfree(Password, pwdLen); CredFree(marshalledCredentials); return (rc >= 0); @@ -1751,7 +1752,7 @@ BOOL freerdp_settings_enforce_monitor_exists(rdpSettings* settings) const UINT32 size = freerdp_settings_get_uint32(settings, FreeRDP_MonitorDefArraySize); if (size == 0) { - if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorDefArray, NULL, 16)) + if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorDefArray, nullptr, 16)) return FALSE; } diff --git a/libfreerdp/core/smartcardlogon.c b/libfreerdp/core/smartcardlogon.c index 72a3033ff..a1b7d4cf2 100644 --- a/libfreerdp/core/smartcardlogon.c +++ b/libfreerdp/core/smartcardlogon.c @@ -269,9 +269,9 @@ static BOOL list_capi_provider_keys(const rdpSettings* settings, LPCWSTR csp, LP BOOL ret = FALSE; HCRYPTKEY hKey = 0; HCRYPTPROV hProvider = 0; - SmartcardCertInfo* cert = NULL; - BYTE* certBytes = NULL; - CHAR* readerName = NULL; + SmartcardCertInfo* cert = nullptr; + BYTE* certBytes = nullptr; + CHAR* readerName = nullptr; if (!CryptAcquireContextW(&hProvider, scope, csp, PROV_RSA_FULL, CRYPT_SILENT)) { @@ -289,7 +289,7 @@ static BOOL list_capi_provider_keys(const rdpSettings* settings, LPCWSTR csp, LP /* ====== retrieve key's reader ====== */ DWORD dwDataLen = 0; - if (!CryptGetProvParam(hProvider, PP_SMARTCARD_READER, NULL, &dwDataLen, 0)) + if (!CryptGetProvParam(hProvider, PP_SMARTCARD_READER, nullptr, &dwDataLen, 0)) { WLog_DBG(TAG, "Unable to get provider param: %d", GetLastError()); goto out; @@ -305,13 +305,13 @@ static BOOL list_capi_provider_keys(const rdpSettings* settings, LPCWSTR csp, LP goto out; } - cert->reader = ConvertUtf8ToWCharAlloc(readerName, NULL); + cert->reader = ConvertUtf8ToWCharAlloc(readerName, nullptr); if (!cert->reader) goto out; /* ====== retrieve key container name ====== */ dwDataLen = 0; - if (!CryptGetProvParam(hProvider, PP_CONTAINER, NULL, &dwDataLen, 0)) + if (!CryptGetProvParam(hProvider, PP_CONTAINER, nullptr, &dwDataLen, 0)) { WLog_DBG(TAG, "Unable to get provider param: %d", GetLastError()); goto out; @@ -327,7 +327,7 @@ static BOOL list_capi_provider_keys(const rdpSettings* settings, LPCWSTR csp, LP goto out; } - cert->containerName = ConvertUtf8ToWCharAlloc(cert->keyName, NULL); + cert->containerName = ConvertUtf8ToWCharAlloc(cert->keyName, nullptr); if (!cert->containerName) goto out; @@ -339,7 +339,7 @@ static BOOL list_capi_provider_keys(const rdpSettings* settings, LPCWSTR csp, LP } dwDataLen = 0; - if (!CryptGetKeyParam(hKey, KP_CERTIFICATE, NULL, &dwDataLen, 0)) + if (!CryptGetKeyParam(hKey, KP_CERTIFICATE, nullptr, &dwDataLen, 0)) { WLog_DBG(TAG, "Unable to get key param for key %s: %d", cert->keyName, GetLastError()); goto out; @@ -386,8 +386,8 @@ static BOOL list_provider_keys(WINPR_ATTR_UNUSED const rdpSettings* settings, SmartcardCertInfo*** pcerts, size_t* pcount) { BOOL ret = FALSE; - NCryptKeyName* keyName = NULL; - PVOID enumState = NULL; + NCryptKeyName* keyName = nullptr; + PVOID enumState = nullptr; SmartcardCertInfo** cert_list = *pcerts; size_t count = *pcount; @@ -395,10 +395,10 @@ static BOOL list_provider_keys(WINPR_ATTR_UNUSED const rdpSettings* settings, ERROR_SUCCESS) { NCRYPT_KEY_HANDLE phKey = 0; - PBYTE certBytes = NULL; + PBYTE certBytes = nullptr; DWORD dwFlags = NCRYPT_SILENT_FLAG; DWORD cbOutput = 0; - SmartcardCertInfo* cert = NULL; + SmartcardCertInfo* cert = nullptr; BOOL haveError = TRUE; SECURITY_STATUS status = 0; @@ -406,7 +406,7 @@ static BOOL list_provider_keys(WINPR_ATTR_UNUSED const rdpSettings* settings, if (!cert) goto out; - cert->keyName = ConvertWCharToUtf8Alloc(keyName->pszName, NULL); + cert->keyName = ConvertWCharToUtf8Alloc(keyName->pszName, nullptr); if (!cert->keyName) goto endofloop; @@ -441,7 +441,7 @@ static BOOL list_provider_keys(WINPR_ATTR_UNUSED const rdpSettings* settings, /* ====== retrieve key's reader ====== */ cbOutput = 0; - status = NCryptGetProperty(phKey, NCRYPT_READER_PROPERTY, NULL, 0, &cbOutput, dwFlags); + status = NCryptGetProperty(phKey, NCRYPT_READER_PROPERTY, nullptr, 0, &cbOutput, dwFlags); if (status != ERROR_SUCCESS) { WLog_DBG(TAG, "unable to retrieve reader's name length for key %s", cert->keyName); @@ -466,7 +466,7 @@ static BOOL list_provider_keys(WINPR_ATTR_UNUSED const rdpSettings* settings, /* ====== retrieve key container name ====== */ /* When using PKCS11, this will try to return what Windows would use for the key's name */ cbOutput = 0; - status = NCryptGetProperty(phKey, NCRYPT_NAME_PROPERTY, NULL, 0, &cbOutput, dwFlags); + status = NCryptGetProperty(phKey, NCRYPT_NAME_PROPERTY, nullptr, 0, &cbOutput, dwFlags); if (status == ERROR_SUCCESS) { cert->containerName = calloc(1, cbOutput + sizeof(WCHAR)); @@ -488,7 +488,8 @@ static BOOL list_provider_keys(WINPR_ATTR_UNUSED const rdpSettings* settings, /* ========= retrieve the certificate ===============*/ cbOutput = 0; - status = NCryptGetProperty(phKey, NCRYPT_CERTIFICATE_PROPERTY, NULL, 0, &cbOutput, dwFlags); + status = + NCryptGetProperty(phKey, NCRYPT_CERTIFICATE_PROPERTY, nullptr, 0, &cbOutput, dwFlags); if (status != ERROR_SUCCESS) { /* can happen that key don't have certificates */ @@ -563,11 +564,11 @@ static BOOL smartcard_hw_enumerateCerts(const rdpSettings* settings, LPCWSTR csp size_t* retCount) { BOOL ret = FALSE; - LPWSTR scope = NULL; + LPWSTR scope = nullptr; NCRYPT_PROV_HANDLE provider = 0; SECURITY_STATUS status = 0; size_t count = 0; - SmartcardCertInfo** cert_list = NULL; + SmartcardCertInfo** cert_list = nullptr; const char* Pkcs11Module = freerdp_settings_get_string(settings, FreeRDP_Pkcs11Module); WINPR_ASSERT(scCerts); @@ -581,7 +582,7 @@ static BOOL smartcard_hw_enumerateCerts(const rdpSettings* settings, LPCWSTR csp goto out; (void)_snprintf(scopeStr, readerSz + 6, "\\\\.\\%s\\", reader); - scope = ConvertUtf8NToWCharAlloc(scopeStr, readerSz + 6, NULL); + scope = ConvertUtf8NToWCharAlloc(scopeStr, readerSz + 6, nullptr); free(scopeStr); if (!scope) @@ -591,7 +592,7 @@ static BOOL smartcard_hw_enumerateCerts(const rdpSettings* settings, LPCWSTR csp if (Pkcs11Module) { /* load a unique CSP by pkcs11 module path */ - LPCSTR paths[] = { Pkcs11Module, NULL }; + LPCSTR paths[] = { Pkcs11Module, nullptr }; if (!csp) csp = MS_SCARD_PROV; @@ -614,17 +615,17 @@ static BOOL smartcard_hw_enumerateCerts(const rdpSettings* settings, LPCWSTR csp } else { - NCryptProviderName* names = NULL; + NCryptProviderName* names = nullptr; DWORD nproviders = 0; #ifdef _WIN32 /* On Windows, mstsc first enumerates the legacy CAPI providers for usable certificates. */ DWORD provType, cbProvName = 0; - for (DWORD i = 0; CryptEnumProvidersW(i, NULL, 0, &provType, NULL, &cbProvName); ++i) + for (DWORD i = 0; CryptEnumProvidersW(i, nullptr, 0, &provType, nullptr, &cbProvName); ++i) { char providerNameStr[256] = WINPR_C_ARRAY_INIT; LPWSTR szProvName = malloc(cbProvName * sizeof(WCHAR)); - if (!CryptEnumProvidersW(i, NULL, 0, &provType, szProvName, &cbProvName)) + if (!CryptEnumProvidersW(i, nullptr, 0, &provType, szProvName, &cbProvName)) { free(szProvName); break; @@ -707,8 +708,8 @@ out: static char* create_temporary_file(void) { BYTE buffer[32]; - char* hex = NULL; - char* path = NULL; + char* hex = nullptr; + char* path = nullptr; winpr_RAND(buffer, sizeof(buffer)); hex = winpr_BinToHexString(buffer, sizeof(buffer), FALSE); @@ -747,17 +748,17 @@ static SmartcardCertInfo* smartcardCertInfo_New(const char* privKeyPEM, const ch } { - char* str = NULL; + char* str = nullptr; size_t len = 0; (void)winpr_asprintf(&str, &len, "%s Emulator", freerdp_getApplicationDetailsString()); if (str) - cert->reader = ConvertUtf8NToWCharAlloc(str, len, NULL); + cert->reader = ConvertUtf8NToWCharAlloc(str, len, nullptr); free(str); } if (!cert->reader) goto fail; - cert->containerName = ConvertUtf8ToWCharAlloc("Private Key 00", NULL); + cert->containerName = ConvertUtf8ToWCharAlloc("Private Key 00", nullptr); if (!cert->containerName) goto fail; @@ -787,14 +788,14 @@ static SmartcardCertInfo* smartcardCertInfo_New(const char* privKeyPEM, const ch return cert; fail: smartcardCertInfo_Free(cert); - return NULL; + return nullptr; } static BOOL smartcard_sw_enumerateCerts(const rdpSettings* settings, SmartcardCertInfo*** scCerts, size_t* retCount) { BOOL rc = FALSE; - SmartcardCertInfo** cert_list = NULL; + SmartcardCertInfo** cert_list = nullptr; WINPR_ASSERT(settings); WINPR_ASSERT(scCerts); @@ -838,11 +839,11 @@ BOOL smartcard_enumerateCerts(const rdpSettings* settings, SmartcardCertInfo*** size_t* retCount, BOOL gateway) { BOOL ret = 0; - LPWSTR csp = NULL; + LPWSTR csp = nullptr; const char* ReaderName = freerdp_settings_get_string(settings, FreeRDP_ReaderName); const char* CspName = freerdp_settings_get_string(settings, FreeRDP_CspName); - const char* Username = NULL; - const char* Domain = NULL; + const char* Username = nullptr; + const char* Domain = nullptr; if (gateway) { @@ -860,12 +861,12 @@ BOOL smartcard_enumerateCerts(const rdpSettings* settings, SmartcardCertInfo*** WINPR_ASSERT(retCount); if (Domain && !strlen(Domain)) - Domain = NULL; + Domain = nullptr; if (freerdp_settings_get_bool(settings, FreeRDP_SmartcardEmulation)) return smartcard_sw_enumerateCerts(settings, scCerts, retCount); - if (CspName && (!(csp = ConvertUtf8ToWCharAlloc(CspName, NULL)))) + if (CspName && (!(csp = ConvertUtf8ToWCharAlloc(CspName, nullptr)))) { WLog_ERR(TAG, "error while converting CSP to WCHAR"); return FALSE; @@ -895,7 +896,7 @@ BOOL smartcard_getCert(const rdpContext* context, SmartcardCertInfo** cert, BOOL const freerdp* instance = context->instance; rdpSettings* settings = context->settings; - SmartcardCertInfo** cert_list = NULL; + SmartcardCertInfo** cert_list = nullptr; size_t count = 0; WINPR_ASSERT(instance); diff --git a/libfreerdp/core/state.c b/libfreerdp/core/state.c index a11bfd333..336c831ba 100644 --- a/libfreerdp/core/state.c +++ b/libfreerdp/core/state.c @@ -44,7 +44,7 @@ BOOL state_run_success(state_run_t status) const char* state_run_result_string(state_run_t status, char* buffer, size_t buffersize) { - const char* name = NULL; + const char* name = nullptr; switch (status) { diff --git a/libfreerdp/core/streamdump.c b/libfreerdp/core/streamdump.c index c10084c1f..e8f9d193c 100644 --- a/libfreerdp/core/streamdump.c +++ b/libfreerdp/core/streamdump.c @@ -168,12 +168,12 @@ fail: static FILE* stream_dump_get_file(const rdpSettings* settings, const char* mode) { - const char* cfolder = NULL; - char* file = NULL; - FILE* fp = NULL; + const char* cfolder = nullptr; + char* file = nullptr; + FILE* fp = nullptr; if (!settings || !mode) - return NULL; + return nullptr; cfolder = freerdp_settings_get_string(settings, FreeRDP_TransportDumpFile); if (!cfolder) @@ -193,7 +193,7 @@ fail: SSIZE_T stream_dump_append(const rdpContext* context, UINT32 flags, wStream* s, size_t* offset) { SSIZE_T rc = -1; - FILE* fp = NULL; + FILE* fp = nullptr; const UINT32 mask = STREAM_MSG_SRV_RX | STREAM_MSG_SRV_TX; CONNECTION_STATE state = freerdp_get_state(context); int r = 0; @@ -241,7 +241,7 @@ SSIZE_T stream_dump_get(const rdpContext* context, UINT32* flags, wStream* s, si UINT64* pts) { SSIZE_T rc = -1; - FILE* fp = NULL; + FILE* fp = nullptr; int r = 0; if (!context || !s || !offset) @@ -412,7 +412,7 @@ static rdpTransportLayer* stream_dump_replay_transport_connect_layer( WINPR_ASSERT(transport); WINPR_ASSERT(hostname); - return NULL; + return nullptr; } static BOOL stream_dump_replay_transport_tls_connect(WINPR_ATTR_UNUSED rdpTransport* transport) @@ -480,7 +480,7 @@ rdpStreamDumpContext* stream_dump_new(void) { rdpStreamDumpContext* dump = calloc(1, sizeof(rdpStreamDumpContext)); if (!dump) - return NULL; + return nullptr; dump->log = WLog_Get(TAG); return dump; diff --git a/libfreerdp/core/tcp.c b/libfreerdp/core/tcp.c index 64a95f0b2..021c62960 100644 --- a/libfreerdp/core/tcp.c +++ b/libfreerdp/core/tcp.c @@ -254,7 +254,7 @@ static long transport_bio_simple_ctrl(BIO* bio, int cmd, long arg1, void* arg2) do { - status = select(sockfd + 1, &rset, NULL, NULL, timeout ? &tv : NULL); + status = select(sockfd + 1, &rset, nullptr, nullptr, timeout ? &tv : nullptr); } while ((status < 0) && (errno == EINTR)); #endif @@ -293,7 +293,7 @@ static long transport_bio_simple_ctrl(BIO* bio, int cmd, long arg1, void* arg2) do { - status = select(sockfd + 1, NULL, &rset, NULL, timeout ? &tv : NULL); + status = select(sockfd + 1, nullptr, &rset, nullptr, timeout ? &tv : nullptr); } while ((status < 0) && (errno == EINTR)); #endif @@ -386,7 +386,7 @@ static int transport_bio_simple_uninit(BIO* bio) if (ptr && ptr->hEvent) { (void)CloseHandle(ptr->hEvent); - ptr->hEvent = NULL; + ptr->hEvent = nullptr; } BIO_set_init(bio, 0); @@ -396,7 +396,7 @@ static int transport_bio_simple_uninit(BIO* bio) static int transport_bio_simple_new(BIO* bio) { - WINPR_BIO_SIMPLE_SOCKET* ptr = NULL; + WINPR_BIO_SIMPLE_SOCKET* ptr = nullptr; BIO_set_flags(bio, BIO_FLAGS_SHOULD_RETRY); ptr = (WINPR_BIO_SIMPLE_SOCKET*)calloc(1, sizeof(WINPR_BIO_SIMPLE_SOCKET)); @@ -409,7 +409,7 @@ static int transport_bio_simple_new(BIO* bio) static int transport_bio_simple_free(BIO* bio) { - WINPR_BIO_SIMPLE_SOCKET* ptr = NULL; + WINPR_BIO_SIMPLE_SOCKET* ptr = nullptr; if (!bio) return 0; @@ -419,7 +419,7 @@ static int transport_bio_simple_free(BIO* bio) if (ptr) { - BIO_set_data(bio, NULL); + BIO_set_data(bio, nullptr); free(ptr); } @@ -428,12 +428,12 @@ static int transport_bio_simple_free(BIO* bio) BIO_METHOD* BIO_s_simple_socket(void) { - static BIO_METHOD* bio_methods = NULL; + static BIO_METHOD* bio_methods = nullptr; - if (bio_methods == NULL) + if (bio_methods == nullptr) { if (!(bio_methods = BIO_meth_new(BIO_TYPE_SIMPLE, "SimpleSocket"))) - return NULL; + return nullptr; BIO_meth_set_write(bio_methods, transport_bio_simple_write); BIO_meth_set_read(bio_methods, transport_bio_simple_read); @@ -464,7 +464,7 @@ static int transport_bio_buffered_write(BIO* bio, const char* buf, int num) size_t committedBytes = 0; DataChunk chunks[2] = WINPR_C_ARRAY_INIT; WINPR_BIO_BUFFERED_SOCKET* ptr = (WINPR_BIO_BUFFERED_SOCKET*)BIO_get_data(bio); - BIO* next_bio = NULL; + BIO* next_bio = nullptr; WINPR_ASSERT(bio); WINPR_ASSERT(ptr); @@ -580,7 +580,7 @@ static long transport_bio_buffered_ctrl(BIO* bio, int cmd, long arg1, void* arg2 if (!ringbuffer_used(&ptr->xmitBuffer)) status = 1; else - status = (transport_bio_buffered_write(bio, NULL, 0) >= 0) ? 1 : -1; + status = (transport_bio_buffered_write(bio, nullptr, 0) >= 0) ? 1 : -1; break; @@ -610,7 +610,7 @@ static long transport_bio_buffered_ctrl(BIO* bio, int cmd, long arg1, void* arg2 static int transport_bio_buffered_new(BIO* bio) { - WINPR_BIO_BUFFERED_SOCKET* ptr = NULL; + WINPR_BIO_BUFFERED_SOCKET* ptr = nullptr; BIO_set_init(bio, 1); BIO_set_flags(bio, BIO_FLAGS_SHOULD_RETRY); ptr = (WINPR_BIO_BUFFERED_SOCKET*)calloc(1, sizeof(WINPR_BIO_BUFFERED_SOCKET)); @@ -643,12 +643,12 @@ static int transport_bio_buffered_free(BIO* bio) BIO_METHOD* BIO_s_buffered_socket(void) { - static BIO_METHOD* bio_methods = NULL; + static BIO_METHOD* bio_methods = nullptr; - if (bio_methods == NULL) + if (bio_methods == nullptr) { if (!(bio_methods = BIO_meth_new(BIO_TYPE_BUFFERED, "BufferedSocket"))) - return NULL; + return nullptr; BIO_meth_set_write(bio_methods, transport_bio_buffered_write); BIO_meth_set_read(bio_methods, transport_bio_buffered_read); @@ -668,9 +668,9 @@ char* freerdp_tcp_address_to_string(const struct sockaddr_storage* addr, BOOL* p const struct sockaddr_in6* sockaddr_ipv6 = (const struct sockaddr_in6*)addr; const struct sockaddr_in* sockaddr_ipv4 = (const struct sockaddr_in*)addr; - if (addr == NULL) + if (addr == nullptr) { - return NULL; + return nullptr; } switch (sockaddr_ipv4->sin_family) @@ -678,14 +678,14 @@ char* freerdp_tcp_address_to_string(const struct sockaddr_storage* addr, BOOL* p case AF_INET: if (!inet_ntop(sockaddr_ipv4->sin_family, &sockaddr_ipv4->sin_addr, ipAddress, sizeof(ipAddress))) - return NULL; + return nullptr; break; case AF_INET6: if (!inet_ntop(sockaddr_ipv6->sin6_family, &sockaddr_ipv6->sin6_addr, ipAddress, sizeof(ipAddress))) - return NULL; + return nullptr; break; @@ -694,10 +694,10 @@ char* freerdp_tcp_address_to_string(const struct sockaddr_storage* addr, BOOL* p break; default: - return NULL; + return nullptr; } - if (pIPv6 != NULL) + if (pIPv6 != nullptr) { *pIPv6 = (sockaddr_ipv4->sin_family == AF_INET6); } @@ -712,14 +712,14 @@ static bool freerdp_tcp_get_ip_address(rdpSettings* settings, int sockfd) struct sockaddr_storage saddr = WINPR_C_ARRAY_INIT; socklen_t length = sizeof(struct sockaddr_storage); - if (!freerdp_settings_set_string(settings, FreeRDP_ClientAddress, NULL)) + if (!freerdp_settings_set_string(settings, FreeRDP_ClientAddress, nullptr)) return false; if (sockfd < 0) return false; if (getsockname(sockfd, (struct sockaddr*)&saddr, &length) != 0) return false; settings->ClientAddress = freerdp_tcp_address_to_string(&saddr, &settings->IPv6Enabled); - return settings->ClientAddress != NULL; + return settings->ClientAddress != nullptr; } char* freerdp_tcp_get_peer_address(SOCKET sockfd) @@ -729,10 +729,10 @@ char* freerdp_tcp_get_peer_address(SOCKET sockfd) if (getpeername((int)sockfd, (struct sockaddr*)&saddr, &length) != 0) { - return NULL; + return nullptr; } - return freerdp_tcp_address_to_string(&saddr, NULL); + return freerdp_tcp_address_to_string(&saddr, nullptr); } static int freerdp_uds_connect(const char* path) @@ -768,11 +768,11 @@ static int freerdp_uds_connect(const char* path) struct addrinfo* freerdp_tcp_resolve_host(const char* hostname, int port, int ai_flags) { - char* service = NULL; + char* service = nullptr; char port_str[16]; int status = 0; struct addrinfo hints = WINPR_C_ARRAY_INIT; - struct addrinfo* result = NULL; + struct addrinfo* result = nullptr; hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; hints.ai_flags = ai_flags; @@ -786,7 +786,7 @@ struct addrinfo* freerdp_tcp_resolve_host(const char* hostname, int port, int ai status = getaddrinfo(hostname, service, &hints, &result); if (status) - return NULL; + return nullptr; return result; } @@ -816,7 +816,7 @@ static BOOL freerdp_tcp_connect_timeout(rdpContext* context, int sockfd, struct u_long arg = 0; DWORD tout = (timeout > 0) ? timeout : INFINITE; - handles[count] = CreateEvent(NULL, TRUE, FALSE, NULL); + handles[count] = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!handles[count]) return FALSE; @@ -912,8 +912,8 @@ static int freerdp_tcp_connect_multi(rdpContext* context, char** hostnames, cons { UINT32 sindex = count; SOCKET sockfd = INVALID_SOCKET; - struct addrinfo* addr = NULL; - struct addrinfo* result = NULL; + struct addrinfo* addr = nullptr; + struct addrinfo* result = nullptr; HANDLE* events = (HANDLE*)calloc(count + 1, sizeof(HANDLE)); t_peer* peers = (t_peer*)calloc(count, sizeof(t_peer)); @@ -939,7 +939,7 @@ static int freerdp_tcp_connect_multi(rdpContext* context, char** hostnames, cons addr = result; - if ((addr->ai_family == AF_INET6) && (addr->ai_next != 0)) + if ((addr->ai_family == AF_INET6) && (addr->ai_next != nullptr)) { while ((addr = addr->ai_next)) { @@ -1073,7 +1073,7 @@ BOOL freerdp_tcp_set_keep_alive_mode(const rdpSettings* settings, int sockfd) int freerdp_tcp_connect(rdpContext* context, const char* hostname, int port, DWORD timeout) { - rdpTransport* transport = NULL; + rdpTransport* transport = nullptr; if (!context || !context->rdp) return -1; transport = context->rdp->transport; @@ -1092,16 +1092,16 @@ static struct addrinfo* reorder_addrinfo_by_preference(rdpContext* context, stru if (!preferIPv6) return addr; - struct addrinfo* ipv6Head = NULL; - struct addrinfo* ipv6Tail = NULL; - struct addrinfo* otherHead = NULL; - struct addrinfo* otherTail = NULL; + struct addrinfo* ipv6Head = nullptr; + struct addrinfo* ipv6Tail = nullptr; + struct addrinfo* otherHead = nullptr; + struct addrinfo* otherTail = nullptr; /* Partition the list into IPv6 and other addresses */ while (addr) { struct addrinfo* next = addr->ai_next; - addr->ai_next = NULL; + addr->ai_next = nullptr; if (addr->ai_family == AF_INET6) { @@ -1165,7 +1165,7 @@ static int get_next_addrinfo(rdpContext* context, struct addrinfo* input, struct fail: freerdp_set_last_error_if_not(context, errorCode); - *result = NULL; + *result = nullptr; return -1; } @@ -1188,7 +1188,7 @@ static int freerdp_vsock_connect(rdpContext* context, const char* hostname, int addr.svm_port = WINPR_ASSERTING_INT_CAST(typeof(addr.svm_port), port); errno = 0; - char* ptr = NULL; + char* ptr = nullptr; unsigned long val = strtoul(hostname, &ptr, 10); if (errno || (val > UINT32_MAX)) { @@ -1221,7 +1221,7 @@ static void log_connection_address(const char* hostname, struct addrinfo* addr) WINPR_ASSERT(addr); char* peerAddress = - freerdp_tcp_address_to_string((const struct sockaddr_storage*)addr->ai_addr, NULL); + freerdp_tcp_address_to_string((const struct sockaddr_storage*)addr->ai_addr, nullptr); if (peerAddress) WLog_DBG(TAG, "resolved %s: try to connect to %s", hostname, peerAddress); free(peerAddress); @@ -1230,7 +1230,7 @@ static void log_connection_address(const char* hostname, struct addrinfo* addr) static int freerdp_host_connect(rdpContext* context, const char* hostname, int port, DWORD timeout) { int sockfd = -1; - struct addrinfo* addr = NULL; + struct addrinfo* addr = nullptr; struct addrinfo* result = freerdp_tcp_resolve_host(hostname, port, 0); if (!result) @@ -1500,9 +1500,9 @@ static BOOL freerdp_tcp_layer_wait(void* userContext, BOOL waitWrite, DWORD time do { if (waitWrite) - status = select(sockfd + 1, NULL, &rset, NULL, timeout ? &tv : NULL); + status = select(sockfd + 1, nullptr, &rset, nullptr, timeout ? &tv : nullptr); else - status = select(sockfd + 1, &rset, NULL, NULL, timeout ? &tv : NULL); + status = select(sockfd + 1, &rset, nullptr, nullptr, timeout ? &tv : nullptr); } while ((status < 0) && (errno == EINTR)); #endif @@ -1513,7 +1513,7 @@ static BOOL freerdp_tcp_layer_wait(void* userContext, BOOL waitWrite, DWORD time static HANDLE freerdp_tcp_layer_get_event(void* userContext) { if (!userContext) - return NULL; + return nullptr; rdpTcpLayer* tcpLayer = (rdpTcpLayer*)userContext; @@ -1528,8 +1528,8 @@ rdpTransportLayer* freerdp_tcp_connect_layer(rdpContext* context, const char* ho const rdpSettings* settings = context->settings; WINPR_ASSERT(settings); - rdpTransportLayer* layer = NULL; - rdpTcpLayer* tcpLayer = NULL; + rdpTransportLayer* layer = nullptr; + rdpTcpLayer* tcpLayer = nullptr; int sockfd = freerdp_tcp_connect(context, hostname, port, timeout); if (sockfd < 0) @@ -1570,7 +1570,7 @@ fail: if (sockfd >= 0) closesocket((SOCKET)sockfd); transport_layer_free(layer); - return NULL; + return nullptr; } BOOL freerdp_tcp_set_nodelay(wLog* log, DWORD level, int sockfd) diff --git a/libfreerdp/core/tcp.h b/libfreerdp/core/tcp.h index 21828810a..a8669c2b1 100644 --- a/libfreerdp/core/tcp.h +++ b/libfreerdp/core/tcp.h @@ -77,30 +77,30 @@ static inline long BIO_set_handle(BIO* b, HANDLE h) static inline long BIO_set_nonblock(BIO* b, long c) { - return BIO_ctrl(b, BIO_C_SET_NONBLOCK, c, NULL); + return BIO_ctrl(b, BIO_C_SET_NONBLOCK, c, nullptr); } WINPR_ATTR_NODISCARD static inline long BIO_read_blocked(BIO* b) { - return BIO_ctrl(b, BIO_C_READ_BLOCKED, 0, NULL); + return BIO_ctrl(b, BIO_C_READ_BLOCKED, 0, nullptr); } WINPR_ATTR_NODISCARD static inline long BIO_write_blocked(BIO* b) { - return BIO_ctrl(b, BIO_C_WRITE_BLOCKED, 0, NULL); + return BIO_ctrl(b, BIO_C_WRITE_BLOCKED, 0, nullptr); } static inline long BIO_wait_read(BIO* b, long c) { - return BIO_ctrl(b, BIO_C_WAIT_READ, c, NULL); + return BIO_ctrl(b, BIO_C_WAIT_READ, c, nullptr); } WINPR_ATTR_NODISCARD static inline long BIO_wait_write(BIO* b, long c) { - return BIO_ctrl(b, BIO_C_WAIT_WRITE, c, NULL); + return BIO_ctrl(b, BIO_C_WAIT_WRITE, c, nullptr); } WINPR_ATTR_NODISCARD diff --git a/libfreerdp/core/test/TestConnect.c b/libfreerdp/core/test/TestConnect.c index 12c6f932e..6f8397346 100644 --- a/libfreerdp/core/test/TestConnect.c +++ b/libfreerdp/core/test/TestConnect.c @@ -7,13 +7,13 @@ #include #include -static HANDLE s_sync = NULL; +static HANDLE s_sync = nullptr; static int runInstance(int argc, char* argv[], freerdp** inst, DWORD timeout) { int rc = -1; RDP_CLIENT_ENTRY_POINTS clientEntryPoints = WINPR_C_ARRAY_INIT; - rdpContext* context = NULL; + rdpContext* context = nullptr; clientEntryPoints.Size = sizeof(RDP_CLIENT_ENTRY_POINTS); clientEntryPoints.Version = RDP_CLIENT_INTERFACE_VERSION; @@ -26,12 +26,12 @@ static int runInstance(int argc, char* argv[], freerdp** inst, DWORD timeout) if (inst) *inst = context->instance; - context->instance->ChooseSmartcard = NULL; - context->instance->PresentGatewayMessage = NULL; - context->instance->LogonErrorInfo = NULL; - context->instance->AuthenticateEx = NULL; - context->instance->VerifyCertificateEx = NULL; - context->instance->VerifyChangedCertificateEx = NULL; + context->instance->ChooseSmartcard = nullptr; + context->instance->PresentGatewayMessage = nullptr; + context->instance->LogonErrorInfo = nullptr; + context->instance->AuthenticateEx = nullptr; + context->instance->VerifyCertificateEx = nullptr; + context->instance->VerifyChangedCertificateEx = nullptr; if (!freerdp_settings_set_bool(context->settings, FreeRDP_DeactivateClientDecoding, TRUE)) return FALSE; @@ -65,7 +65,7 @@ static int runInstance(int argc, char* argv[], freerdp** inst, DWORD timeout) finish: freerdp_client_context_free(context); if (inst) - *inst = NULL; + *inst = nullptr; return rc; } @@ -81,7 +81,7 @@ static int testTimeout(int port) (void)_snprintf(arg1, 18, "/v:192.0.2.1:%d", port); argv[1] = arg1; start = GetTickCount(); - rc = runInstance(ARRAYSIZE(argv), argv, NULL, timeout); + rc = runInstance(ARRAYSIZE(argv), argv, nullptr, timeout); end = GetTickCount(); if (rc != 1) @@ -128,10 +128,10 @@ static int testAbort(int port) DWORD start = 0; DWORD end = 0; DWORD diff = 0; - HANDLE thread = NULL; + HANDLE thread = nullptr; struct testThreadArgs args; - freerdp* instance = NULL; - s_sync = CreateEvent(NULL, TRUE, FALSE, NULL); + freerdp* instance = nullptr; + s_sync = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!s_sync) return -1; @@ -139,12 +139,12 @@ static int testAbort(int port) args.port = port; args.arg = &instance; start = GetTickCount(); - thread = CreateThread(NULL, 0, testThread, &args, 0, NULL); + thread = CreateThread(nullptr, 0, testThread, &args, 0, nullptr); if (!thread) { (void)CloseHandle(s_sync); - s_sync = NULL; + s_sync = nullptr; return -1; } @@ -158,7 +158,7 @@ static int testAbort(int port) { (void)CloseHandle(s_sync); (void)CloseHandle(thread); - s_sync = NULL; + s_sync = nullptr; return -1; } } @@ -167,7 +167,7 @@ static int testAbort(int port) end = GetTickCount(); (void)CloseHandle(s_sync); (void)CloseHandle(thread); - s_sync = NULL; + s_sync = nullptr; diff = end - start; if (diff > 5000) @@ -185,7 +185,7 @@ static int testAbort(int port) static char* concatenate(size_t count, ...) { - char* rc = NULL; + char* rc = nullptr; va_list ap = WINPR_C_ARRAY_INIT; va_start(ap, count); rc = _strdup(va_arg(ap, char*)); @@ -203,7 +203,7 @@ static char* concatenate(size_t count, ...) static BOOL prepare_certificates(const char* path) { BOOL rc = FALSE; - char* exe = NULL; + char* exe = nullptr; DWORD status = 0; STARTUPINFOA si = WINPR_C_ARRAY_INIT; PROCESS_INFORMATION process = WINPR_C_ARRAY_INIT; @@ -218,7 +218,7 @@ static BOOL prepare_certificates(const char* path) return FALSE; (void)_snprintf(commandLine, sizeof(commandLine), "%s -format crt -path . -n server", exe); - rc = CreateProcessA(exe, commandLine, NULL, NULL, TRUE, 0, NULL, path, &si, &process); + rc = CreateProcessA(exe, commandLine, nullptr, nullptr, TRUE, 0, nullptr, path, &si, &process); free(exe); if (!rc) goto fail; @@ -239,12 +239,12 @@ static int testSuccess(int port) STARTUPINFOA si = WINPR_C_ARRAY_INIT; PROCESS_INFORMATION process = WINPR_C_ARRAY_INIT; char arg1[] = "/v:127.0.0.1:XXXXX"; - char* clientArgs[] = { "test", "/v:127.0.0.1:XXXXX", "/cert:ignore", "/rfx", NULL }; - char* commandLine = NULL; + char* clientArgs[] = { "test", "/v:127.0.0.1:XXXXX", "/cert:ignore", "/rfx", nullptr }; + char* commandLine = nullptr; size_t commandLineLen = 0; int argc = 4; - char* path = NULL; - char* wpath = NULL; + char* path = nullptr; + char* wpath = nullptr; char* exe = GetCombinedPath(TESTING_OUTPUT_DIRECTORY, "server"); (void)_snprintf(arg1, 18, "/v:127.0.0.1:%d", port); clientArgs[1] = arg1; @@ -255,7 +255,7 @@ static int testSuccess(int port) path = GetCombinedPath(exe, "Sample"); wpath = GetCombinedPath(exe, "Sample"); free(exe); - exe = NULL; + exe = nullptr; if (!path || !wpath) goto fail; @@ -284,11 +284,12 @@ static int testSuccess(int port) (void)_snprintf(commandLine, commandLineLen, "%s --port=%d", exe, port); si.cb = sizeof(si); - if (!CreateProcessA(NULL, commandLine, NULL, NULL, FALSE, 0, NULL, wpath, &si, &process)) + if (!CreateProcessA(nullptr, commandLine, nullptr, nullptr, FALSE, 0, nullptr, wpath, &si, + &process)) goto fail; Sleep(5000); /* let the server start */ - r = runInstance(argc, clientArgs, NULL, 10000); + r = runInstance(argc, clientArgs, nullptr, 10000); if (!TerminateProcess(process.hProcess, 0)) goto fail; diff --git a/libfreerdp/core/test/TestFuzzCryptoCertificateDataSetPEM.c b/libfreerdp/core/test/TestFuzzCryptoCertificateDataSetPEM.c index 203271564..6a5f8d60a 100644 --- a/libfreerdp/core/test/TestFuzzCryptoCertificateDataSetPEM.c +++ b/libfreerdp/core/test/TestFuzzCryptoCertificateDataSetPEM.c @@ -4,9 +4,9 @@ int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) { - rdpCertificateData* data = NULL; + rdpCertificateData* data = nullptr; char* pem = calloc(Size + 1, sizeof(char)); - if (pem == NULL) + if (pem == nullptr) goto cleanup; memcpy(pem, Data, Size); diff --git a/libfreerdp/core/test/TestSettings.c b/libfreerdp/core/test/TestSettings.c index 3efa92879..e53c9fee3 100644 --- a/libfreerdp/core/test/TestSettings.c +++ b/libfreerdp/core/test/TestSettings.c @@ -72,12 +72,12 @@ static BOOL test_dyn_channels(void) UINT32 u32 = 0; rdpSettings* settings = freerdp_settings_new(0); const char* argv1[] = { "foobar" }; - ADDIN_ARGV* args1 = NULL; - const ADDIN_ARGV* cmp1 = NULL; + ADDIN_ARGV* args1 = nullptr; + const ADDIN_ARGV* cmp1 = nullptr; const char* argv2[] = { "gaga", "abba", "foo" }; - ADDIN_ARGV* args2 = NULL; - const ADDIN_ARGV* cmp2 = NULL; - const ADDIN_ARGV* got = NULL; + ADDIN_ARGV* args2 = nullptr; + const ADDIN_ARGV* cmp2 = nullptr; + const ADDIN_ARGV* got = nullptr; if (!settings) goto fail; @@ -99,7 +99,7 @@ static BOOL test_dyn_channels(void) test = freerdp_dynamic_channel_collection_add(settings, args1); if (!test) goto fail; - args1 = NULL; /* settings have taken ownership */ + args1 = nullptr; /* settings have taken ownership */ u32 = freerdp_settings_get_uint32(settings, FreeRDP_DynamicChannelCount); if (u32 != 1) @@ -112,7 +112,7 @@ static BOOL test_dyn_channels(void) test = freerdp_dynamic_channel_collection_add(settings, args2); if (!test) goto fail; - args2 = NULL; /* settings have taken ownership */ + args2 = nullptr; /* settings have taken ownership */ u32 = freerdp_settings_get_uint32(settings, FreeRDP_DynamicChannelCount); if (u32 != 2) @@ -173,12 +173,12 @@ static BOOL test_static_channels(void) UINT32 u32 = 0; rdpSettings* settings = freerdp_settings_new(0); const char* argv1[] = { "foobar" }; - ADDIN_ARGV* args1 = NULL; - const ADDIN_ARGV* cmp1 = NULL; + ADDIN_ARGV* args1 = nullptr; + const ADDIN_ARGV* cmp1 = nullptr; const char* argv2[] = { "gaga", "abba", "foo" }; - ADDIN_ARGV* args2 = NULL; - const ADDIN_ARGV* cmp2 = NULL; - const ADDIN_ARGV* got = NULL; + ADDIN_ARGV* args2 = nullptr; + const ADDIN_ARGV* cmp2 = nullptr; + const ADDIN_ARGV* got = nullptr; if (!settings) goto fail; @@ -200,7 +200,7 @@ static BOOL test_static_channels(void) test = freerdp_static_channel_collection_add(settings, args1); if (!test) goto fail; - args1 = NULL; /* settings have taken ownership */ + args1 = nullptr; /* settings have taken ownership */ u32 = freerdp_settings_get_uint32(settings, FreeRDP_StaticChannelCount); if (u32 != 1) @@ -213,7 +213,7 @@ static BOOL test_static_channels(void) test = freerdp_static_channel_collection_add(settings, args2); if (!test) goto fail; - args2 = NULL; /* settings have taken ownership */ + args2 = nullptr; /* settings have taken ownership */ u32 = freerdp_settings_get_uint32(settings, FreeRDP_StaticChannelCount); if (u32 != 2) @@ -478,7 +478,7 @@ static BOOL check_key_helpers(size_t key, const char* stype) log_start(); int test_rounds = 100; BOOL res = FALSE; - rdpSettings* settings = NULL; + rdpSettings* settings = nullptr; SSIZE_T rc = 0; SSIZE_T tkey = 0; SSIZE_T type = 0; @@ -556,9 +556,9 @@ static BOOL check_key_helpers(size_t key, const char* stype) { const size_t id = clear_keys[x]; const char* foo = freerdp_settings_get_name_for_key(WINPR_ASSERTING_INT_CAST(SSIZE_T, id)); - if (!freerdp_settings_set_pointer_len(settings, id, NULL, 0)) + if (!freerdp_settings_set_pointer_len(settings, id, nullptr, 0)) { - printf("[%s] freerdp_settings_set_pointer_len(%s, NULL, 0) failed\n", stype, foo); + printf("[%s] freerdp_settings_set_pointer_len(%s, nullptr, 0) failed\n", stype, foo); goto fail; } } @@ -725,7 +725,7 @@ static BOOL check_args(const RDPDR_DEVICE* what, size_t count, const char* args[ } if (count > 2) { - return (a->automount == (args[2] == NULL)); + return (a->automount == (args[2] == nullptr)); } else return !a->automount; @@ -776,37 +776,37 @@ static BOOL check_device_type(void) }; const char* args[] = { "somename", "anothername", "3rdname", "4thname" }; const struct test_entry tests[] = { - { 1, RDPDR_DTYP_SERIAL, 0, NULL }, + { 1, RDPDR_DTYP_SERIAL, 0, nullptr }, { 1, RDPDR_DTYP_SERIAL, 0, args }, { 1, RDPDR_DTYP_SERIAL, 1, args }, { 1, RDPDR_DTYP_SERIAL, 2, args }, { 1, RDPDR_DTYP_SERIAL, 3, args }, { 1, RDPDR_DTYP_SERIAL, 4, args }, - { 1, RDPDR_DTYP_PARALLEL, 0, NULL }, + { 1, RDPDR_DTYP_PARALLEL, 0, nullptr }, { 1, RDPDR_DTYP_PARALLEL, 0, args }, { 1, RDPDR_DTYP_PARALLEL, 1, args }, { 1, RDPDR_DTYP_PARALLEL, 2, args }, { 1, RDPDR_DTYP_PARALLEL, 3, args }, { 1, RDPDR_DTYP_PARALLEL, 4, args }, - { 1, RDPDR_DTYP_PRINT, 0, NULL }, + { 1, RDPDR_DTYP_PRINT, 0, nullptr }, { 1, RDPDR_DTYP_PRINT, 0, args }, { 1, RDPDR_DTYP_PRINT, 1, args }, { 1, RDPDR_DTYP_PRINT, 2, args }, { 1, RDPDR_DTYP_PRINT, 3, args }, { 1, RDPDR_DTYP_PRINT, 4, args }, - { 1, RDPDR_DTYP_FILESYSTEM, 0, NULL }, + { 1, RDPDR_DTYP_FILESYSTEM, 0, nullptr }, { 1, RDPDR_DTYP_FILESYSTEM, 0, args }, { 1, RDPDR_DTYP_FILESYSTEM, 1, args }, { 1, RDPDR_DTYP_FILESYSTEM, 2, args }, { 1, RDPDR_DTYP_FILESYSTEM, 3, args }, { 1, RDPDR_DTYP_FILESYSTEM, 4, args }, - { 1, RDPDR_DTYP_SMARTCARD, 0, NULL }, + { 1, RDPDR_DTYP_SMARTCARD, 0, nullptr }, { 1, RDPDR_DTYP_SMARTCARD, 0, args }, { 1, RDPDR_DTYP_SMARTCARD, 1, args }, { 1, RDPDR_DTYP_SMARTCARD, 2, args }, { 1, RDPDR_DTYP_SMARTCARD, 3, args }, { 1, RDPDR_DTYP_SMARTCARD, 4, args }, - { -3, 0x123, 0, NULL }, + { -3, 0x123, 0, nullptr }, { -3, 0x123, 0, args }, { -3, 0x123, 1, args }, { -3, 0x123, 2, args }, @@ -849,7 +849,7 @@ static BOOL test_write_offsets(rdpSettings* settings, size_t id, size_t elementS for (size_t x = min; x < max; x++) { - const void* ptr = NULL; + const void* ptr = nullptr; char buffer[8192] = WINPR_C_ARRAY_INIT; winpr_RAND(buffer, sizeof(buffer)); @@ -915,7 +915,7 @@ static BOOL test_pointer_array(void) for (size_t x = 0; x < ARRAYSIZE(tests); x++) { const struct pointer_test_case* cur = &tests[x]; - if (!freerdp_settings_set_pointer_len(settings, cur->id, NULL, cur->size)) + if (!freerdp_settings_set_pointer_len(settings, cur->id, nullptr, cur->size)) goto fail; if (cur->sizeId >= 0) { @@ -934,7 +934,7 @@ static BOOL test_pointer_array(void) if (test_write_offsets(settings, cur->id, cur->elementSize, cur->size, cur->size + 5)) goto fail; } - if (!freerdp_settings_set_pointer_len(settings, cur->id, NULL, 0)) + if (!freerdp_settings_set_pointer_len(settings, cur->id, nullptr, 0)) goto fail; if (cur->sizeId >= 0) { @@ -949,7 +949,7 @@ static BOOL test_pointer_array(void) if (test_write_offsets(settings, cur->id, cur->elementSize, 0, cur->size)) goto fail; } - if (!freerdp_settings_set_pointer_len(settings, cur->id, NULL, cur->size)) + if (!freerdp_settings_set_pointer_len(settings, cur->id, nullptr, cur->size)) goto fail; if (cur->sizeId >= 0) { @@ -996,7 +996,7 @@ static BOOL prepare_monitor_array(rdpSettings* settings, const struct validity_t static BOOL check_primary_offset(const rdpSettings* settings, const rdpMonitor* monitors, size_t count) { - const rdpMonitor* cprimary = NULL; + const rdpMonitor* cprimary = nullptr; for (size_t x = 0; x < count; x++) { const rdpMonitor* cur = &monitors[x]; @@ -1012,7 +1012,7 @@ static BOOL check_primary_offset(const rdpSettings* settings, const rdpMonitor* cprimary = cur; } } - const rdpMonitor* sprimary = NULL; + const rdpMonitor* sprimary = nullptr; for (size_t x = 0; x < count; x++) { const rdpMonitor* cur = @@ -1458,11 +1458,11 @@ fail: static BOOL test_string_null(rdpSettings* settings, FreeRDP_Settings_Keys_String id) { - if (!freerdp_settings_set_string(settings, id, NULL)) + if (!freerdp_settings_set_string(settings, id, nullptr)) return FALSE; const char* chk = freerdp_settings_get_string(settings, id); - return (chk == NULL); + return (chk == nullptr); } static BOOL test_string_check(rdpSettings* settings, FreeRDP_Settings_Keys_String id, @@ -1497,7 +1497,7 @@ static BOOL test_string_set_readback(rdpSettings* settings, FreeRDP_Settings_Key WINPR_ASSERT(len > 3); BOOL rc = FALSE; - WCHAR* wstr = NULL; + WCHAR* wstr = nullptr; const size_t slen = strnlen(string, len); if (!freerdp_settings_set_string_len(settings, id, string, slen - 1)) @@ -1561,8 +1561,8 @@ static BOOL test_serialize_with(rdpSettings* src, const char* name) log_start(); BOOL rc = FALSE; size_t slen = 0; - rdpSettings* dst = NULL; - char* str = NULL; + rdpSettings* dst = nullptr; + char* str = nullptr; if (!src) goto fail; @@ -1642,7 +1642,7 @@ static BOOL add_dev_argv(rdpSettings* src, size_t argc, const char* argv[]) { FreeRDP_Settings_Keys_Pointer key = FreeRDP_DeviceArray; size_t count = 6; - if (!freerdp_settings_set_pointer_len(src, key, NULL, count)) + if (!freerdp_settings_set_pointer_len(src, key, nullptr, count)) return FALSE; const uint32_t types[] = { RDPDR_DTYP_SERIAL, RDPDR_DTYP_PARALLEL, RDPDR_DTYP_PRINT, @@ -1665,7 +1665,7 @@ static BOOL add_dev_argv(rdpSettings* src, size_t argc, const char* argv[]) static BOOL fill_random(rdpSettings* src, FreeRDP_Settings_Keys_Pointer key, size_t elem, size_t len) { - if (!freerdp_settings_set_pointer_len(src, key, NULL, len)) + if (!freerdp_settings_set_pointer_len(src, key, nullptr, len)) return FALSE; uint8_t* data = freerdp_settings_get_pointer_writable(src, key); if (!data) @@ -1699,7 +1699,7 @@ static BOOL fill_random_timezone(rdpSettings* src) static BOOL set_private_key(rdpSettings* src) { - if (!freerdp_settings_set_pointer_len(src, FreeRDP_RdpServerRsaKey, NULL, 1)) + if (!freerdp_settings_set_pointer_len(src, FreeRDP_RdpServerRsaKey, nullptr, 1)) return FALSE; rdpPrivateKey* key = @@ -1742,7 +1742,7 @@ static BOOL set_string_array(rdpSettings* src, FreeRDP_Settings_Keys_Pointer key winpr_RAND(&count, sizeof(count)); count = count % max; - if (!freerdp_settings_set_pointer_len(src, key, NULL, count)) + if (!freerdp_settings_set_pointer_len(src, key, nullptr, count)) return FALSE; for (uint32_t x = 0; x < count; x++) @@ -1814,7 +1814,7 @@ static BOOL test_serialize_pointer(DWORD flags) if (!fill_random_timezone(src)) goto fail; - void* ptr = NULL; + void* ptr = nullptr; winpr_RAND((void*)&ptr, sizeof(void*)); if (!freerdp_settings_set_pointer(src, FreeRDP_instance, ptr)) goto fail; @@ -1885,7 +1885,7 @@ static BOOL test_serialize(void) { BOOL rc = FALSE; log_start(); - if (WINPR_JSON_version(NULL, 0) < 0) + if (WINPR_JSON_version(nullptr, 0) < 0) { rc = TRUE; } @@ -1902,7 +1902,7 @@ static BOOL test_serialize(void) return FALSE; if (!test_serialize_strings(flags, "")) return FALSE; - if (!test_serialize_strings(flags, NULL)) + if (!test_serialize_strings(flags, nullptr)) return FALSE; if (!test_serialize_pointer(flags)) return FALSE; @@ -2168,7 +2168,7 @@ static BOOL test_string_list(rdpSettings* settings, const rdpSettings* cloned) { const size_t key = string_list_indices[x]; const char val[] = "test-string"; - const char* res = NULL; + const char* res = nullptr; const char* name = freerdp_settings_get_name_for_key(WINPR_ASSERTING_INT_CAST(SSIZE_T, key)); const char* oval = freerdp_settings_get_string(settings, key); @@ -2242,7 +2242,7 @@ static BOOL test_all(void) log_start(); rdpSettings* settings = freerdp_settings_new(0); - rdpSettings* cloned = NULL; + rdpSettings* cloned = nullptr; if (!settings) { @@ -2333,7 +2333,7 @@ static bool checkTargetBufferResized(rdpSettings* settings, FreeRDP_Settings_Key for (size_t x = count; x < newSize; x++) { const char* cmp = freerdp_settings_get_pointer_array(settings, key, x); - if (cmp != NULL) + if (cmp != nullptr) return false; } return true; diff --git a/libfreerdp/core/test/TestStreamDump.c b/libfreerdp/core/test/TestStreamDump.c index fdac09064..ab7743d0f 100644 --- a/libfreerdp/core/test/TestStreamDump.c +++ b/libfreerdp/core/test/TestStreamDump.c @@ -12,15 +12,15 @@ static BOOL test_entry_read_write(void) { BOOL rc = FALSE; - FILE* fp = NULL; - wStream* sw = NULL; - wStream* sr = NULL; + FILE* fp = nullptr; + wStream* sw = nullptr; + wStream* sr = nullptr; size_t offset = 0; UINT64 ts = 0; UINT32 flags = 0; BYTE tmp[16] = WINPR_C_ARRAY_INIT; char tmp2[64] = WINPR_C_ARRAY_INIT; - char* name = NULL; + char* name = nullptr; size_t entrysize = sizeof(UINT64) /* timestamp */ + sizeof(BYTE) /* direction */ + sizeof(UINT32) /* CRC */ + sizeof(UINT64) /* size */; @@ -35,8 +35,8 @@ static BOOL test_entry_read_write(void) goto fail; } - sw = Stream_New(NULL, 8123); - sr = Stream_New(NULL, 1024); + sw = Stream_New(nullptr, 8123); + sr = Stream_New(nullptr, 1024); if (!sr || !sw) { (void)fprintf(stderr, "[%s] Could not create iostreams sw=%p, sr=%p\n", __func__, (void*)sw, diff --git a/libfreerdp/core/test/TestUtils.c b/libfreerdp/core/test/TestUtils.c index 92a813642..fbd16fd54 100644 --- a/libfreerdp/core/test/TestUtils.c +++ b/libfreerdp/core/test/TestUtils.c @@ -30,7 +30,7 @@ WINPR_ATTR_MALLOC(free, 1) WINPR_ATTR_NODISCARD static char* create(const char* vendor, const char* product, SSIZE_T version, char separator) { - char* wvendor = NULL; + char* wvendor = nullptr; size_t wlen = 0; if (version < 0) (void)winpr_asprintf(&wvendor, &wlen, "%s%c%s", vendor, separator, product); @@ -38,7 +38,8 @@ static char* create(const char* vendor, const char* product, SSIZE_T version, ch (void)winpr_asprintf(&wvendor, &wlen, "%s%c%s%" PRIdz, vendor, separator, product, version); if (!wvendor) { - (void)fprintf(stderr, "%s(vendor=%s, product=%s, version=%" PRIdz ", separator=%c) NULL\n", + (void)fprintf(stderr, + "%s(vendor=%s, product=%s, version=%" PRIdz ", separator=%c) nullptr\n", __func__, vendor, product, version, separator); } return wvendor; @@ -81,7 +82,7 @@ static char* freerdp_settings_get_legacy_config_path(const char* filename, const const size_t plen = strnlen(cproduct, sizeof(product)); if (plen == MAX_PATH) - return NULL; + return nullptr; for (size_t i = 0; i < plen; i++) product[i] = (char)tolower(cproduct[i]); @@ -89,7 +90,7 @@ static char* freerdp_settings_get_legacy_config_path(const char* filename, const char* path = GetKnownSubPath(KNOWN_PATH_XDG_CONFIG_HOME, product); if (!path) - return NULL; + return nullptr; if (!filename) return path; @@ -108,7 +109,7 @@ char* getFreeRDPDefaultConfig(BOOL system, const char* product, const char* vend eKnownPathTypes id = system ? KNOWN_PATH_SYSTEM_CONFIG_HOME : KNOWN_PATH_XDG_CONFIG_HOME; if (!vendor || !product) - return NULL; + return nullptr; #if !defined(WITH_FULL_CONFIG_PATH) if (!system && (_stricmp(vendor, product) == 0)) @@ -117,9 +118,9 @@ char* getFreeRDPDefaultConfig(BOOL system, const char* product, const char* vend char* config = GetKnownPath(id); if (!config) - return NULL; + return nullptr; - char* base = NULL; + char* base = nullptr; if (version < 0) base = GetCombinedPathV(config, "%s", product); else @@ -127,7 +128,7 @@ char* getFreeRDPDefaultConfig(BOOL system, const char* product, const char* vend free(config); if (!base) - return NULL; + return nullptr; if (!filename) return base; @@ -150,9 +151,9 @@ static char* getFreeRDPConfig(bool custom, BOOL system, const char* vendor, cons eKnownPathTypes id = system ? KNOWN_PATH_SYSTEM_CONFIG_HOME : KNOWN_PATH_XDG_CONFIG_HOME; char* config = GetKnownSubPathV(id, "%s", vendor); if (!config) - return NULL; + return nullptr; - char* base = NULL; + char* base = nullptr; if (version < 0) base = GetCombinedPathV(config, "%s", product); else @@ -160,7 +161,7 @@ static char* getFreeRDPConfig(bool custom, BOOL system, const char* vendor, cons free(config); if (!base) - return NULL; + return nullptr; if (!filename) return base; @@ -233,8 +234,8 @@ static bool checkFreeRDPResults(bool custom, const char* vendor, const char* pro } { - char* sys = freerdp_GetConfigFilePath(TRUE, NULL); - const bool rc = checkFreeRDPConfig(custom, sys, TRUE, vendor, product, version, NULL); + char* sys = freerdp_GetConfigFilePath(TRUE, nullptr); + const bool rc = checkFreeRDPConfig(custom, sys, TRUE, vendor, product, version, nullptr); free(sys); if (!rc) return rc; @@ -248,8 +249,8 @@ static bool checkFreeRDPResults(bool custom, const char* vendor, const char* pro return rc; } { - char* sys = freerdp_GetConfigFilePath(FALSE, NULL); - const bool rc = checkFreeRDPConfig(custom, sys, FALSE, vendor, product, version, NULL); + char* sys = freerdp_GetConfigFilePath(FALSE, nullptr); + const bool rc = checkFreeRDPConfig(custom, sys, FALSE, vendor, product, version, nullptr); free(sys); if (!rc) return rc; @@ -268,14 +269,14 @@ static bool checkFreeRDPResults(bool custom, const char* vendor, const char* pro char* pcmp = create(vendor, product, version, '\\'); if (!pcmp) return false; - char* cmp = NULL; + char* cmp = nullptr; size_t clen = 0; #define FMT "foo\\bar\\%s\\gaga" (void)winpr_asprintf(&cmp, &clen, FMT, pcmp); free(pcmp); if (!cmp) { - (void)fprintf(stderr, "winpr_asprintf cmp NULL\n"); + (void)fprintf(stderr, "winpr_asprintf cmp nullptr\n"); return false; } @@ -329,9 +330,9 @@ static char* getWinPRConfig(BOOL system, const char* vendor, const char* product eKnownPathTypes id = system ? KNOWN_PATH_SYSTEM_CONFIG_HOME : KNOWN_PATH_XDG_CONFIG_HOME; char* config = GetKnownSubPathV(id, "%s", vendor); if (!config) - return NULL; + return nullptr; - char* base = NULL; + char* base = nullptr; if (version < 0) base = GetCombinedPathV(config, "%s", product); else @@ -339,7 +340,7 @@ static char* getWinPRConfig(BOOL system, const char* vendor, const char* product free(config); if (!base) - return NULL; + return nullptr; if (!filename) return base; @@ -398,8 +399,8 @@ static bool checkWinPRResults(bool custom, const char* vendor, const char* produ } { - char* sys = winpr_GetConfigFilePath(TRUE, NULL); - const bool rc = checkWinPRConfig(sys, TRUE, vendor, product, version, NULL); + char* sys = winpr_GetConfigFilePath(TRUE, nullptr); + const bool rc = checkWinPRConfig(sys, TRUE, vendor, product, version, nullptr); free(sys); if (!rc) return rc; @@ -412,8 +413,8 @@ static bool checkWinPRResults(bool custom, const char* vendor, const char* produ return rc; } { - char* sys = winpr_GetConfigFilePath(FALSE, NULL); - const bool rc = checkWinPRConfig(sys, FALSE, vendor, product, version, NULL); + char* sys = winpr_GetConfigFilePath(FALSE, nullptr); + const bool rc = checkWinPRConfig(sys, FALSE, vendor, product, version, nullptr); free(sys); if (!rc) return rc; diff --git a/libfreerdp/core/test/TestVersion.c b/libfreerdp/core/test/TestVersion.c index 1853e7827..b33d10132 100644 --- a/libfreerdp/core/test/TestVersion.c +++ b/libfreerdp/core/test/TestVersion.c @@ -3,9 +3,9 @@ int TestVersion(int argc, char* argv[]) { - const char* version = NULL; - const char* git = NULL; - const char* build = NULL; + const char* version = nullptr; + const char* git = nullptr; + const char* build = nullptr; int major = 0; int minor = 0; int revision = 0; diff --git a/libfreerdp/core/timer.c b/libfreerdp/core/timer.c index 4514d8861..c57c7bc02 100644 --- a/libfreerdp/core/timer.c +++ b/libfreerdp/core/timer.c @@ -255,11 +255,11 @@ static void* entry_new(const void* val) { const timer_entry_t* entry = val; if (!entry) - return NULL; + return nullptr; timer_entry_t* copy = calloc(1, sizeof(timer_entry_t)); if (!copy) - return NULL; + return nullptr; *copy = *entry; return copy; } @@ -269,7 +269,7 @@ FreeRDPTimer* freerdp_timer_new(rdpRdp* rdp) WINPR_ASSERT(rdp); FreeRDPTimer* timer = calloc(1, sizeof(FreeRDPTimer)); if (!timer) - return NULL; + return nullptr; timer->rdp = rdp; timer->entries = ArrayList_New(TRUE); @@ -283,17 +283,17 @@ FreeRDPTimer* freerdp_timer_new(rdpRdp* rdp) obj->fnObjectFree = free; } - timer->event = CreateEventA(NULL, TRUE, FALSE, NULL); + timer->event = CreateEventA(nullptr, TRUE, FALSE, nullptr); if (!timer->event) goto fail; - timer->mainevent = CreateEventA(NULL, TRUE, FALSE, NULL); + timer->mainevent = CreateEventA(nullptr, TRUE, FALSE, nullptr); if (!timer->mainevent) goto fail; #if defined(FREERDP_TIMER_SUPPORTED) timer->running = true; - timer->thread = CreateThread(NULL, 0, timer_thread, timer, 0, NULL); + timer->thread = CreateThread(nullptr, 0, timer_thread, timer, 0, nullptr); if (!timer->thread) goto fail; #endif @@ -301,7 +301,7 @@ FreeRDPTimer* freerdp_timer_new(rdpRdp* rdp) fail: freerdp_timer_free(timer); - return NULL; + return nullptr; } static BOOL runExpiredTimerOnMainloop(void* data, WINPR_ATTR_UNUSED size_t index, diff --git a/libfreerdp/core/tpkt.c b/libfreerdp/core/tpkt.c index d446b953a..5ed564caa 100644 --- a/libfreerdp/core/tpkt.c +++ b/libfreerdp/core/tpkt.c @@ -86,7 +86,7 @@ int tpkt_verify_header(wStream* s) * Read a TPKT header. * * @param s A stream to read from - * @param length A pointer to the result, must not be NULL + * @param length A pointer to the result, must not be nullptr * * @return \b TRUE for success, \b FALSE otherwise */ diff --git a/libfreerdp/core/transport.c b/libfreerdp/core/transport.c index e5e66ebcf..8d0339423 100644 --- a/libfreerdp/core/transport.c +++ b/libfreerdp/core/transport.c @@ -108,7 +108,7 @@ typedef struct static const char* where2str(int where, char* ibuffer, size_t ilen) { if (!ibuffer || (ilen < 2)) - return NULL; + return nullptr; ibuffer[0] = '['; size_t len = ilen - 1; @@ -201,7 +201,7 @@ wStream* transport_send_stream_init(WINPR_ATTR_UNUSED rdpTransport* transport, s { WINPR_ASSERT(transport); - return Stream_New(NULL, size); + return Stream_New(nullptr, size); } BOOL transport_attach(rdpTransport* transport, int sockfd) @@ -213,9 +213,9 @@ BOOL transport_attach(rdpTransport* transport, int sockfd) static BOOL transport_default_attach(rdpTransport* transport, int sockfd) { - BIO* socketBio = NULL; - BIO* bufferedBio = NULL; - const rdpSettings* settings = NULL; + BIO* socketBio = nullptr; + BIO* bufferedBio = nullptr; + const rdpSettings* settings = nullptr; rdpContext* context = transport_get_context(transport); if (sockfd < 0) @@ -294,7 +294,7 @@ BOOL transport_connect_rdp(rdpTransport* transport) BOOL transport_connect_tls(rdpTransport* transport) { - const rdpSettings* settings = NULL; + const rdpSettings* settings = nullptr; rdpContext* context = transport_get_context(transport); settings = context->settings; @@ -323,9 +323,9 @@ BOOL transport_connect_tls(rdpTransport* transport) static BOOL transport_default_connect_tls(rdpTransport* transport) { int tlsStatus = 0; - rdpTls* tls = NULL; - rdpContext* context = NULL; - rdpSettings* settings = NULL; + rdpTls* tls = nullptr; + rdpContext* context = nullptr; + rdpSettings* settings = nullptr; WINPR_ASSERT(transport); @@ -396,9 +396,9 @@ static BOOL transport_default_connect_tls(rdpTransport* transport) BOOL transport_connect_nla(rdpTransport* transport, BOOL earlyUserAuth) { - rdpContext* context = NULL; - rdpSettings* settings = NULL; - rdpRdp* rdp = NULL; + rdpContext* context = nullptr; + rdpSettings* settings = nullptr; + rdpRdp* rdp = nullptr; if (!transport) return FALSE; @@ -450,8 +450,8 @@ BOOL transport_connect_nla(rdpTransport* transport, BOOL earlyUserAuth) BOOL transport_connect_rdstls(rdpTransport* transport) { BOOL rc = FALSE; - rdpRdstls* rdstls = NULL; - rdpContext* context = NULL; + rdpRdstls* rdstls = nullptr; + rdpContext* context = nullptr; WINPR_ASSERT(transport); @@ -483,9 +483,9 @@ fail: BOOL transport_connect_aad(rdpTransport* transport) { - rdpContext* context = NULL; - rdpSettings* settings = NULL; - rdpRdp* rdp = NULL; + rdpContext* context = nullptr; + rdpSettings* settings = nullptr; + rdpRdp* rdp = nullptr; if (!transport) return FALSE; @@ -536,7 +536,7 @@ static BOOL transport_can_retry(const rdpContext* context, BOOL status) BOOL transport_connect(rdpTransport* transport, const char* hostname, UINT16 port, DWORD timeout) { BOOL status = FALSE; - rdpSettings* settings = NULL; + rdpSettings* settings = nullptr; rdpContext* context = transport_get_context(transport); BOOL rpcFallback = 0; @@ -571,7 +571,7 @@ BOOL transport_connect(rdpTransport* transport, const char* hostname, UINT16 por else { wst_free(transport->wst); - transport->wst = NULL; + transport->wst = nullptr; } } if (transport_can_retry(transport->context, status) && settings->GatewayHttpTransport) @@ -595,7 +595,7 @@ BOOL transport_connect(rdpTransport* transport, const char* hostname, UINT16 por else { rdg_free(transport->rdg); - transport->rdg = NULL; + transport->rdg = nullptr; } } @@ -621,20 +621,20 @@ BOOL transport_connect(rdpTransport* transport, const char* hostname, UINT16 por else { tsg_free(transport->tsg); - transport->tsg = NULL; + transport->tsg = nullptr; } } } else { UINT16 peerPort = 0; - const char* proxyHostname = NULL; - const char* proxyUsername = NULL; - const char* proxyPassword = NULL; + const char* proxyHostname = nullptr; + const char* proxyUsername = nullptr; + const char* proxyPassword = nullptr; BOOL isProxyConnection = proxy_prepare(settings, &proxyHostname, &peerPort, &proxyUsername, &proxyPassword); - rdpTransportLayer* layer = NULL; + rdpTransportLayer* layer = nullptr; if (isProxyConnection) layer = transport_connect_layer(transport, proxyHostname, peerPort, timeout); else @@ -676,7 +676,7 @@ BOOL transport_connect_childsession(rdpTransport* transport) BOOL transport_accept_rdp(rdpTransport* transport) { - return transport != NULL; + return transport != nullptr; /* RDP encryption */ } @@ -690,7 +690,7 @@ BOOL transport_accept_tls(rdpTransport* transport) static BOOL transport_default_accept_tls(rdpTransport* transport) { rdpContext* context = transport_get_context(transport); - rdpSettings* settings = NULL; + rdpSettings* settings = nullptr; WINPR_ASSERT(context); @@ -712,7 +712,7 @@ static BOOL transport_default_accept_tls(rdpTransport* transport) BOOL transport_accept_nla(rdpTransport* transport) { rdpContext* context = transport_get_context(transport); - rdpSettings* settings = NULL; + rdpSettings* settings = nullptr; WINPR_ASSERT(context); @@ -738,7 +738,7 @@ BOOL transport_accept_nla(rdpTransport* transport) WLog_Print(transport->log, WLOG_ERROR, "client authentication failure"); transport_set_nla_mode(transport, FALSE); nla_free(transport->nla); - transport->nla = NULL; + transport->nla = nullptr; freerdp_tls_set_alert_code(transport->tls, TLS_ALERT_LEVEL_FATAL, TLS_ALERT_DESCRIPTION_ACCESS_DENIED); freerdp_tls_send_alert(transport->tls); @@ -753,8 +753,8 @@ BOOL transport_accept_nla(rdpTransport* transport) BOOL transport_accept_rdstls(rdpTransport* transport) { BOOL rc = FALSE; - rdpRdstls* rdstls = NULL; - rdpContext* context = NULL; + rdpRdstls* rdstls = nullptr; + rdpContext* context = nullptr; WINPR_ASSERT(transport); @@ -832,8 +832,8 @@ static void transport_bio_error_log(rdpTransport* transport, LPCSTR biofunc, static SSIZE_T transport_read_layer(rdpTransport* transport, BYTE* data, size_t bytes) { SSIZE_T read = 0; - rdpRdp* rdp = NULL; - rdpContext* context = NULL; + rdpRdp* rdp = nullptr; + rdpContext* context = nullptr; WINPR_ASSERT(transport); @@ -1472,7 +1472,7 @@ int transport_check_fds(rdpTransport* transport) { int status = 0; state_run_t recv_status = STATE_RUN_FAILED; - wStream* received = NULL; + wStream* received = nullptr; rdpContext* context = transport_get_context(transport); WINPR_ASSERT(context); @@ -1571,7 +1571,7 @@ rdpTransportLayer* transport_connect_layer(rdpTransport* transport, const char* { WINPR_ASSERT(transport); - return IFCALLRESULT(NULL, transport->io.ConnectLayer, transport, hostname, port, timeout); + return IFCALLRESULT(nullptr, transport->io.ConnectLayer, transport, hostname, port, timeout); } static rdpTransportLayer* transport_default_connect_layer(rdpTransport* transport, @@ -1664,7 +1664,7 @@ static BOOL transport_default_disconnect(rdpTransport* transport) if (transport->tls) { freerdp_tls_free(transport->tls); - transport->tls = NULL; + transport->tls = nullptr; } else { @@ -1675,22 +1675,22 @@ static BOOL transport_default_disconnect(rdpTransport* transport) if (transport->tsg) { tsg_free(transport->tsg); - transport->tsg = NULL; + transport->tsg = nullptr; } if (transport->rdg) { rdg_free(transport->rdg); - transport->rdg = NULL; + transport->rdg = nullptr; } if (transport->wst) { wst_free(transport->wst); - transport->wst = NULL; + transport->wst = nullptr; } - transport->frontBio = NULL; + transport->frontBio = nullptr; transport->layer = TRANSPORT_LAYER_TCP; transport->earlyUserAuth = FALSE; LeaveCriticalSection(&(transport->WriteLock)); @@ -1704,7 +1704,7 @@ rdpTransport* transport_new(rdpContext* context) WINPR_ASSERT(context); if (!transport) - return NULL; + return nullptr; transport->log = WLog_Get(TAG); @@ -1728,17 +1728,17 @@ rdpTransport* transport_new(rdpContext* context) if (!transport->ReceiveBuffer) goto fail; - transport->connectedEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + transport->connectedEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!transport->connectedEvent || transport->connectedEvent == INVALID_HANDLE_VALUE) goto fail; - transport->rereadEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + transport->rereadEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!transport->rereadEvent || transport->rereadEvent == INVALID_HANDLE_VALUE) goto fail; - transport->ioEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + transport->ioEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr); if (!transport->ioEvent || transport->ioEvent == INVALID_HANDLE_VALUE) goto fail; @@ -1768,7 +1768,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC transport_free(transport); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void transport_free(rdpTransport* transport) @@ -1824,7 +1824,7 @@ BOOL transport_set_io_callbacks(rdpTransport* transport, const rdpTransportIo* i const rdpTransportIo* transport_get_io_callbacks(const rdpTransport* transport) { if (!transport) - return NULL; + return nullptr; return &transport->io; } @@ -1887,7 +1887,7 @@ wStream* transport_take_from_pool(rdpTransport* transport, size_t size) { WINPR_ASSERT(transport); if (!transport->frontBio) - return NULL; + return nullptr; return StreamPool_Take(transport->ReceivePool, size); } @@ -1958,7 +1958,7 @@ int transport_tcp_connect(rdpTransport* transport, const char* hostname, int por HANDLE transport_get_front_bio(rdpTransport* transport) { - HANDLE hEvent = NULL; + HANDLE hEvent = nullptr; WINPR_ASSERT(transport); WINPR_ASSERT(transport->frontBio); @@ -1987,7 +1987,7 @@ rdpTransportLayer* transport_layer_new(WINPR_ATTR_UNUSED rdpTransport* transport { rdpTransportLayerInt* layer = (rdpTransportLayerInt*)calloc(1, sizeof(rdpTransportLayerInt)); if (!layer) - return NULL; + return nullptr; if (contextSize) { @@ -1995,7 +1995,7 @@ rdpTransportLayer* transport_layer_new(WINPR_ATTR_UNUSED rdpTransport* transport if (!layer->userContextShadowPtr) { free(layer); - return NULL; + return nullptr; } } layer->pub.userContext = layer->userContextShadowPtr; @@ -2100,7 +2100,7 @@ static long transport_layer_bio_ctrl(BIO* bio, int cmd, long arg1, void* arg2) switch (cmd) { case BIO_C_GET_EVENT: - *((HANDLE*)arg2) = IFCALLRESULT(NULL, layer->GetEvent, layer->userContext); + *((HANDLE*)arg2) = IFCALLRESULT(nullptr, layer->GetEvent, layer->userContext); status = 1; break; @@ -2180,7 +2180,7 @@ static int transport_layer_bio_free(BIO* bio) if (layer) transport_layer_free(layer); - BIO_set_data(bio, NULL); + BIO_set_data(bio, nullptr); BIO_set_init(bio, 0); BIO_set_flags(bio, 0); @@ -2189,12 +2189,12 @@ static int transport_layer_bio_free(BIO* bio) BIO_METHOD* BIO_s_transport_layer(void) { - static BIO_METHOD* bio_methods = NULL; + static BIO_METHOD* bio_methods = nullptr; - if (bio_methods == NULL) + if (bio_methods == nullptr) { if (!(bio_methods = BIO_meth_new(BIO_TYPE_SIMPLE, "TransportLayer"))) - return NULL; + return nullptr; BIO_meth_set_write(bio_methods, transport_layer_bio_write); BIO_meth_set_read(bio_methods, transport_layer_bio_read); diff --git a/libfreerdp/core/update.c b/libfreerdp/core/update.c index b0e312a3b..19b3e9973 100644 --- a/libfreerdp/core/update.c +++ b/libfreerdp/core/update.c @@ -261,7 +261,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_bitmap_update(update->context, bitmapUpdate); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } static BOOL update_write_bitmap_update(rdpUpdate* update, wStream* s, @@ -321,7 +321,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_palette_update(update->context, palette_update); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } static BOOL update_read_synchronize(rdpUpdate* update, wStream* s) @@ -378,7 +378,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_pointer_position_update(update->context, pointer_position); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } POINTER_SYSTEM_UPDATE* update_read_pointer_system(rdpUpdate* update, wStream* s) @@ -400,13 +400,13 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_pointer_system_update(update->context, pointer_system); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } static BOOL s_update_read_pointer_color(wStream* s, POINTER_COLOR_UPDATE* pointer_color, BYTE xorBpp, UINT32 flags) { - BYTE* newMask = NULL; + BYTE* newMask = nullptr; UINT32 scanlineSize = 0; UINT32 max = 32; @@ -550,12 +550,12 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_pointer_color_update(update->context, pointer_color); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } static BOOL s_update_read_pointer_large(wStream* s, POINTER_LARGE_UPDATE* pointer) { - BYTE* newMask = NULL; + BYTE* newMask = nullptr; UINT32 scanlineSize = 0; if (!pointer) @@ -679,7 +679,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_pointer_large_update(update->context, pointer); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } POINTER_NEW_UPDATE* update_read_pointer_new(rdpUpdate* update, wStream* s) @@ -714,7 +714,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_pointer_new_update(update->context, pointer_new); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } POINTER_CACHED_UPDATE* update_read_pointer_cached(rdpUpdate* update, wStream* s) @@ -736,7 +736,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC free_pointer_cached_update(update->context, pointer); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } BOOL update_recv_pointer(rdpUpdate* update, wStream* s) @@ -1019,7 +1019,7 @@ void update_post_disconnect(rdpUpdate* update) static BOOL s_update_begin_paint(rdpContext* context) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); rdp_update_internal* update = update_cast(context->update); @@ -1055,7 +1055,7 @@ static BOOL s_update_end_paint(rdpContext* context) return FALSE; wStream* s = update->us; - update->us = NULL; + update->us = nullptr; Stream_SealLength(s); Stream_SetPosition(s, update->offsetOrders); @@ -1081,7 +1081,7 @@ fail: static BOOL update_flush(rdpContext* context) { - rdp_update_internal* update = NULL; + rdp_update_internal* update = nullptr; WINPR_ASSERT(context); update = update_cast(context->update); @@ -1128,7 +1128,7 @@ static BOOL update_check_flush(rdpContext* context, size_t size) static BOOL update_set_bounds(rdpContext* context, const rdpBounds* bounds) { - rdp_update_internal* update = NULL; + rdp_update_internal* update = nullptr; WINPR_ASSERT(context); @@ -1163,7 +1163,7 @@ static BOOL update_bounds_equals(rdpBounds* bounds1, rdpBounds* bounds2) static size_t update_prepare_bounds(rdpContext* context, ORDER_INFO* orderInfo) { size_t length = 0; - rdp_update_internal* update = NULL; + rdp_update_internal* update = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(orderInfo); @@ -1229,7 +1229,7 @@ static size_t update_prepare_order_info(rdpContext* context, ORDER_INFO* orderIn orderInfo->controlFlags = ORDER_STANDARD; orderInfo->controlFlags |= ORDER_TYPE_CHANGE; size_t length = 2; - length += get_primary_drawing_order_field_bytes(orderInfo->orderType, NULL); + length += get_primary_drawing_order_field_bytes(orderInfo->orderType, nullptr); length += update_prepare_bounds(context, orderInfo); return length; } @@ -1254,7 +1254,7 @@ static int update_write_order_info(rdpContext* context, wStream* s, const ORDER_ if (!update_write_field_flags( s, orderInfo->fieldFlags, controlFlags, - get_primary_drawing_order_field_bytes(orderInfo->orderType, NULL))) + get_primary_drawing_order_field_bytes(orderInfo->orderType, nullptr))) return -1; if (!update_write_bounds(s, orderInfo)) return -1; @@ -1344,7 +1344,7 @@ static BOOL update_send_suppress_output(rdpContext* context, BYTE allow, const R static BOOL update_send_surface_command(rdpContext* context, wStream* s) { - wStream* update = NULL; + wStream* update = nullptr; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; BOOL ret = 0; @@ -1371,7 +1371,7 @@ out: static BOOL update_send_surface_bits(rdpContext* context, const SURFACE_BITS_COMMAND* surfaceBitsCommand) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; BOOL ret = FALSE; @@ -1402,7 +1402,7 @@ out_fail: static BOOL update_send_surface_frame_marker(rdpContext* context, const SURFACE_FRAME_MARKER* surfaceFrameMarker) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; BOOL ret = FALSE; @@ -1430,7 +1430,7 @@ out_fail: static BOOL update_send_surface_frame_bits(rdpContext* context, const SURFACE_BITS_COMMAND* cmd, BOOL first, BOOL last, UINT32 frameId) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; @@ -1498,7 +1498,7 @@ static BOOL update_send_frame_acknowledge(rdpContext* context, UINT32 frameId) static BOOL update_send_synchronize(rdpContext* context) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; BOOL ret = 0; @@ -1523,7 +1523,7 @@ static BOOL update_send_desktop_resize(rdpContext* context) static BOOL update_send_bitmap_update(rdpContext* context, const BITMAP_UPDATE* bitmapUpdate) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; rdpUpdate* update = context->update; @@ -1556,7 +1556,7 @@ out_fail: static BOOL update_send_play_sound(rdpContext* context, const PLAY_SOUND_UPDATE* play_sound) { UINT16 sec_flags = 0; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; @@ -2214,7 +2214,7 @@ static BOOL update_send_switch_surface_order(rdpContext* context, static BOOL update_send_pointer_system(rdpContext* context, const POINTER_SYSTEM_UPDATE* pointer_system) { - wStream* s = NULL; + wStream* s = nullptr; BYTE updateCode = 0; WINPR_ASSERT(context); @@ -2240,7 +2240,7 @@ static BOOL update_send_pointer_system(rdpContext* context, static BOOL update_send_pointer_position(rdpContext* context, const POINTER_POSITION_UPDATE* pointerPosition) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; BOOL ret = FALSE; @@ -2292,7 +2292,7 @@ static BOOL update_write_pointer_color(wStream* s, const POINTER_COLOR_UPDATE* p static BOOL update_send_pointer_color(rdpContext* context, const POINTER_COLOR_UPDATE* pointer_color) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; @@ -2337,7 +2337,7 @@ static BOOL update_write_pointer_large(wStream* s, const POINTER_LARGE_UPDATE* p static BOOL update_send_pointer_large(rdpContext* context, const POINTER_LARGE_UPDATE* pointer) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; BOOL ret = FALSE; @@ -2360,7 +2360,7 @@ out_fail: static BOOL update_send_pointer_new(rdpContext* context, const POINTER_NEW_UPDATE* pointer_new) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; @@ -2388,7 +2388,7 @@ out_fail: static BOOL update_send_pointer_cached(rdpContext* context, const POINTER_CACHED_UPDATE* pointer_cached) { - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; @@ -2446,7 +2446,7 @@ BOOL update_read_refresh_rect(rdpUpdate* update, wStream* s) BOOL update_read_suppress_output(rdpUpdate* update, wStream* s) { rdp_update_internal* up = update_cast(update); - RECTANGLE_16* prect = NULL; + RECTANGLE_16* prect = nullptr; RECTANGLE_16 rect = WINPR_C_ARRAY_INIT; BYTE allowDisplayUpdates = 0; @@ -2485,7 +2485,7 @@ BOOL update_read_suppress_output(rdpUpdate* update, wStream* s) static BOOL update_send_set_keyboard_indicators(rdpContext* context, UINT16 led_flags) { UINT16 sec_flags = 0; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; @@ -2506,7 +2506,7 @@ static BOOL update_send_set_keyboard_ime_status(rdpContext* context, UINT16 imeI UINT32 imeConvMode) { UINT16 sec_flags = 0; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(context); rdpRdp* rdp = context->rdp; @@ -3331,7 +3331,7 @@ void update_free_window_state(WINDOW_STATE_ORDER* window_state) rdpUpdate* update_new(rdpRdp* rdp) { - const wObject cb = { NULL, NULL, NULL, update_free_queued_message, NULL }; + const wObject cb = { nullptr, nullptr, nullptr, update_free_queued_message, nullptr }; WINPR_ASSERT(rdp); WINPR_ASSERT(rdp->context); @@ -3339,7 +3339,7 @@ rdpUpdate* update_new(rdpRdp* rdp) rdp_update_internal* update = (rdp_update_internal*)calloc(1, sizeof(rdp_update_internal)); if (!update) - return NULL; + return nullptr; update->common.context = rdp->context; update->log = WLog_Get("com.freerdp.core.update"); @@ -3407,12 +3407,12 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC update_free(&update->common); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void update_free(rdpUpdate* update) { - if (update != NULL) + if (update != nullptr) { rdp_update_internal* up = update_cast(update); rdp_altsec_update_internal* altsec = altsec_update_cast(update->altsec); diff --git a/libfreerdp/core/utils.c b/libfreerdp/core/utils.c index fa098a162..49bb3ca00 100644 --- a/libfreerdp/core/utils.c +++ b/libfreerdp/core/utils.c @@ -40,12 +40,12 @@ BOOL utils_str_copy(const char* value, char** dst) WINPR_ASSERT(dst); free(*dst); - *dst = NULL; + *dst = nullptr; if (!value) return TRUE; (*dst) = _strdup(value); - return (*dst) != NULL; + return (*dst) != nullptr; } static BOOL utils_copy_smartcard_settings(const rdpSettings* settings, rdpSettings* origSettings) @@ -65,8 +65,8 @@ static BOOL utils_copy_smartcard_settings(const rdpSettings* settings, rdpSettin auth_status utils_authenticate_gateway(freerdp* instance, rdp_auth_reason reason) { - rdpSettings* settings = NULL; - rdpSettings* origSettings = NULL; + rdpSettings* settings = nullptr; + rdpSettings* origSettings = nullptr; BOOL prompt = FALSE; BOOL proceed = 0; @@ -135,8 +135,8 @@ auth_status utils_authenticate_gateway(freerdp* instance, rdp_auth_reason reason auth_status utils_authenticate(freerdp* instance, rdp_auth_reason reason, BOOL override) { - rdpSettings* settings = NULL; - rdpSettings* origSettings = NULL; + rdpSettings* settings = nullptr; + rdpSettings* origSettings = nullptr; BOOL prompt = !override; BOOL proceed = 0; @@ -157,7 +157,7 @@ auth_status utils_authenticate(freerdp* instance, rdp_auth_reason reason, BOOL o /* Ask for auth data if no or an empty username was specified or no password was given */ if (utils_str_is_empty(freerdp_settings_get_string(settings, FreeRDP_Username)) || - (settings->Password == NULL && settings->RedirectionPassword == NULL)) + (settings->Password == nullptr && settings->RedirectionPassword == nullptr)) prompt = TRUE; if (!prompt) @@ -318,18 +318,18 @@ BOOL utils_abort_event_is_set(const rdpRdp* rdp) const char* utils_is_vsock(const char* hostname) { if (!hostname) - return NULL; + return nullptr; const char vsock[8] = { 'v', 's', 'o', 'c', 'k', ':', '/', '/' }; if (strncmp(hostname, vsock, sizeof(vsock)) == 0) return &hostname[sizeof(vsock)]; - return NULL; + return nullptr; } static BOOL remove_rdpdr_type(rdpSettings* settings, UINT32 type) { BOOL rc = TRUE; - RDPDR_DEVICE* printer = NULL; + RDPDR_DEVICE* printer = nullptr; do { printer = freerdp_device_collection_find_type(settings, type); diff --git a/libfreerdp/core/utils.h b/libfreerdp/core/utils.h index c70a08c96..6a7822e1c 100644 --- a/libfreerdp/core/utils.h +++ b/libfreerdp/core/utils.h @@ -83,7 +83,7 @@ WINPR_ATTR_NODISCARD FREERDP_LOCAL BOOL utils_reload_channels(rdpContext* contex * @param fmt A format string that must contain a single '%s' being replaced by the * 'vendor\\product` values. * - * @return A registry key to use or \b NULL if failed. + * @return A registry key to use or \b nullptr if failed. * @version since 3.23.0 */ WINPR_ATTR_MALLOC(free, 1) @@ -95,7 +95,7 @@ char* freerdp_getApplicatonDetailsRegKey(WINPR_FORMAT_ARG const char* fmt); * * @param separator the separator character to use * - * @return A 'vendor/product' string to use or \b NULL if failed. + * @return A 'vendor/product' string to use or \b nullptr if failed. * @version since 3.23.0 */ WINPR_ATTR_MALLOC(free, 1) diff --git a/libfreerdp/core/window.c b/libfreerdp/core/window.c index 5ac11ac2e..7c731c717 100644 --- a/libfreerdp/core/window.c +++ b/libfreerdp/core/window.c @@ -36,7 +36,7 @@ static void update_free_window_icon_info(ICON_INFO* iconInfo); BOOL rail_read_unicode_string(wStream* s, RAIL_UNICODE_STRING* unicode_string) { UINT16 new_len = 0; - BYTE* new_str = NULL; + BYTE* new_str = nullptr; if (!Stream_CheckAndLogRequiredLength(TAG, s, 2)) return FALSE; @@ -49,7 +49,7 @@ BOOL rail_read_unicode_string(wStream* s, RAIL_UNICODE_STRING* unicode_string) if (!new_len) { free(unicode_string->string); - unicode_string->string = NULL; + unicode_string->string = nullptr; unicode_string->length = 0; return TRUE; } @@ -59,7 +59,7 @@ BOOL rail_read_unicode_string(wStream* s, RAIL_UNICODE_STRING* unicode_string) if (!new_str) { free(unicode_string->string); - unicode_string->string = NULL; + unicode_string->string = nullptr; return FALSE; } @@ -71,10 +71,10 @@ BOOL rail_read_unicode_string(wStream* s, RAIL_UNICODE_STRING* unicode_string) BOOL utf8_string_to_rail_string(const char* string, RAIL_UNICODE_STRING* unicode_string) { - WCHAR* buffer = NULL; + WCHAR* buffer = nullptr; size_t len = 0; free(unicode_string->string); - unicode_string->string = NULL; + unicode_string->string = nullptr; unicode_string->length = 0; if (!string || strlen(string) < 1) @@ -105,7 +105,7 @@ static char* rail_string_to_utf8_string(const RAIL_UNICODE_STRING* unicode_strin /* See [MS-RDPERP] 2.2.1.2.3 Icon Info (TS_ICON_INFO) */ static BOOL update_read_icon_info(wStream* s, ICON_INFO* iconInfo) { - BYTE* newBitMask = NULL; + BYTE* newBitMask = nullptr; if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) return FALSE; @@ -154,7 +154,7 @@ static BOOL update_read_icon_info(wStream* s, ICON_INFO* iconInfo) if (!newBitMask) { free(iconInfo->bitsMask); - iconInfo->bitsMask = NULL; + iconInfo->bitsMask = nullptr; return FALSE; } @@ -166,20 +166,20 @@ static BOOL update_read_icon_info(wStream* s, ICON_INFO* iconInfo) else { free(iconInfo->bitsMask); - iconInfo->bitsMask = NULL; + iconInfo->bitsMask = nullptr; iconInfo->cbBitsMask = 0; } /* colorTable */ if (iconInfo->cbColorTable > 0) { - BYTE* new_tab = NULL; + BYTE* new_tab = nullptr; new_tab = (BYTE*)realloc(iconInfo->colorTable, iconInfo->cbColorTable); if (!new_tab) { free(iconInfo->colorTable); - iconInfo->colorTable = NULL; + iconInfo->colorTable = nullptr; return FALSE; } @@ -188,7 +188,7 @@ static BOOL update_read_icon_info(wStream* s, ICON_INFO* iconInfo) else { free(iconInfo->colorTable); - iconInfo->colorTable = NULL; + iconInfo->colorTable = nullptr; } if (iconInfo->colorTable) @@ -206,7 +206,7 @@ static BOOL update_read_icon_info(wStream* s, ICON_INFO* iconInfo) if (!newBitMask) { free(iconInfo->bitsColor); - iconInfo->bitsColor = NULL; + iconInfo->bitsColor = nullptr; return FALSE; } @@ -218,7 +218,7 @@ static BOOL update_read_icon_info(wStream* s, ICON_INFO* iconInfo) else { free(iconInfo->bitsColor); - iconInfo->bitsColor = NULL; + iconInfo->bitsColor = nullptr; iconInfo->cbBitsColor = 0; } return TRUE; @@ -249,7 +249,7 @@ static BOOL update_read_window_state_order(wStream* s, WINDOW_ORDER_INFO* orderI WINDOW_STATE_ORDER* windowState) { size_t size = 0; - RECTANGLE_16* newRect = NULL; + RECTANGLE_16* newRect = nullptr; if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_OWNER) { @@ -376,7 +376,7 @@ static BOOL update_read_window_state_order(wStream* s, WINDOW_ORDER_INFO* orderI if (!newRect) { free(windowState->windowRects); - windowState->windowRects = NULL; + windowState->windowRects = nullptr; return FALSE; } @@ -420,7 +420,7 @@ static BOOL update_read_window_state_order(wStream* s, WINDOW_ORDER_INFO* orderI if (!newRect) { free(windowState->visibilityRects); - windowState->visibilityRects = NULL; + windowState->visibilityRects = nullptr; return FALSE; } @@ -675,7 +675,7 @@ static void dump_window_state_order(wLog* log, const char* msg, const WINDOW_ORD if (order->fieldFlags & WINDOW_ORDER_FIELD_SHOW) { - const char* showStr = NULL; + const char* showStr = nullptr; switch (state->showState) { case 0: @@ -780,7 +780,7 @@ static void dump_window_state_order(wLog* log, const char* msg, const WINDOW_ORD DUMP_APPEND(buffer, bufferSize, " appBarState=0x%" PRIx8 "", state->AppBarState); if (order->fieldFlags & WINDOW_ORDER_FIELD_APPBAR_EDGE) { - const char* appBarEdgeStr = NULL; + const char* appBarEdgeStr = nullptr; switch (state->AppBarEdge) { case 0: @@ -1030,7 +1030,7 @@ static BOOL update_read_desktop_actively_monitored_order(wStream* s, if (!newid) { free(monitored_desktop->windowIds); - monitored_desktop->windowIds = NULL; + monitored_desktop->windowIds = nullptr; monitored_desktop->numWindowIds = 0; return FALSE; } @@ -1046,7 +1046,7 @@ static BOOL update_read_desktop_actively_monitored_order(wStream* s, else { free(monitored_desktop->windowIds); - monitored_desktop->windowIds = NULL; + monitored_desktop->windowIds = nullptr; } } @@ -1127,11 +1127,11 @@ void update_free_window_icon_info(ICON_INFO* iconInfo) return; free(iconInfo->bitsColor); - iconInfo->bitsColor = NULL; + iconInfo->bitsColor = nullptr; free(iconInfo->bitsMask); - iconInfo->bitsMask = NULL; + iconInfo->bitsMask = nullptr; free(iconInfo->colorTable); - iconInfo->colorTable = NULL; + iconInfo->colorTable = nullptr; } BOOL update_recv_altsec_window_order(rdpUpdate* update, wStream* s) diff --git a/libfreerdp/crypto/base64.c b/libfreerdp/crypto/base64.c index 18cd5966d..a9b62ea6a 100644 --- a/libfreerdp/crypto/base64.c +++ b/libfreerdp/crypto/base64.c @@ -320,7 +320,7 @@ static inline char* base64_encode_ex(const BYTE* WINPR_RESTRICT alphabet, const BYTE* q = data; BYTE* p = malloc(outLen + extra + 1ull); if (!p) - return NULL; + return nullptr; char* ret = (char*)p; @@ -441,18 +441,18 @@ static inline void* base64_decode(const signed char* WINPR_RESTRICT alphabet, si size_t* WINPR_RESTRICT data_len, BOOL pad) { int n[4] = WINPR_C_ARRAY_INIT; - BYTE* data = NULL; + BYTE* data = nullptr; const size_t remainder = length % 4; if ((pad && remainder > 0) || (remainder == 1)) - return NULL; + return nullptr; if (!pad && remainder) length += 4 - remainder; BYTE* q = data = (BYTE*)malloc(length / 4 * 3 + 1); if (!q) - return NULL; + return nullptr; /* first treat complete blocks */ const size_t nBlocks = (length / 4); @@ -461,7 +461,7 @@ static inline void* base64_decode(const signed char* WINPR_RESTRICT alphabet, si if (nBlocks < 1) { free(data); - return NULL; + return nullptr; } for (size_t i = 0; i < nBlocks - 1; i++, q += 3) @@ -522,7 +522,7 @@ static inline void* base64_decode(const signed char* WINPR_RESTRICT alphabet, si return data; out_free: free(data); - return NULL; + return nullptr; } char* crypto_base64_encode_ex(const BYTE* WINPR_RESTRICT data, size_t length, BOOL withCrLf) diff --git a/libfreerdp/crypto/ber.c b/libfreerdp/crypto/ber.c index 6043e97c4..98c57a9fb 100644 --- a/libfreerdp/crypto/ber.c +++ b/libfreerdp/crypto/ber.c @@ -448,7 +448,7 @@ size_t ber_write_contextual_char_to_unicode_octet_string(wStream* s, BYTE tag, c BOOL ber_read_unicode_octet_string(wStream* s, LPWSTR* str) { - LPWSTR ret = NULL; + LPWSTR ret = nullptr; size_t length = 0; if (!ber_read_octet_string_tag(s, &length)) @@ -471,13 +471,13 @@ BOOL ber_read_unicode_octet_string(wStream* s, LPWSTR* str) BOOL ber_read_char_from_unicode_octet_string(wStream* s, char** str) { size_t length = 0; - char* ptr = NULL; + char* ptr = nullptr; - *str = NULL; + *str = nullptr; if (!ber_read_octet_string_tag(s, &length)) return FALSE; - ptr = Stream_Read_UTF16_String_As_UTF8(s, length / sizeof(WCHAR), NULL); + ptr = Stream_Read_UTF16_String_As_UTF8(s, length / sizeof(WCHAR), nullptr); if (!ptr) return FALSE; *str = ptr; @@ -491,7 +491,7 @@ BOOL ber_read_octet_string_tag(wStream* s, size_t* length) BOOL ber_read_octet_string(wStream* s, BYTE** content, size_t* length) { - BYTE* ret = NULL; + BYTE* ret = nullptr; WINPR_ASSERT(s); WINPR_ASSERT(content); @@ -534,7 +534,7 @@ size_t ber_sizeof_contextual_octet_string(size_t length) /** \brief Read a BER BOOLEAN * * @param s The stream to read from. - * @param value A pointer to the value read, must not be NULL + * @param value A pointer to the value read, must not be nullptr * * \return \b TRUE for success, \b FALSE for any failure */ @@ -588,7 +588,7 @@ BOOL ber_read_integer(wStream* s, UINT32* value) if (!Stream_CheckAndLogRequiredLength(TAG, s, length)) return FALSE; - if (value == NULL) + if (value == nullptr) { // even if we don't care the integer value, check the announced size return Stream_SafeSeek(s, length); diff --git a/libfreerdp/crypto/cert_common.c b/libfreerdp/crypto/cert_common.c index 0a013d03e..4326e2a66 100644 --- a/libfreerdp/crypto/cert_common.c +++ b/libfreerdp/crypto/cert_common.c @@ -55,7 +55,7 @@ BOOL read_bignum(BYTE** dst, DWORD* length, const BIGNUM* num, BOOL alloc) if (alloc) { free(*dst); - *dst = NULL; + *dst = nullptr; *length = 0; } @@ -117,7 +117,7 @@ BOOL cert_info_clone(rdpCertInfo* dst, const rdpCertInfo* src) *dst = *src; - dst->Modulus = NULL; + dst->Modulus = nullptr; dst->ModulusLength = 0; if (src->ModulusLength > 0) { @@ -135,7 +135,7 @@ void cert_info_free(rdpCertInfo* info) WINPR_ASSERT(info); free(info->Modulus); info->ModulusLength = 0; - info->Modulus = NULL; + info->Modulus = nullptr; } BOOL cert_info_allocate(rdpCertInfo* info, size_t size) @@ -193,8 +193,8 @@ BOOL cert_info_read_exponent(rdpCertInfo* info, size_t size, wStream* s) #if !defined(OPENSSL_VERSION_MAJOR) || (OPENSSL_VERSION_MAJOR < 3) X509* x509_from_rsa(const RSA* rsa) { - EVP_PKEY* pubkey = NULL; - X509* x509 = NULL; + EVP_PKEY* pubkey = nullptr; + X509* x509 = nullptr; BIO* bio = BIO_new( #if defined(LIBRESSL_VERSION_NUMBER) BIO_s_mem() @@ -205,7 +205,7 @@ X509* x509_from_rsa(const RSA* rsa) if (!bio) { WLog_ERR(TAG, "BIO_new() failed"); - return NULL; + return nullptr; } const int rc = PEM_write_bio_RSA_PUBKEY(bio, (RSA*)rsa); @@ -215,10 +215,10 @@ X509* x509_from_rsa(const RSA* rsa) goto fail; } - pubkey = PEM_read_bio_PUBKEY(bio, NULL, NULL, NULL); + pubkey = PEM_read_bio_PUBKEY(bio, nullptr, nullptr, nullptr); if (!pubkey) { - WLog_ERR(TAG, "PEM_read_bio_PUBKEY(bio, NULL, NULL, NULL) failed"); + WLog_ERR(TAG, "PEM_read_bio_PUBKEY(bio, nullptr, nullptr, nullptr) failed"); goto fail; } @@ -234,7 +234,7 @@ X509* x509_from_rsa(const RSA* rsa) { WLog_ERR(TAG, "X509_set_pubkey(x509, pubkey) failed"); X509_free(x509); - x509 = NULL; + x509 = nullptr; goto fail; } fail: diff --git a/libfreerdp/crypto/certificate.c b/libfreerdp/crypto/certificate.c index 751372fe2..fd3a6c690 100644 --- a/libfreerdp/crypto/certificate.c +++ b/libfreerdp/crypto/certificate.c @@ -274,7 +274,7 @@ void cert_blob_free(rdpCertBlob* blob) if (!blob) return; free(blob->data); - blob->data = NULL; + blob->data = nullptr; blob->length = 0; } @@ -294,7 +294,7 @@ static BOOL is_rsa_key(const X509* x509) static BOOL certificate_read_x509_certificate(const rdpCertBlob* cert, rdpCertInfo* info) { wStream sbuffer = WINPR_C_ARRAY_INIT; - wStream* s = NULL; + wStream* s = nullptr; size_t length = 0; BYTE padding = 0; UINT32 version = 0; @@ -334,7 +334,7 @@ static BOOL certificate_read_x509_certificate(const rdpCertBlob* cert, rdpCertIn version++; /* serialNumber */ - if (!ber_read_integer(s, NULL)) /* CertificateSerialNumber (INTEGER) */ + if (!ber_read_integer(s, nullptr)) /* CertificateSerialNumber (INTEGER) */ goto error; error++; @@ -483,7 +483,7 @@ static void certificate_free_x509_certificate_chain(rdpX509CertChain* x509_cert_ } free(x509_cert_chain->array); - x509_cert_chain->array = NULL; + x509_cert_chain->array = nullptr; x509_cert_chain->count = 0; } @@ -493,12 +493,12 @@ static OSSL_PARAM* get_params(const BIGNUM* e, const BIGNUM* mod) WINPR_ASSERT(e); WINPR_ASSERT(mod); - OSSL_PARAM* parameters = NULL; + OSSL_PARAM* parameters = nullptr; OSSL_PARAM_BLD* param = OSSL_PARAM_BLD_new(); if (!param) { WLog_ERR(TAG, "OSSL_PARAM_BLD_new() failed"); - return NULL; + return nullptr; } const int bits = BN_num_bits(e); @@ -550,7 +550,7 @@ static BOOL update_x509_from_info(rdpCertificate* cert) WINPR_ASSERT(cert); X509_free(cert->x509); - cert->x509 = NULL; + cert->x509 = nullptr; rdpCertInfo* info = &cert->cert_info; @@ -586,21 +586,21 @@ static BOOL update_x509_from_info(rdpCertificate* cert) } #if !defined(OPENSSL_VERSION_MAJOR) || (OPENSSL_VERSION_MAJOR < 3) - const int rec = RSA_set0_key(rsa, mod, e, NULL); + const int rec = RSA_set0_key(rsa, mod, e, nullptr); if (rec != 1) { - WLog_ERR(TAG, "RSA_set0_key(rsa, mod, e, NULL) failed"); + WLog_ERR(TAG, "RSA_set0_key(rsa, mod, e, nullptr) failed"); goto fail; } cert->x509 = x509_from_rsa(rsa); #else { - EVP_PKEY* pkey = NULL; - EVP_PKEY_CTX* ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL); + EVP_PKEY* pkey = nullptr; + EVP_PKEY_CTX* ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, nullptr); if (!ctx) { - WLog_ERR(TAG, "EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL) failed"); + WLog_ERR(TAG, "EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, nullptr) failed"); goto fail2; } @@ -642,7 +642,7 @@ static BOOL update_x509_from_info(rdpCertificate* cert) { WLog_ERR(TAG, "X509_set_pubkey(cert->x509, pkey) failed"); X509_free(cert->x509); - cert->x509 = NULL; + cert->x509 = nullptr; } fail2: EVP_PKEY_free(pkey); @@ -1096,12 +1096,12 @@ BOOL freerdp_certificate_read_server_cert(rdpCertificate* certificate, const BYT size_t length) { BOOL ret = FALSE; - wStream* s = NULL; + wStream* s = nullptr; wStream sbuffer; UINT32 dwVersion = 0; WINPR_ASSERT(certificate); - if (length < 4) /* NULL certificate is not an error see #1795 */ + if (length < 4) /* nullptr certificate is not an error see #1795 */ { WLog_DBG(TAG, "Received empty certificate, ignoring..."); return TRUE; @@ -1227,12 +1227,12 @@ BOOL cert_clone_int(rdpCertificate* dst, const rdpCertificate* src) rdpCertificate* freerdp_certificate_clone(const rdpCertificate* certificate) { if (!certificate) - return NULL; + return nullptr; rdpCertificate* _certificate = freerdp_certificate_new(); if (!_certificate) - return NULL; + return nullptr; if (!cert_clone_int(_certificate, certificate)) goto out_fail; @@ -1241,7 +1241,7 @@ rdpCertificate* freerdp_certificate_clone(const rdpCertificate* certificate) out_fail: freerdp_certificate_free(_certificate); - return NULL; + return nullptr; } /** @@ -1291,12 +1291,12 @@ static BOOL freerdp_rsa_from_x509(rdpCertificate* cert) return TRUE; #if !defined(OPENSSL_VERSION_MAJOR) || (OPENSSL_VERSION_MAJOR < 3) - RSA* rsa = NULL; - const BIGNUM* rsa_n = NULL; - const BIGNUM* rsa_e = NULL; + RSA* rsa = nullptr; + const BIGNUM* rsa_n = nullptr; + const BIGNUM* rsa_e = nullptr; #else - BIGNUM* rsa_n = NULL; - BIGNUM* rsa_e = NULL; + BIGNUM* rsa_n = nullptr; + BIGNUM* rsa_e = nullptr; #endif EVP_PKEY* pubkey = X509_get0_pubkey(cert->x509); if (!pubkey) @@ -1313,7 +1313,7 @@ static BOOL freerdp_rsa_from_x509(rdpCertificate* cert) /* Now we return failure again if something is wrong. */ rc = FALSE; - RSA_get0_key(rsa, &rsa_n, &rsa_e, NULL); + RSA_get0_key(rsa, &rsa_n, &rsa_e, nullptr); #else if (!EVP_PKEY_get_bn_param(pubkey, OSSL_PKEY_PARAM_RSA_E, &rsa_e)) goto fail; @@ -1344,7 +1344,7 @@ rdpCertificate* freerdp_certificate_new_from_der(const BYTE* data, size_t length { const BYTE* ptr = data; - cert->x509 = d2i_X509(NULL, &ptr, (int)length); + cert->x509 = d2i_X509(nullptr, &ptr, (int)length); } if (!cert->x509) @@ -1354,7 +1354,7 @@ rdpCertificate* freerdp_certificate_new_from_der(const BYTE* data, size_t length return cert; fail: freerdp_certificate_free(cert); - return NULL; + return nullptr; } rdpCertificate* freerdp_certificate_new_from_x509(const X509* xcert, const STACK_OF(X509) * chain) @@ -1363,7 +1363,7 @@ rdpCertificate* freerdp_certificate_new_from_x509(const X509* xcert, const STACK rdpCertificate* cert = freerdp_certificate_new(); if (!cert) - return NULL; + return nullptr; X509* wcert = WINPR_CAST_CONST_PTR_AWAY(xcert, X509*); cert->x509 = X509_dup(wcert); @@ -1379,17 +1379,17 @@ rdpCertificate* freerdp_certificate_new_from_x509(const X509* xcert, const STACK return cert; fail: freerdp_certificate_free(cert); - return NULL; + return nullptr; } static STACK_OF(X509) * extract_chain_from_pem(const char* pem, BOOL isFile) { if (!pem) { - return NULL; + return nullptr; } - BIO* bio = NULL; + BIO* bio = nullptr; if (isFile) bio = BIO_new_file(pem, "rb"); else @@ -1400,14 +1400,14 @@ static STACK_OF(X509) * extract_chain_from_pem(const char* pem, BOOL isFile) if (!bio) { - return NULL; + return nullptr; } - X509* leaf = PEM_read_bio_X509(bio, NULL, NULL, NULL); + X509* leaf = PEM_read_bio_X509(bio, nullptr, nullptr, nullptr); if (!leaf) { BIO_free(bio); - return NULL; + return nullptr; } STACK_OF(X509)* chain = sk_X509_new_null(); @@ -1415,11 +1415,11 @@ static STACK_OF(X509) * extract_chain_from_pem(const char* pem, BOOL isFile) { X509_free(leaf); BIO_free(bio); - return NULL; + return nullptr; } - X509* cert = NULL; - while ((cert = PEM_read_bio_X509(bio, NULL, NULL, NULL)) != NULL) + X509* cert = nullptr; + while ((cert = PEM_read_bio_X509(bio, nullptr, nullptr, nullptr)) != nullptr) { sk_X509_push(chain, cert); } @@ -1433,7 +1433,7 @@ static rdpCertificate* freerdp_certificate_new_from(const char* file, BOOL isFil { X509* x509 = x509_utils_from_pem(file, strlen(file), isFile); if (!x509) - return NULL; + return nullptr; STACK_OF(X509)* chain = extract_chain_from_pem(file, isFile); rdpCertificate* cert = freerdp_certificate_new_from_x509(x509, chain); if (chain) @@ -1456,7 +1456,7 @@ const rdpCertInfo* freerdp_certificate_get_info(const rdpCertificate* cert) { WINPR_ASSERT(cert); if (!freerdp_certificate_is_rsa(cert)) - return NULL; + return nullptr; return &cert->cert_info; } @@ -1476,22 +1476,22 @@ char* freerdp_certificate_get_fingerprint_by_hash_ex(const rdpCertificate* cert, size_t fp_len = 0; size_t pos = 0; size_t size = 0; - BYTE* fp = NULL; - char* fp_buffer = NULL; + BYTE* fp = nullptr; + char* fp_buffer = nullptr; if (!cert || !cert->x509) { WLog_ERR(TAG, "Invalid certificate [%p, %p]", WINPR_CXX_COMPAT_CAST(const void*, cert), - WINPR_CXX_COMPAT_CAST(const void*, cert ? cert->x509 : NULL)); - return NULL; + WINPR_CXX_COMPAT_CAST(const void*, cert ? cert->x509 : nullptr)); + return nullptr; } if (!hash) { WLog_ERR(TAG, "Invalid certificate hash %p", WINPR_CXX_COMPAT_CAST(const void*, hash)); - return NULL; + return nullptr; } fp = x509_utils_get_hash(cert->x509, hash, &fp_len); if (!fp) - return NULL; + return nullptr; if (fp_len < 1) goto fail; @@ -1527,7 +1527,7 @@ char* freerdp_certificate_get_fingerprint_by_hash_ex(const rdpCertificate* cert, fail: free(fp); free(fp_buffer); - return NULL; + return nullptr; } static BOOL bio_read_pem(BIO* bio, char** ppem, size_t* plength) @@ -1540,9 +1540,9 @@ static BOOL bio_read_pem(BIO* bio, char** ppem, size_t* plength) const size_t blocksize = 2048; size_t offset = 0; size_t length = blocksize; - char* pem = NULL; + char* pem = nullptr; - *ppem = NULL; + *ppem = nullptr; if (plength) *plength = 0; @@ -1599,7 +1599,7 @@ char* freerdp_certificate_get_pem_ex(const rdpCertificate* cert, size_t* pLength WINPR_ASSERT(cert); if (!cert->x509) - return NULL; + return nullptr; /** * Don't manage certificates internally, leave it up entirely to the external client @@ -1610,10 +1610,10 @@ char* freerdp_certificate_get_pem_ex(const rdpCertificate* cert, size_t* pLength if (!bio) { WLog_ERR(TAG, "BIO_new() failure"); - return NULL; + return nullptr; } - char* pem = NULL; + char* pem = nullptr; const int status = PEM_write_bio_X509(bio, cert->x509); if (status < 0) @@ -1683,11 +1683,11 @@ BOOL freerdp_certificate_check_eku(const rdpCertificate* cert, int nid) BOOL freerdp_certificate_get_public_key(const rdpCertificate* cert, BYTE** PublicKey, DWORD* PublicKeyLength) { - BYTE* ptr = NULL; - BYTE* optr = NULL; + BYTE* ptr = nullptr; + BYTE* optr = nullptr; int length = 0; BOOL status = FALSE; - EVP_PKEY* pkey = NULL; + EVP_PKEY* pkey = nullptr; WINPR_ASSERT(cert); @@ -1699,7 +1699,7 @@ BOOL freerdp_certificate_get_public_key(const rdpCertificate* cert, BYTE** Publi goto exit; } - length = i2d_PublicKey(pkey, NULL); + length = i2d_PublicKey(pkey, nullptr); if (length < 1) { @@ -1778,18 +1778,18 @@ BOOL freerdp_certificate_publickey_encrypt(const rdpCertificate* cert, const BYT WINPR_ASSERT(pcbOutput); BOOL ret = FALSE; - BYTE* output = NULL; + BYTE* output = nullptr; EVP_PKEY* pkey = X509_get0_pubkey(cert->x509); if (!pkey) return FALSE; - EVP_PKEY_CTX* ctx = EVP_PKEY_CTX_new(pkey, NULL); + EVP_PKEY_CTX* ctx = EVP_PKEY_CTX_new(pkey, nullptr); if (!ctx) return FALSE; size_t outputSize = WINPR_ASSERTING_INT_CAST(size_t, EVP_PKEY_size(pkey)); output = malloc(outputSize); - if (output == NULL) + if (output == nullptr) goto out; *pcbOutput = outputSize; @@ -1802,7 +1802,7 @@ BOOL freerdp_certificate_publickey_encrypt(const rdpCertificate* cert, const BYT } *poutput = output; - output = NULL; + output = nullptr; ret = TRUE; out: EVP_PKEY_CTX_free(ctx); @@ -1816,11 +1816,11 @@ static RSA* freerdp_certificate_get_RSA(const rdpCertificate* cert) WINPR_ASSERT(cert); if (!freerdp_certificate_is_rsa(cert)) - return NULL; + return nullptr; EVP_PKEY* pubkey = X509_get0_pubkey(cert->x509); if (!pubkey) - return NULL; + return nullptr; return EVP_PKEY_get1_RSA(pubkey); } @@ -1833,20 +1833,20 @@ BYTE* freerdp_certificate_get_der(const rdpCertificate* cert, size_t* pLength) if (pLength) *pLength = 0; - const int rc = i2d_X509(cert->x509, NULL); + const int rc = i2d_X509(cert->x509, nullptr); if (rc <= 0) - return NULL; + return nullptr; BYTE* ptr = calloc(WINPR_ASSERTING_INT_CAST(size_t, rc) + 1, sizeof(BYTE)); if (!ptr) - return NULL; + return nullptr; BYTE* i2d_ptr = ptr; const int rc2 = i2d_X509(cert->x509, &i2d_ptr); if (rc2 <= 0) { free(ptr); - return NULL; + return nullptr; } if (pLength) @@ -1880,39 +1880,39 @@ char* freerdp_certificate_get_param(const rdpCertificate* cert, enum FREERDP_CER *psize = 0; #if !defined(OPENSSL_VERSION_MAJOR) || (OPENSSL_VERSION_MAJOR < 3) - const BIGNUM* bn = NULL; + const BIGNUM* bn = nullptr; RSA* rsa = freerdp_certificate_get_RSA(cert); switch (what) { case FREERDP_CERT_RSA_E: - RSA_get0_key(rsa, NULL, &bn, NULL); + RSA_get0_key(rsa, nullptr, &bn, nullptr); break; case FREERDP_CERT_RSA_N: - RSA_get0_key(rsa, &bn, NULL, NULL); + RSA_get0_key(rsa, &bn, nullptr, nullptr); break; default: RSA_free(rsa); - return NULL; + return nullptr; } RSA_free(rsa); #else EVP_PKEY* pkey = X509_get0_pubkey(cert->x509); if (!pkey) - return NULL; + return nullptr; - BIGNUM* bn = NULL; + BIGNUM* bn = nullptr; switch (what) { case FREERDP_CERT_RSA_E: if (!EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_E, &bn)) - return NULL; + return nullptr; break; case FREERDP_CERT_RSA_N: if (!EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_N, &bn)) - return NULL; + return nullptr; break; default: - return NULL; + return nullptr; } #endif diff --git a/libfreerdp/crypto/certificate_data.c b/libfreerdp/crypto/certificate_data.c index c3799c768..4a2e87474 100644 --- a/libfreerdp/crypto/certificate_data.c +++ b/libfreerdp/crypto/certificate_data.c @@ -136,7 +136,7 @@ fail: static rdpCertificateData* freerdp_certificate_data_new_nocopy(const char* hostname, UINT16 port, rdpCertificate* xcert) { - rdpCertificateData* certdata = NULL; + rdpCertificateData* certdata = nullptr; if (!hostname || !xcert) goto fail; @@ -160,14 +160,14 @@ static rdpCertificateData* freerdp_certificate_data_new_nocopy(const char* hostn certdata->cert = xcert; if (!freerdp_certificate_data_load_cache(certdata)) { - certdata->cert = NULL; + certdata->cert = nullptr; goto fail; } return certdata; fail: freerdp_certificate_data_free(certdata); - return NULL; + return nullptr; } rdpCertificateData* freerdp_certificate_data_new(const char* hostname, UINT16 port, @@ -184,7 +184,7 @@ rdpCertificateData* freerdp_certificate_data_new_from_pem(const char* hostname, const char* pem, size_t length) { if (!pem || (length == 0)) - return NULL; + return nullptr; rdpCertificate* cert = freerdp_certificate_new_from_pem(pem); rdpCertificateData* data = freerdp_certificate_data_new_nocopy(hostname, port, cert); @@ -197,7 +197,7 @@ rdpCertificateData* freerdp_certificate_data_new_from_file(const char* hostname, const char* file) { if (!file) - return NULL; + return nullptr; rdpCertificate* cert = freerdp_certificate_new_from_file(file); rdpCertificateData* data = freerdp_certificate_data_new_nocopy(hostname, port, cert); @@ -208,7 +208,7 @@ rdpCertificateData* freerdp_certificate_data_new_from_file(const char* hostname, void freerdp_certificate_data_free(rdpCertificateData* data) { - if (data == NULL) + if (data == nullptr) return; free(data->hostname); @@ -225,7 +225,7 @@ void freerdp_certificate_data_free(rdpCertificateData* data) const char* freerdp_certificate_data_get_host(const rdpCertificateData* cert) { if (!cert) - return NULL; + return nullptr; return cert->hostname; } @@ -244,7 +244,7 @@ const char* freerdp_certificate_data_get_pem(const rdpCertificateData* cert) const char* freerdp_certificate_data_get_pem_ex(const rdpCertificateData* cert, BOOL withFullChain) { if (!cert) - return NULL; + return nullptr; if (withFullChain) return cert->cached_pem_chain; return cert->cached_pem; @@ -253,7 +253,7 @@ const char* freerdp_certificate_data_get_pem_ex(const rdpCertificateData* cert, const char* freerdp_certificate_data_get_subject(const rdpCertificateData* cert) { if (!cert) - return NULL; + return nullptr; return cert->cached_subject; } @@ -261,14 +261,14 @@ const char* freerdp_certificate_data_get_subject(const rdpCertificateData* cert) const char* freerdp_certificate_data_get_issuer(const rdpCertificateData* cert) { if (!cert) - return NULL; + return nullptr; return cert->cached_issuer; } const char* freerdp_certificate_data_get_fingerprint(const rdpCertificateData* cert) { if (!cert) - return NULL; + return nullptr; return cert->cached_fingerprint; } @@ -298,7 +298,7 @@ BOOL freerdp_certificate_data_equal(const rdpCertificateData* a, const rdpCertif const char* freerdp_certificate_data_get_hash(const rdpCertificateData* cert) { if (!cert) - return NULL; + return nullptr; return cert->cached_hash; } diff --git a/libfreerdp/crypto/certificate_store.c b/libfreerdp/crypto/certificate_store.c index bace3af97..29fe76a43 100644 --- a/libfreerdp/crypto/certificate_store.c +++ b/libfreerdp/crypto/certificate_store.c @@ -53,7 +53,7 @@ static char* freerdp_certificate_store_file_path(const rdpCertificateStore* stor const char* hosts = freerdp_certificate_store_get_hosts_path(store); if (!hosts || !hash) - return NULL; + return nullptr; return GetCombinedPath(hosts, hash); } @@ -103,11 +103,11 @@ BOOL freerdp_certificate_store_save_data(rdpCertificateStore* store, const rdpCe const char* base = freerdp_certificate_store_get_hosts_path(store); const char* hash = freerdp_certificate_data_get_hash(data); char* path = freerdp_certificate_store_file_path(store, hash); - FILE* fp = NULL; + FILE* fp = nullptr; if (!winpr_PathFileExists(base)) { - if (!winpr_PathMakePath(base, NULL)) + if (!winpr_PathMakePath(base, nullptr)) goto fail; } @@ -128,8 +128,8 @@ fail: rdpCertificateData* freerdp_certificate_store_load_data(rdpCertificateStore* store, const char* host, UINT16 port) { - char* path = NULL; - rdpCertificateData* data = NULL; + char* path = nullptr; + rdpCertificateData* data = nullptr; WINPR_ASSERT(store); @@ -149,7 +149,7 @@ rdpCertificateStore* freerdp_certificate_store_new(const rdpSettings* settings) rdpCertificateStore* store = (rdpCertificateStore*)calloc(1, sizeof(rdpCertificateStore)); if (!store) - return NULL; + return nullptr; const char* base = freerdp_settings_get_string(settings, FreeRDP_ConfigPath); if (!base) @@ -167,7 +167,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC freerdp_certificate_store_free(store); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void freerdp_certificate_store_free(rdpCertificateStore* store) @@ -199,7 +199,7 @@ char* freerdp_certificate_store_get_cert_path(const rdpCertificateStore* store, char* hash = freerdp_certificate_data_hash(host, port); if (!hash) - return NULL; + return nullptr; char* path = freerdp_certificate_store_file_path(store, hash); free(hash); return path; diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c index 9f95e55a8..3d210f2d9 100644 --- a/libfreerdp/crypto/crypto.c +++ b/libfreerdp/crypto/crypto.c @@ -41,15 +41,15 @@ static SSIZE_T crypto_rsa_common(const BYTE* input, size_t length, UINT32 key_le const BYTE* modulus, const BYTE* exponent, size_t exponent_size, BYTE* output, size_t out_length) { - BN_CTX* ctx = NULL; + BN_CTX* ctx = nullptr; int output_length = -1; - BYTE* input_reverse = NULL; - BYTE* modulus_reverse = NULL; - BYTE* exponent_reverse = NULL; - BIGNUM* mod = NULL; - BIGNUM* exp = NULL; - BIGNUM* x = NULL; - BIGNUM* y = NULL; + BYTE* input_reverse = nullptr; + BYTE* modulus_reverse = nullptr; + BYTE* exponent_reverse = nullptr; + BIGNUM* mod = nullptr; + BIGNUM* exp = nullptr; + BIGNUM* x = nullptr; + BIGNUM* y = nullptr; size_t bufferSize = 0; if (!input || !modulus || !exponent || !output) @@ -188,8 +188,8 @@ void crypto_reverse(BYTE* data, size_t length) char* crypto_read_pem(const char* WINPR_RESTRICT filename, size_t* WINPR_RESTRICT plength) { - char* pem = NULL; - FILE* fp = NULL; + char* pem = nullptr; + FILE* fp = nullptr; WINPR_ASSERT(filename); @@ -242,7 +242,7 @@ fail: if (fp) (void)fclose(fp); free(pem); - return NULL; + return nullptr; } BOOL crypto_write_pem(const char* WINPR_RESTRICT filename, const char* WINPR_RESTRICT pem, diff --git a/libfreerdp/crypto/er.c b/libfreerdp/crypto/er.c index c1e58e23e..a2c23d2d4 100644 --- a/libfreerdp/crypto/er.c +++ b/libfreerdp/crypto/er.c @@ -358,7 +358,7 @@ BOOL er_read_integer(wStream* s, UINT32* value) er_read_universal_tag(s, ER_TAG_INTEGER, FALSE); er_read_length(s, &length); - if (value == NULL) + if (value == nullptr) { Stream_Seek(s, WINPR_ASSERTING_INT_CAST(size_t, length)); return TRUE; diff --git a/libfreerdp/crypto/opensslcompat.c b/libfreerdp/crypto/opensslcompat.c index 314d6b51f..044c3fd21 100644 --- a/libfreerdp/crypto/opensslcompat.c +++ b/libfreerdp/crypto/opensslcompat.c @@ -26,7 +26,7 @@ BIO_METHOD* BIO_meth_new(int type, const char* name) { BIO_METHOD* m; if (!(m = calloc(1, sizeof(BIO_METHOD)))) - return NULL; + return nullptr; m->type = type; m->name = name; return m; @@ -34,11 +34,11 @@ BIO_METHOD* BIO_meth_new(int type, const char* name) void RSA_get0_key(const RSA* r, const BIGNUM** n, const BIGNUM** e, const BIGNUM** d) { - if (n != NULL) + if (n != nullptr) *n = r->n; - if (e != NULL) + if (e != nullptr) *e = r->e; - if (d != NULL) + if (d != nullptr) *d = r->d; } diff --git a/libfreerdp/crypto/opensslcompat.h b/libfreerdp/crypto/opensslcompat.h index 426849411..4476552c7 100644 --- a/libfreerdp/crypto/opensslcompat.h +++ b/libfreerdp/crypto/opensslcompat.h @@ -82,7 +82,7 @@ static inline STACK_OF(X509) * sk_X509_deep_copy(const STACK_OF(X509) * sk, STACK_OF(X509)* stack = sk_X509_new_null(); if (!stack) - return NULL; + return nullptr; if (sk) { @@ -102,7 +102,7 @@ static inline STACK_OF(X509) * sk_X509_deep_copy(const STACK_OF(X509) * sk, fail: sk_X509_pop_free(stack, freefunc); - return NULL; + return nullptr; } #endif diff --git a/libfreerdp/crypto/per.c b/libfreerdp/crypto/per.c index e7107693d..d93fd44ca 100644 --- a/libfreerdp/crypto/per.c +++ b/libfreerdp/crypto/per.c @@ -31,7 +31,7 @@ * Read PER length. * * @param s stream to read from - * @param length A pointer to return the length read, must not be NULL + * @param length A pointer to return the length read, must not be nullptr * * @return \b TRUE for success, \b FALSE otherwise. */ @@ -298,7 +298,7 @@ BOOL per_write_integer(wStream* s, UINT32 integer) * Read PER INTEGER (UINT16). * * @param s The stream to read from - * @param integer The integer result variable pointer, must not be NULL + * @param integer The integer result variable pointer, must not be nullptr * @param min minimum value * * @return \b TRUE for success, \b FALSE otherwise @@ -345,7 +345,7 @@ BOOL per_write_integer16(wStream* s, UINT16 integer, UINT16 min) * Read PER ENUMERATED. * * @param s The stream to read from - * @param enumerated enumerated result variable, must not be NULL + * @param enumerated enumerated result variable, must not be nullptr * @param count enumeration count * * @return \b TRUE for success, \b FALSE otherwise diff --git a/libfreerdp/crypto/privatekey.c b/libfreerdp/crypto/privatekey.c index 08117eb5b..56f1a7cfe 100644 --- a/libfreerdp/crypto/privatekey.c +++ b/libfreerdp/crypto/privatekey.c @@ -96,10 +96,10 @@ static RSA* evp_pkey_to_rsa(const rdpPrivateKey* key) if (!freerdp_key_is_rsa(key)) { WLog_WARN(TAG, "Key is no RSA key"); - return NULL; + return nullptr; } - RSA* rsa = NULL; + RSA* rsa = nullptr; BIO* bio = BIO_new( #if defined(LIBRESSL_VERSION_NUMBER) BIO_s_mem() @@ -108,11 +108,11 @@ static RSA* evp_pkey_to_rsa(const rdpPrivateKey* key) #endif ); if (!bio) - return NULL; - const int rc = PEM_write_bio_PrivateKey(bio, key->evp, NULL, NULL, 0, NULL, NULL); + return nullptr; + const int rc = PEM_write_bio_PrivateKey(bio, key->evp, nullptr, nullptr, 0, nullptr, nullptr); if (rc != 1) goto fail; - rsa = PEM_read_bio_RSAPrivateKey(bio, NULL, NULL, NULL); + rsa = PEM_read_bio_RSAPrivateKey(bio, nullptr, nullptr, nullptr); fail: BIO_free_all(bio); return rsa; @@ -122,27 +122,28 @@ fail: static EVP_PKEY* evp_pkey_utils_from_pem(const char* data, size_t len, BOOL fromFile, const char* password) { - EVP_PKEY* evp = NULL; - BIO* bio = NULL; + EVP_PKEY* evp = nullptr; + BIO* bio = nullptr; if (fromFile) bio = BIO_new_file(data, "rb"); else { if (len > INT_MAX) - return NULL; + return nullptr; bio = BIO_new_mem_buf(data, (int)len); } if (!bio) { WLog_ERR(TAG, "BIO_new failed for private key"); - return NULL; + return nullptr; } - evp = PEM_read_bio_PrivateKey(bio, NULL, NULL, WINPR_CAST_CONST_PTR_AWAY(password, void*)); + evp = + PEM_read_bio_PrivateKey(bio, nullptr, nullptr, WINPR_CAST_CONST_PTR_AWAY(password, void*)); BIO_free_all(bio); if (!evp) - WLog_ERR(TAG, "PEM_read_bio_PrivateKey returned NULL [input length %" PRIuz "]", len); + WLog_ERR(TAG, "PEM_read_bio_PrivateKey returned nullptr [input length %" PRIuz "]", len); return evp; } @@ -187,15 +188,15 @@ static BOOL key_read_private(rdpPrivateKey* key) } } - const BIGNUM* rsa_e = NULL; - const BIGNUM* rsa_n = NULL; - const BIGNUM* rsa_d = NULL; + const BIGNUM* rsa_e = nullptr; + const BIGNUM* rsa_n = nullptr; + const BIGNUM* rsa_d = nullptr; RSA_get0_key(rsa, &rsa_n, &rsa_e, &rsa_d); #else - BIGNUM* rsa_e = NULL; - BIGNUM* rsa_n = NULL; - BIGNUM* rsa_d = NULL; + BIGNUM* rsa_e = nullptr; + BIGNUM* rsa_n = nullptr; + BIGNUM* rsa_d = nullptr; if (!EVP_PKEY_get_bn_param(key->evp, OSSL_PKEY_PARAM_RSA_N, &rsa_n)) goto fail; @@ -229,7 +230,7 @@ fail: rdpPrivateKey* freerdp_key_new_from_pem(const char* pem) { - return freerdp_key_new_from_pem_enc(pem, NULL); + return freerdp_key_new_from_pem_enc(pem, nullptr); } rdpPrivateKey* freerdp_key_new_from_pem_enc(const char* pem, const char* password) @@ -245,12 +246,12 @@ rdpPrivateKey* freerdp_key_new_from_pem_enc(const char* pem, const char* passwor return key; fail: freerdp_key_free(key); - return NULL; + return nullptr; } rdpPrivateKey* freerdp_key_new_from_file(const char* keyfile) { - return freerdp_key_new_from_file_enc(keyfile, NULL); + return freerdp_key_new_from_file_enc(keyfile, nullptr); } rdpPrivateKey* freerdp_key_new_from_file_enc(const char* keyfile, const char* password) @@ -267,7 +268,7 @@ rdpPrivateKey* freerdp_key_new_from_file_enc(const char* keyfile, const char* pa return key; fail: freerdp_key_free(key); - return NULL; + return nullptr; } rdpPrivateKey* freerdp_key_new(void) @@ -278,12 +279,12 @@ rdpPrivateKey* freerdp_key_new(void) rdpPrivateKey* freerdp_key_clone(const rdpPrivateKey* key) { if (!key) - return NULL; + return nullptr; rdpPrivateKey* _key = (rdpPrivateKey*)calloc(1, sizeof(rdpPrivateKey)); if (!_key) - return NULL; + return nullptr; if (key->evp) { @@ -313,7 +314,7 @@ out_fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC freerdp_key_free(_key); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void freerdp_key_free(rdpPrivateKey* key) @@ -333,7 +334,7 @@ const rdpCertInfo* freerdp_key_get_info(const rdpPrivateKey* key) { WINPR_ASSERT(key); if (!freerdp_key_is_rsa(key)) - return NULL; + return nullptr; return &key->cert; } @@ -344,7 +345,7 @@ const BYTE* freerdp_key_get_exponent(const rdpPrivateKey* key, size_t* plength) { if (plength) *plength = 0; - return NULL; + return nullptr; } if (plength) @@ -414,9 +415,9 @@ BOOL freerdp_key_generate(rdpPrivateKey* key, const char* type, size_t count, .. va_end(ap); #if !defined(OPENSSL_VERSION_MAJOR) || (OPENSSL_VERSION_MAJOR < 3) - RSA* rsa = NULL; + RSA* rsa = nullptr; #if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - rsa = RSA_generate_key(key_length, RSA_F4, NULL, NULL); + rsa = RSA_generate_key(key_length, RSA_F4, nullptr, nullptr); #else { BIGNUM* bn = BN_secure_new(); @@ -433,7 +434,7 @@ BOOL freerdp_key_generate(rdpPrivateKey* key, const char* type, size_t count, .. } BN_set_word(bn, RSA_F4); - const int res = RSA_generate_key_ex(rsa, key_length, bn, NULL); + const int res = RSA_generate_key_ex(rsa, key_length, bn, nullptr); BN_clear_free(bn); if (res != 1) @@ -447,14 +448,14 @@ BOOL freerdp_key_generate(rdpPrivateKey* key, const char* type, size_t count, .. if (!EVP_PKEY_assign_RSA(key->evp, rsa)) { EVP_PKEY_free(key->evp); - key->evp = NULL; + key->evp = nullptr; RSA_free(rsa); return FALSE; } rc = TRUE; #else - EVP_PKEY_CTX* pctx = EVP_PKEY_CTX_new_from_name(NULL, type, NULL); + EVP_PKEY_CTX* pctx = EVP_PKEY_CTX_new_from_name(nullptr, type, nullptr); if (!pctx) return FALSE; @@ -465,7 +466,7 @@ BOOL freerdp_key_generate(rdpPrivateKey* key, const char* type, size_t count, .. goto fail; EVP_PKEY_free(key->evp); - key->evp = NULL; + key->evp = nullptr; if (EVP_PKEY_generate(pctx, &key->evp) != 1) goto fail; @@ -479,17 +480,17 @@ fail: BYTE* freerdp_key_get_param(const rdpPrivateKey* key, enum FREERDP_KEY_PARAM param, size_t* plength) { - BYTE* buf = NULL; + BYTE* buf = nullptr; WINPR_ASSERT(key); WINPR_ASSERT(plength); *plength = 0; - BIGNUM* bn = NULL; + BIGNUM* bn = nullptr; #if OPENSSL_VERSION_NUMBER >= 0x30000000L - const char* pk = NULL; + const char* pk = nullptr; switch (param) { case FREERDP_KEY_PARAM_RSA_D: @@ -502,18 +503,18 @@ BYTE* freerdp_key_get_param(const rdpPrivateKey* key, enum FREERDP_KEY_PARAM par pk = OSSL_PKEY_PARAM_RSA_N; break; default: - return NULL; + return nullptr; } if (!EVP_PKEY_get_bn_param(key->evp, pk, &bn)) - return NULL; + return nullptr; #else { const RSA* rsa = EVP_PKEY_get0_RSA(key->evp); if (!rsa) - return NULL; + return nullptr; - const BIGNUM* cbn = NULL; + const BIGNUM* cbn = nullptr; switch (param) { case FREERDP_KEY_PARAM_RSA_D: @@ -532,13 +533,13 @@ BYTE* freerdp_key_get_param(const rdpPrivateKey* key, enum FREERDP_KEY_PARAM par #endif break; default: - return NULL; + return nullptr; } if (!cbn) - return NULL; + return nullptr; bn = BN_dup(cbn); if (!bn) - return NULL; + return nullptr; } #endif @@ -559,7 +560,7 @@ BYTE* freerdp_key_get_param(const rdpPrivateKey* key, enum FREERDP_KEY_PARAM par if (bnlen != length) { free(buf); - buf = NULL; + buf = nullptr; } else *plength = WINPR_ASSERTING_INT_CAST(size_t, length); @@ -574,12 +575,12 @@ WINPR_DIGEST_CTX* freerdp_key_digest_sign(rdpPrivateKey* key, WINPR_MD_TYPE dige { WINPR_DIGEST_CTX* md_ctx = winpr_Digest_New(); if (!md_ctx) - return NULL; + return nullptr; if (!winpr_DigestSign_Init(md_ctx, digest, key->evp)) { winpr_Digest_Free(md_ctx); - return NULL; + return nullptr; } return md_ctx; } @@ -594,9 +595,9 @@ static BOOL bio_read_pem(BIO* bio, char** ppem, size_t* plength) const size_t blocksize = 2048; size_t offset = 0; size_t length = blocksize; - char* pem = NULL; + char* pem = nullptr; - *ppem = NULL; + *ppem = nullptr; if (plength) *plength = 0; @@ -647,7 +648,7 @@ char* freerdp_key_get_pem(const rdpPrivateKey* key, size_t* plen, const char* pa WINPR_ASSERT(key); if (!key->evp) - return NULL; + return nullptr; /** * Don't manage certificates internally, leave it up entirely to the external client @@ -658,16 +659,16 @@ char* freerdp_key_get_pem(const rdpPrivateKey* key, size_t* plen, const char* pa if (!bio) { WLog_ERR(TAG, "BIO_new() failure"); - return NULL; + return nullptr; } - char* pem = NULL; + char* pem = nullptr; - const EVP_CIPHER* enc = NULL; + const EVP_CIPHER* enc = nullptr; if (password) enc = EVP_aes_256_xts(); - const int status = PEM_write_bio_PrivateKey(bio, key->evp, enc, NULL, 0, 0, + const int status = PEM_write_bio_PrivateKey(bio, key->evp, enc, nullptr, 0, nullptr, WINPR_CAST_CONST_PTR_AWAY(password, void*)); if (status < 0) { diff --git a/libfreerdp/crypto/test/TestBase64.c b/libfreerdp/crypto/test/TestBase64.c index 9576f669e..9314411f2 100644 --- a/libfreerdp/crypto/test/TestBase64.c +++ b/libfreerdp/crypto/test/TestBase64.c @@ -35,7 +35,7 @@ static const struct Encode64test encodeTests_base64[] = { { "890123456", 9, "ODkwMTIzNDU2" }, { "7890123456", 10, "Nzg5MDEyMzQ1Ng==" }, - { NULL, -1, NULL }, /* /!\ last one /!\ */ + { nullptr, -1, nullptr }, /* /!\ last one /!\ */ }; static const struct Encode64test encodeTests_base64url[] = { @@ -47,14 +47,14 @@ static const struct Encode64test encodeTests_base64url[] = { { "890123456", 9, "ODkwMTIzNDU2" }, { "78?01>3456", 10, "Nzg_MDE-MzQ1Ng" }, - { NULL, -1, NULL }, /* /!\ last one /!\ */ + { nullptr, -1, nullptr }, /* /!\ last one /!\ */ }; int TestBase64(int argc, char* argv[]) { int testNb = 0; size_t outLen = 0; - BYTE* decoded = NULL; + BYTE* decoded = nullptr; WINPR_UNUSED(argc); WINPR_UNUSED(argv); testNb++; diff --git a/libfreerdp/crypto/test/TestKnownHosts.c b/libfreerdp/crypto/test/TestKnownHosts.c index d6fbedbca..e68b69b0d 100644 --- a/libfreerdp/crypto/test/TestKnownHosts.c +++ b/libfreerdp/crypto/test/TestKnownHosts.c @@ -123,7 +123,7 @@ static int prepare(const char* currentFileV2) "someurl 3389 ff:11:22:dd c3ViamVjdA== aXNzdWVy\r\n" " \t#anothercomment\r\n" "otherurl\t3389\taa:bb:cc:dd\tsubject2\tissuer2\r" }; - FILE* fc = NULL; + FILE* fc = nullptr; fc = winpr_fopen(currentFileV2, "w+"); if (!fc) @@ -147,7 +147,7 @@ finish: static BOOL setup_config(rdpSettings** settings) { BOOL rc = FALSE; - char* path = NULL; + char* path = nullptr; char sname[8192]; SYSTEMTIME systemTime; @@ -169,7 +169,7 @@ static BOOL setup_config(rdpSettings** settings) goto fail; if (!winpr_PathFileExists(path)) { - if (!CreateDirectoryA(path, NULL)) + if (!CreateDirectoryA(path, nullptr)) { (void)fprintf(stderr, "Could not create %s!\n", path); goto fail; @@ -252,12 +252,12 @@ static BOOL test_get_data_ex(rdpCertificateStore* store, const rdpCertificateDat static BOOL test_certs_dir(void) { BOOL rc = FALSE; - rdpSettings* settings = NULL; - rdpCertificateStore* store = NULL; - rdpCertificateData* data1 = NULL; - rdpCertificateData* data2 = NULL; - rdpCertificateData* data3 = NULL; - rdpCertificateData* data4 = NULL; + rdpSettings* settings = nullptr; + rdpCertificateStore* store = nullptr; + rdpCertificateData* data1 = nullptr; + rdpCertificateData* data2 = nullptr; + rdpCertificateData* data3 = nullptr; + rdpCertificateData* data4 = nullptr; printf("%s\n", __func__); if (!setup_config(&settings)) diff --git a/libfreerdp/crypto/test/Test_x509_utils.c b/libfreerdp/crypto/test/Test_x509_utils.c index 255f6d01a..ae48a7f5e 100644 --- a/libfreerdp/crypto/test/Test_x509_utils.c +++ b/libfreerdp/crypto/test/Test_x509_utils.c @@ -35,7 +35,7 @@ static char* certificate_path(const char* filename) const size_t flen = strlen(file) + sizeof(dirsep) + strlen(filename) + sizeof(char); char* result = calloc(1, flen); if (!result) - return NULL; + return nullptr; (void)_snprintf(result, flen, "%s%c%s", file, dirsep, filename); return result; #else @@ -48,7 +48,7 @@ static char* certificate_path(const char* filename) const size_t dirsepLen = last_dirsep - file + 1; char* result = malloc(dirsepLen + filenameLen + 1); if (!result) - return NULL; + return nullptr; strncpy(result, file, dirsepLen); strncpy(result + dirsepLen, filename, filenameLen + 1); return result; @@ -70,7 +70,7 @@ static const certificate_test_t certificate_tests[] = { "CN = TESTJEAN TESTMARTIN 9999999, C = FR, O = MINISTERE DES TESTS, OU = 0002 110014016, OU " "= PERSONNES, UID = 9999999, GN = TESTJEAN, SN = TESTMARTIN" }, - { DISABLED, "Kerberos principal name", 0, "testjean.testmartin@kpn.test.example.com" }, + { DISABLED, "Kerberos principal name", nullptr, "testjean.testmartin@kpn.test.example.com" }, { ENABLED, "Certificate e-mail", x509_utils_get_email, "testjean.testmartin@test.example.com" @@ -101,14 +101,14 @@ static int TestCertificateFile(const char* certificate_path, for (size_t i = 0; i < count; i++) { const certificate_test_t* test = &ccertificate_tests[i]; - char* result = NULL; + char* result = nullptr; if (test->status == DISABLED) { continue; } - result = (test->get_field ? test->get_field(certificate) : 0); + result = (test->get_field ? test->get_field(certificate) : nullptr); if (result) { diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c index 789a1f9ef..2efaa0e06 100644 --- a/libfreerdp/crypto/tls.c +++ b/libfreerdp/crypto/tls.c @@ -101,7 +101,7 @@ static void free_tls_public_key(rdpTls* tls) { WINPR_ASSERT(tls); free(tls->PublicKey); - tls->PublicKey = NULL; + tls->PublicKey = nullptr; tls->PublicKeyLength = 0; } @@ -113,7 +113,7 @@ static void free_tls_bindings(rdpTls* tls) free(tls->Bindings->Bindings); free(tls->Bindings); - tls->Bindings = NULL; + tls->Bindings = nullptr; } static int bio_rdp_tls_write(BIO* bio, const char* buf, int size) @@ -267,9 +267,9 @@ static int bio_rdp_tls_gets(WINPR_ATTR_UNUSED BIO* bio, WINPR_ATTR_UNUSED char* static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr) { - BIO* ssl_rbio = NULL; - BIO* ssl_wbio = NULL; - BIO* next_bio = NULL; + BIO* ssl_rbio = nullptr; + BIO* ssl_wbio = nullptr; + BIO* next_bio = nullptr; long status = -1; BIO_RDP_TLS* tls = (BIO_RDP_TLS*)BIO_get_data(bio); @@ -280,8 +280,8 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr) return 0; next_bio = BIO_next(bio); - ssl_rbio = tls->ssl ? SSL_get_rbio(tls->ssl) : NULL; - ssl_wbio = tls->ssl ? SSL_get_wbio(tls->ssl) : NULL; + ssl_rbio = tls->ssl ? SSL_get_rbio(tls->ssl) : nullptr; + ssl_wbio = tls->ssl ? SSL_get_wbio(tls->ssl) : nullptr; switch (cmd) { @@ -402,10 +402,10 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr) if (next_bio) CRYPTO_add(&(bio->next_bio->references), -1, CRYPTO_LOCK_BIO); - tls->ssl->wbio = tls->ssl->rbio = NULL; + tls->ssl->wbio = tls->ssl->rbio = nullptr; #else /* OpenSSL 1.1: This will also clear the reference we obtained during push */ - SSL_set_bio(tls->ssl, NULL, NULL); + SSL_set_bio(tls->ssl, nullptr, nullptr); #endif } @@ -489,7 +489,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr) static int bio_rdp_tls_new(BIO* bio) { - BIO_RDP_TLS* tls = NULL; + BIO_RDP_TLS* tls = nullptr; BIO_set_flags(bio, BIO_FLAGS_SHOULD_RETRY); if (!(tls = calloc(1, sizeof(BIO_RDP_TLS)))) @@ -502,7 +502,7 @@ static int bio_rdp_tls_new(BIO* bio) static int bio_rdp_tls_free(BIO* bio) { - BIO_RDP_TLS* tls = NULL; + BIO_RDP_TLS* tls = nullptr; if (!bio) return 0; @@ -512,7 +512,7 @@ static int bio_rdp_tls_free(BIO* bio) if (!tls) return 0; - BIO_set_data(bio, NULL); + BIO_set_data(bio, nullptr); if (BIO_get_shutdown(bio)) { if (BIO_get_init(bio) && tls->ssl) @@ -571,12 +571,12 @@ static long bio_rdp_tls_callback_ctrl(BIO* bio, int cmd, bio_info_cb* fp) static BIO_METHOD* BIO_s_rdp_tls(void) { - static BIO_METHOD* bio_methods = NULL; + static BIO_METHOD* bio_methods = nullptr; - if (bio_methods == NULL) + if (bio_methods == nullptr) { if (!(bio_methods = BIO_meth_new(BIO_TYPE_RDP_TLS, "RdpTls"))) - return NULL; + return nullptr; BIO_meth_set_write(bio_methods, bio_rdp_tls_write); BIO_meth_set_read(bio_methods, bio_rdp_tls_read); @@ -593,19 +593,19 @@ static BIO_METHOD* BIO_s_rdp_tls(void) static BIO* BIO_new_rdp_tls(SSL_CTX* ctx, int client) { - BIO* bio = NULL; - SSL* ssl = NULL; + BIO* bio = nullptr; + SSL* ssl = nullptr; bio = BIO_new(BIO_s_rdp_tls()); if (!bio) - return NULL; + return nullptr; ssl = SSL_new(ctx); if (!ssl) { BIO_free_all(bio); - return NULL; + return nullptr; } if (client) @@ -619,7 +619,7 @@ static BIO* BIO_new_rdp_tls(SSL_CTX* ctx, int client) static rdpCertificate* tls_get_certificate(rdpTls* tls, BOOL peer) { - X509* remote_cert = NULL; + X509* remote_cert = nullptr; if (peer) remote_cert = SSL_get_peer_certificate(tls->ssl); @@ -629,10 +629,10 @@ static rdpCertificate* tls_get_certificate(rdpTls* tls, BOOL peer) if (!remote_cert) { WLog_ERR(TAG, "failed to get the server TLS certificate"); - return NULL; + return nullptr; } - /* Get the peer's chain. If it does not exist, we're setting NULL (clean data either way) */ + /* Get the peer's chain. If it does not exist, we're setting nullptr (clean data either way) */ STACK_OF(X509)* chain = SSL_get_peer_cert_chain(tls->ssl); rdpCertificate* cert = freerdp_certificate_new_from_x509(remote_cert, chain); X509_free(remote_cert); @@ -650,15 +650,15 @@ static const char* tls_get_server_name(rdpTls* tls) static SecPkgContext_Bindings* tls_get_channel_bindings(const rdpCertificate* cert) { size_t CertificateHashLength = 0; - BYTE* ChannelBindingToken = NULL; - SEC_CHANNEL_BINDINGS* ChannelBindings = NULL; + BYTE* ChannelBindingToken = nullptr; + SEC_CHANNEL_BINDINGS* ChannelBindings = nullptr; const size_t PrefixLength = strnlen(TLS_SERVER_END_POINT, ARRAYSIZE(TLS_SERVER_END_POINT)); WINPR_ASSERT(cert); /* See https://www.rfc-editor.org/rfc/rfc5929 for details about hashes */ WINPR_MD_TYPE alg = freerdp_certificate_get_signature_alg(cert); - const char* hash = NULL; + const char* hash = nullptr; switch (alg) { @@ -671,11 +671,11 @@ static SecPkgContext_Bindings* tls_get_channel_bindings(const rdpCertificate* ce break; } if (!hash) - return NULL; + return nullptr; char* CertificateHash = freerdp_certificate_get_hash(cert, hash, &CertificateHashLength); if (!CertificateHash) - return NULL; + return nullptr; const size_t ChannelBindingTokenLength = PrefixLength + CertificateHashLength; SecPkgContext_Bindings* ContextBindings = calloc(1, sizeof(SecPkgContext_Bindings)); @@ -706,7 +706,7 @@ static SecPkgContext_Bindings* tls_get_channel_bindings(const rdpCertificate* ce out_free: free(CertificateHash); free(ContextBindings); - return NULL; + return nullptr; } static INIT_ONCE secrets_file_idx_once = INIT_ONCE_STATIC_INIT; @@ -716,14 +716,14 @@ static BOOL CALLBACK secrets_file_init_cb(WINPR_ATTR_UNUSED PINIT_ONCE once, WINPR_ATTR_UNUSED PVOID param, WINPR_ATTR_UNUSED PVOID* context) { - secrets_file_idx = SSL_get_ex_new_index(0, NULL, NULL, NULL, NULL); + secrets_file_idx = SSL_get_ex_new_index(0, nullptr, nullptr, nullptr, nullptr); return (secrets_file_idx != -1); } static void SSLCTX_keylog_cb(const SSL* ssl, const char* line) { - char* dfile = NULL; + char* dfile = nullptr; if (secrets_file_idx == -1) return; @@ -748,7 +748,7 @@ static void tls_reset(rdpTls* tls) if (tls->ctx) { SSL_CTX_free(tls->ctx); - tls->ctx = NULL; + tls->ctx = nullptr; } /* tls->underlying is a stacked BIO under tls->bio. @@ -757,8 +757,8 @@ static void tls_reset(rdpTls* tls) BIO_free_all(tls->bio); else if (tls->underlying) BIO_free_all(tls->underlying); - tls->bio = NULL; - tls->underlying = NULL; + tls->bio = nullptr; + tls->underlying = nullptr; free_tls_public_key(tls); free_tls_bindings(tls); @@ -829,7 +829,7 @@ static BOOL tls_prepare(rdpTls* tls, BIO* underlying, SSL_METHOD* method, int op if (settings->TlsSecretsFile) { #if OPENSSL_VERSION_NUMBER >= 0x10101000L - InitOnceExecuteOnce(&secrets_file_idx_once, secrets_file_init_cb, NULL, NULL); + InitOnceExecuteOnce(&secrets_file_idx_once, secrets_file_init_cb, nullptr, nullptr); if (secrets_file_idx != -1) { @@ -1006,7 +1006,7 @@ static int pollAndHandshake(rdpTls* tls) do { - HANDLE events[] = { freerdp_abort_event(tls->context), NULL }; + HANDLE events[] = { freerdp_abort_event(tls->context), nullptr }; DWORD status = 0; if (BIO_get_event(tls->bio, &events[1]) < 0) { @@ -1394,7 +1394,7 @@ static BOOL is_accepted(rdpTls* tls, const rdpCertificate* cert) return TRUE; } - freerdp_settings_set_string(settings, keyAccepted, NULL); + freerdp_settings_set_string(settings, keyAccepted, nullptr); freerdp_settings_set_uint32(settings, keyLength, 0); return FALSE; @@ -1404,7 +1404,7 @@ static BOOL compare_fingerprint(const char* fp, const char* hash, const rdpCerti BOOL separator) { BOOL equal = 0; - char* strhash = NULL; + char* strhash = nullptr; WINPR_ASSERT(fp); WINPR_ASSERT(hash); @@ -1439,12 +1439,12 @@ static BOOL is_accepted_fingerprint(const rdpCertificate* cert, BOOL rc = FALSE; if (CertificateAcceptedFingerprints) { - char* context = NULL; + char* context = nullptr; char* copy = _strdup(CertificateAcceptedFingerprints); char* cur = strtok_s(copy, ",", &context); while (cur) { - char* subcontext = NULL; + char* subcontext = nullptr; const char* h = strtok_s(cur, ":", &subcontext); if (!h) @@ -1459,7 +1459,7 @@ static BOOL is_accepted_fingerprint(const rdpCertificate* cert, } } next: - cur = strtok_s(NULL, ",", &context); + cur = strtok_s(nullptr, ",", &context); } free(copy); } @@ -1508,7 +1508,7 @@ static BOOL tls_extract_full_pem(const rdpCertificate* cert, BYTE** PublicKey, if (!cert || !PublicKey) return FALSE; *PublicKey = (BYTE*)freerdp_certificate_get_pem(cert, PublicKeyLength); - return *PublicKey != NULL; + return *PublicKey != nullptr; } static int tls_config_parse_bool(WINPR_JSON* json, const char* opt) @@ -1642,15 +1642,15 @@ int tls_verify_certificate(rdpTls* tls, const rdpCertificate* cert, const char* int match = 0; size_t length = 0; BOOL certificate_status = 0; - char* common_name = NULL; + char* common_name = nullptr; size_t common_name_length = 0; - char** dns_names = 0; + char** dns_names = nullptr; size_t dns_names_count = 0; - size_t* dns_names_lengths = NULL; + size_t* dns_names_lengths = nullptr; int verification_status = -1; BOOL hostname_match = FALSE; - rdpCertificateData* certificate_data = NULL; - BYTE* pemCert = NULL; + rdpCertificateData* certificate_data = nullptr; + BYTE* pemCert = nullptr; DWORD flags = VERIFY_CERT_FLAG_NONE; WINPR_ASSERT(tls); @@ -1841,7 +1841,7 @@ int tls_verify_certificate(rdpTls* tls, const rdpCertificate* cert, const char* { const BOOL use_pem = freerdp_settings_get_bool(settings, FreeRDP_CertificateCallbackPreferPEM); - char* fp = NULL; + char* fp = nullptr; DWORD cflags = flags; if (use_pem) { @@ -1913,7 +1913,7 @@ int tls_verify_certificate(rdpTls* tls, const rdpCertificate* cert, const char* const BOOL fpIsAllocated = !old_pem || !freerdp_settings_get_bool(settings, FreeRDP_CertificateCallbackPreferPEM); - char* fp = NULL; + char* fp = nullptr; if (!fpIsAllocated) { cflags |= VERIFY_CERT_FLAG_FP_IS_PEM; @@ -2037,7 +2037,7 @@ void tls_print_certificate_name_mismatch_error(const char* hostname, UINT16 port const char* common_name, char** alt_names, size_t alt_names_count) { - WINPR_ASSERT(NULL != hostname); + WINPR_ASSERT(nullptr != hostname); WLog_ERR(TAG, "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); WLog_ERR(TAG, "@ WARNING: CERTIFICATE NAME MISMATCH! @"); WLog_ERR(TAG, "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); @@ -2049,7 +2049,7 @@ void tls_print_certificate_name_mismatch_error(const char* hostname, UINT16 port if (alt_names_count > 0) { - WINPR_ASSERT(NULL != alt_names); + WINPR_ASSERT(nullptr != alt_names); WLog_ERR(TAG, "Alternative names:"); for (size_t index = 0; index < alt_names_count; index++) @@ -2064,11 +2064,11 @@ void tls_print_certificate_name_mismatch_error(const char* hostname, UINT16 port rdpTls* freerdp_tls_new(rdpContext* context) { - rdpTls* tls = NULL; + rdpTls* tls = nullptr; tls = (rdpTls*)calloc(1, sizeof(rdpTls)); if (!tls) - return NULL; + return nullptr; tls->context = context; @@ -2085,7 +2085,7 @@ rdpTls* freerdp_tls_new(rdpContext* context) return tls; out_free: free(tls); - return NULL; + return nullptr; } void freerdp_tls_free(rdpTls* tls) @@ -2098,7 +2098,7 @@ void freerdp_tls_free(rdpTls* tls) if (tls->certificate_store) { freerdp_certificate_store_free(tls->certificate_store); - tls->certificate_store = NULL; + tls->certificate_store = nullptr; } free(tls); diff --git a/libfreerdp/crypto/x509_utils.c b/libfreerdp/crypto/x509_utils.c index b41ff0ce7..77f642b16 100644 --- a/libfreerdp/crypto/x509_utils.c +++ b/libfreerdp/crypto/x509_utils.c @@ -40,33 +40,33 @@ BYTE* x509_utils_get_hash(const X509* xcert, const char* hash, size_t* length) { UINT32 fp_len = EVP_MAX_MD_SIZE; - BYTE* fp = NULL; + BYTE* fp = nullptr; const EVP_MD* md = EVP_get_digestbyname(hash); if (!md) { WLog_ERR(TAG, "System does not support %s hash!", hash); - return NULL; + return nullptr; } if (!xcert || !length) { WLog_ERR(TAG, "Invalid arguments: xcert=%p, length=%p", WINPR_CXX_COMPAT_CAST(const void*, xcert), WINPR_CXX_COMPAT_CAST(const void*, length)); - return NULL; + return nullptr; } fp = calloc(fp_len + 1, sizeof(BYTE)); if (!fp) { WLog_ERR(TAG, "could not allocate %" PRIu32 " bytes", fp_len); - return NULL; + return nullptr; } if (X509_digest(xcert, md, fp, &fp_len) != 1) { free(fp); WLog_ERR(TAG, "certificate does not have a %s hash!", hash); - return NULL; + return nullptr; } *length = fp_len; @@ -75,7 +75,7 @@ BYTE* x509_utils_get_hash(const X509* xcert, const char* hash, size_t* length) static char* crypto_print_name(const X509_NAME* name) { - char* buffer = NULL; + char* buffer = nullptr; BIO* outBIO = BIO_new(BIO_s_mem()); if (X509_NAME_print_ex(outBIO, name, 0, XN_FLAG_ONELINE) > 0) @@ -93,7 +93,7 @@ static char* crypto_print_name(const X509_NAME* name) if (rc <= 0) { free(buffer); - buffer = NULL; + buffer = nullptr; goto fail; } } @@ -105,11 +105,11 @@ fail: char* x509_utils_get_subject(const X509* xcert) { - char* subject = NULL; + char* subject = nullptr; if (!xcert) { - WLog_ERR(TAG, "Invalid certificate NULL"); - return NULL; + WLog_ERR(TAG, "Invalid certificate nullptr"); + return nullptr; } subject = crypto_print_name(X509_get_subject_name(xcert)); if (!subject) @@ -189,8 +189,8 @@ static void map_subject_alt_name(const X509* x509, int general_name_type, general_name_mapper_pr mapper, void* data) { int num = 0; - STACK_OF(GENERAL_NAME)* gens = NULL; - gens = X509_get_ext_d2i(x509, NID_subject_alt_name, NULL, NULL); + STACK_OF(GENERAL_NAME)* gens = nullptr; + gens = X509_get_ext_d2i(x509, NID_subject_alt_name, nullptr, nullptr); if (!gens) { @@ -247,7 +247,7 @@ typedef struct string_list static void string_list_initialize(string_list* list) { - list->strings = 0; + list->strings = nullptr; list->allocated = 0; list->count = 0; list->maximum = INT_MAX; @@ -274,8 +274,8 @@ static void string_list_free(string_list* list) static int extract_string(GENERAL_NAME* name, void* data, int index, int count) { string_list* list = data; - unsigned char* cstring = 0; - ASN1_STRING* str = NULL; + unsigned char* cstring = nullptr; + ASN1_STRING* str = nullptr; WINPR_UNUSED(index); @@ -300,7 +300,7 @@ static int extract_string(GENERAL_NAME* name, void* data, int index, int count) if ((ASN1_STRING_to_UTF8(&cstring, str)) < 0) { WLog_ERR(TAG, "ASN1_STRING_to_UTF8() failed for %s: %s", - general_name_type_label(name->type), ERR_error_string(ERR_get_error(), NULL)); + general_name_type_label(name->type), ERR_error_string(ERR_get_error(), nullptr)); return 1; } @@ -352,8 +352,8 @@ typedef struct object_list static void object_list_initialize(object_list* list) { - list->type_id = 0; - list->strings = 0; + list->type_id = nullptr; + list->strings = nullptr; list->allocated = 0; list->count = 0; list->maximum = INT_MAX; @@ -371,15 +371,15 @@ static void object_list_allocate(object_list* list, size_t allocate_count) static char* object_string(ASN1_TYPE* object) { - char* result = NULL; - unsigned char* utf8String = NULL; + char* result = nullptr; + unsigned char* utf8String = nullptr; /* TODO: check that object.type is a string type. */ const int length = ASN1_STRING_to_UTF8(&utf8String, object->value.asn1_string); if (length < 0) { - return 0; + return nullptr; } result = strndup((char*)utf8String, WINPR_ASSERTING_INT_CAST(size_t, length)); @@ -435,7 +435,7 @@ static int extract_othername_object_as_string(GENERAL_NAME* name, void* data, in char* x509_utils_get_email(const X509* x509) { - char* result = 0; + char* result = nullptr; string_list list; string_list_initialize(&list); list.maximum = 1; @@ -444,7 +444,7 @@ char* x509_utils_get_email(const X509* x509) if (list.count == 0) { string_list_free(&list); - return 0; + return nullptr; } result = _strdup(list.strings[0]); @@ -455,7 +455,7 @@ char* x509_utils_get_email(const X509* x509) char* x509_utils_get_upn(const X509* x509) { - char* result = 0; + char* result = nullptr; object_list list = WINPR_C_ARRAY_INIT; object_list_initialize(&list); list.type_id = OBJ_nid2obj(NID_ms_upn); @@ -465,7 +465,7 @@ char* x509_utils_get_upn(const X509* x509) if (list.count == 0) { object_list_free(&list); - return 0; + return nullptr; } result = list.strings[0]; @@ -479,16 +479,16 @@ char* x509_utils_get_date(const X509* x509, BOOL startDate) const ASN1_TIME* date = startDate ? X509_get0_notBefore(x509) : X509_get0_notAfter(x509); if (!date) - return NULL; + return nullptr; BIO* bmem = BIO_new(BIO_s_mem()); if (!bmem) - return NULL; + return nullptr; - char* str = NULL; + char* str = nullptr; if (ASN1_TIME_print(bmem, date)) { - BUF_MEM* bptr = NULL; + BUF_MEM* bptr = nullptr; BIO_get_mem_ptr(bmem, &bptr); str = strndup(bptr->data, bptr->length); @@ -520,7 +520,7 @@ void x509_utils_dns_names_free(size_t count, size_t* lengths, char** dns_names) char** x509_utils_get_dns_names(const X509* xcert, size_t* count, size_t** lengths) { - char** result = 0; + char** result = nullptr; string_list list = WINPR_C_ARRAY_INIT; string_list_initialize(&list); map_subject_alt_name(xcert, GEN_DNS, extract_string, &list); @@ -529,7 +529,7 @@ char** x509_utils_get_dns_names(const X509* xcert, size_t* count, size_t** lengt if (list.count <= 0) { string_list_free(&list); - return NULL; + return nullptr; } /* lengths are not useful, since we converted the @@ -542,9 +542,9 @@ char** x509_utils_get_dns_names(const X509* xcert, size_t* count, size_t** lengt string_list_free(&list); free((void*)result); free(*lengths); - (*lengths) = 0; + (*lengths) = nullptr; (*count) = 0; - return NULL; + return nullptr; } for (size_t i = 0; i < list.count; i++) @@ -559,11 +559,11 @@ char** x509_utils_get_dns_names(const X509* xcert, size_t* count, size_t** lengt char* x509_utils_get_issuer(const X509* xcert) { - char* issuer = NULL; + char* issuer = nullptr; if (!xcert) { - WLog_ERR(TAG, "Invalid certificate NULL"); - return NULL; + WLog_ERR(TAG, "Invalid certificate nullptr"); + return nullptr; } issuer = crypto_print_name(X509_get_issuer_name(xcert)); if (!issuer) @@ -585,8 +585,8 @@ static int asn1_object_cmp(const ASN1_OBJECT* const* a, const ASN1_OBJECT* const BOOL x509_utils_check_eku(const X509* xcert, int nid) { BOOL ret = FALSE; - STACK_OF(ASN1_OBJECT)* oid_stack = NULL; - ASN1_OBJECT* oid = NULL; + STACK_OF(ASN1_OBJECT)* oid_stack = nullptr; + ASN1_OBJECT* oid = nullptr; if (!xcert) return FALSE; @@ -595,7 +595,7 @@ BOOL x509_utils_check_eku(const X509* xcert, int nid) if (!oid) return FALSE; - oid_stack = X509_get_ext_d2i(xcert, NID_ext_key_usage, NULL, NULL); + oid_stack = X509_get_ext_d2i(xcert, NID_ext_key_usage, nullptr, nullptr); if (!oid_stack) return FALSE; @@ -609,12 +609,12 @@ BOOL x509_utils_check_eku(const X509* xcert, int nid) void x509_utils_print_info(const X509* xcert) { - char* fp = NULL; - char* issuer = NULL; - char* subject = NULL; + char* fp = nullptr; + char* issuer = nullptr; + char* subject = nullptr; subject = x509_utils_get_subject(xcert); issuer = x509_utils_get_issuer(xcert); - fp = (char*)x509_utils_get_hash(xcert, "sha256", NULL); + fp = (char*)x509_utils_get_hash(xcert, "sha256", nullptr); if (!fp) { @@ -638,14 +638,14 @@ out_free_issuer: X509* x509_utils_from_pem(const char* data, size_t len, BOOL fromFile) { - X509* x509 = NULL; - BIO* bio = NULL; + X509* x509 = nullptr; + BIO* bio = nullptr; if (fromFile) bio = BIO_new_file(data, "rb"); else { if (len > INT_MAX) - return NULL; + return nullptr; bio = BIO_new_mem_buf(data, (int)len); } @@ -653,13 +653,13 @@ X509* x509_utils_from_pem(const char* data, size_t len, BOOL fromFile) if (!bio) { WLog_ERR(TAG, "BIO_new failed for certificate"); - return NULL; + return nullptr; } - x509 = PEM_read_bio_X509(bio, NULL, NULL, 0); + x509 = PEM_read_bio_X509(bio, nullptr, nullptr, nullptr); BIO_free_all(bio); if (!x509) - WLog_ERR(TAG, "PEM_read_bio_X509 returned NULL [input length %" PRIuz "]", len); + WLog_ERR(TAG, "PEM_read_bio_X509 returned nullptr [input length %" PRIuz "]", len); return x509; } @@ -712,15 +712,15 @@ static WINPR_MD_TYPE get_rsa_pss_digest(const X509_ALGOR* alg) WINPR_MD_TYPE message_digest = WINPR_MD_NONE; WINPR_MD_TYPE mgf1_digest = WINPR_MD_NONE; int param_type = 0; - const void* param_value = NULL; - const ASN1_STRING* sequence = NULL; - const unsigned char* inp = NULL; - RSA_PSS_PARAMS* params = NULL; - X509_ALGOR* mgf1_digest_alg = NULL; + const void* param_value = nullptr; + const ASN1_STRING* sequence = nullptr; + const unsigned char* inp = nullptr; + RSA_PSS_PARAMS* params = nullptr; + X509_ALGOR* mgf1_digest_alg = nullptr; /* The RSA-PSS digest is encoded in a complex structure, defined in https://www.rfc-editor.org/rfc/rfc4055.html. */ - X509_ALGOR_get0(NULL, ¶m_type, ¶m_value, alg); + X509_ALGOR_get0(nullptr, ¶m_type, ¶m_value, alg); /* param_type and param_value the parameter in ASN1_TYPE form, but split into two parameters. A SEQUENCE is has type V_ASN1_SEQUENCE, and the value is an ASN1_STRING with the encoded @@ -731,30 +731,30 @@ static WINPR_MD_TYPE get_rsa_pss_digest(const X509_ALGOR* alg) /* Decode the structure. */ inp = ASN1_STRING_get0_data(sequence); - params = d2i_RSA_PSS_PARAMS(NULL, &inp, ASN1_STRING_length(sequence)); - if (params == NULL) + params = d2i_RSA_PSS_PARAMS(nullptr, &inp, ASN1_STRING_length(sequence)); + if (params == nullptr) goto end; /* RSA-PSS uses two hash algorithms, a message digest and also an MGF function which is, itself, parameterized by a hash function. Both fields default to SHA-1, so we must also check for the - value being NULL. */ + value being nullptr. */ message_digest = WINPR_MD_SHA1; - if (params->hashAlgorithm != NULL) + if (params->hashAlgorithm != nullptr) { - const ASN1_OBJECT* obj = NULL; - X509_ALGOR_get0(&obj, NULL, NULL, params->hashAlgorithm); + const ASN1_OBJECT* obj = nullptr; + X509_ALGOR_get0(&obj, nullptr, nullptr, params->hashAlgorithm); message_digest = hash_nid_to_winpr(OBJ_obj2nid(obj)); if (message_digest == WINPR_MD_NONE) goto end; } mgf1_digest = WINPR_MD_SHA1; - if (params->maskGenAlgorithm != NULL) + if (params->maskGenAlgorithm != nullptr) { - const ASN1_OBJECT* obj = NULL; + const ASN1_OBJECT* obj = nullptr; int mgf_param_type = 0; - const void* mgf_param_value = NULL; - const ASN1_STRING* mgf_param_sequence = NULL; + const void* mgf_param_value = nullptr; + const ASN1_STRING* mgf_param_sequence = nullptr; /* First, check this is MGF-1, the only one ever defined. */ X509_ALGOR_get0(&obj, &mgf_param_type, &mgf_param_value, params->maskGenAlgorithm); if (OBJ_obj2nid(obj) != NID_mgf1) @@ -765,12 +765,12 @@ static WINPR_MD_TYPE get_rsa_pss_digest(const X509_ALGOR* alg) goto end; mgf_param_sequence = mgf_param_value; inp = ASN1_STRING_get0_data(mgf_param_sequence); - mgf1_digest_alg = d2i_X509_ALGOR(NULL, &inp, ASN1_STRING_length(mgf_param_sequence)); - if (mgf1_digest_alg == NULL) + mgf1_digest_alg = d2i_X509_ALGOR(nullptr, &inp, ASN1_STRING_length(mgf_param_sequence)); + if (mgf1_digest_alg == nullptr) goto end; /* Finally, extract the digest. */ - X509_ALGOR_get0(&obj, NULL, NULL, mgf1_digest_alg); + X509_ALGOR_get0(&obj, nullptr, nullptr, mgf1_digest_alg); mgf1_digest = hash_nid_to_winpr(OBJ_obj2nid(obj)); if (mgf1_digest == WINPR_MD_NONE) goto end; @@ -797,13 +797,13 @@ WINPR_MD_TYPE x509_utils_get_signature_alg(const X509* xcert) if (nid == NID_rsassaPss) { - const X509_ALGOR* alg = NULL; - X509_get0_signature(NULL, &alg, xcert); + const X509_ALGOR* alg = nullptr; + X509_get0_signature(nullptr, &alg, xcert); return get_rsa_pss_digest(alg); } int hash_nid = 0; - if (OBJ_find_sigid_algs(nid, &hash_nid, NULL) != 1) + if (OBJ_find_sigid_algs(nid, &hash_nid, nullptr) != 1) return WINPR_MD_NONE; return hash_nid_to_winpr(hash_nid); @@ -812,25 +812,25 @@ WINPR_MD_TYPE x509_utils_get_signature_alg(const X509* xcert) char* x509_utils_get_common_name(const X509* xcert, size_t* plength) { X509_NAME* subject_name = X509_get_subject_name(xcert); - if (subject_name == NULL) - return NULL; + if (subject_name == nullptr) + return nullptr; const int index = X509_NAME_get_index_by_NID(subject_name, NID_commonName, -1); if (index < 0) - return NULL; + return nullptr; const X509_NAME_ENTRY* entry = X509_NAME_get_entry(subject_name, index); - if (entry == NULL) - return NULL; + if (entry == nullptr) + return nullptr; const ASN1_STRING* entry_data = X509_NAME_ENTRY_get_data(entry); - if (entry_data == NULL) - return NULL; + if (entry_data == nullptr) + return nullptr; - BYTE* common_name_raw = NULL; + BYTE* common_name_raw = nullptr; const int length = ASN1_STRING_to_UTF8(&common_name_raw, entry_data); if (length < 0) - return NULL; + return nullptr; if (plength) *plength = (size_t)length; @@ -863,16 +863,16 @@ static int verify_cb(int ok, X509_STORE_CTX* csc) BOOL x509_utils_verify(X509* xcert, STACK_OF(X509) * chain, const char* certificate_store_path) { const int purposes[3] = { X509_PURPOSE_SSL_SERVER, X509_PURPOSE_SSL_CLIENT, X509_PURPOSE_ANY }; - X509_STORE_CTX* csc = NULL; + X509_STORE_CTX* csc = nullptr; BOOL status = FALSE; - X509_LOOKUP* lookup = NULL; + X509_LOOKUP* lookup = nullptr; if (!xcert) return FALSE; X509_STORE* cert_ctx = X509_STORE_new(); - if (cert_ctx == NULL) + if (cert_ctx == nullptr) goto end; #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) @@ -880,7 +880,7 @@ BOOL x509_utils_verify(X509* xcert, STACK_OF(X509) * chain, const char* certific #else OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, - NULL); + nullptr); #endif if (X509_STORE_set_default_paths(cert_ctx) != 1) @@ -888,12 +888,12 @@ BOOL x509_utils_verify(X509* xcert, STACK_OF(X509) * chain, const char* certific lookup = X509_STORE_add_lookup(cert_ctx, X509_LOOKUP_hash_dir()); - if (lookup == NULL) + if (lookup == nullptr) goto end; - X509_LOOKUP_add_dir(lookup, NULL, X509_FILETYPE_DEFAULT); + X509_LOOKUP_add_dir(lookup, nullptr, X509_FILETYPE_DEFAULT); - if (certificate_store_path != NULL) + if (certificate_store_path != nullptr) { X509_LOOKUP_add_dir(lookup, certificate_store_path, X509_FILETYPE_PEM); } @@ -907,7 +907,7 @@ BOOL x509_utils_verify(X509* xcert, STACK_OF(X509) * chain, const char* certific int purpose = purposes[i]; csc = X509_STORE_CTX_new(); - if (csc == NULL) + if (csc == nullptr) goto skip; if (!X509_STORE_CTX_init(csc, cert_ctx, xcert, chain)) goto skip; diff --git a/libfreerdp/emu/scard/smartcard_emulate.c b/libfreerdp/emu/scard/smartcard_emulate.c index 5f0666ead..d31877976 100644 --- a/libfreerdp/emu/scard/smartcard_emulate.c +++ b/libfreerdp/emu/scard/smartcard_emulate.c @@ -52,7 +52,7 @@ static char* card_id_and_name_a(const UUID* CardIdentifier, LPCSTR LookupName) size_t len = strlen(LookupName) + 34; char* id = malloc(len); if (!id) - return NULL; + return nullptr; (void)snprintf(id, len, "%08X%04X%04X%02X%02X%02X%02X%02X%02X%02X%02X\\%s", CardIdentifier->Data1, CardIdentifier->Data2, CardIdentifier->Data3, @@ -64,10 +64,10 @@ static char* card_id_and_name_a(const UUID* CardIdentifier, LPCSTR LookupName) static char* card_id_and_name_w(const UUID* CardIdentifier, LPCWSTR LookupName) { - char* res = NULL; - char* tmp = ConvertWCharToUtf8Alloc(LookupName, NULL); + char* res = nullptr; + char* tmp = ConvertWCharToUtf8Alloc(LookupName, nullptr); if (!tmp) - return NULL; + return nullptr; res = card_id_and_name_a(CardIdentifier, tmp); free(tmp); return res; @@ -156,7 +156,7 @@ static BOOL scard_status_transition(SCardContext* context) memcpy(reader->rgbAtr, ATR, sizeof(ATR)); } { - InitOnceExecuteOnce(&g_ReaderNameWGuard, g_ReaderNameWInit, NULL, NULL); + InitOnceExecuteOnce(&g_ReaderNameWGuard, g_ReaderNameWInit, nullptr, nullptr); SCARD_READERSTATEW* reader = &context->readerStateW[0]; reader->szReader = g_ReaderNameW; reader->dwEventState = SCARD_STATE_PRESENT; @@ -211,7 +211,7 @@ static SCardContext* scard_context_new(void) { SCardContext* ctx = calloc(1, sizeof(SCardContext)); if (!ctx) - return NULL; + return nullptr; ctx->strings = ArrayList_New(FALSE); if (!ctx->strings) @@ -239,7 +239,7 @@ static SCardContext* scard_context_new(void) return ctx; fail: scard_context_free(ctx); - return NULL; + return nullptr; } static void scard_handle_free(void* handle) @@ -256,7 +256,7 @@ static void scard_handle_free(void* handle) static SCardHandle* scard_handle_new(SmartcardEmulationContext* smartcard, SCARDCONTEXT context, const void* name, BOOL unicode) { - SCardHandle* hdl = NULL; + SCardHandle* hdl = nullptr; WINPR_ASSERT(smartcard); @@ -265,7 +265,7 @@ static SCardHandle* scard_handle_new(SmartcardEmulationContext* smartcard, SCARD goto fail; /* ATTENTION: Do not use _strdup or _wcsdup! - * These strings are required to be double NULL terminated! + * These strings are required to be double nullptr terminated! */ if (unicode) { @@ -311,12 +311,12 @@ static SCardHandle* scard_handle_new(SmartcardEmulationContext* smartcard, SCARD fail: scard_handle_free(hdl); - return NULL; + return nullptr; } static LONG scard_handle_valid(SmartcardEmulationContext* smartcard, SCARDHANDLE handle) { - SCardHandle* ctx = NULL; + SCardHandle* ctx = nullptr; WINPR_ASSERT(smartcard); @@ -330,7 +330,7 @@ static LONG scard_handle_valid(SmartcardEmulationContext* smartcard, SCARDHANDLE static LONG scard_reader_name_valid_a(SmartcardEmulationContext* smartcard, SCARDCONTEXT context, const char* name) { - SCardContext* ctx = NULL; + SCardContext* ctx = nullptr; WINPR_ASSERT(smartcard); ctx = HashTable_GetItemValue(smartcard->contexts, (const void*)context); @@ -351,7 +351,7 @@ static LONG scard_reader_name_valid_a(SmartcardEmulationContext* smartcard, SCAR static LONG scard_reader_name_valid_w(SmartcardEmulationContext* smartcard, SCARDCONTEXT context, const WCHAR* name) { - SCardContext* ctx = NULL; + SCardContext* ctx = nullptr; WINPR_ASSERT(smartcard); ctx = HashTable_GetItemValue(smartcard->contexts, (const void*)context); @@ -378,7 +378,7 @@ LONG WINAPI Emulate_SCardEstablishContext(SmartcardEmulationContext* smartcard, LPSCARDCONTEXT phContext) { LONG status = SCARD_E_NO_MEMORY; - SCardContext* ctx = NULL; + SCardContext* ctx = nullptr; WINPR_ASSERT(smartcard); @@ -416,7 +416,7 @@ LONG WINAPI Emulate_SCardEstablishContext(SmartcardEmulationContext* smartcard, LONG WINAPI Emulate_SCardReleaseContext(SmartcardEmulationContext* smartcard, SCARDCONTEXT hContext) { LONG status = 0; - SCardContext* value = NULL; + SCardContext* value = nullptr; WINPR_ASSERT(smartcard); @@ -562,7 +562,7 @@ LONG WINAPI Emulate_SCardListReadersW(SmartcardEmulationContext* smartcard, SCAR WINPR_UNUSED(mszGroups); /* Not required */ - InitOnceExecuteOnce(&g_ReaderNameWGuard, g_ReaderNameWInit, NULL, NULL); + InitOnceExecuteOnce(&g_ReaderNameWGuard, g_ReaderNameWInit, nullptr, nullptr); if (SCARD_S_SUCCESS == status) { SCardContext* value = HashTable_GetItemValue(smartcard->contexts, (const void*)hContext); @@ -1246,7 +1246,7 @@ LONG WINAPI Emulate_SCardFreeMemory(SmartcardEmulationContext* smartcard, SCARDC HANDLE WINAPI Emulate_SCardAccessStartedEvent(SmartcardEmulationContext* smartcard) { - HANDLE hEvent = NULL; + HANDLE hEvent = nullptr; WINPR_ASSERT(smartcard); @@ -1558,8 +1558,8 @@ LONG WINAPI Emulate_SCardCancel(SmartcardEmulationContext* smartcard, SCARDCONTE SCardHandle* find_reader(SmartcardEmulationContext* smartcard, const void* szReader, BOOL unicode) { - SCardHandle* hdl = NULL; - UINT_PTR* keys = NULL; + SCardHandle* hdl = nullptr; + UINT_PTR* keys = nullptr; size_t count = 0; WINPR_ASSERT(smartcard); @@ -1587,13 +1587,13 @@ static SCardHandle* reader2handle(SmartcardEmulationContext* smartcard, SCARDCON SCARDHANDLE* phCard, DWORD dwPreferredProtocols, LPDWORD pdwActiveProtocol) { - SCardHandle* hdl = NULL; + SCardHandle* hdl = nullptr; WINPR_ASSERT(phCard); *phCard = 0; if (Emulate_SCardIsValidContext(smartcard, hContext) != SCARD_S_SUCCESS) - return NULL; + return nullptr; hdl = scard_handle_new(smartcard, hContext, szReader, unicode); if (hdl) @@ -1605,7 +1605,7 @@ static SCardHandle* reader2handle(SmartcardEmulationContext* smartcard, SCARDCON if (!HashTable_Insert(smartcard->handles, (const void*)hdl->card, hdl)) { scard_handle_free(hdl); - hdl = NULL; + hdl = nullptr; } else { @@ -1614,7 +1614,7 @@ static SCardHandle* reader2handle(SmartcardEmulationContext* smartcard, SCARDCON if ((hdl->dwActiveProtocol & dwPreferredProtocols) == 0) { scard_handle_free(hdl); - hdl = NULL; + hdl = nullptr; } else *pdwActiveProtocol = hdl->dwActiveProtocol; @@ -1886,7 +1886,7 @@ LONG WINAPI Emulate_SCardStatusA(SmartcardEmulationContext* smartcard, SCARDHAND if (status == SCARD_S_SUCCESS) { - SCardContext* ctx = NULL; + SCardContext* ctx = nullptr; SCardHandle* hdl = HashTable_GetItemValue(smartcard->handles, (const void*)hCard); WINPR_ASSERT(hdl); @@ -1935,7 +1935,7 @@ LONG WINAPI Emulate_SCardStatusW(SmartcardEmulationContext* smartcard, SCARDHAND if (status == SCARD_S_SUCCESS) { - SCardContext* ctx = NULL; + SCardContext* ctx = nullptr; SCardHandle* hdl = HashTable_GetItemValue(smartcard->handles, (const void*)hCard); WINPR_ASSERT(hdl); @@ -1987,7 +1987,7 @@ LONG WINAPI Emulate_SCardTransmit(SmartcardEmulationContext* smartcard, SCARDHAN if (status == SCARD_S_SUCCESS) { - BYTE* response = NULL; + BYTE* response = nullptr; DWORD responseSize = 0; SCardHandle* hdl = HashTable_GetItemValue(smartcard->handles, (const void*)hCard); WINPR_ASSERT(hdl); @@ -2246,7 +2246,7 @@ LONG WINAPI Emulate_SCardReadCacheA(SmartcardEmulationContext* smartcard, SCARDC if (status == SCARD_S_SUCCESS) { - SCardCacheItem* data = NULL; + SCardCacheItem* data = nullptr; SCardContext* value = HashTable_GetItemValue(smartcard->contexts, (const void*)hContext); WINPR_ASSERT(value); /* Must be valid after Emulate_SCardIsValidContext */ @@ -2290,7 +2290,7 @@ LONG WINAPI Emulate_SCardReadCacheW(SmartcardEmulationContext* smartcard, SCARDC if (status == SCARD_S_SUCCESS) { - SCardCacheItem* data = NULL; + SCardCacheItem* data = nullptr; SCardContext* value = HashTable_GetItemValue(smartcard->contexts, (const void*)hContext); WINPR_ASSERT(value); /* Must be valid after Emulate_SCardIsValidContext */ @@ -2316,7 +2316,7 @@ static LONG insert_data(wHashTable* table, DWORD FreshnessCounter, const char* k const PBYTE Data, DWORD DataLen) { BOOL rc = 0; - SCardCacheItem* item = NULL; + SCardCacheItem* item = nullptr; WINPR_ASSERT(table); WINPR_ASSERT(key); @@ -2690,7 +2690,7 @@ static BOOL handle_equals(const void* pva, const void* pvb) SmartcardEmulationContext* Emulate_New(const rdpSettings* settings) { - SmartcardEmulationContext* smartcard = NULL; + SmartcardEmulationContext* smartcard = nullptr; WINPR_ASSERT(settings); @@ -2747,7 +2747,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC Emulate_Free(smartcard); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void Emulate_Free(SmartcardEmulationContext* context) @@ -2763,10 +2763,10 @@ void Emulate_Free(SmartcardEmulationContext* context) BOOL Emulate_IsConfigured(SmartcardEmulationContext* context) { BOOL rc = FALSE; - vgidsContext* vgids = NULL; - const char* pem = NULL; - const char* key = NULL; - const char* pin = NULL; + vgidsContext* vgids = nullptr; + const char* pem = nullptr; + const char* key = nullptr; + const char* pin = nullptr; WINPR_ASSERT(context); diff --git a/libfreerdp/emu/scard/smartcard_virtual_gids.c b/libfreerdp/emu/scard/smartcard_virtual_gids.c index 04b96d1db..75a0c226a 100644 --- a/libfreerdp/emu/scard/smartcard_virtual_gids.c +++ b/libfreerdp/emu/scard/smartcard_virtual_gids.c @@ -273,7 +273,7 @@ static vgidsEF* vgids_ef_new(vgidsContext* ctx, USHORT id) vgidsEF* ef = calloc(1, sizeof(vgidsEF)); ef->id = id; - ef->data = Stream_New(NULL, 1024); + ef->data = Stream_New(nullptr, 1024); if (!ef->data) { WLog_ERR(TAG, "Failed to create file data stream"); @@ -291,7 +291,7 @@ static vgidsEF* vgids_ef_new(vgidsContext* ctx, USHORT id) create_failed: vgids_ef_free(ef); - return NULL; + return nullptr; } static BOOL vgids_write_tlv(wStream* s, UINT16 tag, const void* data, size_t dataSize) @@ -383,7 +383,7 @@ static BOOL vgids_ef_read_do(vgidsEF* ef, UINT16 doID, BYTE** data, DWORD* dataS if (nextDOID == doID) { - BYTE* outData = NULL; + BYTE* outData = nullptr; /* Include Tag and length in result */ doSize += (UINT16)(Stream_GetPosition(ef->data) - curPos); @@ -454,8 +454,8 @@ static BOOL vgids_prepare_certificate(const rdpCertificate* cert, BYTE** kxc, DW ZLIB compressed cert */ uLongf destSize = 0; - wStream* s = NULL; - BYTE* comprData = NULL; + wStream* s = nullptr; + BYTE* comprData = nullptr; WINPR_ASSERT(cert); @@ -484,7 +484,7 @@ static BOOL vgids_prepare_certificate(const rdpCertificate* cert, BYTE** kxc, DW } /* Write container data */ - s = Stream_New(NULL, destSize + 4); + s = Stream_New(nullptr, destSize + 4); Stream_Write_UINT16(s, 0x0001); Stream_Write_UINT16(s, WINPR_ASSERTING_INT_CAST(uint16_t, certSize)); Stream_Write(s, comprData, destSize); @@ -540,7 +540,7 @@ static BOOL vgids_prepare_keymap(vgidsContext* context, BYTE** outData, DWORD* o BYTE unknown (count?): 0x01 Array of vgidsKeymapRecord */ - BYTE* data = NULL; + BYTE* data = nullptr; vgidsKeymapRecord record = { 1, /* state */ 0, /* algo */ @@ -643,7 +643,7 @@ static BOOL vgids_create_response(UINT16 status, const BYTE* answer, DWORD answe static BOOL vgids_read_do_fkt(void* data, size_t index, va_list ap) { - BYTE* response = NULL; + BYTE* response = nullptr; DWORD responseSize = 0; vgidsEF* file = (vgidsEF*)data; vgidsContext* context = va_arg(ap, vgidsContext*); @@ -672,13 +672,13 @@ static void vgids_read_do(vgidsContext* context, UINT16 efID, UINT16 doID) static void vgids_reset_context_response(vgidsContext* context) { Stream_Free(context->responseData, TRUE); - context->responseData = NULL; + context->responseData = nullptr; } static void vgids_reset_context_command_data(vgidsContext* context) { Stream_Free(context->commandData, TRUE); - context->commandData = NULL; + context->commandData = nullptr; } static BOOL vgids_ins_select(vgidsContext* context, wStream* s, BYTE** response, @@ -688,12 +688,12 @@ static BOOL vgids_ins_select(vgidsContext* context, wStream* s, BYTE** response, BYTE p2 = 0; BYTE lc = 0; DWORD resultDataSize = 0; - const BYTE* resultData = NULL; + const BYTE* resultData = nullptr; UINT16 status = ISO_STATUS_SUCCESS; /* The only select operations performed are either select by AID or select 3FFF (return * information about the currently selected DF) */ - if (!vgids_parse_apdu_header(s, NULL, NULL, &p1, &p2, &lc, NULL)) + if (!vgids_parse_apdu_header(s, nullptr, nullptr, &p1, &p2, &lc, nullptr)) return FALSE; /* Check P1 for selection mode */ @@ -803,8 +803,8 @@ static UINT16 vgids_handle_chained_response(vgidsContext* context, const BYTE** static BOOL vgids_get_public_key(vgidsContext* context, UINT16 doTag) { BOOL rc = FALSE; - wStream* pubKey = NULL; - wStream* response = NULL; + wStream* pubKey = nullptr; + wStream* response = nullptr; WINPR_ASSERT(context); @@ -818,14 +818,14 @@ static BOOL vgids_get_public_key(vgidsContext* context, UINT16 doTag) if (!n || !e) goto handle_error; - pubKey = Stream_New(NULL, nSize + eSize + 0x10); + pubKey = Stream_New(nullptr, nSize + eSize + 0x10); if (!pubKey) { WLog_ERR(TAG, "Failed to allocate public key stream"); goto handle_error; } - response = Stream_New(NULL, Stream_Capacity(pubKey) + 0x10); + response = Stream_New(nullptr, Stream_Capacity(pubKey) + 0x10); if (!response) { WLog_ERR(TAG, "Failed to allocate response stream"); @@ -846,7 +846,7 @@ static BOOL vgids_get_public_key(vgidsContext* context, UINT16 doTag) /* set response data */ Stream_SetPosition(response, 0); context->responseData = response; - response = NULL; + response = nullptr; rc = TRUE; handle_error: @@ -866,14 +866,14 @@ static BOOL vgids_ins_getdata(vgidsContext* context, wStream* s, BYTE** response BYTE p2 = 0; BYTE lc = 0; DWORD resultDataSize = 0; - const BYTE* resultData = NULL; + const BYTE* resultData = nullptr; UINT16 status = ISO_STATUS_SUCCESS; /* GetData is called a lot! - To retrieve DOs from files - To retrieve public key information */ - if (!vgids_parse_apdu_header(s, NULL, NULL, &p1, &p2, &lc, NULL)) + if (!vgids_parse_apdu_header(s, nullptr, nullptr, &p1, &p2, &lc, nullptr)) return FALSE; /* free any previous queried data */ @@ -984,14 +984,14 @@ static BOOL vgids_ins_manage_security_environment(vgidsContext* context, wStream BYTE p2 = 0; BYTE lc = 0; DWORD resultDataSize = 0; - const BYTE* resultData = NULL; + const BYTE* resultData = nullptr; UINT16 status = ISO_STATUS_SUCCESS; vgids_reset_context_command_data(context); vgids_reset_context_response(context); /* Manage security environment prepares the card for performing crypto operations. */ - if (!vgids_parse_apdu_header(s, NULL, NULL, &p1, &p2, &lc, NULL)) + if (!vgids_parse_apdu_header(s, nullptr, nullptr, &p1, &p2, &lc, nullptr)) return FALSE; /* Check APDU params */ @@ -1043,7 +1043,7 @@ static BOOL vgids_perform_digital_signature(vgidsContext* context) { size_t sigSize = 0; size_t msgSize = 0; - EVP_PKEY_CTX* ctx = NULL; + EVP_PKEY_CTX* ctx = nullptr; EVP_PKEY* pk = freerdp_key_get_evp_pkey(context->privateKey); const vgidsDigestInfoMap gidsDigestInfo[VGIDS_MAX_DIGEST_INFO] = { { g_PKCS1_SHA1, sizeof(g_PKCS1_SHA1), EVP_sha1() }, @@ -1081,7 +1081,7 @@ static BOOL vgids_perform_digital_signature(vgidsContext* context) msgSize = Stream_GetRemainingLength(context->commandData); /* setup signing context */ - ctx = EVP_PKEY_CTX_new(pk, NULL); + ctx = EVP_PKEY_CTX_new(pk, nullptr); if (!ctx) { WLog_ERR(TAG, "Failed to create signing context"); @@ -1111,14 +1111,14 @@ static BOOL vgids_perform_digital_signature(vgidsContext* context) } /* Determine buffer length */ - if (EVP_PKEY_sign(ctx, NULL, &sigSize, Stream_Pointer(context->commandData), msgSize) <= - 0) + if (EVP_PKEY_sign(ctx, nullptr, &sigSize, Stream_Pointer(context->commandData), + msgSize) <= 0) { WLog_ERR(TAG, "Failed to determine signature size"); goto sign_failed; } - context->responseData = Stream_New(NULL, sigSize); + context->responseData = Stream_New(nullptr, sigSize); if (!context->responseData) { WLog_ERR(TAG, "Failed to allocate signing buffer"); @@ -1153,7 +1153,7 @@ sign_failed: static BOOL vgids_perform_decrypt(vgidsContext* context) { - EVP_PKEY_CTX* ctx = NULL; + EVP_PKEY_CTX* ctx = nullptr; BOOL rc = FALSE; int res = 0; int padding = RSA_NO_PADDING; @@ -1170,7 +1170,7 @@ static BOOL vgids_perform_decrypt(vgidsContext* context) EVP_PKEY* pkey = freerdp_key_get_evp_pkey(context->privateKey); if (!pkey) goto decrypt_failed; - ctx = EVP_PKEY_CTX_new(pkey, NULL); + ctx = EVP_PKEY_CTX_new(pkey, nullptr); if (!ctx) goto decrypt_failed; if (EVP_PKEY_decrypt_init(ctx) <= 0) @@ -1182,7 +1182,7 @@ static BOOL vgids_perform_decrypt(vgidsContext* context) { const size_t inlen = Stream_Length(context->commandData); size_t outlen = 0; - res = EVP_PKEY_decrypt(ctx, NULL, &outlen, Stream_Buffer(context->commandData), inlen); + res = EVP_PKEY_decrypt(ctx, nullptr, &outlen, Stream_Buffer(context->commandData), inlen); if (res < 0) { WLog_ERR(TAG, "Failed to decrypt data"); @@ -1190,7 +1190,7 @@ static BOOL vgids_perform_decrypt(vgidsContext* context) } /* Prepare output buffer */ - context->responseData = Stream_New(NULL, outlen); + context->responseData = Stream_New(nullptr, outlen); if (!context->responseData) { @@ -1229,11 +1229,11 @@ static BOOL vgids_ins_perform_security_operation(vgidsContext* context, wStream* BYTE p2 = 0; BYTE lc = 0; DWORD resultDataSize = 0; - const BYTE* resultData = NULL; + const BYTE* resultData = nullptr; UINT16 status = ISO_STATUS_SUCCESS; /* Perform security operation */ - if (!vgids_parse_apdu_header(s, &cla, NULL, &p1, &p2, &lc, NULL)) + if (!vgids_parse_apdu_header(s, &cla, nullptr, &p1, &p2, &lc, nullptr)) return FALSE; if (lc == 0) @@ -1259,7 +1259,7 @@ static BOOL vgids_ins_perform_security_operation(vgidsContext* context, wStream* /* Append the data to the context command buffer (PSO might chain command data) */ if (!context->commandData) { - context->commandData = Stream_New(NULL, lc); + context->commandData = Stream_New(nullptr, lc); if (!context->commandData) return FALSE; } @@ -1319,7 +1319,7 @@ static BOOL vgids_ins_getresponse(vgidsContext* context, wStream* s, BYTE** resp BYTE p2 = 0; BYTE le = 0; DWORD resultDataSize = 0; - const BYTE* resultData = NULL; + const BYTE* resultData = nullptr; DWORD expectedLen = 0; DWORD remainingSize = 0; UINT16 status = ISO_STATUS_SUCCESS; @@ -1332,7 +1332,7 @@ static BOOL vgids_ins_getresponse(vgidsContext* context, wStream* s, BYTE** resp goto create_response; } - if (!vgids_parse_apdu_header(s, NULL, NULL, &p1, &p2, NULL, &le)) + if (!vgids_parse_apdu_header(s, nullptr, nullptr, &p1, &p2, nullptr, &le)) return FALSE; /* Check APDU params */ @@ -1380,7 +1380,7 @@ static BOOL vgids_ins_verify(vgidsContext* context, wStream* s, BYTE** response, char pin[VGIDS_MAX_PIN_SIZE + 1] = WINPR_C_ARRAY_INIT; /* Verify is always called for the application password (PIN) P2=0x80 */ - if (!vgids_parse_apdu_header(s, NULL, &ins, &p1, &p2, NULL, NULL)) + if (!vgids_parse_apdu_header(s, nullptr, &ins, &p1, &p2, nullptr, nullptr)) return FALSE; /* Check APDU params */ @@ -1435,12 +1435,12 @@ static BOOL vgids_ins_verify(vgidsContext* context, wStream* s, BYTE** response, } create_response: - return vgids_create_response(status, NULL, 0, response, responseSize); + return vgids_create_response(status, nullptr, 0, response, responseSize); } vgidsContext* vgids_new(void) { - wObject* obj = NULL; + wObject* obj = nullptr; vgidsContext* ctx = calloc(1, sizeof(vgidsContext)); ctx->files = ArrayList_New(FALSE); @@ -1457,7 +1457,7 @@ vgidsContext* vgids_new(void) create_failed: vgids_free(ctx); - return NULL; + return nullptr; } BOOL vgids_init(vgidsContext* ctx, const char* cert, const char* privateKey, const char* pin) @@ -1466,12 +1466,12 @@ BOOL vgids_init(vgidsContext* ctx, const char* cert, const char* privateKey, con DWORD keymapSize = 0; DWORD fsTableSize = 0; BOOL rc = FALSE; - BYTE* kxc = NULL; - BYTE* keymap = NULL; - BYTE* fsTable = NULL; - vgidsEF* masterEF = NULL; - vgidsEF* cardidEF = NULL; - vgidsEF* commonEF = NULL; + BYTE* kxc = nullptr; + BYTE* keymap = nullptr; + BYTE* fsTable = nullptr; + vgidsEF* masterEF = nullptr; + vgidsEF* cardidEF = nullptr; + vgidsEF* commonEF = nullptr; BYTE cardid[VGIDS_CARDID_SIZE] = WINPR_C_ARRAY_INIT; vgidsContainerMapEntry cmrec = { { 'P', 'r', 'i', 'v', 'a', 't', 'e', ' ', 'K', 'e', 'y', ' ', '0', '0' }, @@ -1492,7 +1492,7 @@ BOOL vgids_init(vgidsContext* ctx, const char* cert, const char* privateKey, con /* Check params */ if (!cert || !privateKey || !pin) { - WLog_DBG(TAG, "Passed invalid NULL argument: cert=%p, privateKey=%p, pin=%p", + WLog_DBG(TAG, "Passed invalid nullptr argument: cert=%p, privateKey=%p, pin=%p", WINPR_CXX_COMPAT_CAST(const void*, cert), WINPR_CXX_COMPAT_CAST(const void*, privateKey), WINPR_CXX_COMPAT_CAST(const void*, pin)); @@ -1504,7 +1504,7 @@ BOOL vgids_init(vgidsContext* ctx, const char* cert, const char* privateKey, con if (!ctx->certificate) goto init_failed; - ctx->privateKey = freerdp_key_new_from_pem_enc(privateKey, NULL); + ctx->privateKey = freerdp_key_new_from_pem_enc(privateKey, nullptr); if (!ctx->privateKey) goto init_failed; @@ -1594,7 +1594,7 @@ BOOL vgids_process_apdu(vgidsContext* context, const BYTE* data, DWORD dataSize, /* Check params */ if (!context || !data || !response || !responseSize) { - WLog_ERR(TAG, "Invalid NULL pointer passed"); + WLog_ERR(TAG, "Invalid nullptr pointer passed"); return FALSE; } @@ -1627,7 +1627,7 @@ BOOL vgids_process_apdu(vgidsContext* context, const BYTE* data, DWORD dataSize, } /* return command not allowed */ - return vgids_create_response(ISO_STATUS_COMMANDNOTALLOWED, NULL, 0, response, responseSize); + return vgids_create_response(ISO_STATUS_COMMANDNOTALLOWED, nullptr, 0, response, responseSize); } void vgids_free(vgidsContext* context) diff --git a/libfreerdp/gdi/bitmap.c b/libfreerdp/gdi/bitmap.c index 4b0804d1e..cf4305eb1 100644 --- a/libfreerdp/gdi/bitmap.c +++ b/libfreerdp/gdi/bitmap.c @@ -108,7 +108,7 @@ HGDI_BITMAP gdi_CreateBitmap(UINT32 nWidth, UINT32 nHeight, UINT32 format, BYTE* * @param nHeight height * @param format the color format used * @param data pixel buffer - * @param fkt_free The function used for deallocation of the buffer, NULL for none. + * @param fkt_free The function used for deallocation of the buffer, nullptr for none. * @return new bitmap */ @@ -118,7 +118,7 @@ HGDI_BITMAP gdi_CreateBitmapEx(UINT32 nWidth, UINT32 nHeight, UINT32 format, UIN HGDI_BITMAP hBitmap = (HGDI_BITMAP)calloc(1, sizeof(GDI_BITMAP)); if (!hBitmap) - return NULL; + return nullptr; hBitmap->objectType = GDIOBJECT_BITMAP; hBitmap->format = format; @@ -151,7 +151,7 @@ HGDI_BITMAP gdi_CreateCompatibleBitmap(HGDI_DC hdc, UINT32 nWidth, UINT32 nHeigh HGDI_BITMAP hBitmap = (HGDI_BITMAP)calloc(1, sizeof(GDI_BITMAP)); if (!hBitmap) - return NULL; + return nullptr; hBitmap->objectType = GDIOBJECT_BITMAP; hBitmap->format = hdc->format; @@ -168,7 +168,7 @@ HGDI_BITMAP gdi_CreateCompatibleBitmap(HGDI_DC hdc, UINT32 nWidth, UINT32 nHeigh if (!hBitmap->data) { free(hBitmap); - return NULL; + return nullptr; } /* Initialize with 0xff */ @@ -355,7 +355,7 @@ static inline BOOL BitBlt_write(HGDI_DC hdcDest, HGDI_DC hdcSrc, INT32 nXDest, I static BOOL adjust_src_coordinates(HGDI_DC hdcSrc, INT32 nWidth, INT32 nHeight, INT32* px, INT32* py) { - HGDI_BITMAP hSrcBmp = NULL; + HGDI_BITMAP hSrcBmp = nullptr; INT32 nXSrc = 0; INT32 nYSrc = 0; @@ -398,7 +398,7 @@ static BOOL adjust_src_coordinates(HGDI_DC hdcSrc, INT32 nWidth, INT32 nHeight, static BOOL adjust_src_dst_coordinates(HGDI_DC hdcDest, INT32* pnXSrc, INT32* pnYSrc, INT32* pnXDst, INT32* pnYDst, INT32* pnWidth, INT32* pnHeight) { - HGDI_BITMAP hDstBmp = NULL; + HGDI_BITMAP hDstBmp = nullptr; volatile INT32 diffX = 0; volatile INT32 diffY = 0; volatile INT32 nXSrc = 0; @@ -591,8 +591,8 @@ static BOOL BitBlt_process(HGDI_DC hdcDest, INT32 nXDest, INT32 nYDest, INT32 nW BOOL gdi_BitBlt(HGDI_DC hdcDest, INT32 nXDest, INT32 nYDest, INT32 nWidth, INT32 nHeight, HGDI_DC hdcSrc, INT32 nXSrc, INT32 nYSrc, DWORD rop, const gdiPalette* palette) { - HGDI_BITMAP hSrcBmp = NULL; - HGDI_BITMAP hDstBmp = NULL; + HGDI_BITMAP hSrcBmp = nullptr; + HGDI_BITMAP hDstBmp = nullptr; if (!hdcDest) return FALSE; diff --git a/libfreerdp/gdi/brush.c b/libfreerdp/gdi/brush.c index d1edef9a1..2853129d3 100644 --- a/libfreerdp/gdi/brush.c +++ b/libfreerdp/gdi/brush.c @@ -826,7 +826,7 @@ HGDI_BRUSH gdi_CreateSolidBrush(UINT32 crColor) HGDI_BRUSH hBrush = (HGDI_BRUSH)calloc(1, sizeof(GDI_BRUSH)); if (!hBrush) - return NULL; + return nullptr; hBrush->objectType = GDIOBJECT_BRUSH; hBrush->style = GDI_BS_SOLID; @@ -845,7 +845,7 @@ HGDI_BRUSH gdi_CreatePatternBrush(HGDI_BITMAP hbmp) HGDI_BRUSH hBrush = (HGDI_BRUSH)calloc(1, sizeof(GDI_BRUSH)); if (!hBrush) - return NULL; + return nullptr; hBrush->objectType = GDIOBJECT_BRUSH; hBrush->style = GDI_BS_PATTERN; @@ -858,7 +858,7 @@ HGDI_BRUSH gdi_CreateHatchBrush(HGDI_BITMAP hbmp) HGDI_BRUSH hBrush = (HGDI_BRUSH)calloc(1, sizeof(GDI_BRUSH)); if (!hBrush) - return NULL; + return nullptr; hBrush->objectType = GDIOBJECT_BRUSH; hBrush->style = GDI_BS_HATCHED; diff --git a/libfreerdp/gdi/clipping.c b/libfreerdp/gdi/clipping.c index 2a2b539f7..3cbed495b 100644 --- a/libfreerdp/gdi/clipping.c +++ b/libfreerdp/gdi/clipping.c @@ -85,12 +85,12 @@ BOOL gdi_ClipCoords(HGDI_DC hdc, INT32* x, INT32* y, INT32* w, INT32* h, INT32* int dy = 0; BOOL draw = TRUE; - if (hdc == NULL) + if (hdc == nullptr) return FALSE; HGDI_BITMAP hBmp = (HGDI_BITMAP)hdc->selectedObject; - if (hBmp != NULL) + if (hBmp != nullptr) { if (hdc->clip->null) { @@ -158,10 +158,10 @@ BOOL gdi_ClipCoords(HGDI_DC hdc, INT32* x, INT32* y, INT32* w, INT32* h, INT32* draw = FALSE; } - if (srcx != NULL) + if (srcx != nullptr) *srcx += dx; - if (srcy != NULL) + if (srcy != nullptr) *srcy += dy; if (!gdi_RectToCRgn(&coords, x, y, w, h)) diff --git a/libfreerdp/gdi/dc.c b/libfreerdp/gdi/dc.c index 10dc9883b..62e7920de 100644 --- a/libfreerdp/gdi/dc.c +++ b/libfreerdp/gdi/dc.c @@ -45,7 +45,7 @@ HGDI_DC gdi_GetDC(void) HGDI_DC hDC = (HGDI_DC)calloc(1, sizeof(GDI_DC)); if (!hDC) - return NULL; + return nullptr; hDC->format = PIXEL_FORMAT_XRGB32; hDC->drawMode = GDI_R2_BLACK; @@ -54,11 +54,11 @@ HGDI_DC gdi_GetDC(void) if (!hDC->clip) { free(hDC); - return NULL; + return nullptr; } hDC->clip->null = TRUE; - hDC->hwnd = NULL; + hDC->hwnd = nullptr; return hDC; } @@ -71,10 +71,10 @@ HGDI_DC gdi_GetDC(void) HGDI_DC gdi_CreateDC(UINT32 format) { - HGDI_DC hDC = NULL; + HGDI_DC hDC = nullptr; if (!(hDC = (HGDI_DC)calloc(1, sizeof(GDI_DC)))) - return NULL; + return nullptr; hDC->drawMode = GDI_R2_BLACK; @@ -82,7 +82,7 @@ HGDI_DC gdi_CreateDC(UINT32 format) goto fail; hDC->clip->null = TRUE; - hDC->hwnd = NULL; + hDC->hwnd = nullptr; hDC->format = format; if (!(hDC->hwnd = (HGDI_WND)calloc(1, sizeof(GDI_WND)))) @@ -101,7 +101,7 @@ HGDI_DC gdi_CreateDC(UINT32 format) return hDC; fail: gdi_DeleteDC(hDC); - return NULL; + return nullptr; } /** @@ -116,18 +116,18 @@ HGDI_DC gdi_CreateCompatibleDC(HGDI_DC hdc) HGDI_DC hDC = (HGDI_DC)calloc(1, sizeof(GDI_DC)); if (!hDC) - return NULL; + return nullptr; if (!(hDC->clip = gdi_CreateRectRgn(0, 0, 0, 0))) { free(hDC); - return NULL; + return nullptr; } hDC->clip->null = TRUE; hDC->format = hdc->format; hDC->drawMode = hdc->drawMode; - hDC->hwnd = NULL; + hDC->hwnd = nullptr; return hDC; } @@ -144,8 +144,8 @@ HGDIOBJECT gdi_SelectObject(HGDI_DC hdc, HGDIOBJECT hgdiobject) { HGDIOBJECT previousSelectedObject = hdc->selectedObject; - if (hgdiobject == NULL) - return NULL; + if (hgdiobject == nullptr) + return nullptr; if (hgdiobject->objectType == GDIOBJECT_BITMAP) { @@ -174,7 +174,7 @@ HGDIOBJECT gdi_SelectObject(HGDI_DC hdc, HGDIOBJECT hgdiobject) else { /* Unknown GDI Object Type */ - return NULL; + return nullptr; } return previousSelectedObject; @@ -199,7 +199,7 @@ BOOL gdi_DeleteObject(HGDIOBJECT hgdiobject) if (hBitmap->data && hBitmap->free) { hBitmap->free(hBitmap->data); - hBitmap->data = NULL; + hBitmap->data = nullptr; } free(hBitmap); diff --git a/libfreerdp/gdi/gdi.c b/libfreerdp/gdi/gdi.c index 6010e5d3c..87478e3b8 100644 --- a/libfreerdp/gdi/gdi.c +++ b/libfreerdp/gdi/gdi.c @@ -459,14 +459,14 @@ gdiBitmap* gdi_bitmap_new_ex(rdpGdi* gdi, int width, int height, int bpp, BYTE* goto fail_bitmap_bitmap; gdi_SelectObject(bitmap->hdc, (HGDIOBJECT)bitmap->bitmap); - bitmap->org_bitmap = NULL; + bitmap->org_bitmap = nullptr; return bitmap; fail_bitmap_bitmap: gdi_DeleteDC(bitmap->hdc); fail_hdc: free(bitmap); fail_bitmap: - return NULL; + return nullptr; } void gdi_bitmap_free_ex(gdiBitmap* bitmap) @@ -489,8 +489,8 @@ BOOL gdi_bitmap_update(rdpContext* context, const BITMAP_UPDATE* bitmapUpdate) "context->codecs=%p", WINPR_CXX_COMPAT_CAST(const void*, context), WINPR_CXX_COMPAT_CAST(const void*, bitmapUpdate), - WINPR_CXX_COMPAT_CAST(const void*, context ? context->gdi : NULL), - WINPR_CXX_COMPAT_CAST(const void*, context ? context->codecs : NULL)); + WINPR_CXX_COMPAT_CAST(const void*, context ? context->gdi : nullptr), + WINPR_CXX_COMPAT_CAST(const void*, context ? context->codecs : nullptr)); return FALSE; } @@ -580,7 +580,7 @@ static BOOL gdi_dstblt(rdpContext* context, const DSTBLT_ORDER* dstblt) if (!gdi || !gdi->drawing) return FALSE; return gdi_BitBlt(gdi->drawing->hdc, dstblt->nLeftRect, dstblt->nTopRect, dstblt->nWidth, - dstblt->nHeight, NULL, 0, 0, gdi_rop3_code_checked(dstblt->bRop), + dstblt->nHeight, nullptr, 0, 0, gdi_rop3_code_checked(dstblt->bRop), &gdi->palette); } @@ -593,23 +593,23 @@ static BOOL gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt) UINT32 foreColor = 0; UINT32 backColor = 0; UINT32 originalColor = 0; - HGDI_BRUSH originalBrush = NULL; - HGDI_BRUSH hbrush = NULL; + HGDI_BRUSH originalBrush = nullptr; + HGDI_BRUSH hbrush = nullptr; rdpGdi* gdi = context->gdi; BOOL ret = FALSE; const DWORD rop = gdi_rop3_code_checked(patblt->bRop); INT32 nXSrc = 0; INT32 nYSrc = 0; BYTE data[8 * 8 * 4]; - HGDI_BITMAP hBmp = NULL; + HGDI_BITMAP hBmp = nullptr; if (!gdi || !gdi->drawing || !gdi->drawing->hdc) return FALSE; - if (!gdi_decode_color(gdi, patblt->foreColor, &foreColor, NULL)) + if (!gdi_decode_color(gdi, patblt->foreColor, &foreColor, nullptr)) return FALSE; - if (!gdi_decode_color(gdi, patblt->backColor, &backColor, NULL)) + if (!gdi_decode_color(gdi, patblt->backColor, &backColor, nullptr)) return FALSE; originalColor = gdi_SetTextColor(gdi->drawing->hdc, foreColor); @@ -623,14 +623,14 @@ static BOOL gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt) case GDI_BS_HATCHED: { - const BYTE* hatched = NULL; + const BYTE* hatched = nullptr; hatched = GDI_BS_HATCHED_PATTERNS + (8ULL * brush->hatch); if (!freerdp_image_copy_from_monochrome(data, gdi->drawing->hdc->format, 0, 0, 0, 8, 8, hatched, backColor, foreColor, &gdi->palette)) goto out_error; - hBmp = gdi_CreateBitmapEx(8, 8, gdi->drawing->hdc->format, 0, data, NULL); + hBmp = gdi_CreateBitmapEx(8, 8, gdi->drawing->hdc->format, 0, data, nullptr); if (!hBmp) goto out_error; @@ -666,7 +666,7 @@ static BOOL gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt) goto out_error; } - hBmp = gdi_CreateBitmapEx(8, 8, gdi->drawing->hdc->format, 0, data, NULL); + hBmp = gdi_CreateBitmapEx(8, 8, gdi->drawing->hdc->format, 0, data, nullptr); if (!hBmp) goto out_error; @@ -717,7 +717,7 @@ static BOOL gdi_opaque_rect(rdpContext* context, const OPAQUE_RECT_ORDER* opaque WINPR_ASSERT(opaque_rect); GDI_RECT rect; - HGDI_BRUSH hBrush = NULL; + HGDI_BRUSH hBrush = nullptr; UINT32 brush_color = 0; rdpGdi* gdi = context->gdi; BOOL ret = 0; @@ -731,7 +731,7 @@ static BOOL gdi_opaque_rect(rdpContext* context, const OPAQUE_RECT_ORDER* opaque if (!gdi_CRgnToRect(x, y, w, h, &rect)) return TRUE; - if (!gdi_decode_color(gdi, opaque_rect->color, &brush_color, NULL)) + if (!gdi_decode_color(gdi, opaque_rect->color, &brush_color, nullptr)) return FALSE; if (!(hBrush = gdi_CreateSolidBrush(brush_color))) @@ -756,7 +756,7 @@ static BOOL gdi_multi_opaque_rect(rdpContext* context, if (!gdi || !gdi->drawing) return FALSE; - if (!gdi_decode_color(gdi, multi_opaque_rect->color, &brush_color, NULL)) + if (!gdi_decode_color(gdi, multi_opaque_rect->color, &brush_color, nullptr)) return FALSE; HGDI_BRUSH hBrush = gdi_CreateSolidBrush(brush_color); @@ -796,7 +796,7 @@ static BOOL gdi_line_to(rdpContext* context, const LINE_TO_ORDER* lineTo) if (!gdi || !gdi->drawing || !gdi->drawing->hdc) return FALSE; - if (!gdi_decode_color(gdi, lineTo->penColor, &color, NULL)) + if (!gdi_decode_color(gdi, lineTo->penColor, &color, nullptr)) return FALSE; HGDI_PEN hPen = gdi_CreatePen(lineTo->penStyle, lineTo->penWidth, color, @@ -808,7 +808,7 @@ static BOOL gdi_line_to(rdpContext* context, const LINE_TO_ORDER* lineTo) gdi_SelectObject(gdi->drawing->hdc, (HGDIOBJECT)hPen); gdi_SetROP2(gdi->drawing->hdc, WINPR_ASSERTING_INT_CAST(int32_t, lineTo->bRop2)); - if (!gdi_MoveToEx(gdi->drawing->hdc, lineTo->nXStart, lineTo->nYStart, NULL)) + if (!gdi_MoveToEx(gdi->drawing->hdc, lineTo->nXStart, lineTo->nYStart, nullptr)) goto fail; if (!gdi_LineTo(gdi->drawing->hdc, lineTo->nXEnd, lineTo->nYEnd)) goto fail; @@ -830,7 +830,7 @@ static BOOL gdi_polyline(rdpContext* context, const POLYLINE_ORDER* polyline) return FALSE; UINT32 color = 0; - if (!gdi_decode_color(gdi, polyline->penColor, &color, NULL)) + if (!gdi_decode_color(gdi, polyline->penColor, &color, nullptr)) return FALSE; WINPR_ASSERT(gdi->drawing); @@ -844,7 +844,7 @@ static BOOL gdi_polyline(rdpContext* context, const POLYLINE_ORDER* polyline) gdi_SetROP2(gdi->drawing->hdc, WINPR_ASSERTING_INT_CAST(int32_t, polyline->bRop2)); INT32 x = polyline->xStart; INT32 y = polyline->yStart; - if (!gdi_MoveToEx(gdi->drawing->hdc, x, y, NULL)) + if (!gdi_MoveToEx(gdi->drawing->hdc, x, y, nullptr)) goto fail; DELTA_POINT* points = polyline->points; @@ -854,7 +854,7 @@ static BOOL gdi_polyline(rdpContext* context, const POLYLINE_ORDER* polyline) y += points[i].y; if (!gdi_LineTo(gdi->drawing->hdc, x, y)) goto fail; - if (!gdi_MoveToEx(gdi->drawing->hdc, x, y, NULL)) + if (!gdi_MoveToEx(gdi->drawing->hdc, x, y, nullptr)) goto fail; } @@ -883,7 +883,7 @@ static BOOL gdi_mem3blt(rdpContext* context, MEM3BLT_ORDER* mem3blt) WINPR_ASSERT(context); WINPR_ASSERT(mem3blt); - HGDI_BRUSH originalBrush = NULL; + HGDI_BRUSH originalBrush = nullptr; rdpGdi* gdi = context->gdi; if (!gdi || !gdi->drawing) return FALSE; @@ -895,10 +895,10 @@ static BOOL gdi_mem3blt(rdpContext* context, MEM3BLT_ORDER* mem3blt) UINT32 backColor = 0; UINT32 originalColor = 0; - if (!gdi_decode_color(gdi, mem3blt->foreColor, &foreColor, NULL)) + if (!gdi_decode_color(gdi, mem3blt->foreColor, &foreColor, nullptr)) return FALSE; - if (!gdi_decode_color(gdi, mem3blt->backColor, &backColor, NULL)) + if (!gdi_decode_color(gdi, mem3blt->backColor, &backColor, nullptr)) return FALSE; originalColor = gdi_SetTextColor(gdi->drawing->hdc, foreColor); @@ -924,7 +924,7 @@ static BOOL gdi_mem3blt(rdpContext* context, MEM3BLT_ORDER* mem3blt) case GDI_BS_PATTERN: { - HGDI_BITMAP hBmp = NULL; + HGDI_BITMAP hBmp = nullptr; UINT32 brushFormat = 0; BYTE* data = (BYTE*)winpr_aligned_malloc( 8ULL * 8ULL * FreeRDPGetBytesPerPixel(gdi->drawing->hdc->format), 16); @@ -1257,20 +1257,20 @@ static void gdi_register_update_callbacks(rdpUpdate* update) primary->PatBlt = gdi_patblt; primary->ScrBlt = gdi_scrblt; primary->OpaqueRect = gdi_opaque_rect; - primary->DrawNineGrid = NULL; - primary->MultiDstBlt = NULL; - primary->MultiPatBlt = NULL; - primary->MultiScrBlt = NULL; + primary->DrawNineGrid = nullptr; + primary->MultiDstBlt = nullptr; + primary->MultiPatBlt = nullptr; + primary->MultiScrBlt = nullptr; primary->MultiOpaqueRect = gdi_multi_opaque_rect; - primary->MultiDrawNineGrid = NULL; + primary->MultiDrawNineGrid = nullptr; primary->LineTo = gdi_line_to; primary->Polyline = gdi_polyline; primary->MemBlt = gdi_memblt; primary->Mem3Blt = gdi_mem3blt; - primary->SaveBitmap = NULL; - primary->GlyphIndex = NULL; - primary->FastIndex = NULL; - primary->FastGlyph = NULL; + primary->SaveBitmap = nullptr; + primary->GlyphIndex = nullptr; + primary->FastIndex = nullptr; + primary->FastGlyph = nullptr; primary->PolygonSC = gdi_polygon_sc; primary->PolygonCB = gdi_polygon_cb; primary->EllipseSC = gdi_ellipse_sc; @@ -1324,7 +1324,7 @@ static BOOL gdi_init_primary(rdpGdi* gdi, UINT32 stride, UINT32 format, BYTE* bu gdi->stride = gdi->primary->bitmap->scanline; gdi_SelectObject(gdi->primary->hdc, (HGDIOBJECT)gdi->primary->bitmap); - gdi->primary->org_bitmap = NULL; + gdi->primary->org_bitmap = nullptr; gdi->primary_buffer = gdi->primary->bitmap->data; if (!(gdi->primary->hdc->hwnd = (HGDI_WND)calloc(1, sizeof(GDI_WND)))) @@ -1353,7 +1353,7 @@ fail_bitmap: gdi_DeleteDC(gdi->primary->hdc); fail_hdc: free(gdi->primary); - gdi->primary = NULL; + gdi->primary = nullptr; fail_primary: rdp_update_unlock(gdi->context->update); return FALSE; @@ -1361,7 +1361,7 @@ fail_primary: BOOL gdi_resize(rdpGdi* gdi, UINT32 width, UINT32 height) { - return gdi_resize_ex(gdi, width, height, 0, 0, NULL, NULL); + return gdi_resize_ex(gdi, width, height, 0, 0, nullptr, nullptr); } BOOL gdi_resize_ex(rdpGdi* gdi, UINT32 width, UINT32 height, UINT32 stride, UINT32 format, @@ -1386,13 +1386,13 @@ BOOL gdi_resize_ex(rdpGdi* gdi, UINT32 width, UINT32 height, UINT32 stride, UINT rdp_update_lock(gdi->context->update); if (gdi->drawing == gdi->primary) - gdi->drawing = NULL; + gdi->drawing = nullptr; gdi->width = (INT32)width; gdi->height = (INT32)height; gdi_bitmap_free_ex(gdi->primary); - gdi->primary = NULL; - gdi->primary_buffer = NULL; + gdi->primary = nullptr; + gdi->primary_buffer = nullptr; return gdi_init_primary(gdi, stride, format, buffer, pfree, TRUE); } @@ -1405,7 +1405,7 @@ BOOL gdi_resize_ex(rdpGdi* gdi, UINT32 width, UINT32 height, UINT32 stride, UINT */ BOOL gdi_init(freerdp* instance, UINT32 format) { - return gdi_init_ex(instance, format, 0, NULL, winpr_aligned_free); + return gdi_init_ex(instance, format, 0, nullptr, winpr_aligned_free); } /** @@ -1422,9 +1422,9 @@ BOOL gdi_init(freerdp* instance, UINT32 format) BOOL gdi_init_ex(freerdp* instance, UINT32 format, UINT32 stride, BYTE* buffer, void (*pfree)(void*)) { - rdpContext* context = NULL; + rdpContext* context = nullptr; UINT32 SrcFormat = 0; - rdpGdi* gdi = NULL; + rdpGdi* gdi = nullptr; WINPR_ASSERT(instance); @@ -1487,8 +1487,8 @@ fail: void gdi_free(freerdp* instance) { - rdpGdi* gdi = NULL; - rdpContext* context = NULL; + rdpGdi* gdi = nullptr; + rdpContext* context = nullptr; if (!instance || !instance->context) return; @@ -1504,8 +1504,8 @@ void gdi_free(freerdp* instance) context = instance->context; cache_free(context->cache); - context->cache = NULL; - instance->context->gdi = (rdpGdi*)NULL; + context->cache = nullptr; + instance->context->gdi = (rdpGdi*)nullptr; } BOOL gdi_send_suppress_output(rdpGdi* gdi, BOOL suppress) diff --git a/libfreerdp/gdi/gdi.h b/libfreerdp/gdi/gdi.h index 4cf461852..b49ec285c 100644 --- a/libfreerdp/gdi/gdi.h +++ b/libfreerdp/gdi/gdi.h @@ -53,7 +53,7 @@ static inline BYTE* gdi_get_bitmap_pointer(HGDI_DC hdcBmp, INT32 x, INT32 y) "gdi_get_bitmap_pointer: requesting invalid pointer: (%" PRId32 ",%" PRId32 ") in %" PRId32 "x%" PRId32 "", x, y, hBmp->width, hBmp->height); - return 0; + return nullptr; } } @@ -67,7 +67,7 @@ static inline BYTE* gdi_get_bitmap_pointer(HGDI_DC hdcBmp, INT32 x, INT32 y) WINPR_ATTR_NODISCARD static inline BYTE* gdi_get_brush_pointer(HGDI_DC hdcBrush, UINT32 x, UINT32 y) { - BYTE* p = NULL; + BYTE* p = nullptr; UINT32 brushStyle = gdi_GetBrushStyle(hdcBrush); switch (brushStyle) diff --git a/libfreerdp/gdi/gfx.c b/libfreerdp/gdi/gfx.c index b16762b05..4bc6f5cd7 100644 --- a/libfreerdp/gdi/gfx.c +++ b/libfreerdp/gdi/gfx.c @@ -91,10 +91,10 @@ static UINT gdi_ResetGraphics(RdpgfxClientContext* context, UINT16 count = 0; UINT32 DesktopWidth = 0; UINT32 DesktopHeight = 0; - UINT16* pSurfaceIds = NULL; - rdpGdi* gdi = NULL; - rdpUpdate* update = NULL; - rdpSettings* settings = NULL; + UINT16* pSurfaceIds = nullptr; + rdpGdi* gdi = nullptr; + rdpUpdate* update = nullptr; + rdpSettings* settings = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(resetGraphics); @@ -172,9 +172,9 @@ static UINT gdi_OutputUpdate(rdpGdi* gdi, gdiGfxSurface* surface) UINT32 surfaceX = 0; UINT32 surfaceY = 0; RECTANGLE_16 surfaceRect; - const RECTANGLE_16* rects = NULL; + const RECTANGLE_16* rects = nullptr; UINT32 nbRects = 0; - rdpUpdate* update = NULL; + rdpUpdate* update = nullptr; WINPR_ASSERT(gdi); WINPR_ASSERT(gdi->context); @@ -249,7 +249,7 @@ static UINT gdi_WindowUpdate(RdpgfxClientContext* context, gdiGfxSurface* surfac static UINT gdi_UpdateSurfaces(RdpgfxClientContext* context) { UINT16 count = 0; - UINT16* pSurfaceIds = NULL; + UINT16* pSurfaceIds = nullptr; WINPR_ASSERT(context); @@ -301,7 +301,7 @@ fail: */ static UINT gdi_StartFrame(RdpgfxClientContext* context, const RDPGFX_START_FRAME_PDU* startFrame) { - rdpGdi* gdi = NULL; + rdpGdi* gdi = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(startFrame); @@ -355,7 +355,7 @@ static UINT gdi_SurfaceCommand_Uncompressed(rdpGdi* gdi, RdpgfxClientContext* co const RDPGFX_SURFACE_COMMAND* cmd) { UINT status = CHANNEL_RC_OK; - gdiGfxSurface* surface = NULL; + gdiGfxSurface* surface = nullptr; RECTANGLE_16 invalidRect; DWORD bpp = 0; size_t size = 0; @@ -386,7 +386,7 @@ static UINT gdi_SurfaceCommand_Uncompressed(rdpGdi* gdi, RdpgfxClientContext* co if (!freerdp_image_copy_no_overlap(surface->data, surface->format, surface->scanline, cmd->left, cmd->top, cmd->width, cmd->height, cmd->data, cmd->format, 0, - 0, 0, NULL, FREERDP_FLIP_NONE)) + 0, 0, nullptr, FREERDP_FLIP_NONE)) return ERROR_INTERNAL_ERROR; invalidRect.left = (UINT16)MIN(UINT16_MAX, cmd->left); @@ -416,9 +416,9 @@ static UINT gdi_SurfaceCommand_RemoteFX(rdpGdi* gdi, RdpgfxClientContext* contex const RDPGFX_SURFACE_COMMAND* cmd) { UINT status = ERROR_INTERNAL_ERROR; - gdiGfxSurface* surface = NULL; + gdiGfxSurface* surface = nullptr; REGION16 invalidRegion; - const RECTANGLE_16* rects = NULL; + const RECTANGLE_16* rects = nullptr; UINT32 nrRects = 0; WINPR_ASSERT(gdi); WINPR_ASSERT(context); @@ -476,7 +476,7 @@ static UINT gdi_SurfaceCommand_ClearCodec(rdpGdi* gdi, RdpgfxClientContext* cont { INT32 rc = 0; UINT status = CHANNEL_RC_OK; - gdiGfxSurface* surface = NULL; + gdiGfxSurface* surface = nullptr; RECTANGLE_16 invalidRect; WINPR_ASSERT(gdi); WINPR_ASSERT(context); @@ -530,8 +530,8 @@ static UINT gdi_SurfaceCommand_Planar(rdpGdi* gdi, RdpgfxClientContext* context, const RDPGFX_SURFACE_COMMAND* cmd) { UINT status = CHANNEL_RC_OK; - BYTE* DstData = NULL; - gdiGfxSurface* surface = NULL; + BYTE* DstData = nullptr; + gdiGfxSurface* surface = nullptr; RECTANGLE_16 invalidRect; WINPR_ASSERT(gdi); WINPR_ASSERT(context); @@ -587,9 +587,9 @@ static UINT gdi_SurfaceCommand_AVC420(rdpGdi* gdi, RdpgfxClientContext* context, #ifdef WITH_GFX_H264 INT32 rc = 0; UINT status = CHANNEL_RC_OK; - gdiGfxSurface* surface = NULL; - RDPGFX_H264_METABLOCK* meta = NULL; - RDPGFX_AVC420_BITMAP_STREAM* bs = NULL; + gdiGfxSurface* surface = nullptr; + RDPGFX_H264_METABLOCK* meta = nullptr; + RDPGFX_AVC420_BITMAP_STREAM* bs = nullptr; WINPR_ASSERT(gdi); WINPR_ASSERT(context); WINPR_ASSERT(cmd); @@ -670,12 +670,12 @@ static UINT gdi_SurfaceCommand_AVC444(rdpGdi* gdi, RdpgfxClientContext* context, #ifdef WITH_GFX_H264 INT32 rc = 0; UINT status = CHANNEL_RC_OK; - gdiGfxSurface* surface = NULL; - RDPGFX_AVC444_BITMAP_STREAM* bs = NULL; - RDPGFX_AVC420_BITMAP_STREAM* avc1 = NULL; - RDPGFX_H264_METABLOCK* meta1 = NULL; - RDPGFX_AVC420_BITMAP_STREAM* avc2 = NULL; - RDPGFX_H264_METABLOCK* meta2 = NULL; + gdiGfxSurface* surface = nullptr; + RDPGFX_AVC444_BITMAP_STREAM* bs = nullptr; + RDPGFX_AVC420_BITMAP_STREAM* avc1 = nullptr; + RDPGFX_H264_METABLOCK* meta1 = nullptr; + RDPGFX_AVC420_BITMAP_STREAM* avc2 = nullptr; + RDPGFX_H264_METABLOCK* meta2 = nullptr; WINPR_ASSERT(gdi); WINPR_ASSERT(context); WINPR_ASSERT(cmd); @@ -785,7 +785,7 @@ static BOOL gdi_apply_alpha(BYTE* data, UINT32 format, UINT32 stride, RECTANGLE_ BYTE* src = &line[x * bpp]; UINT32 color = FreeRDPReadColor(src, format); - FreeRDPSplitColor(color, format, &r, &g, &b, NULL, NULL); + FreeRDPSplitColor(color, format, &r, &g, &b, nullptr, nullptr); color = FreeRDPGetColor(format, r, g, b, a); FreeRDPWriteColor(src, format, color); written++; @@ -807,10 +807,10 @@ static UINT gdi_SurfaceCommand_Alpha(rdpGdi* gdi, RdpgfxClientContext* context, UINT status = CHANNEL_RC_OK; UINT16 alphaSig = 0; UINT16 compressed = 0; - gdiGfxSurface* surface = NULL; + gdiGfxSurface* surface = nullptr; RECTANGLE_16 invalidRect; wStream buffer; - wStream* s = NULL; + wStream* s = nullptr; WINPR_ASSERT(gdi); WINPR_ASSERT(context); WINPR_ASSERT(cmd); @@ -858,7 +858,7 @@ static UINT gdi_SurfaceCommand_Alpha(rdpGdi* gdi, RdpgfxClientContext* context, BYTE* src = &line[x * FreeRDPGetBytesPerPixel(surface->format)]; Stream_Read_UINT8(s, a); color = FreeRDPReadColor(src, surface->format); - FreeRDPSplitColor(color, surface->format, &r, &g, &b, NULL, NULL); + FreeRDPSplitColor(color, surface->format, &r, &g, &b, nullptr, nullptr); color = FreeRDPGetColor(surface->format, r, g, b, a); FreeRDPWriteColor(src, surface->format, color); } @@ -974,9 +974,9 @@ static UINT gdi_SurfaceCommand_Progressive(rdpGdi* gdi, RdpgfxClientContext* con { INT32 rc = 0; UINT status = ERROR_INTERNAL_ERROR; - gdiGfxSurface* surface = NULL; + gdiGfxSurface* surface = nullptr; REGION16 invalidRegion; - const RECTANGLE_16* rects = NULL; + const RECTANGLE_16* rects = nullptr; UINT32 nrRects = 0; /** * Note: Since this comes via a Wire-To-Surface-2 PDU the @@ -1052,7 +1052,7 @@ fail: static UINT gdi_SurfaceCommand(RdpgfxClientContext* context, const RDPGFX_SURFACE_COMMAND* cmd) { UINT status = CHANNEL_RC_OK; - rdpGdi* gdi = NULL; + rdpGdi* gdi = nullptr; if (!context || !cmd) return ERROR_INVALID_PARAMETER; @@ -1148,8 +1148,8 @@ static UINT gdi_CreateSurface(RdpgfxClientContext* context, const RDPGFX_CREATE_SURFACE_PDU* createSurface) { UINT rc = ERROR_INTERNAL_ERROR; - gdiGfxSurface* surface = NULL; - rdpGdi* gdi = NULL; + gdiGfxSurface* surface = nullptr; + rdpGdi* gdi = nullptr; WINPR_ASSERT(context); WINPR_ASSERT(createSurface); gdi = (rdpGdi*)context->custom; @@ -1225,8 +1225,8 @@ static UINT gdi_DeleteSurface(RdpgfxClientContext* context, { UINT rc = CHANNEL_RC_OK; UINT res = ERROR_INTERNAL_ERROR; - rdpCodecs* codecs = NULL; - gdiGfxSurface* surface = NULL; + rdpCodecs* codecs = nullptr; + gdiGfxSurface* surface = nullptr; EnterCriticalSection(&context->mux); WINPR_ASSERT(context->GetSurfaceData); @@ -1248,7 +1248,7 @@ static UINT gdi_DeleteSurface(RdpgfxClientContext* context, } WINPR_ASSERT(context->SetSurfaceData); - res = context->SetSurfaceData(context, deleteSurface->surfaceId, NULL); + res = context->SetSurfaceData(context, deleteSurface->surfaceId, nullptr); if (res) rc = res; @@ -1357,10 +1357,10 @@ static UINT gdi_SurfaceToSurface(RdpgfxClientContext* context, { UINT status = ERROR_INTERNAL_ERROR; BOOL sameSurface = 0; - const RECTANGLE_16* rectSrc = NULL; + const RECTANGLE_16* rectSrc = nullptr; RECTANGLE_16 invalidRect; - gdiGfxSurface* surfaceSrc = NULL; - gdiGfxSurface* surfaceDst = NULL; + gdiGfxSurface* surfaceSrc = nullptr; + gdiGfxSurface* surfaceDst = nullptr; rdpGdi* gdi = (rdpGdi*)context->custom; EnterCriticalSection(&context->mux); rectSrc = &(surfaceToSurface->rectSrc); @@ -1399,7 +1399,7 @@ static UINT gdi_SurfaceToSurface(RdpgfxClientContext* context, if (!freerdp_image_copy(surfaceDst->data, surfaceDst->format, surfaceDst->scanline, destPt->x, destPt->y, rwidth, rheight, surfaceSrc->data, surfaceSrc->format, surfaceSrc->scanline, rectSrc->left, - rectSrc->top, NULL, FREERDP_FLIP_NONE)) + rectSrc->top, nullptr, FREERDP_FLIP_NONE)) goto fail; invalidRect = rect; @@ -1453,7 +1453,7 @@ static gdiGfxCacheEntry* gdi_GfxCacheEntryNew(UINT64 cacheKey, UINT32 width, UIN return cacheEntry; fail: gdi_GfxCacheEntryFree(cacheEntry); - return NULL; + return nullptr; } /** @@ -1464,7 +1464,7 @@ fail: static UINT gdi_SurfaceToCache(RdpgfxClientContext* context, const RDPGFX_SURFACE_TO_CACHE_PDU* surfaceToCache) { - gdiGfxCacheEntry* cacheEntry = NULL; + gdiGfxCacheEntry* cacheEntry = nullptr; UINT rc = ERROR_INTERNAL_ERROR; EnterCriticalSection(&context->mux); const RECTANGLE_16* rect = &(surfaceToCache->rectSrc); @@ -1491,7 +1491,7 @@ static UINT gdi_SurfaceToCache(RdpgfxClientContext* context, if (!freerdp_image_copy_no_overlap(cacheEntry->data, cacheEntry->format, cacheEntry->scanline, 0, 0, cacheEntry->width, cacheEntry->height, surface->data, surface->format, surface->scanline, rect->left, rect->top, - NULL, FREERDP_FLIP_NONE)) + nullptr, FREERDP_FLIP_NONE)) goto fail; { @@ -1520,8 +1520,8 @@ static UINT gdi_CacheToSurface(RdpgfxClientContext* context, const RDPGFX_CACHE_TO_SURFACE_PDU* cacheToSurface) { UINT status = ERROR_INTERNAL_ERROR; - gdiGfxSurface* surface = NULL; - gdiGfxCacheEntry* cacheEntry = NULL; + gdiGfxSurface* surface = nullptr; + gdiGfxCacheEntry* cacheEntry = nullptr; RECTANGLE_16 invalidRect; rdpGdi* gdi = (rdpGdi*)context->custom; @@ -1552,7 +1552,7 @@ static UINT gdi_CacheToSurface(RdpgfxClientContext* context, if (!freerdp_image_copy_no_overlap(surface->data, surface->format, surface->scanline, destPt->x, destPt->y, cacheEntry->width, cacheEntry->height, cacheEntry->data, cacheEntry->format, - cacheEntry->scanline, 0, 0, NULL, FREERDP_FLIP_NONE)) + cacheEntry->scanline, 0, 0, nullptr, FREERDP_FLIP_NONE)) goto fail; invalidRect = rect; @@ -1583,7 +1583,7 @@ static UINT gdi_CacheImportReply(RdpgfxClientContext* context, const RDPGFX_CACHE_IMPORT_REPLY_PDU* cacheImportReply) { UINT16 count = 0; - const UINT16* slots = NULL; + const UINT16* slots = nullptr; UINT error = CHANNEL_RC_OK; slots = cacheImportReply->cacheSlots; @@ -1627,7 +1627,7 @@ static UINT gdi_ImportCacheEntry(RdpgfxClientContext* context, UINT16 cacheSlot, const PERSISTENT_CACHE_ENTRY* importCacheEntry) { UINT error = ERROR_INTERNAL_ERROR; - gdiGfxCacheEntry* cacheEntry = NULL; + gdiGfxCacheEntry* cacheEntry = nullptr; if (cacheSlot == 0) return CHANNEL_RC_OK; @@ -1640,8 +1640,8 @@ static UINT gdi_ImportCacheEntry(RdpgfxClientContext* context, UINT16 cacheSlot, if (!freerdp_image_copy_no_overlap(cacheEntry->data, cacheEntry->format, cacheEntry->scanline, 0, 0, cacheEntry->width, cacheEntry->height, - importCacheEntry->data, PIXEL_FORMAT_BGRX32, 0, 0, 0, NULL, - FREERDP_FLIP_NONE)) + importCacheEntry->data, PIXEL_FORMAT_BGRX32, 0, 0, 0, + nullptr, FREERDP_FLIP_NONE)) goto fail; { @@ -1668,7 +1668,7 @@ fail: static UINT gdi_ExportCacheEntry(RdpgfxClientContext* context, UINT16 cacheSlot, PERSISTENT_CACHE_ENTRY* exportCacheEntry) { - gdiGfxCacheEntry* cacheEntry = NULL; + gdiGfxCacheEntry* cacheEntry = nullptr; WINPR_ASSERT(context->GetCacheSlotData); cacheEntry = (gdiGfxCacheEntry*)context->GetCacheSlotData(context, cacheSlot); @@ -1695,7 +1695,7 @@ static UINT gdi_ExportCacheEntry(RdpgfxClientContext* context, UINT16 cacheSlot, static UINT gdi_EvictCacheEntry(RdpgfxClientContext* context, const RDPGFX_EVICT_CACHE_ENTRY_PDU* evictCacheEntry) { - gdiGfxCacheEntry* cacheEntry = NULL; + gdiGfxCacheEntry* cacheEntry = nullptr; UINT rc = ERROR_NOT_FOUND; WINPR_ASSERT(context); @@ -1709,7 +1709,7 @@ static UINT gdi_EvictCacheEntry(RdpgfxClientContext* context, gdi_GfxCacheEntryFree(cacheEntry); WINPR_ASSERT(context->SetCacheSlotData); - rc = context->SetCacheSlotData(context, evictCacheEntry->cacheSlot, NULL); + rc = context->SetCacheSlotData(context, evictCacheEntry->cacheSlot, nullptr); LeaveCriticalSection(&context->mux); return rc; } @@ -1723,7 +1723,7 @@ static UINT gdi_MapSurfaceToOutput(RdpgfxClientContext* context, const RDPGFX_MAP_SURFACE_TO_OUTPUT_PDU* surfaceToOutput) { UINT rc = ERROR_INTERNAL_ERROR; - gdiGfxSurface* surface = NULL; + gdiGfxSurface* surface = nullptr; EnterCriticalSection(&context->mux); WINPR_ASSERT(context->GetSurfaceData); @@ -1755,7 +1755,7 @@ gdi_MapSurfaceToScaledOutput(RdpgfxClientContext* context, const RDPGFX_MAP_SURFACE_TO_SCALED_OUTPUT_PDU* surfaceToOutput) { UINT rc = ERROR_INTERNAL_ERROR; - gdiGfxSurface* surface = NULL; + gdiGfxSurface* surface = nullptr; EnterCriticalSection(&context->mux); WINPR_ASSERT(context->GetSurfaceData); @@ -1791,7 +1791,7 @@ static UINT gdi_MapSurfaceToWindow(RdpgfxClientContext* context, const RDPGFX_MAP_SURFACE_TO_WINDOW_PDU* surfaceToWindow) { UINT rc = ERROR_INTERNAL_ERROR; - gdiGfxSurface* surface = NULL; + gdiGfxSurface* surface = nullptr; EnterCriticalSection(&context->mux); WINPR_ASSERT(context->GetSurfaceData); @@ -1834,7 +1834,7 @@ gdi_MapSurfaceToScaledWindow(RdpgfxClientContext* context, const RDPGFX_MAP_SURFACE_TO_SCALED_WINDOW_PDU* surfaceToWindow) { UINT rc = ERROR_INTERNAL_ERROR; - gdiGfxSurface* surface = NULL; + gdiGfxSurface* surface = nullptr; EnterCriticalSection(&context->mux); WINPR_ASSERT(context->GetSurfaceData); @@ -1874,7 +1874,7 @@ fail: BOOL gdi_graphics_pipeline_init(rdpGdi* gdi, RdpgfxClientContext* gfx) { - return gdi_graphics_pipeline_init_ex(gdi, gfx, NULL, NULL, NULL); + return gdi_graphics_pipeline_init_ex(gdi, gfx, nullptr, nullptr, nullptr); } BOOL gdi_graphics_pipeline_init_ex(rdpGdi* gdi, RdpgfxClientContext* gfx, @@ -1938,9 +1938,9 @@ BOOL gdi_graphics_pipeline_init_ex(rdpGdi* gdi, RdpgfxClientContext* gfx, gdi->graphicsReset = TRUE; if (freerdp_settings_get_bool(settings, FreeRDP_DeactivateClientDecoding)) { - gfx->UpdateSurfaceArea = NULL; - gfx->UpdateSurfaces = NULL; - gfx->SurfaceCommand = NULL; + gfx->UpdateSurfaceArea = nullptr; + gfx->UpdateSurfaces = nullptr; + gfx->SurfaceCommand = nullptr; } return TRUE; @@ -1949,14 +1949,14 @@ BOOL gdi_graphics_pipeline_init_ex(rdpGdi* gdi, RdpgfxClientContext* gfx, void gdi_graphics_pipeline_uninit(rdpGdi* gdi, RdpgfxClientContext* gfx) { if (gdi) - gdi->gfx = NULL; + gdi->gfx = nullptr; if (!gfx) return; - gfx->custom = NULL; + gfx->custom = nullptr; freerdp_client_codecs_free(gfx->codecs); - gfx->codecs = NULL; + gfx->codecs = nullptr; DeleteCriticalSection(&gfx->mux); PROFILER_PRINT_HEADER PROFILER_PRINT(gfx->SurfaceProfiler) diff --git a/libfreerdp/gdi/graphics.c b/libfreerdp/gdi/graphics.c index 71b28710a..7371169d8 100644 --- a/libfreerdp/gdi/graphics.c +++ b/libfreerdp/gdi/graphics.c @@ -43,18 +43,18 @@ HGDI_BITMAP gdi_create_bitmap(rdpGdi* gdi, UINT32 nWidth, UINT32 nHeight, UINT32 { UINT32 nSrcStep = 0; UINT32 nDstStep = 0; - BYTE* pSrcData = NULL; - BYTE* pDstData = NULL; - HGDI_BITMAP bitmap = NULL; + BYTE* pSrcData = nullptr; + BYTE* pDstData = nullptr; + HGDI_BITMAP bitmap = nullptr; if (!gdi) - return NULL; + return nullptr; nDstStep = nWidth * FreeRDPGetBytesPerPixel(gdi->dstFormat); pDstData = winpr_aligned_malloc(1ull * nHeight * nDstStep, 16); if (!pDstData) - return NULL; + return nullptr; pSrcData = data; nSrcStep = nWidth * FreeRDPGetBytesPerPixel(SrcFormat); @@ -64,7 +64,7 @@ HGDI_BITMAP gdi_create_bitmap(rdpGdi* gdi, UINT32 nWidth, UINT32 nHeight, UINT32 FREERDP_FLIP_NONE)) { winpr_aligned_free(pDstData); - return NULL; + return nullptr; } bitmap = gdi_CreateBitmap(nWidth, nHeight, gdi->dstFormat, pDstData); @@ -73,7 +73,7 @@ HGDI_BITMAP gdi_create_bitmap(rdpGdi* gdi, UINT32 nWidth, UINT32 nHeight, UINT32 static BOOL gdi_Bitmap_New(rdpContext* context, rdpBitmap* bitmap) { - gdiBitmap* gdi_bitmap = NULL; + gdiBitmap* gdi_bitmap = nullptr; rdpGdi* gdi = context->gdi; gdi_bitmap = (gdiBitmap*)bitmap; gdi_bitmap->hdc = gdi_CreateCompatibleDC(gdi->hdc); @@ -93,13 +93,13 @@ static BOOL gdi_Bitmap_New(rdpContext* context, rdpBitmap* bitmap) if (!gdi_bitmap->bitmap) { gdi_DeleteDC(gdi_bitmap->hdc); - gdi_bitmap->hdc = NULL; + gdi_bitmap->hdc = nullptr; return FALSE; } gdi_bitmap->hdc->format = gdi_bitmap->bitmap->format; gdi_SelectObject(gdi_bitmap->hdc, (HGDIOBJECT)gdi_bitmap->bitmap); - gdi_bitmap->org_bitmap = NULL; + gdi_bitmap->org_bitmap = nullptr; return TRUE; } @@ -249,7 +249,7 @@ static BOOL gdi_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, const static BOOL gdi_Bitmap_SetSurface(rdpContext* context, rdpBitmap* bitmap, BOOL primary) { - rdpGdi* gdi = NULL; + rdpGdi* gdi = nullptr; if (!context) return FALSE; @@ -298,13 +298,13 @@ static BOOL gdi_Glyph_New(rdpContext* context, rdpGlyph* glyph) } gdi_SelectObject(gdi_glyph->hdc, (HGDIOBJECT)gdi_glyph->bitmap); - gdi_glyph->org_bitmap = NULL; + gdi_glyph->org_bitmap = nullptr; return TRUE; } static void gdi_Glyph_Free(WINPR_ATTR_UNUSED rdpContext* context, rdpGlyph* glyph) { - gdiGlyph* gdi_glyph = NULL; + gdiGlyph* gdi_glyph = nullptr; gdi_glyph = (gdiGlyph*)glyph; if (gdi_glyph) @@ -320,9 +320,9 @@ static void gdi_Glyph_Free(WINPR_ATTR_UNUSED rdpContext* context, rdpGlyph* glyp static BOOL gdi_Glyph_Draw(rdpContext* context, const rdpGlyph* glyph, INT32 x, INT32 y, INT32 w, INT32 h, INT32 sx, INT32 sy, BOOL fOpRedundant) { - const gdiGlyph* gdi_glyph = NULL; - rdpGdi* gdi = NULL; - HGDI_BRUSH brush = NULL; + const gdiGlyph* gdi_glyph = nullptr; + rdpGdi* gdi = nullptr; + HGDI_BRUSH brush = nullptr; BOOL rc = FALSE; if (!context || !glyph) @@ -386,10 +386,10 @@ static BOOL gdi_Glyph_BeginDraw(rdpContext* context, INT32 x, INT32 y, INT32 wid if (!fOpRedundant) { - if (!gdi_decode_color(gdi, bgcolor, &bgcolor, NULL)) + if (!gdi_decode_color(gdi, bgcolor, &bgcolor, nullptr)) return FALSE; - if (!gdi_decode_color(gdi, fgcolor, &fgcolor, NULL)) + if (!gdi_decode_color(gdi, fgcolor, &fgcolor, nullptr)) return FALSE; if (!gdi_SetClipRgn(gdi->drawing->hdc, x, y, width, height)) @@ -434,7 +434,7 @@ static BOOL gdi_Glyph_EndDraw(rdpContext* context, WINPR_ATTR_UNUSED INT32 x, WINPR_ATTR_UNUSED INT32 height, WINPR_ATTR_UNUSED UINT32 bgcolor, WINPR_ATTR_UNUSED UINT32 fgcolor) { - rdpGdi* gdi = NULL; + rdpGdi* gdi = nullptr; if (!context || !context->gdi) return FALSE; diff --git a/libfreerdp/gdi/line.c b/libfreerdp/gdi/line.c index 7243a2559..1ad25f476 100644 --- a/libfreerdp/gdi/line.c +++ b/libfreerdp/gdi/line.c @@ -221,7 +221,7 @@ BOOL gdi_PolylineTo(HGDI_DC hdc, GDI_POINT* lppt, DWORD cCount) if (!gdi_LineTo(hdc, lppt[i].x, lppt[i].y)) return FALSE; - if (!gdi_MoveToEx(hdc, lppt[i].x, lppt[i].y, NULL)) + if (!gdi_MoveToEx(hdc, lppt[i].x, lppt[i].y, nullptr)) return FALSE; } @@ -252,11 +252,11 @@ BOOL gdi_Polyline(HGDI_DC hdc, GDI_POINT* lppt, UINT32 cPoints) if (!gdi_LineTo(hdc, lppt[i].x, lppt[i].y)) return FALSE; - if (!gdi_MoveToEx(hdc, lppt[i].x, lppt[i].y, NULL)) + if (!gdi_MoveToEx(hdc, lppt[i].x, lppt[i].y, nullptr)) return FALSE; } - if (!gdi_MoveToEx(hdc, pt.x, pt.y, NULL)) + if (!gdi_MoveToEx(hdc, pt.x, pt.y, nullptr)) return FALSE; } @@ -304,7 +304,7 @@ BOOL gdi_MoveToEx(HGDI_DC hdc, INT32 X, INT32 Y, HGDI_POINT lpPoint) { WINPR_ASSERT(hdc); - if (lpPoint != NULL) + if (lpPoint != nullptr) { lpPoint->x = hdc->pen->posX; lpPoint->y = hdc->pen->posY; diff --git a/libfreerdp/gdi/pen.c b/libfreerdp/gdi/pen.c index cbd091edc..118bc161d 100644 --- a/libfreerdp/gdi/pen.c +++ b/libfreerdp/gdi/pen.c @@ -48,7 +48,7 @@ HGDI_PEN gdi_CreatePen(UINT32 fnPenStyle, UINT32 nWidth, UINT32 crColor, UINT32 { HGDI_PEN hPen = (HGDI_PEN)calloc(1, sizeof(GDI_PEN)); if (!hPen) - return NULL; + return nullptr; hPen->objectType = GDIOBJECT_PEN; hPen->style = fnPenStyle; hPen->color = crColor; diff --git a/libfreerdp/gdi/region.c b/libfreerdp/gdi/region.c index e9769bb64..aa3dc8036 100644 --- a/libfreerdp/gdi/region.c +++ b/libfreerdp/gdi/region.c @@ -40,7 +40,7 @@ static char* gdi_rect_str(char* buffer, size_t size, const GDI_RECT* rect) { if (!buffer || (size < 1) || !rect) - return NULL; + return nullptr; (void)_snprintf(buffer, size - 1, "[top/left=%" PRId32 "x%" PRId32 "-bottom/right%" PRId32 "x%" PRId32 "]", @@ -53,7 +53,7 @@ static char* gdi_rect_str(char* buffer, size_t size, const GDI_RECT* rect) static char* gdi_regn_str(char* buffer, size_t size, const GDI_RGN* rgn) { if (!buffer || (size < 1) || !rgn) - return NULL; + return nullptr; (void)_snprintf(buffer, size - 1, "[%" PRId32 "x%" PRId32 "-%" PRId32 "x%" PRId32 "]", rgn->x, rgn->y, rgn->w, rgn->h); @@ -78,7 +78,7 @@ GDI_RGN* gdi_CreateRectRgn(INT32 nLeftRect, INT32 nTopRect, INT32 nRightRect, IN { INT64 w = 0; INT64 h = 0; - GDI_RGN* hRgn = NULL; + GDI_RGN* hRgn = nullptr; w = nRightRect - nLeftRect + 1ll; h = nBottomRect - nTopRect + 1ll; @@ -88,12 +88,12 @@ GDI_RGN* gdi_CreateRectRgn(INT32 nLeftRect, INT32 nTopRect, INT32 nRightRect, IN "Can not create region top/left=%" PRId32 "x%" PRId32 "-bottom/right=%" PRId32 "x%" PRId32, nTopRect, nLeftRect, nBottomRect, nRightRect); - return NULL; + return nullptr; } hRgn = (GDI_RGN*)calloc(1, sizeof(GDI_RGN)); if (!hRgn) - return NULL; + return nullptr; hRgn->objectType = GDIOBJECT_REGION; hRgn->x = nLeftRect; @@ -115,17 +115,17 @@ GDI_RGN* gdi_CreateRectRgn(INT32 nLeftRect, INT32 nTopRect, INT32 nRightRect, IN GDI_RECT* gdi_CreateRect(INT32 xLeft, INT32 yTop, INT32 xRight, INT32 yBottom) { - GDI_RECT* hRect = NULL; + GDI_RECT* hRect = nullptr; if (xLeft > xRight) - return NULL; + return nullptr; if (yTop > yBottom) - return NULL; + return nullptr; hRect = (GDI_RECT*)calloc(1, sizeof(GDI_RECT)); if (!hRect) - return NULL; + return nullptr; hRect->objectType = GDIOBJECT_RECT; hRect->left = xLeft; @@ -614,8 +614,8 @@ inline BOOL gdi_InvalidateRegion(HGDI_DC hdc, INT32 x, INT32 y, INT32 w, INT32 h { GDI_RECT inv; GDI_RECT rgn; - GDI_RGN* invalid = NULL; - GDI_RGN* cinvalid = NULL; + GDI_RGN* invalid = nullptr; + GDI_RGN* cinvalid = nullptr; if (!hdc->hwnd) return TRUE; @@ -630,7 +630,7 @@ inline BOOL gdi_InvalidateRegion(HGDI_DC hdc, INT32 x, INT32 y, INT32 w, INT32 h if ((hdc->hwnd->ninvalid + 1) > (INT64)hdc->hwnd->count) { - GDI_RGN* new_rgn = NULL; + GDI_RGN* new_rgn = nullptr; size_t new_cnt = 2ULL * hdc->hwnd->count; if (new_cnt > UINT32_MAX) return FALSE; diff --git a/libfreerdp/gdi/shape.c b/libfreerdp/gdi/shape.c index 3a8d54cc7..be8850268 100644 --- a/libfreerdp/gdi/shape.c +++ b/libfreerdp/gdi/shape.c @@ -145,7 +145,7 @@ BOOL gdi_FillRect(HGDI_DC hdc, const GDI_RECT* rect, HGDI_BRUSH hbr) if (!hdc || !hbr) return FALSE; - if (!gdi_ClipCoords(hdc, &nXDest, &nYDest, &nWidth, &nHeight, NULL, NULL)) + if (!gdi_ClipCoords(hdc, &nXDest, &nYDest, &nWidth, &nHeight, nullptr, nullptr)) return TRUE; switch (hbr->style) @@ -213,7 +213,7 @@ BOOL gdi_FillRect(HGDI_DC hdc, const GDI_RECT* rect, HGDI_BRUSH hbr) { const UINT32 tmp = FreeRDPReadColor(patp, hbr->pattern->format); dstColor = - FreeRDPConvertColor(tmp, hbr->pattern->format, hdc->format, NULL); + FreeRDPConvertColor(tmp, hbr->pattern->format, hdc->format, nullptr); } BYTE* dstp = gdi_get_bitmap_pointer(hdc, nXDest + x, nYDest + y); @@ -266,7 +266,7 @@ BOOL gdi_Rectangle(HGDI_DC hdc, INT32 nXDst, INT32 nYDst, INT32 nWidth, INT32 nH { UINT32 color = 0; - if (!gdi_ClipCoords(hdc, &nXDst, &nYDst, &nWidth, &nHeight, NULL, NULL)) + if (!gdi_ClipCoords(hdc, &nXDst, &nYDst, &nWidth, &nHeight, nullptr, nullptr)) return TRUE; color = hdc->textColor; diff --git a/libfreerdp/gdi/test/TestGdiBitBlt.c b/libfreerdp/gdi/test/TestGdiBitBlt.c index 9f8c12c59..14903aa71 100644 --- a/libfreerdp/gdi/test/TestGdiBitBlt.c +++ b/libfreerdp/gdi/test/TestGdiBitBlt.c @@ -415,55 +415,55 @@ static BOOL test_gdi_BitBlt(UINT32 SrcFormat, UINT32 DstFormat) { BOOL rc = FALSE; BOOL failed = FALSE; - HGDI_DC hdcSrc = NULL; - HGDI_DC hdcDst = NULL; + HGDI_DC hdcSrc = nullptr; + HGDI_DC hdcDst = nullptr; const UINT32 RawFormat = PIXEL_FORMAT_RGB8; - struct test_bitblt tests[] = { { GDI_SRCCOPY, bmp_SRCCOPY, NULL }, - { GDI_SPna, bmp_SPna, NULL }, - { GDI_BLACKNESS, bmp_BLACKNESS, NULL }, - { GDI_WHITENESS, bmp_WHITENESS, NULL }, - { GDI_SRCAND, bmp_SRCAND, NULL }, - { GDI_SRCPAINT, bmp_SRCPAINT, NULL }, - { GDI_SRCINVERT, bmp_SRCINVERT, NULL }, - { GDI_SRCERASE, bmp_SRCERASE, NULL }, - { GDI_NOTSRCCOPY, bmp_NOTSRCCOPY, NULL }, - { GDI_NOTSRCERASE, bmp_NOTSRCERASE, NULL }, - { GDI_DSTINVERT, bmp_DSTINVERT, NULL }, - { GDI_MERGECOPY, bmp_MERGECOPY, NULL }, - { GDI_MERGEPAINT, bmp_MERGEPAINT, NULL }, - { GDI_PATCOPY, bmp_PATCOPY, NULL }, - { GDI_PATPAINT, bmp_PATPAINT, NULL }, - { GDI_PATINVERT, bmp_PATINVERT, NULL }, - { GDI_DSTINVERT, bmp_SRC, NULL }, - { GDI_DSPDxax, bmp_SRC, NULL }, - { GDI_PSDPxax, bmp_SRC, NULL }, - { GDI_DSna, bmp_SRC, NULL }, - { GDI_DPa, bmp_SRC, NULL }, - { GDI_PDxn, bmp_SRC, NULL }, - { GDI_DSxn, bmp_SRC, NULL }, - { GDI_PSDnox, bmp_SRC, NULL }, - { GDI_PDSona, bmp_SRC, NULL }, - { GDI_DSPDxox, bmp_SRC, NULL }, - { GDI_DPSDonox, bmp_SRC, NULL }, - { GDI_SPDSxax, bmp_SRC, NULL }, - { GDI_DPon, bmp_SRC, NULL }, - { GDI_DPna, bmp_SRC, NULL }, - { GDI_Pn, bmp_SRC, NULL }, - { GDI_PDna, bmp_SRC, NULL }, - { GDI_DPan, bmp_SRC, NULL }, - { GDI_DSan, bmp_SRC, NULL }, - { GDI_DSxn, bmp_SRC, NULL }, - { GDI_DPa, bmp_SRC, NULL }, - { GDI_DSTCOPY, bmp_SRC, NULL }, - { GDI_DPno, bmp_SRC, NULL }, - { GDI_SDno, bmp_SRC, NULL }, - { GDI_PDno, bmp_SRC, NULL }, - { GDI_DPo, bmp_SRC, NULL } }; + struct test_bitblt tests[] = { { GDI_SRCCOPY, bmp_SRCCOPY, nullptr }, + { GDI_SPna, bmp_SPna, nullptr }, + { GDI_BLACKNESS, bmp_BLACKNESS, nullptr }, + { GDI_WHITENESS, bmp_WHITENESS, nullptr }, + { GDI_SRCAND, bmp_SRCAND, nullptr }, + { GDI_SRCPAINT, bmp_SRCPAINT, nullptr }, + { GDI_SRCINVERT, bmp_SRCINVERT, nullptr }, + { GDI_SRCERASE, bmp_SRCERASE, nullptr }, + { GDI_NOTSRCCOPY, bmp_NOTSRCCOPY, nullptr }, + { GDI_NOTSRCERASE, bmp_NOTSRCERASE, nullptr }, + { GDI_DSTINVERT, bmp_DSTINVERT, nullptr }, + { GDI_MERGECOPY, bmp_MERGECOPY, nullptr }, + { GDI_MERGEPAINT, bmp_MERGEPAINT, nullptr }, + { GDI_PATCOPY, bmp_PATCOPY, nullptr }, + { GDI_PATPAINT, bmp_PATPAINT, nullptr }, + { GDI_PATINVERT, bmp_PATINVERT, nullptr }, + { GDI_DSTINVERT, bmp_SRC, nullptr }, + { GDI_DSPDxax, bmp_SRC, nullptr }, + { GDI_PSDPxax, bmp_SRC, nullptr }, + { GDI_DSna, bmp_SRC, nullptr }, + { GDI_DPa, bmp_SRC, nullptr }, + { GDI_PDxn, bmp_SRC, nullptr }, + { GDI_DSxn, bmp_SRC, nullptr }, + { GDI_PSDnox, bmp_SRC, nullptr }, + { GDI_PDSona, bmp_SRC, nullptr }, + { GDI_DSPDxox, bmp_SRC, nullptr }, + { GDI_DPSDonox, bmp_SRC, nullptr }, + { GDI_SPDSxax, bmp_SRC, nullptr }, + { GDI_DPon, bmp_SRC, nullptr }, + { GDI_DPna, bmp_SRC, nullptr }, + { GDI_Pn, bmp_SRC, nullptr }, + { GDI_PDna, bmp_SRC, nullptr }, + { GDI_DPan, bmp_SRC, nullptr }, + { GDI_DSan, bmp_SRC, nullptr }, + { GDI_DSxn, bmp_SRC, nullptr }, + { GDI_DPa, bmp_SRC, nullptr }, + { GDI_DSTCOPY, bmp_SRC, nullptr }, + { GDI_DPno, bmp_SRC, nullptr }, + { GDI_SDno, bmp_SRC, nullptr }, + { GDI_PDno, bmp_SRC, nullptr }, + { GDI_DPo, bmp_SRC, nullptr } }; const UINT32 number_tests = sizeof(tests) / sizeof(tests[0]); - HGDI_BITMAP hBmpSrc = NULL; - HGDI_BITMAP hBmpDst = NULL; - HGDI_BITMAP hBmpDstOriginal = NULL; - HGDI_BRUSH brush = NULL; + HGDI_BITMAP hBmpSrc = nullptr; + HGDI_BITMAP hBmpDst = nullptr; + HGDI_BITMAP hBmpDstOriginal = nullptr; + HGDI_BRUSH brush = nullptr; gdiPalette g; gdiPalette* hPalette = &g; g.format = DstFormat; @@ -526,7 +526,7 @@ static BOOL test_gdi_BitBlt(UINT32 SrcFormat, UINT32 DstFormat) failed = TRUE; } - gdi_SelectObject(hdcDst, NULL); + gdi_SelectObject(hdcDst, nullptr); gdi_DeleteObject((HGDIOBJECT)brush); rc = !failed; fail: diff --git a/libfreerdp/gdi/test/TestGdiClip.c b/libfreerdp/gdi/test/TestGdiClip.c index 52198076a..276770104 100644 --- a/libfreerdp/gdi/test/TestGdiClip.c +++ b/libfreerdp/gdi/test/TestGdiClip.c @@ -59,7 +59,7 @@ static bool test_gdi_coords(size_t testNr, HGDI_DC hdc, const GDI_RGN* clip, con } const BOOL draw = - gdi_ClipCoords(hdc, &(rgn1->x), &(rgn1->y), &(rgn1->w), &(rgn1->h), NULL, NULL); + gdi_ClipCoords(hdc, &(rgn1->x), &(rgn1->y), &(rgn1->w), &(rgn1->h), nullptr, nullptr); if (expect) { if (!draw) @@ -101,8 +101,8 @@ fail: static int test_gdi_ClipCoords(void) { int rc = -1; - HGDI_DC hdc = NULL; - HGDI_BITMAP bmp = NULL; + HGDI_DC hdc = nullptr; + HGDI_BITMAP bmp = nullptr; const UINT32 format = PIXEL_FORMAT_ARGB32; if (!(hdc = gdi_GetDC())) @@ -112,7 +112,7 @@ static int test_gdi_ClipCoords(void) } hdc->format = format; - bmp = gdi_CreateBitmapEx(1024, 768, PIXEL_FORMAT_XRGB32, 0, NULL, NULL); + bmp = gdi_CreateBitmapEx(1024, 768, PIXEL_FORMAT_XRGB32, 0, nullptr, nullptr); gdi_SelectObject(hdc, (HGDIOBJECT)bmp); gdi_SetNullClipRgn(hdc); @@ -140,17 +140,17 @@ static int test_gdi_ClipCoords(void) const struct testcase_t testcases[] = { /* null clipping region */ - { NULL, &rgn20x20_100x100, &rgn20x20_100x100 }, + { nullptr, &rgn20x20_100x100, &rgn20x20_100x100 }, /* region all inside clipping region */ { &rgn0x0_1024x768, &rgn20x20_100x100, &rgn20x20_100x100 }, /* region all outside clipping region, on the left */ - { &rgn300x300_100x100, &rgn20x20_100x100, NULL }, + { &rgn300x300_100x100, &rgn20x20_100x100, nullptr }, /* region all outside clipping region, on the right */ - { &rgn300x300_100x100, &rgn420x420_100x100, NULL }, + { &rgn300x300_100x100, &rgn420x420_100x100, nullptr }, /* region all outside clipping region, on top */ - { &rgn300x300_100x100, &rgn300x20_100x100, NULL }, + { &rgn300x300_100x100, &rgn300x20_100x100, nullptr }, /* region all outside clipping region, at the bottom */ - { &rgn300x300_100x100, &rgn300x420_100x100, NULL }, + { &rgn300x300_100x100, &rgn300x420_100x100, nullptr }, /* left outside, right = clip, top = clip, bottom = clip */ { &rgn300x300_100x100, &rgn100x300_300x100, &rgn300x300_100x100 }, /* left outside, right inside, top = clip, bottom = clip */ @@ -184,11 +184,11 @@ fail: static int test_gdi_InvalidateRegion(void) { int rc = -1; - HGDI_DC hdc = NULL; - HGDI_RGN rgn1 = NULL; - HGDI_RGN rgn2 = NULL; - HGDI_RGN invalid = NULL; - HGDI_BITMAP bmp = NULL; + HGDI_DC hdc = nullptr; + HGDI_RGN rgn1 = nullptr; + HGDI_RGN rgn2 = nullptr; + HGDI_RGN invalid = nullptr; + HGDI_BITMAP bmp = nullptr; const UINT32 format = PIXEL_FORMAT_XRGB32; if (!(hdc = gdi_GetDC())) @@ -198,7 +198,7 @@ static int test_gdi_InvalidateRegion(void) } hdc->format = format; - bmp = gdi_CreateBitmapEx(1024, 768, PIXEL_FORMAT_XRGB32, 0, NULL, NULL); + bmp = gdi_CreateBitmapEx(1024, 768, PIXEL_FORMAT_XRGB32, 0, nullptr, nullptr); gdi_SelectObject(hdc, (HGDIOBJECT)bmp); gdi_SetNullClipRgn(hdc); hdc->hwnd = (HGDI_WND)calloc(1, sizeof(GDI_WND)); diff --git a/libfreerdp/gdi/test/TestGdiCreate.c b/libfreerdp/gdi/test/TestGdiCreate.c index ea85ea92d..c8860ccbd 100644 --- a/libfreerdp/gdi/test/TestGdiCreate.c +++ b/libfreerdp/gdi/test/TestGdiCreate.c @@ -24,7 +24,7 @@ static const UINT32 colorFormatCount = sizeof(colorFormatList) / sizeof(colorFor static int test_gdi_GetDC(void) { int rc = -1; - HGDI_DC hdc = NULL; + HGDI_DC hdc = nullptr; if (!(hdc = gdi_GetDC())) { @@ -47,8 +47,8 @@ fail: static int test_gdi_CreateCompatibleDC(void) { int rc = -1; - HGDI_DC hdc = NULL; - HGDI_DC chdc = NULL; + HGDI_DC hdc = nullptr; + HGDI_DC chdc = nullptr; if (!(hdc = gdi_GetDC())) { @@ -87,8 +87,8 @@ static int test_gdi_CreateBitmap(void) UINT32 format = PIXEL_FORMAT_ARGB32; INT32 width = 0; INT32 height = 0; - BYTE* data = NULL; - HGDI_BITMAP hBitmap = NULL; + BYTE* data = nullptr; + HGDI_BITMAP hBitmap = nullptr; width = 32; height = 16; @@ -133,10 +133,10 @@ fail: static int test_gdi_CreateCompatibleBitmap(void) { int rc = -1; - HGDI_DC hdc = NULL; + HGDI_DC hdc = nullptr; INT32 width = 0; INT32 height = 0; - HGDI_BITMAP hBitmap = NULL; + HGDI_BITMAP hBitmap = nullptr; if (!(hdc = gdi_GetDC())) { @@ -178,7 +178,7 @@ static int test_gdi_CreatePen(void) { int rc = -1; const UINT32 format = PIXEL_FORMAT_RGBA32; - HGDI_PEN hPen = gdi_CreatePen(GDI_PS_SOLID, 8, 0xAABBCCDD, format, NULL); + HGDI_PEN hPen = gdi_CreatePen(GDI_PS_SOLID, 8, 0xAABBCCDD, format, nullptr); if (!hPen) { @@ -224,9 +224,9 @@ fail: static int test_gdi_CreatePatternBrush(void) { int rc = -1; - HGDI_BRUSH hBrush = NULL; - HGDI_BITMAP hBitmap = NULL; - hBitmap = gdi_CreateBitmap(64, 64, 32, NULL); + HGDI_BRUSH hBrush = nullptr; + HGDI_BITMAP hBitmap = nullptr; + hBitmap = gdi_CreateBitmap(64, 64, 32, nullptr); hBrush = gdi_CreatePatternBrush(hBitmap); if (!hBitmap || !hBrush) @@ -292,7 +292,7 @@ fail: static int test_gdi_CreateRect(void) { int rc = -1; - GDI_RECT* hRect = NULL; + GDI_RECT* hRect = nullptr; INT32 x1 = 32; INT32 y1 = 64; INT32 x2 = 128; @@ -339,10 +339,10 @@ static BOOL test_gdi_GetPixel(void) for (UINT32 x = 0; x < colorFormatCount; x++) { UINT32 bpp = 0; - HGDI_DC hdc = NULL; + HGDI_DC hdc = nullptr; UINT32 width = 128; UINT32 height = 64; - HGDI_BITMAP hBitmap = NULL; + HGDI_BITMAP hBitmap = nullptr; if (!(hdc = gdi_GetDC())) { @@ -398,10 +398,10 @@ static BOOL test_gdi_SetPixel(void) for (UINT32 x = 0; x < colorFormatCount; x++) { UINT32 bpp = 0; - HGDI_DC hdc = NULL; + HGDI_DC hdc = nullptr; UINT32 width = 128; UINT32 height = 64; - HGDI_BITMAP hBitmap = NULL; + HGDI_BITMAP hBitmap = nullptr; if (!(hdc = gdi_GetDC())) { @@ -446,7 +446,7 @@ static BOOL test_gdi_SetPixel(void) static int test_gdi_SetROP2(void) { int rc = -1; - HGDI_DC hdc = NULL; + HGDI_DC hdc = nullptr; if (!(hdc = gdi_GetDC())) { @@ -468,11 +468,11 @@ fail: static int test_gdi_MoveToEx(void) { int rc = -1; - HGDI_DC hdc = NULL; - HGDI_PEN hPen = NULL; - HGDI_POINT prevPoint = NULL; + HGDI_DC hdc = nullptr; + HGDI_PEN hPen = nullptr; + HGDI_POINT prevPoint = nullptr; const UINT32 format = PIXEL_FORMAT_RGBA32; - gdiPalette* palette = NULL; + gdiPalette* palette = nullptr; if (!(hdc = gdi_GetDC())) { @@ -487,7 +487,7 @@ static int test_gdi_MoveToEx(void) } gdi_SelectObject(hdc, (HGDIOBJECT)hPen); - gdi_MoveToEx(hdc, 128, 256, NULL); + gdi_MoveToEx(hdc, 128, 256, nullptr); if (hdc->pen->posX != 128) goto fail; diff --git a/libfreerdp/gdi/test/TestGdiEllipse.c b/libfreerdp/gdi/test/TestGdiEllipse.c index ca9e629d0..cd3af92d6 100644 --- a/libfreerdp/gdi/test/TestGdiEllipse.c +++ b/libfreerdp/gdi/test/TestGdiEllipse.c @@ -91,12 +91,12 @@ int TestGdiEllipse(int argc, char* argv[]) for (UINT32 i = 0; i < number_formats; i++) { - HGDI_DC hdc = NULL; - HGDI_PEN pen = NULL; - HGDI_BITMAP hBmp = NULL; - HGDI_BITMAP hBmp_Ellipse_1 = NULL; - HGDI_BITMAP hBmp_Ellipse_2 = NULL; - HGDI_BITMAP hBmp_Ellipse_3 = NULL; + HGDI_DC hdc = nullptr; + HGDI_PEN pen = nullptr; + HGDI_BITMAP hBmp = nullptr; + HGDI_BITMAP hBmp_Ellipse_1 = nullptr; + HGDI_BITMAP hBmp_Ellipse_2 = nullptr; + HGDI_BITMAP hBmp_Ellipse_3 = nullptr; const UINT32 format = colorFormats[i]; gdiPalette* hPalette = &g; g.format = format; diff --git a/libfreerdp/gdi/test/TestGdiLine.c b/libfreerdp/gdi/test/TestGdiLine.c index c1aeded35..fc54ab0c0 100644 --- a/libfreerdp/gdi/test/TestGdiLine.c +++ b/libfreerdp/gdi/test/TestGdiLine.c @@ -552,7 +552,7 @@ static BOOL test_line(HGDI_DC hdc, const gdiPalette* hPalette, UINT32 mX, UINT32 if ((cX > 0) || (cY > 0) || (cW > 0) || (cH > 0)) gdi_SetClipRgn(hdc, cX, cY, cW, cH); - gdi_MoveToEx(hdc, mX, mY, NULL); + gdi_MoveToEx(hdc, mX, mY, nullptr); gdi_LineTo(hdc, lX, lY); if (!test_assert_bitmaps_equal(hBmp, hOrgBmp, "Case 10", hPalette)) @@ -579,27 +579,27 @@ int TestGdiLine(int argc, char* argv[]) for (size_t ifmt = 0; ifmt < number_formats; ifmt++) { gdiPalette g = WINPR_C_ARRAY_INIT; - HGDI_DC hdc = NULL; - HGDI_PEN pen = NULL; - HGDI_BITMAP hBmp = NULL; - struct ropMap rop_map[] = { { GDI_R2_BLACK, NULL, line_to_R2_BLACK }, - { GDI_R2_NOTMERGEPEN, NULL, line_to_R2_NOTMERGEPEN }, - { GDI_R2_MASKNOTPEN, NULL, line_to_R2_MASKNOTPEN }, - { GDI_R2_NOTCOPYPEN, NULL, line_to_R2_NOTCOPYPEN }, - { GDI_R2_MASKPENNOT, NULL, line_to_R2_MASKPENNOT }, - { GDI_R2_NOT, NULL, line_to_R2_NOT }, - { GDI_R2_XORPEN, NULL, line_to_R2_XORPEN }, - { GDI_R2_NOTMASKPEN, NULL, line_to_R2_NOTMASKPEN }, - { GDI_R2_MASKPEN, NULL, line_to_R2_MASKPEN }, - { GDI_R2_NOTXORPEN, NULL, line_to_R2_NOTXORPEN }, - { GDI_R2_NOP, NULL, line_to_R2_NOP }, - { GDI_R2_MERGENOTPEN, NULL, line_to_R2_MERGENOTPEN }, - { GDI_R2_COPYPEN, NULL, line_to_R2_COPYPEN }, - { GDI_R2_MERGEPENNOT, NULL, line_to_R2_MERGEPENNOT }, - { GDI_R2_MERGEPEN, NULL, line_to_R2_MERGEPEN }, - { GDI_R2_WHITE, NULL, line_to_R2_WHITE } }; + HGDI_DC hdc = nullptr; + HGDI_PEN pen = nullptr; + HGDI_BITMAP hBmp = nullptr; + struct ropMap rop_map[] = { { GDI_R2_BLACK, nullptr, line_to_R2_BLACK }, + { GDI_R2_NOTMERGEPEN, nullptr, line_to_R2_NOTMERGEPEN }, + { GDI_R2_MASKNOTPEN, nullptr, line_to_R2_MASKNOTPEN }, + { GDI_R2_NOTCOPYPEN, nullptr, line_to_R2_NOTCOPYPEN }, + { GDI_R2_MASKPENNOT, nullptr, line_to_R2_MASKPENNOT }, + { GDI_R2_NOT, nullptr, line_to_R2_NOT }, + { GDI_R2_XORPEN, nullptr, line_to_R2_XORPEN }, + { GDI_R2_NOTMASKPEN, nullptr, line_to_R2_NOTMASKPEN }, + { GDI_R2_MASKPEN, nullptr, line_to_R2_MASKPEN }, + { GDI_R2_NOTXORPEN, nullptr, line_to_R2_NOTXORPEN }, + { GDI_R2_NOP, nullptr, line_to_R2_NOP }, + { GDI_R2_MERGENOTPEN, nullptr, line_to_R2_MERGENOTPEN }, + { GDI_R2_COPYPEN, nullptr, line_to_R2_COPYPEN }, + { GDI_R2_MERGEPENNOT, nullptr, line_to_R2_MERGEPENNOT }, + { GDI_R2_MERGEPEN, nullptr, line_to_R2_MERGEPEN }, + { GDI_R2_WHITE, nullptr, line_to_R2_WHITE } }; const size_t map_size = sizeof(rop_map) / sizeof(rop_map[0]); - HGDI_BITMAP hBmp_LineTo[LINTETO_NUMBER] = { NULL }; + HGDI_BITMAP hBmp_LineTo[LINTETO_NUMBER] = { nullptr }; gdiPalette* hPalette = &g; UINT32 penColor = 0; const UINT32 format = colorFormats[ifmt]; @@ -695,7 +695,7 @@ int TestGdiLine(int argc, char* argv[]) } gdi_SetClipRgn(hdc, 0, 0, 16, 16); - gdi_MoveToEx(hdc, 0, 0, NULL); + gdi_MoveToEx(hdc, 0, 0, nullptr); gdi_SetROP2(hdc, rop_map[x].rop); gdi_LineTo(hdc, 16, 16); diff --git a/libfreerdp/gdi/test/TestGdiRect.c b/libfreerdp/gdi/test/TestGdiRect.c index 67a37f393..4f93378c6 100644 --- a/libfreerdp/gdi/test/TestGdiRect.c +++ b/libfreerdp/gdi/test/TestGdiRect.c @@ -17,7 +17,7 @@ static int test_gdi_PtInRect(void) { int rc = -1; - GDI_RECT* hRect = NULL; + GDI_RECT* hRect = nullptr; UINT32 left = 20; UINT32 top = 40; UINT32 right = 60; @@ -69,10 +69,10 @@ fail: static int test_gdi_FillRect(void) { int rc = -1; - HGDI_DC hdc = NULL; - GDI_RECT* hRect = NULL; - HGDI_BRUSH hBrush = NULL; - HGDI_BITMAP hBitmap = NULL; + HGDI_DC hdc = nullptr; + GDI_RECT* hRect = nullptr; + HGDI_BRUSH hBrush = nullptr; + HGDI_BITMAP hBitmap = nullptr; UINT32 color = 0; UINT32 pixel = 0; UINT32 rawPixel = 0; @@ -115,7 +115,7 @@ static int test_gdi_FillRect(void) for (UINT32 y = 0; y < height; y++) { rawPixel = gdi_GetPixel(hdc, x, y); - pixel = FreeRDPConvertColor(rawPixel, hdc->format, PIXEL_FORMAT_ARGB32, NULL); + pixel = FreeRDPConvertColor(rawPixel, hdc->format, PIXEL_FORMAT_ARGB32, nullptr); if (gdi_PtInRect(hRect, WINPR_ASSERTING_INT_CAST(int, x), WINPR_ASSERTING_INT_CAST(int, y))) diff --git a/libfreerdp/gdi/test/TestGdiRegion.c b/libfreerdp/gdi/test/TestGdiRegion.c index f5d2aa700..89b668432 100644 --- a/libfreerdp/gdi/test/TestGdiRegion.c +++ b/libfreerdp/gdi/test/TestGdiRegion.c @@ -22,10 +22,10 @@ int TestGdiRegion(int argc, char* argv[]) INT32 r = 0; INT32 t = 0; INT32 b = 0; - HGDI_RGN rgn1 = NULL; - HGDI_RGN rgn2 = NULL; - GDI_RECT* rect1 = NULL; - GDI_RECT* rect2 = NULL; + HGDI_RGN rgn1 = nullptr; + HGDI_RGN rgn2 = nullptr; + GDI_RECT* rect1 = nullptr; + GDI_RECT* rect2 = nullptr; WINPR_UNUSED(argc); WINPR_UNUSED(argv); @@ -178,7 +178,7 @@ int TestGdiRegion(int argc, char* argv[]) if (!gdi_SetRect(rect2, -4, 500, 66, 754)) goto fail; - if (gdi_SetRgn(NULL, -23, -42, 33, 99)) + if (gdi_SetRgn(nullptr, -23, -42, 33, 99)) goto fail; if (gdi_SetRgn(rgn2, -23, -42, -33, 99)) goto fail; @@ -197,7 +197,7 @@ int TestGdiRegion(int argc, char* argv[]) if (rgn2->null) goto fail; - if (gdi_SetRectRgn(NULL, 33, 22, 44, 33)) + if (gdi_SetRectRgn(nullptr, 33, 22, 44, 33)) goto fail; if (gdi_SetRectRgn(rgn1, 331, 22, 44, 33)) goto fail; @@ -219,11 +219,11 @@ int TestGdiRegion(int argc, char* argv[]) if (!gdi_EqualRgn(rgn1, rgn1)) goto fail; - if (gdi_CopyRect(rect1, NULL)) + if (gdi_CopyRect(rect1, nullptr)) goto fail; - if (gdi_CopyRect(NULL, rect1)) + if (gdi_CopyRect(nullptr, rect1)) goto fail; - if (gdi_CopyRect(NULL, NULL)) + if (gdi_CopyRect(nullptr, nullptr)) goto fail; if (!gdi_CopyRect(rect1, rect2)) goto fail; diff --git a/libfreerdp/gdi/test/TestGdiRop3.c b/libfreerdp/gdi/test/TestGdiRop3.c index 50b8e1819..29f3c3382 100644 --- a/libfreerdp/gdi/test/TestGdiRop3.c +++ b/libfreerdp/gdi/test/TestGdiRop3.c @@ -118,8 +118,8 @@ static char* gdi_convert_postfix_to_infix(const char* postfix) } else { - char* a = NULL; - char* b = NULL; + char* a = nullptr; + char* b = nullptr; /* token is an operator */ unary = FALSE; @@ -189,7 +189,7 @@ static char* gdi_convert_postfix_to_infix(const char* postfix) end: Stack_Free(stack); - return NULL; + return nullptr; } static const char* test_ROP3[] = { "DSPDxax", "PSDPxax", "SPna", "DSna", "DPa", diff --git a/libfreerdp/gdi/test/helpers.c b/libfreerdp/gdi/test/helpers.c index 752acb0c1..81e691d32 100644 --- a/libfreerdp/gdi/test/helpers.c +++ b/libfreerdp/gdi/test/helpers.c @@ -24,8 +24,8 @@ HGDI_BITMAP test_convert_to_bitmap(const BYTE* src, UINT32 SrcFormat, UINT32 Src UINT32 yDst, UINT32 nWidth, UINT32 nHeight, const gdiPalette* hPalette) { - HGDI_BITMAP bmp = NULL; - BYTE* data = NULL; + HGDI_BITMAP bmp = nullptr; + BYTE* data = nullptr; if (DstStride == 0) DstStride = nWidth * FreeRDPGetBytesPerPixel(DstFormat); @@ -33,13 +33,13 @@ HGDI_BITMAP test_convert_to_bitmap(const BYTE* src, UINT32 SrcFormat, UINT32 Src data = winpr_aligned_malloc(1ULL * DstStride * nHeight, 16); if (!data) - return NULL; + return nullptr; if (!freerdp_image_copy(data, DstFormat, DstStride, xDst, yDst, nWidth, nHeight, src, SrcFormat, SrcStride, xSrc, ySrc, hPalette, FREERDP_FLIP_NONE)) { winpr_aligned_free(data); - return NULL; + return nullptr; } bmp = gdi_CreateBitmap(nWidth, nHeight, DstFormat, data); @@ -47,7 +47,7 @@ HGDI_BITMAP test_convert_to_bitmap(const BYTE* src, UINT32 SrcFormat, UINT32 Src if (!bmp) { winpr_aligned_free(data); - return NULL; + return nullptr; } return bmp; diff --git a/libfreerdp/gdi/video.c b/libfreerdp/gdi/video.c index 6b1d6f1b0..5c2970528 100644 --- a/libfreerdp/gdi/video.c +++ b/libfreerdp/gdi/video.c @@ -62,8 +62,8 @@ static BOOL gdiVideoShowSurface(VideoClientContext* video, const VideoSurface* s UINT32 destinationWidth, UINT32 destinationHeight) { BOOL rc = FALSE; - rdpGdi* gdi = NULL; - rdpUpdate* update = NULL; + rdpGdi* gdi = nullptr; + rdpUpdate* update = nullptr; WINPR_ASSERT(video); WINPR_ASSERT(surface); @@ -140,7 +140,7 @@ void gdi_video_control_init(rdpGdi* gdi, VideoClientContext* video) void gdi_video_control_uninit(rdpGdi* gdi, WINPR_ATTR_UNUSED VideoClientContext* video) { WINPR_ASSERT(gdi); - gdi->video = NULL; + gdi->video = nullptr; } void gdi_video_data_init(WINPR_ATTR_UNUSED rdpGdi* gdi, WINPR_ATTR_UNUSED VideoClientContext* video) @@ -158,13 +158,13 @@ void gdi_video_data_uninit(WINPR_ATTR_UNUSED rdpGdi* gdi, VideoSurface* VideoClient_CreateCommonContext(size_t size, UINT32 x, UINT32 y, UINT32 w, UINT32 h) { - VideoSurface* ret = NULL; + VideoSurface* ret = nullptr; WINPR_ASSERT(size >= sizeof(VideoSurface)); ret = calloc(1, size); if (!ret) - return NULL; + return nullptr; ret->format = PIXEL_FORMAT_BGRX32; ret->x = x; @@ -181,7 +181,7 @@ VideoSurface* VideoClient_CreateCommonContext(size_t size, UINT32 x, UINT32 y, U return ret; fail: VideoClient_DestroyCommonContext(ret); - return NULL; + return nullptr; } void VideoClient_DestroyCommonContext(VideoSurface* surface) diff --git a/libfreerdp/locale/keyboard.c b/libfreerdp/locale/keyboard.c index 5c56cf06f..8d3cfde3c 100644 --- a/libfreerdp/locale/keyboard.c +++ b/libfreerdp/locale/keyboard.c @@ -240,7 +240,7 @@ static int freerdp_detect_keyboard(DWORD* keyboardLayoutId) ULONG rc; errno = 0; - rc = strtoul(name, NULL, 16); + rc = strtoul(name, nullptr, 16); if (errno == 0) *keyboardLayoutId = rc; } @@ -365,7 +365,7 @@ FREERDP_REMAP_TABLE* freerdp_keyboard_remap_string_to_list(const char* list) FREERDP_REMAP_TABLE* remap_table = calloc(1, sizeof(FREERDP_REMAP_TABLE)); if (!remap_table) - return NULL; + return nullptr; for (size_t x = 0; x < ARRAYSIZE(remap_table->table); x++) remap_table->table[x] = (UINT32)x; @@ -379,7 +379,7 @@ FREERDP_REMAP_TABLE* freerdp_keyboard_remap_string_to_list(const char* list) goto fail; { - char* context = NULL; + char* context = nullptr; char* token = strtok_s(copy, ",", &context); while (token) { @@ -390,7 +390,7 @@ FREERDP_REMAP_TABLE* freerdp_keyboard_remap_string_to_list(const char* list) if (key >= remap_table_size) goto fail; remap_table->table[key] = value; - token = strtok_s(NULL, ",", &context); + token = strtok_s(nullptr, ",", &context); } } @@ -402,7 +402,7 @@ fail: if (!success) { free(remap_table); - return NULL; + return nullptr; } return remap_table; } @@ -416,8 +416,8 @@ DWORD freerdp_keyboard_init_ex(DWORD keyboardLayoutId, const char* keyboardRemap if (keyboardRemappingList) { char* copy = _strdup(keyboardRemappingList); - char* context = NULL; - char* token = NULL; + char* context = nullptr; + char* token = nullptr; if (!copy) goto fail; token = strtok_s(copy, ",", &context); @@ -430,7 +430,7 @@ DWORD freerdp_keyboard_init_ex(DWORD keyboardLayoutId, const char* keyboardRemap if (key >= ARRAYSIZE(REMAPPING_TABLE)) goto fail; REMAPPING_TABLE[key] = value; - token = strtok_s(NULL, ",", &context); + token = strtok_s(nullptr, ",", &context); } fail: free(copy); @@ -507,7 +507,7 @@ const char* freerdp_keyboard_scancode_name(DWORD scancode) return entry->name; } - return NULL; + return nullptr; } DWORD freerdp_keyboard_remap_key(const FREERDP_REMAP_TABLE* remap_table, DWORD rdpScanCode) diff --git a/libfreerdp/locale/keyboard_apple.c b/libfreerdp/locale/keyboard_apple.c index b9a385fe9..9dc450f47 100644 --- a/libfreerdp/locale/keyboard_apple.c +++ b/libfreerdp/locale/keyboard_apple.c @@ -188,7 +188,7 @@ static const KEYBOARD_LAYOUT_MAPPING KEYBOARD_MAPPING_TABLE[] = { int freerdp_detect_keyboard_layout_from_cf(DWORD* keyboardLayoutId) { CFIndex length; - char* inputSourceId = NULL; + char* inputSourceId = nullptr; CFStringRef inputSourceIdRef; TISInputSourceRef inputSrc = TISCopyCurrentKeyboardLayoutInputSource(); if (!inputSrc) diff --git a/libfreerdp/locale/keyboard_layout.c b/libfreerdp/locale/keyboard_layout.c index 8479ad58b..bc48e2d2b 100644 --- a/libfreerdp/locale/keyboard_layout.c +++ b/libfreerdp/locale/keyboard_layout.c @@ -904,7 +904,7 @@ static BOOL load_layout_file(void) { #if defined(DUMP_LAYOUTS_TO_JSON) /* Dump to file in /tmp */ - char* str = NULL; + char* str = nullptr; WINPR_JSON* json = WINPR_JSON_CreateObject(); if (!json) goto end; @@ -933,13 +933,13 @@ end: return TRUE; } #else -static RDP_KEYBOARD_LAYOUT* sRDP_KEYBOARD_LAYOUT_TABLE = NULL; +static RDP_KEYBOARD_LAYOUT* sRDP_KEYBOARD_LAYOUT_TABLE = nullptr; static size_t sRDP_KEYBOARD_LAYOUT_TABLE_len = 0; -static RDP_KEYBOARD_LAYOUT_VARIANT* sRDP_KEYBOARD_LAYOUT_VARIANT_TABLE = NULL; +static RDP_KEYBOARD_LAYOUT_VARIANT* sRDP_KEYBOARD_LAYOUT_VARIANT_TABLE = nullptr; static size_t sRDP_KEYBOARD_LAYOUT_VARIANT_TABLE_len = 0; -static RDP_KEYBOARD_IME* sRDP_KEYBOARD_IME_TABLE = NULL; +static RDP_KEYBOARD_IME* sRDP_KEYBOARD_IME_TABLE = nullptr; static size_t sRDP_KEYBOARD_IME_TABLE_len = 0; static void clear_keyboard_layout(RDP_KEYBOARD_LAYOUT* layout) @@ -982,7 +982,7 @@ static void clear_layout_tables(void) } free(sRDP_KEYBOARD_LAYOUT_TABLE); - sRDP_KEYBOARD_LAYOUT_TABLE = NULL; + sRDP_KEYBOARD_LAYOUT_TABLE = nullptr; sRDP_KEYBOARD_LAYOUT_TABLE_len = 0; for (size_t x = 0; x < sRDP_KEYBOARD_LAYOUT_VARIANT_TABLE_len; x++) @@ -991,7 +991,7 @@ static void clear_layout_tables(void) clear_keyboard_variant(variant); } free(sRDP_KEYBOARD_LAYOUT_VARIANT_TABLE); - sRDP_KEYBOARD_LAYOUT_VARIANT_TABLE = NULL; + sRDP_KEYBOARD_LAYOUT_VARIANT_TABLE = nullptr; sRDP_KEYBOARD_LAYOUT_VARIANT_TABLE_len = 0; for (size_t x = 0; x < sRDP_KEYBOARD_IME_TABLE_len; x++) @@ -1000,7 +1000,7 @@ static void clear_layout_tables(void) clear_keyboard_ime(ime); } free(sRDP_KEYBOARD_IME_TABLE); - sRDP_KEYBOARD_IME_TABLE = NULL; + sRDP_KEYBOARD_IME_TABLE = nullptr; sRDP_KEYBOARD_IME_TABLE_len = 0; } @@ -1019,7 +1019,7 @@ static char* get_object_str(WINPR_JSON* json, size_t pos, const char* name) { WLog_WARN(TAG, "Invalid JSON entry at entry %" PRIuz ", missing an Object named '%s'", pos, name); - return NULL; + return nullptr; } WINPR_JSON* obj = WINPR_JSON_GetObjectItemCaseSensitive(json, name); WINPR_ASSERT(obj); @@ -1028,15 +1028,15 @@ static char* get_object_str(WINPR_JSON* json, size_t pos, const char* name) WLog_WARN(TAG, "Invalid JSON entry at entry %" PRIuz ", Object named '%s': Not of type string", pos, name); - return NULL; + return nullptr; } const char* str = WINPR_JSON_GetStringValue(obj); if (!str) { - WLog_WARN(TAG, "Invalid JSON entry at entry %" PRIuz ", Object named '%s': NULL string", + WLog_WARN(TAG, "Invalid JSON entry at entry %" PRIuz ", Object named '%s': nullptr string", pos, name); - return NULL; + return nullptr; } return _strdup(str); @@ -1078,7 +1078,7 @@ static bool parse_json_layout_entry_id(WINPR_JSON* json, size_t pos, RDP_KEYBOAR } entry->code = WINPR_CXX_COMPAT_CAST(uint32_t, code); entry->name = get_object_str(json, pos, "name"); - return entry->name != NULL; + return entry->name != nullptr; } static BOOL parse_json_layout_entry(WINPR_JSON* json, size_t pos, RDP_KEYBOARD_LAYOUT* entry) @@ -1229,7 +1229,7 @@ static BOOL CALLBACK load_layouts(PINIT_ONCE once, PVOID param, PVOID* context) WINPR_UNUSED(param); WINPR_UNUSED(context); - WINPR_JSON* json = NULL; + WINPR_JSON* json = nullptr; char* filename = GetCombinedPath(FREERDP_RESOURCE_ROOT, "KeyboardLayoutMap.json"); if (!filename) { @@ -1274,7 +1274,7 @@ end: static BOOL load_layout_file(void) { static INIT_ONCE once = INIT_ONCE_STATIC_INIT; - InitOnceExecuteOnce(&once, load_layouts, NULL, NULL); + InitOnceExecuteOnce(&once, load_layouts, nullptr, nullptr); return TRUE; } @@ -1340,7 +1340,7 @@ static const char* rdp_keyboard_layout_by_id(UINT32 id) return layout->name; } - return 0; + return nullptr; } static const char* rdp_keyboard_variant_by_id(UINT32 id) @@ -1353,7 +1353,7 @@ static const char* rdp_keyboard_variant_by_id(UINT32 id) if (variant->code == id) return variant->name; } - return 0; + return nullptr; } static const char* rdp_keyboard_ime_by_id(UINT32 id) @@ -1366,7 +1366,7 @@ static const char* rdp_keyboard_ime_by_id(UINT32 id) if (ime->code == id) return ime->name; } - return NULL; + return nullptr; } static BOOL rdp_keyboard_layout_clone_append(RDP_KEYBOARD_LAYOUT** layouts, size_t* pcount) @@ -1465,7 +1465,7 @@ void freerdp_keyboard_layouts_free(RDP_KEYBOARD_LAYOUT* layouts, size_t count) RDP_KEYBOARD_LAYOUT* freerdp_keyboard_get_layouts(DWORD types, size_t* count) { size_t num = 0; - RDP_KEYBOARD_LAYOUT* layouts = NULL; + RDP_KEYBOARD_LAYOUT* layouts = nullptr; load_layout_file(); @@ -1496,7 +1496,7 @@ RDP_KEYBOARD_LAYOUT* freerdp_keyboard_get_layouts(DWORD types, size_t* count) return layouts; fail: freerdp_keyboard_layouts_free(layouts, num); - return NULL; + return nullptr; } const char* freerdp_keyboard_get_layout_name_from_id(DWORD keyboardLayoutID) @@ -1550,7 +1550,7 @@ static void copy(const struct LanguageIdentifier* id, RDP_CODEPAGE* cp) static BOOL copyOnMatch(DWORD column, const char* filter, const struct LanguageIdentifier* cur, RDP_CODEPAGE* dst) { - const char* what = NULL; + const char* what = nullptr; switch (column) { case 0: @@ -1589,7 +1589,7 @@ RDP_CODEPAGE* freerdp_keyboard_get_matching_codepages(DWORD column, const char* RDP_CODEPAGE* pages = calloc(ARRAYSIZE(language_identifiers), sizeof(RDP_CODEPAGE)); if (!pages) - return NULL; + return nullptr; if (count) *count = 0; @@ -1613,7 +1613,7 @@ RDP_CODEPAGE* freerdp_keyboard_get_matching_codepages(DWORD column, const char* return pages; fail: freerdp_codepages_free(pages); - return NULL; + return nullptr; } void freerdp_codepages_free(RDP_CODEPAGE* pages) diff --git a/libfreerdp/locale/keyboard_sun.c b/libfreerdp/locale/keyboard_sun.c index 094ed5b6a..70bb3fb58 100644 --- a/libfreerdp/locale/keyboard_sun.c +++ b/libfreerdp/locale/keyboard_sun.c @@ -225,30 +225,30 @@ int freerdp_get_solaris_keyboard_layout_and_type(int* type, int* layout) if (!kbd) return -1; - while (fgets(buffer, sizeof(buffer), kbd) != NULL) + while (fgets(buffer, sizeof(buffer), kbd) != nullptr) { long val; - if ((pch = strstr(buffer, "type=")) != NULL) + if ((pch = strstr(buffer, "type=")) != nullptr) { beg = pch + sizeof("type=") - 1; end = strchr(beg, '\n'); end[0] = '\0'; errno = 0; - val = strtol(beg, NULL, 0); + val = strtol(beg, nullptr, 0); if ((errno != 0) || (val < INT32_MIN) || (val > INT32_MAX)) goto fail; *type = val; } - else if ((pch = strstr(buffer, "layout=")) != NULL) + else if ((pch = strstr(buffer, "layout=")) != nullptr) { beg = pch + sizeof("layout=") - 1; end = strchr(beg, ' '); end[0] = '\0'; errno = 0; - val = strtol(beg, NULL, 0); + val = strtol(beg, nullptr, 0); if ((errno != 0) || (val < INT32_MIN) || (val > INT32_MAX)) goto fail; diff --git a/libfreerdp/locale/keyboard_x11.c b/libfreerdp/locale/keyboard_x11.c index c6b5d3200..52c008d2f 100644 --- a/libfreerdp/locale/keyboard_x11.c +++ b/libfreerdp/locale/keyboard_x11.c @@ -86,9 +86,9 @@ static BOOL parse_xkb_rule_names(char* xkb_rule, unsigned long num_bytes, char** static DWORD kbd_layout_id_from_x_property(Display* display, Window root, char* property_name) { - char* layout = NULL; - char* variant = NULL; - char* rule = NULL; + char* layout = nullptr; + char* variant = nullptr; + char* rule = nullptr; Atom type = None; int item_size = 0; unsigned long items = 0; @@ -121,7 +121,7 @@ static DWORD kbd_layout_id_from_x_property(Display* display, Window root, char* int freerdp_detect_keyboard_layout_from_xkb(DWORD* keyboardLayoutId) { - Display* display = XOpenDisplay(NULL); + Display* display = XOpenDisplay(nullptr); if (!display) return 0; diff --git a/libfreerdp/locale/keyboard_xkbfile.c b/libfreerdp/locale/keyboard_xkbfile.c index 159b918ee..453208996 100644 --- a/libfreerdp/locale/keyboard_xkbfile.c +++ b/libfreerdp/locale/keyboard_xkbfile.c @@ -306,15 +306,15 @@ static void* freerdp_keyboard_xkb_init(void) { int status = 0; - Display* display = XOpenDisplay(NULL); + Display* display = XOpenDisplay(nullptr); if (!display) - return NULL; + return nullptr; - status = XkbQueryExtension(display, NULL, NULL, NULL, NULL, NULL); + status = XkbQueryExtension(display, nullptr, nullptr, nullptr, nullptr, nullptr); if (!status) - return NULL; + return nullptr; return (void*)display; } @@ -352,7 +352,7 @@ int freerdp_keyboard_init_xkbfile(DWORD* keyboardLayoutId, DWORD* x11_keycode_to /* return substring starting after nth comma, ending at following comma */ static char* comma_substring(char* s, size_t n) { - char* p = NULL; + char* p = nullptr; if (!s) return ""; @@ -377,7 +377,7 @@ int detect_keyboard_layout_from_xkbfile(void* display, DWORD* keyboardLayoutId) if (!display) return -2; - char* rules = NULL; + char* rules = nullptr; XkbRF_VarDefsRec rules_names = WINPR_C_ARRAY_INIT; const Bool rc = XkbRF_GetNamesProp(display, &rules, &rules_names); if (!rc) @@ -470,7 +470,7 @@ int freerdp_keyboard_load_map_from_xkbfile(void* display, DWORD* x11_keycode_to_ XkbDescPtr xkb = XkbGetMap(display, 0, XkbUseCoreKbd); if (!xkb) { - DEBUG_KBD("XkbGetMap() == NULL"); + DEBUG_KBD("XkbGetMap() == nullptr"); return -3; } diff --git a/libfreerdp/locale/locale.c b/libfreerdp/locale/locale.c index 0234c824c..63a328497 100644 --- a/libfreerdp/locale/locale.c +++ b/libfreerdp/locale/locale.c @@ -676,10 +676,10 @@ static BOOL freerdp_get_system_language_and_country_codes(char* language, size_t size_t dot = 0; DWORD nSize = 0; size_t underscore = 0; - char* env_lang = NULL; + char* env_lang = nullptr; LPCSTR lang = "LANG"; /* LANG = _. */ - nSize = GetEnvironmentVariableA(lang, NULL, 0); + nSize = GetEnvironmentVariableA(lang, nullptr, 0); if (!nSize) return FALSE; /* LANG environment variable was not set */ @@ -736,7 +736,7 @@ static const SYSTEM_LOCALE* freerdp_detect_system_locale(void) { char language[LOCALE_LANGUAGE_LEN] = WINPR_C_ARRAY_INIT; char country[LOCALE_COUNTRY_LEN] = WINPR_C_ARRAY_INIT; - const SYSTEM_LOCALE* locale = NULL; + const SYSTEM_LOCALE* locale = nullptr; freerdp_get_system_language_and_country_codes(language, ARRAYSIZE(language), country, ARRAYSIZE(country)); @@ -757,10 +757,10 @@ static const SYSTEM_LOCALE* freerdp_detect_system_locale(void) DWORD freerdp_get_system_locale_id(void) { - const SYSTEM_LOCALE* locale = NULL; + const SYSTEM_LOCALE* locale = nullptr; locale = freerdp_detect_system_locale(); - if (locale != NULL) + if (locale != nullptr) return locale->code; return 0; @@ -781,7 +781,7 @@ static const SYSTEM_LOCALE* get_locale_from_str(const char* name) else if ((strcmp(name, current->language) == 0)) return current; } - return NULL; + return nullptr; } static INT64 get_layout_from_locale(const SYSTEM_LOCALE* locale) @@ -831,7 +831,7 @@ const char* freerdp_get_system_locale_name_from_id(DWORD localeId) return current->name; } - return NULL; + return nullptr; } INT64 freerdp_get_locale_id_from_string(const char* locale) diff --git a/libfreerdp/locale/test/TestLocaleKeyboard.c b/libfreerdp/locale/test/TestLocaleKeyboard.c index bca9d7d02..50f8c96b2 100644 --- a/libfreerdp/locale/test/TestLocaleKeyboard.c +++ b/libfreerdp/locale/test/TestLocaleKeyboard.c @@ -213,7 +213,7 @@ static BOOL test_layouts(DWORD types) " elements, failed:\n", types, count); (void)fprintf(stderr, - "[%" PRIuz "]: freerdp_keyboard_get_layouts(%" PRIu32 ") -> NULL\n", x, + "[%" PRIuz "]: freerdp_keyboard_get_layouts(%" PRIu32 ") -> nullptr\n", x, cur->code); goto fail; } @@ -293,11 +293,11 @@ static BOOL test_codepages(void) for (DWORD column = 0; column < 4; column++) { size_t count = 0; - RDP_CODEPAGE* cp = freerdp_keyboard_get_matching_codepages(column, NULL, &count); + RDP_CODEPAGE* cp = freerdp_keyboard_get_matching_codepages(column, nullptr, &count); if (!cp || (count == 0)) { (void)fprintf(stderr, - "freerdp_keyboard_get_matching_codepages(%" PRIu32 ", NULL) failed!\n", + "freerdp_keyboard_get_matching_codepages(%" PRIu32 ", nullptr) failed!\n", column); return FALSE; } @@ -308,13 +308,13 @@ static BOOL test_codepages(void) { DWORD column = get_random(4); size_t count = 0; - RDP_CODEPAGE* cp = freerdp_keyboard_get_matching_codepages(column, NULL, &count); + RDP_CODEPAGE* cp = freerdp_keyboard_get_matching_codepages(column, nullptr, &count); freerdp_codepages_free(cp); if (cp || (count != 0)) { (void)fprintf(stderr, "freerdp_keyboard_get_matching_codepages(%" PRIu32 - ", NULL) returned not NULL!\n", + ", nullptr) returned not nullptr!\n", column); return FALSE; } @@ -336,10 +336,10 @@ static BOOL test_init(void) return FALSE; } - const DWORD kbdex = freerdp_keyboard_init_ex(0, NULL); + const DWORD kbdex = freerdp_keyboard_init_ex(0, nullptr); if (kbd == 0) { - (void)fprintf(stderr, "freerdp_keyboard_init_ex(0, NULL) returned invalid layout 0\n"); + (void)fprintf(stderr, "freerdp_keyboard_init_ex(0, nullptr) returned invalid layout 0\n"); return FALSE; } @@ -347,7 +347,7 @@ static BOOL test_init(void) { (void)fprintf( stderr, - "freerdp_keyboard_init(0) != freerdp_keyboard_init_ex(0, NULL): returned %" PRIu32 + "freerdp_keyboard_init(0) != freerdp_keyboard_init_ex(0, nullptr): returned %" PRIu32 " vs %" PRIu32 "\n", kbd, kbdex); return FALSE; diff --git a/libfreerdp/locale/xkb_layout_ids.c b/libfreerdp/locale/xkb_layout_ids.c index e7eb9f789..ddf1bb0c8 100644 --- a/libfreerdp/locale/xkb_layout_ids.c +++ b/libfreerdp/locale/xkb_layout_ids.c @@ -740,10 +740,10 @@ static const XKB_VARIANT tm_variants[] = { static const XKB_LAYOUT xkbLayouts[] = { { "us", KBD_US, us_variants }, /* USA */ - { "ad", 0, NULL }, /* Andorra */ + { "ad", 0, nullptr }, /* Andorra */ { "af", KBD_FARSI, af_variants }, /* Afghanistan */ { "ara", KBD_ARABIC_101, ara_variants }, /* Arabic */ - { "al", 0, NULL }, /* Albania */ + { "al", 0, nullptr }, /* Albania */ { "am", KBD_ARMENIAN_EASTERN, am_variants }, /* Armenia */ { "az", KBD_AZERI_CYRILLIC, az_variants }, /* Azerbaijan */ { "by", KBD_BELARUSIAN, by_variants }, /* Belarus */ @@ -754,15 +754,15 @@ static const XKB_LAYOUT xkbLayouts[] = { { "br", KBD_PORTUGUESE_BRAZILIAN_ABNT, br_variants }, /* Brazil */ { "bg", KBD_BULGARIAN_LATIN, bg_variants }, /* Bulgaria */ { "ma", KBD_FRENCH, ma_variants }, /* Morocco */ - { "mm", 0, NULL }, /* Myanmar */ + { "mm", 0, nullptr }, /* Myanmar */ { "ca", KBD_US, ca_variants }, /* Canada */ - { "cd", 0, NULL }, /* Congo, Democratic Republic of the */ + { "cd", 0, nullptr }, /* Congo, Democratic Republic of the */ { "cn", KBD_CHINESE_TRADITIONAL_PHONETIC, cn_variants }, /* China */ { "hr", KBD_CROATIAN, hr_variants }, /* Croatia */ { "cz", KBD_CZECH, cz_variants }, /* Czechia */ { "dk", KBD_DANISH, dk_variants }, /* Denmark */ { "nl", KBD_DUTCH, nl_variants }, /* Netherlands */ - { "bt", 0, NULL }, /* Bhutan */ + { "bt", 0, nullptr }, /* Bhutan */ { "ee", KBD_ESTONIAN, ee_variants }, /* Estonia */ { "ir", 0, ir_variants }, /* Iran */ { "iq", 0, iq_variants }, /* Iraq */ @@ -770,7 +770,7 @@ static const XKB_LAYOUT xkbLayouts[] = { { "fi", KBD_FINNISH, fi_variants }, /* Finland */ { "fr", KBD_FRENCH, fr_variants }, /* France */ { "gh", 0, gh_variants }, /* Ghana */ - { "gn", 0, NULL }, /* Guinea */ + { "gn", 0, nullptr }, /* Guinea */ { "ge", KBD_GEORGIAN, ge_variants }, /* Georgia */ { "at", KBD_GERMAN, de_variants }, /* Austria */ { "de", KBD_GERMAN, de_variants }, /* Germany */ @@ -781,17 +781,17 @@ static const XKB_LAYOUT xkbLayouts[] = { { "it", KBD_ITALIAN, it_variants }, /* Italy */ { "jp", KBD_JAPANESE_INPUT_SYSTEM_MS_IME2002, jp_variants }, /* Japan */ { "kg", 0, kg_variants }, /* Kyrgyzstan */ - { "kh", 0, NULL }, /* Cambodia */ + { "kh", 0, nullptr }, /* Cambodia */ { "kz", KBD_KAZAKH, kz_variants }, /* Kazakhstan */ - { "la", 0, NULL }, /* Laos */ + { "la", 0, nullptr }, /* Laos */ { "latam", KBD_LATIN_AMERICAN, latam_variants }, /* Latin America */ { "lt", KBD_LITHUANIAN, lt_variants }, /* Lithuania */ { "lv", KBD_LATVIAN, lv_variants }, /* Latvia */ - { "mao", KBD_MAORI, NULL }, /* Maori */ + { "mao", KBD_MAORI, nullptr }, /* Maori */ { "me", KBD_SERBIAN_LATIN, me_variants }, /* Montenegro */ { "mk", KBD_FYRO_MACEDONIAN, mk_variants }, /* Macedonia */ { "mt", KBD_MALTESE_48_KEY, mt_variants }, /* Malta */ - { "mn", KBD_MONGOLIAN_CYRILLIC, NULL }, /* Mongolia */ + { "mn", KBD_MONGOLIAN_CYRILLIC, nullptr }, /* Mongolia */ { "no", KBD_NORWEGIAN, no_variants }, /* Norway */ { "pl", KBD_POLISH_PROGRAMMERS, pl_variants }, /* Poland */ { "pt", KBD_PORTUGUESE, pt_variants }, /* Portugal */ @@ -811,17 +811,17 @@ static const XKB_LAYOUT xkbLayouts[] = { { "ua", KBD_UKRAINIAN, ua_variants }, /* Ukraine */ { "gb", KBD_UNITED_KINGDOM, gb_variants }, /* United Kingdom */ { "uz", KBD_UZBEK_CYRILLIC, uz_variants }, /* Uzbekistan */ - { "vn", KBD_VIETNAMESE, NULL }, /* Vietnam */ + { "vn", KBD_VIETNAMESE, nullptr }, /* Vietnam */ { "kr", KBD_KOREAN_INPUT_SYSTEM_IME_2000, kr_variants }, /* Korea, Republic of */ { "ie", KBD_UNITED_KINGDOM, ie_variants }, /* Ireland */ { "pk", 0, pk_variants }, /* Pakistan */ - { "mv", 0, NULL }, /* Maldives */ - { "za", KBD_US, NULL }, /* South Africa */ + { "mv", 0, nullptr }, /* Maldives */ + { "za", KBD_US, nullptr }, /* South Africa */ { "epo", 0, epo_variants }, /* Esperanto */ - { "np", KBD_NEPALI, NULL }, /* Nepal */ + { "np", KBD_NEPALI, nullptr }, /* Nepal */ { "ng", 0, ng_variants }, /* Nigeria */ - { "et", 0, NULL }, /* Ethiopia */ - { "sn", 0, NULL }, /* Senegal */ + { "et", 0, nullptr }, /* Ethiopia */ + { "sn", 0, nullptr }, /* Senegal */ { "brai", 0, brai_variants }, /* Braille */ { "tm", KBD_TURKISH_Q, tm_variants }, /* Turkmenistan */ }; @@ -855,7 +855,7 @@ static UINT32 find_keyboard_layout_variant(const XKB_LAYOUT* layout, const char* UINT32 find_keyboard_layout_in_xorg_rules(const char* layout, const char* variant) { - if ((layout == NULL) || (variant == NULL)) + if ((layout == nullptr) || (variant == nullptr)) return 0; DEBUG_KBD("xkbLayout: %s\txkbVariant: %s", layout, variant); diff --git a/libfreerdp/primitives/neon/prim_YCoCg_neon.c b/libfreerdp/primitives/neon/prim_YCoCg_neon.c index 1970f1500..32997b46c 100644 --- a/libfreerdp/primitives/neon/prim_YCoCg_neon.c +++ b/libfreerdp/primitives/neon/prim_YCoCg_neon.c @@ -29,7 +29,7 @@ #if defined(NEON_INTRINSICS_ENABLED) #include -static primitives_t* generic = NULL; +static primitives_t* generic = nullptr; static pstatus_t neon_YCoCgToRGB_8u_X(const BYTE* WINPR_RESTRICT pSrc, INT32 srcStep, BYTE* WINPR_RESTRICT pDst, UINT32 DstFormat, INT32 dstStep, diff --git a/libfreerdp/primitives/neon/prim_YUV_neon.c b/libfreerdp/primitives/neon/prim_YUV_neon.c index b7f2ef031..f44016cda 100644 --- a/libfreerdp/primitives/neon/prim_YUV_neon.c +++ b/libfreerdp/primitives/neon/prim_YUV_neon.c @@ -33,7 +33,7 @@ #if defined(NEON_INTRINSICS_ENABLED) #include -static primitives_t* generic = NULL; +static primitives_t* generic = nullptr; static inline uint8x8_t neon_YUV2R_single(uint16x8_t C, int16x8_t D, int16x8_t E) { diff --git a/libfreerdp/primitives/neon/prim_colors_neon.c b/libfreerdp/primitives/neon/prim_colors_neon.c index 75ef5a709..b5ad49f78 100644 --- a/libfreerdp/primitives/neon/prim_colors_neon.c +++ b/libfreerdp/primitives/neon/prim_colors_neon.c @@ -30,7 +30,7 @@ #if defined(NEON_INTRINSICS_ENABLED) #include -static primitives_t* generic = NULL; +static primitives_t* generic = nullptr; static pstatus_t neon_yCbCrToRGB_16s8u_P3AC4R_X(const INT16* WINPR_RESTRICT pSrc[3], UINT32 srcStep, BYTE* WINPR_RESTRICT pDst, UINT32 dstStep, diff --git a/libfreerdp/primitives/opencl/prim_YUV_opencl.c b/libfreerdp/primitives/opencl/prim_YUV_opencl.c index 2b8a2b855..4f8cf2523 100644 --- a/libfreerdp/primitives/opencl/prim_YUV_opencl.c +++ b/libfreerdp/primitives/opencl/prim_YUV_opencl.c @@ -68,7 +68,7 @@ static void cl_kernel_free(primitives_cl_kernel* kernel) for (size_t i = 0; i < ARRAYSIZE(kernel->srcObjs); i++) { cl_mem obj = kernel->srcObjs[i]; - kernel->srcObjs[i] = NULL; + kernel->srcObjs[i] = nullptr; if (obj) clReleaseMemObject(obj); } @@ -104,7 +104,7 @@ static primitives_cl_kernel* cl_kernel_new(const char* kernelName, const prim_si return kernel; fail: cl_kernel_free(kernel); - return NULL; + return nullptr; } static BOOL cl_kernel_set_sources(primitives_cl_kernel* ctx, const BYTE* WINPR_RESTRICT pSrc[3], @@ -155,7 +155,7 @@ static BOOL cl_kernel_set_destination(primitives_cl_kernel* ctx, UINT32 dstStep) ctx->dstStep = dstStep; cl_int ret = CL_INVALID_VALUE; ctx->dstObj = clCreateBuffer(ctx->cl->context, CL_MEM_WRITE_ONLY, - 1ull * dstStep * ctx->roi.height, NULL, &ret); + 1ull * dstStep * ctx->roi.height, nullptr, &ret); if (ret != CL_SUCCESS) { WLog_ERR(TAG, "unable to create dest obj"); @@ -188,8 +188,8 @@ static BOOL cl_kernel_process(primitives_cl_kernel* ctx, BYTE* pDst) indexes[0] = ctx->roi.width; indexes[1] = ctx->roi.height; - cl_int ret = clEnqueueNDRangeKernel(ctx->cl->commandQueue, ctx->kernel, 2, NULL, indexes, NULL, - 0, NULL, NULL); + cl_int ret = clEnqueueNDRangeKernel(ctx->cl->commandQueue, ctx->kernel, 2, nullptr, indexes, + nullptr, 0, nullptr, nullptr); if (ret != CL_SUCCESS) { WLog_ERR(TAG, "unable to enqueue call kernel"); @@ -198,7 +198,7 @@ static BOOL cl_kernel_process(primitives_cl_kernel* ctx, BYTE* pDst) /* Transfer result to host */ ret = clEnqueueReadBuffer(ctx->cl->commandQueue, ctx->dstObj, CL_TRUE, 0, - ctx->roi.height * ctx->dstStep, pDst, 0, NULL, NULL); + ctx->roi.height * ctx->dstStep, pDst, 0, nullptr, nullptr); if (ret != CL_SUCCESS) { WLog_ERR(TAG, "unable to read back buffer"); @@ -265,12 +265,12 @@ static BOOL primitives_init_opencl_context(primitives_opencl_context* WINPR_REST { cl_uint ndevices = 0; cl_uint nplatforms = 0; - cl_kernel kernel = NULL; + cl_kernel kernel = nullptr; BOOL gotGPU = FALSE; size_t programLen = 0; - cl_int ret = clGetPlatformIDs(0, NULL, &nplatforms); + cl_int ret = clGetPlatformIDs(0, nullptr, &nplatforms); if (ret != CL_SUCCESS || nplatforms < 1) return FALSE; @@ -287,13 +287,13 @@ static BOOL primitives_init_opencl_context(primitives_opencl_context* WINPR_REST for (cl_uint i = 0; (i < nplatforms) && !gotGPU; i++) { - cl_device_id device_id = NULL; - cl_context context = NULL; + cl_device_id device_id = nullptr; + cl_context context = nullptr; char platformName[1000] = WINPR_C_ARRAY_INIT; char deviceName[1000] = WINPR_C_ARRAY_INIT; ret = clGetPlatformInfo(platform_ids[i], CL_PLATFORM_NAME, sizeof(platformName), - platformName, NULL); + platformName, nullptr); if (ret != CL_SUCCESS) continue; @@ -301,7 +301,7 @@ static BOOL primitives_init_opencl_context(primitives_opencl_context* WINPR_REST if (ret != CL_SUCCESS) continue; - ret = clGetDeviceInfo(device_id, CL_DEVICE_NAME, sizeof(deviceName), deviceName, NULL); + ret = clGetDeviceInfo(device_id, CL_DEVICE_NAME, sizeof(deviceName), deviceName, nullptr); if (ret != CL_SUCCESS) { WLog_ERR(TAG, "openCL: unable get device name for platform %s", platformName); @@ -309,7 +309,7 @@ static BOOL primitives_init_opencl_context(primitives_opencl_context* WINPR_REST continue; } - context = clCreateContext(NULL, 1, &device_id, NULL, NULL, &ret); + context = clCreateContext(nullptr, 1, &device_id, nullptr, nullptr, &ret); if (ret != CL_SUCCESS) { WLog_ERR(TAG, "openCL: unable to create context for platform %s, device %s", @@ -319,7 +319,7 @@ static BOOL primitives_init_opencl_context(primitives_opencl_context* WINPR_REST } #if defined(CL_VERSION_2_0) - prims->commandQueue = clCreateCommandQueueWithProperties(context, device_id, NULL, &ret); + prims->commandQueue = clCreateCommandQueueWithProperties(context, device_id, nullptr, &ret); #else prims->commandQueue = clCreateCommandQueue(context, device_id, 0, &ret); #endif @@ -356,7 +356,7 @@ static BOOL primitives_init_opencl_context(primitives_opencl_context* WINPR_REST goto fail; } - ret = clBuildProgram(prims->program, 1, &prims->deviceId, NULL, NULL, NULL); + ret = clBuildProgram(prims->program, 1, &prims->deviceId, nullptr, nullptr, nullptr); if (ret != CL_SUCCESS) { size_t length = 0; @@ -397,7 +397,7 @@ static pstatus_t opencl_YUV420ToRGB_8u_P3AC4R(const BYTE* WINPR_RESTRICT pSrc[3] UINT32 dstStep, UINT32 DstFormat, const prim_size_t* WINPR_RESTRICT roi) { - const char* kernel_name = NULL; + const char* kernel_name = nullptr; switch (DstFormat) { @@ -442,7 +442,7 @@ static pstatus_t opencl_YUV444ToRGB_8u_P3AC4R(const BYTE* WINPR_RESTRICT pSrc[3] UINT32 dstStep, UINT32 DstFormat, const prim_size_t* WINPR_RESTRICT roi) { - const char* kernel_name = NULL; + const char* kernel_name = nullptr; switch (DstFormat) { diff --git a/libfreerdp/primitives/prim_YUV.c b/libfreerdp/primitives/prim_YUV.c index 37beade5d..65a5a8dd6 100644 --- a/libfreerdp/primitives/prim_YUV.c +++ b/libfreerdp/primitives/prim_YUV.c @@ -125,7 +125,7 @@ static inline pstatus_t general_ChromaV1ToYUV444(const BYTE* WINPR_RESTRICT pSrc for (size_t y = 0; y < padHeigth; y++) { const BYTE* Ya = pSrc[0] + y * srcStep[0]; - BYTE* pX = NULL; + BYTE* pX = nullptr; if ((y) % mod < (mod + 1) / 2) { @@ -657,7 +657,7 @@ static inline void BGRX_fillYUV(size_t offset, const BYTE* WINPR_RESTRICT pRGB[2 BYTE G = 0; BYTE R = 0; const UINT32 color = FreeRDPReadColor(&pRGB[i][(offset + j) * bpp], SrcFormat); - FreeRDPSplitColor(color, SrcFormat, &R, &G, &B, NULL, NULL); + FreeRDPSplitColor(color, SrcFormat, &R, &G, &B, nullptr, nullptr); pY[i][offset + j] = RGB2Y(R, G, B); pU[i][offset + j] = RGB2U(R, G, B); pV[i][offset + j] = RGB2V(R, G, B); @@ -689,7 +689,7 @@ static inline void BGRX_fillYUV_single(size_t offset, const BYTE* WINPR_RESTRICT BYTE G = 0; BYTE R = 0; const UINT32 color = FreeRDPReadColor(&pRGB[(offset + j) * bpp], SrcFormat); - FreeRDPSplitColor(color, SrcFormat, &R, &G, &B, NULL, NULL); + FreeRDPSplitColor(color, SrcFormat, &R, &G, &B, nullptr, nullptr); pY[offset + j] = RGB2Y(R, G, B); pU[offset + j] = RGB2U(R, G, B); pV[offset + j] = RGB2V(R, G, B); @@ -774,7 +774,7 @@ static inline void fillYUV(size_t offset, const BYTE* WINPR_RESTRICT pRGB[2], UI BYTE G = 0; BYTE R = 0; const UINT32 color = FreeRDPReadColor(&pRGB[i][(offset + j) * bpp], SrcFormat); - FreeRDPSplitColor(color, SrcFormat, &R, &G, &B, NULL, NULL); + FreeRDPSplitColor(color, SrcFormat, &R, &G, &B, nullptr, nullptr); const BYTE y = RGB2Y(R, G, B); const BYTE u = RGB2U(R, G, B); const BYTE v = RGB2V(R, G, B); @@ -810,7 +810,7 @@ static inline void fillYUV_single(size_t offset, const BYTE* WINPR_RESTRICT pRGB BYTE G = 0; BYTE R = 0; const UINT32 color = FreeRDPReadColor(&pRGB[(offset + j) * bpp], SrcFormat); - FreeRDPSplitColor(color, SrcFormat, &R, &G, &B, NULL, NULL); + FreeRDPSplitColor(color, SrcFormat, &R, &G, &B, nullptr, nullptr); const BYTE y = RGB2Y(R, G, B); const BYTE u = RGB2U(R, G, B); const BYTE v = RGB2V(R, G, B); @@ -1163,7 +1163,7 @@ static inline pstatus_t general_RGBToYUV420_ANY(const BYTE* WINPR_RESTRICT pSrc, UINT32 color = 0; /* row 1, pixel 1 */ color = FreeRDPReadColor(src + x1, srcFormat); - FreeRDPSplitColor(color, srcFormat, &R, &G, &B, NULL, NULL); + FreeRDPSplitColor(color, srcFormat, &R, &G, &B, nullptr, nullptr); Ra = R; Ga = G; Ba = B; @@ -1173,7 +1173,7 @@ static inline pstatus_t general_RGBToYUV420_ANY(const BYTE* WINPR_RESTRICT pSrc, { /* row 1, pixel 2 */ color = FreeRDPReadColor(src + x2, srcFormat); - FreeRDPSplitColor(color, srcFormat, &R, &G, &B, NULL, NULL); + FreeRDPSplitColor(color, srcFormat, &R, &G, &B, nullptr, nullptr); Ra += R; Ga += G; Ba += B; @@ -1182,7 +1182,7 @@ static inline pstatus_t general_RGBToYUV420_ANY(const BYTE* WINPR_RESTRICT pSrc, /* row 2, pixel 1 */ color = FreeRDPReadColor(src + x3, srcFormat); - FreeRDPSplitColor(color, srcFormat, &R, &G, &B, NULL, NULL); + FreeRDPSplitColor(color, srcFormat, &R, &G, &B, nullptr, nullptr); Ra += R; Ga += G; Ba += B; @@ -1192,7 +1192,7 @@ static inline pstatus_t general_RGBToYUV420_ANY(const BYTE* WINPR_RESTRICT pSrc, { /* row 2, pixel 2 */ color = FreeRDPReadColor(src + x4, srcFormat); - FreeRDPSplitColor(color, srcFormat, &R, &G, &B, NULL, NULL); + FreeRDPSplitColor(color, srcFormat, &R, &G, &B, nullptr, nullptr); Ra += R; Ga += G; Ba += B; @@ -1223,7 +1223,7 @@ static inline pstatus_t general_RGBToYUV420_ANY(const BYTE* WINPR_RESTRICT pSrc, BYTE B = 0; /* row 1, pixel 1 */ UINT32 color = FreeRDPReadColor(src + x1, srcFormat); - FreeRDPSplitColor(color, srcFormat, &R, &G, &B, NULL, NULL); + FreeRDPSplitColor(color, srcFormat, &R, &G, &B, nullptr, nullptr); INT32 Ra = R; INT32 Ga = G; INT32 Ba = B; @@ -1233,7 +1233,7 @@ static inline pstatus_t general_RGBToYUV420_ANY(const BYTE* WINPR_RESTRICT pSrc, { /* row 1, pixel 2 */ color = FreeRDPReadColor(src + x2, srcFormat); - FreeRDPSplitColor(color, srcFormat, &R, &G, &B, NULL, NULL); + FreeRDPSplitColor(color, srcFormat, &R, &G, &B, nullptr, nullptr); Ra += R; Ga += G; Ba += B; @@ -1431,8 +1431,8 @@ static inline pstatus_t general_RGBToAVC444YUV_BGRX(const BYTE* WINPR_RESTRICT p BYTE* b3 = pDst1[2] + 1ULL * (y / 2) * dst1Step[2]; BYTE* b6 = pDst2[1] + 1ULL * (y / 2) * dst2Step[1]; BYTE* b7 = pDst2[2] + 1ULL * (y / 2) * dst2Step[2]; - int_general_RGBToAVC444YUV_BGRX_DOUBLE_ROW(0, srcEven, NULL, b1Even, NULL, b2, b3, NULL, - NULL, b6, b7, roi->width); + int_general_RGBToAVC444YUV_BGRX_DOUBLE_ROW(0, srcEven, nullptr, b1Even, nullptr, b2, b3, + nullptr, nullptr, b6, b7, roi->width); } return PRIMITIVES_SUCCESS; @@ -1566,7 +1566,7 @@ static inline pstatus_t general_RGBToAVC444YUV_RGBX(const BYTE* WINPR_RESTRICT p const size_t i = y >> 1; const size_t n = (i & (size_t)~7) + i; BYTE* b1Even = pDst1[0] + 1ULL * y * dst1Step[0]; - BYTE* b1Odd = !last ? (b1Even + dst1Step[0]) : NULL; + BYTE* b1Odd = !last ? (b1Even + dst1Step[0]) : nullptr; BYTE* b2 = pDst1[1] + 1ULL * (y / 2) * dst1Step[1]; BYTE* b3 = pDst1[2] + 1ULL * (y / 2) * dst1Step[2]; BYTE* b4 = pDst2[0] + 1ULL * dst2Step[0] * n; @@ -1584,8 +1584,8 @@ static inline pstatus_t general_RGBToAVC444YUV_RGBX(const BYTE* WINPR_RESTRICT p BYTE* b3 = pDst1[2] + 1ULL * (y / 2) * dst1Step[2]; BYTE* b6 = pDst2[1] + 1ULL * (y / 2) * dst2Step[1]; BYTE* b7 = pDst2[2] + 1ULL * (y / 2) * dst2Step[2]; - general_RGBToAVC444YUV_RGBX_DOUBLE_ROW(srcEven, NULL, b1Even, NULL, b2, b3, NULL, NULL, b6, - b7, roi->width); + general_RGBToAVC444YUV_RGBX_DOUBLE_ROW(srcEven, nullptr, b1Even, nullptr, b2, b3, nullptr, + nullptr, b6, b7, roi->width); } return PRIMITIVES_SUCCESS; } @@ -1619,7 +1619,7 @@ static inline void general_RGBToAVC444YUV_ANY_DOUBLE_ROW( BYTE b = 0; const UINT32 color = FreeRDPReadColor(srcEven, srcFormat); srcEven += bpp; - FreeRDPSplitColor(color, srcFormat, &r, &g, &b, NULL, NULL); + FreeRDPSplitColor(color, srcFormat, &r, &g, &b, nullptr, nullptr); Y1e = Y2e = Y1o = Y2o = RGB2Y(r, g, b); U1e = U2e = U1o = U2o = RGB2U(r, g, b); V1e = V2e = V1o = V2o = RGB2V(r, g, b); @@ -1632,7 +1632,7 @@ static inline void general_RGBToAVC444YUV_ANY_DOUBLE_ROW( BYTE b = 0; const UINT32 color = FreeRDPReadColor(srcEven, srcFormat); srcEven += bpp; - FreeRDPSplitColor(color, srcFormat, &r, &g, &b, NULL, NULL); + FreeRDPSplitColor(color, srcFormat, &r, &g, &b, nullptr, nullptr); Y2e = RGB2Y(r, g, b); U2e = RGB2U(r, g, b); V2e = RGB2V(r, g, b); @@ -1645,7 +1645,7 @@ static inline void general_RGBToAVC444YUV_ANY_DOUBLE_ROW( BYTE b = 0; const UINT32 color = FreeRDPReadColor(srcOdd, srcFormat); srcOdd += bpp; - FreeRDPSplitColor(color, srcFormat, &r, &g, &b, NULL, NULL); + FreeRDPSplitColor(color, srcFormat, &r, &g, &b, nullptr, nullptr); Y1o = Y2o = RGB2Y(r, g, b); U1o = U2o = RGB2U(r, g, b); V1o = V2o = RGB2V(r, g, b); @@ -1658,7 +1658,7 @@ static inline void general_RGBToAVC444YUV_ANY_DOUBLE_ROW( BYTE b = 0; const UINT32 color = FreeRDPReadColor(srcOdd, srcFormat); srcOdd += bpp; - FreeRDPSplitColor(color, srcFormat, &r, &g, &b, NULL, NULL); + FreeRDPSplitColor(color, srcFormat, &r, &g, &b, nullptr, nullptr); Y2o = RGB2Y(r, g, b); U2o = RGB2U(r, g, b); V2o = RGB2V(r, g, b); @@ -1782,7 +1782,7 @@ general_RGBToAVC444YUV_ANY(const BYTE* WINPR_RESTRICT pSrc, UINT32 srcFormat, UI const UINT32 i = (UINT32)y >> 1; const UINT32 n = (i & (uint32_t)~7) + i; BYTE* b1Even = pDst1[0] + y * dst1Step[0]; - BYTE* b1Odd = !last ? (b1Even + dst1Step[0]) : NULL; + BYTE* b1Odd = !last ? (b1Even + dst1Step[0]) : nullptr; BYTE* b2 = pDst1[1] + (y / 2) * dst1Step[1]; BYTE* b3 = pDst1[2] + (y / 2) * dst1Step[2]; BYTE* b4 = pDst2[0] + 1ULL * dst2Step[0] * n; @@ -1871,7 +1871,7 @@ static inline void general_RGBToAVC444YUVv2_ANY_DOUBLE_ROW( BYTE r = 0; const UINT32 color = FreeRDPReadColor(srcEven, srcFormat); srcEven += bpp; - FreeRDPSplitColor(color, srcFormat, &r, &g, &b, NULL, NULL); + FreeRDPSplitColor(color, srcFormat, &r, &g, &b, nullptr, nullptr); Ya = RGB2Y(r, g, b); Ua = RGB2U(r, g, b); Va = RGB2V(r, g, b); @@ -1884,7 +1884,7 @@ static inline void general_RGBToAVC444YUVv2_ANY_DOUBLE_ROW( BYTE r = 0; const UINT32 color = FreeRDPReadColor(srcEven, srcFormat); srcEven += bpp; - FreeRDPSplitColor(color, srcFormat, &r, &g, &b, NULL, NULL); + FreeRDPSplitColor(color, srcFormat, &r, &g, &b, nullptr, nullptr); Yb = RGB2Y(r, g, b); Ub = RGB2U(r, g, b); Vb = RGB2V(r, g, b); @@ -1903,7 +1903,7 @@ static inline void general_RGBToAVC444YUVv2_ANY_DOUBLE_ROW( BYTE r = 0; const UINT32 color = FreeRDPReadColor(srcOdd, srcFormat); srcOdd += bpp; - FreeRDPSplitColor(color, srcFormat, &r, &g, &b, NULL, NULL); + FreeRDPSplitColor(color, srcFormat, &r, &g, &b, nullptr, nullptr); Yc = RGB2Y(r, g, b); Uc = RGB2U(r, g, b); Vc = RGB2V(r, g, b); @@ -1922,7 +1922,7 @@ static inline void general_RGBToAVC444YUVv2_ANY_DOUBLE_ROW( BYTE r = 0; const UINT32 color = FreeRDPReadColor(srcOdd, srcFormat); srcOdd += bpp; - FreeRDPSplitColor(color, srcFormat, &r, &g, &b, NULL, NULL); + FreeRDPSplitColor(color, srcFormat, &r, &g, &b, nullptr, nullptr); Yd = RGB2Y(r, g, b); Ud = RGB2U(r, g, b); Vd = RGB2V(r, g, b); @@ -2045,7 +2045,7 @@ general_RGBToAVC444YUVv2_ANY(const BYTE* WINPR_RESTRICT pSrc, UINT32 srcFormat, for (; y < roi->height - roi->height % 2; y += 2) { const BYTE* srcEven = (pSrc + y * srcStep); - const BYTE* srcOdd = (y < roi->height - 1) ? (srcEven + srcStep) : NULL; + const BYTE* srcOdd = (y < roi->height - 1) ? (srcEven + srcStep) : nullptr; BYTE* dstLumaYEven = (pDst1[0] + y * dst1Step[0]); BYTE* dstLumaYOdd = (dstLumaYEven + dst1Step[0]); BYTE* dstLumaU = (pDst1[1] + (y / 2) * dst1Step[1]); @@ -2072,8 +2072,8 @@ general_RGBToAVC444YUVv2_ANY(const BYTE* WINPR_RESTRICT pSrc, UINT32 srcFormat, BYTE* dstEvenChromaY1 = (pDst2[0] + y * dst2Step[0]); BYTE* dstEvenChromaY2 = dstEvenChromaY1 + roi->width / 2; general_RGBToAVC444YUVv2_ANY_DOUBLE_ROW( - srcEven, NULL, srcFormat, dstLumaYEven, NULL, dstLumaU, dstLumaV, dstEvenChromaY1, - dstEvenChromaY2, NULL, NULL, NULL, NULL, NULL, NULL, roi->width); + srcEven, nullptr, srcFormat, dstLumaYEven, nullptr, dstLumaU, dstLumaV, dstEvenChromaY1, + dstEvenChromaY2, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, roi->width); } return PRIMITIVES_SUCCESS; @@ -2097,7 +2097,7 @@ static inline void int_general_RGBToAVC444YUVv2_BGRX_DOUBLE_ROW( for (size_t x = offset; x < width; x += 2) { const BYTE* srcEven = &pSrcEven[4ULL * x]; - const BYTE* srcOdd = pSrcOdd ? &pSrcOdd[4ULL * x] : NULL; + const BYTE* srcOdd = pSrcOdd ? &pSrcOdd[4ULL * x] : nullptr; BYTE Ya = 0; BYTE Ua = 0; BYTE Va = 0; @@ -2275,8 +2275,8 @@ static inline pstatus_t general_RGBToAVC444YUVv2_BGRX(const BYTE* WINPR_RESTRICT BYTE* dstEvenChromaY1 = (pDst2[0] + y * dst2Step[0]); BYTE* dstEvenChromaY2 = dstEvenChromaY1 + roi->width / 2; int_general_RGBToAVC444YUVv2_BGRX_DOUBLE_ROW( - 0, srcEven, NULL, dstLumaYEven, NULL, dstLumaU, dstLumaV, dstEvenChromaY1, - dstEvenChromaY2, NULL, NULL, NULL, NULL, NULL, NULL, roi->width); + 0, srcEven, nullptr, dstLumaYEven, nullptr, dstLumaU, dstLumaV, dstEvenChromaY1, + dstEvenChromaY2, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, roi->width); } return PRIMITIVES_SUCCESS; diff --git a/libfreerdp/primitives/prim_copy.c b/libfreerdp/primitives/prim_copy.c index 3178d55eb..27a9dd951 100644 --- a/libfreerdp/primitives/prim_copy.c +++ b/libfreerdp/primitives/prim_copy.c @@ -26,7 +26,7 @@ #include -static primitives_t* generic = NULL; +static primitives_t* generic = nullptr; /* ------------------------------------------------------------------------- */ /*static inline BOOL memory_regions_overlap_1d(*/ diff --git a/libfreerdp/primitives/prim_set.c b/libfreerdp/primitives/prim_set.c index 42fb2e011..b754d2573 100644 --- a/libfreerdp/primitives/prim_set.c +++ b/libfreerdp/primitives/prim_set.c @@ -84,7 +84,7 @@ static pstatus_t general_set_32u(UINT32 val, UINT32* WINPR_RESTRICT pDst, UINT32 UINT32* dptr = pDst; size_t span = 0; size_t remaining = 0; - primitives_t* prims = NULL; + primitives_t* prims = nullptr; if (len < 256) { diff --git a/libfreerdp/primitives/primitives.c b/libfreerdp/primitives/primitives.c index 780ec0902..920b5edbc 100644 --- a/libfreerdp/primitives/primitives.c +++ b/libfreerdp/primitives/primitives.c @@ -77,7 +77,7 @@ static BOOL primitives_init_generic(primitives_t* prims) primitives_init_colors(prims); primitives_init_YCoCg(prims); primitives_init_YUV(prims); - prims->uninit = NULL; + prims->uninit = nullptr; return TRUE; } @@ -134,9 +134,9 @@ static void primitives_YUV_benchmark_free(primitives_YUV_benchmark* bench) static primitives_YUV_benchmark* primitives_YUV_benchmark_init(primitives_YUV_benchmark* ret) { - prim_size_t* roi = NULL; + prim_size_t* roi = nullptr; if (!ret) - return NULL; + return nullptr; memset(ret, 0, sizeof(primitives_YUV_benchmark)); roi = &ret->roi; @@ -210,17 +210,16 @@ static BOOL primitives_autodetect_best(primitives_t* prims) UINT32 count; }; - struct prim_benchmark testcases[] = - { - { "generic", NULL, PRIMITIVES_PURE_SOFT, 0 }, + struct prim_benchmark testcases[] = { + { "generic", nullptr, PRIMITIVES_PURE_SOFT, 0 }, #if defined(HAVE_CPU_OPTIMIZED_PRIMITIVES) - { "optimized", NULL, PRIMITIVES_ONLY_CPU, 0 }, + { "optimized", nullptr, PRIMITIVES_ONLY_CPU, 0 }, #endif #if defined(WITH_OPENCL) - { "opencl", NULL, PRIMITIVES_ONLY_GPU, 0 }, + { "opencl", nullptr, PRIMITIVES_ONLY_GPU, 0 }, #endif }; - const struct prim_benchmark* best = NULL; + const struct prim_benchmark* best = nullptr; #if !defined(HAVE_CPU_OPTIMIZED_PRIMITIVES) || !defined(WITH_OPENCL) { @@ -360,14 +359,14 @@ void primitives_uninit(void) /* ------------------------------------------------------------------------- */ static void setup(void) { - InitOnceExecuteOnce(&generic_primitives_InitOnce, primitives_init_generic_cb, NULL, NULL); + InitOnceExecuteOnce(&generic_primitives_InitOnce, primitives_init_generic_cb, nullptr, nullptr); #if defined(HAVE_CPU_OPTIMIZED_PRIMITIVES) - InitOnceExecuteOnce(&cpu_primitives_InitOnce, primitives_init_cpu_cb, NULL, NULL); + InitOnceExecuteOnce(&cpu_primitives_InitOnce, primitives_init_cpu_cb, nullptr, nullptr); #endif #if defined(WITH_OPENCL) - InitOnceExecuteOnce(&gpu_primitives_InitOnce, primitives_init_gpu_cb, NULL, NULL); + InitOnceExecuteOnce(&gpu_primitives_InitOnce, primitives_init_gpu_cb, nullptr, nullptr); #endif - InitOnceExecuteOnce(&auto_primitives_InitOnce, primitives_auto_init_cb, NULL, NULL); + InitOnceExecuteOnce(&auto_primitives_InitOnce, primitives_auto_init_cb, nullptr, nullptr); } primitives_t* primitives_get(void) @@ -378,26 +377,28 @@ primitives_t* primitives_get(void) primitives_t* primitives_get_generic(void) { - InitOnceExecuteOnce(&generic_primitives_InitOnce, primitives_init_generic_cb, NULL, NULL); + InitOnceExecuteOnce(&generic_primitives_InitOnce, primitives_init_generic_cb, nullptr, nullptr); return &pPrimitivesGeneric; } primitives_t* primitives_get_by_type(primitive_hints type) { - InitOnceExecuteOnce(&generic_primitives_InitOnce, primitives_init_generic_cb, NULL, NULL); + InitOnceExecuteOnce(&generic_primitives_InitOnce, primitives_init_generic_cb, nullptr, nullptr); switch (type) { case PRIMITIVES_ONLY_GPU: #if defined(WITH_OPENCL) - if (!InitOnceExecuteOnce(&gpu_primitives_InitOnce, primitives_init_gpu_cb, NULL, NULL)) - return NULL; + if (!InitOnceExecuteOnce(&gpu_primitives_InitOnce, primitives_init_gpu_cb, nullptr, + nullptr)) + return nullptr; return &pPrimitivesGpu; #endif case PRIMITIVES_ONLY_CPU: #if defined(HAVE_CPU_OPTIMIZED_PRIMITIVES) - if (!InitOnceExecuteOnce(&cpu_primitives_InitOnce, primitives_init_cpu_cb, NULL, NULL)) - return NULL; + if (!InitOnceExecuteOnce(&cpu_primitives_InitOnce, primitives_init_cpu_cb, nullptr, + nullptr)) + return nullptr; return &pPrimitivesCpu; #endif case PRIMITIVES_PURE_SOFT: diff --git a/libfreerdp/primitives/sse/prim_YCoCg_ssse3.c b/libfreerdp/primitives/sse/prim_YCoCg_ssse3.c index cbc70984e..d72f90b21 100644 --- a/libfreerdp/primitives/sse/prim_YCoCg_ssse3.c +++ b/libfreerdp/primitives/sse/prim_YCoCg_ssse3.c @@ -32,7 +32,7 @@ #include #include -static primitives_t* generic = NULL; +static primitives_t* generic = nullptr; /* ------------------------------------------------------------------------- */ static pstatus_t ssse3_YCoCgRToRGB_8u_AC4R_invert(const BYTE* WINPR_RESTRICT pSrc, UINT32 srcStep, diff --git a/libfreerdp/primitives/sse/prim_YUV_sse4.1.c b/libfreerdp/primitives/sse/prim_YUV_sse4.1.c index 160dc02e4..6fed9945c 100644 --- a/libfreerdp/primitives/sse/prim_YUV_sse4.1.c +++ b/libfreerdp/primitives/sse/prim_YUV_sse4.1.c @@ -37,7 +37,7 @@ #include #include -static primitives_t* generic = NULL; +static primitives_t* generic = nullptr; /****************************************************************************/ /* sse41 YUV420 -> RGB conversion */ @@ -635,7 +635,7 @@ static inline void sse41_RGBToYUV420_BGRX_Y(const BYTE* WINPR_RESTRICT src, BYTE for (; x < width; x++) { - sse41_BGRX_TO_YUV(&src[4ULL * x], &dst[x], NULL, NULL); + sse41_BGRX_TO_YUV(&src[4ULL * x], &dst[x], nullptr, nullptr); } } @@ -713,10 +713,10 @@ static inline void sse41_RGBToYUV420_BGRX_UV(const BYTE* WINPR_RESTRICT src1, { BYTE u[4] = WINPR_C_ARRAY_INIT; BYTE v[4] = WINPR_C_ARRAY_INIT; - sse41_BGRX_TO_YUV(&src1[4ULL * x], NULL, &u[0], &v[0]); - sse41_BGRX_TO_YUV(&src1[4ULL * (1ULL + x)], NULL, &u[1], &v[1]); - sse41_BGRX_TO_YUV(&src2[4ULL * x], NULL, &u[2], &v[2]); - sse41_BGRX_TO_YUV(&src2[4ULL * (1ULL + x)], NULL, &u[3], &v[3]); + sse41_BGRX_TO_YUV(&src1[4ULL * x], nullptr, &u[0], &v[0]); + sse41_BGRX_TO_YUV(&src1[4ULL * (1ULL + x)], nullptr, &u[1], &v[1]); + sse41_BGRX_TO_YUV(&src2[4ULL * x], nullptr, &u[2], &v[2]); + sse41_BGRX_TO_YUV(&src2[4ULL * (1ULL + x)], nullptr, &u[3], &v[3]); const INT16 u4 = WINPR_ASSERTING_INT_CAST(INT16, (INT16)u[0] + u[1] + u[2] + u[3]); const INT16 uu = WINPR_ASSERTING_INT_CAST(INT16, u4 / 4); const BYTE u8 = CLIP(uu); @@ -1031,8 +1031,8 @@ static pstatus_t sse41_RGBToAVC444YUV_BGRX(const BYTE* WINPR_RESTRICT pSrc, BYTE* b3 = pDst1[2] + (y / 2) * dst1Step[2]; BYTE* b6 = pDst2[1] + (y / 2) * dst2Step[1]; BYTE* b7 = pDst2[2] + (y / 2) * dst2Step[2]; - general_RGBToAVC444YUV_BGRX_DOUBLE_ROW(0, srcEven, NULL, b1Even, NULL, b2, b3, NULL, NULL, - b6, b7, roi->width); + general_RGBToAVC444YUV_BGRX_DOUBLE_ROW(0, srcEven, nullptr, b1Even, nullptr, b2, b3, + nullptr, nullptr, b6, b7, roi->width); } return PRIMITIVES_SUCCESS; @@ -1365,10 +1365,10 @@ static pstatus_t sse41_RGBToAVC444YUVv2_BGRX(const BYTE* WINPR_RESTRICT pSrc, BYTE* dstChromaV1 = (pDst2[2] + (y / 2) * dst2Step[2]); BYTE* dstChromaU2 = dstChromaU1 + roi->width / 4; BYTE* dstChromaV2 = dstChromaV1 + roi->width / 4; - general_RGBToAVC444YUVv2_BGRX_DOUBLE_ROW(0, srcEven, NULL, dstLumaYEven, NULL, dstLumaU, - dstLumaV, dstEvenChromaY1, dstEvenChromaY2, NULL, - NULL, dstChromaU1, dstChromaU2, dstChromaV1, - dstChromaV2, roi->width); + general_RGBToAVC444YUVv2_BGRX_DOUBLE_ROW(0, srcEven, nullptr, dstLumaYEven, nullptr, + dstLumaU, dstLumaV, dstEvenChromaY1, + dstEvenChromaY2, nullptr, nullptr, dstChromaU1, + dstChromaU2, dstChromaV1, dstChromaV2, roi->width); } return PRIMITIVES_SUCCESS; @@ -1513,7 +1513,7 @@ static pstatus_t sse41_ChromaV1ToYUV444(const BYTE* WINPR_RESTRICT pSrcRaw[3], for (size_t y = 0; y < padHeigth; y++) { const BYTE* Ya = pSrc[0] + 1ULL * srcStep[0] * y; - BYTE* pX = NULL; + BYTE* pX = nullptr; if ((y) % mod < (mod + 1) / 2) { diff --git a/libfreerdp/primitives/sse/prim_add_sse3.c b/libfreerdp/primitives/sse/prim_add_sse3.c index ec9168246..575339f7d 100644 --- a/libfreerdp/primitives/sse/prim_add_sse3.c +++ b/libfreerdp/primitives/sse/prim_add_sse3.c @@ -29,7 +29,7 @@ #include #include -static primitives_t* generic = NULL; +static primitives_t* generic = nullptr; /* ------------------------------------------------------------------------- */ SSE3_SSD_ROUTINE(sse3_add_16s, INT16, generic->add_16s, _mm_adds_epi16, diff --git a/libfreerdp/primitives/sse/prim_alphaComp_sse3.c b/libfreerdp/primitives/sse/prim_alphaComp_sse3.c index 84f3e15a4..3b75767ae 100644 --- a/libfreerdp/primitives/sse/prim_alphaComp_sse3.c +++ b/libfreerdp/primitives/sse/prim_alphaComp_sse3.c @@ -36,7 +36,7 @@ #include #include -static primitives_t* generic = NULL; +static primitives_t* generic = nullptr; static pstatus_t sse2_alphaComp_argb(const BYTE* WINPR_RESTRICT pSrc1, UINT32 src1Step, const BYTE* WINPR_RESTRICT pSrc2, UINT32 src2Step, diff --git a/libfreerdp/primitives/sse/prim_andor_sse3.c b/libfreerdp/primitives/sse/prim_andor_sse3.c index d1c66d38f..c07709506 100644 --- a/libfreerdp/primitives/sse/prim_andor_sse3.c +++ b/libfreerdp/primitives/sse/prim_andor_sse3.c @@ -28,7 +28,7 @@ #include #include -static primitives_t* generic = NULL; +static primitives_t* generic = nullptr; /* ------------------------------------------------------------------------- */ SSE3_SCD_PRE_ROUTINE(sse3_andC_32u, UINT32, generic->andC_32u, _mm_and_si128, diff --git a/libfreerdp/primitives/sse/prim_colors_sse2.c b/libfreerdp/primitives/sse/prim_colors_sse2.c index fd4794e3c..0b1bd2a22 100644 --- a/libfreerdp/primitives/sse/prim_colors_sse2.c +++ b/libfreerdp/primitives/sse/prim_colors_sse2.c @@ -31,7 +31,7 @@ #if defined(SSE_AVX_INTRINSICS_ENABLED) #include -static primitives_t* generic = NULL; +static primitives_t* generic = nullptr; #define CACHE_LINE_BYTES 64 @@ -577,7 +577,7 @@ static pstatus_t sse2_RGBToRGB_16s8u_P3AC4R_BGRX( const UINT16* pb = (const UINT16*)(pSrc[2]); const UINT32 pad = roi->width % 16; const __m128i a = mm_set1_epu32(0xFFFFFFFFU); - BYTE* out = NULL; + BYTE* out = nullptr; UINT32 srcbump = 0; UINT32 dstbump = 0; out = pDst; @@ -683,7 +683,7 @@ static pstatus_t sse2_RGBToRGB_16s8u_P3AC4R_RGBX( const UINT16* pb = (const UINT16*)(pSrc[2]); const UINT32 pad = roi->width % 16; const __m128i a = mm_set1_epu32(0xFFFFFFFFU); - BYTE* out = NULL; + BYTE* out = nullptr; UINT32 srcbump = 0; UINT32 dstbump = 0; out = pDst; @@ -794,7 +794,7 @@ static pstatus_t sse2_RGBToRGB_16s8u_P3AC4R_XBGR( const UINT16* pb = (const UINT16*)(pSrc[2]); const UINT32 pad = roi->width % 16; const __m128i a = mm_set1_epu32(0xFFFFFFFFU); - BYTE* out = NULL; + BYTE* out = nullptr; UINT32 srcbump = 0; UINT32 dstbump = 0; out = pDst; @@ -905,7 +905,7 @@ static pstatus_t sse2_RGBToRGB_16s8u_P3AC4R_XRGB( const UINT16* pb = (const UINT16*)(pSrc[2]); const __m128i a = mm_set1_epu32(0xFFFFFFFFU); const UINT32 pad = roi->width % 16; - BYTE* out = NULL; + BYTE* out = nullptr; UINT32 srcbump = 0; UINT32 dstbump = 0; out = pDst; diff --git a/libfreerdp/primitives/sse/prim_set_sse2.c b/libfreerdp/primitives/sse/prim_set_sse2.c index a1f52a590..e308dbd3e 100644 --- a/libfreerdp/primitives/sse/prim_set_sse2.c +++ b/libfreerdp/primitives/sse/prim_set_sse2.c @@ -29,13 +29,13 @@ #if defined(SSE_AVX_INTRINSICS_ENABLED) #include -static primitives_t* generic = NULL; +static primitives_t* generic = nullptr; static pstatus_t sse2_set_8u(BYTE val, BYTE* WINPR_RESTRICT pDst, UINT32 ulen) { size_t len = ulen; BYTE byte = 0; - BYTE* dptr = NULL; + BYTE* dptr = nullptr; __m128i xmm0; size_t count = 0; diff --git a/libfreerdp/primitives/sse/prim_shift_sse3.c b/libfreerdp/primitives/sse/prim_shift_sse3.c index fb391e369..ea81e5230 100644 --- a/libfreerdp/primitives/sse/prim_shift_sse3.c +++ b/libfreerdp/primitives/sse/prim_shift_sse3.c @@ -28,7 +28,7 @@ #include #include -static primitives_t* generic = NULL; +static primitives_t* generic = nullptr; /* ------------------------------------------------------------------------- */ SSE3_SCD_ROUTINE(sse2_lShiftC_16s, INT16, generic->lShiftC_16s, _mm_slli_epi16, int16_t, diff --git a/libfreerdp/primitives/sse/prim_sign_ssse3.c b/libfreerdp/primitives/sse/prim_sign_ssse3.c index 40349bcbb..00b686e00 100644 --- a/libfreerdp/primitives/sse/prim_sign_ssse3.c +++ b/libfreerdp/primitives/sse/prim_sign_ssse3.c @@ -28,7 +28,7 @@ #include #include -static primitives_t* generic = NULL; +static primitives_t* generic = nullptr; /* ------------------------------------------------------------------------- */ static pstatus_t ssse3_sign_16s(const INT16* WINPR_RESTRICT pSrc, INT16* WINPR_RESTRICT pDst, diff --git a/libfreerdp/primitives/test/TestPrimitivesAlphaComp.c b/libfreerdp/primitives/test/TestPrimitivesAlphaComp.c index 06924f73c..e00221661 100644 --- a/libfreerdp/primitives/test/TestPrimitivesAlphaComp.c +++ b/libfreerdp/primitives/test/TestPrimitivesAlphaComp.c @@ -120,7 +120,7 @@ static BOOL test_alphaComp_func(void) BYTE ALIGN(src1[SRC1_WIDTH * SRC1_HEIGHT * 4]) = WINPR_C_ARRAY_INIT; BYTE ALIGN(src2[SRC2_WIDTH * SRC2_HEIGHT * 4]) = WINPR_C_ARRAY_INIT; BYTE ALIGN(dst1[DST_WIDTH * DST_HEIGHT * 4]) = WINPR_C_ARRAY_INIT; - UINT32* ptr = NULL; + UINT32* ptr = nullptr; winpr_RAND(src1, sizeof(src1)); /* Special-case the first two values */ src1[0] &= 0x00FFFFFFU; @@ -161,7 +161,7 @@ static int test_alphaComp_speed(void) BYTE ALIGN(src1[SRC1_WIDTH * SRC1_HEIGHT]) = WINPR_C_ARRAY_INIT; BYTE ALIGN(src2[SRC2_WIDTH * SRC2_HEIGHT]) = WINPR_C_ARRAY_INIT; BYTE ALIGN(dst1[DST_WIDTH * DST_HEIGHT]) = WINPR_C_ARRAY_INIT; - UINT32* ptr = NULL; + UINT32* ptr = nullptr; winpr_RAND(src1, sizeof(src1)); /* Special-case the first two values */ diff --git a/libfreerdp/primitives/test/TestPrimitivesColors.c b/libfreerdp/primitives/test/TestPrimitivesColors.c index 6d8c5bfb0..e4cde5aaa 100644 --- a/libfreerdp/primitives/test/TestPrimitivesColors.c +++ b/libfreerdp/primitives/test/TestPrimitivesColors.c @@ -22,11 +22,11 @@ /* ------------------------------------------------------------------------- */ static BOOL test_RGBToRGB_16s8u_P3AC4R_func(prim_size_t roi, DWORD DstFormat) { - INT16* r = NULL; - INT16* g = NULL; - INT16* b = NULL; - BYTE* out1 = NULL; - BYTE* out2 = NULL; + INT16* r = nullptr; + INT16* g = nullptr; + INT16* b = nullptr; + BYTE* out1 = nullptr; + BYTE* out2 = nullptr; BOOL failed = FALSE; const INT16* ptrs[3]; const UINT32 rgbStride = roi.width * 2; diff --git a/libfreerdp/primitives/test/TestPrimitivesCopy.c b/libfreerdp/primitives/test/TestPrimitivesCopy.c index be3e3fecd..c0b9e0274 100644 --- a/libfreerdp/primitives/test/TestPrimitivesCopy.c +++ b/libfreerdp/primitives/test/TestPrimitivesCopy.c @@ -79,7 +79,7 @@ static BYTE* rand_alloc(size_t w, size_t h, size_t bpp, size_t pad, BYTE** copy) const size_t s = w * bpp + pad; BYTE* ptr = calloc(s, h); if (!ptr) - return NULL; + return nullptr; winpr_RAND(ptr, s * h); @@ -89,7 +89,7 @@ static BYTE* rand_alloc(size_t w, size_t h, size_t bpp, size_t pad, BYTE** copy) if (!ptr2) { free(ptr); - return NULL; + return nullptr; } memcpy(ptr2, ptr, s * h); *copy = ptr2; @@ -131,22 +131,22 @@ static BOOL test_copy_no_overlap_off(BOOL verbose, UINT32 srcFormat, UINT32 dstF const UINT32 sstride = (w + sxoff) * sbpp + pad; const UINT32 dstride = (w + dxoff) * dbpp + pad; - BYTE* dst2 = NULL; - BYTE* src2 = NULL; + BYTE* dst2 = nullptr; + BYTE* src2 = nullptr; BYTE* dst1 = rand_alloc(w + dxoff, h + dyoff, dbpp, pad, &dst2); BYTE* src1 = rand_alloc(w + sxoff, h + syoff, sbpp, pad, &src2); if (!dst1 || !dst2 || !src1 || !src2) goto fail; if (gen->copy_no_overlap(dst1, dstFormat, dstride, dxoff, dyoff, w, h, src1, srcFormat, sstride, - sxoff, syoff, NULL, flags) != PRIMITIVES_SUCCESS) + sxoff, syoff, nullptr, flags) != PRIMITIVES_SUCCESS) goto fail; if (memcmp(src1, src2, 1ULL * sstride * h) != 0) goto fail; if (prims->copy_no_overlap(dst2, dstFormat, dstride, dxoff, dyoff, w, h, src1, srcFormat, - sstride, sxoff, syoff, NULL, flags) != PRIMITIVES_SUCCESS) + sstride, sxoff, syoff, nullptr, flags) != PRIMITIVES_SUCCESS) goto fail; if (memcmp(src1, src2, 1ULL * sstride * h) != 0) @@ -167,8 +167,8 @@ static BOOL test_copy_no_overlap_off(BOOL verbose, UINT32 srcFormat, UINT32 dstF const UINT32 c2 = FreeRDPReadColor(&d2[(x + dxoff) * dbpp], dstFormat); BYTE a1 = 0; BYTE a2 = 0; - FreeRDPSplitColor(c1, dstFormat, NULL, NULL, NULL, &a1, NULL); - FreeRDPSplitColor(c2, dstFormat, NULL, NULL, NULL, &a2, NULL); + FreeRDPSplitColor(c1, dstFormat, nullptr, nullptr, nullptr, &a1, nullptr); + FreeRDPSplitColor(c2, dstFormat, nullptr, nullptr, nullptr, &a2, nullptr); if (a1 != a2) goto fail; } diff --git a/libfreerdp/primitives/test/TestPrimitivesYCbCr.c b/libfreerdp/primitives/test/TestPrimitivesYCbCr.c index fce4158bb..5c378ed8f 100644 --- a/libfreerdp/primitives/test/TestPrimitivesYCbCr.c +++ b/libfreerdp/primitives/test/TestPrimitivesYCbCr.c @@ -1539,8 +1539,8 @@ static int test_bmp_cmp_dump(const BYTE* actual, const BYTE* expected, size_t si BYTE eG = 0; BYTE eB = 0; - FreeRDPSplitColor(pixel, PIXEL_FORMAT_XRGB32, &R, &G, &B, NULL, NULL); - FreeRDPSplitColor(ePixel, PIXEL_FORMAT_XRGB32, &eR, &eG, &eB, NULL, NULL); + FreeRDPSplitColor(pixel, PIXEL_FORMAT_XRGB32, &R, &G, &B, nullptr, nullptr); + FreeRDPSplitColor(ePixel, PIXEL_FORMAT_XRGB32, &eR, &eG, &eB, nullptr, nullptr); error[0] = (R > eR) ? R - eR : eR - R; error[1] = (G > eG) ? G - eG : eG - G; error[2] = (B > eB) ? B - eB : eB - B; @@ -1575,11 +1575,11 @@ static int test_PrimitivesYCbCr(const primitives_t* prims, UINT32 format, prim_s pstatus_t status = -1; int cnt[3]; float err[3]; - BYTE* actual = NULL; - BYTE* actual1 = NULL; + BYTE* actual = nullptr; + BYTE* actual1 = nullptr; const BYTE* expected = (const BYTE*)TEST_XRGB_IMAGE; int margin = 1; - INT16* pYCbCr[3] = { NULL, NULL, NULL }; + INT16* pYCbCr[3] = { nullptr, nullptr, nullptr }; const UINT32 srcStride = roi.width * 2; const UINT32 dstStride = roi.width * FreeRDPGetBytesPerPixel(format); const UINT32 srcSize = srcStride * roi.height; diff --git a/libfreerdp/primitives/test/TestPrimitivesYCoCg.c b/libfreerdp/primitives/test/TestPrimitivesYCoCg.c index a31d5ebfc..010f925dd 100644 --- a/libfreerdp/primitives/test/TestPrimitivesYCoCg.c +++ b/libfreerdp/primitives/test/TestPrimitivesYCoCg.c @@ -26,9 +26,9 @@ static BOOL test_YCoCgRToRGB_8u_AC4R_func(UINT32 width, UINT32 height) { pstatus_t status = -1; - BYTE* out_sse = NULL; - BYTE* in = NULL; - BYTE* out_c = NULL; + BYTE* out_sse = nullptr; + BYTE* in = nullptr; + BYTE* out_c = nullptr; const UINT32 srcStride = width * 4; const UINT32 size = srcStride * height; const UINT32 formats[] = { PIXEL_FORMAT_ARGB32, PIXEL_FORMAT_ABGR32, PIXEL_FORMAT_RGBA32, diff --git a/libfreerdp/primitives/test/TestPrimitivesYUV.c b/libfreerdp/primitives/test/TestPrimitivesYUV.c index 191e16da5..8f5e75e0d 100644 --- a/libfreerdp/primitives/test/TestPrimitivesYUV.c +++ b/libfreerdp/primitives/test/TestPrimitivesYUV.c @@ -69,8 +69,8 @@ static BOOL similarRGB(size_t y, const BYTE* src, const BYTE* dst, size_t size, dColor = FreeRDPReadColor(dst, format); src += bpp; dst += bpp; - FreeRDPSplitColor(sColor, format, &sR, &sG, &sB, &sA, NULL); - FreeRDPSplitColor(dColor, format, &dR, &dG, &dB, &dA, NULL); + FreeRDPSplitColor(sColor, format, &sR, &sG, &sB, &sA, nullptr); + FreeRDPSplitColor(dColor, format, &dR, &dG, &dB, &dA, nullptr); const long diffr = labs(1L * sR - dR); const long diffg = labs(1L * sG - dG); @@ -133,8 +133,8 @@ static void get_size(BOOL large, UINT32* width, UINT32* height) static BOOL check_padding(const BYTE* psrc, size_t size, size_t padding, const char* buffer) { BOOL rc = TRUE; - const BYTE* src = NULL; - const BYTE* esrc = NULL; + const BYTE* src = nullptr; + const BYTE* esrc = nullptr; size_t halfPad = (padding + 1) / 2; if (!psrc) @@ -183,11 +183,11 @@ static BOOL check_padding(const BYTE* psrc, size_t size, size_t padding, const c static void* set_padding(size_t size, size_t padding) { size_t halfPad = (padding + 1) / 2; - BYTE* psrc = NULL; + BYTE* psrc = nullptr; BYTE* src = winpr_aligned_malloc(size + 2 * halfPad, 16); if (!src) - return NULL; + return nullptr; memset(&src[0], 'A', halfPad); memset(&src[halfPad], PADDING_FILL_VALUE, size); @@ -197,7 +197,7 @@ static void* set_padding(size_t size, size_t padding) if (!check_padding(psrc, size, padding, "init")) { winpr_aligned_free(src); - return NULL; + return nullptr; } return psrc; @@ -205,7 +205,7 @@ static void* set_padding(size_t size, size_t padding) static void free_padding(void* src, size_t padding) { - BYTE* ptr = NULL; + BYTE* ptr = nullptr; if (!src) return; @@ -440,8 +440,8 @@ static BOOL TestPrimitiveYUV(primitives_t* prims, prim_size_t roi, BOOL use444) UINT32 aheight = 0; BYTE* yuv[3] = WINPR_C_ARRAY_INIT; UINT32 yuv_step[3] = WINPR_C_ARRAY_INIT; - BYTE* rgb = NULL; - BYTE* rgb_dst = NULL; + BYTE* rgb = nullptr; + BYTE* rgb_dst = nullptr; size_t size = 0; size_t uvsize = 0; size_t uvwidth = 0; @@ -663,9 +663,9 @@ static void free_yuv420(BYTE** planes, UINT32 padding) free_padding(planes[0], padding); free_padding(planes[1], padding); free_padding(planes[2], padding); - planes[0] = NULL; - planes[1] = NULL; - planes[2] = NULL; + planes[0] = nullptr; + planes[1] = nullptr; + planes[2] = nullptr; } static BOOL check_yuv420(BYTE** planes, UINT32 width, UINT32 height, UINT32 padding) @@ -746,13 +746,13 @@ static BOOL TestPrimitiveRgbToLumaChroma(primitives_t* prims, prim_size_t roi, U BYTE* lumaGeneric[3] = WINPR_C_ARRAY_INIT; BYTE* chromaGeneric[3] = WINPR_C_ARRAY_INIT; UINT32 yuv_step[3]; - BYTE* rgb = NULL; + BYTE* rgb = nullptr; size_t size = 0; size_t uvwidth = 0; const size_t padding = 0x1000; UINT32 stride = 0; - fn_RGBToAVC444YUV_t fkt = NULL; - fn_RGBToAVC444YUV_t gen = NULL; + fn_RGBToAVC444YUV_t fkt = nullptr; + fn_RGBToAVC444YUV_t gen = nullptr; const UINT32 formats[] = { PIXEL_FORMAT_XRGB32, PIXEL_FORMAT_XBGR32, PIXEL_FORMAT_ARGB32, PIXEL_FORMAT_ABGR32, PIXEL_FORMAT_RGBA32, PIXEL_FORMAT_RGBX32, PIXEL_FORMAT_BGRA32, PIXEL_FORMAT_BGRX32 }; @@ -971,7 +971,7 @@ static void free_yuv(BYTE* yuv[3]) for (size_t x = 0; x < 3; x++) { free(yuv[x]); - yuv[x] = NULL; + yuv[x] = nullptr; } } @@ -1072,12 +1072,12 @@ static BOOL compare_yuv444_to_rgb(prim_size_t roi, DWORD type) BYTE r1 = 0; BYTE g1 = 0; BYTE b1 = 0; - FreeRDPSplitColor(color1, format, &r1, &g1, &b1, NULL, NULL); + FreeRDPSplitColor(color1, format, &r1, &g1, &b1, nullptr, nullptr); BYTE r2 = 0; BYTE g2 = 0; BYTE b2 = 0; - FreeRDPSplitColor(color2, format, &r2, &g2, &b2, NULL, NULL); + FreeRDPSplitColor(color2, format, &r2, &g2, &b2, nullptr, nullptr); const int dr12 = abs(r1 - r2); const int dg12 = abs(g1 - g2); @@ -1245,12 +1245,12 @@ static BOOL compare_yuv420_to_rgb(prim_size_t roi, DWORD type) BYTE r1 = 0; BYTE g1 = 0; BYTE b1 = 0; - FreeRDPSplitColor(color1, format, &r1, &g1, &b1, NULL, NULL); + FreeRDPSplitColor(color1, format, &r1, &g1, &b1, nullptr, nullptr); BYTE r2 = 0; BYTE g2 = 0; BYTE b2 = 0; - FreeRDPSplitColor(color2, format, &r2, &g2, &b2, NULL, NULL); + FreeRDPSplitColor(color2, format, &r2, &g2, &b2, nullptr, nullptr); const int dr12 = abs(r1 - r2); const int dg12 = abs(g1 - g2); @@ -1420,9 +1420,9 @@ int TestPrimitivesYUV(int argc, char* argv[]) *ptr++ = '\0'; errno = 0; - roi.width = strtoul(str, NULL, 0); + roi.width = strtoul(str, nullptr, 0); if (errno == 0) - roi.height = strtoul(str, NULL, 0); + roi.height = strtoul(str, nullptr, 0); reset = errno != 0; } diff --git a/libfreerdp/primitives/test/prim_test.c b/libfreerdp/primitives/test/prim_test.c index 2d415df03..0fa1ffcfb 100644 --- a/libfreerdp/primitives/test/prim_test.c +++ b/libfreerdp/primitives/test/prim_test.c @@ -27,8 +27,8 @@ #include #include -primitives_t* generic = NULL; -primitives_t* optimized = NULL; +primitives_t* generic = nullptr; +primitives_t* optimized = nullptr; BOOL g_TestPrimitivesPerformance = FALSE; UINT32 g_Iterations = 1000; diff --git a/libfreerdp/utils/cliprdr_utils.c b/libfreerdp/utils/cliprdr_utils.c index b5d036ac4..6ce971d3e 100644 --- a/libfreerdp/utils/cliprdr_utils.c +++ b/libfreerdp/utils/cliprdr_utils.c @@ -64,7 +64,7 @@ UINT cliprdr_parse_file_list(const BYTE* format_data, UINT32 format_data_length, UINT result = NO_ERROR; UINT32 count = 0; wStream sbuffer; - wStream* s = NULL; + wStream* s = nullptr; if (!format_data || !file_descriptor_array || !file_descriptor_count) return ERROR_BAD_ARGUMENTS; @@ -197,7 +197,7 @@ UINT cliprdr_serialize_file_list_ex(UINT32 flags, const FILEDESCRIPTORW* file_de { UINT result = NO_ERROR; size_t len = 0; - wStream* s = NULL; + wStream* s = nullptr; if (!file_descriptor_array || !format_data || !format_data_length) return ERROR_BAD_ARGUMENTS; @@ -208,7 +208,7 @@ UINT cliprdr_serialize_file_list_ex(UINT32 flags, const FILEDESCRIPTORW* file_de return ERROR_BAD_ARGUMENTS; } - s = Stream_New(NULL, 4 + file_descriptor_count * CLIPRDR_FILEDESCRIPTOR_SIZE); + s = Stream_New(nullptr, 4 + file_descriptor_count * CLIPRDR_FILEDESCRIPTOR_SIZE); if (!s) return ERROR_NOT_ENOUGH_MEMORY; diff --git a/libfreerdp/utils/encoded_types.c b/libfreerdp/utils/encoded_types.c index ce635ab01..f7d739a49 100644 --- a/libfreerdp/utils/encoded_types.c +++ b/libfreerdp/utils/encoded_types.c @@ -223,7 +223,7 @@ BOOL freerdp_write_four_byte_signed_integer(wStream* s, INT32 value) BOOL freerdp_read_four_byte_float(wStream* s, double* value) { - return freerdp_read_four_byte_float_exp(s, value, NULL); + return freerdp_read_four_byte_float_exp(s, value, nullptr); } BOOL freerdp_read_four_byte_float_exp(wStream* s, double* value, BYTE* exp) diff --git a/libfreerdp/utils/helpers.c b/libfreerdp/utils/helpers.c index fd4b75f20..99f1f0fd6 100644 --- a/libfreerdp/utils/helpers.c +++ b/libfreerdp/utils/helpers.c @@ -91,7 +91,7 @@ static BOOL CALLBACK init_app_details(WINPR_ATTR_UNUSED PINIT_ONCE once, WINPR_ATTR_NODISCARD static BOOL initializeApplicationDetails(void) { - InitOnceExecuteOnce(&s_freerdp_app_details_once, init_app_details, NULL, NULL); + InitOnceExecuteOnce(&s_freerdp_app_details_once, init_app_details, nullptr, nullptr); return TRUE; } @@ -130,14 +130,14 @@ BOOL freerdp_setApplicationDetails(const char* vendor, const char* product, SSIZ const char* freerdp_getApplicationDetailsVendor(void) { if (!initializeApplicationDetails()) - return NULL; + return nullptr; return s_freerdp_vendor_string; } const char* freerdp_getApplicationDetailsProduct(void) { if (!initializeApplicationDetails()) - return NULL; + return nullptr; return s_freerdp_product_string; } @@ -145,9 +145,9 @@ char* freerdp_getApplicatonDetailsRegKey(const char* fmt) { char* val = freerdp_getApplicatonDetailsCombined('\\'); if (!val) - return NULL; + return nullptr; - char* str = NULL; + char* str = nullptr; size_t slen = 0; (void)winpr_asprintf(&str, &slen, fmt, val); free(val); @@ -161,7 +161,7 @@ char* freerdp_getApplicatonDetailsCombined(char separator) const char* product = freerdp_getApplicationDetailsProduct(); size_t slen = 0; - char* str = NULL; + char* str = nullptr; if (version < 0) { (void)winpr_asprintf(&str, &slen, "%s%c%s", vendor, separator, product); @@ -209,7 +209,7 @@ static char* freerdp_settings_get_legacy_config_path(const char* filename) char* path = GetKnownSubPath(KNOWN_PATH_XDG_CONFIG_HOME, product); if (!path) - return NULL; + return nullptr; char* filepath = GetCombinedPath(path, filename); free(path); @@ -227,13 +227,13 @@ WINPR_ATTR_MALLOC(free, 1) static char* getCustomConfigPath(BOOL system, const c const SSIZE_T version = freerdp_getApplicationDetailsVersion(); if (!vendor || !product) - return NULL; + return nullptr; char* config = GetKnownSubPathV(id, "%s", vendor); if (!config) - return NULL; + return nullptr; - char* base = NULL; + char* base = nullptr; if (version < 0) base = GetCombinedPathV(config, "%s", product); else @@ -241,7 +241,7 @@ WINPR_ATTR_MALLOC(free, 1) static char* getCustomConfigPath(BOOL system, const c free(config); if (!base) - return NULL; + return nullptr; if (!filename) return base; @@ -268,7 +268,7 @@ char* freerdp_GetConfigFilePath(BOOL system, const char* filename) const SSIZE_T version = freerdp_getApplicationDetailsVersion(); if (!vendor || !product) - return NULL; + return nullptr; #if !defined(WITH_FULL_CONFIG_PATH) if (!system && (_stricmp(vendor, product) == 0)) @@ -277,9 +277,9 @@ char* freerdp_GetConfigFilePath(BOOL system, const char* filename) char* config = GetKnownPath(id); if (!config) - return NULL; + return nullptr; - char* base = NULL; + char* base = nullptr; if (version < 0) base = GetCombinedPathV(config, "%s", product); else @@ -287,7 +287,7 @@ char* freerdp_GetConfigFilePath(BOOL system, const char* filename) free(config); if (!base) - return NULL; + return nullptr; if (!filename) return base; @@ -301,7 +301,7 @@ WINPR_JSON* freerdp_GetJSONConfigFile(BOOL system, const char* filename) { char* path = freerdp_GetConfigFilePath(system, filename); if (!path) - return NULL; + return nullptr; WINPR_JSON* json = WINPR_JSON_ParseFromFile(path); free(path); diff --git a/libfreerdp/utils/http.c b/libfreerdp/utils/http.c index e25c94d40..17886d6d7 100644 --- a/libfreerdp/utils/http.c +++ b/libfreerdp/utils/http.c @@ -54,7 +54,7 @@ static void log_errors_(wLog* log, const char* msg, const char* file, const char { error_logged = TRUE; WLog_PrintTextMessage(log, level, line, file, fkt, "%s: %s", msg, - ERR_error_string(ec, NULL)); + ERR_error_string(ec, nullptr)); } if (!error_logged) WLog_PrintTextMessage(log, level, line, file, fkt, "%s (no details available)", msg); @@ -91,15 +91,15 @@ BOOL freerdp_http_request(const char* url, const char* body, long* status_code, size_t* response_length) { BOOL ret = FALSE; - char* hostname = NULL; - const char* path = NULL; - char* headers = NULL; + char* hostname = nullptr; + const char* path = nullptr; + char* headers = nullptr; size_t size = 0; int status = 0; char buffer[1024] = WINPR_C_ARRAY_INIT; - BIO* bio = NULL; - SSL_CTX* ssl_ctx = NULL; - SSL* ssl = NULL; + BIO* bio = nullptr; + SSL_CTX* ssl_ctx = nullptr; + SSL* ssl = nullptr; WINPR_ASSERT(status_code); WINPR_ASSERT(response); @@ -108,7 +108,7 @@ BOOL freerdp_http_request(const char* url, const char* body, long* status_code, wLog* log = WLog_Get(TAG); WINPR_ASSERT(log); - *response = NULL; + *response = nullptr; if (!url || strnlen(url, 8) < 8 || strncmp(url, "https://", 8) != 0 || !(path = strchr(url + 8, '/'))) @@ -241,7 +241,7 @@ BOOL freerdp_http_request(const char* url, const char* body, long* status_code, } errno = 0; - *status_code = strtol(&buffer[sizeof(header)], NULL, 0); + *status_code = strtol(&buffer[sizeof(header)], nullptr, 0); if (errno != 0) { char ebuffer[256] = WINPR_C_ARRAY_INIT; @@ -259,12 +259,12 @@ BOOL freerdp_http_request(const char* url, const char* body, long* status_code, goto out; } - char* val = NULL; + char* val = nullptr; char* name = strtok_s(buffer, ":", &val); if (name && (_stricmp(name, "content-length") == 0)) { errno = 0; - *response_length = strtoul(val, NULL, 10); + *response_length = strtoul(val, nullptr, 10); if (errno) { char ebuffer[256] = WINPR_C_ARRAY_INIT; @@ -313,7 +313,7 @@ out: if (!ret) { free(*response); - *response = NULL; + *response = nullptr; *response_length = 0; } free(hostname); diff --git a/libfreerdp/utils/passphrase.c b/libfreerdp/utils/passphrase.c index 2ea88b9d3..dccc778f6 100644 --- a/libfreerdp/utils/passphrase.c +++ b/libfreerdp/utils/passphrase.c @@ -56,13 +56,13 @@ const char* freerdp_passphrase_read(rdpContext* context, const char* prompt, cha WCHAR PasswordW[CREDUI_MAX_PASSWORD_LENGTH + 1] = WINPR_C_ARRAY_INIT; BOOL fSave = FALSE; DWORD dwFlags = 0; - WCHAR* promptW = ConvertUtf8ToWCharAlloc(prompt, NULL); + WCHAR* promptW = ConvertUtf8ToWCharAlloc(prompt, nullptr); const DWORD status = - CredUICmdLinePromptForCredentialsW(promptW, NULL, 0, UserNameW, ARRAYSIZE(UserNameW), + CredUICmdLinePromptForCredentialsW(promptW, nullptr, 0, UserNameW, ARRAYSIZE(UserNameW), PasswordW, ARRAYSIZE(PasswordW), &fSave, dwFlags); free(promptW); if (ConvertWCharNToUtf8(PasswordW, ARRAYSIZE(PasswordW), buf, bufsiz) < 0) - return NULL; + return nullptr; return buf; } @@ -114,7 +114,7 @@ static int wait_for_fd(int fd, int timeout) do { - status = select(fd + 1, &rset, NULL, NULL, timeout ? &tv : NULL); + status = select(fd + 1, &rset, nullptr, nullptr, timeout ? &tv : nullptr); } while ((status < 0) && (errno == EINTR)); #endif @@ -125,8 +125,8 @@ static void replace_char(char* buffer, WINPR_ATTR_UNUSED size_t buffer_len, cons { while (*toreplace != '\0') { - char* ptr = NULL; - while ((ptr = strrchr(buffer, *toreplace)) != NULL) + char* ptr = nullptr; + while ((ptr = strrchr(buffer, *toreplace)) != nullptr) *ptr = '\0'; toreplace++; } @@ -138,12 +138,12 @@ static const char* freerdp_passphrase_read_tty(rdpContext* context, const char* BOOL terminal_needs_reset = FALSE; char term_name[L_ctermid] = WINPR_C_ARRAY_INIT; - FILE* fout = NULL; + FILE* fout = nullptr; if (bufsiz == 0) { errno = EINVAL; - return NULL; + return nullptr; } ctermid(term_name); @@ -167,7 +167,7 @@ static const char* freerdp_passphrase_read_tty(rdpContext* context, const char* if (!fout) { close(term_file); - return NULL; + return nullptr; } terminal_fildes = term_file; } @@ -193,7 +193,7 @@ static const char* freerdp_passphrase_read_tty(rdpContext* context, const char* (void)fflush(fout); { - char* ptr = NULL; + char* ptr = nullptr; size_t ptr_len = 0; const SSIZE_T res = freerdp_interruptible_get_line(context, &ptr, &ptr_len, fp); if (res < 0) @@ -232,7 +232,7 @@ error: errno = saved_errno; } - return NULL; + return nullptr; } static const char* freerdp_passphrase_read_askpass(const char* prompt, char* buf, size_t bufsiz, @@ -245,15 +245,15 @@ static const char* freerdp_passphrase_read_askpass(const char* prompt, char* buf // NOLINTNEXTLINE(clang-analyzer-optin.taint.GenericTaint) FILE* askproc = popen(command, "r"); if (!askproc) - return NULL; + return nullptr; WINPR_ASSERT(bufsiz <= INT32_MAX); - if (fgets(buf, (int)bufsiz, askproc) != NULL) + if (fgets(buf, (int)bufsiz, askproc) != nullptr) buf[strcspn(buf, "\r\n")] = '\0'; else - buf = NULL; + buf = nullptr; const int status = pclose(askproc); if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) - buf = NULL; + buf = nullptr; return buf; } @@ -387,7 +387,7 @@ int freerdp_interruptible_getc(rdpContext* context, FILE* stream) const char* freerdp_passphrase_read(rdpContext* context, const char* prompt, char* buf, size_t bufsiz, int from_stdin) { - return NULL; + return nullptr; } int freerdp_interruptible_getc(rdpContext* context, FILE* f) @@ -400,10 +400,10 @@ SSIZE_T freerdp_interruptible_get_line(rdpContext* context, char** plineptr, siz FILE* stream) { int c = 0; - char* n = NULL; + char* n = nullptr; size_t step = 32; size_t used = 0; - char* ptr = NULL; + char* ptr = nullptr; size_t len = 0; if (!plineptr || !psize) @@ -447,7 +447,7 @@ SSIZE_T freerdp_interruptible_get_line(rdpContext* context, char** plineptr, siz if (!n) { free(ptr); - *plineptr = NULL; + *plineptr = nullptr; return -1; } @@ -484,7 +484,7 @@ SSIZE_T freerdp_interruptible_get_line(rdpContext* context, char** plineptr, siz if (c == EOF) { free(ptr); - *plineptr = NULL; + *plineptr = nullptr; return EOF; } *plineptr = ptr; diff --git a/libfreerdp/utils/pcap.c b/libfreerdp/utils/pcap.c index 795a043d5..b53573017 100644 --- a/libfreerdp/utils/pcap.c +++ b/libfreerdp/utils/pcap.c @@ -95,7 +95,7 @@ static BOOL pcap_read_record(rdpPcap* pcap, pcap_record* record) if (fread(record->data, record->length, 1, pcap->fp) != 1) { free(record->data); - record->data = NULL; + record->data = nullptr; return FALSE; } return TRUE; @@ -130,7 +130,7 @@ BOOL pcap_add_record(rdpPcap* pcap, const void* data, size_t length) record->header.ts_sec = (UINT32)WINPR_TIME_NS_TO_S(ns); record->header.ts_usec = (UINT32)WINPR_TIME_NS_REM_US(ns); - if (pcap->tail == NULL) + if (pcap->tail == nullptr) { pcap->tail = record; if (!pcap->tail) @@ -144,7 +144,7 @@ BOOL pcap_add_record(rdpPcap* pcap, const void* data, size_t length) pcap->tail = record; } - if (pcap->record == NULL) + if (pcap->record == nullptr) pcap->record = record; return TRUE; @@ -200,7 +200,7 @@ rdpPcap* pcap_open(const char* name, BOOL write) pcap->record_count = 0; pcap->fp = winpr_fopen(name, write ? "w+b" : "rb"); - if (pcap->fp == NULL) + if (pcap->fp == nullptr) goto fail; if (write) @@ -228,20 +228,20 @@ rdpPcap* pcap_open(const char* name, BOOL write) fail: pcap_close(pcap); - return NULL; + return nullptr; } void pcap_flush(rdpPcap* pcap) { WINPR_ASSERT(pcap); - while (pcap->record != NULL) + while (pcap->record != nullptr) { (void)pcap_write_record(pcap, pcap->record); pcap->record = pcap->record->next; } - if (pcap->fp != NULL) + if (pcap->fp != nullptr) (void)fflush(pcap->fp); } @@ -252,7 +252,7 @@ void pcap_close(rdpPcap* pcap) pcap_flush(pcap); - if (pcap->fp != NULL) + if (pcap->fp != nullptr) (void)fclose(pcap->fp); free(pcap->name); diff --git a/libfreerdp/utils/profiler.c b/libfreerdp/utils/profiler.c index b1c058ded..253e2ddaf 100644 --- a/libfreerdp/utils/profiler.c +++ b/libfreerdp/utils/profiler.c @@ -38,7 +38,7 @@ PROFILER* profiler_create(const char* name) PROFILER* profiler = (PROFILER*)calloc(1, sizeof(PROFILER)); if (!profiler) - return NULL; + return nullptr; profiler->name = _strdup(name); profiler->stopwatch = stopwatch_create(); @@ -49,7 +49,7 @@ PROFILER* profiler_create(const char* name) return profiler; fail: profiler_free(profiler); - return NULL; + return nullptr; } void profiler_free(PROFILER* profiler) diff --git a/libfreerdp/utils/rdpdr_utils.c b/libfreerdp/utils/rdpdr_utils.c index c38650469..94737c818 100644 --- a/libfreerdp/utils/rdpdr_utils.c +++ b/libfreerdp/utils/rdpdr_utils.c @@ -646,10 +646,10 @@ const char* rdpdr_irp_val2str(UINT32 ioCode1) const char* rdpdr_irp_mask2str(UINT32 ioCode1Mask, char* buffer, size_t len) { if (len < 1) - return NULL; + return nullptr; - if (!winpr_str_append("{", buffer, len, NULL)) - return NULL; + if (!winpr_str_append("{", buffer, len, nullptr)) + return nullptr; for (size_t x = 0; x < 32; x++) { @@ -657,14 +657,14 @@ const char* rdpdr_irp_mask2str(UINT32 ioCode1Mask, char* buffer, size_t len) if (ioCode1Mask & mask) { if (!winpr_str_append(rdpdr_irp_val2str(mask), &buffer[1], len - 1, "|")) - return NULL; + return nullptr; } } char number[16] = WINPR_C_ARRAY_INIT; (void)_snprintf(number, sizeof(number), "}[0x%08" PRIx32 "]", ioCode1Mask); - if (!winpr_str_append(number, buffer, len, NULL)) - return NULL; + if (!winpr_str_append(number, buffer, len, nullptr)) + return nullptr; return buffer; } diff --git a/libfreerdp/utils/ringbuffer.c b/libfreerdp/utils/ringbuffer.c index 0a1549726..76c9ff82e 100644 --- a/libfreerdp/utils/ringbuffer.c +++ b/libfreerdp/utils/ringbuffer.c @@ -72,13 +72,13 @@ void ringbuffer_destroy(RingBuffer* ringbuffer) return; free(ringbuffer->buffer); - ringbuffer->buffer = NULL; + ringbuffer->buffer = nullptr; } static BOOL ringbuffer_realloc(RingBuffer* ringbuffer, size_t targetSize) { WINPR_ASSERT(ringbuffer); - BYTE* newData = NULL; + BYTE* newData = nullptr; DEBUG_RINGBUFFER("ringbuffer_realloc(%p): targetSize: %" PRIdz "", (void*)rb, targetSize); if (ringbuffer->writePtr == ringbuffer->readPtr) @@ -212,7 +212,7 @@ BYTE* ringbuffer_ensure_linear_write(RingBuffer* ringbuffer, size_t sz) if (ringbuffer->freeSize < sz) { if (!ringbuffer_realloc(ringbuffer, ringbuffer->size + sz - ringbuffer->freeSize + 32)) - return NULL; + return nullptr; } if (ringbuffer->writePtr == ringbuffer->readPtr) diff --git a/libfreerdp/utils/signal_posix.c b/libfreerdp/utils/signal_posix.c index 5b685c305..a5375e87a 100644 --- a/libfreerdp/utils/signal_posix.c +++ b/libfreerdp/utils/signal_posix.c @@ -56,10 +56,10 @@ static void fatal_handler(int signum) default_sigaction.sa_handler = SIG_DFL; sigfillset(&(default_sigaction.sa_mask)); default_sigaction.sa_flags = 0; - sigaction(signum, &default_sigaction, NULL); + sigaction(signum, &default_sigaction, nullptr); sigemptyset(&this_mask); sigaddset(&this_mask, signum); - pthread_sigmask(SIG_UNBLOCK, &this_mask, NULL); + pthread_sigmask(SIG_UNBLOCK, &this_mask, nullptr); (void)raise(signum); } @@ -101,16 +101,16 @@ static BOOL register_handlers(const int* signals, size_t count, void (*handler)( for (size_t x = 0; x < count; x++) { struct sigaction orig_sigaction = WINPR_C_ARRAY_INIT; - if (sigaction(signals[x], NULL, &orig_sigaction) == 0) + if (sigaction(signals[x], nullptr, &orig_sigaction) == 0) { if (orig_sigaction.sa_handler != SIG_IGN) { - sigaction(signals[x], &saction, NULL); + sigaction(signals[x], &saction, nullptr); } } } - pthread_sigmask(SIG_SETMASK, &orig_set, NULL); + pthread_sigmask(SIG_SETMASK, &orig_set, nullptr); return TRUE; } @@ -132,10 +132,10 @@ static void unregister_handlers(const int* signals, size_t count) for (size_t x = 0; x < count; x++) { - sigaction(signals[x], &saction, NULL); + sigaction(signals[x], &saction, nullptr); } - pthread_sigmask(SIG_SETMASK, &orig_set, NULL); + pthread_sigmask(SIG_SETMASK, &orig_set, nullptr); } static void unregister_all_handlers(void) diff --git a/libfreerdp/utils/smartcard_call.c b/libfreerdp/utils/smartcard_call.c index abed448f1..b1c3ae7af 100644 --- a/libfreerdp/utils/smartcard_call.c +++ b/libfreerdp/utils/smartcard_call.c @@ -57,7 +57,7 @@ #define wrap(ctx, fkt, ...) \ ctx->useEmulatedCard ? SCARD_F_INTERNAL_ERROR : ctx->pWinSCardApi->pfn##fkt(__VA_ARGS__) #define wrap_ptr(ctx, fkt, ...) \ - ctx->useEmulatedCard ? NULL : ctx->pWinSCardApi->pfn##fkt(__VA_ARGS__) + ctx->useEmulatedCard ? nullptr : ctx->pWinSCardApi->pfn##fkt(__VA_ARGS__) #endif struct s_scard_call_context @@ -96,7 +96,7 @@ static LONG smartcard_EstablishContext_Call(scard_call_context* smartcard, wStre EstablishContext_Return ret = WINPR_C_ARRAY_INIT; EstablishContext_Call* call = &operation->call.establishContext; status = ret.ReturnCode = - wrap(smartcard, SCardEstablishContext, call->dwScope, NULL, NULL, &hContext); + wrap(smartcard, SCardEstablishContext, call->dwScope, nullptr, nullptr, &hContext); if (ret.ReturnCode == SCARD_S_SUCCESS) { @@ -186,7 +186,7 @@ static LONG smartcard_ListReaderGroupsA_Call(scard_call_context* smartcard, wStr { LONG status = 0; ListReaderGroups_Return ret = WINPR_C_ARRAY_INIT; - LPSTR mszGroups = NULL; + LPSTR mszGroups = nullptr; DWORD cchGroups = 0; WINPR_ASSERT(smartcard); @@ -218,7 +218,7 @@ static LONG smartcard_ListReaderGroupsW_Call(scard_call_context* smartcard, wStr { LONG status = 0; ListReaderGroups_Return ret = WINPR_C_ARRAY_INIT; - LPWSTR mszGroups = NULL; + LPWSTR mszGroups = nullptr; DWORD cchGroups = 0; WINPR_ASSERT(smartcard); @@ -265,7 +265,7 @@ static BOOL filter_match(wLinkedList* list, LPCSTR reader, size_t readerLen) if (filter) { - if (strstr(reader, filter) != NULL) + if (strstr(reader, filter) != nullptr) return TRUE; } } @@ -278,7 +278,7 @@ static DWORD filter_device_by_name_a(wLinkedList* list, LPSTR* mszReaders, DWORD size_t rpos = 0; size_t wpos = 0; - if (*mszReaders == NULL || LinkedList_Count(list) < 1) + if (*mszReaders == nullptr || LinkedList_Count(list) < 1) return cchReaders; do @@ -313,12 +313,12 @@ static DWORD filter_device_by_name_a(wLinkedList* list, LPSTR* mszReaders, DWORD static DWORD filter_device_by_name_w(wLinkedList* list, LPWSTR* mszReaders, DWORD cchReaders) { DWORD rc = 0; - LPSTR readers = NULL; + LPSTR readers = nullptr; if (LinkedList_Count(list) < 1) return cchReaders; - readers = ConvertMszWCharNToUtf8Alloc(*mszReaders, cchReaders, NULL); + readers = ConvertMszWCharNToUtf8Alloc(*mszReaders, cchReaders, nullptr); if (!readers) { @@ -327,10 +327,10 @@ static DWORD filter_device_by_name_w(wLinkedList* list, LPWSTR* mszReaders, DWOR } free(*mszReaders); - *mszReaders = NULL; + *mszReaders = nullptr; rc = filter_device_by_name_a(list, &readers, cchReaders); - *mszReaders = ConvertMszUtf8NToWCharAlloc(readers, rc, NULL); + *mszReaders = ConvertMszUtf8NToWCharAlloc(readers, rc, nullptr); if (!*mszReaders) rc = 0; @@ -342,7 +342,7 @@ static LONG smartcard_ListReadersA_Call(scard_call_context* smartcard, wStream* SMARTCARD_OPERATION* operation) { ListReaders_Return ret = WINPR_C_ARRAY_INIT; - LPSTR mszReaders = NULL; + LPSTR mszReaders = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -385,7 +385,7 @@ static LONG smartcard_ListReadersW_Call(scard_call_context* smartcard, wStream* LONG status = 0; ListReaders_Return ret = WINPR_C_ARRAY_INIT; DWORD cchReaders = 0; - ListReaders_Call* call = NULL; + ListReaders_Call* call = nullptr; union { const BYTE* bp; @@ -440,7 +440,7 @@ static LONG smartcard_IntroduceReaderGroupA_Call(scard_call_context* smartcard, SMARTCARD_OPERATION* operation) { Long_Return ret = WINPR_C_ARRAY_INIT; - ContextAndStringA_Call* call = NULL; + ContextAndStringA_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -458,7 +458,7 @@ static LONG smartcard_IntroduceReaderGroupW_Call(scard_call_context* smartcard, SMARTCARD_OPERATION* operation) { Long_Return ret = WINPR_C_ARRAY_INIT; - ContextAndStringW_Call* call = NULL; + ContextAndStringW_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -476,7 +476,7 @@ static LONG smartcard_IntroduceReaderA_Call(scard_call_context* smartcard, SMARTCARD_OPERATION* operation) { Long_Return ret = WINPR_C_ARRAY_INIT; - ContextAndTwoStringA_Call* call = NULL; + ContextAndTwoStringA_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -495,7 +495,7 @@ static LONG smartcard_IntroduceReaderW_Call(scard_call_context* smartcard, SMARTCARD_OPERATION* operation) { Long_Return ret = WINPR_C_ARRAY_INIT; - ContextAndTwoStringW_Call* call = NULL; + ContextAndTwoStringW_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -514,7 +514,7 @@ static LONG smartcard_ForgetReaderA_Call(scard_call_context* smartcard, SMARTCARD_OPERATION* operation) { Long_Return ret = WINPR_C_ARRAY_INIT; - ContextAndStringA_Call* call = NULL; + ContextAndStringA_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -532,7 +532,7 @@ static LONG smartcard_ForgetReaderW_Call(scard_call_context* smartcard, SMARTCARD_OPERATION* operation) { Long_Return ret = WINPR_C_ARRAY_INIT; - ContextAndStringW_Call* call = NULL; + ContextAndStringW_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -550,7 +550,7 @@ static LONG smartcard_AddReaderToGroupA_Call(scard_call_context* smartcard, SMARTCARD_OPERATION* operation) { Long_Return ret = WINPR_C_ARRAY_INIT; - ContextAndTwoStringA_Call* call = NULL; + ContextAndTwoStringA_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -569,7 +569,7 @@ static LONG smartcard_AddReaderToGroupW_Call(scard_call_context* smartcard, SMARTCARD_OPERATION* operation) { Long_Return ret = WINPR_C_ARRAY_INIT; - ContextAndTwoStringW_Call* call = NULL; + ContextAndTwoStringW_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -588,7 +588,7 @@ static LONG smartcard_RemoveReaderFromGroupA_Call(scard_call_context* smartcard, SMARTCARD_OPERATION* operation) { Long_Return ret = WINPR_C_ARRAY_INIT; - ContextAndTwoStringA_Call* call = NULL; + ContextAndTwoStringA_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -607,7 +607,7 @@ static LONG smartcard_RemoveReaderFromGroupW_Call(scard_call_context* smartcard, SMARTCARD_OPERATION* operation) { Long_Return ret = WINPR_C_ARRAY_INIT; - ContextAndTwoStringW_Call* call = NULL; + ContextAndTwoStringW_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -626,7 +626,7 @@ static LONG smartcard_LocateCardsA_Call(scard_call_context* smartcard, wStream* { LONG status = 0; LocateCards_Return ret = WINPR_C_ARRAY_INIT; - LocateCardsA_Call* call = NULL; + LocateCardsA_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(operation); @@ -637,7 +637,7 @@ static LONG smartcard_LocateCardsA_Call(scard_call_context* smartcard, wStream* call->rgReaderStates, call->cReaders); scard_log_status_error_wlog(smartcard->log, "SCardLocateCardsA", ret.ReturnCode); ret.cReaders = call->cReaders; - ret.rgReaderStates = NULL; + ret.rgReaderStates = nullptr; if (ret.cReaders > 0) { @@ -669,7 +669,7 @@ static LONG smartcard_LocateCardsW_Call(scard_call_context* smartcard, wStream* { LONG status = 0; LocateCards_Return ret = WINPR_C_ARRAY_INIT; - LocateCardsW_Call* call = NULL; + LocateCardsW_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(operation); @@ -680,7 +680,7 @@ static LONG smartcard_LocateCardsW_Call(scard_call_context* smartcard, wStream* call->rgReaderStates, call->cReaders); scard_log_status_error_wlog(smartcard->log, "SCardLocateCardsW", ret.ReturnCode); ret.cReaders = call->cReaders; - ret.rgReaderStates = NULL; + ret.rgReaderStates = nullptr; if (ret.cReaders > 0) { @@ -713,7 +713,7 @@ static LONG smartcard_ReadCacheA_Call(scard_call_context* smartcard, wStream* ou LONG status = 0; BOOL autoalloc = 0; ReadCache_Return ret = WINPR_C_ARRAY_INIT; - ReadCacheA_Call* call = NULL; + ReadCacheA_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -763,7 +763,7 @@ static LONG smartcard_ReadCacheW_Call(scard_call_context* smartcard, wStream* ou { LONG status = 0; ReadCache_Return ret = WINPR_C_ARRAY_INIT; - ReadCacheW_Call* call = NULL; + ReadCacheW_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -799,7 +799,7 @@ static LONG smartcard_WriteCacheA_Call(scard_call_context* smartcard, SMARTCARD_OPERATION* operation) { Long_Return ret = WINPR_C_ARRAY_INIT; - WriteCacheA_Call* call = NULL; + WriteCacheA_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -820,7 +820,7 @@ static LONG smartcard_WriteCacheW_Call(scard_call_context* smartcard, SMARTCARD_OPERATION* operation) { Long_Return ret = WINPR_C_ARRAY_INIT; - WriteCacheW_Call* call = NULL; + WriteCacheW_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -873,7 +873,7 @@ static LONG smartcard_GetReaderIcon_Call(scard_call_context* smartcard, wStream* { LONG status = 0; GetReaderIcon_Return ret = WINPR_C_ARRAY_INIT; - GetReaderIcon_Call* call = NULL; + GetReaderIcon_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -901,7 +901,7 @@ static LONG smartcard_GetDeviceTypeId_Call(scard_call_context* smartcard, wStrea { LONG status = 0; GetDeviceTypeId_Return ret = WINPR_C_ARRAY_INIT; - GetDeviceTypeId_Call* call = NULL; + GetDeviceTypeId_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -927,8 +927,8 @@ static LONG smartcard_GetStatusChangeA_Call(scard_call_context* smartcard, wStre DWORD dwTimeOut = 0; const DWORD dwTimeStep = 100; GetStatusChange_Return ret = WINPR_C_ARRAY_INIT; - GetStatusChangeA_Call* call = NULL; - LPSCARD_READERSTATEA rgReaderStates = NULL; + GetStatusChangeA_Call* call = nullptr; + LPSCARD_READERSTATEA rgReaderStates = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -989,7 +989,7 @@ static LONG smartcard_GetStatusChangeW_Call(scard_call_context* smartcard, wStre DWORD dwTimeOut = 0; const DWORD dwTimeStep = 100; GetStatusChange_Return ret = WINPR_C_ARRAY_INIT; - LPSCARD_READERSTATEW rgReaderStates = NULL; + LPSCARD_READERSTATEW rgReaderStates = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1066,7 +1066,7 @@ static LONG smartcard_ConnectA_Call(scard_call_context* smartcard, wStream* out, LONG status = 0; SCARDHANDLE hCard = 0; Connect_Return ret = WINPR_C_ARRAY_INIT; - ConnectA_Call* call = NULL; + ConnectA_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1102,7 +1102,7 @@ static LONG smartcard_ConnectW_Call(scard_call_context* smartcard, wStream* out, LONG status = 0; SCARDHANDLE hCard = 0; Connect_Return ret = WINPR_C_ARRAY_INIT; - ConnectW_Call* call = NULL; + ConnectW_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1137,7 +1137,7 @@ static LONG smartcard_Reconnect_Call(scard_call_context* smartcard, wStream* out { LONG status = 0; Reconnect_Return ret = WINPR_C_ARRAY_INIT; - Reconnect_Call* call = NULL; + Reconnect_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1159,7 +1159,7 @@ static LONG smartcard_Disconnect_Call(scard_call_context* smartcard, WINPR_ATTR_ SMARTCARD_OPERATION* operation) { Long_Return ret = WINPR_C_ARRAY_INIT; - HCardAndDisposition_Call* call = NULL; + HCardAndDisposition_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1195,7 +1195,7 @@ static LONG smartcard_EndTransaction_Call(scard_call_context* smartcard, SMARTCARD_OPERATION* operation) { Long_Return ret = WINPR_C_ARRAY_INIT; - HCardAndDisposition_Call* call = NULL; + HCardAndDisposition_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1238,8 +1238,8 @@ static LONG smartcard_StatusA_Call(scard_call_context* smartcard, wStream* out, Status_Return ret = WINPR_C_ARRAY_INIT; DWORD cchReaderLen = 0; DWORD cbAtrLen = 0; - LPSTR mszReaderNames = NULL; - Status_Call* call = NULL; + LPSTR mszReaderNames = nullptr; + Status_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1257,8 +1257,8 @@ static LONG smartcard_StatusA_Call(scard_call_context* smartcard, wStream* out, status = ret.ReturnCode = wrap(smartcard, SCardStatusA, operation->hCard, - call->fmszReaderNamesIsNULL ? NULL : (LPSTR)&mszReaderNames, &cchReaderLen, - &ret.dwState, &ret.dwProtocol, cbAtrLen ? (BYTE*)&ret.pbAtr : NULL, &cbAtrLen); + call->fmszReaderNamesIsNULL ? nullptr : (LPSTR)&mszReaderNames, &cchReaderLen, + &ret.dwState, &ret.dwProtocol, cbAtrLen ? (BYTE*)&ret.pbAtr : nullptr, &cbAtrLen); scard_log_status_error_wlog(smartcard->log, "SCardStatusA", status); if ((ret.ReturnCode == SCARD_S_SUCCESS) && (cchReaderLen == SCARD_AUTOALLOCATE)) @@ -1290,8 +1290,8 @@ static LONG smartcard_StatusW_Call(scard_call_context* smartcard, wStream* out, { LONG status = 0; Status_Return ret = WINPR_C_ARRAY_INIT; - LPWSTR mszReaderNames = NULL; - Status_Call* call = NULL; + LPWSTR mszReaderNames = nullptr; + Status_Call* call = nullptr; DWORD cbAtrLen = 0; WINPR_ASSERT(smartcard); @@ -1313,7 +1313,7 @@ static LONG smartcard_StatusW_Call(scard_call_context* smartcard, wStream* out, status = ret.ReturnCode = wrap(smartcard, SCardStatusW, operation->hCard, - call->fmszReaderNamesIsNULL ? NULL : (LPWSTR)&mszReaderNames, &ret.cBytes, + call->fmszReaderNamesIsNULL ? nullptr : (LPWSTR)&mszReaderNames, &ret.cBytes, &ret.dwState, &ret.dwProtocol, (BYTE*)&ret.pbAtr, &cbAtrLen); scard_log_status_error_wlog(smartcard->log, "SCardStatusW", status); if ((ret.ReturnCode == SCARD_S_SUCCESS) && (ret.cBytes == SCARD_AUTOALLOCATE)) @@ -1352,7 +1352,7 @@ static LONG smartcard_Transmit_Call(scard_call_context* smartcard, wStream* out, { LONG status = 0; Transmit_Return ret = WINPR_C_ARRAY_INIT; - Transmit_Call* call = NULL; + Transmit_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1360,7 +1360,7 @@ static LONG smartcard_Transmit_Call(scard_call_context* smartcard, wStream* out, call = &operation->call.transmit; ret.cbRecvLength = 0; - ret.pbRecvBuffer = NULL; + ret.pbRecvBuffer = nullptr; if (call->cbRecvLength && !call->fpbRecvBufferIsNULL) { @@ -1394,7 +1394,7 @@ static LONG smartcard_Control_Call(scard_call_context* smartcard, wStream* out, { LONG status = 0; Control_Return ret = WINPR_C_ARRAY_INIT; - Control_Call* call = NULL; + Control_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1425,9 +1425,9 @@ static LONG smartcard_GetAttrib_Call(scard_call_context* smartcard, wStream* out BOOL autoAllocate = FALSE; LONG status = 0; DWORD cbAttrLen = 0; - LPBYTE pbAttr = NULL; + LPBYTE pbAttr = nullptr; GetAttrib_Return ret = WINPR_C_ARRAY_INIT; - const GetAttrib_Call* call = NULL; + const GetAttrib_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(operation); @@ -1470,7 +1470,7 @@ static LONG smartcard_SetAttrib_Call(scard_call_context* smartcard, WINPR_ATTR_U SMARTCARD_OPERATION* operation) { Long_Return ret = WINPR_C_ARRAY_INIT; - SetAttrib_Call* call = NULL; + SetAttrib_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(out); @@ -1510,8 +1510,8 @@ static LONG smartcard_LocateCardsByATRA_Call(scard_call_context* smartcard, wStr { LONG status = 0; GetStatusChange_Return ret = WINPR_C_ARRAY_INIT; - LPSCARD_READERSTATEA states = NULL; - LocateCardsByATRA_Call* call = NULL; + LPSCARD_READERSTATEA states = nullptr; + LocateCardsByATRA_Call* call = nullptr; WINPR_ASSERT(smartcard); WINPR_ASSERT(operation); @@ -1554,7 +1554,7 @@ static LONG smartcard_LocateCardsByATRA_Call(scard_call_context* smartcard, wStr } ret.cReaders = call->cReaders; - ret.rgReaderStates = NULL; + ret.rgReaderStates = nullptr; if (ret.cReaders > 0) ret.rgReaderStates = (ReaderState_Return*)calloc(ret.cReaders, sizeof(ReaderState_Return)); @@ -1905,8 +1905,8 @@ void context_free(void* arg) scard_call_context* smartcard_call_context_new(const rdpSettings* settings) { - wObject* obj = NULL; - scard_call_context* ctx = NULL; + wObject* obj = nullptr; + scard_call_context* ctx = nullptr; WINPR_ASSERT(settings); ctx = calloc(1, sizeof(scard_call_context)); @@ -1916,7 +1916,7 @@ scard_call_context* smartcard_call_context_new(const rdpSettings* settings) ctx->log = WLog_Get(SCARD_TAG); WINPR_ASSERT(ctx->log); - ctx->stopEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + ctx->stopEvent = CreateEventA(nullptr, TRUE, FALSE, nullptr); if (!ctx->stopEvent) goto fail; @@ -1983,7 +1983,7 @@ fail: WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC smartcard_call_context_free(ctx); WINPR_PRAGMA_DIAG_POP - return NULL; + return nullptr; } void smartcard_call_context_free(scard_call_context* ctx) @@ -2006,7 +2006,7 @@ void smartcard_call_context_free(scard_call_context* ctx) if (ctx->emulation) { Emulate_Free(ctx->emulation); - ctx->emulation = NULL; + ctx->emulation = nullptr; } #endif } @@ -2015,10 +2015,10 @@ void smartcard_call_context_free(scard_call_context* ctx) { ZeroMemory(&ctx->WinSCardApi, sizeof(SCardApiFunctionTable)); FreeLibrary(ctx->hWinSCardLibrary); - ctx->hWinSCardLibrary = NULL; + ctx->hWinSCardLibrary = nullptr; } - ctx->pWinSCardApi = NULL; + ctx->pWinSCardApi = nullptr; HashTable_Free(ctx->rgSCardContextList); (void)CloseHandle(ctx->stopEvent); @@ -2070,12 +2070,12 @@ BOOL smarcard_call_set_callbacks(scard_call_context* ctx, void* userdata, void* smartcard_call_get_context(scard_call_context* ctx, SCARDCONTEXT hContext) { - struct s_scard_context_element* element = NULL; + struct s_scard_context_element* element = nullptr; WINPR_ASSERT(ctx); element = HashTable_GetItemValue(ctx->rgSCardContextList, (void*)hContext); if (!element) - return NULL; + return nullptr; return element->context; } diff --git a/libfreerdp/utils/smartcard_pack.c b/libfreerdp/utils/smartcard_pack.c index 8f1ac0a2c..6d5211b4c 100644 --- a/libfreerdp/utils/smartcard_pack.c +++ b/libfreerdp/utils/smartcard_pack.c @@ -37,7 +37,7 @@ static const DWORD g_LogLevel = WLOG_DEBUG; static wLog* scard_log(void) { - static wLog* log = NULL; + static wLog* log = nullptr; if (!log) log = WLog_Get(SCARD_TAG); return log; @@ -98,7 +98,7 @@ static BOOL smartcard_ndr_pointer_read_(wLog* log, wStream* s, UINT32* index, UI *ptr = ndrPtr; if (expect != ndrPtr) { - /* Allow NULL pointer if we read the result */ + /* Allow nullptr pointer if we read the result */ if (ptr && (ndrPtr == 0)) return TRUE; WLog_Print(log, WLOG_WARN, @@ -117,10 +117,10 @@ static LONG smartcard_ndr_read_ex(wLog* log, wStream* s, BYTE** data, size_t min size_t len = 0; size_t offset = 0; size_t len2 = 0; - void* r = NULL; + void* r = nullptr; size_t required = 0; - *data = NULL; + *data = nullptr; if (plen) *plen = 0; @@ -215,7 +215,7 @@ static LONG smartcard_ndr_read_ex(wLog* log, wStream* s, BYTE** data, size_t min static LONG smartcard_ndr_read(wLog* log, wStream* s, BYTE** data, size_t min, size_t elementSize, ndr_ptr_t type) { - return smartcard_ndr_read_ex(log, s, data, min, elementSize, type, NULL); + return smartcard_ndr_read_ex(log, s, data, min, elementSize, type, nullptr); } static BOOL smartcard_ndr_pointer_write(wStream* s, UINT32* index, DWORD length) @@ -381,27 +381,27 @@ static char* smartcard_convert_string_list(const void* in, size_t bytes, BOOL un const char* sz; const WCHAR* wz; } string; - char* mszA = NULL; + char* mszA = nullptr; string.pv = in; if (bytes < 1) - return NULL; + return nullptr; - if (in == NULL) - return NULL; + if (in == nullptr) + return nullptr; if (unicode) { mszA = ConvertMszWCharNToUtf8Alloc(string.wz, bytes / sizeof(WCHAR), &length); if (!mszA) - return NULL; + return nullptr; } else { mszA = (char*)calloc(bytes, sizeof(char)); if (!mszA) - return NULL; + return nullptr; CopyMemory(mszA, string.sz, bytes - 1); length = bytes; } @@ -409,7 +409,7 @@ static char* smartcard_convert_string_list(const void* in, size_t bytes, BOOL un if (length < 1) { free(mszA); - return NULL; + return nullptr; } for (size_t index = 0; index < length - 1; index++) { @@ -442,10 +442,10 @@ static char* smartcard_msz_dump_w(const WCHAR* msz, size_t len, char* buffer, si { size_t szlen = 0; if (!msz) - return NULL; + return nullptr; char* sz = ConvertMszWCharNToUtf8Alloc(msz, len, &szlen); if (!sz) - return NULL; + return nullptr; smartcard_msz_dump_a(sz, szlen, buffer, bufferLen); free(sz); @@ -462,7 +462,7 @@ static char* smartcard_array_dump(const void* pd, size_t len, char* buffer, size if (!data && (len > 0)) { - (void)_snprintf(buffer, bufferLen, "{ NULL [%" PRIuz "] }", len); + (void)_snprintf(buffer, bufferLen, "{ nullptr [%" PRIuz "] }", len); goto fail; } @@ -882,7 +882,7 @@ static void smartcard_trace_get_status_change_return(wLog* log, const GetStatusC if (!ret->rgReaderStates && (ret->cReaders > 0)) { - WLog_Print(log, g_LogLevel, " [INVALID STATE] rgReaderStates=NULL, cReaders=%" PRIu32, + WLog_Print(log, g_LogLevel, " [INVALID STATE] rgReaderStates=nullptr, cReaders=%" PRIu32, ret->cReaders); } else if (ret->ReturnCode != SCARD_S_SUCCESS) @@ -1066,7 +1066,7 @@ static void smartcard_trace_transmit_call(wLog* log, const Transmit_Call* call) { WINPR_ASSERT(call); UINT32 cbExtraBytes = 0; - BYTE* pbExtraBytes = NULL; + BYTE* pbExtraBytes = nullptr; if (!WLog_IsLevelActive(log, g_LogLevel)) return; @@ -1152,7 +1152,7 @@ static void smartcard_trace_transmit_return(wLog* log, const Transmit_Return* re { WINPR_ASSERT(ret); UINT32 cbExtraBytes = 0; - BYTE* pbExtraBytes = NULL; + BYTE* pbExtraBytes = nullptr; if (!WLog_IsLevelActive(log, g_LogLevel)) return; @@ -1337,7 +1337,7 @@ static void smartcard_trace_status_call(wLog* log, const Status_Call* call, BOOL static void smartcard_trace_status_return(wLog* log, const Status_Return* ret, BOOL unicode) { WINPR_ASSERT(ret); - char* mszReaderNamesA = NULL; + char* mszReaderNamesA = nullptr; char buffer[1024] = WINPR_C_ARRAY_INIT; DWORD cBytes = 0; @@ -1371,7 +1371,7 @@ static void smartcard_trace_state_return(wLog* log, const State_Return* ret) { WINPR_ASSERT(ret); char buffer[1024] = WINPR_C_ARRAY_INIT; - char* state = NULL; + char* state = nullptr; if (!WLog_IsLevelActive(log, g_LogLevel)) return; @@ -1580,7 +1580,7 @@ static LONG smartcard_unpack_common_context_and_string_a(wLog* log, wStream* s, if (status != SCARD_S_SUCCESS) return status; - if (!smartcard_ndr_pointer_read(log, s, &index, NULL)) + if (!smartcard_ndr_pointer_read(log, s, &index, nullptr)) return ERROR_INVALID_DATA; status = smartcard_unpack_redir_scard_context_ref(log, s, pbContextNdrPtr, phContext); @@ -1606,7 +1606,7 @@ static LONG smartcard_unpack_common_context_and_string_w(wLog* log, wStream* s, if (status != SCARD_S_SUCCESS) return status; - if (!smartcard_ndr_pointer_read(log, s, &index, NULL)) + if (!smartcard_ndr_pointer_read(log, s, &index, nullptr)) return ERROR_INVALID_DATA; status = smartcard_unpack_redir_scard_context_ref(log, s, pbContextNdrPtr, phContext); @@ -1952,7 +1952,7 @@ LONG smartcard_unpack_redir_scard_handle_(wLog* log, wStream* s, REDIR_SCARDHAND if (!Stream_CheckAndLogRequiredLengthWLog(log, s, handle->cbHandle)) return STATUS_BUFFER_TOO_SMALL; - if (!smartcard_ndr_pointer_read_(log, s, index, NULL, file, function, line)) + if (!smartcard_ndr_pointer_read_(log, s, index, nullptr, file, function, line)) return ERROR_INVALID_DATA; return SCARD_S_SUCCESS; @@ -2139,7 +2139,7 @@ LONG smartcard_unpack_list_readers_call(wStream* s, ListReaders_Call* call, BOOL wLog* log = scard_log(); WINPR_ASSERT(call); - call->mszGroups = NULL; + call->mszGroups = nullptr; LONG status = smartcard_unpack_redir_scard_context(log, s, &(call->handles.hContext), &index, &pbContextNdrPtr); @@ -2228,9 +2228,9 @@ LONG smartcard_unpack_connect_a_call(wStream* s, ConnectA_Call* call) WINPR_ASSERT(call); wLog* log = scard_log(); - call->szReader = NULL; + call->szReader = nullptr; - if (!smartcard_ndr_pointer_read(log, s, &index, NULL)) + if (!smartcard_ndr_pointer_read(log, s, &index, nullptr)) return ERROR_INVALID_DATA; status = smartcard_unpack_connect_common(log, s, &(call->Common), &index, &pbContextNdrPtr); @@ -2264,9 +2264,9 @@ LONG smartcard_unpack_connect_w_call(wStream* s, ConnectW_Call* call) WINPR_ASSERT(call); wLog* log = scard_log(); - call->szReader = NULL; + call->szReader = nullptr; - if (!smartcard_ndr_pointer_read(log, s, &index, NULL)) + if (!smartcard_ndr_pointer_read(log, s, &index, nullptr)) return ERROR_INVALID_DATA; status = smartcard_unpack_connect_common(log, s, &(call->Common), &index, &pbContextNdrPtr); @@ -2463,7 +2463,7 @@ static LONG smartcard_unpack_reader_state_a(wLog* log, wStream* s, LPSCARD_READE if (ptr != 0) goto fail; } - /* Ignore NULL length strings */ + /* Ignore nullptr length strings */ states[index] = ptr != 0; Stream_Read_UINT32(s, readerState->dwCurrentState); /* dwCurrentState (4 bytes) */ Stream_Read_UINT32(s, readerState->dwEventState); /* dwEventState (4 bytes) */ @@ -2537,7 +2537,7 @@ static LONG smartcard_unpack_reader_state_w(wLog* log, wStream* s, LPSCARD_READE if (ptr != 0) goto fail; } - /* Ignore NULL length strings */ + /* Ignore nullptr length strings */ states[index] = ptr != 0; Stream_Read_UINT32(s, readerState->dwCurrentState); /* dwCurrentState (4 bytes) */ Stream_Read_UINT32(s, readerState->dwEventState); /* dwEventState (4 bytes) */ @@ -2549,7 +2549,7 @@ static LONG smartcard_unpack_reader_state_w(wLog* log, wStream* s, LPSCARD_READE { LPSCARD_READERSTATEW readerState = &rgReaderStates[index]; - /* Skip NULL pointers */ + /* Skip nullptr pointers */ if (!states[index]) continue; @@ -2588,7 +2588,7 @@ LONG smartcard_unpack_get_status_change_a_call(wStream* s, GetStatusChangeA_Call WINPR_ASSERT(call); wLog* log = scard_log(); - call->rgReaderStates = NULL; + call->rgReaderStates = nullptr; LONG status = smartcard_unpack_redir_scard_context(log, s, &(call->handles.hContext), &index, &pbContextNdrPtr); @@ -2633,7 +2633,7 @@ LONG smartcard_unpack_get_status_change_w_call(wStream* s, GetStatusChangeW_Call WINPR_ASSERT(call); wLog* log = scard_log(); - call->rgReaderStates = NULL; + call->rgReaderStates = nullptr; LONG status = smartcard_unpack_redir_scard_context(log, s, &(call->handles.hContext), &index, &pbContextNdrPtr); @@ -2909,7 +2909,7 @@ LONG smartcard_unpack_control_call(wStream* s, Control_Call* call) UINT32 pvInBufferNdrPtr = 0; UINT32 pbContextNdrPtr = 0; - call->pvInBuffer = NULL; + call->pvInBuffer = nullptr; LONG status = smartcard_unpack_redir_scard_context(log, s, &(call->handles.hContext), &index, &pbContextNdrPtr); @@ -2983,7 +2983,7 @@ LONG smartcard_pack_control_return(wStream* s, const Control_Return* ret) LONG smartcard_unpack_transmit_call(wStream* s, Transmit_Call* call) { UINT32 length = 0; - BYTE* pbExtraBytes = NULL; + BYTE* pbExtraBytes = nullptr; UINT32 pbExtraBytesNdrPtr = 0; UINT32 pbSendBufferNdrPtr = 0; UINT32 pioRecvPciNdrPtr = 0; @@ -2995,9 +2995,9 @@ LONG smartcard_unpack_transmit_call(wStream* s, Transmit_Call* call) WINPR_ASSERT(call); wLog* log = scard_log(); - call->pioSendPci = NULL; - call->pioRecvPci = NULL; - call->pbSendBuffer = NULL; + call->pioSendPci = nullptr; + call->pioRecvPci = nullptr; + call->pbSendBuffer = nullptr; LONG status = smartcard_unpack_redir_scard_context(log, s, &(call->handles.hContext), &index, &pbContextNdrPtr); @@ -3257,7 +3257,7 @@ LONG smartcard_unpack_locate_cards_by_atr_a_call(wStream* s, LocateCardsByATRA_C WINPR_ASSERT(call); wLog* log = scard_log(); - call->rgReaderStates = NULL; + call->rgReaderStates = nullptr; LONG status = smartcard_unpack_redir_scard_context(log, s, &(call->handles.hContext), &index, &pbContextNdrPtr); @@ -3546,7 +3546,7 @@ LONG smartcard_unpack_locate_cards_by_atr_w_call(wStream* s, LocateCardsByATRW_C WINPR_ASSERT(call); wLog* log = scard_log(); - call->rgReaderStates = NULL; + call->rgReaderStates = nullptr; LONG status = smartcard_unpack_redir_scard_context(log, s, &(call->handles.hContext), &index, &pbContextNdrPtr); @@ -3624,7 +3624,7 @@ LONG smartcard_unpack_read_cache_a_call(wStream* s, ReadCacheA_Call* call) Stream_Read_INT32(s, call->Common.fPbDataIsNULL); Stream_Read_UINT32(s, call->Common.cbDataLen); - call->szLookupName = NULL; + call->szLookupName = nullptr; if (mszNdrPtr) { status = smartcard_ndr_read_a(log, s, &call->szLookupName, NDR_PTR_FULL); @@ -3674,7 +3674,7 @@ LONG smartcard_unpack_read_cache_w_call(wStream* s, ReadCacheW_Call* call) Stream_Read_INT32(s, call->Common.fPbDataIsNULL); Stream_Read_UINT32(s, call->Common.cbDataLen); - call->szLookupName = NULL; + call->szLookupName = nullptr; if (mszNdrPtr) { status = smartcard_ndr_read_w(log, s, &call->szLookupName, NDR_PTR_FULL); @@ -3728,7 +3728,7 @@ LONG smartcard_unpack_write_cache_a_call(wStream* s, WriteCacheA_Call* call) if (!smartcard_ndr_pointer_read(log, s, &index, &pbDataNdrPtr)) return ERROR_INVALID_DATA; - call->szLookupName = NULL; + call->szLookupName = nullptr; if (mszNdrPtr) { status = smartcard_ndr_read_a(log, s, &call->szLookupName, NDR_PTR_FULL); @@ -3741,7 +3741,7 @@ LONG smartcard_unpack_write_cache_a_call(wStream* s, WriteCacheA_Call* call) if (status != SCARD_S_SUCCESS) return status; - call->Common.CardIdentifier = NULL; + call->Common.CardIdentifier = nullptr; if (contextNdrPtr) { status = smartcard_ndr_read_u(log, s, &call->Common.CardIdentifier); @@ -3749,7 +3749,7 @@ LONG smartcard_unpack_write_cache_a_call(wStream* s, WriteCacheA_Call* call) return status; } - call->Common.pbData = NULL; + call->Common.pbData = nullptr; if (pbDataNdrPtr) { status = smartcard_ndr_read(log, s, &call->Common.pbData, call->Common.cbDataLen, 1, @@ -3791,7 +3791,7 @@ LONG smartcard_unpack_write_cache_w_call(wStream* s, WriteCacheW_Call* call) if (!smartcard_ndr_pointer_read(log, s, &index, &pbDataNdrPtr)) return ERROR_INVALID_DATA; - call->szLookupName = NULL; + call->szLookupName = nullptr; if (mszNdrPtr) { status = smartcard_ndr_read_w(log, s, &call->szLookupName, NDR_PTR_FULL); @@ -3804,7 +3804,7 @@ LONG smartcard_unpack_write_cache_w_call(wStream* s, WriteCacheW_Call* call) if (status != SCARD_S_SUCCESS) return status; - call->Common.CardIdentifier = NULL; + call->Common.CardIdentifier = nullptr; if (contextNdrPtr) { status = smartcard_ndr_read_u(log, s, &call->Common.CardIdentifier); @@ -3812,7 +3812,7 @@ LONG smartcard_unpack_write_cache_w_call(wStream* s, WriteCacheW_Call* call) return status; } - call->Common.pbData = NULL; + call->Common.pbData = nullptr; if (pbDataNdrPtr) { status = smartcard_ndr_read(log, s, &call->Common.pbData, call->Common.cbDataLen, 1, diff --git a/libfreerdp/utils/stopwatch.c b/libfreerdp/utils/stopwatch.c index cbb6318ac..9936fefbb 100644 --- a/libfreerdp/utils/stopwatch.c +++ b/libfreerdp/utils/stopwatch.c @@ -35,7 +35,7 @@ STOPWATCH* stopwatch_create(void) { STOPWATCH* sw = (STOPWATCH*)calloc(1, sizeof(STOPWATCH)); if (!sw) - return NULL; + return nullptr; stopwatch_reset(sw); return sw; diff --git a/libfreerdp/utils/string.c b/libfreerdp/utils/string.c index 18745e5b6..272033082 100644 --- a/libfreerdp/utils/string.c +++ b/libfreerdp/utils/string.c @@ -60,7 +60,7 @@ const char* rdp_redirection_flags_to_string(UINT32 flags, char* buffer, size_t s if (flags & cur->flag) { if (!winpr_str_append(cur->name, buffer, size, "|")) - return NULL; + return nullptr; } } return buffer; @@ -76,7 +76,7 @@ const char* rdp_cluster_info_flags_to_string(UINT32 flags, char* buffer, size_t if (flags & REDIRECTED_SMARTCARD) winpr_str_append("REDIRECTED_SMARTCARD", buffer, size, "|"); - const char* str = NULL; + const char* str = nullptr; switch (version) { case REDIRECTION_VERSION1: @@ -115,14 +115,14 @@ BOOL freerdp_extract_key_value(const char* str, UINT32* pkey, UINT32* pvalue) if (!str || !pkey || !pvalue) return FALSE; - char* end1 = NULL; + char* end1 = nullptr; errno = 0; unsigned long key = strtoul(str, &end1, 0); if ((errno != 0) || !end1 || (*end1 != '=') || (key > UINT32_MAX)) return FALSE; errno = 0; - unsigned long val = strtoul(&end1[1], NULL, 0); + unsigned long val = strtoul(&end1[1], nullptr, 0); if ((errno != 0) || (val > UINT32_MAX)) return FALSE; diff --git a/libfreerdp/utils/test/TestPodArrays.c b/libfreerdp/utils/test/TestPodArrays.c index dc4f7e7c3..a65441935 100644 --- a/libfreerdp/utils/test/TestPodArrays.c +++ b/libfreerdp/utils/test/TestPodArrays.c @@ -65,8 +65,8 @@ int TestPodArrays(int argc, char* argv[]) UINT32 sum = 0; UINT32 foreach_index = 0; ArrayUINT32 uint32s = WINPR_C_ARRAY_INIT; - UINT32* ptr = NULL; - const UINT32* cptr = NULL; + UINT32* ptr = nullptr; + const UINT32* cptr = nullptr; ArrayBasicStruct basicStructs = WINPR_C_ARRAY_INIT; BasicStruct basicStruct = { 1, 2 }; @@ -107,7 +107,7 @@ int TestPodArrays(int argc, char* argv[]) goto fail; /* test modifying values of the array during the foreach */ - if (!array_uint32_foreach(&uint32s, cb_set_to_1, NULL) || array_uint32_get(&uint32s, 5) != 1) + if (!array_uint32_foreach(&uint32s, cb_set_to_1, nullptr) || array_uint32_get(&uint32s, 5) != 1) goto fail; /* this one is to test that we can modify the array itself during the foreach and that things @@ -119,7 +119,7 @@ int TestPodArrays(int argc, char* argv[]) if (!array_basicstruct_append(&basicStructs, basicStruct)) goto fail; - if (!array_basicstruct_foreach(&basicStructs, cb_basic_struct, NULL)) + if (!array_basicstruct_foreach(&basicStructs, cb_basic_struct, nullptr)) goto fail; rc = 0; diff --git a/libfreerdp/utils/test/TestRingBuffer.c b/libfreerdp/utils/test/TestRingBuffer.c index de8417e44..0691da426 100644 --- a/libfreerdp/utils/test/TestRingBuffer.c +++ b/libfreerdp/utils/test/TestRingBuffer.c @@ -82,8 +82,8 @@ int TestRingBuffer(int argc, char* argv[]) { RingBuffer ringBuffer; int testNo = 0; - BYTE* tmpBuf = NULL; - BYTE* rb_ptr = NULL; + BYTE* tmpBuf = nullptr; + BYTE* rb_ptr = nullptr; DataChunk chunks[2]; WINPR_UNUSED(argc);