From 8cc658204412b0121edaeacc597b311be2e8aed0 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Mon, 14 Feb 2022 13:59:22 +0000 Subject: [PATCH] Unify struct definitions (#7633) * Unified enum/struct definitions, fixed include issues * Fixed mac compilation issues * Added missing include * Fixed windows server build warnings * Fixed VS2010 build issue * Removed unnecessary library linking * Fixed ThreadPool WinXP compatibility * Fixed pr review remarks --- channels/audin/client/alsa/audin_alsa.c | 2 +- channels/audin/client/audin_main.c | 15 +- channels/audin/client/ios/audin_ios.m | 12 +- channels/audin/client/mac/audin_mac.m | 2 +- .../audin/client/opensles/audin_opensl_es.c | 2 +- channels/audin/client/oss/audin_oss.c | 2 +- channels/audin/client/pulse/audin_pulse.c | 2 +- channels/audin/client/sndio/audin_sndio.c | 2 +- channels/audin/client/winmm/audin_winmm.c | 2 +- channels/audin/server/audin.c | 2 +- channels/client/tables.h | 21 +- channels/cliprdr/client/cliprdr_main.h | 5 +- channels/cliprdr/server/cliprdr_main.h | 5 +- channels/disp/client/disp_main.c | 15 +- channels/disp/server/disp_main.h | 2 +- channels/drdynvc/client/drdynvc_main.h | 25 +- channels/drdynvc/server/drdynvc_main.h | 2 +- channels/drive/client/drive_file.h | 6 +- channels/drive/client/drive_main.c | 6 +- channels/echo/client/echo_main.c | 15 +- channels/echo/server/echo_main.c | 2 +- channels/encomsp/server/encomsp_main.h | 2 +- channels/geometry/client/geometry_main.c | 15 +- channels/gfxredir/server/gfxredir_main.h | 2 +- channels/parallel/client/parallel_main.c | 5 +- channels/printer/client/cups/printer_cups.c | 26 +-- channels/printer/client/printer_main.c | 5 +- channels/printer/client/win/printer_win.c | 26 +-- channels/rail/client/rail_main.h | 5 +- channels/rail/server/rail_main.h | 2 +- channels/rdpdr/client/rdpdr_main.c | 9 +- channels/rdpdr/client/rdpdr_main.h | 6 +- channels/rdpdr/server/rdpdr_main.h | 19 +- channels/rdpei/client/rdpei_main.c | 15 +- channels/rdpei/client/rdpei_main.h | 10 +- channels/rdpei/server/rdpei_main.c | 2 +- channels/rdpgfx/client/rdpgfx_main.h | 15 +- channels/rdpgfx/server/rdpgfx_main.h | 2 +- channels/rdpsnd/client/alsa/rdpsnd_alsa.c | 6 +- channels/rdpsnd/client/fake/rdpsnd_fake.c | 6 +- channels/rdpsnd/client/ios/rdpsnd_ios.c | 2 +- channels/rdpsnd/client/mac/rdpsnd_mac.m | 5 +- channels/rdpsnd/client/opensles/opensl_io.h | 2 +- .../rdpsnd/client/opensles/rdpsnd_opensles.c | 6 +- channels/rdpsnd/client/oss/rdpsnd_oss.c | 6 +- channels/rdpsnd/client/pulse/rdpsnd_pulse.c | 6 +- channels/rdpsnd/client/rdpsnd_main.c | 10 +- channels/rdpsnd/client/sndio/rdpsnd_sndio.c | 6 +- channels/rdpsnd/client/winmm/rdpsnd_winmm.c | 6 +- channels/rdpsnd/server/rdpsnd_main.h | 2 +- channels/remdesk/client/remdesk_main.h | 5 +- channels/remdesk/server/remdesk_main.h | 2 +- channels/serial/client/serial_main.c | 12 +- channels/smartcard/client/smartcard_main.h | 23 +- channels/sshagent/client/sshagent_main.c | 15 +- channels/tsmf/client/alsa/tsmf_alsa.c | 2 +- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c | 2 +- .../tsmf/client/gstreamer/tsmf_platform.h | 2 +- channels/tsmf/client/oss/tsmf_oss.c | 2 +- channels/tsmf/client/pulse/tsmf_pulse.c | 2 +- channels/tsmf/client/tsmf_audio.h | 4 +- channels/tsmf/client/tsmf_codec.c | 4 +- channels/tsmf/client/tsmf_decoder.h | 6 +- channels/tsmf/client/tsmf_ifman.h | 5 +- channels/tsmf/client/tsmf_main.h | 18 +- channels/tsmf/client/tsmf_media.c | 6 +- channels/tsmf/client/tsmf_media.h | 6 +- channels/tsmf/client/tsmf_types.h | 2 +- .../urbdrc/client/libusb/libusb_udevice.c | 6 +- .../urbdrc/client/libusb/libusb_udevice.h | 6 +- .../urbdrc/client/libusb/libusb_udevman.c | 12 +- channels/urbdrc/client/urbdrc_main.h | 37 ++- channels/urbdrc/common/msusb.h | 16 +- channels/video/client/video_main.c | 74 +++--- client/Android/android_event.h | 28 +-- client/Android/android_freerdp.h | 5 +- client/Mac/Keyboard.m | 5 +- client/Mac/mfreerdp.h | 6 +- client/Sample/tf_freerdp.h | 5 +- client/Wayland/wlf_disp.c | 2 +- client/Wayland/wlf_pointer.c | 5 +- client/Wayland/wlfreerdp.h | 9 +- client/Windows/wf_client.h | 12 +- client/Windows/wf_cliprdr.c | 25 +- client/Windows/wf_floatbar.c | 8 +- client/Windows/wf_floatbar.h | 2 +- client/Windows/wf_rail.c | 5 +- client/X11/xf_cliprdr.c | 15 +- client/X11/xf_disp.c | 2 +- client/X11/xf_floatbar.c | 22 +- client/X11/xf_keyboard.h | 5 +- client/X11/xf_monitor.h | 10 +- client/X11/xf_window.c | 5 +- client/X11/xfreerdp.h | 4 +- client/iOS/Misc/TSXTypes.h | 8 +- include/freerdp/addin.h | 5 +- include/freerdp/altsec.h | 70 +++--- include/freerdp/cache/bitmap.h | 13 +- include/freerdp/cache/glyph.h | 23 +- include/freerdp/cache/palette.h | 5 +- include/freerdp/channels/cliprdr.h | 80 +++---- include/freerdp/channels/disp.h | 16 +- include/freerdp/channels/encomsp.h | 66 +++--- include/freerdp/channels/geometry.h | 12 +- include/freerdp/channels/gfxredir.h | 84 +++---- include/freerdp/channels/rdpdr.h | 17 +- include/freerdp/channels/rdpei.h | 31 ++- include/freerdp/channels/rdpgfx.h | 180 ++++++-------- include/freerdp/channels/remdesk.h | 40 ++-- include/freerdp/channels/scard.h | 120 +++++----- include/freerdp/channels/video.h | 26 +-- include/freerdp/client/audin.h | 9 +- include/freerdp/client/cliprdr.h | 59 ++--- include/freerdp/client/disp.h | 4 +- include/freerdp/client/drdynvc.h | 4 +- include/freerdp/client/encomsp.h | 4 +- include/freerdp/client/geometry.h | 8 +- include/freerdp/client/rail.h | 4 +- include/freerdp/client/rdpei.h | 4 +- include/freerdp/client/rdpgfx.h | 4 +- include/freerdp/client/rdpsnd.h | 5 +- include/freerdp/client/remdesk.h | 6 +- include/freerdp/client/sshagent.h | 2 +- include/freerdp/client/tsmf.h | 9 +- include/freerdp/client/video.h | 19 +- include/freerdp/codec/clear.h | 2 +- include/freerdp/codec/dsp.h | 2 +- include/freerdp/codec/h264.h | 15 +- include/freerdp/codec/interleaved.h | 12 +- include/freerdp/codec/nsc.h | 2 +- include/freerdp/codec/planar.h | 19 +- include/freerdp/codec/progressive.h | 2 +- include/freerdp/codec/region.h | 8 +- include/freerdp/codec/rfx.h | 34 ++- include/freerdp/codec/yuv.h | 2 +- include/freerdp/codec/zgfx.h | 2 +- include/freerdp/codecs.h | 2 + include/freerdp/dvc.h | 28 +-- include/freerdp/extension.h | 6 +- include/freerdp/gdi/gdi.h | 55 ++--- include/freerdp/gdi/video.h | 3 +- include/freerdp/locale/keyboard.h | 10 +- include/freerdp/pointer.h | 30 +-- include/freerdp/primary.h | 145 +++++------- include/freerdp/rail.h | 135 +++++------ include/freerdp/secondary.h | 40 ++-- include/freerdp/server/audin.h | 4 +- include/freerdp/server/cliprdr.h | 4 +- include/freerdp/server/disp.h | 6 +- include/freerdp/server/drdynvc.h | 6 +- include/freerdp/server/echo.h | 4 +- include/freerdp/server/encomsp.h | 6 +- include/freerdp/server/gfxredir.h | 6 +- include/freerdp/server/proxy/proxy_context.h | 10 +- .../freerdp/server/proxy/proxy_modules_api.h | 6 +- include/freerdp/server/rail.h | 6 +- include/freerdp/server/rdpdr.h | 11 +- include/freerdp/server/rdpei.h | 6 +- include/freerdp/server/rdpgfx.h | 6 +- include/freerdp/server/rdpsnd.h | 8 +- include/freerdp/server/remdesk.h | 6 +- include/freerdp/server/shadow.h | 28 +-- include/freerdp/settings.h | 83 +++---- include/freerdp/svc.h | 10 +- include/freerdp/types.h | 30 +-- include/freerdp/update.h | 45 ++-- include/freerdp/utils/pcap.h | 14 +- include/freerdp/utils/profiler.h | 2 +- include/freerdp/utils/ringbuffer.h | 10 +- include/freerdp/utils/smartcard_call.h | 2 +- include/freerdp/utils/smartcard_operations.h | 5 +- include/freerdp/utils/stopwatch.h | 5 +- include/freerdp/window.h | 45 ++-- libfreerdp/cache/brush.c | 5 +- libfreerdp/cache/glyph.c | 1 + libfreerdp/cache/nine_grid.c | 5 +- libfreerdp/codec/clear.c | 12 +- libfreerdp/codec/dsp.c | 8 +- libfreerdp/codec/dsp.h | 2 +- libfreerdp/codec/dsp_ffmpeg.c | 2 +- libfreerdp/codec/h264.h | 2 +- libfreerdp/codec/h264_ffmpeg.c | 5 +- libfreerdp/codec/h264_mediacodec.c | 6 +- libfreerdp/codec/h264_mf.c | 5 +- libfreerdp/codec/h264_openh264.c | 5 +- libfreerdp/codec/interleaved.c | 10 + libfreerdp/codec/nsc_encode.c | 5 +- libfreerdp/codec/nsc_types.h | 8 +- libfreerdp/codec/progressive.c | 10 +- libfreerdp/codec/progressive.h | 57 ++--- libfreerdp/codec/region.c | 2 +- libfreerdp/codec/rfx.c | 7 +- libfreerdp/codec/rfx_bitstream.h | 5 +- libfreerdp/codec/rfx_types.h | 4 +- .../codec/test/TestFreeRDPCodecProgressive.c | 5 +- libfreerdp/codec/xcrush.c | 25 +- libfreerdp/codec/yuv.c | 17 +- libfreerdp/codec/zgfx.c | 29 ++- libfreerdp/core/client.h | 20 +- libfreerdp/core/errinfo.h | 5 +- libfreerdp/core/fastpath.h | 10 +- libfreerdp/core/gateway/http.c | 6 +- libfreerdp/core/gateway/http.h | 8 +- libfreerdp/core/gateway/rdg.c | 6 +- libfreerdp/core/gateway/rpc.h | 77 +++--- libfreerdp/core/gateway/rts_signature.h | 11 +- libfreerdp/core/gateway/tsg.c | 36 +-- libfreerdp/core/gateway/tsg.h | 5 +- libfreerdp/core/nego.h | 5 +- libfreerdp/core/nla.h | 5 +- libfreerdp/core/server.c | 5 +- libfreerdp/core/tcp.c | 10 +- libfreerdp/core/test/TestConnect.c | 7 +- libfreerdp/crypto/tls.c | 5 +- libfreerdp/emu/scard/smartcard_virtual_gids.c | 2 +- libfreerdp/locale/keyboard_layout.c | 10 +- libfreerdp/locale/keyboard_sun.c | 5 +- libfreerdp/locale/keyboard_xkbfile.c | 5 +- libfreerdp/locale/locale.c | 15 +- libfreerdp/locale/xkb_layout_ids.c | 10 +- libfreerdp/utils/profiler.c | 2 +- libfreerdp/utils/smartcard_call.c | 11 +- server/Mac/mf_audin.c | 4 +- server/Mac/mf_peer.c | 8 +- server/Mac/mf_rdpsnd.h | 6 +- server/Mac/mfreerdp.c | 3 + server/Windows/CMakeLists.txt | 2 +- server/Windows/wf_interface.c | 2 +- server/Windows/wf_peer.c | 2 +- server/proxy/channels/pf_channel_rdpdr.c | 2 +- server/proxy/proxy_modules.h | 10 +- server/shadow/X11/x11_shadow.c | 10 +- server/shadow/shadow_client.c | 5 +- server/shadow/shadow_subsystem_builtin.c | 5 +- uwac/libuwac/uwac-window.c | 2 +- winpr/include/winpr/bitstream.h | 5 +- winpr/include/winpr/clipboard.h | 16 +- winpr/include/winpr/cmdline.h | 11 +- winpr/include/winpr/collections.h | 79 +++---- winpr/include/winpr/comm.h | 14 +- winpr/include/winpr/crypto.h | 24 +- winpr/include/winpr/file.h | 17 +- winpr/include/winpr/image.h | 20 +- winpr/include/winpr/ini.h | 2 +- winpr/include/winpr/interlocked.h | 26 +-- winpr/include/winpr/io.h | 7 +- winpr/include/winpr/nt.h | 30 +-- winpr/include/winpr/pool.h | 37 ++- winpr/include/winpr/rpc.h | 34 +-- winpr/include/winpr/schannel.h | 23 +- winpr/include/winpr/security.h | 62 ++--- winpr/include/winpr/shell.h | 10 +- winpr/include/winpr/smartcard.h | 10 +- winpr/include/winpr/sspi.h | 220 +++++++----------- winpr/include/winpr/sspicli.h | 2 +- winpr/include/winpr/stream.h | 7 +- winpr/include/winpr/synch.h | 8 +- winpr/include/winpr/sysinfo.h | 15 +- winpr/include/winpr/thread.h | 4 +- winpr/include/winpr/timezone.h | 4 +- winpr/include/winpr/tools/makecert.h | 2 +- winpr/include/winpr/user.h | 4 +- winpr/include/winpr/winsock.h | 14 +- winpr/include/winpr/wlog.h | 16 +- winpr/include/winpr/wtsapi.h | 85 +++---- winpr/libwinpr/clipboard/clipboard.h | 19 +- winpr/libwinpr/comm/comm_ioctl.h | 16 +- winpr/libwinpr/crypto/crypto.h | 10 +- winpr/libwinpr/file/generic.c | 5 +- winpr/libwinpr/handle/handle.h | 2 +- winpr/libwinpr/input/virtualkey.c | 10 +- .../interlocked/test/TestInterlockedDList.c | 2 +- .../interlocked/test/TestInterlockedSList.c | 2 +- winpr/libwinpr/io/io.h | 6 +- winpr/libwinpr/pipe/pipe.c | 2 +- winpr/libwinpr/pool/pool.h | 53 ++++- winpr/libwinpr/pool/work.c | 1 - winpr/libwinpr/registry/registry_reg.h | 12 +- winpr/libwinpr/smartcard/smartcard_pcsc.c | 16 +- winpr/libwinpr/sspi/CredSSP/credssp.c | 2 +- winpr/libwinpr/sspi/CredSSP/credssp.h | 5 +- winpr/libwinpr/sspi/Kerberos/kerberos.c | 2 +- winpr/libwinpr/sspi/Kerberos/kerberos.h | 2 +- winpr/libwinpr/sspi/NTLM/ntlm.h | 73 +++--- winpr/libwinpr/sspi/NTLM/ntlm_message.c | 2 +- winpr/libwinpr/sspi/Negotiate/negotiate.c | 2 +- winpr/libwinpr/sspi/Negotiate/negotiate.h | 10 +- winpr/libwinpr/sspi/Schannel/schannel.c | 2 +- winpr/libwinpr/sspi/Schannel/schannel.h | 10 +- .../libwinpr/sspi/Schannel/schannel_openssl.c | 2 +- .../libwinpr/sspi/Schannel/schannel_openssl.h | 2 +- winpr/libwinpr/sspi/sspi.h | 5 +- winpr/libwinpr/sspi/sspi_gss.h | 8 +- winpr/libwinpr/sspi/sspi_winpr.c | 20 +- winpr/libwinpr/sspi/test/TestNTLM.c | 10 +- winpr/libwinpr/thread/thread.h | 6 +- winpr/libwinpr/timezone/TimeZones.h | 10 +- winpr/libwinpr/timezone/WindowsZones.h | 5 +- winpr/libwinpr/utils/collections/ArrayList.c | 2 +- winpr/libwinpr/utils/collections/BipBuffer.c | 7 +- winpr/libwinpr/utils/collections/BufferPool.c | 7 +- winpr/libwinpr/utils/collections/HashTable.c | 6 +- winpr/libwinpr/utils/collections/LinkedList.c | 6 +- .../libwinpr/utils/collections/MessageQueue.c | 2 +- winpr/libwinpr/utils/collections/ObjectPool.c | 2 +- winpr/libwinpr/utils/collections/PubSub.c | 2 +- winpr/libwinpr/utils/collections/Queue.c | 2 +- winpr/libwinpr/utils/collections/Stack.c | 2 +- winpr/libwinpr/utils/collections/StreamPool.c | 2 +- winpr/libwinpr/utils/corkscrew/map_info.h | 2 +- winpr/libwinpr/utils/ini.c | 12 +- winpr/libwinpr/utils/lodepng/lodepng.h | 18 +- winpr/libwinpr/utils/print.c | 2 +- winpr/libwinpr/utils/trio/trio.c | 14 +- winpr/libwinpr/utils/trio/triostr.c | 2 +- winpr/libwinpr/utils/trio/triostr.h | 2 +- winpr/libwinpr/utils/wlog/BinaryAppender.c | 5 +- winpr/libwinpr/utils/wlog/CallbackAppender.c | 5 +- winpr/libwinpr/utils/wlog/ConsoleAppender.c | 5 +- winpr/libwinpr/utils/wlog/DataMessage.c | 2 +- winpr/libwinpr/utils/wlog/FileAppender.c | 5 +- winpr/libwinpr/utils/wlog/ImageMessage.c | 2 +- winpr/libwinpr/utils/wlog/JournaldAppender.c | 5 +- winpr/libwinpr/utils/wlog/Layout.c | 2 +- winpr/libwinpr/utils/wlog/Layout.h | 4 +- winpr/libwinpr/utils/wlog/PacketMessage.c | 2 +- winpr/libwinpr/utils/wlog/PacketMessage.h | 38 ++- winpr/libwinpr/utils/wlog/SyslogAppender.c | 5 +- winpr/libwinpr/utils/wlog/UdpAppender.c | 5 +- winpr/libwinpr/utils/wlog/UdpAppender.h | 2 +- winpr/libwinpr/utils/wlog/wlog.c | 5 +- winpr/libwinpr/utils/wlog/wlog.h | 8 +- winpr/libwinpr/wtsapi/wtsapi_win32.c | 5 +- winpr/tools/makecert/makecert.c | 2 +- 334 files changed, 1980 insertions(+), 2635 deletions(-) diff --git a/channels/audin/client/alsa/audin_alsa.c b/channels/audin/client/alsa/audin_alsa.c index 3fad039af..e72645e4e 100644 --- a/channels/audin/client/alsa/audin_alsa.c +++ b/channels/audin/client/alsa/audin_alsa.c @@ -40,7 +40,7 @@ #include "audin_main.h" -typedef struct _AudinALSADevice +typedef struct { IAudinDevice iface; diff --git a/channels/audin/client/audin_main.c b/channels/audin/client/audin_main.c index 7807a7039..11ae2814a 100644 --- a/channels/audin/client/audin_main.c +++ b/channels/audin/client/audin_main.c @@ -51,17 +51,15 @@ #define MSG_SNDIN_DATA 0x06 #define MSG_SNDIN_FORMATCHANGE 0x07 -typedef struct _AUDIN_LISTENER_CALLBACK AUDIN_LISTENER_CALLBACK; -struct _AUDIN_LISTENER_CALLBACK +typedef struct { IWTSListenerCallback iface; IWTSPlugin* plugin; IWTSVirtualChannelManager* channel_mgr; -}; +} AUDIN_LISTENER_CALLBACK; -typedef struct _AUDIN_CHANNEL_CALLBACK AUDIN_CHANNEL_CALLBACK; -struct _AUDIN_CHANNEL_CALLBACK +typedef struct { IWTSVirtualChannelCallback iface; @@ -76,10 +74,9 @@ struct _AUDIN_CHANNEL_CALLBACK */ AUDIO_FORMAT* formats; UINT32 formats_count; -}; +} AUDIN_CHANNEL_CALLBACK; -typedef struct _AUDIN_PLUGIN AUDIN_PLUGIN; -struct _AUDIN_PLUGIN +typedef struct { IWTSPlugin iface; @@ -105,7 +102,7 @@ struct _AUDIN_PLUGIN IWTSListener* listener; BOOL initialized; -}; +} AUDIN_PLUGIN; static BOOL audin_process_addin_args(AUDIN_PLUGIN* audin, const ADDIN_ARGV* args); diff --git a/channels/audin/client/ios/audin_ios.m b/channels/audin/client/ios/audin_ios.m index 8e39a1636..02ad5541c 100644 --- a/channels/audin/client/ios/audin_ios.m +++ b/channels/audin/client/ios/audin_ios.m @@ -53,11 +53,11 @@ #define IOS_AUDIO_QUEUE_NUM_BUFFERS 100 - typedef struct _AudinIosDevice - { - IAudinDevice iface; +typedef struct +{ + IAudinDevice iface; - AUDIO_FORMAT format; + AUDIO_FORMAT format; UINT32 FramesPerPacket; int dev_unit; @@ -70,7 +70,7 @@ AudioQueueRef audioQueue; AudioStreamBasicDescription audioFormat; AudioQueueBufferRef audioBuffers[IOS_AUDIO_QUEUE_NUM_BUFFERS]; - } AudinIosDevice; +} AudinIosDevice; static AudioFormatID audin_ios_get_format(const AUDIO_FORMAT *format) { @@ -338,4 +338,4 @@ error_out: free(ios); return error; - } \ No newline at end of file + } diff --git a/channels/audin/client/mac/audin_mac.m b/channels/audin/client/mac/audin_mac.m index ccc387458..92ce73034 100644 --- a/channels/audin/client/mac/audin_mac.m +++ b/channels/audin/client/mac/audin_mac.m @@ -65,7 +65,7 @@ typedef UInt32 AudioFormatID; typedef UInt32 AudioFormatFlags; #endif -typedef struct _AudinMacDevice +typedef struct { IAudinDevice iface; diff --git a/channels/audin/client/opensles/audin_opensl_es.c b/channels/audin/client/opensles/audin_opensl_es.c index 9d540088c..282f8ff54 100644 --- a/channels/audin/client/opensles/audin_opensl_es.c +++ b/channels/audin/client/opensles/audin_opensl_es.c @@ -40,7 +40,7 @@ #include "audin_main.h" #include "opensl_io.h" -typedef struct _AudinOpenSLESDevice +typedef struct { IAudinDevice iface; diff --git a/channels/audin/client/oss/audin_oss.c b/channels/audin/client/oss/audin_oss.c index 0934ff235..5cf2dbdc4 100644 --- a/channels/audin/client/oss/audin_oss.c +++ b/channels/audin/client/oss/audin_oss.c @@ -51,7 +51,7 @@ #include "audin_main.h" -typedef struct _AudinOSSDevice +typedef struct { IAudinDevice iface; diff --git a/channels/audin/client/pulse/audin_pulse.c b/channels/audin/client/pulse/audin_pulse.c index 234bd3c0c..1949b3ac1 100644 --- a/channels/audin/client/pulse/audin_pulse.c +++ b/channels/audin/client/pulse/audin_pulse.c @@ -40,7 +40,7 @@ #include "audin_main.h" -typedef struct _AudinPulseDevice +typedef struct { IAudinDevice iface; diff --git a/channels/audin/client/sndio/audin_sndio.c b/channels/audin/client/sndio/audin_sndio.c index 32a0f5022..995647b33 100644 --- a/channels/audin/client/sndio/audin_sndio.c +++ b/channels/audin/client/sndio/audin_sndio.c @@ -32,7 +32,7 @@ #include "audin_main.h" -typedef struct _AudinSndioDevice +typedef struct { IAudinDevice device; diff --git a/channels/audin/client/winmm/audin_winmm.c b/channels/audin/client/winmm/audin_winmm.c index d9024b107..f3d64abff 100644 --- a/channels/audin/client/winmm/audin_winmm.c +++ b/channels/audin/client/winmm/audin_winmm.c @@ -42,7 +42,7 @@ #define WAVE_MAPPED_DEFAULT_COMMUNICATION_DEVICE 0x0010 #endif -typedef struct _AudinWinmmDevice +typedef struct { IAudinDevice iface; diff --git a/channels/audin/server/audin.c b/channels/audin/server/audin.c index 10d61ed26..f7e17f97c 100644 --- a/channels/audin/server/audin.c +++ b/channels/audin/server/audin.c @@ -49,7 +49,7 @@ #define MSG_SNDIN_DATA 0x06 #define MSG_SNDIN_FORMATCHANGE 0x07 -typedef struct _audin_server +typedef struct { audin_server_context context; diff --git a/channels/client/tables.h b/channels/client/tables.h index 7b74709e5..f87ddb226 100644 --- a/channels/client/tables.h +++ b/channels/client/tables.h @@ -24,36 +24,33 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wstrict-prototypes" #endif -struct _STATIC_ENTRY + +typedef struct { const char* name; UINT (*entry)(); -}; -typedef struct _STATIC_ENTRY STATIC_ENTRY; +} STATIC_ENTRY; -struct _STATIC_ENTRY_TABLE +typedef struct { const char* name; const STATIC_ENTRY* table; -}; -typedef struct _STATIC_ENTRY_TABLE STATIC_ENTRY_TABLE; +} STATIC_ENTRY_TABLE; -struct _STATIC_SUBSYSTEM_ENTRY +typedef struct { const char* name; const char* type; UINT (*entry)(); -}; -typedef struct _STATIC_SUBSYSTEM_ENTRY STATIC_SUBSYSTEM_ENTRY; +} STATIC_SUBSYSTEM_ENTRY; -struct _STATIC_ADDIN_TABLE +typedef struct { const char* name; const char* type; UINT (*entry)(); const STATIC_SUBSYSTEM_ENTRY* table; -}; -typedef struct _STATIC_ADDIN_TABLE STATIC_ADDIN_TABLE; +} STATIC_ADDIN_TABLE; #if defined(__GNUC__) #pragma GCC diagnostic pop diff --git a/channels/cliprdr/client/cliprdr_main.h b/channels/cliprdr/client/cliprdr_main.h index 8bb718205..410b61c33 100644 --- a/channels/cliprdr/client/cliprdr_main.h +++ b/channels/cliprdr/client/cliprdr_main.h @@ -30,7 +30,7 @@ #define TAG CHANNELS_TAG("cliprdr.client") -struct cliprdr_plugin +typedef struct { CHANNEL_DEF channelDef; CHANNEL_ENTRY_POINTS_FREERDP_EX channelEntryPoints; @@ -48,8 +48,7 @@ struct cliprdr_plugin BOOL fileClipNoFilePaths; BOOL canLockClipData; BOOL hasHugeFileSupport; -}; -typedef struct cliprdr_plugin cliprdrPlugin; +} cliprdrPlugin; CliprdrClientContext* cliprdr_get_client_interface(cliprdrPlugin* cliprdr); diff --git a/channels/cliprdr/server/cliprdr_main.h b/channels/cliprdr/server/cliprdr_main.h index fce0ddba5..f687d9b22 100644 --- a/channels/cliprdr/server/cliprdr_main.h +++ b/channels/cliprdr/server/cliprdr_main.h @@ -32,7 +32,7 @@ #define CLIPRDR_HEADER_LENGTH 8 -struct _cliprdr_server_private +typedef struct { HANDLE vcm; HANDLE Thread; @@ -42,7 +42,6 @@ struct _cliprdr_server_private wStream* s; char* temporaryDirectory; -}; -typedef struct _cliprdr_server_private CliprdrServerPrivate; +} CliprdrServerPrivate; #endif /* FREERDP_CHANNEL_CLIPRDR_SERVER_MAIN_H */ diff --git a/channels/disp/client/disp_main.c b/channels/disp/client/disp_main.c index 4902e0f09..41b2d0e55 100644 --- a/channels/disp/client/disp_main.c +++ b/channels/disp/client/disp_main.c @@ -42,27 +42,25 @@ #include "disp_main.h" #include "../disp_common.h" -struct _DISP_CHANNEL_CALLBACK +typedef struct { IWTSVirtualChannelCallback iface; IWTSPlugin* plugin; IWTSVirtualChannelManager* channel_mgr; IWTSVirtualChannel* channel; -}; -typedef struct _DISP_CHANNEL_CALLBACK DISP_CHANNEL_CALLBACK; +} DISP_CHANNEL_CALLBACK; -struct _DISP_LISTENER_CALLBACK +typedef struct { IWTSListenerCallback iface; IWTSPlugin* plugin; IWTSVirtualChannelManager* channel_mgr; DISP_CHANNEL_CALLBACK* channel_callback; -}; -typedef struct _DISP_LISTENER_CALLBACK DISP_LISTENER_CALLBACK; +} DISP_LISTENER_CALLBACK; -struct _DISP_PLUGIN +typedef struct { IWTSPlugin iface; @@ -73,8 +71,7 @@ struct _DISP_PLUGIN UINT32 MaxMonitorAreaFactorA; UINT32 MaxMonitorAreaFactorB; BOOL initialized; -}; -typedef struct _DISP_PLUGIN DISP_PLUGIN; +} DISP_PLUGIN; /** * Function description diff --git a/channels/disp/server/disp_main.h b/channels/disp/server/disp_main.h index c47462bed..920a50871 100644 --- a/channels/disp/server/disp_main.h +++ b/channels/disp/server/disp_main.h @@ -22,7 +22,7 @@ #include -struct _disp_server_private +struct s_disp_server_private { BOOL isReady; wStream* input_stream; diff --git a/channels/drdynvc/client/drdynvc_main.h b/channels/drdynvc/client/drdynvc_main.h index a80e30f81..7f8d2c3f4 100644 --- a/channels/drdynvc/client/drdynvc_main.h +++ b/channels/drdynvc/client/drdynvc_main.h @@ -37,7 +37,7 @@ typedef struct drdynvc_plugin drdynvcPlugin; -struct _DVCMAN +typedef struct { IWTSVirtualChannelManager iface; @@ -49,10 +49,9 @@ struct _DVCMAN wArrayList* listeners; wArrayList* channels; wStreamPool* pool; -}; -typedef struct _DVCMAN DVCMAN; +} DVCMAN; -struct _DVCMAN_LISTENER +typedef struct { IWTSListener iface; @@ -60,20 +59,18 @@ struct _DVCMAN_LISTENER char* channel_name; UINT32 flags; IWTSListenerCallback* listener_callback; -}; -typedef struct _DVCMAN_LISTENER DVCMAN_LISTENER; +} DVCMAN_LISTENER; -struct _DVCMAN_ENTRY_POINTS +typedef struct { IDRDYNVC_ENTRY_POINTS iface; DVCMAN* dvcman; const ADDIN_ARGV* args; rdpSettings* settings; -}; -typedef struct _DVCMAN_ENTRY_POINTS DVCMAN_ENTRY_POINTS; +} DVCMAN_ENTRY_POINTS; -struct _DVCMAN_CHANNEL +typedef struct { IWTSVirtualChannel iface; @@ -87,10 +84,9 @@ struct _DVCMAN_CHANNEL wStream* dvc_data; UINT32 dvc_data_length; CRITICAL_SECTION lock; -}; -typedef struct _DVCMAN_CHANNEL DVCMAN_CHANNEL; +} DVCMAN_CHANNEL; -enum _DRDYNVC_STATE +typedef enum { DRDYNVC_STATE_INITIAL, DRDYNVC_STATE_CAPABILITIES, @@ -98,8 +94,7 @@ enum _DRDYNVC_STATE DRDYNVC_STATE_OPENING_CHANNEL, DRDYNVC_STATE_SEND_RECEIVE, DRDYNVC_STATE_FINAL -}; -typedef enum _DRDYNVC_STATE DRDYNVC_STATE; +} DRDYNVC_STATE; struct drdynvc_plugin { diff --git a/channels/drdynvc/server/drdynvc_main.h b/channels/drdynvc/server/drdynvc_main.h index 8e17f89c2..4456d95bc 100644 --- a/channels/drdynvc/server/drdynvc_main.h +++ b/channels/drdynvc/server/drdynvc_main.h @@ -27,7 +27,7 @@ #include #include -struct _drdynvc_server_private +struct s_drdynvc_server_private { HANDLE Thread; HANDLE StopEvent; diff --git a/channels/drive/client/drive_file.h b/channels/drive/client/drive_file.h index ed789d6f0..a92825325 100644 --- a/channels/drive/client/drive_file.h +++ b/channels/drive/client/drive_file.h @@ -31,9 +31,7 @@ #define TAG CHANNELS_TAG("drive.client") -typedef struct _DRIVE_FILE DRIVE_FILE; - -struct _DRIVE_FILE +typedef struct { UINT32 id; BOOL is_dir; @@ -49,7 +47,7 @@ struct _DRIVE_FILE UINT32 DesiredAccess; UINT32 CreateDisposition; UINT32 CreateOptions; -}; +} DRIVE_FILE; DRIVE_FILE* drive_file_new(const WCHAR* base_path, const WCHAR* path, UINT32 PathLength, UINT32 id, UINT32 DesiredAccess, UINT32 CreateDisposition, UINT32 CreateOptions, diff --git a/channels/drive/client/drive_main.c b/channels/drive/client/drive_main.c index 920a7918f..82cd344ca 100644 --- a/channels/drive/client/drive_main.c +++ b/channels/drive/client/drive_main.c @@ -47,9 +47,7 @@ #include "drive_file.h" -typedef struct _DRIVE_DEVICE DRIVE_DEVICE; - -struct _DRIVE_DEVICE +typedef struct { DEVICE device; @@ -64,7 +62,7 @@ struct _DRIVE_DEVICE DEVMAN* devman; rdpContext* rdpcontext; -}; +} DRIVE_DEVICE; static UINT sys_code_page = 0; diff --git a/channels/echo/client/echo_main.c b/channels/echo/client/echo_main.c index bbc53b849..8d6fdd878 100644 --- a/channels/echo/client/echo_main.c +++ b/channels/echo/client/echo_main.c @@ -35,34 +35,31 @@ #define TAG CHANNELS_TAG("echo.client") -typedef struct _ECHO_LISTENER_CALLBACK ECHO_LISTENER_CALLBACK; -struct _ECHO_LISTENER_CALLBACK +typedef struct { IWTSListenerCallback iface; IWTSPlugin* plugin; IWTSVirtualChannelManager* channel_mgr; -}; +} ECHO_LISTENER_CALLBACK; -typedef struct _ECHO_CHANNEL_CALLBACK ECHO_CHANNEL_CALLBACK; -struct _ECHO_CHANNEL_CALLBACK +typedef struct { IWTSVirtualChannelCallback iface; IWTSPlugin* plugin; IWTSVirtualChannelManager* channel_mgr; IWTSVirtualChannel* channel; -}; +} ECHO_CHANNEL_CALLBACK; -typedef struct _ECHO_PLUGIN ECHO_PLUGIN; -struct _ECHO_PLUGIN +typedef struct { IWTSPlugin iface; ECHO_LISTENER_CALLBACK* listener_callback; IWTSListener* listener; BOOL initialized; -}; +} ECHO_PLUGIN; /** * Function description diff --git a/channels/echo/server/echo_main.c b/channels/echo/server/echo_main.c index 5ad487076..e79b7b7ec 100644 --- a/channels/echo/server/echo_main.c +++ b/channels/echo/server/echo_main.c @@ -39,7 +39,7 @@ #define TAG CHANNELS_TAG("echo.server") -typedef struct _echo_server +typedef struct { echo_server_context context; diff --git a/channels/encomsp/server/encomsp_main.h b/channels/encomsp/server/encomsp_main.h index 18daf72ef..37d8c7123 100644 --- a/channels/encomsp/server/encomsp_main.h +++ b/channels/encomsp/server/encomsp_main.h @@ -26,7 +26,7 @@ #include -struct _encomsp_server_private +struct s_encomsp_server_private { HANDLE Thread; HANDLE StopEvent; diff --git a/channels/geometry/client/geometry_main.c b/channels/geometry/client/geometry_main.c index 7a7195d0c..c24b19138 100644 --- a/channels/geometry/client/geometry_main.c +++ b/channels/geometry/client/geometry_main.c @@ -40,27 +40,25 @@ #include "geometry_main.h" -struct _GEOMETRY_CHANNEL_CALLBACK +typedef struct { IWTSVirtualChannelCallback iface; IWTSPlugin* plugin; IWTSVirtualChannelManager* channel_mgr; IWTSVirtualChannel* channel; -}; -typedef struct _GEOMETRY_CHANNEL_CALLBACK GEOMETRY_CHANNEL_CALLBACK; +} GEOMETRY_CHANNEL_CALLBACK; -struct _GEOMETRY_LISTENER_CALLBACK +typedef struct { IWTSListenerCallback iface; IWTSPlugin* plugin; IWTSVirtualChannelManager* channel_mgr; GEOMETRY_CHANNEL_CALLBACK* channel_callback; -}; -typedef struct _GEOMETRY_LISTENER_CALLBACK GEOMETRY_LISTENER_CALLBACK; +} GEOMETRY_LISTENER_CALLBACK; -struct _GEOMETRY_PLUGIN +typedef struct { IWTSPlugin iface; @@ -69,8 +67,7 @@ struct _GEOMETRY_PLUGIN GeometryClientContext* context; BOOL initialized; -}; -typedef struct _GEOMETRY_PLUGIN GEOMETRY_PLUGIN; +} GEOMETRY_PLUGIN; static UINT32 mappedGeometryHash(const void* v) { diff --git a/channels/gfxredir/server/gfxredir_main.h b/channels/gfxredir/server/gfxredir_main.h index e44e16a56..45424fd97 100644 --- a/channels/gfxredir/server/gfxredir_main.h +++ b/channels/gfxredir/server/gfxredir_main.h @@ -22,7 +22,7 @@ #include -struct _gfxredir_server_private +struct s_gfxredir_server_private { BOOL isReady; wStream* input_stream; diff --git a/channels/parallel/client/parallel_main.c b/channels/parallel/client/parallel_main.c index dc2d59f89..8ce7637f7 100644 --- a/channels/parallel/client/parallel_main.c +++ b/channels/parallel/client/parallel_main.c @@ -61,7 +61,7 @@ #define TAG CHANNELS_TAG("drive.client") -struct _PARALLEL_DEVICE +typedef struct { DEVICE device; @@ -72,8 +72,7 @@ struct _PARALLEL_DEVICE HANDLE thread; wMessageQueue* queue; rdpContext* rdpcontext; -}; -typedef struct _PARALLEL_DEVICE PARALLEL_DEVICE; +} PARALLEL_DEVICE; /** * Function description diff --git a/channels/printer/client/cups/printer_cups.c b/channels/printer/client/cups/printer_cups.c index 982033f20..5c1ca83fb 100644 --- a/channels/printer/client/cups/printer_cups.c +++ b/channels/printer/client/cups/printer_cups.c @@ -40,32 +40,28 @@ #include -typedef struct rdp_cups_printer_driver rdpCupsPrinterDriver; -typedef struct rdp_cups_printer rdpCupsPrinter; -typedef struct rdp_cups_print_job rdpCupsPrintJob; - -struct rdp_cups_printer_driver +typedef struct { rdpPrinterDriver driver; int id_sequence; size_t references; -}; +} rdpCupsPrinterDriver; -struct rdp_cups_printer -{ - rdpPrinter printer; - - rdpCupsPrintJob* printjob; -}; - -struct rdp_cups_print_job +typedef struct { rdpPrintJob printjob; void* printjob_object; int printjob_id; -}; +} rdpCupsPrintJob; + +typedef struct +{ + rdpPrinter printer; + + rdpCupsPrintJob* printjob; +} rdpCupsPrinter; static void printer_cups_get_printjob_name(char* buf, size_t size, size_t id) { diff --git a/channels/printer/client/printer_main.c b/channels/printer/client/printer_main.c index cf3005344..0a10ba469 100644 --- a/channels/printer/client/printer_main.c +++ b/channels/printer/client/printer_main.c @@ -48,8 +48,7 @@ #define TAG CHANNELS_TAG("printer.client") -typedef struct _PRINTER_DEVICE PRINTER_DEVICE; -struct _PRINTER_DEVICE +typedef struct { DEVICE device; @@ -63,7 +62,7 @@ struct _PRINTER_DEVICE HANDLE thread; rdpContext* rdpcontext; char port[64]; -}; +} PRINTER_DEVICE; typedef enum { diff --git a/channels/printer/client/win/printer_win.c b/channels/printer/client/win/printer_win.c index e8d325c20..68905bc4c 100644 --- a/channels/printer/client/win/printer_win.c +++ b/channels/printer/client/win/printer_win.c @@ -48,26 +48,15 @@ } while (0) #endif -typedef struct rdp_win_printer_driver rdpWinPrinterDriver; -typedef struct rdp_win_printer rdpWinPrinter; -typedef struct rdp_win_print_job rdpWinPrintJob; - -struct rdp_win_printer_driver +typedef struct { rdpPrinterDriver driver; size_t id_sequence; size_t references; -}; +} rdpWinPrinterDriver; -struct rdp_win_printer -{ - rdpPrinter printer; - HANDLE hPrinter; - rdpWinPrintJob* printjob; -}; - -struct rdp_win_print_job +typedef struct { rdpPrintJob printjob; DOC_INFO_1 di; @@ -75,7 +64,14 @@ struct rdp_win_print_job void* printjob_object; int printjob_id; -}; +} rdpWinPrintJob; + +typedef struct +{ + rdpPrinter printer; + HANDLE hPrinter; + rdpWinPrintJob* printjob; +} rdpWinPrinter; static WCHAR* printer_win_get_printjob_name(size_t id) { diff --git a/channels/rail/client/rail_main.h b/channels/rail/client/rail_main.h index 9ba75cf3c..2cbc6c155 100644 --- a/channels/rail/client/rail_main.h +++ b/channels/rail/client/rail_main.h @@ -36,7 +36,7 @@ #include "../rail_common.h" -struct rail_plugin +typedef struct { CHANNEL_DEF channelDef; CHANNEL_ENTRY_POINTS_FREERDP_EX channelEntryPoints; @@ -52,8 +52,7 @@ struct rail_plugin DWORD channelFlags; RAIL_CLIENT_STATUS_ORDER clientStatus; BOOL sendHandshake; -}; -typedef struct rail_plugin railPlugin; +} railPlugin; RailClientContext* rail_get_client_interface(railPlugin* rail); UINT rail_send_channel_data(railPlugin* rail, wStream* s); diff --git a/channels/rail/server/rail_main.h b/channels/rail/server/rail_main.h index 74cb95986..f15cf1934 100644 --- a/channels/rail/server/rail_main.h +++ b/channels/rail/server/rail_main.h @@ -29,7 +29,7 @@ #include "../rail_common.h" -struct _rail_server_private +struct s_rail_server_private { HANDLE thread; HANDLE stopEvent; diff --git a/channels/rdpdr/client/rdpdr_main.c b/channels/rdpdr/client/rdpdr_main.c index 790cc2921..00bbb2740 100644 --- a/channels/rdpdr/client/rdpdr_main.c +++ b/channels/rdpdr/client/rdpdr_main.c @@ -72,14 +72,13 @@ #include "rdpdr_main.h" -typedef struct _DEVICE_DRIVE_EXT DEVICE_DRIVE_EXT; /* IMPORTANT: Keep in sync with DRIVE_DEVICE */ -struct _DEVICE_DRIVE_EXT +typedef struct { DEVICE device; WCHAR* path; BOOL automount; -}; +} DEVICE_DRIVE_EXT; static const char* rdpdr_device_type_string(UINT32 type) { @@ -426,7 +425,7 @@ static UINT drive_hotplug_thread_terminate(rdpdrPlugin* rdpdr) #define MAX_USB_DEVICES 100 -typedef struct _hotplug_dev +typedef struct { char* path; BOOL to_add; @@ -695,7 +694,7 @@ static BOOL isAutomountLocation(const char* path) #define MAX_USB_DEVICES 100 -typedef struct _hotplug_dev +typedef struct { char* path; BOOL to_add; diff --git a/channels/rdpdr/client/rdpdr_main.h b/channels/rdpdr/client/rdpdr_main.h index 7e18746fc..ad1edc459 100644 --- a/channels/rdpdr/client/rdpdr_main.h +++ b/channels/rdpdr/client/rdpdr_main.h @@ -44,9 +44,7 @@ #define TAG CHANNELS_TAG("rdpdr.client") -typedef struct rdpdr_plugin rdpdrPlugin; - -struct rdpdr_plugin +typedef struct { CHANNEL_DEF channelDef; CHANNEL_ENTRY_POINTS_FREERDP_EX channelEntryPoints; @@ -78,7 +76,7 @@ struct rdpdr_plugin HANDLE stopEvent; #endif rdpContext* rdpcontext; -}; +} rdpdrPlugin; UINT rdpdr_send(rdpdrPlugin* rdpdr, wStream* s); diff --git a/channels/rdpdr/server/rdpdr_main.h b/channels/rdpdr/server/rdpdr_main.h index c1ec53445..425c6d88d 100644 --- a/channels/rdpdr/server/rdpdr_main.h +++ b/channels/rdpdr/server/rdpdr_main.h @@ -31,7 +31,7 @@ #include #include -struct _rdpdr_server_private +struct s_rdpdr_server_private { HANDLE Thread; HANDLE StopEvent; @@ -50,24 +50,22 @@ struct _rdpdr_server_private #define RDPDR_HEADER_LENGTH 4 -struct _RDPDR_HEADER +typedef struct { UINT16 Component; UINT16 PacketId; -}; -typedef struct _RDPDR_HEADER RDPDR_HEADER; +} RDPDR_HEADER; #define RDPDR_CAPABILITY_HEADER_LENGTH 8 -struct _RDPDR_CAPABILITY_HEADER +typedef struct { UINT16 CapabilityType; UINT16 CapabilityLength; UINT32 Version; -}; -typedef struct _RDPDR_CAPABILITY_HEADER RDPDR_CAPABILITY_HEADER; +} RDPDR_CAPABILITY_HEADER; -struct _RDPDR_IRP +typedef struct S_RDPDR_IRP { UINT32 CompletionId; UINT32 DeviceId; @@ -76,9 +74,8 @@ struct _RDPDR_IRP char ExtraBuffer[256]; void* CallbackData; UINT(*Callback) - (RdpdrServerContext* context, wStream* s, struct _RDPDR_IRP* irp, UINT32 deviceId, + (RdpdrServerContext* context, wStream* s, struct S_RDPDR_IRP* irp, UINT32 deviceId, UINT32 completionId, UINT32 ioStatus); -}; -typedef struct _RDPDR_IRP RDPDR_IRP; +} RDPDR_IRP; #endif /* FREERDP_CHANNEL_RDPDR_SERVER_MAIN_H */ diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c index 54be9ad55..9eecad371 100644 --- a/channels/rdpei/client/rdpei_main.c +++ b/channels/rdpei/client/rdpei_main.c @@ -65,27 +65,25 @@ #define MAX_CONTACTS 64 #define MAX_PEN_CONTACTS 4 -struct _RDPEI_CHANNEL_CALLBACK +typedef struct { IWTSVirtualChannelCallback iface; IWTSPlugin* plugin; IWTSVirtualChannelManager* channel_mgr; IWTSVirtualChannel* channel; -}; -typedef struct _RDPEI_CHANNEL_CALLBACK RDPEI_CHANNEL_CALLBACK; +} RDPEI_CHANNEL_CALLBACK; -struct _RDPEI_LISTENER_CALLBACK +typedef struct { IWTSListenerCallback iface; IWTSPlugin* plugin; IWTSVirtualChannelManager* channel_mgr; RDPEI_CHANNEL_CALLBACK* channel_callback; -}; -typedef struct _RDPEI_LISTENER_CALLBACK RDPEI_LISTENER_CALLBACK; +} RDPEI_LISTENER_CALLBACK; -struct _RDPEI_PLUGIN +typedef struct { IWTSPlugin iface; @@ -111,8 +109,7 @@ struct _RDPEI_PLUGIN BOOL initialized; HANDLE thread; HANDLE event; -}; -typedef struct _RDPEI_PLUGIN RDPEI_PLUGIN; +} RDPEI_PLUGIN; /** * Function description diff --git a/channels/rdpei/client/rdpei_main.h b/channels/rdpei/client/rdpei_main.h index 01ecd5ff9..adc21809e 100644 --- a/channels/rdpei/client/rdpei_main.h +++ b/channels/rdpei/client/rdpei_main.h @@ -62,24 +62,22 @@ * */ -struct _RDPINPUT_CONTACT_POINT +typedef struct { BOOL dirty; BOOL active; UINT32 contactId; INT32 externalId; RDPINPUT_CONTACT_DATA data; -}; -typedef struct _RDPINPUT_CONTACT_POINT RDPINPUT_CONTACT_POINT; +} RDPINPUT_CONTACT_POINT; -struct _RDPINPUT_PEN_CONTACT_POINT +typedef struct { BOOL dirty; BOOL active; INT32 externalId; RDPINPUT_PEN_CONTACT data; -}; -typedef struct _RDPINPUT_PEN_CONTACT_POINT RDPINPUT_PEN_CONTACT_POINT; +} RDPINPUT_PEN_CONTACT_POINT; #ifdef WITH_DEBUG_DVC #define DEBUG_DVC(...) WLog_DBG(TAG, __VA_ARGS__) diff --git a/channels/rdpei/server/rdpei_main.c b/channels/rdpei/server/rdpei_main.c index 558a54190..067c90d58 100644 --- a/channels/rdpei/server/rdpei_main.c +++ b/channels/rdpei/server/rdpei_main.c @@ -42,7 +42,7 @@ enum RdpEiState STATE_SUSPENDED, }; -struct _rdpei_server_private +struct s_rdpei_server_private { HANDLE channelHandle; HANDLE eventHandle; diff --git a/channels/rdpgfx/client/rdpgfx_main.h b/channels/rdpgfx/client/rdpgfx_main.h index 760d1be56..b6477cb69 100644 --- a/channels/rdpgfx/client/rdpgfx_main.h +++ b/channels/rdpgfx/client/rdpgfx_main.h @@ -32,27 +32,25 @@ #include #include -struct _RDPGFX_CHANNEL_CALLBACK +typedef struct { IWTSVirtualChannelCallback iface; IWTSPlugin* plugin; IWTSVirtualChannelManager* channel_mgr; IWTSVirtualChannel* channel; -}; -typedef struct _RDPGFX_CHANNEL_CALLBACK RDPGFX_CHANNEL_CALLBACK; +} RDPGFX_CHANNEL_CALLBACK; -struct _RDPGFX_LISTENER_CALLBACK +typedef struct { IWTSListenerCallback iface; IWTSPlugin* plugin; IWTSVirtualChannelManager* channel_mgr; RDPGFX_CHANNEL_CALLBACK* channel_callback; -}; -typedef struct _RDPGFX_LISTENER_CALLBACK RDPGFX_LISTENER_CALLBACK; +} RDPGFX_LISTENER_CALLBACK; -struct _RDPGFX_PLUGIN +typedef struct { IWTSPlugin iface; @@ -86,7 +84,6 @@ struct _RDPGFX_PLUGIN RDPGFX_CAPSET ConnectionCaps; BOOL SendQoeAck; BOOL initialized; -}; -typedef struct _RDPGFX_PLUGIN RDPGFX_PLUGIN; +} RDPGFX_PLUGIN; #endif /* FREERDP_CHANNEL_RDPGFX_CLIENT_MAIN_H */ diff --git a/channels/rdpgfx/server/rdpgfx_main.h b/channels/rdpgfx/server/rdpgfx_main.h index be29b7638..bea797ede 100644 --- a/channels/rdpgfx/server/rdpgfx_main.h +++ b/channels/rdpgfx/server/rdpgfx_main.h @@ -23,7 +23,7 @@ #include #include -struct _rdpgfx_server_private +struct s_rdpgfx_server_private { ZGFX_CONTEXT* zgfx; BOOL ownThread; diff --git a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c index ef480d35d..9c2110e8b 100644 --- a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c +++ b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c @@ -41,9 +41,7 @@ #include "rdpsnd_main.h" -typedef struct rdpsnd_alsa_plugin rdpsndAlsaPlugin; - -struct rdpsnd_alsa_plugin +typedef struct { rdpsndDevicePlugin device; @@ -59,7 +57,7 @@ struct rdpsnd_alsa_plugin snd_pcm_uframes_t buffer_size; snd_pcm_uframes_t period_size; -}; +} rdpsndAlsaPlugin; #define SND_PCM_CHECK(_func, _status) \ do \ diff --git a/channels/rdpsnd/client/fake/rdpsnd_fake.c b/channels/rdpsnd/client/fake/rdpsnd_fake.c index 0cd45b47e..542717bd8 100644 --- a/channels/rdpsnd/client/fake/rdpsnd_fake.c +++ b/channels/rdpsnd/client/fake/rdpsnd_fake.c @@ -34,12 +34,10 @@ #include "rdpsnd_main.h" -typedef struct rdpsnd_fake_plugin rdpsndFakePlugin; - -struct rdpsnd_fake_plugin +typedef struct { rdpsndDevicePlugin device; -}; +} rdpsndFakePlugin; static BOOL rdpsnd_fake_open(rdpsndDevicePlugin* device, const AUDIO_FORMAT* format, UINT32 latency) { diff --git a/channels/rdpsnd/client/ios/rdpsnd_ios.c b/channels/rdpsnd/client/ios/rdpsnd_ios.c index 85c1df5bc..6b226c5c4 100644 --- a/channels/rdpsnd/client/ios/rdpsnd_ios.c +++ b/channels/rdpsnd/client/ios/rdpsnd_ios.c @@ -36,7 +36,7 @@ #define INPUT_BUFFER_SIZE 32768 #define CIRCULAR_BUFFER_SIZE (INPUT_BUFFER_SIZE * 4) -typedef struct rdpsnd_ios_plugin +typedef struct { rdpsndDevicePlugin device; AudioComponentInstance audio_unit; diff --git a/channels/rdpsnd/client/mac/rdpsnd_mac.m b/channels/rdpsnd/client/mac/rdpsnd_mac.m index d8c4da8d6..e239f73f0 100644 --- a/channels/rdpsnd/client/mac/rdpsnd_mac.m +++ b/channels/rdpsnd/client/mac/rdpsnd_mac.m @@ -39,7 +39,7 @@ #include "rdpsnd_main.h" -struct rdpsnd_mac_plugin +typedef struct { rdpsndDevicePlugin device; @@ -52,8 +52,7 @@ struct rdpsnd_mac_plugin AVAudioEngine *engine; AVAudioPlayerNode *player; UINT64 diff; -}; -typedef struct rdpsnd_mac_plugin rdpsndMacPlugin; +} rdpsndMacPlugin; static BOOL rdpsnd_mac_set_format(rdpsndDevicePlugin *device, const AUDIO_FORMAT *format, UINT32 latency) diff --git a/channels/rdpsnd/client/opensles/opensl_io.h b/channels/rdpsnd/client/opensles/opensl_io.h index 57dc04841..f303d2145 100644 --- a/channels/rdpsnd/client/opensles/opensl_io.h +++ b/channels/rdpsnd/client/opensles/opensl_io.h @@ -42,7 +42,7 @@ extern "C" { #endif - typedef struct opensl_stream + typedef struct { // engine interfaces SLObjectItf engineObject; diff --git a/channels/rdpsnd/client/opensles/rdpsnd_opensles.c b/channels/rdpsnd/client/opensles/rdpsnd_opensles.c index 11f07459d..aae293e55 100644 --- a/channels/rdpsnd/client/opensles/rdpsnd_opensles.c +++ b/channels/rdpsnd/client/opensles/rdpsnd_opensles.c @@ -41,9 +41,7 @@ #include "opensl_io.h" #include "rdpsnd_main.h" -typedef struct rdpsnd_opensles_plugin rdpsndopenslesPlugin; - -struct rdpsnd_opensles_plugin +typedef struct { rdpsndDevicePlugin device; @@ -59,7 +57,7 @@ struct rdpsnd_opensles_plugin UINT32 rate; UINT32 channels; int format; -}; +} rdpsndopenslesPlugin; static int rdpsnd_opensles_volume_to_millibel(unsigned short level, int max) { diff --git a/channels/rdpsnd/client/oss/rdpsnd_oss.c b/channels/rdpsnd/client/oss/rdpsnd_oss.c index fc2f1df3e..c6878c2cd 100644 --- a/channels/rdpsnd/client/oss/rdpsnd_oss.c +++ b/channels/rdpsnd/client/oss/rdpsnd_oss.c @@ -51,9 +51,7 @@ #include "rdpsnd_main.h" -typedef struct rdpsnd_oss_plugin rdpsndOssPlugin; - -struct rdpsnd_oss_plugin +typedef struct { rdpsndDevicePlugin device; @@ -65,7 +63,7 @@ struct rdpsnd_oss_plugin UINT32 latency; AUDIO_FORMAT format; -}; +} rdpsndOssPlugin; #define OSS_LOG_ERR(_text, _error) \ do \ diff --git a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c index 3e6a80158..2e3c7443c 100644 --- a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c +++ b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c @@ -38,9 +38,7 @@ #include "rdpsnd_main.h" -typedef struct rdpsnd_pulse_plugin rdpsndPulsePlugin; - -struct rdpsnd_pulse_plugin +typedef struct { rdpsndDevicePlugin device; @@ -51,7 +49,7 @@ struct rdpsnd_pulse_plugin pa_stream* stream; UINT32 latency; UINT32 volume; -}; +} rdpsndPulsePlugin; static BOOL rdpsnd_pulse_format_supported(rdpsndDevicePlugin* device, const AUDIO_FORMAT* format); diff --git a/channels/rdpsnd/client/rdpsnd_main.c b/channels/rdpsnd/client/rdpsnd_main.c index e3ca19f56..7eee228a5 100644 --- a/channels/rdpsnd/client/rdpsnd_main.c +++ b/channels/rdpsnd/client/rdpsnd_main.c @@ -51,25 +51,23 @@ #include "rdpsnd_common.h" #include "rdpsnd_main.h" -struct _RDPSND_CHANNEL_CALLBACK +typedef struct { IWTSVirtualChannelCallback iface; IWTSPlugin* plugin; IWTSVirtualChannelManager* channel_mgr; IWTSVirtualChannel* channel; -}; -typedef struct _RDPSND_CHANNEL_CALLBACK RDPSND_CHANNEL_CALLBACK; +} RDPSND_CHANNEL_CALLBACK; -struct _RDPSND_LISTENER_CALLBACK +typedef struct { IWTSListenerCallback iface; IWTSPlugin* plugin; IWTSVirtualChannelManager* channel_mgr; RDPSND_CHANNEL_CALLBACK* channel_callback; -}; -typedef struct _RDPSND_LISTENER_CALLBACK RDPSND_LISTENER_CALLBACK; +} RDPSND_LISTENER_CALLBACK; struct rdpsnd_plugin { diff --git a/channels/rdpsnd/client/sndio/rdpsnd_sndio.c b/channels/rdpsnd/client/sndio/rdpsnd_sndio.c index 00f24905c..776b20c0d 100644 --- a/channels/rdpsnd/client/sndio/rdpsnd_sndio.c +++ b/channels/rdpsnd/client/sndio/rdpsnd_sndio.c @@ -36,15 +36,13 @@ #include "rdpsnd_main.h" -typedef struct rdpsnd_sndio_plugin rdpsndSndioPlugin; - -struct rdpsnd_sndio_plugin +typedef struct { rdpsndDevicePlugin device; struct sio_hdl* hdl; struct sio_par par; -}; +} rdpsndSndioPlugin; static BOOL rdpsnd_sndio_open(rdpsndDevicePlugin* device, AUDIO_FORMAT* format, int latency) { diff --git a/channels/rdpsnd/client/winmm/rdpsnd_winmm.c b/channels/rdpsnd/client/winmm/rdpsnd_winmm.c index 0c51f77d8..52e4a792e 100644 --- a/channels/rdpsnd/client/winmm/rdpsnd_winmm.c +++ b/channels/rdpsnd/client/winmm/rdpsnd_winmm.c @@ -41,9 +41,7 @@ #include "rdpsnd_main.h" -typedef struct rdpsnd_winmm_plugin rdpsndWinmmPlugin; - -struct rdpsnd_winmm_plugin +typedef struct { rdpsndDevicePlugin device; @@ -55,7 +53,7 @@ struct rdpsnd_winmm_plugin HANDLE hThread; DWORD threadId; CRITICAL_SECTION cs; -}; +} rdpsndWinmmPlugin; static BOOL rdpsnd_winmm_convert_format(const AUDIO_FORMAT* in, WAVEFORMATEX* out) { diff --git a/channels/rdpsnd/server/rdpsnd_main.h b/channels/rdpsnd/server/rdpsnd_main.h index 149adbb13..8623dd451 100644 --- a/channels/rdpsnd/server/rdpsnd_main.h +++ b/channels/rdpsnd/server/rdpsnd_main.h @@ -32,7 +32,7 @@ #define TAG CHANNELS_TAG("rdpsnd.server") -struct _rdpsnd_server_private +struct s_rdpsnd_server_private { BOOL ownThread; HANDLE Thread; diff --git a/channels/remdesk/client/remdesk_main.h b/channels/remdesk/client/remdesk_main.h index 852e18ec7..6952f83f9 100644 --- a/channels/remdesk/client/remdesk_main.h +++ b/channels/remdesk/client/remdesk_main.h @@ -38,7 +38,7 @@ #include #define TAG CHANNELS_TAG("remdesk.client") -struct remdesk_plugin +typedef struct { CHANNEL_DEF channelDef; CHANNEL_ENTRY_POINTS_FREERDP_EX channelEntryPoints; @@ -57,7 +57,6 @@ struct remdesk_plugin BYTE* EncryptedPassStub; size_t EncryptedPassStubSize; rdpContext* rdpcontext; -}; -typedef struct remdesk_plugin remdeskPlugin; +} remdeskPlugin; #endif /* FREERDP_CHANNEL_REMDESK_CLIENT_MAIN_H */ diff --git a/channels/remdesk/server/remdesk_main.h b/channels/remdesk/server/remdesk_main.h index f47d037ab..4268e4ed1 100644 --- a/channels/remdesk/server/remdesk_main.h +++ b/channels/remdesk/server/remdesk_main.h @@ -29,7 +29,7 @@ #define TAG CHANNELS_TAG("remdesk.server") -struct _remdesk_server_private +struct s_remdesk_server_private { HANDLE Thread; HANDLE StopEvent; diff --git a/channels/serial/client/serial_main.c b/channels/serial/client/serial_main.c index d9743e6e6..e15b96606 100644 --- a/channels/serial/client/serial_main.c +++ b/channels/serial/client/serial_main.c @@ -52,9 +52,7 @@ #define MAX_IRP_THREADS 5 -typedef struct _SERIAL_DEVICE SERIAL_DEVICE; - -struct _SERIAL_DEVICE +typedef struct { DEVICE device; BOOL permissive; @@ -70,15 +68,13 @@ struct _SERIAL_DEVICE UINT32 IrpThreadToBeTerminatedCount; CRITICAL_SECTION TerminatingIrpThreadsLock; rdpContext* rdpcontext; -}; +} SERIAL_DEVICE; -typedef struct _IRP_THREAD_DATA IRP_THREAD_DATA; - -struct _IRP_THREAD_DATA +typedef struct { SERIAL_DEVICE* serial; IRP* irp; -}; +} IRP_THREAD_DATA; static UINT32 _GetLastErrorToIoStatus(SERIAL_DEVICE* serial) { diff --git a/channels/smartcard/client/smartcard_main.h b/channels/smartcard/client/smartcard_main.h index 559813735..ffeb175be 100644 --- a/channels/smartcard/client/smartcard_main.h +++ b/channels/smartcard/client/smartcard_main.h @@ -41,18 +41,7 @@ #define TAG CHANNELS_TAG("smartcard.client") -typedef struct _SMARTCARD_DEVICE SMARTCARD_DEVICE; - -struct _SMARTCARD_CONTEXT -{ - HANDLE thread; - SCARDCONTEXT hContext; - wMessageQueue* IrpQueue; - SMARTCARD_DEVICE* smartcard; -}; -typedef struct _SMARTCARD_CONTEXT SMARTCARD_CONTEXT; - -struct _SMARTCARD_DEVICE +typedef struct { DEVICE device; @@ -61,6 +50,14 @@ struct _SMARTCARD_DEVICE wMessageQueue* IrpQueue; wListDictionary* rgOutstandingMessages; rdpContext* rdpcontext; -}; +} SMARTCARD_DEVICE; + +typedef struct +{ + HANDLE thread; + SCARDCONTEXT hContext; + wMessageQueue* IrpQueue; + SMARTCARD_DEVICE* smartcard; +} SMARTCARD_CONTEXT; #endif /* FREERDP_CHANNEL_SMARTCARD_CLIENT_MAIN_H */ diff --git a/channels/sshagent/client/sshagent_main.c b/channels/sshagent/client/sshagent_main.c index 07f57c385..cc428acd1 100644 --- a/channels/sshagent/client/sshagent_main.c +++ b/channels/sshagent/client/sshagent_main.c @@ -58,8 +58,7 @@ #define TAG CHANNELS_TAG("sshagent.client") -typedef struct _SSHAGENT_LISTENER_CALLBACK SSHAGENT_LISTENER_CALLBACK; -struct _SSHAGENT_LISTENER_CALLBACK +typedef struct { IWTSListenerCallback iface; @@ -68,10 +67,9 @@ struct _SSHAGENT_LISTENER_CALLBACK rdpContext* rdpcontext; const char* agent_uds_path; -}; +} SSHAGENT_LISTENER_CALLBACK; -typedef struct _SSHAGENT_CHANNEL_CALLBACK SSHAGENT_CHANNEL_CALLBACK; -struct _SSHAGENT_CHANNEL_CALLBACK +typedef struct { IWTSVirtualChannelCallback iface; @@ -83,17 +81,16 @@ struct _SSHAGENT_CHANNEL_CALLBACK int agent_fd; HANDLE thread; CRITICAL_SECTION lock; -}; +} SSHAGENT_CHANNEL_CALLBACK; -typedef struct _SSHAGENT_PLUGIN SSHAGENT_PLUGIN; -struct _SSHAGENT_PLUGIN +typedef struct { IWTSPlugin iface; SSHAGENT_LISTENER_CALLBACK* listener_callback; rdpContext* rdpcontext; -}; +} SSHAGENT_PLUGIN; /** * Function to open the connection to the sshagent diff --git a/channels/tsmf/client/alsa/tsmf_alsa.c b/channels/tsmf/client/alsa/tsmf_alsa.c index 6e1f00357..bef3f5529 100644 --- a/channels/tsmf/client/alsa/tsmf_alsa.c +++ b/channels/tsmf/client/alsa/tsmf_alsa.c @@ -35,7 +35,7 @@ #include "tsmf_audio.h" -typedef struct _TSMFALSAAudioDevice +typedef struct { ITSMFAudioDevice iface; diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c index cf0aa9ba1..d76d4356d 100644 --- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c +++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c @@ -70,7 +70,7 @@ #define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P #endif -typedef struct _TSMFFFmpegDecoder +typedef struct { ITSMFDecoder iface; diff --git a/channels/tsmf/client/gstreamer/tsmf_platform.h b/channels/tsmf/client/gstreamer/tsmf_platform.h index b6f0b33cd..681095cf1 100644 --- a/channels/tsmf/client/gstreamer/tsmf_platform.h +++ b/channels/tsmf/client/gstreamer/tsmf_platform.h @@ -25,7 +25,7 @@ #include #include -typedef struct _TSMFGstreamerDecoder +typedef struct { ITSMFDecoder iface; diff --git a/channels/tsmf/client/oss/tsmf_oss.c b/channels/tsmf/client/oss/tsmf_oss.c index 774affbd1..71f01c0c6 100644 --- a/channels/tsmf/client/oss/tsmf_oss.c +++ b/channels/tsmf/client/oss/tsmf_oss.c @@ -46,7 +46,7 @@ #include "tsmf_audio.h" -typedef struct _TSMFOSSAudioDevice +typedef struct { ITSMFAudioDevice iface; diff --git a/channels/tsmf/client/pulse/tsmf_pulse.c b/channels/tsmf/client/pulse/tsmf_pulse.c index b2f567e05..cfa6c11c1 100644 --- a/channels/tsmf/client/pulse/tsmf_pulse.c +++ b/channels/tsmf/client/pulse/tsmf_pulse.c @@ -32,7 +32,7 @@ #include "tsmf_audio.h" -typedef struct _TSMFPulseAudioDevice +typedef struct { ITSMFAudioDevice iface; diff --git a/channels/tsmf/client/tsmf_audio.h b/channels/tsmf/client/tsmf_audio.h index e7ae68cb1..fc783d003 100644 --- a/channels/tsmf/client/tsmf_audio.h +++ b/channels/tsmf/client/tsmf_audio.h @@ -22,9 +22,9 @@ #include "tsmf_types.h" -typedef struct _ITSMFAudioDevice ITSMFAudioDevice; +typedef struct s_ITSMFAudioDevice ITSMFAudioDevice; -struct _ITSMFAudioDevice +struct s_ITSMFAudioDevice { /* Open the audio device. */ BOOL (*Open)(ITSMFAudioDevice* audio, const char* device); diff --git a/channels/tsmf/client/tsmf_codec.c b/channels/tsmf/client/tsmf_codec.c index e993d9356..ae49dcc5f 100644 --- a/channels/tsmf/client/tsmf_codec.c +++ b/channels/tsmf/client/tsmf_codec.c @@ -36,7 +36,7 @@ #define TAG CHANNELS_TAG("tsmf.client") -typedef struct _TSMFMediaTypeMap +typedef struct { BYTE guid[16]; const char* name; @@ -330,7 +330,7 @@ static UINT32 tsmf_codec_parse_VIDEOINFOHEADER2(TS_AM_MEDIA_TYPE* mediatype, wSt static UINT32 tsmf_codec_parse_VIDEOINFOHEADER(TS_AM_MEDIA_TYPE* mediatype, wStream* s) { /* - typedef struct tagVIDEOINFOHEADER { + typedef struct { RECT rcSource; //16 RECT rcTarget; //16 32 DWORD dwBitRate; //4 36 diff --git a/channels/tsmf/client/tsmf_decoder.h b/channels/tsmf/client/tsmf_decoder.h index 9a16faffe..6b7833e3d 100644 --- a/channels/tsmf/client/tsmf_decoder.h +++ b/channels/tsmf/client/tsmf_decoder.h @@ -23,7 +23,7 @@ #include "tsmf_types.h" -typedef enum _ITSMFControlMsg +typedef enum { Control_Pause, Control_Resume, @@ -31,9 +31,9 @@ typedef enum _ITSMFControlMsg Control_Stop } ITSMFControlMsg; -typedef struct _ITSMFDecoder ITSMFDecoder; +typedef struct s_ITSMFDecoder ITSMFDecoder; -struct _ITSMFDecoder +struct s_ITSMFDecoder { /* Set the decoder format. Return true if supported. */ BOOL (*SetFormat)(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* media_type); diff --git a/channels/tsmf/client/tsmf_ifman.h b/channels/tsmf/client/tsmf_ifman.h index 3830f5b49..9547f6b08 100644 --- a/channels/tsmf/client/tsmf_ifman.h +++ b/channels/tsmf/client/tsmf_ifman.h @@ -24,8 +24,7 @@ #include -typedef struct _TSMF_IFMAN TSMF_IFMAN; -struct _TSMF_IFMAN +typedef struct { IWTSVirtualChannelCallback* channel_callback; const char* decoder_name; @@ -40,7 +39,7 @@ struct _TSMF_IFMAN wStream* output; BOOL output_pending; UINT32 output_interface_id; -}; +} TSMF_IFMAN; UINT tsmf_ifman_rim_exchange_capability_request(TSMF_IFMAN* ifman); UINT tsmf_ifman_exchange_capability_request(TSMF_IFMAN* ifman); diff --git a/channels/tsmf/client/tsmf_main.h b/channels/tsmf/client/tsmf_main.h index 366215cdb..fb783c180 100644 --- a/channels/tsmf/client/tsmf_main.h +++ b/channels/tsmf/client/tsmf_main.h @@ -24,21 +24,15 @@ #include -typedef struct _TSMF_LISTENER_CALLBACK TSMF_LISTENER_CALLBACK; - -typedef struct _TSMF_CHANNEL_CALLBACK TSMF_CHANNEL_CALLBACK; - -typedef struct _TSMF_PLUGIN TSMF_PLUGIN; - -struct _TSMF_LISTENER_CALLBACK +typedef struct { IWTSListenerCallback iface; IWTSPlugin* plugin; IWTSVirtualChannelManager* channel_mgr; -}; +} TSMF_LISTENER_CALLBACK; -struct _TSMF_CHANNEL_CALLBACK +typedef struct { IWTSVirtualChannelCallback iface; @@ -48,9 +42,9 @@ struct _TSMF_CHANNEL_CALLBACK BYTE presentation_id[GUID_SIZE]; UINT32 stream_id; -}; +} TSMF_CHANNEL_CALLBACK; -struct _TSMF_PLUGIN +typedef struct { IWTSPlugin iface; @@ -62,7 +56,7 @@ struct _TSMF_PLUGIN const char* audio_device; rdpContext* rdpcontext; -}; +} TSMF_PLUGIN; BOOL tsmf_send_eos_response(IWTSVirtualChannelCallback* pChannelCallback, UINT32 message_id); BOOL tsmf_playback_ack(IWTSVirtualChannelCallback* pChannelCallback, UINT32 message_id, diff --git a/channels/tsmf/client/tsmf_media.c b/channels/tsmf/client/tsmf_media.c index d7c587323..5c29ecd42 100644 --- a/channels/tsmf/client/tsmf_media.c +++ b/channels/tsmf/client/tsmf_media.c @@ -67,7 +67,7 @@ #define VIDEO_MIN_BUFFER_LEVEL 10 #define VIDEO_MAX_BUFFER_LEVEL 30 -struct _TSMF_PRESENTATION +struct S_TSMF_PRESENTATION { BYTE presentation_id[GUID_SIZE]; @@ -93,7 +93,7 @@ struct _TSMF_PRESENTATION void* rects; }; -struct _TSMF_STREAM +struct S_TSMF_STREAM { UINT32 stream_id; @@ -137,7 +137,7 @@ struct _TSMF_STREAM BOOL seeking; }; -struct _TSMF_SAMPLE +struct S_TSMF_SAMPLE { UINT32 sample_id; UINT64 start_time; diff --git a/channels/tsmf/client/tsmf_media.h b/channels/tsmf/client/tsmf_media.h index ade06da8f..b98e322a9 100644 --- a/channels/tsmf/client/tsmf_media.h +++ b/channels/tsmf/client/tsmf_media.h @@ -30,11 +30,11 @@ #include -typedef struct _TSMF_PRESENTATION TSMF_PRESENTATION; +typedef struct S_TSMF_PRESENTATION TSMF_PRESENTATION; -typedef struct _TSMF_STREAM TSMF_STREAM; +typedef struct S_TSMF_STREAM TSMF_STREAM; -typedef struct _TSMF_SAMPLE TSMF_SAMPLE; +typedef struct S_TSMF_SAMPLE TSMF_SAMPLE; TSMF_PRESENTATION* tsmf_presentation_new(const BYTE* guid, IWTSVirtualChannelCallback* pChannelCallback); diff --git a/channels/tsmf/client/tsmf_types.h b/channels/tsmf/client/tsmf_types.h index 7e3823dd2..65c50927d 100644 --- a/channels/tsmf/client/tsmf_types.h +++ b/channels/tsmf/client/tsmf_types.h @@ -39,7 +39,7 @@ } while (0) #endif -typedef struct _TS_AM_MEDIA_TYPE +typedef struct { int MajorType; int SubType; diff --git a/channels/urbdrc/client/libusb/libusb_udevice.c b/channels/urbdrc/client/libusb/libusb_udevice.c index 93de7433c..72c915023 100644 --- a/channels/urbdrc/client/libusb/libusb_udevice.c +++ b/channels/urbdrc/client/libusb/libusb_udevice.c @@ -62,9 +62,7 @@ #define HAVE_STREAM_ID_API 1 #endif -typedef struct _ASYNC_TRANSFER_USER_DATA ASYNC_TRANSFER_USER_DATA; - -struct _ASYNC_TRANSFER_USER_DATA +typedef struct { wStream* data; BOOL noack; @@ -79,7 +77,7 @@ struct _ASYNC_TRANSFER_USER_DATA #if !defined(HAVE_STREAM_ID_API) UINT32 streamID; #endif -}; +} ASYNC_TRANSFER_USER_DATA; static void request_free(void* value); diff --git a/channels/urbdrc/client/libusb/libusb_udevice.h b/channels/urbdrc/client/libusb/libusb_udevice.h index a5f836b9b..33705e3a5 100644 --- a/channels/urbdrc/client/libusb/libusb_udevice.h +++ b/channels/urbdrc/client/libusb/libusb_udevice.h @@ -35,9 +35,7 @@ typedef struct libusb_interface LIBUSB_INTERFACE; typedef struct libusb_interface_descriptor LIBUSB_INTERFACE_DESCRIPTOR; typedef struct libusb_endpoint_descriptor LIBUSB_ENDPOINT_DESCEIPTOR; -typedef struct _UDEVICE UDEVICE; - -struct _UDEVICE +typedef struct { IUDEVICE iface; @@ -66,7 +64,7 @@ struct _UDEVICE wArrayList* request_queue; URBDRC_PLUGIN* urbdrc; -}; +} UDEVICE; typedef UDEVICE* PUDEVICE; size_t udev_new_by_id(URBDRC_PLUGIN* urbdrc, libusb_context* ctx, UINT16 idVendor, UINT16 idProduct, diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c index c609f6b9a..1a29c3fe4 100644 --- a/channels/urbdrc/client/libusb/libusb_udevman.c +++ b/channels/urbdrc/client/libusb/libusb_udevman.c @@ -56,17 +56,13 @@ _man->iface.get_##_arg = udevman_get_##_arg; \ _man->iface.set_##_arg = udevman_set_##_arg -typedef struct _VID_PID_PAIR VID_PID_PAIR; - -struct _VID_PID_PAIR +typedef struct { UINT16 vid; UINT16 pid; -}; +} VID_PID_PAIR; -typedef struct _UDEVMAN UDEVMAN; - -struct _UDEVMAN +typedef struct { IUDEVMAN iface; @@ -86,7 +82,7 @@ struct _UDEVMAN libusb_context* context; HANDLE thread; BOOL running; -}; +} UDEVMAN; typedef UDEVMAN* PUDEVMAN; static BOOL poll_libusb_events(UDEVMAN* udevman); diff --git a/channels/urbdrc/client/urbdrc_main.h b/channels/urbdrc/client/urbdrc_main.h index ad6762150..6fdb50786 100644 --- a/channels/urbdrc/client/urbdrc_main.h +++ b/channels/urbdrc/client/urbdrc_main.h @@ -39,8 +39,8 @@ } while (0) #endif -typedef struct _IUDEVICE IUDEVICE; -typedef struct _IUDEVMAN IUDEVMAN; +typedef struct S_IUDEVICE IUDEVICE; +typedef struct S_IUDEVMAN IUDEVMAN; #define BASIC_DEV_STATE_DEFINED(_arg, _type) \ _type (*get_##_arg)(IUDEVICE * pdev); \ @@ -50,30 +50,24 @@ typedef struct _IUDEVMAN IUDEVMAN; _type (*get_##_arg)(IUDEVMAN * udevman); \ void (*set_##_arg)(IUDEVMAN * udevman, _type _arg) -typedef struct _URBDRC_LISTENER_CALLBACK URBDRC_LISTENER_CALLBACK; - -struct _URBDRC_LISTENER_CALLBACK +typedef struct { IWTSListenerCallback iface; IWTSPlugin* plugin; IWTSVirtualChannelManager* channel_mgr; -}; +} URBDRC_LISTENER_CALLBACK; -typedef struct _URBDRC_CHANNEL_CALLBACK URBDRC_CHANNEL_CALLBACK; - -struct _URBDRC_CHANNEL_CALLBACK +typedef struct { IWTSVirtualChannelCallback iface; IWTSPlugin* plugin; IWTSVirtualChannelManager* channel_mgr; IWTSVirtualChannel* channel; -}; +} URBDRC_CHANNEL_CALLBACK; -typedef struct _URBDRC_PLUGIN URBDRC_PLUGIN; - -struct _URBDRC_PLUGIN +typedef struct { IWTSPlugin iface; @@ -86,37 +80,34 @@ struct _URBDRC_PLUGIN wLog* log; IWTSListener* listener; BOOL initialized; -}; +} URBDRC_PLUGIN; typedef BOOL (*PREGISTERURBDRCSERVICE)(IWTSPlugin* plugin, IUDEVMAN* udevman); -struct _FREERDP_URBDRC_SERVICE_ENTRY_POINTS +typedef struct { IWTSPlugin* plugin; PREGISTERURBDRCSERVICE pRegisterUDEVMAN; const ADDIN_ARGV* args; -}; -typedef struct _FREERDP_URBDRC_SERVICE_ENTRY_POINTS FREERDP_URBDRC_SERVICE_ENTRY_POINTS; +} FREERDP_URBDRC_SERVICE_ENTRY_POINTS; typedef FREERDP_URBDRC_SERVICE_ENTRY_POINTS* PFREERDP_URBDRC_SERVICE_ENTRY_POINTS; typedef int (*PFREERDP_URBDRC_DEVICE_ENTRY)(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints); -typedef struct _TRANSFER_DATA TRANSFER_DATA; - -struct _TRANSFER_DATA +typedef struct { URBDRC_CHANNEL_CALLBACK* callback; URBDRC_PLUGIN* urbdrc; IUDEVMAN* udevman; IWTSVirtualChannel* channel; wStream* s; -}; +} TRANSFER_DATA; typedef void (*t_isoch_transfer_cb)(IUDEVICE* idev, URBDRC_CHANNEL_CALLBACK* callback, wStream* out, UINT32 InterfaceId, BOOL noAck, UINT32 MessageId, UINT32 RequestId, UINT32 NumberOfPackets, UINT32 status, UINT32 StartFrame, UINT32 ErrorCount, UINT32 OutputBufferSize); -struct _IUDEVICE +struct S_IUDEVICE { /* Transfer */ int (*isoch_transfer)(IUDEVICE* idev, URBDRC_CHANNEL_CALLBACK* callback, UINT32 MessageId, @@ -194,7 +185,7 @@ struct _IUDEVICE BASIC_DEV_STATE_DEFINED(p_next, void*); }; -struct _IUDEVMAN +struct S_IUDEVMAN { /* Standard */ void (*free)(IUDEVMAN* idevman); diff --git a/channels/urbdrc/common/msusb.h b/channels/urbdrc/common/msusb.h index ff17ed1b1..71ea3e625 100644 --- a/channels/urbdrc/common/msusb.h +++ b/channels/urbdrc/common/msusb.h @@ -24,11 +24,7 @@ #include #include -typedef struct _MSUSB_INTERFACE_DESCRIPTOR MSUSB_INTERFACE_DESCRIPTOR; -typedef struct _MSUSB_PIPE_DESCRIPTOR MSUSB_PIPE_DESCRIPTOR; -typedef struct _MSUSB_CONFIG_DESCRIPTOR MSUSB_CONFIG_DESCRIPTOR; - -struct _MSUSB_PIPE_DESCRIPTOR +typedef struct { UINT16 MaximumPacketSize; UINT32 MaximumTransferSize; @@ -38,9 +34,9 @@ struct _MSUSB_PIPE_DESCRIPTOR BYTE bInterval; BYTE PipeType; int InitCompleted; -}; +} MSUSB_PIPE_DESCRIPTOR; -struct _MSUSB_INTERFACE_DESCRIPTOR +typedef struct { UINT16 Length; UINT16 NumberOfPipesExpected; @@ -53,9 +49,9 @@ struct _MSUSB_INTERFACE_DESCRIPTOR BYTE bInterfaceProtocol; MSUSB_PIPE_DESCRIPTOR** MsPipes; int InitCompleted; -}; +} MSUSB_INTERFACE_DESCRIPTOR; -struct _MSUSB_CONFIG_DESCRIPTOR +typedef struct { UINT16 wTotalLength; BYTE bConfigurationValue; @@ -64,7 +60,7 @@ struct _MSUSB_CONFIG_DESCRIPTOR MSUSB_INTERFACE_DESCRIPTOR** MsInterfaces; int InitCompleted; int MsOutSize; -}; +} MSUSB_CONFIG_DESCRIPTOR; #ifdef __cplusplus extern "C" diff --git a/channels/video/client/video_main.c b/channels/video/client/video_main.c index 6526e6544..dc4abea21 100644 --- a/channels/video/client/video_main.c +++ b/channels/video/client/video_main.c @@ -47,27 +47,25 @@ #include "video_main.h" -struct _VIDEO_CHANNEL_CALLBACK +typedef struct { IWTSVirtualChannelCallback iface; IWTSPlugin* plugin; IWTSVirtualChannelManager* channel_mgr; IWTSVirtualChannel* channel; -}; -typedef struct _VIDEO_CHANNEL_CALLBACK VIDEO_CHANNEL_CALLBACK; +} VIDEO_CHANNEL_CALLBACK; -struct _VIDEO_LISTENER_CALLBACK +typedef struct { IWTSListenerCallback iface; IWTSPlugin* plugin; IWTSVirtualChannelManager* channel_mgr; VIDEO_CHANNEL_CALLBACK* channel_callback; -}; -typedef struct _VIDEO_LISTENER_CALLBACK VIDEO_LISTENER_CALLBACK; +} VIDEO_LISTENER_CALLBACK; -struct _VIDEO_PLUGIN +typedef struct { IWTSPlugin wtsPlugin; @@ -78,46 +76,15 @@ struct _VIDEO_PLUGIN VideoClientContext* context; BOOL initialized; -}; -typedef struct _VIDEO_PLUGIN VIDEO_PLUGIN; +} VIDEO_PLUGIN; #define XF_VIDEO_UNLIMITED_RATE 31 static const BYTE MFVideoFormat_H264[] = { 'H', '2', '6', '4', 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71 }; -typedef struct _PresentationContext PresentationContext; -typedef struct _VideoFrame VideoFrame; - -/** @brief private data for the channel */ -struct _VideoClientContextPriv -{ - VideoClientContext* video; - GeometryClientContext* geometry; - wQueue* frames; - CRITICAL_SECTION framesLock; - wBufferPool* surfacePool; - UINT32 publishedFrames; - UINT32 droppedFrames; - UINT32 lastSentRate; - UINT64 nextFeedbackTime; - PresentationContext* currentPresentation; -}; - /** @brief */ -struct _VideoFrame -{ - UINT64 publishTime; - UINT64 hnsDuration; - MAPPED_GEOMETRY* geometry; - UINT32 w, h; - UINT32 scanline; - BYTE* surfaceData; - PresentationContext* presentation; -}; - -/** @brief */ -struct _PresentationContext +typedef struct { VideoClientContext* video; BYTE PresentationId; @@ -131,6 +98,33 @@ struct _PresentationContext UINT64 lastPublishTime, nextPublishTime; volatile LONG refCounter; VideoSurface* surface; +} PresentationContext; + +/** @brief */ +typedef struct +{ + UINT64 publishTime; + UINT64 hnsDuration; + MAPPED_GEOMETRY* geometry; + UINT32 w, h; + UINT32 scanline; + BYTE* surfaceData; + PresentationContext* presentation; +} VideoFrame; + +/** @brief private data for the channel */ +struct s_VideoClientContextPriv +{ + VideoClientContext* video; + GeometryClientContext* geometry; + wQueue* frames; + CRITICAL_SECTION framesLock; + wBufferPool* surfacePool; + UINT32 publishedFrames; + UINT32 droppedFrames; + UINT32 lastSentRate; + UINT64 nextFeedbackTime; + PresentationContext* currentPresentation; }; static void PresentationContext_unref(PresentationContext* presentation); diff --git a/client/Android/android_event.h b/client/Android/android_event.h index 0a2ea5fe1..26e995044 100644 --- a/client/Android/android_event.h +++ b/client/Android/android_event.h @@ -20,45 +20,40 @@ #define EVENT_TYPE_KEY_UNICODE 4 #define EVENT_TYPE_CLIPBOARD 5 -struct _ANDROID_EVENT +typedef struct { int type; -}; -typedef struct _ANDROID_EVENT ANDROID_EVENT; +} ANDROID_EVENT; -struct _ANDROID_EVENT_KEY +typedef struct { int type; int flags; UINT16 scancode; -}; -typedef struct _ANDROID_EVENT_KEY ANDROID_EVENT_KEY; +} ANDROID_EVENT_KEY; -struct _ANDROID_EVENT_CURSOR +typedef struct { int type; UINT16 flags; UINT16 x; UINT16 y; -}; -typedef struct _ANDROID_EVENT_CURSOR ANDROID_EVENT_CURSOR; +} ANDROID_EVENT_CURSOR; -struct _ANDROID_EVENT_CLIPBOARD +typedef struct { int type; void* data; int data_length; -}; -typedef struct _ANDROID_EVENT_CLIPBOARD ANDROID_EVENT_CLIPBOARD; +} ANDROID_EVENT_CLIPBOARD; -struct _ANDROID_EVENT_QUEUE +typedef struct { int size; int count; HANDLE isSet; ANDROID_EVENT** events; -}; -typedef struct _ANDROID_EVENT_QUEUE ANDROID_EVENT_QUEUE; +} ANDROID_EVENT_QUEUE; FREERDP_LOCAL BOOL android_push_event(freerdp* inst, ANDROID_EVENT* event); @@ -69,7 +64,8 @@ FREERDP_LOCAL ANDROID_EVENT_KEY* android_event_key_new(int flags, UINT16 scancod FREERDP_LOCAL ANDROID_EVENT_KEY* android_event_unicodekey_new(UINT16 flags, UINT16 key); FREERDP_LOCAL ANDROID_EVENT_CURSOR* android_event_cursor_new(UINT16 flags, UINT16 x, UINT16 y); FREERDP_LOCAL ANDROID_EVENT* android_event_disconnect_new(void); -FREERDP_LOCAL ANDROID_EVENT_CLIPBOARD* android_event_clipboard_new(const void* data, size_t data_length); +FREERDP_LOCAL ANDROID_EVENT_CLIPBOARD* android_event_clipboard_new(const void* data, + size_t data_length); FREERDP_LOCAL void android_event_free(ANDROID_EVENT* event); diff --git a/client/Android/android_freerdp.h b/client/Android/android_freerdp.h index 58d127cbd..aad308b20 100644 --- a/client/Android/android_freerdp.h +++ b/client/Android/android_freerdp.h @@ -21,7 +21,7 @@ #include "android_event.h" -struct android_context +typedef struct { rdpContext rdpCtx; @@ -38,7 +38,6 @@ struct android_context CLIPRDR_FORMAT* serverFormats; CliprdrClientContext* cliprdr; UINT32 clipboardCapabilities; -}; -typedef struct android_context androidContext; +} androidContext; #endif /* FREERDP_CLIENT_ANDROID_FREERDP_H */ diff --git a/client/Mac/Keyboard.m b/client/Mac/Keyboard.m index 9bb9cd481..625142d56 100644 --- a/client/Mac/Keyboard.m +++ b/client/Mac/Keyboard.m @@ -24,12 +24,11 @@ #include #include -struct _APPLE_KEYBOARD_DESC +typedef struct { uint32_t ProductId; enum APPLE_KEYBOARD_TYPE Type; -}; -typedef struct _APPLE_KEYBOARD_DESC APPLE_KEYBOARD_DESC; +} APPLE_KEYBOARD_DESC; /* VendorID: 0x05AC (Apple, Inc.) */ diff --git a/client/Mac/mfreerdp.h b/client/Mac/mfreerdp.h index 727a0d3cc..a5721689e 100644 --- a/client/Mac/mfreerdp.h +++ b/client/Mac/mfreerdp.h @@ -1,8 +1,6 @@ #ifndef FREERDP_CLIENT_MAC_FREERDP_H #define FREERDP_CLIENT_MAC_FREERDP_H -typedef struct mf_context mfContext; - #include #include #include @@ -29,7 +27,7 @@ typedef struct mf_context mfContext; #include "Keyboard.h" #include -struct mf_context +typedef struct { rdpContext context; DEFINE_RDP_CLIENT_COMMON(); @@ -85,6 +83,6 @@ struct mf_context int yMaxScroll; // maximum vertical scroll value CGEventFlags kbdFlags; -}; +} mfContext; #endif /* FREERDP_CLIENT_MAC_FREERDP_H */ diff --git a/client/Sample/tf_freerdp.h b/client/Sample/tf_freerdp.h index 19e0cee02..585d0b25b 100644 --- a/client/Sample/tf_freerdp.h +++ b/client/Sample/tf_freerdp.h @@ -28,7 +28,7 @@ #include #include -struct tf_context +typedef struct { rdpContext context; @@ -36,7 +36,6 @@ struct tf_context RdpeiClientContext* rdpei; RdpgfxClientContext* gfx; EncomspClientContext* encomsp; -}; -typedef struct tf_context tfContext; +} tfContext; #endif /* FREERDP_CLIENT_SAMPLE_H */ diff --git a/client/Wayland/wlf_disp.c b/client/Wayland/wlf_disp.c index 2203156e8..0228c1125 100644 --- a/client/Wayland/wlf_disp.c +++ b/client/Wayland/wlf_disp.c @@ -26,7 +26,7 @@ #define RESIZE_MIN_DELAY 200 /* minimum delay in ms between two resizes */ -struct _wlfDispContext +struct s_wlfDispContext { wlfContext* wlc; DispClientContext* disp; diff --git a/client/Wayland/wlf_pointer.c b/client/Wayland/wlf_pointer.c index 95a4f4187..adb651927 100644 --- a/client/Wayland/wlf_pointer.c +++ b/client/Wayland/wlf_pointer.c @@ -27,13 +27,12 @@ #define TAG CLIENT_TAG("wayland.pointer") -struct wlf_pointer +typedef struct { rdpPointer pointer; size_t size; void* data; -}; -typedef struct wlf_pointer wlfPointer; +} wlfPointer; static BOOL wlf_Pointer_New(rdpContext* context, rdpPointer* pointer) { diff --git a/client/Wayland/wlfreerdp.h b/client/Wayland/wlfreerdp.h index 7baac7a95..b46d7516a 100644 --- a/client/Wayland/wlfreerdp.h +++ b/client/Wayland/wlfreerdp.h @@ -28,13 +28,12 @@ #include #include -typedef struct wlf_context wlfContext; typedef struct wlf_clipboard wfClipboard; -typedef struct _wlfDispContext wlfDispContext; +typedef struct s_wlfDispContext wlfDispContext; #define MAX_CONTACTS 20 -typedef struct touch_contact +typedef struct { int id; double pos_x; @@ -42,7 +41,7 @@ typedef struct touch_contact BOOL emulate_mouse; } touchContact; -struct wlf_context +typedef struct { rdpContext context; @@ -66,7 +65,7 @@ struct wlf_context wArrayList* events; touchContact contacts[MAX_CONTACTS]; -}; +} wlfContext; BOOL wlf_scale_coordinates(rdpContext* context, UINT32* px, UINT32* py, BOOL fromLocalToRDP); BOOL wlf_copy_image(const void* src, size_t srcStride, size_t srcWidth, size_t srcHeight, void* dst, diff --git a/client/Windows/wf_client.h b/client/Windows/wf_client.h index da81cf612..49f9c1a0b 100644 --- a/client/Windows/wf_client.h +++ b/client/Windows/wf_client.h @@ -44,8 +44,6 @@ #include #include -typedef struct wf_context wfContext; - #include "wf_channels.h" #include "wf_floatbar.h" #include "wf_event.h" @@ -59,22 +57,20 @@ extern "C" // System menu constants #define SYSCOMMAND_ID_SMARTSIZING 1000 - struct wf_bitmap + typedef struct { rdpBitmap _bitmap; HDC hdc; HBITMAP bitmap; HBITMAP org_bitmap; BYTE* pdata; - }; - typedef struct wf_bitmap wfBitmap; + } wfBitmap; - struct wf_pointer + typedef struct { rdpPointer pointer; HCURSOR cursor; - }; - typedef struct wf_pointer wfPointer; + } wfPointer; struct wf_context { diff --git a/client/Windows/wf_cliprdr.c b/client/Windows/wf_cliprdr.c index a8a43c86d..e3bc92a55 100644 --- a/client/Windows/wf_cliprdr.c +++ b/client/Windows/wf_cliprdr.c @@ -61,15 +61,14 @@ typedef BOOL(WINAPI* fnRemoveClipboardFormatListener)(HWND hwnd); typedef BOOL(WINAPI* fnGetUpdatedClipboardFormats)(PUINT lpuiFormats, UINT cFormats, PUINT pcFormatsOut); -struct format_mapping +typedef struct { UINT32 remote_format_id; UINT32 local_format_id; WCHAR* name; -}; -typedef struct format_mapping formatMapping; +} formatMapping; -struct _CliprdrEnumFORMATETC +typedef struct { IEnumFORMATETC iEnumFORMATETC; @@ -77,10 +76,9 @@ struct _CliprdrEnumFORMATETC LONG m_nIndex; LONG m_nNumFormats; FORMATETC* m_pFormatEtc; -}; -typedef struct _CliprdrEnumFORMATETC CliprdrEnumFORMATETC; +} CliprdrEnumFORMATETC; -struct _CliprdrStream +typedef struct { IStream iStream; @@ -90,10 +88,9 @@ struct _CliprdrStream ULARGE_INTEGER m_lOffset; FILEDESCRIPTORW m_Dsc; void* m_pData; -}; -typedef struct _CliprdrStream CliprdrStream; +} CliprdrStream; -struct _CliprdrDataObject +typedef struct { IDataObject iDataObject; @@ -104,10 +101,9 @@ struct _CliprdrDataObject ULONG m_nStreams; IStream** m_pStream; void* m_pData; -}; -typedef struct _CliprdrDataObject CliprdrDataObject; +} CliprdrDataObject; -struct wf_clipboard +typedef struct { wfContext* wfc; rdpChannels* channels; @@ -143,8 +139,7 @@ struct wf_clipboard fnAddClipboardFormatListener AddClipboardFormatListener; fnRemoveClipboardFormatListener RemoveClipboardFormatListener; fnGetUpdatedClipboardFormats GetUpdatedClipboardFormats; -}; -typedef struct wf_clipboard wfClipboard; +} wfClipboard; #define WM_CLIPRDR_MESSAGE (WM_USER + 156) #define OLE_SETCLIPBOARD 1 diff --git a/client/Windows/wf_floatbar.c b/client/Windows/wf_floatbar.c index cb84b626f..da19f0228 100644 --- a/client/Windows/wf_floatbar.c +++ b/client/Windows/wf_floatbar.c @@ -31,8 +31,6 @@ #define TAG CLIENT_TAG("windows.floatbar") -typedef struct _Button Button; - /* TIMERs */ #define TIMER_HIDE 1 #define TIMER_ANIMAT_SHOW 2 @@ -60,7 +58,7 @@ typedef struct _Button Button; #define MINIMIZE_X (RESTORE_X - (BUTTON_WIDTH + BUTTON_SPACING)) #define TEXT_X (BACKGROUND_H + ((BUTTON_WIDTH + BUTTON_SPACING) * 3) + 5) -struct _Button +typedef struct { wfFloatBar* floatbar; int type; @@ -74,9 +72,9 @@ struct _Button HBITMAP locked_bmp_act; HBITMAP unlocked_bmp; HBITMAP unlocked_bmp_act; -}; +} Button; -struct _FloatBar +struct s_FloatBar { HINSTANCE root_window; DWORD flags; diff --git a/client/Windows/wf_floatbar.h b/client/Windows/wf_floatbar.h index 2636abab1..761eeb2a9 100644 --- a/client/Windows/wf_floatbar.h +++ b/client/Windows/wf_floatbar.h @@ -22,7 +22,7 @@ #include -typedef struct _FloatBar wfFloatBar; +typedef struct s_FloatBar wfFloatBar; typedef struct wf_context wfContext; wfFloatBar* wf_floatbar_new(wfContext* wfc, HINSTANCE window, DWORD flags); diff --git a/client/Windows/wf_rail.c b/client/Windows/wf_rail.c index 8ac62dac2..5f2a279c5 100644 --- a/client/Windows/wf_rail.c +++ b/client/Windows/wf_rail.c @@ -50,13 +50,12 @@ struct wf_rail_window /* RemoteApp Core Protocol Extension */ -struct _WINDOW_STYLE +typedef struct { UINT32 style; const char* name; BOOL multi; -}; -typedef struct _WINDOW_STYLE WINDOW_STYLE; +} WINDOW_STYLE; static const WINDOW_STYLE WINDOW_STYLES[] = { { WS_BORDER, "WS_BORDER", FALSE }, { WS_CAPTION, "WS_CAPTION", FALSE }, diff --git a/client/X11/xf_cliprdr.c b/client/X11/xf_cliprdr.c index 7f5d281ab..0a69022bf 100644 --- a/client/X11/xf_cliprdr.c +++ b/client/X11/xf_cliprdr.c @@ -64,16 +64,15 @@ #define MAX_CLIPBOARD_FORMATS 255 #define WIN32_FILETIME_TO_UNIX_EPOCH_USEC UINT64_C(116444736000000000) -struct xf_cliprdr_format +typedef struct { Atom atom; UINT32 formatId; char* formatName; -}; -typedef struct xf_cliprdr_format xfCliprdrFormat; +} xfCliprdrFormat; #ifdef WITH_FUSE -struct xf_cliprdr_fuse_stream +typedef struct { UINT32 stream_id; /* must be one of FILECONTENTS_SIZE or FILECONTENTS_RANGE*/ @@ -81,10 +80,9 @@ struct xf_cliprdr_fuse_stream fuse_req_t req; /*for FILECONTENTS_SIZE must be ino number* */ size_t req_ino; -}; -typedef struct xf_cliprdr_fuse_stream xfCliprdrFuseStream; +} xfCliprdrFuseStream; -struct xf_cliprdr_fuse_inode +typedef struct { size_t parent_ino; size_t ino; @@ -95,8 +93,7 @@ struct xf_cliprdr_fuse_inode struct timespec st_mtim; char* name; wArrayList* child_inos; -}; -typedef struct xf_cliprdr_fuse_inode xfCliprdrFuseInode; +} xfCliprdrFuseInode; static void xf_cliprdr_fuse_inode_free(void* obj) { diff --git a/client/X11/xf_disp.c b/client/X11/xf_disp.c index 1feb26f91..7cef1300c 100644 --- a/client/X11/xf_disp.c +++ b/client/X11/xf_disp.c @@ -36,7 +36,7 @@ #define TAG CLIENT_TAG("x11disp") #define RESIZE_MIN_DELAY 200 /* minimum delay in ms between two resizes */ -struct _xfDispContext +struct s_xfDispContext { xfContext* xfc; DispClientContext* disp; diff --git a/client/X11/xf_floatbar.c b/client/X11/xf_floatbar.c index d8445538c..c33f3e992 100644 --- a/client/X11/xf_floatbar.c +++ b/client/X11/xf_floatbar.c @@ -60,7 +60,16 @@ typedef BOOL (*OnClick)(xfFloatbar*); -typedef struct xf_floatbar_button xfFloatbarButton; +typedef struct +{ + int x; + int y; + int type; + bool focus; + bool clicked; + OnClick onclick; + Window handle; +} xfFloatbarButton; struct xf_floatbar { @@ -82,17 +91,6 @@ struct xf_floatbar char* title; }; -struct xf_floatbar_button -{ - int x; - int y; - int type; - bool focus; - bool clicked; - OnClick onclick; - Window handle; -}; - static xfFloatbarButton* xf_floatbar_new_button(xfFloatbar* floatbar, int type); static BOOL xf_floatbar_button_onclick_close(xfFloatbar* floatbar) diff --git a/client/X11/xf_keyboard.h b/client/X11/xf_keyboard.h index 36b921b45..2fcfc8515 100644 --- a/client/X11/xf_keyboard.h +++ b/client/X11/xf_keyboard.h @@ -25,7 +25,7 @@ #include "xf_client.h" #include "xfreerdp.h" -struct _XF_MODIFIER_KEYS +typedef struct { BOOL Shift; BOOL LeftShift; @@ -39,8 +39,7 @@ struct _XF_MODIFIER_KEYS BOOL Super; BOOL LeftSuper; BOOL RightSuper; -}; -typedef struct _XF_MODIFIER_KEYS XF_MODIFIER_KEYS; +} XF_MODIFIER_KEYS; BOOL xf_keyboard_init(xfContext* xfc); void xf_keyboard_free(xfContext* xfc); diff --git a/client/X11/xf_monitor.h b/client/X11/xf_monitor.h index 2e3cd2f34..c27c88f67 100644 --- a/client/X11/xf_monitor.h +++ b/client/X11/xf_monitor.h @@ -23,22 +23,20 @@ #include #include -struct _MONITOR_INFO +typedef struct { RECTANGLE_16 area; RECTANGLE_16 workarea; BOOL primary; -}; -typedef struct _MONITOR_INFO MONITOR_INFO; +} MONITOR_INFO; -struct _VIRTUAL_SCREEN +typedef struct { int nmonitors; RECTANGLE_16 area; RECTANGLE_16 workarea; MONITOR_INFO* monitors; -}; -typedef struct _VIRTUAL_SCREEN VIRTUAL_SCREEN; +} VIRTUAL_SCREEN; #include "xf_client.h" #include "xfreerdp.h" diff --git a/client/X11/xf_window.c b/client/X11/xf_window.c index 5d48248d3..5b4103b1e 100644 --- a/client/X11/xf_window.c +++ b/client/X11/xf_window.c @@ -98,15 +98,14 @@ #define PROP_MOTIF_WM_HINTS_ELEMENTS 5 -struct _PropMotifWmHints +typedef struct { unsigned long flags; unsigned long functions; unsigned long decorations; long inputMode; unsigned long status; -}; -typedef struct _PropMotifWmHints PropMotifWmHints; +} PropMotifWmHints; static void xf_SetWindowTitleText(xfContext* xfc, Window window, const char* name) { diff --git a/client/X11/xfreerdp.h b/client/X11/xfreerdp.h index 1685857cf..29f885348 100644 --- a/client/X11/xfreerdp.h +++ b/client/X11/xfreerdp.h @@ -111,8 +111,8 @@ struct xf_glyph typedef struct xf_glyph xfGlyph; typedef struct xf_clipboard xfClipboard; -typedef struct _xfDispContext xfDispContext; -typedef struct _xfVideoContext xfVideoContext; +typedef struct s_xfDispContext xfDispContext; +typedef struct s_xfVideoContext xfVideoContext; typedef struct xf_rail_icon_cache xfRailIconCache; /* Number of buttons that are mapped from X11 to RDP button events. */ diff --git a/client/iOS/Misc/TSXTypes.h b/client/iOS/Misc/TSXTypes.h index 51c52c1fa..1938aef1a 100644 --- a/client/iOS/Misc/TSXTypes.h +++ b/client/iOS/Misc/TSXTypes.h @@ -14,7 +14,7 @@ #pragma mark Internal state // Represents the underlying state of a TWSession RDP connection. -typedef enum _TSXConnectionState +typedef enum { TSXConnectionClosed = 0, // Session either hasn't begun connecting, or its connection has finished disconnecting. @@ -32,21 +32,21 @@ typedef enum _TSXConnectionState // Represents the type of screen resolution the user has selected. Most are dynamic sizes, meaning // that the actual session dimensions are calculated when connecting. -typedef enum _TSXScreenOptions +typedef enum { TSXScreenOptionFixed = 0, // A static resolution, like 1024x768 TSXScreenOptionFitScreen = 1, // Upon connection, fit the session to the entire screen size TSXScreenOptionCustom = 2, // Like fixed just specified by the user } TSXScreenOptions; -typedef enum _TSXAudioPlaybackOptions +typedef enum { TSXAudioPlaybackLocal = 0, TSXAudioPlaybackServer = 1, TSXAudioPlaybackSilent = 2 } TSXAudioPlaybackOptions; -typedef enum _TSXProtocolSecurityOptions +typedef enum { TSXProtocolSecurityAutomatic = 0, TSXProtocolSecurityRDP = 1, diff --git a/include/freerdp/addin.h b/include/freerdp/addin.h index 2249e8f57..8c53a9744 100644 --- a/include/freerdp/addin.h +++ b/include/freerdp/addin.h @@ -38,14 +38,13 @@ #define FREERDP_ADDIN_CHANNEL_DEVICE 0x00004000 #define FREERDP_ADDIN_CHANNEL_ENTRYEX 0x00008000 -struct _FREERDP_ADDIN +typedef struct { DWORD dwFlags; CHAR cName[16]; CHAR cType[16]; CHAR cSubsystem[16]; -}; -typedef struct _FREERDP_ADDIN FREERDP_ADDIN; +} FREERDP_ADDIN; typedef PVIRTUALCHANNELENTRY (*FREERDP_LOAD_CHANNEL_ADDIN_ENTRY_FN)(LPCSTR pszName, LPCSTR pszSubsystem, diff --git a/include/freerdp/altsec.h b/include/freerdp/altsec.h index 94974af68..2445e88e5 100644 --- a/include/freerdp/altsec.h +++ b/include/freerdp/altsec.h @@ -36,30 +36,27 @@ #define STREAM_BITMAP_COMPRESSED 0x02 #define STREAM_BITMAP_V2 0x04 -struct _OFFSCREEN_DELETE_LIST +typedef struct { UINT32 sIndices; UINT32 cIndices; UINT16* indices; -}; -typedef struct _OFFSCREEN_DELETE_LIST OFFSCREEN_DELETE_LIST; +} OFFSCREEN_DELETE_LIST; -struct _CREATE_OFFSCREEN_BITMAP_ORDER +typedef struct { UINT32 id; UINT32 cx; UINT32 cy; OFFSCREEN_DELETE_LIST deleteList; -}; -typedef struct _CREATE_OFFSCREEN_BITMAP_ORDER CREATE_OFFSCREEN_BITMAP_ORDER; +} CREATE_OFFSCREEN_BITMAP_ORDER; -struct _SWITCH_SURFACE_ORDER +typedef struct { UINT32 bitmapId; -}; -typedef struct _SWITCH_SURFACE_ORDER SWITCH_SURFACE_ORDER; +} SWITCH_SURFACE_ORDER; -struct _NINE_GRID_BITMAP_INFO +typedef struct { UINT32 flFlags; UINT32 ulLeftWidth; @@ -67,26 +64,23 @@ struct _NINE_GRID_BITMAP_INFO UINT32 ulTopHeight; UINT32 ulBottomHeight; UINT32 crTransparent; -}; -typedef struct _NINE_GRID_BITMAP_INFO NINE_GRID_BITMAP_INFO; +} NINE_GRID_BITMAP_INFO; -struct _CREATE_NINE_GRID_BITMAP_ORDER +typedef struct { UINT32 bitmapBpp; UINT32 bitmapId; UINT32 cx; UINT32 cy; NINE_GRID_BITMAP_INFO nineGridInfo; -}; -typedef struct _CREATE_NINE_GRID_BITMAP_ORDER CREATE_NINE_GRID_BITMAP_ORDER; +} CREATE_NINE_GRID_BITMAP_ORDER; -struct _FRAME_MARKER_ORDER +typedef struct { UINT32 action; -}; -typedef struct _FRAME_MARKER_ORDER FRAME_MARKER_ORDER; +} FRAME_MARKER_ORDER; -struct _STREAM_BITMAP_FIRST_ORDER +typedef struct { UINT32 bitmapFlags; UINT32 bitmapBpp; @@ -96,44 +90,39 @@ struct _STREAM_BITMAP_FIRST_ORDER UINT32 bitmapSize; UINT32 bitmapBlockSize; BYTE* bitmapBlock; -}; -typedef struct _STREAM_BITMAP_FIRST_ORDER STREAM_BITMAP_FIRST_ORDER; +} STREAM_BITMAP_FIRST_ORDER; -struct _STREAM_BITMAP_NEXT_ORDER +typedef struct { UINT32 bitmapFlags; UINT32 bitmapType; UINT32 bitmapBlockSize; BYTE* bitmapBlock; -}; -typedef struct _STREAM_BITMAP_NEXT_ORDER STREAM_BITMAP_NEXT_ORDER; +} STREAM_BITMAP_NEXT_ORDER; -struct _DRAW_GDIPLUS_FIRST_ORDER +typedef struct { UINT32 cbSize; UINT32 cbTotalSize; UINT32 cbTotalEmfSize; BYTE* emfRecords; -}; -typedef struct _DRAW_GDIPLUS_FIRST_ORDER DRAW_GDIPLUS_FIRST_ORDER; +} DRAW_GDIPLUS_FIRST_ORDER; -struct _DRAW_GDIPLUS_NEXT_ORDER +typedef struct { UINT32 cbSize; BYTE* emfRecords; -}; -typedef struct _DRAW_GDIPLUS_NEXT_ORDER DRAW_GDIPLUS_NEXT_ORDER; +} DRAW_GDIPLUS_NEXT_ORDER; -struct _DRAW_GDIPLUS_END_ORDER +typedef struct { UINT32 cbSize; UINT32 cbTotalSize; UINT32 cbTotalEmfSize; BYTE* emfRecords; -}; -typedef struct _DRAW_GDIPLUS_END_ORDER DRAW_GDIPLUS_END_ORDER; +} DRAW_GDIPLUS_END_ORDER; -struct _DRAW_GDIPLUS_CACHE_FIRST_ORDER +typedef struct { UINT32 flags; UINT32 cacheType; @@ -141,20 +130,18 @@ struct _DRAW_GDIPLUS_CACHE_FIRST_ORDER UINT32 cbSize; UINT32 cbTotalSize; BYTE* emfRecords; -}; -typedef struct _DRAW_GDIPLUS_CACHE_FIRST_ORDER DRAW_GDIPLUS_CACHE_FIRST_ORDER; +} DRAW_GDIPLUS_CACHE_FIRST_ORDER; -struct _DRAW_GDIPLUS_CACHE_NEXT_ORDER +typedef struct { UINT32 flags; UINT32 cacheType; UINT32 cacheIndex; UINT32 cbSize; BYTE* emfRecords; -}; -typedef struct _DRAW_GDIPLUS_CACHE_NEXT_ORDER DRAW_GDIPLUS_CACHE_NEXT_ORDER; +} DRAW_GDIPLUS_CACHE_NEXT_ORDER; -struct _DRAW_GDIPLUS_CACHE_END_ORDER +typedef struct { UINT32 flags; UINT32 cacheType; @@ -162,8 +149,7 @@ struct _DRAW_GDIPLUS_CACHE_END_ORDER UINT32 cbSize; UINT32 cbTotalSize; BYTE* emfRecords; -}; -typedef struct _DRAW_GDIPLUS_CACHE_END_ORDER DRAW_GDIPLUS_CACHE_END_ORDER; +} DRAW_GDIPLUS_CACHE_END_ORDER; typedef BOOL (*pCreateOffscreenBitmap)( rdpContext* context, const CREATE_OFFSCREEN_BITMAP_ORDER* create_offscreen_bitmap); diff --git a/include/freerdp/cache/bitmap.h b/include/freerdp/cache/bitmap.h index ee922c87b..d2be4330a 100644 --- a/include/freerdp/cache/bitmap.h +++ b/include/freerdp/cache/bitmap.h @@ -27,18 +27,13 @@ #include -typedef struct _BITMAP_V2_CELL BITMAP_V2_CELL; -typedef struct rdp_bitmap_cache rdpBitmapCache; - -#include - -struct _BITMAP_V2_CELL +typedef struct { UINT32 number; rdpBitmap** entries; -}; +} BITMAP_V2_CELL; -struct rdp_bitmap_cache +typedef struct { pMemBlt MemBlt; /* 0 */ pMem3Blt Mem3Blt; /* 1 */ @@ -54,7 +49,7 @@ struct rdp_bitmap_cache /* internal */ rdpContext* context; -}; +} rdpBitmapCache; #ifdef __cplusplus extern "C" diff --git a/include/freerdp/cache/glyph.h b/include/freerdp/cache/glyph.h index 2b1ce57ec..1f508aaa7 100644 --- a/include/freerdp/cache/glyph.h +++ b/include/freerdp/cache/glyph.h @@ -27,39 +27,32 @@ #include #include -typedef struct _GLYPH_CACHE GLYPH_CACHE; -typedef struct _FRAGMENT_CACHE_ENTRY FRAGMENT_CACHE_ENTRY; -typedef struct _FRAGMENT_CACHE FRAGMENT_CACHE; -typedef struct rdp_glyph_cache rdpGlyphCache; - -#include - -struct _GLYPH_CACHE +typedef struct { UINT32 number; UINT32 maxCellSize; rdpGlyph** entries; -}; +} GLYPH_CACHE; -struct _FRAGMENT_CACHE_ENTRY +typedef struct { void* fragment; UINT32 size; -}; +} FRAGMENT_CACHE_ENTRY; -struct _FRAGMENT_CACHE +typedef struct { FRAGMENT_CACHE_ENTRY* entries; -}; +} FRAGMENT_CACHE; -struct rdp_glyph_cache +typedef struct { FRAGMENT_CACHE fragCache; GLYPH_CACHE glyphCache[10]; wLog* log; rdpContext* context; -}; +} rdpGlyphCache; #ifdef __cplusplus extern "C" diff --git a/include/freerdp/cache/palette.h b/include/freerdp/cache/palette.h index a561b5ae5..482a9d860 100644 --- a/include/freerdp/cache/palette.h +++ b/include/freerdp/cache/palette.h @@ -27,15 +27,14 @@ #include -typedef struct _PALETTE_TABLE_ENTRY PALETTE_TABLE_ENTRY; typedef struct rdp_palette_cache rdpPaletteCache; #include -struct _PALETTE_TABLE_ENTRY +typedef struct { void* entry; -}; +} PALETTE_TABLE_ENTRY; struct rdp_palette_cache { diff --git a/include/freerdp/channels/cliprdr.h b/include/freerdp/channels/cliprdr.h index d36cfe092..8726033ad 100644 --- a/include/freerdp/channels/cliprdr.h +++ b/include/freerdp/channels/cliprdr.h @@ -80,15 +80,14 @@ /* Special Clipboard Response Formats */ -struct _CLIPRDR_MFPICT +typedef struct { UINT32 mappingMode; UINT32 xExt; UINT32 yExt; UINT32 metaFileSize; BYTE* metaFileData; -}; -typedef struct _CLIPRDR_MFPICT CLIPRDR_MFPICT; +} CLIPRDR_MFPICT; #ifdef __cplusplus extern "C" @@ -117,107 +116,94 @@ extern "C" UINT16 msgFlags; \ UINT32 dataLen -struct _CLIPRDR_HEADER +typedef struct { DEFINE_CLIPRDR_HEADER_COMMON(); -}; -typedef struct _CLIPRDR_HEADER CLIPRDR_HEADER; +} CLIPRDR_HEADER; -struct _CLIPRDR_CAPABILITY_SET +typedef struct { UINT16 capabilitySetType; UINT16 capabilitySetLength; -}; -typedef struct _CLIPRDR_CAPABILITY_SET CLIPRDR_CAPABILITY_SET; +} CLIPRDR_CAPABILITY_SET; -struct _CLIPRDR_GENERAL_CAPABILITY_SET +typedef struct { UINT16 capabilitySetType; UINT16 capabilitySetLength; UINT32 version; UINT32 generalFlags; -}; -typedef struct _CLIPRDR_GENERAL_CAPABILITY_SET CLIPRDR_GENERAL_CAPABILITY_SET; +} CLIPRDR_GENERAL_CAPABILITY_SET; -struct _CLIPRDR_CAPABILITIES +typedef struct { DEFINE_CLIPRDR_HEADER_COMMON(); UINT32 cCapabilitiesSets; CLIPRDR_CAPABILITY_SET* capabilitySets; -}; -typedef struct _CLIPRDR_CAPABILITIES CLIPRDR_CAPABILITIES; +} CLIPRDR_CAPABILITIES; -struct _CLIPRDR_MONITOR_READY +typedef struct { DEFINE_CLIPRDR_HEADER_COMMON(); -}; -typedef struct _CLIPRDR_MONITOR_READY CLIPRDR_MONITOR_READY; +} CLIPRDR_MONITOR_READY; -struct _CLIPRDR_TEMP_DIRECTORY +typedef struct { DEFINE_CLIPRDR_HEADER_COMMON(); char szTempDir[520]; -}; -typedef struct _CLIPRDR_TEMP_DIRECTORY CLIPRDR_TEMP_DIRECTORY; +} CLIPRDR_TEMP_DIRECTORY; -struct _CLIPRDR_FORMAT +typedef struct { UINT32 formatId; char* formatName; -}; -typedef struct _CLIPRDR_FORMAT CLIPRDR_FORMAT; +} CLIPRDR_FORMAT; -struct _CLIPRDR_FORMAT_LIST +typedef struct { DEFINE_CLIPRDR_HEADER_COMMON(); UINT32 numFormats; CLIPRDR_FORMAT* formats; -}; -typedef struct _CLIPRDR_FORMAT_LIST CLIPRDR_FORMAT_LIST; +} CLIPRDR_FORMAT_LIST; -struct _CLIPRDR_FORMAT_LIST_RESPONSE +typedef struct { DEFINE_CLIPRDR_HEADER_COMMON(); -}; -typedef struct _CLIPRDR_FORMAT_LIST_RESPONSE CLIPRDR_FORMAT_LIST_RESPONSE; +} CLIPRDR_FORMAT_LIST_RESPONSE; -struct _CLIPRDR_LOCK_CLIPBOARD_DATA +typedef struct { DEFINE_CLIPRDR_HEADER_COMMON(); UINT32 clipDataId; -}; -typedef struct _CLIPRDR_LOCK_CLIPBOARD_DATA CLIPRDR_LOCK_CLIPBOARD_DATA; +} CLIPRDR_LOCK_CLIPBOARD_DATA; -struct _CLIPRDR_UNLOCK_CLIPBOARD_DATA +typedef struct { DEFINE_CLIPRDR_HEADER_COMMON(); UINT32 clipDataId; -}; -typedef struct _CLIPRDR_UNLOCK_CLIPBOARD_DATA CLIPRDR_UNLOCK_CLIPBOARD_DATA; +} CLIPRDR_UNLOCK_CLIPBOARD_DATA; -struct _CLIPRDR_FORMAT_DATA_REQUEST +typedef struct { DEFINE_CLIPRDR_HEADER_COMMON(); UINT32 requestedFormatId; -}; -typedef struct _CLIPRDR_FORMAT_DATA_REQUEST CLIPRDR_FORMAT_DATA_REQUEST; +} CLIPRDR_FORMAT_DATA_REQUEST; -struct _CLIPRDR_FORMAT_DATA_RESPONSE +typedef struct { DEFINE_CLIPRDR_HEADER_COMMON(); const BYTE* requestedFormatData; -}; -typedef struct _CLIPRDR_FORMAT_DATA_RESPONSE CLIPRDR_FORMAT_DATA_RESPONSE; +} CLIPRDR_FORMAT_DATA_RESPONSE; -struct _CLIPRDR_FILE_CONTENTS_REQUEST +typedef struct { DEFINE_CLIPRDR_HEADER_COMMON(); @@ -229,17 +215,15 @@ struct _CLIPRDR_FILE_CONTENTS_REQUEST UINT32 cbRequested; BOOL haveClipDataId; UINT32 clipDataId; -}; -typedef struct _CLIPRDR_FILE_CONTENTS_REQUEST CLIPRDR_FILE_CONTENTS_REQUEST; +} CLIPRDR_FILE_CONTENTS_REQUEST; -struct _CLIPRDR_FILE_CONTENTS_RESPONSE +typedef struct { DEFINE_CLIPRDR_HEADER_COMMON(); UINT32 streamId; UINT32 cbRequested; const BYTE* requestedData; -}; -typedef struct _CLIPRDR_FILE_CONTENTS_RESPONSE CLIPRDR_FILE_CONTENTS_RESPONSE; +} CLIPRDR_FILE_CONTENTS_RESPONSE; #endif /* FREERDP_CHANNEL_CLIPRDR_H */ diff --git a/include/freerdp/channels/disp.h b/include/freerdp/channels/disp.h index 427e64e1b..61d85ea47 100644 --- a/include/freerdp/channels/disp.h +++ b/include/freerdp/channels/disp.h @@ -48,14 +48,13 @@ #define DISPLAY_CONTROL_MIN_PHYSICAL_MONITOR_HEIGHT 10 #define DISPLAY_CONTROL_MAX_PHYSICAL_MONITOR_HEIGHT 10000 -struct _DISPLAY_CONTROL_HEADER +typedef struct { UINT32 type; UINT32 length; -}; -typedef struct _DISPLAY_CONTROL_HEADER DISPLAY_CONTROL_HEADER; +} DISPLAY_CONTROL_HEADER; -struct _DISPLAY_CONTROL_MONITOR_LAYOUT +typedef struct { UINT32 Flags; INT32 Left; @@ -67,16 +66,13 @@ struct _DISPLAY_CONTROL_MONITOR_LAYOUT UINT32 Orientation; UINT32 DesktopScaleFactor; UINT32 DeviceScaleFactor; -}; -typedef struct _DISPLAY_CONTROL_MONITOR_LAYOUT DISPLAY_CONTROL_MONITOR_LAYOUT; +} DISPLAY_CONTROL_MONITOR_LAYOUT; -struct _DISPLAY_CONTROL_MONITOR_LAYOUT_PDU +typedef struct { UINT32 MonitorLayoutSize; UINT32 NumMonitors; DISPLAY_CONTROL_MONITOR_LAYOUT* Monitors; -}; - -typedef struct _DISPLAY_CONTROL_MONITOR_LAYOUT_PDU DISPLAY_CONTROL_MONITOR_LAYOUT_PDU; +} DISPLAY_CONTROL_MONITOR_LAYOUT_PDU; #endif /* FREERDP_CHANNEL_DISP_H */ diff --git a/include/freerdp/channels/encomsp.h b/include/freerdp/channels/encomsp.h index e3a29974b..97bf7179d 100644 --- a/include/freerdp/channels/encomsp.h +++ b/include/freerdp/channels/encomsp.h @@ -25,12 +25,11 @@ #define ENCOMSP_SVC_CHANNEL_NAME "encomsp" -struct _ENCOMSP_UNICODE_STRING +typedef struct { UINT16 cchString; WCHAR wString[1024]; -}; -typedef struct _ENCOMSP_UNICODE_STRING ENCOMSP_UNICODE_STRING; +} ENCOMSP_UNICODE_STRING; /* Filter Updated PDU Flags */ @@ -81,39 +80,35 @@ typedef struct _ENCOMSP_UNICODE_STRING ENCOMSP_UNICODE_STRING; #define ENCOMSP_ORDER_HEADER_SIZE 4 -struct _ENCOMSP_ORDER_HEADER +typedef struct { DEFINE_ENCOMSP_HEADER_COMMON(); -}; -typedef struct _ENCOMSP_ORDER_HEADER ENCOMSP_ORDER_HEADER; +} ENCOMSP_ORDER_HEADER; -struct _ENCOMSP_FILTER_UPDATED_PDU +typedef struct { DEFINE_ENCOMSP_HEADER_COMMON(); BYTE Flags; -}; -typedef struct _ENCOMSP_FILTER_UPDATED_PDU ENCOMSP_FILTER_UPDATED_PDU; +} ENCOMSP_FILTER_UPDATED_PDU; -struct _ENCOMSP_APPLICATION_CREATED_PDU +typedef struct { DEFINE_ENCOMSP_HEADER_COMMON(); UINT16 Flags; UINT32 AppId; ENCOMSP_UNICODE_STRING Name; -}; -typedef struct _ENCOMSP_APPLICATION_CREATED_PDU ENCOMSP_APPLICATION_CREATED_PDU; +} ENCOMSP_APPLICATION_CREATED_PDU; -struct _ENCOMSP_APPLICATION_REMOVED_PDU +typedef struct { DEFINE_ENCOMSP_HEADER_COMMON(); UINT32 AppId; -}; -typedef struct _ENCOMSP_APPLICATION_REMOVED_PDU ENCOMSP_APPLICATION_REMOVED_PDU; +} ENCOMSP_APPLICATION_REMOVED_PDU; -struct _ENCOMSP_WINDOW_CREATED_PDU +typedef struct { DEFINE_ENCOMSP_HEADER_COMMON(); @@ -121,26 +116,23 @@ struct _ENCOMSP_WINDOW_CREATED_PDU UINT32 AppId; UINT32 WndId; ENCOMSP_UNICODE_STRING Name; -}; -typedef struct _ENCOMSP_WINDOW_CREATED_PDU ENCOMSP_WINDOW_CREATED_PDU; +} ENCOMSP_WINDOW_CREATED_PDU; -struct _ENCOMSP_WINDOW_REMOVED_PDU +typedef struct { DEFINE_ENCOMSP_HEADER_COMMON(); UINT32 WndId; -}; -typedef struct _ENCOMSP_WINDOW_REMOVED_PDU ENCOMSP_WINDOW_REMOVED_PDU; +} ENCOMSP_WINDOW_REMOVED_PDU; -struct _ENCOMSP_SHOW_WINDOW_PDU +typedef struct { DEFINE_ENCOMSP_HEADER_COMMON(); UINT32 WndId; -}; -typedef struct _ENCOMSP_SHOW_WINDOW_PDU ENCOMSP_SHOW_WINDOW_PDU; +} ENCOMSP_SHOW_WINDOW_PDU; -struct _ENCOMSP_PARTICIPANT_CREATED_PDU +typedef struct { DEFINE_ENCOMSP_HEADER_COMMON(); @@ -148,39 +140,33 @@ struct _ENCOMSP_PARTICIPANT_CREATED_PDU UINT32 GroupId; UINT16 Flags; ENCOMSP_UNICODE_STRING FriendlyName; -}; -typedef struct _ENCOMSP_PARTICIPANT_CREATED_PDU ENCOMSP_PARTICIPANT_CREATED_PDU; +} ENCOMSP_PARTICIPANT_CREATED_PDU; -struct _ENCOMSP_PARTICIPANT_REMOVED_PDU +typedef struct { DEFINE_ENCOMSP_HEADER_COMMON(); UINT32 ParticipantId; UINT32 DiscType; UINT32 DiscCode; -}; -typedef struct _ENCOMSP_PARTICIPANT_REMOVED_PDU ENCOMSP_PARTICIPANT_REMOVED_PDU; +} ENCOMSP_PARTICIPANT_REMOVED_PDU; -struct _ENCOMSP_CHANGE_PARTICIPANT_CONTROL_LEVEL_PDU +typedef struct { DEFINE_ENCOMSP_HEADER_COMMON(); UINT16 Flags; UINT32 ParticipantId; -}; -typedef struct _ENCOMSP_CHANGE_PARTICIPANT_CONTROL_LEVEL_PDU - ENCOMSP_CHANGE_PARTICIPANT_CONTROL_LEVEL_PDU; +} ENCOMSP_CHANGE_PARTICIPANT_CONTROL_LEVEL_PDU; -struct _ENCOMSP_GRAPHICS_STREAM_PAUSED_PDU +typedef struct { DEFINE_ENCOMSP_HEADER_COMMON(); -}; -typedef struct _ENCOMSP_GRAPHICS_STREAM_PAUSED_PDU ENCOMSP_GRAPHICS_STREAM_PAUSED_PDU; +} ENCOMSP_GRAPHICS_STREAM_PAUSED_PDU; -struct _ENCOMSP_GRAPHICS_STREAM_RESUMED_PDU +typedef struct { DEFINE_ENCOMSP_HEADER_COMMON(); -}; -typedef struct _ENCOMSP_GRAPHICS_STREAM_RESUMED_PDU ENCOMSP_GRAPHICS_STREAM_RESUMED_PDU; +} ENCOMSP_GRAPHICS_STREAM_RESUMED_PDU; #endif /* FREERDP_CHANNEL_ENCOMSP_H */ diff --git a/include/freerdp/channels/geometry.h b/include/freerdp/channels/geometry.h index 31b842a22..51a45f4b4 100644 --- a/include/freerdp/channels/geometry.h +++ b/include/freerdp/channels/geometry.h @@ -36,16 +36,14 @@ enum RDH_RECTANGLE = 1 }; -struct _FREERDP_RGNDATA +typedef struct { RDP_RECT boundingRect; UINT32 nRectCount; RDP_RECT* rects; -}; +} FREERDP_RGNDATA; -typedef struct _FREERDP_RGNDATA FREERDP_RGNDATA; - -struct _MAPPED_GEOMETRY_PACKET +typedef struct { UINT32 version; UINT64 mappingId; @@ -56,8 +54,6 @@ struct _MAPPED_GEOMETRY_PACKET UINT32 geometryType; FREERDP_RGNDATA geometry; -}; - -typedef struct _MAPPED_GEOMETRY_PACKET MAPPED_GEOMETRY_PACKET; +} MAPPED_GEOMETRY_PACKET; #endif /* FREERDP_CHANNEL_GEOMETRY_H */ diff --git a/include/freerdp/channels/gfxredir.h b/include/freerdp/channels/gfxredir.h index 5290f3945..a6164a58a 100644 --- a/include/freerdp/channels/gfxredir.h +++ b/include/freerdp/channels/gfxredir.h @@ -62,80 +62,62 @@ /* GFXREDIR_PRESENT_BUFFER_PDU.numOpaqueRects */ #define GFXREDIR_MAX_OPAQUE_RECTS 0x10 -struct _GFXREDIR_HEADER +typedef struct { UINT32 cmdId; UINT32 length; -}; +} GFXREDIR_HEADER; -typedef struct _GFXREDIR_HEADER GFXREDIR_HEADER; - -struct _GFXREDIR_LEGACY_CAPS_PDU +typedef struct { UINT16 version; // GFXREDIR_CHANNEL_VERSION_LEGACY -}; +} GFXREDIR_LEGACY_CAPS_PDU; -typedef struct _GFXREDIR_LEGACY_CAPS_PDU GFXREDIR_LEGACY_CAPS_PDU; - -struct _GFXREDIR_CAPS_HEADER +typedef struct { - UINT32 signature; // GFXREDIR_CAPS_SIGNATURE - UINT32 version; // GFXREDIR_CAPS_VERSION - UINT32 length; // GFXREDIR_CAPS_HEADER_SIZE + size of capsData -}; + UINT32 signature; // GFXREDIR_CAPS_SIGNATURE + UINT32 version; // GFXREDIR_CAPS_VERSION + UINT32 length; // GFXREDIR_CAPS_HEADER_SIZE + size of capsData +} GFXREDIR_CAPS_HEADER; -typedef struct _GFXREDIR_CAPS_HEADER GFXREDIR_CAPS_HEADER; - -struct _GFXREDIR_CAPS_V2_0_PDU +typedef struct { GFXREDIR_CAPS_HEADER header; UINT32 supportedFeatures; /* Reserved for future extensions */ -}; +} GFXREDIR_CAPS_V2_0_PDU; -typedef struct _GFXREDIR_CAPS_V2_0_PDU GFXREDIR_CAPS_V2_0_PDU; - -struct _GFXREDIR_ERROR_PDU +typedef struct { UINT32 errorCode; -}; +} GFXREDIR_ERROR_PDU; -typedef struct _GFXREDIR_ERROR_PDU GFXREDIR_ERROR_PDU; - -struct _GFXREDIR_CAPS_ADVERTISE_PDU +typedef struct { UINT32 length; // length of caps; const BYTE* caps; // points variable length array of GFXREDIR_CAPS_HEADER. -}; +} GFXREDIR_CAPS_ADVERTISE_PDU; -typedef struct _GFXREDIR_CAPS_ADVERTISE_PDU GFXREDIR_CAPS_ADVERTISE_PDU; - -struct _GFXREDIR_CAPS_CONFIRM_PDU +typedef struct { UINT32 version; // confirmed version, must be one of advertised by client. UINT32 length; // GFXREDIR_CAPS_HEADER_SIZE + size of capsData. const BYTE* capsData; // confirmed capsData from selected GFXREDIR_CAPS_HEADER.capsData. -}; +} GFXREDIR_CAPS_CONFIRM_PDU; -typedef struct _GFXREDIR_CAPS_CONFIRM_PDU GFXREDIR_CAPS_CONFIRM_PDU; - -struct _GFXREDIR_OPEN_POOL_PDU +typedef struct { UINT64 poolId; UINT64 poolSize; UINT32 sectionNameLength; // number of charactor, must include null terminated char. const unsigned short* sectionName; // Windows-style 2 bytes wchar_t with null-terminated. -}; +} GFXREDIR_OPEN_POOL_PDU; -typedef struct _GFXREDIR_OPEN_POOL_PDU GFXREDIR_OPEN_POOL_PDU; - -struct _GFXREDIR_CLOSE_POOL_PDU +typedef struct { UINT64 poolId; -}; +} GFXREDIR_CLOSE_POOL_PDU; -typedef struct _GFXREDIR_CLOSE_POOL_PDU GFXREDIR_CLOSE_POOL_PDU; - -struct _GFXREDIR_CREATE_BUFFER_PDU +typedef struct { UINT64 poolId; UINT64 bufferId; @@ -144,18 +126,14 @@ struct _GFXREDIR_CREATE_BUFFER_PDU UINT32 width; UINT32 height; UINT32 format; // GFXREDIR_BUFFER_PIXEL_FORMAT_ -}; +} GFXREDIR_CREATE_BUFFER_PDU; -typedef struct _GFXREDIR_CREATE_BUFFER_PDU GFXREDIR_CREATE_BUFFER_PDU; - -struct _GFXREDIR_DESTROY_BUFFER_PDU +typedef struct { UINT64 bufferId; -}; +} GFXREDIR_DESTROY_BUFFER_PDU; -typedef struct _GFXREDIR_DESTROY_BUFFER_PDU GFXREDIR_DESTROY_BUFFER_PDU; - -struct _GFXREDIR_PRESENT_BUFFER_PDU +typedef struct { UINT64 timestamp; UINT64 presentId; @@ -167,16 +145,12 @@ struct _GFXREDIR_PRESENT_BUFFER_PDU RECTANGLE_32 dirtyRect; UINT32 numOpaqueRects; RECTANGLE_32* opaqueRects; -}; +} GFXREDIR_PRESENT_BUFFER_PDU; -typedef struct _GFXREDIR_PRESENT_BUFFER_PDU GFXREDIR_PRESENT_BUFFER_PDU; - -struct _GFXREDIR_PRESENT_BUFFER_ACK_PDU +typedef struct { UINT64 windowId; UINT64 presentId; -}; - -typedef struct _GFXREDIR_PRESENT_BUFFER_ACK_PDU GFXREDIR_PRESENT_BUFFER_ACK_PDU; +} GFXREDIR_PRESENT_BUFFER_ACK_PDU; #endif /* FREERDP_CHANNEL_GFXREDIR_H */ diff --git a/include/freerdp/channels/rdpdr.h b/include/freerdp/channels/rdpdr.h index 0e77805f0..6a35eb7a3 100644 --- a/include/freerdp/channels/rdpdr.h +++ b/include/freerdp/channels/rdpdr.h @@ -310,9 +310,9 @@ enum FILE_FS_INFORMATION_CLASS }; #endif -typedef struct _DEVICE DEVICE; -typedef struct _IRP IRP; -typedef struct _DEVMAN DEVMAN; +typedef struct S_DEVICE DEVICE; +typedef struct S_IRP IRP; +typedef struct S_DEVMAN DEVMAN; typedef UINT (*pcCustomComponentRequest)(DEVICE* device, UINT16 component, UINT16 packetId, wStream* s); @@ -320,7 +320,7 @@ typedef UINT (*pcIRPRequest)(DEVICE* device, IRP* irp); typedef UINT (*pcInitDevice)(DEVICE* device); typedef UINT (*pcFreeDevice)(DEVICE* device); -struct _DEVICE +struct S_DEVICE { UINT32 id; @@ -336,7 +336,7 @@ struct _DEVICE typedef UINT (*pcIRPResponse)(IRP* irp); -struct _IRP +struct S_IRP { WINPR_SLIST_ENTRY ItemEntry; @@ -358,7 +358,7 @@ struct _IRP BOOL cancelled; }; -struct _DEVMAN +struct S_DEVMAN { void* plugin; UINT32 id_sequence; @@ -367,15 +367,14 @@ struct _DEVMAN typedef UINT (*pcRegisterDevice)(DEVMAN* devman, DEVICE* device); -struct _DEVICE_SERVICE_ENTRY_POINTS +typedef struct { DEVMAN* devman; pcRegisterDevice RegisterDevice; RDPDR_DEVICE* device; rdpContext* rdpcontext; -}; -typedef struct _DEVICE_SERVICE_ENTRY_POINTS DEVICE_SERVICE_ENTRY_POINTS; +} DEVICE_SERVICE_ENTRY_POINTS; typedef DEVICE_SERVICE_ENTRY_POINTS* PDEVICE_SERVICE_ENTRY_POINTS; typedef UINT (*PDEVICE_SERVICE_ENTRY)(PDEVICE_SERVICE_ENTRY_POINTS); diff --git a/include/freerdp/channels/rdpei.h b/include/freerdp/channels/rdpei.h index bbe18433b..acd53691d 100644 --- a/include/freerdp/channels/rdpei.h +++ b/include/freerdp/channels/rdpei.h @@ -91,7 +91,7 @@ typedef enum } RDPINPUT_PEN_FLAGS; /** @brief a contact point */ -struct _RDPINPUT_CONTACT_DATA +typedef struct { UINT32 contactId; UINT16 fieldsPresent; /* Mask of CONTACT_DATA_*_PRESENT values */ @@ -104,28 +104,25 @@ struct _RDPINPUT_CONTACT_DATA INT16 contactRectBottom; /* Present if CONTACT_DATA_CONTACTRECT_PRESENT */ UINT32 orientation; /* Present if CONTACT_DATA_ORIENTATION_PRESENT, values in degree, [0-359] */ UINT32 pressure; /* Present if CONTACT_DATA_PRESSURE_PRESENT, normalized value [0-1024] */ -}; -typedef struct _RDPINPUT_CONTACT_DATA RDPINPUT_CONTACT_DATA; +} RDPINPUT_CONTACT_DATA; /** @brief a frame containing contact points */ -struct _RDPINPUT_TOUCH_FRAME +typedef struct { UINT16 contactCount; UINT64 frameOffset; RDPINPUT_CONTACT_DATA* contacts; -}; -typedef struct _RDPINPUT_TOUCH_FRAME RDPINPUT_TOUCH_FRAME; +} RDPINPUT_TOUCH_FRAME; /** @brief a touch event with some frames*/ -struct _RDPINPUT_TOUCH_EVENT +typedef struct { UINT32 encodeTime; UINT16 frameCount; RDPINPUT_TOUCH_FRAME* frames; -}; -typedef struct _RDPINPUT_TOUCH_EVENT RDPINPUT_TOUCH_EVENT; +} RDPINPUT_TOUCH_EVENT; -struct _RDPINPUT_PEN_CONTACT +typedef struct { UINT8 deviceId; UINT16 fieldsPresent; /* Mask of RDPINPUT_PEN_FIELDS_PRESENT values */ @@ -139,23 +136,21 @@ struct _RDPINPUT_PEN_CONTACT pressure; /* Present if RDPINPUT_PEN_CONTACT_PRESSURE_PRESENT, normalized value [0-1024] */ INT16 tiltX; /* Present if PEN_CONTACT_TILTX_PRESENT, range [-90, 90] */ INT16 tiltY; /* Present if PEN_CONTACT_TILTY_PRESENT, range [-90, 90] */ -}; -typedef struct _RDPINPUT_PEN_CONTACT RDPINPUT_PEN_CONTACT; +} RDPINPUT_PEN_CONTACT; -struct _RDPINPUT_PEN_FRAME +typedef struct { UINT16 contactCount; UINT64 frameOffset; RDPINPUT_PEN_CONTACT* contacts; -}; -typedef struct _RDPINPUT_PEN_FRAME RDPINPUT_PEN_FRAME; +} RDPINPUT_PEN_FRAME; /** @brief a touch event with some frames*/ -struct _RDPINPUT_PEN_EVENT +typedef struct { UINT32 encodeTime; UINT16 frameCount; RDPINPUT_PEN_FRAME* frames; -}; -typedef struct _RDPINPUT_PEN_EVENT RDPINPUT_PEN_EVENT; +} RDPINPUT_PEN_EVENT; + #endif /* FREERDP_CHANNEL_RDPEI_H */ diff --git a/include/freerdp/channels/rdpgfx.h b/include/freerdp/channels/rdpgfx.h index 095022ddf..f9b97929a 100644 --- a/include/freerdp/channels/rdpgfx.h +++ b/include/freerdp/channels/rdpgfx.h @@ -30,21 +30,19 @@ * Common Data Types */ -struct _RDPGFX_POINT16 +typedef struct { UINT16 x; UINT16 y; -}; -typedef struct _RDPGFX_POINT16 RDPGFX_POINT16; +} RDPGFX_POINT16; -struct _RDPGFX_COLOR32 +typedef struct { BYTE B; BYTE G; BYTE R; BYTE XA; -}; -typedef struct _RDPGFX_COLOR32 RDPGFX_COLOR32; +} RDPGFX_COLOR32; #define GFX_PIXEL_FORMAT_XRGB_8888 0x20 #define GFX_PIXEL_FORMAT_ARGB_8888 0x21 @@ -79,13 +77,12 @@ typedef BYTE RDPGFX_PIXELFORMAT; #define RDPGFX_HEADER_SIZE 8 -struct _RDPGFX_HEADER +typedef struct { UINT16 cmdId; UINT16 flags; UINT32 pduLength; -}; -typedef struct _RDPGFX_HEADER RDPGFX_HEADER; +} RDPGFX_HEADER; /** * Capability Sets [MS-RDPEGFX] 2.2.3 @@ -106,13 +103,12 @@ typedef struct _RDPGFX_HEADER RDPGFX_HEADER; #define RDPGFX_NUMBER_CAPSETS 9 #define RDPGFX_CAPSET_BASE_SIZE 8 -struct _RDPGFX_CAPSET +typedef struct { UINT32 version; UINT32 length; UINT32 flags; -}; -typedef struct _RDPGFX_CAPSET RDPGFX_CAPSET; +} RDPGFX_CAPSET; #define RDPGFX_CAPS_FLAG_THINCLIENT 0x00000001U /* 8.0+ */ #define RDPGFX_CAPS_FLAG_SMALL_CACHE 0x00000002U /* 8.0+ */ @@ -120,29 +116,26 @@ typedef struct _RDPGFX_CAPSET RDPGFX_CAPSET; #define RDPGFX_CAPS_FLAG_AVC_DISABLED 0x00000020U /* 10.0+ */ #define RDPGFX_CAPS_FLAG_AVC_THINCLIENT 0x00000040U /* 10.3+ */ -struct _RDPGFX_CAPSET_VERSION8 +typedef struct { UINT32 version; UINT32 capsDataLength; UINT32 flags; -}; -typedef struct _RDPGFX_CAPSET_VERSION8 RDPGFX_CAPSET_VERSION8; +} RDPGFX_CAPSET_VERSION8; -struct _RDPGFX_CAPSET_VERSION81 +typedef struct { UINT32 version; UINT32 capsDataLength; UINT32 flags; -}; -typedef struct _RDPGFX_CAPSET_VERSION81 RDPGFX_CAPSET_VERSION81; +} RDPGFX_CAPSET_VERSION81; -struct _RDPGFX_CAPSET_VERSION10 +typedef struct { UINT32 version; UINT32 capsDataLength; UINT32 flags; -}; -typedef struct _RDPGFX_CAPSET_VERSION10 RDPGFX_CAPSET_VERSION10; +} RDPGFX_CAPSET_VERSION10; /** * Graphics Messages @@ -159,7 +152,7 @@ typedef struct _RDPGFX_CAPSET_VERSION10 RDPGFX_CAPSET_VERSION10; #define RDPGFX_WIRE_TO_SURFACE_PDU_1_SIZE 17 -struct _RDPGFX_WIRE_TO_SURFACE_PDU_1 +typedef struct { UINT16 surfaceId; UINT16 codecId; @@ -167,15 +160,14 @@ struct _RDPGFX_WIRE_TO_SURFACE_PDU_1 RECTANGLE_16 destRect; UINT32 bitmapDataLength; BYTE* bitmapData; -}; -typedef struct _RDPGFX_WIRE_TO_SURFACE_PDU_1 RDPGFX_WIRE_TO_SURFACE_PDU_1; +} RDPGFX_WIRE_TO_SURFACE_PDU_1; #define RDPGFX_CODECID_CAPROGRESSIVE 0x0009 #define RDPGFX_CODECID_CAPROGRESSIVE_V2 0x000D #define RDPGFX_WIRE_TO_SURFACE_PDU_2_SIZE 13 -struct _RDPGFX_WIRE_TO_SURFACE_PDU_2 +typedef struct { UINT16 surfaceId; UINT16 codecId; @@ -183,10 +175,9 @@ struct _RDPGFX_WIRE_TO_SURFACE_PDU_2 RDPGFX_PIXELFORMAT pixelFormat; UINT32 bitmapDataLength; BYTE* bitmapData; -}; -typedef struct _RDPGFX_WIRE_TO_SURFACE_PDU_2 RDPGFX_WIRE_TO_SURFACE_PDU_2; +} RDPGFX_WIRE_TO_SURFACE_PDU_2; -struct _RDPGFX_SURFACE_COMMAND +typedef struct { UINT32 surfaceId; UINT32 codecId; @@ -201,121 +192,107 @@ struct _RDPGFX_SURFACE_COMMAND UINT32 length; BYTE* data; void* extra; -}; -typedef struct _RDPGFX_SURFACE_COMMAND RDPGFX_SURFACE_COMMAND; +} RDPGFX_SURFACE_COMMAND; -struct _RDPGFX_DELETE_ENCODING_CONTEXT_PDU +typedef struct { UINT16 surfaceId; UINT32 codecContextId; -}; -typedef struct _RDPGFX_DELETE_ENCODING_CONTEXT_PDU RDPGFX_DELETE_ENCODING_CONTEXT_PDU; +} RDPGFX_DELETE_ENCODING_CONTEXT_PDU; -struct _RDPGFX_SOLID_FILL_PDU +typedef struct { UINT16 surfaceId; RDPGFX_COLOR32 fillPixel; UINT16 fillRectCount; RECTANGLE_16* fillRects; -}; -typedef struct _RDPGFX_SOLID_FILL_PDU RDPGFX_SOLID_FILL_PDU; +} RDPGFX_SOLID_FILL_PDU; -struct _RDPGFX_SURFACE_TO_SURFACE_PDU +typedef struct { UINT16 surfaceIdSrc; UINT16 surfaceIdDest; RECTANGLE_16 rectSrc; UINT16 destPtsCount; RDPGFX_POINT16* destPts; -}; -typedef struct _RDPGFX_SURFACE_TO_SURFACE_PDU RDPGFX_SURFACE_TO_SURFACE_PDU; +} RDPGFX_SURFACE_TO_SURFACE_PDU; -struct _RDPGFX_SURFACE_TO_CACHE_PDU +typedef struct { UINT16 surfaceId; UINT64 cacheKey; UINT16 cacheSlot; RECTANGLE_16 rectSrc; -}; -typedef struct _RDPGFX_SURFACE_TO_CACHE_PDU RDPGFX_SURFACE_TO_CACHE_PDU; +} RDPGFX_SURFACE_TO_CACHE_PDU; -struct _RDPGFX_CACHE_TO_SURFACE_PDU +typedef struct { UINT16 cacheSlot; UINT16 surfaceId; UINT16 destPtsCount; RDPGFX_POINT16* destPts; -}; -typedef struct _RDPGFX_CACHE_TO_SURFACE_PDU RDPGFX_CACHE_TO_SURFACE_PDU; +} RDPGFX_CACHE_TO_SURFACE_PDU; -struct _RDPGFX_EVICT_CACHE_ENTRY_PDU +typedef struct { UINT16 cacheSlot; -}; -typedef struct _RDPGFX_EVICT_CACHE_ENTRY_PDU RDPGFX_EVICT_CACHE_ENTRY_PDU; +} RDPGFX_EVICT_CACHE_ENTRY_PDU; -struct _RDPGFX_CREATE_SURFACE_PDU +typedef struct { UINT16 surfaceId; UINT16 width; UINT16 height; RDPGFX_PIXELFORMAT pixelFormat; -}; -typedef struct _RDPGFX_CREATE_SURFACE_PDU RDPGFX_CREATE_SURFACE_PDU; +} RDPGFX_CREATE_SURFACE_PDU; -struct _RDPGFX_DELETE_SURFACE_PDU +typedef struct { UINT16 surfaceId; -}; -typedef struct _RDPGFX_DELETE_SURFACE_PDU RDPGFX_DELETE_SURFACE_PDU; +} RDPGFX_DELETE_SURFACE_PDU; #define RDPGFX_START_FRAME_PDU_SIZE 8 -struct _RDPGFX_START_FRAME_PDU +typedef struct { UINT32 timestamp; UINT32 frameId; -}; -typedef struct _RDPGFX_START_FRAME_PDU RDPGFX_START_FRAME_PDU; +} RDPGFX_START_FRAME_PDU; #define RDPGFX_END_FRAME_PDU_SIZE 4 -struct _RDPGFX_END_FRAME_PDU +typedef struct { UINT32 frameId; -}; -typedef struct _RDPGFX_END_FRAME_PDU RDPGFX_END_FRAME_PDU; +} RDPGFX_END_FRAME_PDU; #define QUEUE_DEPTH_UNAVAILABLE 0x00000000 #define SUSPEND_FRAME_ACKNOWLEDGEMENT 0xFFFFFFFF -struct _RDPGFX_FRAME_ACKNOWLEDGE_PDU +typedef struct { UINT32 queueDepth; UINT32 frameId; UINT32 totalFramesDecoded; -}; -typedef struct _RDPGFX_FRAME_ACKNOWLEDGE_PDU RDPGFX_FRAME_ACKNOWLEDGE_PDU; +} RDPGFX_FRAME_ACKNOWLEDGE_PDU; -struct _RDPGFX_RESET_GRAPHICS_PDU +typedef struct { UINT32 width; UINT32 height; UINT32 monitorCount; MONITOR_DEF* monitorDefArray; -}; -typedef struct _RDPGFX_RESET_GRAPHICS_PDU RDPGFX_RESET_GRAPHICS_PDU; +} RDPGFX_RESET_GRAPHICS_PDU; -struct _RDPGFX_MAP_SURFACE_TO_OUTPUT_PDU +typedef struct { UINT16 surfaceId; UINT16 reserved; UINT32 outputOriginX; UINT32 outputOriginY; -}; -typedef struct _RDPGFX_MAP_SURFACE_TO_OUTPUT_PDU RDPGFX_MAP_SURFACE_TO_OUTPUT_PDU; +} RDPGFX_MAP_SURFACE_TO_OUTPUT_PDU; -struct _RDPGFX_MAP_SURFACE_TO_SCALED_OUTPUT_PDU +typedef struct { UINT16 surfaceId; UINT16 reserved; @@ -323,53 +300,46 @@ struct _RDPGFX_MAP_SURFACE_TO_SCALED_OUTPUT_PDU UINT32 outputOriginY; UINT32 targetWidth; UINT32 targetHeight; -}; -typedef struct _RDPGFX_MAP_SURFACE_TO_SCALED_OUTPUT_PDU RDPGFX_MAP_SURFACE_TO_SCALED_OUTPUT_PDU; +} RDPGFX_MAP_SURFACE_TO_SCALED_OUTPUT_PDU; -struct _RDPGFX_CACHE_ENTRY_METADATA +typedef struct { UINT64 cacheKey; UINT32 bitmapLength; -}; -typedef struct _RDPGFX_CACHE_ENTRY_METADATA RDPGFX_CACHE_ENTRY_METADATA; +} RDPGFX_CACHE_ENTRY_METADATA; -struct _RDPGFX_CACHE_IMPORT_OFFER_PDU +typedef struct { UINT16 cacheEntriesCount; RDPGFX_CACHE_ENTRY_METADATA* cacheEntries; -}; -typedef struct _RDPGFX_CACHE_IMPORT_OFFER_PDU RDPGFX_CACHE_IMPORT_OFFER_PDU; +} RDPGFX_CACHE_IMPORT_OFFER_PDU; -struct _RDPGFX_CACHE_IMPORT_REPLY_PDU +typedef struct { UINT16 importedEntriesCount; UINT16* cacheSlots; -}; -typedef struct _RDPGFX_CACHE_IMPORT_REPLY_PDU RDPGFX_CACHE_IMPORT_REPLY_PDU; +} RDPGFX_CACHE_IMPORT_REPLY_PDU; -struct _RDPGFX_CAPS_ADVERTISE_PDU +typedef struct { UINT16 capsSetCount; RDPGFX_CAPSET* capsSets; -}; -typedef struct _RDPGFX_CAPS_ADVERTISE_PDU RDPGFX_CAPS_ADVERTISE_PDU; +} RDPGFX_CAPS_ADVERTISE_PDU; -struct _RDPGFX_CAPS_CONFIRM_PDU +typedef struct { RDPGFX_CAPSET* capsSet; -}; -typedef struct _RDPGFX_CAPS_CONFIRM_PDU RDPGFX_CAPS_CONFIRM_PDU; +} RDPGFX_CAPS_CONFIRM_PDU; -struct _RDPGFX_MAP_SURFACE_TO_WINDOW_PDU +typedef struct { UINT16 surfaceId; UINT64 windowId; UINT32 mappedWidth; UINT32 mappedHeight; -}; -typedef struct _RDPGFX_MAP_SURFACE_TO_WINDOW_PDU RDPGFX_MAP_SURFACE_TO_WINDOW_PDU; +} RDPGFX_MAP_SURFACE_TO_WINDOW_PDU; -struct _RDPGFX_MAP_SURFACE_TO_SCALED_WINDOW_PDU +typedef struct { UINT16 surfaceId; UINT64 windowId; @@ -377,12 +347,11 @@ struct _RDPGFX_MAP_SURFACE_TO_SCALED_WINDOW_PDU UINT32 mappedHeight; UINT32 targetWidth; UINT32 targetHeight; -}; -typedef struct _RDPGFX_MAP_SURFACE_TO_SCALED_WINDOW_PDU RDPGFX_MAP_SURFACE_TO_SCALED_WINDOW_PDU; +} RDPGFX_MAP_SURFACE_TO_SCALED_WINDOW_PDU; /* H264 */ -struct _RDPGFX_H264_QUANT_QUALITY +typedef struct { BYTE qpVal; BYTE qualityVal; @@ -390,40 +359,35 @@ struct _RDPGFX_H264_QUANT_QUALITY BYTE qp; BYTE r; BYTE p; -}; -typedef struct _RDPGFX_H264_QUANT_QUALITY RDPGFX_H264_QUANT_QUALITY; +} RDPGFX_H264_QUANT_QUALITY; -struct _RDPGFX_H264_METABLOCK +typedef struct { UINT32 numRegionRects; RECTANGLE_16* regionRects; RDPGFX_H264_QUANT_QUALITY* quantQualityVals; -}; -typedef struct _RDPGFX_H264_METABLOCK RDPGFX_H264_METABLOCK; +} RDPGFX_H264_METABLOCK; -struct _RDPGFX_AVC420_BITMAP_STREAM +typedef struct { RDPGFX_H264_METABLOCK meta; UINT32 length; BYTE* data; -}; -typedef struct _RDPGFX_AVC420_BITMAP_STREAM RDPGFX_AVC420_BITMAP_STREAM; +} RDPGFX_AVC420_BITMAP_STREAM; -struct _RDPGFX_AVC444_BITMAP_STREAM +typedef struct { UINT32 cbAvc420EncodedBitstream1; BYTE LC; RDPGFX_AVC420_BITMAP_STREAM bitstream[2]; -}; -typedef struct _RDPGFX_AVC444_BITMAP_STREAM RDPGFX_AVC444_BITMAP_STREAM; +} RDPGFX_AVC444_BITMAP_STREAM; -struct _RDPGFX_QOE_FRAME_ACKNOWLEDGE_PDU +typedef struct { UINT32 frameId; UINT32 timestamp; UINT16 timeDiffSE; UINT16 timeDiffEDR; -}; -typedef struct _RDPGFX_QOE_FRAME_ACKNOWLEDGE_PDU RDPGFX_QOE_FRAME_ACKNOWLEDGE_PDU; +} RDPGFX_QOE_FRAME_ACKNOWLEDGE_PDU; #endif /* FREERDP_CHANNEL_RDPGFX_H */ diff --git a/include/freerdp/channels/remdesk.h b/include/freerdp/channels/remdesk.h index f68e194b1..e283f9a01 100644 --- a/include/freerdp/channels/remdesk.h +++ b/include/freerdp/channels/remdesk.h @@ -74,23 +74,21 @@ #define REMDESK_ERROR_SHADOWEND_CONFIGCHANGE 301 #define REMDESK_ERROR_SHADOWEND_UNKNOWN 302 -struct _REMDESK_CHANNEL_HEADER +typedef struct { UINT32 DataLength; char ChannelName[32]; -}; -typedef struct _REMDESK_CHANNEL_HEADER REMDESK_CHANNEL_HEADER; +} REMDESK_CHANNEL_HEADER; #define REMDESK_CHANNEL_CTL_NAME "RC_CTL" #define REMDESK_CHANNEL_CTL_SIZE 22 -struct _REMDESK_CTL_HEADER +typedef struct { REMDESK_CHANNEL_HEADER ch; UINT32 msgType; -}; -typedef struct _REMDESK_CTL_HEADER REMDESK_CTL_HEADER; +} REMDESK_CTL_HEADER; #define REMDESK_CTL_REMOTE_CONTROL_DESKTOP 1 #define REMDESK_CTL_RESULT 2 @@ -105,55 +103,49 @@ typedef struct _REMDESK_CTL_HEADER REMDESK_CTL_HEADER; #define REMDESK_CTL_RAEXPERT_NAME 11 #define REMDESK_CTL_TOKEN 12 -struct _REMDESK_CTL_RESULT_PDU +typedef struct { REMDESK_CTL_HEADER ctlHeader; UINT32 result; -}; -typedef struct _REMDESK_CTL_RESULT_PDU REMDESK_CTL_RESULT_PDU; +} REMDESK_CTL_RESULT_PDU; -struct _REMDESK_CTL_VERSION_INFO_PDU +typedef struct { REMDESK_CTL_HEADER ctlHeader; UINT32 versionMajor; UINT32 versionMinor; -}; -typedef struct _REMDESK_CTL_VERSION_INFO_PDU REMDESK_CTL_VERSION_INFO_PDU; +} REMDESK_CTL_VERSION_INFO_PDU; -struct _REMDESK_CTL_AUTHENTICATE_PDU +typedef struct { REMDESK_CTL_HEADER ctlHeader; char* raConnectionString; char* expertBlob; -}; -typedef struct _REMDESK_CTL_AUTHENTICATE_PDU REMDESK_CTL_AUTHENTICATE_PDU; +} REMDESK_CTL_AUTHENTICATE_PDU; -struct _REMDESK_CTL_REMOTE_CONTROL_DESKTOP_PDU +typedef struct { REMDESK_CTL_HEADER ctlHeader; char* raConnectionString; -}; -typedef struct _REMDESK_CTL_REMOTE_CONTROL_DESKTOP_PDU REMDESK_CTL_REMOTE_CONTROL_DESKTOP_PDU; +} REMDESK_CTL_REMOTE_CONTROL_DESKTOP_PDU; -struct _REMDESK_CTL_VERIFY_PASSWORD_PDU +typedef struct { REMDESK_CTL_HEADER ctlHeader; char* expertBlob; -}; -typedef struct _REMDESK_CTL_VERIFY_PASSWORD_PDU REMDESK_CTL_VERIFY_PASSWORD_PDU; +} REMDESK_CTL_VERIFY_PASSWORD_PDU; -struct _REMDESK_CTL_EXPERT_ON_VISTA_PDU +typedef struct { REMDESK_CTL_HEADER ctlHeader; BYTE* EncryptedPassword; UINT32 EncryptedPasswordLength; -}; -typedef struct _REMDESK_CTL_EXPERT_ON_VISTA_PDU REMDESK_CTL_EXPERT_ON_VISTA_PDU; +} REMDESK_CTL_EXPERT_ON_VISTA_PDU; #endif /* FREERDP_CHANNEL_REMDESK_H */ diff --git a/include/freerdp/channels/scard.h b/include/freerdp/channels/scard.h index 2b6aeb3e5..6bcda5640 100644 --- a/include/freerdp/channels/scard.h +++ b/include/freerdp/channels/scard.h @@ -85,39 +85,37 @@ /* interface type_scard_pack */ /* [unique][version][uuid] */ -typedef struct _REDIR_SCARDCONTEXT +typedef struct { /* [range] */ DWORD cbContext; /* [size_is][unique] */ BYTE pbContext[8]; } REDIR_SCARDCONTEXT; -typedef struct _REDIR_SCARDHANDLE +typedef struct { /* [range] */ DWORD cbHandle; /* [size_is] */ BYTE pbHandle[8]; } REDIR_SCARDHANDLE; -typedef struct _Long_Return +typedef struct { LONG ReturnCode; } Long_Return; -typedef struct _longAndMultiString_Return +typedef struct { LONG ReturnCode; /* [range] */ DWORD cBytes; /* [size_is][unique] */ BYTE* msz; -} ListReaderGroups_Return; +} ListReaderGroups_Return, ListReaders_Return; -typedef struct _longAndMultiString_Return ListReaders_Return; - -typedef struct _EstablishContext_Return +typedef struct { LONG ReturnCode; REDIR_SCARDCONTEXT hContext; } EstablishContext_Return; -typedef struct _ReaderState_Return +typedef struct { DWORD dwCurrentState; DWORD dwEventState; @@ -125,36 +123,34 @@ typedef struct _ReaderState_Return BYTE rgbAtr[36]; } ReaderState_Return; -typedef struct _LocateCards_ATRMask +typedef struct { /* [range] */ DWORD cbAtr; BYTE rgbAtr[36]; BYTE rgbMask[36]; } LocateCards_ATRMask; -typedef struct _GetStatusChange_Return +typedef struct { LONG ReturnCode; /* [range] */ DWORD cReaders; /* [size_is] */ ReaderState_Return* rgReaderStates; -} LocateCards_Return; +} LocateCards_Return, GetStatusChange_Return; -typedef struct _GetStatusChange_Return GetStatusChange_Return; - -typedef struct _GetReaderIcon_Return +typedef struct { LONG ReturnCode; ULONG cbDataLen; BYTE* pbData; } GetReaderIcon_Return; -typedef struct _GetDeviceTypeId_Return +typedef struct { LONG ReturnCode; ULONG dwDeviceId; } GetDeviceTypeId_Return; -typedef struct _Connect_Return +typedef struct { LONG ReturnCode; REDIR_SCARDCONTEXT hContext; @@ -162,13 +158,13 @@ typedef struct _Connect_Return DWORD dwActiveProtocol; } Connect_Return; -typedef struct Reconnect_Return +typedef struct { LONG ReturnCode; DWORD dwActiveProtocol; } Reconnect_Return; -typedef struct _State_Return +typedef struct { LONG ReturnCode; DWORD dwState; @@ -177,7 +173,7 @@ typedef struct _State_Return /* [size_is][unique] */ BYTE rgAtr[36]; } State_Return; -typedef struct _Status_Return +typedef struct { LONG ReturnCode; /* [range] */ DWORD cBytes; @@ -188,14 +184,14 @@ typedef struct _Status_Return /* [range] */ DWORD cbAtrLen; } Status_Return; -typedef struct _SCardIO_Request +typedef struct { DWORD dwProtocol; /* [range] */ DWORD cbExtraBytes; /* [size_is][unique] */ BYTE* pbExtraBytes; } SCardIO_Request; -typedef struct _Transmit_Return +typedef struct { LONG ReturnCode; /* [unique] */ LPSCARD_IO_REQUEST pioRecvPci; @@ -203,27 +199,27 @@ typedef struct _Transmit_Return /* [size_is][unique] */ BYTE* pbRecvBuffer; } Transmit_Return; -typedef struct _GetTransmitCount_Return +typedef struct { LONG ReturnCode; DWORD cTransmitCount; } GetTransmitCount_Return; -typedef struct _Control_Return +typedef struct { LONG ReturnCode; /* [range] */ DWORD cbOutBufferSize; /* [size_is][unique] */ BYTE* pvOutBuffer; } Control_Return; -typedef struct _GetAttrib_Return +typedef struct { LONG ReturnCode; /* [range] */ DWORD cbAttrLen; /* [size_is][unique] */ BYTE* pbAttr; } GetAttrib_Return; -typedef struct _ReadCache_Return +typedef struct { LONG ReturnCode; /* [range] */ DWORD cbDataLen; @@ -231,20 +227,20 @@ typedef struct _ReadCache_Return } ReadCache_Return; #pragma pack(pop) -typedef struct _Handles_Call +typedef struct { REDIR_SCARDCONTEXT hContext; REDIR_SCARDHANDLE hCard; } Handles_Call; -typedef struct _ListReaderGroups_Call +typedef struct { Handles_Call handles; LONG fmszGroupsIsNULL; DWORD cchGroups; } ListReaderGroups_Call; -typedef struct _ListReaders_Call +typedef struct { Handles_Call handles; /* [range] */ DWORD cBytes; @@ -253,7 +249,7 @@ typedef struct _ListReaders_Call DWORD cchReaders; } ListReaders_Call; -typedef struct _GetStatusChangeA_Call +typedef struct { Handles_Call handles; DWORD dwTimeOut; @@ -261,7 +257,7 @@ typedef struct _GetStatusChangeA_Call /* [size_is] */ LPSCARD_READERSTATEA rgReaderStates; } GetStatusChangeA_Call; -typedef struct _LocateCardsA_Call +typedef struct { Handles_Call handles; /* [range] */ DWORD cBytes; @@ -270,7 +266,7 @@ typedef struct _LocateCardsA_Call /* [size_is] */ LPSCARD_READERSTATEA rgReaderStates; } LocateCardsA_Call; -typedef struct _LocateCardsW_Call +typedef struct { Handles_Call handles; /* [range] */ DWORD cBytes; @@ -279,7 +275,7 @@ typedef struct _LocateCardsW_Call /* [size_is] */ LPSCARD_READERSTATEW rgReaderStates; } LocateCardsW_Call; -typedef struct _LocateCardsByATRA_Call +typedef struct { Handles_Call handles; /* [range] */ DWORD cAtrs; @@ -288,7 +284,7 @@ typedef struct _LocateCardsByATRA_Call /* [size_is] */ LPSCARD_READERSTATEA rgReaderStates; } LocateCardsByATRA_Call; -typedef struct _LocateCardsByATRW_Call +typedef struct { Handles_Call handles; /* [range] */ DWORD cAtrs; @@ -297,7 +293,7 @@ typedef struct _LocateCardsByATRW_Call /* [size_is] */ LPSCARD_READERSTATEW rgReaderStates; } LocateCardsByATRW_Call; -typedef struct _GetStatusChangeW_Call +typedef struct { Handles_Call handles; DWORD dwTimeOut; @@ -305,38 +301,38 @@ typedef struct _GetStatusChangeW_Call /* [size_is] */ LPSCARD_READERSTATEW rgReaderStates; } GetStatusChangeW_Call; -typedef struct _GetReaderIcon_Call +typedef struct { Handles_Call handles; WCHAR* szReaderName; } GetReaderIcon_Call; -typedef struct _GetDeviceTypeId_Call +typedef struct { Handles_Call handles; WCHAR* szReaderName; } GetDeviceTypeId_Call; -typedef struct _Connect_Common_Call +typedef struct { Handles_Call handles; DWORD dwShareMode; DWORD dwPreferredProtocols; } Connect_Common_Call; -typedef struct _ConnectA_Call +typedef struct { Connect_Common_Call Common; /* [string] */ CHAR* szReader; } ConnectA_Call; -typedef struct _ConnectW_Call +typedef struct { Connect_Common_Call Common; /* [string] */ WCHAR* szReader; } ConnectW_Call; -typedef struct _Reconnect_Call +typedef struct { Handles_Call handles; DWORD dwShareMode; @@ -344,20 +340,20 @@ typedef struct _Reconnect_Call DWORD dwInitialization; } Reconnect_Call; -typedef struct _HCardAndDisposition_Call +typedef struct { Handles_Call handles; DWORD dwDisposition; } HCardAndDisposition_Call; -typedef struct _State_Call +typedef struct { Handles_Call handles; LONG fpbAtrIsNULL; DWORD cbAtrLen; } State_Call; -typedef struct _Status_Call +typedef struct { Handles_Call handles; LONG fmszReaderNamesIsNULL; @@ -365,7 +361,7 @@ typedef struct _Status_Call DWORD cbAtrLen; } Status_Call; -typedef struct _Transmit_Call +typedef struct { Handles_Call handles; LPSCARD_IO_REQUEST pioSendPci; @@ -376,55 +372,55 @@ typedef struct _Transmit_Call DWORD cbRecvLength; } Transmit_Call; -typedef struct _Long_Call +typedef struct { Handles_Call handles; LONG LongValue; } Long_Call; -typedef struct _Context_Call +typedef struct { Handles_Call handles; } Context_Call; -typedef struct _ContextAndStringA_Call +typedef struct { Handles_Call handles; /* [string] */ char* sz; } ContextAndStringA_Call; -typedef struct _ContextAndStringW_Call +typedef struct { Handles_Call handles; /* [string] */ WCHAR* sz; } ContextAndStringW_Call; -typedef struct _ContextAndTwoStringA_Call +typedef struct { Handles_Call handles; /* [string] */ char* sz1; /* [string] */ char* sz2; } ContextAndTwoStringA_Call; -typedef struct _ContextAndTwoStringW_Call +typedef struct { Handles_Call handles; /* [string] */ WCHAR* sz1; /* [string] */ WCHAR* sz2; } ContextAndTwoStringW_Call; -typedef struct _EstablishContext_Call +typedef struct { Handles_Call handles; DWORD dwScope; } EstablishContext_Call; -typedef struct _GetTranmitCount_Call +typedef struct { Handles_Call handles; } GetTransmitCount_Call; -typedef struct _Control_Call +typedef struct { Handles_Call handles; DWORD dwControlCode; @@ -434,7 +430,7 @@ typedef struct _Control_Call DWORD cbOutBufferSize; } Control_Call; -typedef struct _GetAttrib_Call +typedef struct { Handles_Call handles; DWORD dwAttrId; @@ -442,7 +438,7 @@ typedef struct _GetAttrib_Call DWORD cbAttrLen; } GetAttrib_Call; -typedef struct _SetAttrib_Call +typedef struct { Handles_Call handles; DWORD dwAttrId; @@ -450,7 +446,7 @@ typedef struct _SetAttrib_Call /* [size_is] */ BYTE* pbAttr; } SetAttrib_Call; -typedef struct _ReadCache_Common +typedef struct { Handles_Call handles; UUID* CardIdentifier; @@ -459,19 +455,19 @@ typedef struct _ReadCache_Common DWORD cbDataLen; } ReadCache_Common; -typedef struct _ReadCacheA_Call +typedef struct { ReadCache_Common Common; /* [string] */ char* szLookupName; } ReadCacheA_Call; -typedef struct _ReadCacheW_Call +typedef struct { ReadCache_Common Common; /* [string] */ WCHAR* szLookupName; } ReadCacheW_Call; -typedef struct _WriteCache_Common +typedef struct { Handles_Call handles; UUID* CardIdentifier; @@ -480,13 +476,13 @@ typedef struct _WriteCache_Common /* [size_is][unique] */ BYTE* pbData; } WriteCache_Common; -typedef struct _WriteCacheA_Call +typedef struct { WriteCache_Common Common; /* [string] */ char* szLookupName; } WriteCacheA_Call; -typedef struct _WriteCacheW_Call +typedef struct { WriteCache_Common Common; /* [string] */ WCHAR* szLookupName; diff --git a/include/freerdp/channels/video.h b/include/freerdp/channels/video.h index c1197c0ba..cbfdcc4c3 100644 --- a/include/freerdp/channels/video.h +++ b/include/freerdp/channels/video.h @@ -43,7 +43,7 @@ enum }; /** @brief presentation request struct */ -struct _TSMM_PRESENTATION_REQUEST +typedef struct { BYTE PresentationId; BYTE Version; @@ -56,15 +56,13 @@ struct _TSMM_PRESENTATION_REQUEST BYTE VideoSubtypeId[16]; UINT32 cbExtra; BYTE* pExtraData; -}; -typedef struct _TSMM_PRESENTATION_REQUEST TSMM_PRESENTATION_REQUEST; +} TSMM_PRESENTATION_REQUEST; /** @brief response to a TSMM_PRESENTATION_REQUEST */ -struct _TSMM_PRESENTATION_RESPONSE +typedef struct { BYTE PresentationId; -}; -typedef struct _TSMM_PRESENTATION_RESPONSE TSMM_PRESENTATION_RESPONSE; +} TSMM_PRESENTATION_RESPONSE; /** @brief TSMM_VIDEO_DATA flags */ enum @@ -75,7 +73,7 @@ enum }; /** @brief a video data packet */ -struct _TSMM_VIDEO_DATA +typedef struct { BYTE PresentationId; BYTE Version; @@ -87,8 +85,7 @@ struct _TSMM_VIDEO_DATA UINT32 SampleNumber; UINT32 cbSample; BYTE* pSample; -}; -typedef struct _TSMM_VIDEO_DATA TSMM_VIDEO_DATA; +} TSMM_VIDEO_DATA; /** @brief values for NotificationType in TSMM_CLIENT_NOTIFICATION */ enum @@ -98,21 +95,18 @@ enum }; /** @brief struct used when NotificationType is FRAMERATE_OVERRIDE */ -struct _TSMM_CLIENT_NOTIFICATION_FRAMERATE_OVERRIDE +typedef struct { UINT32 Flags; UINT32 DesiredFrameRate; -}; -typedef struct _TSMM_CLIENT_NOTIFICATION_FRAMERATE_OVERRIDE - TSMM_CLIENT_NOTIFICATION_FRAMERATE_OVERRIDE; +} TSMM_CLIENT_NOTIFICATION_FRAMERATE_OVERRIDE; /** @brief a client to server notification struct */ -struct _TSMM_CLIENT_NOTIFICATION +typedef struct { BYTE PresentationId; BYTE NotificationType; TSMM_CLIENT_NOTIFICATION_FRAMERATE_OVERRIDE FramerateOverride; -}; -typedef struct _TSMM_CLIENT_NOTIFICATION TSMM_CLIENT_NOTIFICATION; +} TSMM_CLIENT_NOTIFICATION; #endif /* FREERDP_CHANNEL_VIDEO_H */ diff --git a/include/freerdp/client/audin.h b/include/freerdp/client/audin.h index 4487caa17..e9333bee7 100644 --- a/include/freerdp/client/audin.h +++ b/include/freerdp/client/audin.h @@ -33,8 +33,8 @@ typedef UINT (*AudinReceive)(const AUDIO_FORMAT* format, const BYTE* data, size_t size, void* userData); -typedef struct _IAudinDevice IAudinDevice; -struct _IAudinDevice +typedef struct s_IAudinDevice IAudinDevice; +struct s_IAudinDevice { UINT (*Open)(IAudinDevice* devplugin, AudinReceive receive, void* userData); BOOL (*FormatSupported)(IAudinDevice* devplugin, const AUDIO_FORMAT* format); @@ -47,14 +47,13 @@ struct _IAudinDevice typedef UINT (*PREGISTERAUDINDEVICE)(IWTSPlugin* plugin, IAudinDevice* device); -struct _FREERDP_AUDIN_DEVICE_ENTRY_POINTS +typedef struct { IWTSPlugin* plugin; PREGISTERAUDINDEVICE pRegisterAudinDevice; const ADDIN_ARGV* args; rdpContext* rdpcontext; -}; -typedef struct _FREERDP_AUDIN_DEVICE_ENTRY_POINTS FREERDP_AUDIN_DEVICE_ENTRY_POINTS; +} FREERDP_AUDIN_DEVICE_ENTRY_POINTS; typedef FREERDP_AUDIN_DEVICE_ENTRY_POINTS* PFREERDP_AUDIN_DEVICE_ENTRY_POINTS; typedef UINT (*PFREERDP_AUDIN_DEVICE_ENTRY)(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints); diff --git a/include/freerdp/client/cliprdr.h b/include/freerdp/client/cliprdr.h index b4c54afc6..0d9337ee4 100644 --- a/include/freerdp/client/cliprdr.h +++ b/include/freerdp/client/cliprdr.h @@ -32,7 +32,7 @@ * Client Interface */ -typedef struct _cliprdr_client_context CliprdrClientContext; +typedef struct s_cliprdr_client_context CliprdrClientContext; typedef UINT (*pcCliprdrServerCapabilities)(CliprdrClientContext* context, const CLIPRDR_CAPABILITIES* capabilities); @@ -75,7 +75,7 @@ typedef UINT (*pcCliprdrClientFileContentsResponse)( typedef UINT (*pcCliprdrServerFileContentsResponse)( CliprdrClientContext* context, const CLIPRDR_FILE_CONTENTS_RESPONSE* fileContentsResponse); -struct _cliprdr_client_context +struct s_cliprdr_client_context { void* handle; void* custom; @@ -105,33 +105,30 @@ struct _cliprdr_client_context rdpContext* rdpcontext; }; -struct _CLIPRDR_FORMAT_NAME +typedef struct { UINT32 id; char* name; int length; -}; -typedef struct _CLIPRDR_FORMAT_NAME CLIPRDR_FORMAT_NAME; +} CLIPRDR_FORMAT_NAME; /** * Clipboard Events */ -struct _RDP_CB_CLIP_CAPS +typedef struct { wMessage event; UINT32 capabilities; -}; -typedef struct _RDP_CB_CLIP_CAPS RDP_CB_CLIP_CAPS; +} RDP_CB_CLIP_CAPS; -struct _RDP_CB_MONITOR_READY_EVENT +typedef struct { wMessage event; UINT32 capabilities; -}; -typedef struct _RDP_CB_MONITOR_READY_EVENT RDP_CB_MONITOR_READY_EVENT; +} RDP_CB_MONITOR_READY_EVENT; -struct _RDP_CB_FORMAT_LIST_EVENT +typedef struct { wMessage event; UINT32* formats; @@ -139,25 +136,22 @@ struct _RDP_CB_FORMAT_LIST_EVENT BYTE* raw_format_data; UINT32 raw_format_data_size; BOOL raw_format_unicode; -}; -typedef struct _RDP_CB_FORMAT_LIST_EVENT RDP_CB_FORMAT_LIST_EVENT; +} RDP_CB_FORMAT_LIST_EVENT; -struct _RDP_CB_DATA_REQUEST_EVENT +typedef struct { wMessage event; UINT32 format; -}; -typedef struct _RDP_CB_DATA_REQUEST_EVENT RDP_CB_DATA_REQUEST_EVENT; +} RDP_CB_DATA_REQUEST_EVENT; -struct _RDP_CB_DATA_RESPONSE_EVENT +typedef struct { wMessage event; BYTE* data; UINT32 size; -}; -typedef struct _RDP_CB_DATA_RESPONSE_EVENT RDP_CB_DATA_RESPONSE_EVENT; +} RDP_CB_DATA_RESPONSE_EVENT; -struct _RDP_CB_FILECONTENTS_REQUEST_EVENT +typedef struct { wMessage event; UINT32 streamId; @@ -167,37 +161,32 @@ struct _RDP_CB_FILECONTENTS_REQUEST_EVENT UINT32 nPositionHigh; UINT32 cbRequested; UINT32 clipDataId; -}; -typedef struct _RDP_CB_FILECONTENTS_REQUEST_EVENT RDP_CB_FILECONTENTS_REQUEST_EVENT; +} RDP_CB_FILECONTENTS_REQUEST_EVENT; -struct _RDP_CB_FILECONTENTS_RESPONSE_EVENT +typedef struct { wMessage event; BYTE* data; UINT32 size; UINT32 streamId; -}; -typedef struct _RDP_CB_FILECONTENTS_RESPONSE_EVENT RDP_CB_FILECONTENTS_RESPONSE_EVENT; +} RDP_CB_FILECONTENTS_RESPONSE_EVENT; -struct _RDP_CB_LOCK_CLIPDATA_EVENT +typedef struct { wMessage event; UINT32 clipDataId; -}; -typedef struct _RDP_CB_LOCK_CLIPDATA_EVENT RDP_CB_LOCK_CLIPDATA_EVENT; +} RDP_CB_LOCK_CLIPDATA_EVENT; -struct _RDP_CB_UNLOCK_CLIPDATA_EVENT +typedef struct { wMessage event; UINT32 clipDataId; -}; -typedef struct _RDP_CB_UNLOCK_CLIPDATA_EVENT RDP_CB_UNLOCK_CLIPDATA_EVENT; +} RDP_CB_UNLOCK_CLIPDATA_EVENT; -struct _RDP_CB_TEMPDIR_EVENT +typedef struct { wMessage event; char dirname[520]; -}; -typedef struct _RDP_CB_TEMPDIR_EVENT RDP_CB_TEMPDIR_EVENT; +} RDP_CB_TEMPDIR_EVENT; #endif /* FREERDP_CHANNEL_CLIPRDR_CLIENT_CLIPRDR_H */ diff --git a/include/freerdp/client/disp.h b/include/freerdp/client/disp.h index 02f876eec..ca018e1d5 100644 --- a/include/freerdp/client/disp.h +++ b/include/freerdp/client/disp.h @@ -24,14 +24,14 @@ #include -typedef struct _disp_client_context DispClientContext; +typedef struct s_disp_client_context DispClientContext; typedef UINT (*pcDispCaps)(DispClientContext* context, UINT32 MaxNumMonitors, UINT32 MaxMonitorAreaFactorA, UINT32 MaxMonitorAreaFactorB); typedef UINT (*pcDispSendMonitorLayout)(DispClientContext* context, UINT32 NumMonitors, DISPLAY_CONTROL_MONITOR_LAYOUT* Monitors); -struct _disp_client_context +struct s_disp_client_context { void* handle; void* custom; diff --git a/include/freerdp/client/drdynvc.h b/include/freerdp/client/drdynvc.h index e0410c82d..abe6921ef 100644 --- a/include/freerdp/client/drdynvc.h +++ b/include/freerdp/client/drdynvc.h @@ -26,7 +26,7 @@ * Client Interface */ -typedef struct _drdynvc_client_context DrdynvcClientContext; +typedef struct s_drdynvc_client_context DrdynvcClientContext; typedef int (*pcDrdynvcGetVersion)(DrdynvcClientContext* context); typedef UINT (*pcDrdynvcOnChannelConnected)(DrdynvcClientContext* context, const char* name, @@ -38,7 +38,7 @@ typedef UINT (*pcDrdynvcOnChannelAttached)(DrdynvcClientContext* context, const typedef UINT (*pcDrdynvcOnChannelDetached)(DrdynvcClientContext* context, const char* name, void* pInterface); -struct _drdynvc_client_context +struct s_drdynvc_client_context { void* handle; void* custom; diff --git a/include/freerdp/client/encomsp.h b/include/freerdp/client/encomsp.h index e00578cdb..361a9ff64 100644 --- a/include/freerdp/client/encomsp.h +++ b/include/freerdp/client/encomsp.h @@ -28,7 +28,7 @@ * Client Interface */ -typedef struct _encomsp_client_context EncomspClientContext; +typedef struct s_encomsp_client_context EncomspClientContext; typedef UINT (*pcEncomspFilterUpdated)(EncomspClientContext* context, const ENCOMSP_FILTER_UPDATED_PDU* filterUpdated); @@ -55,7 +55,7 @@ typedef UINT (*pcEncomspGraphicsStreamResumed)( EncomspClientContext* context, const ENCOMSP_GRAPHICS_STREAM_RESUMED_PDU* graphicsStreamResumed); -struct _encomsp_client_context +struct s_encomsp_client_context { void* handle; void* custom; diff --git a/include/freerdp/client/geometry.h b/include/freerdp/client/geometry.h index c3dcbd615..aa335a45b 100644 --- a/include/freerdp/client/geometry.h +++ b/include/freerdp/client/geometry.h @@ -27,15 +27,15 @@ /** * Client Interface */ -typedef struct _geometry_client_context GeometryClientContext; +typedef struct s_geometry_client_context GeometryClientContext; -typedef struct _MAPPED_GEOMETRY MAPPED_GEOMETRY; +typedef struct S_MAPPED_GEOMETRY MAPPED_GEOMETRY; typedef BOOL (*pcMappedGeometryAdded)(GeometryClientContext* context, MAPPED_GEOMETRY* geometry); typedef BOOL (*pcMappedGeometryUpdate)(MAPPED_GEOMETRY* geometry); typedef BOOL (*pcMappedGeometryClear)(MAPPED_GEOMETRY* geometry); /** @brief a geometry record tracked by the geometry channel */ -struct _MAPPED_GEOMETRY +struct S_MAPPED_GEOMETRY { volatile LONG refCounter; UINT64 mappingId; @@ -50,7 +50,7 @@ struct _MAPPED_GEOMETRY }; /** @brief the geometry context for client channel */ -struct _geometry_client_context +struct s_geometry_client_context { wHashTable* geometries; void* handle; diff --git a/include/freerdp/client/rail.h b/include/freerdp/client/rail.h index 0ce7dc332..4a9b2f24e 100644 --- a/include/freerdp/client/rail.h +++ b/include/freerdp/client/rail.h @@ -31,7 +31,7 @@ * Client Interface */ -typedef struct _rail_client_context RailClientContext; +typedef struct s_rail_client_context RailClientContext; typedef UINT (*pcRailOnOpen)(RailClientContext* context, BOOL* sendHandshake); @@ -87,7 +87,7 @@ typedef UINT (*pcRailServerGetAppidResponseExtended)(RailClientContext* context, typedef UINT (*pcRailClientCompartmentInfo)(RailClientContext* context, const RAIL_COMPARTMENT_INFO_ORDER* compartmentInfo); -struct _rail_client_context +struct s_rail_client_context { void* handle; void* custom; diff --git a/include/freerdp/client/rdpei.h b/include/freerdp/client/rdpei.h index 33dddb543..dbf5b02a3 100644 --- a/include/freerdp/client/rdpei.h +++ b/include/freerdp/client/rdpei.h @@ -28,7 +28,7 @@ * Client Interface */ -typedef struct _rdpei_client_context RdpeiClientContext; +typedef struct s_rdpei_client_context RdpeiClientContext; typedef UINT32 (*pcRdpeiGetVersion)(RdpeiClientContext* context); typedef UINT32 (*pcRdpeiGetFeatures)(RdpeiClientContext* context); @@ -53,7 +53,7 @@ typedef UINT (*pcRdpeiPenRawEvent)(RdpeiClientContext* context, INT32 externalId typedef UINT (*pcRdpeiSuspendTouch)(RdpeiClientContext* context); typedef UINT (*pcRdpeiResumeTouch)(RdpeiClientContext* context); -struct _rdpei_client_context +struct s_rdpei_client_context { void* handle; void* custom; diff --git a/include/freerdp/client/rdpgfx.h b/include/freerdp/client/rdpgfx.h index 7adbabb9f..8561a3e2b 100644 --- a/include/freerdp/client/rdpgfx.h +++ b/include/freerdp/client/rdpgfx.h @@ -30,7 +30,7 @@ * Client Interface */ -typedef struct _rdpgfx_client_context RdpgfxClientContext; +typedef struct s_rdpgfx_client_context RdpgfxClientContext; typedef UINT (*pcRdpgfxResetGraphics)(RdpgfxClientContext* context, const RDPGFX_RESET_GRAPHICS_PDU* resetGraphics); @@ -97,7 +97,7 @@ typedef UINT (*pcRdpgfxMapWindowForSurface)(RdpgfxClientContext* context, UINT16 UINT64 windowID); typedef UINT (*pcRdpgfxUnmapWindowForSurface)(RdpgfxClientContext* context, UINT64 windowID); -struct _rdpgfx_client_context +struct s_rdpgfx_client_context { void* handle; void* custom; diff --git a/include/freerdp/client/rdpsnd.h b/include/freerdp/client/rdpsnd.h index 0ce0d79e8..1ecfb4ae9 100644 --- a/include/freerdp/client/rdpsnd.h +++ b/include/freerdp/client/rdpsnd.h @@ -60,13 +60,12 @@ struct rdpsnd_device_plugin typedef void (*PREGISTERRDPSNDDEVICE)(rdpsndPlugin* rdpsnd, rdpsndDevicePlugin* device); -struct _FREERDP_RDPSND_DEVICE_ENTRY_POINTS +typedef struct { rdpsndPlugin* rdpsnd; PREGISTERRDPSNDDEVICE pRegisterRdpsndDevice; const ADDIN_ARGV* args; -}; -typedef struct _FREERDP_RDPSND_DEVICE_ENTRY_POINTS FREERDP_RDPSND_DEVICE_ENTRY_POINTS; +} FREERDP_RDPSND_DEVICE_ENTRY_POINTS; typedef FREERDP_RDPSND_DEVICE_ENTRY_POINTS* PFREERDP_RDPSND_DEVICE_ENTRY_POINTS; typedef UINT (*PFREERDP_RDPSND_DEVICE_ENTRY)(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints); diff --git a/include/freerdp/client/remdesk.h b/include/freerdp/client/remdesk.h index 58a10ba10..89751f4dc 100644 --- a/include/freerdp/client/remdesk.h +++ b/include/freerdp/client/remdesk.h @@ -26,12 +26,10 @@ * Client Interface */ -typedef struct _remdesk_client_context RemdeskClientContext; - -struct _remdesk_client_context +typedef struct { void* handle; void* custom; -}; +} RemdeskClientContext; #endif /* FREERDP_CHANNEL_REMDESK_CLIENT_REMDESK_H */ diff --git a/include/freerdp/client/sshagent.h b/include/freerdp/client/sshagent.h index dfb27ca6c..f549abbfa 100644 --- a/include/freerdp/client/sshagent.h +++ b/include/freerdp/client/sshagent.h @@ -26,7 +26,7 @@ #include #include -typedef struct _sshagent_client_context +typedef struct { int ProtocolVersion; int MaxConnections; diff --git a/include/freerdp/client/tsmf.h b/include/freerdp/client/tsmf.h index 0d5e0d549..a3d1be62d 100644 --- a/include/freerdp/client/tsmf.h +++ b/include/freerdp/client/tsmf.h @@ -36,7 +36,7 @@ #define RDP_PIXFMT_I420 0x30323449 #define RDP_PIXFMT_YV12 0x32315659 -struct _TSMF_VIDEO_FRAME_EVENT +typedef struct { BYTE* frameData; UINT32 frameSize; @@ -49,18 +49,17 @@ struct _TSMF_VIDEO_FRAME_EVENT INT16 height; UINT16 numVisibleRects; RECTANGLE_16* visibleRects; -}; -typedef struct _TSMF_VIDEO_FRAME_EVENT TSMF_VIDEO_FRAME_EVENT; +} TSMF_VIDEO_FRAME_EVENT; /** * Client Interface */ -typedef struct _tsmf_client_context TsmfClientContext; +typedef struct s_tsmf_client_context TsmfClientContext; typedef int (*pcTsmfFrameEvent)(TsmfClientContext* context, TSMF_VIDEO_FRAME_EVENT* event); -struct _tsmf_client_context +struct s_tsmf_client_context { void* handle; void* custom; diff --git a/include/freerdp/client/video.h b/include/freerdp/client/video.h index be7f9e213..e520e98ee 100644 --- a/include/freerdp/client/video.h +++ b/include/freerdp/client/video.h @@ -28,23 +28,18 @@ extern "C" { #endif - typedef struct _VideoClientContext VideoClientContext; - typedef struct _VideoClientContextPriv VideoClientContextPriv; - typedef struct _VideoSurface VideoSurface; + typedef struct s_VideoClientContext VideoClientContext; + typedef struct s_VideoClientContextPriv VideoClientContextPriv; /** @brief an implementation of surface used by the video channel */ - struct _VideoSurface + typedef struct { UINT32 x, y, w, h; UINT32 alignedWidth, alignedHeight; BYTE* data; DWORD format; UINT32 scanline; - }; - - FREERDP_API VideoSurface* VideoClient_CreateCommonContext(size_t size, UINT32 x, UINT32 y, - UINT32 w, UINT32 h); - FREERDP_API void VideoClient_DestroyCommonContext(VideoSurface* surface); + } VideoSurface; typedef void (*pcVideoTimer)(VideoClientContext* video, UINT64 now); typedef void (*pcVideoSetGeometry)(VideoClientContext* video, GeometryClientContext* geometry); @@ -55,7 +50,7 @@ extern "C" typedef BOOL (*pcVideoDeleteSurface)(VideoClientContext* video, VideoSurface* surface); /** @brief context for the video (MS-RDPEVOR) channel */ - struct _VideoClientContext + struct s_VideoClientContext { void* handle; void* custom; @@ -68,6 +63,10 @@ extern "C" pcVideoDeleteSurface deleteSurface; }; + FREERDP_API VideoSurface* VideoClient_CreateCommonContext(size_t size, UINT32 x, UINT32 y, + UINT32 w, UINT32 h); + FREERDP_API void VideoClient_DestroyCommonContext(VideoSurface* surface); + #ifdef __cplusplus } #endif diff --git a/include/freerdp/codec/clear.h b/include/freerdp/codec/clear.h index 84393086a..859c24cfb 100644 --- a/include/freerdp/codec/clear.h +++ b/include/freerdp/codec/clear.h @@ -26,7 +26,7 @@ #include #include -typedef struct _CLEAR_CONTEXT CLEAR_CONTEXT; +typedef struct S_CLEAR_CONTEXT CLEAR_CONTEXT; #ifdef __cplusplus extern "C" diff --git a/include/freerdp/codec/dsp.h b/include/freerdp/codec/dsp.h index 779966169..8ce28dc56 100644 --- a/include/freerdp/codec/dsp.h +++ b/include/freerdp/codec/dsp.h @@ -25,7 +25,7 @@ #include #include -typedef struct _FREERDP_DSP_CONTEXT FREERDP_DSP_CONTEXT; +typedef struct S_FREERDP_DSP_CONTEXT FREERDP_DSP_CONTEXT; #ifdef __cplusplus extern "C" diff --git a/include/freerdp/codec/h264.h b/include/freerdp/codec/h264.h index 995c540cc..b2dbc97f9 100644 --- a/include/freerdp/codec/h264.h +++ b/include/freerdp/codec/h264.h @@ -26,18 +26,16 @@ #include #include -typedef struct _H264_CONTEXT H264_CONTEXT; -typedef struct _H264_CONTEXT_SUBSYSTEM H264_CONTEXT_SUBSYSTEM; -typedef struct _YUV_CONTEXT YUV_CONTEXT; +typedef struct S_H264_CONTEXT_SUBSYSTEM H264_CONTEXT_SUBSYSTEM; +typedef struct S_YUV_CONTEXT YUV_CONTEXT; -enum _H264_RATECONTROL_MODE +typedef enum { H264_RATECONTROL_VBR = 0, H264_RATECONTROL_CQP -}; -typedef enum _H264_RATECONTROL_MODE H264_RATECONTROL_MODE; +} H264_RATECONTROL_MODE; -struct _H264_CONTEXT +typedef struct { BOOL Compressor; @@ -70,7 +68,8 @@ struct _H264_CONTEXT void* lumaData; wLog* log; -}; +} H264_CONTEXT; + #ifdef __cplusplus extern "C" { diff --git a/include/freerdp/codec/interleaved.h b/include/freerdp/codec/interleaved.h index 63d295b33..d2ef02e5a 100644 --- a/include/freerdp/codec/interleaved.h +++ b/include/freerdp/codec/interleaved.h @@ -20,23 +20,13 @@ #ifndef FREERDP_CODEC_INTERLEAVED_H #define FREERDP_CODEC_INTERLEAVED_H -typedef struct _BITMAP_INTERLEAVED_CONTEXT BITMAP_INTERLEAVED_CONTEXT; - #include #include #include #include -struct _BITMAP_INTERLEAVED_CONTEXT -{ - BOOL Compressor; - - UINT32 TempSize; - BYTE* TempBuffer; - - wStream* bts; -}; +typedef struct S_BITMAP_INTERLEAVED_CONTEXT BITMAP_INTERLEAVED_CONTEXT; #ifdef __cplusplus extern "C" diff --git a/include/freerdp/codec/nsc.h b/include/freerdp/codec/nsc.h index 3dda9df9f..408f0850f 100644 --- a/include/freerdp/codec/nsc.h +++ b/include/freerdp/codec/nsc.h @@ -42,7 +42,7 @@ extern "C" NSC_COLOR_FORMAT } NSC_PARAMETER; - typedef struct _NSC_CONTEXT NSC_CONTEXT; + typedef struct S_NSC_CONTEXT NSC_CONTEXT; #if defined(WITH_FREERDP_DEPRECATED) FREERDP_API WINPR_DEPRECATED(BOOL nsc_context_set_pixel_format(NSC_CONTEXT* context, diff --git a/include/freerdp/codec/planar.h b/include/freerdp/codec/planar.h index 5184424c5..34a5e6e0a 100644 --- a/include/freerdp/codec/planar.h +++ b/include/freerdp/codec/planar.h @@ -24,7 +24,7 @@ #include -typedef struct _BITMAP_PLANAR_CONTEXT BITMAP_PLANAR_CONTEXT; +typedef struct S_BITMAP_PLANAR_CONTEXT BITMAP_PLANAR_CONTEXT; #include #include @@ -40,7 +40,7 @@ typedef struct _BITMAP_PLANAR_CONTEXT BITMAP_PLANAR_CONTEXT; #define PLANAR_CONTROL_BYTE_RUN_LENGTH(_controlByte) (_controlByte & 0x0F) #define PLANAR_CONTROL_BYTE_RAW_BYTES(_controlByte) ((_controlByte >> 4) & 0x0F) -struct _RDP6_RLE_SEGMENT +typedef struct { /** * controlByte: @@ -49,17 +49,15 @@ struct _RDP6_RLE_SEGMENT */ BYTE controlByte; BYTE* rawValues; -}; -typedef struct _RDP6_RLE_SEGMENT RDP6_RLE_SEGMENT; +} RDP6_RLE_SEGMENT; -struct _RDP6_RLE_SEGMENTS +typedef struct { UINT32 cSegments; RDP6_RLE_SEGMENT* segments; -}; -typedef struct _RDP6_RLE_SEGMENTS RDP6_RLE_SEGMENTS; +} RDP6_RLE_SEGMENTS; -struct _RDP6_BITMAP_STREAM +typedef struct { /** * formatHeader: @@ -70,10 +68,9 @@ struct _RDP6_BITMAP_STREAM * [6-7]: Reserved */ BYTE formatHeader; -}; -typedef struct _RDP6_BITMAP_STREAM RDP6_BITMAP_STREAM; +} RDP6_BITMAP_STREAM; -struct _BITMAP_PLANAR_CONTEXT +struct S_BITMAP_PLANAR_CONTEXT { UINT32 maxWidth; UINT32 maxHeight; diff --git a/include/freerdp/codec/progressive.h b/include/freerdp/codec/progressive.h index 57a81f98d..e23ca2dff 100644 --- a/include/freerdp/codec/progressive.h +++ b/include/freerdp/codec/progressive.h @@ -20,7 +20,7 @@ #ifndef FREERDP_CODEC_PROGRESSIVE_H #define FREERDP_CODEC_PROGRESSIVE_H -typedef struct _PROGRESSIVE_CONTEXT PROGRESSIVE_CONTEXT; +typedef struct S_PROGRESSIVE_CONTEXT PROGRESSIVE_CONTEXT; #include #include diff --git a/include/freerdp/codec/region.h b/include/freerdp/codec/region.h index daac6fb44..19239b634 100644 --- a/include/freerdp/codec/region.h +++ b/include/freerdp/codec/region.h @@ -32,15 +32,13 @@ extern "C" { #endif - struct _REGION16_DATA; - typedef struct _REGION16_DATA REGION16_DATA; + typedef struct S_REGION16_DATA REGION16_DATA; - struct _REGION16 + typedef struct { RECTANGLE_16 extents; REGION16_DATA* data; - }; - typedef struct _REGION16 REGION16; + } REGION16; /** computes if two rectangles are equal * @param r1 first rectangle diff --git a/include/freerdp/codec/rfx.h b/include/freerdp/codec/rfx.h index f71207dac..d989c92c1 100644 --- a/include/freerdp/codec/rfx.h +++ b/include/freerdp/codec/rfx.h @@ -22,14 +22,8 @@ #ifndef FREERDP_CODEC_REMOTEFX_H #define FREERDP_CODEC_REMOTEFX_H -typedef struct _RFX_RECT RFX_RECT; -typedef struct _RFX_TILE RFX_TILE; -typedef struct _RFX_MESSAGE RFX_MESSAGE; -typedef struct _RFX_CONTEXT RFX_CONTEXT; - #include #include -#include #include #include @@ -40,22 +34,21 @@ extern "C" { #endif - enum _RLGR_MODE + typedef enum { RLGR1, RLGR3 - }; - typedef enum _RLGR_MODE RLGR_MODE; + } RLGR_MODE; - struct _RFX_RECT + typedef struct { UINT16 x; UINT16 y; UINT16 width; UINT16 height; - }; + } RFX_RECT; - struct _RFX_TILE + typedef struct { UINT16 x; UINT16 y; @@ -76,9 +69,9 @@ extern "C" BYTE* CbData; BYTE* CrData; BYTE* YCbCrData; - }; + } RFX_TILE; - struct _RFX_MESSAGE + typedef struct { UINT32 frameIdx; @@ -105,11 +98,11 @@ extern "C" UINT32 tilesDataSize; BOOL freeArray; - }; + } RFX_MESSAGE; - typedef struct _RFX_CONTEXT_PRIV RFX_CONTEXT_PRIV; + typedef struct S_RFX_CONTEXT_PRIV RFX_CONTEXT_PRIV; - enum _RFX_STATE + typedef enum { RFX_STATE_INITIAL, RFX_STATE_SERVER_UNINITIALIZED, @@ -117,8 +110,7 @@ extern "C" RFX_STATE_SEND_FRAME_DATA, RFX_STATE_FRAME_DATA_SENT, RFX_STATE_FINAL - }; - typedef enum _RFX_STATE RFX_STATE; + } RFX_STATE; #define RFX_DECODED_SYNC 0x00000001 #define RFX_DECODED_CONTEXT 0x00000002 @@ -126,7 +118,7 @@ extern "C" #define RFX_DECODED_CHANNELS 0x00000008 #define RFX_DECODED_HEADERS 0x0000000F - struct _RFX_CONTEXT + typedef struct { RFX_STATE state; @@ -170,7 +162,7 @@ extern "C" /* private definitions */ RFX_CONTEXT_PRIV* priv; - }; + } RFX_CONTEXT; FREERDP_API void rfx_context_set_pixel_format(RFX_CONTEXT* context, UINT32 pixel_format); diff --git a/include/freerdp/codec/yuv.h b/include/freerdp/codec/yuv.h index ab66cd7f7..be5ba81ab 100644 --- a/include/freerdp/codec/yuv.h +++ b/include/freerdp/codec/yuv.h @@ -20,7 +20,7 @@ #ifndef FREERDP_CODEC_YUV_H #define FREERDP_CODEC_YUV_H -typedef struct _YUV_CONTEXT YUV_CONTEXT; +typedef struct S_YUV_CONTEXT YUV_CONTEXT; #include #include diff --git a/include/freerdp/codec/zgfx.h b/include/freerdp/codec/zgfx.h index 17038b6b6..074bbd68a 100644 --- a/include/freerdp/codec/zgfx.h +++ b/include/freerdp/codec/zgfx.h @@ -32,7 +32,7 @@ #define ZGFX_SEGMENTED_MAXSIZE 65535 -typedef struct _ZGFX_CONTEXT ZGFX_CONTEXT; +typedef struct S_ZGFX_CONTEXT ZGFX_CONTEXT; #ifdef __cplusplus extern "C" diff --git a/include/freerdp/codecs.h b/include/freerdp/codecs.h index b1134d121..d0d0714db 100644 --- a/include/freerdp/codecs.h +++ b/include/freerdp/codecs.h @@ -22,6 +22,8 @@ #include +#include + #include #include diff --git a/include/freerdp/dvc.h b/include/freerdp/dvc.h index fa7fd7bc7..d38caf3bd 100644 --- a/include/freerdp/dvc.h +++ b/include/freerdp/dvc.h @@ -56,15 +56,15 @@ #include #include -typedef struct _IWTSVirtualChannelManager IWTSVirtualChannelManager; -typedef struct _IWTSListener IWTSListener; -typedef struct _IWTSVirtualChannel IWTSVirtualChannel; +typedef struct s_IWTSVirtualChannelManager IWTSVirtualChannelManager; +typedef struct s_IWTSListener IWTSListener; +typedef struct s_IWTSVirtualChannel IWTSVirtualChannel; -typedef struct _IWTSPlugin IWTSPlugin; -typedef struct _IWTSListenerCallback IWTSListenerCallback; -typedef struct _IWTSVirtualChannelCallback IWTSVirtualChannelCallback; +typedef struct s_IWTSPlugin IWTSPlugin; +typedef struct s_IWTSListenerCallback IWTSListenerCallback; +typedef struct s_IWTSVirtualChannelCallback IWTSVirtualChannelCallback; -struct _IWTSListener +struct s_IWTSListener { /* Retrieves the listener-specific configuration. */ UINT (*GetConfiguration)(IWTSListener* pListener, void** ppPropertyBag); @@ -72,7 +72,7 @@ struct _IWTSListener void* pInterface; }; -struct _IWTSVirtualChannel +struct s_IWTSVirtualChannel { /* Starts a write request on the channel. */ UINT (*Write)(IWTSVirtualChannel* pChannel, ULONG cbSize, const BYTE* pBuffer, void* pReserved); @@ -80,7 +80,7 @@ struct _IWTSVirtualChannel UINT (*Close)(IWTSVirtualChannel* pChannel); }; -struct _IWTSVirtualChannelManager +struct s_IWTSVirtualChannelManager { /* Returns an instance of a listener object that listens on a specific endpoint, or creates a static channel. */ @@ -95,7 +95,7 @@ struct _IWTSVirtualChannelManager UINT (*DestroyListener)(IWTSVirtualChannelManager* pChannelMgr, IWTSListener* ppListener); }; -struct _IWTSPlugin +struct s_IWTSPlugin { /* Used for the first call that is made from the client to the plug-in. */ UINT (*Initialize)(IWTSPlugin* pPlugin, IWTSVirtualChannelManager* pChannelMgr); @@ -119,7 +119,7 @@ struct _IWTSPlugin void* pInterface; }; -struct _IWTSListenerCallback +struct s_IWTSListenerCallback { /* Accepts or denies a connection request for an incoming connection to the associated listener. */ @@ -128,7 +128,7 @@ struct _IWTSListenerCallback BOOL* pbAccept, IWTSVirtualChannelCallback** ppCallback); }; -struct _IWTSVirtualChannelCallback +struct s_IWTSVirtualChannelCallback { /* Notifies the user about data that is being received. */ UINT (*OnDataReceived)(IWTSVirtualChannelCallback* pChannelCallback, wStream* data); @@ -139,8 +139,8 @@ struct _IWTSVirtualChannelCallback }; /* The DVC Plugin entry points */ -typedef struct _IDRDYNVC_ENTRY_POINTS IDRDYNVC_ENTRY_POINTS; -struct _IDRDYNVC_ENTRY_POINTS +typedef struct S_IDRDYNVC_ENTRY_POINTS IDRDYNVC_ENTRY_POINTS; +struct S_IDRDYNVC_ENTRY_POINTS { UINT(*RegisterPlugin) (IDRDYNVC_ENTRY_POINTS* pEntryPoints, const char* name, IWTSPlugin* pPlugin); diff --git a/include/freerdp/extension.h b/include/freerdp/extension.h index 40b4283a6..57eae102b 100644 --- a/include/freerdp/extension.h +++ b/include/freerdp/extension.h @@ -43,16 +43,14 @@ typedef UINT32(FREERDP_CC* PREGISTERPRECONNECTHOOK)(rdpExtPlugin* plugin, typedef UINT32(FREERDP_CC* PREGISTERPOSTCONNECTHOOK)(rdpExtPlugin* plugin, PFREERDP_EXTENSION_HOOK hook); -struct _FREERDP_EXTENSION_ENTRY_POINTS +typedef struct { void* ext; /* Reference to internal instance */ PREGISTEREXTENSION pRegisterExtension; PREGISTERPRECONNECTHOOK pRegisterPreConnectHook; PREGISTERPOSTCONNECTHOOK pRegisterPostConnectHook; void* data; -}; - -typedef struct _FREERDP_EXTENSION_ENTRY_POINTS FREERDP_EXTENSION_ENTRY_POINTS; +} FREERDP_EXTENSION_ENTRY_POINTS; typedef FREERDP_EXTENSION_ENTRY_POINTS* PFREERDP_EXTENSION_ENTRY_POINTS; typedef int(FREERDP_CC* PFREERDP_EXTENSION_ENTRY)(PFREERDP_EXTENSION_ENTRY_POINTS pEntryPoints); diff --git a/include/freerdp/gdi/gdi.h b/include/freerdp/gdi/gdi.h index 790f5df21..e021b2be9 100644 --- a/include/freerdp/gdi/gdi.h +++ b/include/freerdp/gdi/gdi.h @@ -356,25 +356,23 @@ #define COMPLEXREGION 0x03 #endif -struct _GDIOBJECT +typedef struct { BYTE objectType; -}; -typedef struct _GDIOBJECT GDIOBJECT; +} GDIOBJECT; typedef GDIOBJECT* HGDIOBJECT; -struct _GDI_RECT +typedef struct { BYTE objectType; INT32 left; INT32 top; INT32 right; INT32 bottom; -}; -typedef struct _GDI_RECT GDI_RECT; +} GDI_RECT; typedef GDI_RECT* HGDI_RECT; -struct _GDI_RGN +typedef struct { BYTE objectType; INT32 x; /* left */ @@ -382,11 +380,10 @@ struct _GDI_RGN INT32 w; /* width */ INT32 h; /* height */ BOOL null; /* null region */ -}; -typedef struct _GDI_RGN GDI_RGN; +} GDI_RGN; typedef GDI_RGN* HGDI_RGN; -struct _GDI_BITMAP +typedef struct { BYTE objectType; UINT32 format; @@ -395,11 +392,10 @@ struct _GDI_BITMAP UINT32 scanline; BYTE* data; void (*free)(void*); -}; -typedef struct _GDI_BITMAP GDI_BITMAP; +} GDI_BITMAP; typedef GDI_BITMAP* HGDI_BITMAP; -struct _GDI_PEN +typedef struct { BYTE objectType; UINT32 style; @@ -409,35 +405,31 @@ struct _GDI_PEN UINT32 color; UINT32 format; const gdiPalette* palette; -}; -typedef struct _GDI_PEN GDI_PEN; +} GDI_PEN; typedef GDI_PEN* HGDI_PEN; -struct _GDI_PALETTEENTRY +typedef struct { BYTE red; BYTE green; BYTE blue; -}; -typedef struct _GDI_PALETTEENTRY GDI_PALETTEENTRY; +} GDI_PALETTEENTRY; -struct _GDI_PALETTE +typedef struct { UINT16 count; GDI_PALETTEENTRY* entries; -}; -typedef struct _GDI_PALETTE GDI_PALETTE; +} GDI_PALETTE; typedef GDI_PALETTE* HGDI_PALETTE; -struct _GDI_POINT +typedef struct { INT32 x; INT32 y; -}; -typedef struct _GDI_POINT GDI_POINT; +} GDI_POINT; typedef GDI_POINT* HGDI_POINT; -struct _GDI_BRUSH +typedef struct { BYTE objectType; int style; @@ -445,21 +437,19 @@ struct _GDI_BRUSH UINT32 color; INT32 nXOrg; INT32 nYOrg; -}; -typedef struct _GDI_BRUSH GDI_BRUSH; +} GDI_BRUSH; typedef GDI_BRUSH* HGDI_BRUSH; -struct _GDI_WND +typedef struct { UINT32 count; INT32 ninvalid; HGDI_RGN invalid; HGDI_RGN cinvalid; -}; -typedef struct _GDI_WND GDI_WND; +} GDI_WND; typedef GDI_WND* HGDI_WND; -struct _GDI_DC +typedef struct { HGDIOBJECT selectedObject; UINT32 format; @@ -471,8 +461,7 @@ struct _GDI_DC HGDI_WND hwnd; INT32 drawMode; INT32 bkMode; -}; -typedef struct _GDI_DC GDI_DC; +} GDI_DC; typedef GDI_DC* HGDI_DC; struct gdi_bitmap diff --git a/include/freerdp/gdi/video.h b/include/freerdp/gdi/video.h index f34b45ddb..9d740035a 100644 --- a/include/freerdp/gdi/video.h +++ b/include/freerdp/gdi/video.h @@ -24,8 +24,7 @@ #include #include -struct _gdiVideoContext; -typedef struct _gdiVideoContext gdiVideoContext; +typedef struct s_gdiVideoContext gdiVideoContext; FREERDP_API void gdi_video_geometry_init(rdpGdi* gdi, GeometryClientContext* geom); FREERDP_API void gdi_video_geometry_uninit(rdpGdi* gdi, GeometryClientContext* geom); diff --git a/include/freerdp/locale/keyboard.h b/include/freerdp/locale/keyboard.h index 0769b5c52..366b8ed1b 100644 --- a/include/freerdp/locale/keyboard.h +++ b/include/freerdp/locale/keyboard.h @@ -30,7 +30,7 @@ #define RDP_KEYBOARD_LAYOUT_TYPE_VARIANT 2 #define RDP_KEYBOARD_LAYOUT_TYPE_IME 4 -struct _RDP_CODEPAGE +typedef struct { UINT16 id; UINT8 primaryId; @@ -40,15 +40,13 @@ struct _RDP_CODEPAGE char primaryLanguageSymbol[512]; char subLanguage[512]; char subLanguageSymbol[512]; -}; -typedef struct _RDP_CODEPAGE RDP_CODEPAGE; +} RDP_CODEPAGE; -struct _RDP_KEYBOARD_LAYOUT +typedef struct { DWORD code; /* Keyboard layout code */ char* name; /* Keyboard layout name */ -}; -typedef struct _RDP_KEYBOARD_LAYOUT RDP_KEYBOARD_LAYOUT; +} RDP_KEYBOARD_LAYOUT; /* Keyboard layout IDs */ diff --git a/include/freerdp/pointer.h b/include/freerdp/pointer.h index 5ea720bb1..731348785 100644 --- a/include/freerdp/pointer.h +++ b/include/freerdp/pointer.h @@ -32,20 +32,18 @@ #define SYSPTR_NULL 0x00000000 #define SYSPTR_DEFAULT 0x00007F00 -struct _POINTER_POSITION_UPDATE +typedef struct { UINT32 xPos; UINT32 yPos; -}; -typedef struct _POINTER_POSITION_UPDATE POINTER_POSITION_UPDATE; +} POINTER_POSITION_UPDATE; -struct _POINTER_SYSTEM_UPDATE +typedef struct { UINT32 type; -}; -typedef struct _POINTER_SYSTEM_UPDATE POINTER_SYSTEM_UPDATE; +} POINTER_SYSTEM_UPDATE; -struct _POINTER_COLOR_UPDATE +typedef struct { UINT32 cacheIndex; UINT32 xPos; @@ -56,10 +54,9 @@ struct _POINTER_COLOR_UPDATE UINT32 lengthXorMask; BYTE* xorMaskData; BYTE* andMaskData; -}; -typedef struct _POINTER_COLOR_UPDATE POINTER_COLOR_UPDATE; +} POINTER_COLOR_UPDATE; -struct _POINTER_LARGE_UPDATE +typedef struct { UINT16 xorBpp; UINT16 cacheIndex; @@ -71,21 +68,18 @@ struct _POINTER_LARGE_UPDATE UINT32 lengthXorMask; BYTE* xorMaskData; BYTE* andMaskData; -}; -typedef struct _POINTER_LARGE_UPDATE POINTER_LARGE_UPDATE; +} POINTER_LARGE_UPDATE; -struct _POINTER_NEW_UPDATE +typedef struct { UINT32 xorBpp; POINTER_COLOR_UPDATE colorPtrAttr; -}; -typedef struct _POINTER_NEW_UPDATE POINTER_NEW_UPDATE; +} POINTER_NEW_UPDATE; -struct _POINTER_CACHED_UPDATE +typedef struct { UINT32 cacheIndex; -}; -typedef struct _POINTER_CACHED_UPDATE POINTER_CACHED_UPDATE; +} POINTER_CACHED_UPDATE; typedef BOOL (*pPointerPosition)(rdpContext* context, const POINTER_POSITION_UPDATE* pointer_position); diff --git a/include/freerdp/primary.h b/include/freerdp/primary.h index 80e34c4b3..0f6b6f26e 100644 --- a/include/freerdp/primary.h +++ b/include/freerdp/primary.h @@ -22,7 +22,7 @@ #include -struct _GLYPH_DATA +typedef struct { UINT32 cacheIndex; INT16 x; @@ -31,10 +31,9 @@ struct _GLYPH_DATA UINT32 cy; UINT32 cb; BYTE* aj; -}; -typedef struct _GLYPH_DATA GLYPH_DATA; +} GLYPH_DATA; -struct _GLYPH_DATA_V2 +typedef struct { UINT32 cacheIndex; INT32 x; @@ -43,8 +42,7 @@ struct _GLYPH_DATA_V2 UINT32 cy; UINT32 cb; BYTE* aj; -}; -typedef struct _GLYPH_DATA_V2 GLYPH_DATA_V2; +} GLYPH_DATA_V2; #define BACKMODE_TRANSPARENT 0x0001 #define BACKMODE_OPAQUE 0x0002 @@ -71,7 +69,7 @@ struct rdp_brush }; typedef struct rdp_brush rdpBrush; -struct _ORDER_INFO +typedef struct { UINT32 controlFlags; UINT32 orderType; @@ -79,20 +77,18 @@ struct _ORDER_INFO UINT32 boundsFlags; rdpBounds bounds; BOOL deltaCoordinates; -}; -typedef struct _ORDER_INFO ORDER_INFO; +} ORDER_INFO; -struct _DSTBLT_ORDER +typedef struct { INT32 nLeftRect; INT32 nTopRect; INT32 nWidth; INT32 nHeight; UINT32 bRop; -}; -typedef struct _DSTBLT_ORDER DSTBLT_ORDER; +} DSTBLT_ORDER; -struct _PATBLT_ORDER +typedef struct { INT32 nLeftRect; INT32 nTopRect; @@ -102,10 +98,9 @@ struct _PATBLT_ORDER UINT32 backColor; UINT32 foreColor; rdpBrush brush; -}; -typedef struct _PATBLT_ORDER PATBLT_ORDER; +} PATBLT_ORDER; -struct _SCRBLT_ORDER +typedef struct { INT32 nLeftRect; INT32 nTopRect; @@ -114,39 +109,35 @@ struct _SCRBLT_ORDER UINT32 bRop; INT32 nXSrc; INT32 nYSrc; -}; -typedef struct _SCRBLT_ORDER SCRBLT_ORDER; +} SCRBLT_ORDER; -struct _OPAQUE_RECT_ORDER +typedef struct { INT32 nLeftRect; INT32 nTopRect; INT32 nWidth; INT32 nHeight; UINT32 color; -}; -typedef struct _OPAQUE_RECT_ORDER OPAQUE_RECT_ORDER; +} OPAQUE_RECT_ORDER; -struct _DRAW_NINE_GRID_ORDER +typedef struct { INT32 srcLeft; INT32 srcTop; INT32 srcRight; INT32 srcBottom; UINT32 bitmapId; -}; -typedef struct _DRAW_NINE_GRID_ORDER DRAW_NINE_GRID_ORDER; +} DRAW_NINE_GRID_ORDER; -struct _DELTA_RECT +typedef struct { INT32 left; INT32 top; INT32 width; INT32 height; -}; -typedef struct _DELTA_RECT DELTA_RECT; +} DELTA_RECT; -struct _MULTI_DSTBLT_ORDER +typedef struct { INT32 nLeftRect; INT32 nTopRect; @@ -156,10 +147,9 @@ struct _MULTI_DSTBLT_ORDER UINT32 numRectangles; UINT32 cbData; DELTA_RECT rectangles[45]; -}; -typedef struct _MULTI_DSTBLT_ORDER MULTI_DSTBLT_ORDER; +} MULTI_DSTBLT_ORDER; -struct _MULTI_PATBLT_ORDER +typedef struct { INT32 nLeftRect; INT32 nTopRect; @@ -172,10 +162,9 @@ struct _MULTI_PATBLT_ORDER UINT32 numRectangles; UINT32 cbData; DELTA_RECT rectangles[45]; -}; -typedef struct _MULTI_PATBLT_ORDER MULTI_PATBLT_ORDER; +} MULTI_PATBLT_ORDER; -struct _MULTI_SCRBLT_ORDER +typedef struct { INT32 nLeftRect; INT32 nTopRect; @@ -187,10 +176,9 @@ struct _MULTI_SCRBLT_ORDER UINT32 numRectangles; UINT32 cbData; DELTA_RECT rectangles[45]; -}; -typedef struct _MULTI_SCRBLT_ORDER MULTI_SCRBLT_ORDER; +} MULTI_SCRBLT_ORDER; -struct _MULTI_OPAQUE_RECT_ORDER +typedef struct { INT32 nLeftRect; INT32 nTopRect; @@ -200,10 +188,9 @@ struct _MULTI_OPAQUE_RECT_ORDER UINT32 numRectangles; UINT32 cbData; DELTA_RECT rectangles[45]; -}; -typedef struct _MULTI_OPAQUE_RECT_ORDER MULTI_OPAQUE_RECT_ORDER; +} MULTI_OPAQUE_RECT_ORDER; -struct _MULTI_DRAW_NINE_GRID_ORDER +typedef struct { INT32 srcLeft; INT32 srcTop; @@ -213,10 +200,9 @@ struct _MULTI_DRAW_NINE_GRID_ORDER UINT32 nDeltaEntries; UINT32 cbData; DELTA_RECT rectangles[45]; -}; -typedef struct _MULTI_DRAW_NINE_GRID_ORDER MULTI_DRAW_NINE_GRID_ORDER; +} MULTI_DRAW_NINE_GRID_ORDER; -struct _LINE_TO_ORDER +typedef struct { UINT32 backMode; INT32 nXStart; @@ -228,17 +214,15 @@ struct _LINE_TO_ORDER UINT32 penStyle; UINT32 penWidth; UINT32 penColor; -}; -typedef struct _LINE_TO_ORDER LINE_TO_ORDER; +} LINE_TO_ORDER; -struct _DELTA_POINT +typedef struct { INT32 x; INT32 y; -}; -typedef struct _DELTA_POINT DELTA_POINT; +} DELTA_POINT; -struct _POLYLINE_ORDER +typedef struct { INT32 xStart; INT32 yStart; @@ -247,10 +231,9 @@ struct _POLYLINE_ORDER UINT32 numDeltaEntries; UINT32 cbData; DELTA_POINT* points; -}; -typedef struct _POLYLINE_ORDER POLYLINE_ORDER; +} POLYLINE_ORDER; -struct _MEMBLT_ORDER +typedef struct { UINT32 cacheId; UINT32 colorIndex; @@ -263,10 +246,9 @@ struct _MEMBLT_ORDER INT32 nYSrc; UINT32 cacheIndex; rdpBitmap* bitmap; -}; -typedef struct _MEMBLT_ORDER MEMBLT_ORDER; +} MEMBLT_ORDER; -struct _MEM3BLT_ORDER +typedef struct { UINT32 cacheId; UINT32 colorIndex; @@ -282,10 +264,9 @@ struct _MEM3BLT_ORDER rdpBrush brush; UINT32 cacheIndex; rdpBitmap* bitmap; -}; -typedef struct _MEM3BLT_ORDER MEM3BLT_ORDER; +} MEM3BLT_ORDER; -struct _SAVE_BITMAP_ORDER +typedef struct { UINT32 savedBitmapPosition; INT32 nLeftRect; @@ -293,27 +274,24 @@ struct _SAVE_BITMAP_ORDER INT32 nRightRect; INT32 nBottomRect; UINT32 operation; -}; -typedef struct _SAVE_BITMAP_ORDER SAVE_BITMAP_ORDER; +} SAVE_BITMAP_ORDER; -struct _GLYPH_FRAGMENT_INDEX +typedef struct { UINT32 index; UINT32 delta; -}; -typedef struct _GLYPH_FRAGMENT_INDEX GLYPH_FRAGMENT_INDEX; +} GLYPH_FRAGMENT_INDEX; -struct _GLYPH_FRAGMENT +typedef struct { UINT32 operation; UINT32 index; UINT32 size; UINT32 nindices; GLYPH_FRAGMENT_INDEX* indices; -}; -typedef struct _GLYPH_FRAGMENT GLYPH_FRAGMENT; +} GLYPH_FRAGMENT; -struct _GLYPH_INDEX_ORDER +typedef struct { UINT32 cacheId; UINT32 flAccel; @@ -334,10 +312,9 @@ struct _GLYPH_INDEX_ORDER INT32 y; UINT32 cbData; BYTE data[256]; -}; -typedef struct _GLYPH_INDEX_ORDER GLYPH_INDEX_ORDER; +} GLYPH_INDEX_ORDER; -struct _FAST_INDEX_ORDER +typedef struct { UINT32 cacheId; UINT32 flAccel; @@ -357,10 +334,9 @@ struct _FAST_INDEX_ORDER INT32 y; UINT32 cbData; BYTE data[256]; -}; -typedef struct _FAST_INDEX_ORDER FAST_INDEX_ORDER; +} FAST_INDEX_ORDER; -struct _FAST_GLYPH_ORDER +typedef struct { UINT32 cacheId; UINT32 flAccel; @@ -380,10 +356,9 @@ struct _FAST_GLYPH_ORDER UINT32 cbData; BYTE data[256]; GLYPH_DATA_V2 glyphData; -}; -typedef struct _FAST_GLYPH_ORDER FAST_GLYPH_ORDER; +} FAST_GLYPH_ORDER; -struct _POLYGON_SC_ORDER +typedef struct { INT32 xStart; INT32 yStart; @@ -393,10 +368,9 @@ struct _POLYGON_SC_ORDER UINT32 numPoints; UINT32 cbData; DELTA_POINT* points; -}; -typedef struct _POLYGON_SC_ORDER POLYGON_SC_ORDER; +} POLYGON_SC_ORDER; -struct _POLYGON_CB_ORDER +typedef struct { INT32 xStart; INT32 yStart; @@ -409,10 +383,9 @@ struct _POLYGON_CB_ORDER UINT32 numPoints; UINT32 cbData; DELTA_POINT* points; -}; -typedef struct _POLYGON_CB_ORDER POLYGON_CB_ORDER; +} POLYGON_CB_ORDER; -struct _ELLIPSE_SC_ORDER +typedef struct { INT32 leftRect; INT32 topRect; @@ -421,10 +394,9 @@ struct _ELLIPSE_SC_ORDER UINT32 bRop2; UINT32 fillMode; UINT32 color; -}; -typedef struct _ELLIPSE_SC_ORDER ELLIPSE_SC_ORDER; +} ELLIPSE_SC_ORDER; -struct _ELLIPSE_CB_ORDER +typedef struct { INT32 leftRect; INT32 topRect; @@ -435,8 +407,7 @@ struct _ELLIPSE_CB_ORDER UINT32 backColor; UINT32 foreColor; rdpBrush brush; -}; -typedef struct _ELLIPSE_CB_ORDER ELLIPSE_CB_ORDER; +} ELLIPSE_CB_ORDER; typedef BOOL (*pDstBlt)(rdpContext* context, const DSTBLT_ORDER* dstblt); typedef BOOL (*pPatBlt)(rdpContext* context, PATBLT_ORDER* patblt); diff --git a/include/freerdp/rail.h b/include/freerdp/rail.h index 8641547a7..91a35867f 100644 --- a/include/freerdp/rail.h +++ b/include/freerdp/rail.h @@ -290,71 +290,63 @@ enum SPI_MASK #define RAIL_TASKBAR_MSG_TAB_ACTIVE 0x00000004 #define RAIL_TASKBAR_MSG_TAB_PROPERTIES 0x00000005 -struct _RAIL_UNICODE_STRING +typedef struct { UINT16 length; BYTE* string; -}; -typedef struct _RAIL_UNICODE_STRING RAIL_UNICODE_STRING; +} RAIL_UNICODE_STRING; -struct _RAIL_HIGH_CONTRAST +typedef struct { UINT32 flags; UINT32 colorSchemeLength; RAIL_UNICODE_STRING colorScheme; -}; -typedef struct _RAIL_HIGH_CONTRAST RAIL_HIGH_CONTRAST; +} RAIL_HIGH_CONTRAST; /* RAIL Orders */ -struct _RAIL_HANDSHAKE_ORDER +typedef struct { UINT32 buildNumber; -}; -typedef struct _RAIL_HANDSHAKE_ORDER RAIL_HANDSHAKE_ORDER; +} RAIL_HANDSHAKE_ORDER; -struct _RAIL_HANDSHAKE_EX_ORDER +typedef struct { UINT32 buildNumber; UINT32 railHandshakeFlags; -}; -typedef struct _RAIL_HANDSHAKE_EX_ORDER RAIL_HANDSHAKE_EX_ORDER; +} RAIL_HANDSHAKE_EX_ORDER; -struct _RAIL_CLIENT_STATUS_ORDER +typedef struct { UINT32 flags; -}; -typedef struct _RAIL_CLIENT_STATUS_ORDER RAIL_CLIENT_STATUS_ORDER; +} RAIL_CLIENT_STATUS_ORDER; -struct _RAIL_EXEC_ORDER +typedef struct { UINT16 flags; char* RemoteApplicationProgram; char* RemoteApplicationWorkingDir; char* RemoteApplicationArguments; -}; -typedef struct _RAIL_EXEC_ORDER RAIL_EXEC_ORDER; +} RAIL_EXEC_ORDER; -struct _RAIL_EXEC_RESULT_ORDER +typedef struct { UINT16 flags; UINT16 execResult; UINT32 rawResult; RAIL_UNICODE_STRING exeOrFile; -}; -typedef struct _RAIL_EXEC_RESULT_ORDER RAIL_EXEC_RESULT_ORDER; +} RAIL_EXEC_RESULT_ORDER; -struct _TS_FILTERKEYS +typedef struct { UINT32 Flags; UINT32 WaitTime; UINT32 DelayTime; UINT32 RepeatTime; UINT32 BounceTime; -}; -typedef struct _TS_FILTERKEYS TS_FILTERKEYS; +} TS_FILTERKEYS; -struct _RAIL_SYSPARAM_ORDER +typedef struct { UINT32 param; UINT32 params; @@ -372,40 +364,35 @@ struct _RAIL_SYSPARAM_ORDER TS_FILTERKEYS filterKeys; BOOL setScreenSaveActive; BOOL setScreenSaveSecure; -}; -typedef struct _RAIL_SYSPARAM_ORDER RAIL_SYSPARAM_ORDER; +} RAIL_SYSPARAM_ORDER; -struct _RAIL_ACTIVATE_ORDER +typedef struct { UINT32 windowId; BOOL enabled; -}; -typedef struct _RAIL_ACTIVATE_ORDER RAIL_ACTIVATE_ORDER; +} RAIL_ACTIVATE_ORDER; -struct _RAIL_SYSMENU_ORDER +typedef struct { UINT32 windowId; INT16 left; INT16 top; -}; -typedef struct _RAIL_SYSMENU_ORDER RAIL_SYSMENU_ORDER; +} RAIL_SYSMENU_ORDER; -struct _RAIL_SYSCOMMAND_ORDER +typedef struct { UINT32 windowId; UINT16 command; -}; -typedef struct _RAIL_SYSCOMMAND_ORDER RAIL_SYSCOMMAND_ORDER; +} RAIL_SYSCOMMAND_ORDER; -struct _RAIL_NOTIFY_EVENT_ORDER +typedef struct { UINT32 windowId; UINT32 notifyIconId; UINT32 message; -}; -typedef struct _RAIL_NOTIFY_EVENT_ORDER RAIL_NOTIFY_EVENT_ORDER; +} RAIL_NOTIFY_EVENT_ORDER; -struct _RAIL_MINMAXINFO_ORDER +typedef struct { UINT32 windowId; INT16 maxWidth; @@ -416,112 +403,98 @@ struct _RAIL_MINMAXINFO_ORDER INT16 minTrackHeight; INT16 maxTrackWidth; INT16 maxTrackHeight; -}; -typedef struct _RAIL_MINMAXINFO_ORDER RAIL_MINMAXINFO_ORDER; +} RAIL_MINMAXINFO_ORDER; -struct _RAIL_LOCALMOVESIZE_ORDER +typedef struct { UINT32 windowId; BOOL isMoveSizeStart; UINT16 moveSizeType; INT16 posX; INT16 posY; -}; -typedef struct _RAIL_LOCALMOVESIZE_ORDER RAIL_LOCALMOVESIZE_ORDER; +} RAIL_LOCALMOVESIZE_ORDER; -struct _RAIL_WINDOWMOVE_ORDER +typedef struct { UINT32 windowId; INT16 left; INT16 top; INT16 right; INT16 bottom; -}; -typedef struct _RAIL_WINDOWMOVE_ORDER RAIL_WINDOW_MOVE_ORDER; +} RAIL_WINDOW_MOVE_ORDER; -struct _RAIL_GET_APPID_REQ_ORDER +typedef struct { UINT32 windowId; -}; -typedef struct _RAIL_GET_APPID_REQ_ORDER RAIL_GET_APPID_REQ_ORDER; +} RAIL_GET_APPID_REQ_ORDER; -struct _RAIL_GET_APPID_RESP_ORDER +typedef struct { UINT32 windowId; WCHAR applicationId[260]; -}; -typedef struct _RAIL_GET_APPID_RESP_ORDER RAIL_GET_APPID_RESP_ORDER; +} RAIL_GET_APPID_RESP_ORDER; -struct _RAIL_LANGBAR_INFO_ORDER +typedef struct { UINT32 languageBarStatus; -}; -typedef struct _RAIL_LANGBAR_INFO_ORDER RAIL_LANGBAR_INFO_ORDER; +} RAIL_LANGBAR_INFO_ORDER; -struct _RAIL_COMPARTMENT_INFO_ORDER +typedef struct { UINT32 ImeState; UINT32 ImeConvMode; UINT32 ImeSentenceMode; UINT32 KanaMode; -}; -typedef struct _RAIL_COMPARTMENT_INFO_ORDER RAIL_COMPARTMENT_INFO_ORDER; +} RAIL_COMPARTMENT_INFO_ORDER; -struct _RAIL_ZORDER_SYNC +typedef struct { UINT32 windowIdMarker; -}; -typedef struct _RAIL_ZORDER_SYNC RAIL_ZORDER_SYNC; +} RAIL_ZORDER_SYNC; -struct _RAIL_CLOAK +typedef struct { UINT32 windowId; BOOL cloak; -}; -typedef struct _RAIL_CLOAK RAIL_CLOAK; +} RAIL_CLOAK; -struct _RAIL_POWER_DISPLAY_REQUEST +typedef struct { UINT32 active; -}; -typedef struct _RAIL_POWER_DISPLAY_REQUEST RAIL_POWER_DISPLAY_REQUEST; +} RAIL_POWER_DISPLAY_REQUEST; -struct _RAIL_TASKBAR_INFO_ORDER +typedef struct { UINT32 TaskbarMessage; UINT32 WindowIdTab; UINT32 Body; -}; -typedef struct _RAIL_TASKBAR_INFO_ORDER RAIL_TASKBAR_INFO_ORDER; +} RAIL_TASKBAR_INFO_ORDER; -struct _RAIL_LANGUAGEIME_INFO_ORDER +typedef struct { UINT32 ProfileType; UINT32 LanguageID; GUID LanguageProfileCLSID; GUID ProfileGUID; UINT32 KeyboardLayout; -}; -typedef struct _RAIL_LANGUAGEIME_INFO_ORDER RAIL_LANGUAGEIME_INFO_ORDER; +} RAIL_LANGUAGEIME_INFO_ORDER; -struct _RAIL_SNAP_ARRANGE +typedef struct { UINT32 windowId; INT16 left; INT16 top; INT16 right; INT16 bottom; -}; -typedef struct _RAIL_SNAP_ARRANGE RAIL_SNAP_ARRANGE; +} RAIL_SNAP_ARRANGE; -struct _RAIL_GET_APPID_RESP_EX +typedef struct { UINT32 windowID; WCHAR applicationID[520 / sizeof(WCHAR)]; UINT32 processId; WCHAR processImageName[520 / sizeof(WCHAR)]; -}; -typedef struct _RAIL_GET_APPID_RESP_EX RAIL_GET_APPID_RESP_EX; +} RAIL_GET_APPID_RESP_EX; /* DEPRECATED: RAIL Constants * use the spec conformant naming scheme TS_ below diff --git a/include/freerdp/secondary.h b/include/freerdp/secondary.h index 647a5deca..2c30ecc82 100644 --- a/include/freerdp/secondary.h +++ b/include/freerdp/secondary.h @@ -67,7 +67,7 @@ #define SO_CHAR_INC_EQUAL_BM_BASE 0x20 #define SO_MAXEXT_EQUAL_BM_SIDE 0x40 -struct _CACHE_BITMAP_ORDER +typedef struct { UINT32 cacheId; UINT32 bitmapBpp; @@ -78,10 +78,9 @@ struct _CACHE_BITMAP_ORDER BOOL compressed; BYTE bitmapComprHdr[8]; BYTE* bitmapDataStream; -}; -typedef struct _CACHE_BITMAP_ORDER CACHE_BITMAP_ORDER; +} CACHE_BITMAP_ORDER; -struct _CACHE_BITMAP_V2_ORDER +typedef struct { UINT32 cacheId; UINT32 flags; @@ -98,10 +97,9 @@ struct _CACHE_BITMAP_V2_ORDER UINT32 cbScanWidth; UINT32 cbUncompressedSize; BYTE* bitmapDataStream; -}; -typedef struct _CACHE_BITMAP_V2_ORDER CACHE_BITMAP_V2_ORDER; +} CACHE_BITMAP_V2_ORDER; -struct _BITMAP_DATA_EX +typedef struct { UINT32 bpp; UINT32 codecID; @@ -109,10 +107,9 @@ struct _BITMAP_DATA_EX UINT32 height; UINT32 length; BYTE* data; -}; -typedef struct _BITMAP_DATA_EX BITMAP_DATA_EX; +} BITMAP_DATA_EX; -struct _CACHE_BITMAP_V3_ORDER +typedef struct { UINT32 cacheId; UINT32 bpp; @@ -121,37 +118,33 @@ struct _CACHE_BITMAP_V3_ORDER UINT32 key1; UINT32 key2; BITMAP_DATA_EX bitmapData; -}; -typedef struct _CACHE_BITMAP_V3_ORDER CACHE_BITMAP_V3_ORDER; +} CACHE_BITMAP_V3_ORDER; -struct _CACHE_COLOR_TABLE_ORDER +typedef struct { UINT32 cacheIndex; UINT32 numberColors; UINT32 colorTable[256]; -}; -typedef struct _CACHE_COLOR_TABLE_ORDER CACHE_COLOR_TABLE_ORDER; +} CACHE_COLOR_TABLE_ORDER; -struct _CACHE_GLYPH_ORDER +typedef struct { UINT32 cacheId; UINT32 cGlyphs; GLYPH_DATA glyphData[256]; WCHAR* unicodeCharacters; -}; -typedef struct _CACHE_GLYPH_ORDER CACHE_GLYPH_ORDER; +} CACHE_GLYPH_ORDER; -struct _CACHE_GLYPH_V2_ORDER +typedef struct { UINT32 cacheId; UINT32 flags; UINT32 cGlyphs; GLYPH_DATA_V2 glyphData[256]; WCHAR* unicodeCharacters; -}; -typedef struct _CACHE_GLYPH_V2_ORDER CACHE_GLYPH_V2_ORDER; +} CACHE_GLYPH_V2_ORDER; -struct _CACHE_BRUSH_ORDER +typedef struct { UINT32 index; UINT32 bpp; @@ -160,8 +153,7 @@ struct _CACHE_BRUSH_ORDER UINT32 style; UINT32 length; BYTE data[256]; -}; -typedef struct _CACHE_BRUSH_ORDER CACHE_BRUSH_ORDER; +} CACHE_BRUSH_ORDER; typedef BOOL (*pCacheBitmap)(rdpContext* context, const CACHE_BITMAP_ORDER* cache_bitmap_order); typedef BOOL (*pCacheBitmapV2)(rdpContext* context, CACHE_BITMAP_V2_ORDER* cache_bitmap_v2_order); diff --git a/include/freerdp/server/audin.h b/include/freerdp/server/audin.h index a8da17d27..6522ec070 100644 --- a/include/freerdp/server/audin.h +++ b/include/freerdp/server/audin.h @@ -26,7 +26,7 @@ #include #include -typedef struct _audin_server_context audin_server_context; +typedef struct s_audin_server_context audin_server_context; typedef UINT (*psAudinServerSelectFormat)(audin_server_context* context, size_t client_format_index); @@ -40,7 +40,7 @@ typedef UINT (*psAudinServerReceiveSamples)(audin_server_context* context, const AUDIO_FORMAT* format, wStream* buf, size_t nframes); -struct _audin_server_context +struct s_audin_server_context { HANDLE vcm; diff --git a/include/freerdp/server/cliprdr.h b/include/freerdp/server/cliprdr.h index 9adff98c0..9464a1349 100644 --- a/include/freerdp/server/cliprdr.h +++ b/include/freerdp/server/cliprdr.h @@ -33,7 +33,7 @@ * Server Interface */ -typedef struct _cliprdr_server_context CliprdrServerContext; +typedef struct s_cliprdr_server_context CliprdrServerContext; typedef UINT (*psCliprdrOpen)(CliprdrServerContext* context); typedef UINT (*psCliprdrClose)(CliprdrServerContext* context); @@ -83,7 +83,7 @@ typedef UINT (*psCliprdrClientFileContentsResponse)( typedef UINT (*psCliprdrServerFileContentsResponse)( CliprdrServerContext* context, const CLIPRDR_FILE_CONTENTS_RESPONSE* fileContentsResponse); -struct _cliprdr_server_context +struct s_cliprdr_server_context { void* handle; void* custom; diff --git a/include/freerdp/server/disp.h b/include/freerdp/server/disp.h index 43aea647a..4af429630 100644 --- a/include/freerdp/server/disp.h +++ b/include/freerdp/server/disp.h @@ -26,8 +26,8 @@ #include #include -typedef struct _disp_server_private DispServerPrivate; -typedef struct _disp_server_context DispServerContext; +typedef struct s_disp_server_private DispServerPrivate; +typedef struct s_disp_server_context DispServerContext; typedef UINT (*psDispMonitorLayout)(DispServerContext* context, const DISPLAY_CONTROL_MONITOR_LAYOUT_PDU* pdu); @@ -35,7 +35,7 @@ typedef UINT (*psDispCaps)(DispServerContext* context); typedef UINT (*psDispOpen)(DispServerContext* context); typedef UINT (*psDispClose)(DispServerContext* context); -struct _disp_server_context +struct s_disp_server_context { void* custom; HANDLE vcm; diff --git a/include/freerdp/server/drdynvc.h b/include/freerdp/server/drdynvc.h index 23f980279..8b4768166 100644 --- a/include/freerdp/server/drdynvc.h +++ b/include/freerdp/server/drdynvc.h @@ -30,13 +30,13 @@ * Server Interface */ -typedef struct _drdynvc_client_context DrdynvcServerContext; -typedef struct _drdynvc_server_private DrdynvcServerPrivate; +typedef struct s_drdynvc_client_context DrdynvcServerContext; +typedef struct s_drdynvc_server_private DrdynvcServerPrivate; typedef UINT (*psDrdynvcStart)(DrdynvcServerContext* context); typedef UINT (*psDrdynvcStop)(DrdynvcServerContext* context); -struct _drdynvc_client_context +struct s_drdynvc_client_context { HANDLE vcm; diff --git a/include/freerdp/server/echo.h b/include/freerdp/server/echo.h index 0643a5932..c11637165 100644 --- a/include/freerdp/server/echo.h +++ b/include/freerdp/server/echo.h @@ -32,7 +32,7 @@ typedef enum ECHO_SERVER_OPEN_RESULT ECHO_SERVER_OPEN_RESULT_ERROR = 3 } ECHO_SERVER_OPEN_RESULT; -typedef struct _echo_server_context echo_server_context; +typedef struct s_echo_server_context echo_server_context; typedef UINT (*psEchoServerOpen)(echo_server_context* context); typedef UINT (*psEchoServerClose)(echo_server_context* context); @@ -44,7 +44,7 @@ typedef UINT (*psEchoServerOpenResult)(echo_server_context* context, typedef UINT (*psEchoServerResponse)(echo_server_context* context, const BYTE* buffer, UINT32 length); -struct _echo_server_context +struct s_echo_server_context { HANDLE vcm; diff --git a/include/freerdp/server/encomsp.h b/include/freerdp/server/encomsp.h index 9c562497d..489edd0c4 100644 --- a/include/freerdp/server/encomsp.h +++ b/include/freerdp/server/encomsp.h @@ -32,8 +32,8 @@ * Server Interface */ -typedef struct _encomsp_server_context EncomspServerContext; -typedef struct _encomsp_server_private EncomspServerPrivate; +typedef struct s_encomsp_server_context EncomspServerContext; +typedef struct s_encomsp_server_private EncomspServerPrivate; typedef UINT (*psEncomspStart)(EncomspServerContext* context); typedef UINT (*psEncomspStop)(EncomspServerContext* context); @@ -62,7 +62,7 @@ typedef UINT (*psEncomspGraphicsStreamPaused)( typedef UINT (*psEncomspGraphicsStreamResumed)( EncomspServerContext* context, ENCOMSP_GRAPHICS_STREAM_RESUMED_PDU* graphicsStreamResumed); -struct _encomsp_server_context +struct s_encomsp_server_context { HANDLE vcm; void* custom; diff --git a/include/freerdp/server/gfxredir.h b/include/freerdp/server/gfxredir.h index 05fdea62c..e5c672514 100644 --- a/include/freerdp/server/gfxredir.h +++ b/include/freerdp/server/gfxredir.h @@ -26,8 +26,8 @@ #include #include -typedef struct _gfxredir_server_private GfxRedirServerPrivate; -typedef struct _gfxredir_server_context GfxRedirServerContext; +typedef struct s_gfxredir_server_private GfxRedirServerPrivate; +typedef struct s_gfxredir_server_context GfxRedirServerContext; typedef UINT (*psGfxRedirOpen)(GfxRedirServerContext* context); typedef UINT (*psGfxRedirClose)(GfxRedirServerContext* context); @@ -57,7 +57,7 @@ typedef UINT (*psGfxRedirPresentBuffer)(GfxRedirServerContext* context, typedef UINT (*psGfxRedirPresentBufferAck)(GfxRedirServerContext* context, const GFXREDIR_PRESENT_BUFFER_ACK_PDU* presentBufferAck); -struct _gfxredir_server_context +struct s_gfxredir_server_context { void* custom; HANDLE vcm; diff --git a/include/freerdp/server/proxy/proxy_context.h b/include/freerdp/server/proxy/proxy_context.h index cfaae08bb..b1ffb93ab 100644 --- a/include/freerdp/server/proxy/proxy_context.h +++ b/include/freerdp/server/proxy/proxy_context.h @@ -36,11 +36,10 @@ extern "C" typedef struct proxy_data proxyData; typedef struct proxy_module proxyModule; - typedef struct channel_data_event_info proxyChannelDataEventInfo; - typedef struct _InterceptContextMapEntry + typedef struct s_InterceptContextMapEntry { - void (*free)(struct _InterceptContextMapEntry*); + void (*free)(struct s_InterceptContextMapEntry*); } InterceptContextMapEntry; /* All proxy interception channels derive from this base struct @@ -48,14 +47,13 @@ extern "C" FREERDP_API void intercept_context_entry_free(void* obj); /** @brief how is handled a channel */ - enum pf_utils_channel_mode + typedef enum { PF_UTILS_CHANNEL_NOT_HANDLED, PF_UTILS_CHANNEL_BLOCK, PF_UTILS_CHANNEL_PASSTHROUGH, PF_UTILS_CHANNEL_INTERCEPT, - }; - typedef enum pf_utils_channel_mode pf_utils_channel_mode; + } pf_utils_channel_mode; /** @brief per channel configuration */ struct p_server_channel_context diff --git a/include/freerdp/server/proxy/proxy_modules_api.h b/include/freerdp/server/proxy/proxy_modules_api.h index 91598c5ce..723b5b6db 100644 --- a/include/freerdp/server/proxy/proxy_modules_api.h +++ b/include/freerdp/server/proxy/proxy_modules_api.h @@ -144,7 +144,7 @@ typedef struct proxy_mouse_event_info UINT16 y; } proxyMouseEventInfo; -typedef struct channel_data_event_info +typedef struct { /* channel metadata */ const char* channel_name; @@ -157,7 +157,7 @@ typedef struct channel_data_event_info UINT32 flags; } proxyChannelDataEventInfo; -typedef enum proxy_fetch_target_method +typedef enum { PROXY_FETCH_TARGET_METHOD_DEFAULT, PROXY_FETCH_TARGET_METHOD_CONFIG, @@ -165,7 +165,7 @@ typedef enum proxy_fetch_target_method PROXY_FETCH_TARGET_USE_CUSTOM_ADDR } ProxyFetchTargetMethod; -typedef struct fetch_target_event_info +typedef struct { /* out values */ char* target_address; diff --git a/include/freerdp/server/rail.h b/include/freerdp/server/rail.h index 419ac322a..fdc0f0304 100644 --- a/include/freerdp/server/rail.h +++ b/include/freerdp/server/rail.h @@ -27,8 +27,8 @@ #include #include -typedef struct _rail_server_context RailServerContext; -typedef struct _rail_server_private RailServerPrivate; +typedef struct s_rail_server_context RailServerContext; +typedef struct s_rail_server_private RailServerPrivate; typedef UINT (*psRailStart)(RailServerContext* context); typedef BOOL (*psRailStop)(RailServerContext* context); @@ -89,7 +89,7 @@ typedef UINT (*psRailServerPowerDisplayRequest)( typedef UINT (*psRailServerGetAppidRespEx)(RailServerContext* context, const RAIL_GET_APPID_RESP_EX* GetAppidRespEx); -struct _rail_server_context +struct s_rail_server_context { HANDLE vcm; void* custom; diff --git a/include/freerdp/server/rdpdr.h b/include/freerdp/server/rdpdr.h index ac1949b96..bdafd3f10 100644 --- a/include/freerdp/server/rdpdr.h +++ b/include/freerdp/server/rdpdr.h @@ -32,11 +32,11 @@ * Server Interface */ -typedef struct _rdpdr_server_context RdpdrServerContext; -typedef struct _rdpdr_server_private RdpdrServerPrivate; +typedef struct s_rdpdr_server_context RdpdrServerContext; +typedef struct s_rdpdr_server_private RdpdrServerPrivate; #ifndef __MINGW32__ -struct _FILE_DIRECTORY_INFORMATION +typedef struct { UINT32 NextEntryOffset; UINT32 FileIndex; @@ -48,8 +48,7 @@ struct _FILE_DIRECTORY_INFORMATION LARGE_INTEGER AllocationSize; UINT32 FileAttributes; char FileName[512]; -}; -typedef struct _FILE_DIRECTORY_INFORMATION FILE_DIRECTORY_INFORMATION; +} FILE_DIRECTORY_INFORMATION; #endif typedef UINT (*psRdpdrStart)(RdpdrServerContext* context); @@ -110,7 +109,7 @@ typedef void (*psRdpdrOnSmartcardCreate)(RdpdrServerContext* context, UINT32 dev const char* name); typedef void (*psRdpdrOnSmartcardDelete)(RdpdrServerContext* context, UINT32 deviceId); -struct _rdpdr_server_context +struct s_rdpdr_server_context { HANDLE vcm; diff --git a/include/freerdp/server/rdpei.h b/include/freerdp/server/rdpei.h index 765809d8f..bb8b22272 100644 --- a/include/freerdp/server/rdpei.h +++ b/include/freerdp/server/rdpei.h @@ -26,10 +26,10 @@ #include #include -typedef struct _rdpei_server_context RdpeiServerContext; -typedef struct _rdpei_server_private RdpeiServerPrivate; +typedef struct s_rdpei_server_context RdpeiServerContext; +typedef struct s_rdpei_server_private RdpeiServerPrivate; -struct _rdpei_server_context +struct s_rdpei_server_context { HANDLE vcm; diff --git a/include/freerdp/server/rdpgfx.h b/include/freerdp/server/rdpgfx.h index 9e52ca1de..756ac18d5 100644 --- a/include/freerdp/server/rdpgfx.h +++ b/include/freerdp/server/rdpgfx.h @@ -23,8 +23,8 @@ #include #include -typedef struct _rdpgfx_server_context RdpgfxServerContext; -typedef struct _rdpgfx_server_private RdpgfxServerPrivate; +typedef struct s_rdpgfx_server_context RdpgfxServerContext; +typedef struct s_rdpgfx_server_private RdpgfxServerPrivate; typedef BOOL (*psRdpgfxServerOpen)(RdpgfxServerContext* context); typedef BOOL (*psRdpgfxServerClose)(RdpgfxServerContext* context); @@ -78,7 +78,7 @@ typedef UINT (*psRdpgfxFrameAcknowledge)(RdpgfxServerContext* context, typedef UINT (*psRdpgfxQoeFrameAcknowledge)( RdpgfxServerContext* context, const RDPGFX_QOE_FRAME_ACKNOWLEDGE_PDU* qoeFrameAcknowledge); -struct _rdpgfx_server_context +struct s_rdpgfx_server_context { HANDLE vcm; void* custom; diff --git a/include/freerdp/server/rdpsnd.h b/include/freerdp/server/rdpsnd.h index e4d8b38d2..596b72d36 100644 --- a/include/freerdp/server/rdpsnd.h +++ b/include/freerdp/server/rdpsnd.h @@ -25,9 +25,9 @@ #include #include -typedef struct _rdpsnd_server_context RdpsndServerContext; -typedef struct _rdpsnd_server_context rdpsnd_server_context; -typedef struct _rdpsnd_server_private RdpsndServerPrivate; +typedef struct s_rdpsnd_server_context RdpsndServerContext; +typedef struct s_rdpsnd_server_context rdpsnd_server_context; +typedef struct s_rdpsnd_server_private RdpsndServerPrivate; typedef UINT (*psRdpsndStart)(RdpsndServerContext* context); typedef UINT (*psRdpsndStop)(RdpsndServerContext* context); @@ -44,7 +44,7 @@ typedef UINT (*psRdpsndServerClose)(RdpsndServerContext* context); typedef void (*psRdpsndServerActivated)(RdpsndServerContext* context); -struct _rdpsnd_server_context +struct s_rdpsnd_server_context { HANDLE vcm; diff --git a/include/freerdp/server/remdesk.h b/include/freerdp/server/remdesk.h index a64ebb47c..e8dabd964 100644 --- a/include/freerdp/server/remdesk.h +++ b/include/freerdp/server/remdesk.h @@ -32,13 +32,13 @@ * Server Interface */ -typedef struct _remdesk_server_context RemdeskServerContext; -typedef struct _remdesk_server_private RemdeskServerPrivate; +typedef struct s_remdesk_server_context RemdeskServerContext; +typedef struct s_remdesk_server_private RemdeskServerPrivate; typedef UINT (*psRemdeskStart)(RemdeskServerContext* context); typedef UINT (*psRemdeskStop)(RemdeskServerContext* context); -struct _remdesk_server_context +struct s_remdesk_server_context { HANDLE vcm; void* custom; diff --git a/include/freerdp/server/shadow.h b/include/freerdp/server/shadow.h index 265c65df0..e81d18397 100644 --- a/include/freerdp/server/shadow.h +++ b/include/freerdp/server/shadow.h @@ -52,7 +52,7 @@ typedef struct rdp_shadow_capture rdpShadowCapture; typedef struct rdp_shadow_subsystem rdpShadowSubsystem; typedef struct rdp_shadow_multiclient_event rdpShadowMultiClientEvent; -typedef struct _RDP_SHADOW_ENTRY_POINTS RDP_SHADOW_ENTRY_POINTS; +typedef struct S_RDP_SHADOW_ENTRY_POINTS RDP_SHADOW_ENTRY_POINTS; typedef int (*pfnShadowSubsystemEntry)(RDP_SHADOW_ENTRY_POINTS* pEntryPoints); typedef rdpShadowSubsystem* (*pfnShadowSubsystemNew)(void); @@ -170,7 +170,7 @@ struct rdp_shadow_surface REGION16 invalidRegion; }; -struct _RDP_SHADOW_ENTRY_POINTS +struct S_RDP_SHADOW_ENTRY_POINTS { pfnShadowSubsystemNew New; pfnShadowSubsystemFree Free; @@ -226,11 +226,11 @@ struct rdp_shadow_subsystem /* Definition of message between subsystem and clients */ #define SHADOW_MSG_IN_REFRESH_REQUEST_ID 1001 -typedef struct _SHADOW_MSG_OUT SHADOW_MSG_OUT; +typedef struct S_SHADOW_MSG_OUT SHADOW_MSG_OUT; typedef void (*MSG_OUT_FREE_FN)(UINT32 id, SHADOW_MSG_OUT* msg); /* function to free SHADOW_MSG_OUT */ -struct _SHADOW_MSG_OUT +struct S_SHADOW_MSG_OUT { int refCount; MSG_OUT_FREE_FN Free; @@ -241,15 +241,14 @@ struct _SHADOW_MSG_OUT #define SHADOW_MSG_OUT_AUDIO_OUT_SAMPLES_ID 2003 #define SHADOW_MSG_OUT_AUDIO_OUT_VOLUME_ID 2004 -struct _SHADOW_MSG_OUT_POINTER_POSITION_UPDATE +typedef struct { SHADOW_MSG_OUT common; UINT32 xPos; UINT32 yPos; -}; -typedef struct _SHADOW_MSG_OUT_POINTER_POSITION_UPDATE SHADOW_MSG_OUT_POINTER_POSITION_UPDATE; +} SHADOW_MSG_OUT_POINTER_POSITION_UPDATE; -struct _SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE +typedef struct { SHADOW_MSG_OUT common; UINT32 xHot; @@ -260,26 +259,23 @@ struct _SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE UINT32 lengthXorMask; BYTE* xorMaskData; BYTE* andMaskData; -}; -typedef struct _SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE; +} SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE; -struct _SHADOW_MSG_OUT_AUDIO_OUT_SAMPLES +typedef struct { SHADOW_MSG_OUT common; AUDIO_FORMAT* audio_format; void* buf; size_t nFrames; UINT16 wTimestamp; -}; -typedef struct _SHADOW_MSG_OUT_AUDIO_OUT_SAMPLES SHADOW_MSG_OUT_AUDIO_OUT_SAMPLES; +} SHADOW_MSG_OUT_AUDIO_OUT_SAMPLES; -struct _SHADOW_MSG_OUT_AUDIO_OUT_VOLUME +typedef struct { SHADOW_MSG_OUT common; UINT16 left; UINT16 right; -}; -typedef struct _SHADOW_MSG_OUT_AUDIO_OUT_VOLUME SHADOW_MSG_OUT_AUDIO_OUT_VOLUME; +} SHADOW_MSG_OUT_AUDIO_OUT_VOLUME; #ifdef __cplusplus extern "C" diff --git a/include/freerdp/settings.h b/include/freerdp/settings.h index de2d09e72..274ce00a2 100644 --- a/include/freerdp/settings.h +++ b/include/freerdp/settings.h @@ -257,12 +257,11 @@ typedef enum #define KEYBOARD_HOOK_REMOTE 1 #define KEYBOARD_HOOK_FULLSCREEN_ONLY 2 -struct _TARGET_NET_ADDRESS +typedef struct { UINT32 Length; LPWSTR Address; -}; -typedef struct _TARGET_NET_ADDRESS TARGET_NET_ADDRESS; +} TARGET_NET_ADDRESS; /* Logon Error Info */ #define LOGON_MSG_DISCONNECT_REFUSED 0xFFFFFFF9 @@ -348,24 +347,22 @@ struct rdp_certificate }; typedef struct rdp_certificate rdpCertificate; -struct rdp_rsa_key +typedef struct { BYTE* Modulus; DWORD ModulusLength; BYTE* PrivateExponent; DWORD PrivateExponentLength; BYTE exponent[4]; -}; -typedef struct rdp_rsa_key rdpRsaKey; +} rdpRsaKey; /* Channels */ -struct _ADDIN_ARGV +typedef struct { int argc; char** argv; -}; -typedef struct _ADDIN_ARGV ADDIN_ARGV; +} ADDIN_ARGV; /* Extensions */ @@ -377,52 +374,47 @@ struct rdp_ext_set /* Bitmap Cache */ -struct _BITMAP_CACHE_CELL_INFO +typedef struct { UINT16 numEntries; UINT16 maxSize; -}; -typedef struct _BITMAP_CACHE_CELL_INFO BITMAP_CACHE_CELL_INFO; +} BITMAP_CACHE_CELL_INFO; -struct _BITMAP_CACHE_V2_CELL_INFO +typedef struct { UINT32 numEntries; BOOL persistent; -}; -typedef struct _BITMAP_CACHE_V2_CELL_INFO BITMAP_CACHE_V2_CELL_INFO; +} BITMAP_CACHE_V2_CELL_INFO; /* Glyph Cache */ -struct _GLYPH_CACHE_DEFINITION +typedef struct { UINT16 cacheEntries; UINT16 cacheMaximumCellSize; -}; -typedef struct _GLYPH_CACHE_DEFINITION GLYPH_CACHE_DEFINITION; +} GLYPH_CACHE_DEFINITION; /* Monitors */ -struct _MONITOR_DEF +typedef struct { INT32 left; INT32 top; INT32 right; INT32 bottom; UINT32 flags; -}; -typedef struct _MONITOR_DEF MONITOR_DEF; +} MONITOR_DEF; -struct _MONITOR_ATTRIBUTES +typedef struct { UINT32 physicalWidth; UINT32 physicalHeight; UINT32 orientation; UINT32 desktopScaleFactor; UINT32 deviceScaleFactor; -}; -typedef struct _MONITOR_ATTRIBUTES MONITOR_ATTRIBUTES; +} MONITOR_ATTRIBUTES; -struct rdp_monitor +typedef struct { INT32 x; INT32 y; @@ -431,8 +423,7 @@ struct rdp_monitor UINT32 is_primary; UINT32 orig_screen; MONITOR_ATTRIBUTES attributes; -}; -typedef struct rdp_monitor rdpMonitor; +} rdpMonitor; /* Device Redirection */ @@ -442,50 +433,44 @@ typedef struct rdp_monitor rdpMonitor; #define RDPDR_DTYP_FILESYSTEM 0x00000008 #define RDPDR_DTYP_SMARTCARD 0x00000020 -struct _RDPDR_DEVICE +typedef struct { UINT32 Id; UINT32 Type; char* Name; -}; -typedef struct _RDPDR_DEVICE RDPDR_DEVICE; +} RDPDR_DEVICE; -struct _RDPDR_DRIVE +typedef struct { RDPDR_DEVICE device; char* Path; BOOL automount; -}; -typedef struct _RDPDR_DRIVE RDPDR_DRIVE; +} RDPDR_DRIVE; -struct _RDPDR_PRINTER +typedef struct { RDPDR_DEVICE device; char* DriverName; -}; -typedef struct _RDPDR_PRINTER RDPDR_PRINTER; +} RDPDR_PRINTER; -struct _RDPDR_SMARTCARD +typedef struct { RDPDR_DEVICE device; -}; -typedef struct _RDPDR_SMARTCARD RDPDR_SMARTCARD; +} RDPDR_SMARTCARD; -struct _RDPDR_SERIAL +typedef struct { RDPDR_DEVICE device; char* Path; char* Driver; char* Permissive; -}; -typedef struct _RDPDR_SERIAL RDPDR_SERIAL; +} RDPDR_SERIAL; -struct _RDPDR_PARALLEL +typedef struct { RDPDR_DEVICE device; char* Path; -}; -typedef struct _RDPDR_PARALLEL RDPDR_PARALLEL; +} RDPDR_PARALLEL; #define PROXY_TYPE_NONE 0 #define PROXY_TYPE_HTTP 1 @@ -1157,10 +1142,10 @@ struct rdp_settings ALIGN64 BOOL PromptForCredentials; /* 1283 */ /* Settings used for smartcard emulation */ - UINT64 padding1284[1285 - 1284]; /* 1284 */ - ALIGN64 char* SmartcardCertificate; /* 1285 */ - ALIGN64 char* SmartcardPrivateKey; /* 1286 */ - UINT64 padding1344[1344 - 1287]; /* 1287 */ + UINT64 padding1284[1285 - 1284]; /* 1284 */ + ALIGN64 char* SmartcardCertificate; /* 1285 */ + ALIGN64 char* SmartcardPrivateKey; /* 1286 */ + UINT64 padding1344[1344 - 1287]; /* 1287 */ /* Kerberos Authentication */ ALIGN64 char* KerberosKdc; /* 1344 */ diff --git a/include/freerdp/svc.h b/include/freerdp/svc.h index 745424dcd..3d6240d02 100644 --- a/include/freerdp/svc.h +++ b/include/freerdp/svc.h @@ -35,7 +35,7 @@ #define FREERDP_CHANNEL_MAGIC_NUMBER 0x46524450 -struct _CHANNEL_ENTRY_POINTS_FREERDP +typedef struct { UINT32 cbSize; UINT32 protocolVersion; @@ -49,11 +49,10 @@ struct _CHANNEL_ENTRY_POINTS_FREERDP void* pExtendedData; /* extended initial data */ void* pInterface; /* channel callback interface, use after initialization */ rdpContext* context; -}; -typedef struct _CHANNEL_ENTRY_POINTS_FREERDP CHANNEL_ENTRY_POINTS_FREERDP; +} CHANNEL_ENTRY_POINTS_FREERDP; typedef CHANNEL_ENTRY_POINTS_FREERDP* PCHANNEL_ENTRY_POINTS_FREERDP; -struct _CHANNEL_ENTRY_POINTS_FREERDP_EX +typedef struct { UINT32 cbSize; UINT32 protocolVersion; @@ -67,8 +66,7 @@ struct _CHANNEL_ENTRY_POINTS_FREERDP_EX void* pExtendedData; /* extended initial data */ void* pInterface; /* channel callback interface, use after initialization */ rdpContext* context; -}; -typedef struct _CHANNEL_ENTRY_POINTS_FREERDP_EX CHANNEL_ENTRY_POINTS_FREERDP_EX; +} CHANNEL_ENTRY_POINTS_FREERDP_EX; typedef CHANNEL_ENTRY_POINTS_FREERDP_EX* PCHANNEL_ENTRY_POINTS_FREERDP_EX; #endif /* FREERDP_SVC_H */ diff --git a/include/freerdp/types.h b/include/freerdp/types.h index 32b4fbfd2..6c86d2b3d 100644 --- a/include/freerdp/types.h +++ b/include/freerdp/types.h @@ -32,56 +32,50 @@ #define MAX(x, y) (((x) > (y)) ? (x) : (y)) #endif -struct _PALETTE_ENTRY +typedef struct { BYTE red; BYTE green; BYTE blue; -}; -typedef struct _PALETTE_ENTRY PALETTE_ENTRY; +} PALETTE_ENTRY; -struct rdp_palette +typedef struct { UINT32 count; PALETTE_ENTRY entries[256]; -}; -typedef struct rdp_palette rdpPalette; +} rdpPalette; #include -struct _RDP_PLUGIN_DATA +typedef struct { DWORD size; void* data[4]; -}; -typedef struct _RDP_PLUGIN_DATA RDP_PLUGIN_DATA; +} RDP_PLUGIN_DATA; -struct _RDP_RECT +typedef struct { INT16 x; INT16 y; INT16 width; INT16 height; -}; -typedef struct _RDP_RECT RDP_RECT; +} RDP_RECT; -struct _RECTANGLE_16 +typedef struct { UINT16 left; UINT16 top; UINT16 right; UINT16 bottom; -}; -typedef struct _RECTANGLE_16 RECTANGLE_16; +} RECTANGLE_16; -struct _RECTANGLE_32 +typedef struct { UINT32 left; UINT32 top; UINT32 width; UINT32 height; -}; -typedef struct _RECTANGLE_32 RECTANGLE_32; +} RECTANGLE_32; /* Plugin events */ diff --git a/include/freerdp/update.h b/include/freerdp/update.h index 218e09a87..d1339d56e 100644 --- a/include/freerdp/update.h +++ b/include/freerdp/update.h @@ -44,7 +44,7 @@ typedef struct rdp_update rdpUpdate; /* Bitmap Updates */ #define EX_COMPRESSED_BITMAP_HEADER_PRESENT 0x01 -struct _BITMAP_DATA +typedef struct { UINT32 destLeft; UINT32 destTop; @@ -61,46 +61,41 @@ struct _BITMAP_DATA UINT32 cbUncompressedSize; BYTE* bitmapDataStream; BOOL compressed; -}; -typedef struct _BITMAP_DATA BITMAP_DATA; +} BITMAP_DATA; -struct _BITMAP_UPDATE +typedef struct { UINT32 number; BITMAP_DATA* rectangles; BOOL skipCompression; -}; -typedef struct _BITMAP_UPDATE BITMAP_UPDATE; +} BITMAP_UPDATE; /* Palette Updates */ -struct _PALETTE_UPDATE +typedef struct { UINT32 number; PALETTE_ENTRY entries[256]; -}; -typedef struct _PALETTE_UPDATE PALETTE_UPDATE; +} PALETTE_UPDATE; /* Play Sound (System Beep) Updates */ -struct _PLAY_SOUND_UPDATE +typedef struct { UINT32 duration; UINT32 frequency; -}; -typedef struct _PLAY_SOUND_UPDATE PLAY_SOUND_UPDATE; +} PLAY_SOUND_UPDATE; /* Surface Command Updates */ -struct _TS_COMPRESSED_BITMAP_HEADER_EX +typedef struct { UINT32 highUniqueId; UINT32 lowUniqueId; UINT64 tmMilliseconds; UINT64 tmSeconds; -}; -typedef struct _TS_COMPRESSED_BITMAP_HEADER_EX TS_COMPRESSED_BITMAP_HEADER_EX; +} TS_COMPRESSED_BITMAP_HEADER_EX; -struct _TS_BITMAP_DATA_EX +typedef struct { BYTE bpp; BYTE flags; @@ -110,8 +105,7 @@ struct _TS_BITMAP_DATA_EX UINT32 bitmapDataLength; TS_COMPRESSED_BITMAP_HEADER_EX exBitmapDataHeader; BYTE* bitmapData; -}; -typedef struct _TS_BITMAP_DATA_EX TS_BITMAP_DATA_EX; +} TS_BITMAP_DATA_EX; enum SURFCMD_CMDTYPE { @@ -120,7 +114,7 @@ enum SURFCMD_CMDTYPE CMDTYPE_STREAM_SURFACE_BITS = 0x0006 }; -struct _SURFACE_BITS_COMMAND +typedef struct { UINT32 cmdType; UINT32 destLeft; @@ -129,15 +123,13 @@ struct _SURFACE_BITS_COMMAND UINT32 destBottom; TS_BITMAP_DATA_EX bmp; BOOL skipCompression; -}; -typedef struct _SURFACE_BITS_COMMAND SURFACE_BITS_COMMAND; +} SURFACE_BITS_COMMAND; -struct _SURFACE_FRAME_MARKER +typedef struct { UINT32 frameAction; UINT32 frameId; -}; -typedef struct _SURFACE_FRAME_MARKER SURFACE_FRAME_MARKER; +} SURFACE_FRAME_MARKER; enum SURFCMD_FRAMEACTION { @@ -159,13 +151,12 @@ enum TS_STATUS_VM_RETRYING_MONITORING = 0x00000505 }; -struct _SURFACE_FRAME +typedef struct { UINT32 frameId; UINT32 commandCount; SURFACE_BITS_COMMAND* commands; -}; -typedef struct _SURFACE_FRAME SURFACE_FRAME; +} SURFACE_FRAME; /* defined inside libfreerdp-core */ typedef struct rdp_update_proxy rdpUpdateProxy; diff --git a/include/freerdp/utils/pcap.h b/include/freerdp/utils/pcap.h index 30e133774..29a743333 100644 --- a/include/freerdp/utils/pcap.h +++ b/include/freerdp/utils/pcap.h @@ -23,7 +23,7 @@ #include #include -struct _pcap_header +typedef struct { UINT32 magic_number; /* magic number */ UINT16 version_major; /* major version number */ @@ -32,21 +32,19 @@ struct _pcap_header UINT32 sigfigs; /* accuracy of timestamps */ UINT32 snaplen; /* max length of captured packets, in octets */ UINT32 network; /* data link type */ -}; -typedef struct _pcap_header pcap_header; +} pcap_header; -struct _pcap_record_header +typedef struct { UINT32 ts_sec; /* timestamp seconds */ UINT32 ts_usec; /* timestamp microseconds */ UINT32 incl_len; /* number of octets of packet saved in file */ UINT32 orig_len; /* actual length of packet */ -}; -typedef struct _pcap_record_header pcap_record_header; +} pcap_record_header; -typedef struct _pcap_record pcap_record; +typedef struct s_pcap_record pcap_record; -struct _pcap_record +struct s_pcap_record { pcap_record_header header; union diff --git a/include/freerdp/utils/profiler.h b/include/freerdp/utils/profiler.h index a05d14200..4cb31984e 100644 --- a/include/freerdp/utils/profiler.h +++ b/include/freerdp/utils/profiler.h @@ -23,7 +23,7 @@ #include #include -typedef struct _PROFILER PROFILER; +typedef struct S_PROFILER PROFILER; #ifdef __cplusplus extern "C" diff --git a/include/freerdp/utils/ringbuffer.h b/include/freerdp/utils/ringbuffer.h index 21f607e1c..edbb7c2e3 100644 --- a/include/freerdp/utils/ringbuffer.h +++ b/include/freerdp/utils/ringbuffer.h @@ -24,7 +24,7 @@ #include /** @brief ring buffer meta data */ -struct _RingBuffer +typedef struct { size_t initialSize; size_t freeSize; @@ -32,16 +32,14 @@ struct _RingBuffer size_t readPtr; size_t writePtr; BYTE* buffer; -}; -typedef struct _RingBuffer RingBuffer; +} RingBuffer; /** @brief a piece of data in the ring buffer, exactly like a glibc iovec */ -struct _DataChunk +typedef struct { size_t size; const BYTE* data; -}; -typedef struct _DataChunk DataChunk; +} DataChunk; #ifdef __cplusplus extern "C" diff --git a/include/freerdp/utils/smartcard_call.h b/include/freerdp/utils/smartcard_call.h index 7708492bf..51d126e54 100644 --- a/include/freerdp/utils/smartcard_call.h +++ b/include/freerdp/utils/smartcard_call.h @@ -31,7 +31,7 @@ #include #include -typedef struct _scard_call_context scard_call_context; +typedef struct s_scard_call_context scard_call_context; FREERDP_API scard_call_context* smartcard_call_context_new(const rdpSettings* settings); FREERDP_API void smartcard_call_context_free(scard_call_context* ctx); diff --git a/include/freerdp/utils/smartcard_operations.h b/include/freerdp/utils/smartcard_operations.h index 310902b46..fc011639b 100644 --- a/include/freerdp/utils/smartcard_operations.h +++ b/include/freerdp/utils/smartcard_operations.h @@ -30,7 +30,7 @@ #include #include -struct _SMARTCARD_OPERATION +typedef struct { union { @@ -79,8 +79,7 @@ struct _SMARTCARD_OPERATION SCARDCONTEXT hContext; SCARDHANDLE hCard; const char* ioControlCodeName; -}; -typedef struct _SMARTCARD_OPERATION SMARTCARD_OPERATION; +} SMARTCARD_OPERATION; FREERDP_API LONG smartcard_irp_device_control_decode(wStream* s, UINT32 CompletionId, UINT32 FileId, SMARTCARD_OPERATION* operation); diff --git a/include/freerdp/utils/stopwatch.h b/include/freerdp/utils/stopwatch.h index eefa5b3b3..9e044043b 100644 --- a/include/freerdp/utils/stopwatch.h +++ b/include/freerdp/utils/stopwatch.h @@ -23,14 +23,13 @@ #include #include -struct _STOPWATCH +typedef struct { UINT64 start; UINT64 end; UINT64 elapsed; UINT32 count; -}; -typedef struct _STOPWATCH STOPWATCH; +} STOPWATCH; #ifdef __cplusplus extern "C" diff --git a/include/freerdp/window.h b/include/freerdp/window.h index 45174b1ae..f69fade07 100644 --- a/include/freerdp/window.h +++ b/include/freerdp/window.h @@ -143,15 +143,14 @@ #define WS_EX_DECORATIONS 0x40000000 -struct _WINDOW_ORDER_INFO +typedef struct { UINT32 windowId; UINT32 fieldFlags; UINT32 notifyIconId; -}; -typedef struct _WINDOW_ORDER_INFO WINDOW_ORDER_INFO; +} WINDOW_ORDER_INFO; -struct _ICON_INFO +typedef struct { UINT32 cacheEntry; UINT32 cacheId; @@ -164,26 +163,23 @@ struct _ICON_INFO BYTE* bitsMask; BYTE* colorTable; BYTE* bitsColor; -}; -typedef struct _ICON_INFO ICON_INFO; +} ICON_INFO; -struct _CACHED_ICON_INFO +typedef struct { UINT32 cacheEntry; UINT32 cacheId; -}; -typedef struct _CACHED_ICON_INFO CACHED_ICON_INFO; +} CACHED_ICON_INFO; -struct _NOTIFY_ICON_INFOTIP +typedef struct { UINT32 timeout; UINT32 flags; RAIL_UNICODE_STRING text; RAIL_UNICODE_STRING title; -}; -typedef struct _NOTIFY_ICON_INFOTIP NOTIFY_ICON_INFOTIP; +} NOTIFY_ICON_INFOTIP; -struct _WINDOW_STATE_ORDER +typedef struct { UINT32 ownerWindowId; UINT32 style; @@ -217,22 +213,19 @@ struct _WINDOW_STATE_ORDER UINT8 EnforceServerZOrder; UINT8 AppBarState; UINT8 AppBarEdge; -}; -typedef struct _WINDOW_STATE_ORDER WINDOW_STATE_ORDER; +} WINDOW_STATE_ORDER; -struct _WINDOW_ICON_ORDER +typedef struct { ICON_INFO* iconInfo; -}; -typedef struct _WINDOW_ICON_ORDER WINDOW_ICON_ORDER; +} WINDOW_ICON_ORDER; -struct _WINDOW_CACHED_ICON_ORDER +typedef struct { CACHED_ICON_INFO cachedIcon; -}; -typedef struct _WINDOW_CACHED_ICON_ORDER WINDOW_CACHED_ICON_ORDER; +} WINDOW_CACHED_ICON_ORDER; -struct _NOTIFY_ICON_STATE_ORDER +typedef struct { UINT32 version; RAIL_UNICODE_STRING toolTip; @@ -240,16 +233,14 @@ struct _NOTIFY_ICON_STATE_ORDER UINT32 state; ICON_INFO icon; CACHED_ICON_INFO cachedIcon; -}; -typedef struct _NOTIFY_ICON_STATE_ORDER NOTIFY_ICON_STATE_ORDER; +} NOTIFY_ICON_STATE_ORDER; -struct _MONITORED_DESKTOP_ORDER +typedef struct { UINT32 activeWindowId; UINT32 numWindowIds; UINT32* windowIds; -}; -typedef struct _MONITORED_DESKTOP_ORDER MONITORED_DESKTOP_ORDER; +} MONITORED_DESKTOP_ORDER; typedef BOOL (*pWindowCreate)(rdpContext* context, const WINDOW_ORDER_INFO* orderInfo, const WINDOW_STATE_ORDER* window_state); diff --git a/libfreerdp/cache/brush.c b/libfreerdp/cache/brush.c index 36e9f36a4..45a8ca624 100644 --- a/libfreerdp/cache/brush.c +++ b/libfreerdp/cache/brush.c @@ -36,12 +36,11 @@ #define TAG FREERDP_TAG("cache.brush") -struct _BRUSH_ENTRY +typedef struct { UINT32 bpp; void* entry; -}; -typedef struct _BRUSH_ENTRY BRUSH_ENTRY; +} BRUSH_ENTRY; struct rdp_brush_cache { diff --git a/libfreerdp/cache/glyph.c b/libfreerdp/cache/glyph.c index 369165347..84d10f6cd 100644 --- a/libfreerdp/cache/glyph.c +++ b/libfreerdp/cache/glyph.c @@ -30,6 +30,7 @@ #include #include +#include #include #include "glyph.h" diff --git a/libfreerdp/cache/nine_grid.c b/libfreerdp/cache/nine_grid.c index 24a52add3..4e262c86c 100644 --- a/libfreerdp/cache/nine_grid.c +++ b/libfreerdp/cache/nine_grid.c @@ -34,11 +34,10 @@ #define TAG FREERDP_TAG("cache.nine_grid") -struct _NINE_GRID_ENTRY +typedef struct { void* entry; -}; -typedef struct _NINE_GRID_ENTRY NINE_GRID_ENTRY; +} NINE_GRID_ENTRY; struct rdp_nine_grid_cache { diff --git a/libfreerdp/codec/clear.c b/libfreerdp/codec/clear.c index 977a07c45..36b830c77 100644 --- a/libfreerdp/codec/clear.c +++ b/libfreerdp/codec/clear.c @@ -40,23 +40,21 @@ #define CLEARCODEC_VBAR_SIZE 32768 #define CLEARCODEC_VBAR_SHORT_SIZE 16384 -struct _CLEAR_GLYPH_ENTRY +typedef struct { UINT32 size; UINT32 count; UINT32* pixels; -}; -typedef struct _CLEAR_GLYPH_ENTRY CLEAR_GLYPH_ENTRY; +} CLEAR_GLYPH_ENTRY; -struct _CLEAR_VBAR_ENTRY +typedef struct { UINT32 size; UINT32 count; BYTE* pixels; -}; -typedef struct _CLEAR_VBAR_ENTRY CLEAR_VBAR_ENTRY; +} CLEAR_VBAR_ENTRY; -struct _CLEAR_CONTEXT +struct S_CLEAR_CONTEXT { BOOL Compressor; NSC_CONTEXT* nsc; diff --git a/libfreerdp/codec/dsp.c b/libfreerdp/codec/dsp.c index b64f20c6e..29df3153b 100644 --- a/libfreerdp/codec/dsp.c +++ b/libfreerdp/codec/dsp.c @@ -61,7 +61,8 @@ #if !defined(WITH_DSP_FFMPEG) -union _ADPCM { +typedef union +{ struct { size_t packet_size; @@ -75,10 +76,9 @@ union _ADPCM { INT32 sample1[2]; INT32 sample2[2]; } ms; -}; -typedef union _ADPCM ADPCM; +} ADPCM; -struct _FREERDP_DSP_CONTEXT +struct S_FREERDP_DSP_CONTEXT { BOOL encoder; diff --git a/libfreerdp/codec/dsp.h b/libfreerdp/codec/dsp.h index c932efe77..1325c31e2 100644 --- a/libfreerdp/codec/dsp.h +++ b/libfreerdp/codec/dsp.h @@ -25,7 +25,7 @@ #include #include -struct _FREERDP_DSP_COMMON_CONTEXT +struct S_FREERDP_DSP_COMMON_CONTEXT { wStream* buffer; wStream* resample; diff --git a/libfreerdp/codec/dsp_ffmpeg.c b/libfreerdp/codec/dsp_ffmpeg.c index 37c67da79..705999b7a 100644 --- a/libfreerdp/codec/dsp_ffmpeg.c +++ b/libfreerdp/codec/dsp_ffmpeg.c @@ -40,7 +40,7 @@ #define TAG FREERDP_TAG("dsp.ffmpeg") -struct _FREERDP_DSP_CONTEXT +struct S_FREERDP_DSP_CONTEXT { AUDIO_FORMAT format; diff --git a/libfreerdp/codec/h264.h b/libfreerdp/codec/h264.h index 817916616..c4ff5d73d 100644 --- a/libfreerdp/codec/h264.h +++ b/libfreerdp/codec/h264.h @@ -31,7 +31,7 @@ typedef int (*pfnH264SubsystemDecompress)(H264_CONTEXT* h264, const BYTE* pSrcDa typedef int (*pfnH264SubsystemCompress)(H264_CONTEXT* h264, const BYTE** pSrcYuv, const UINT32* pStride, BYTE** ppDstData, UINT32* pDstSize); -struct _H264_CONTEXT_SUBSYSTEM +struct S_H264_CONTEXT_SUBSYSTEM { const char* name; pfnH264SubsystemInit Init; diff --git a/libfreerdp/codec/h264_ffmpeg.c b/libfreerdp/codec/h264_ffmpeg.c index 58dec852b..155909290 100644 --- a/libfreerdp/codec/h264_ffmpeg.c +++ b/libfreerdp/codec/h264_ffmpeg.c @@ -71,7 +71,7 @@ static inline char* error_string(char* errbuf, size_t errbuf_size, int errnum) #define VAAPI_DEVICE "/dev/dri/renderD128" #endif -struct _H264_CONTEXT_LIBAVCODEC +typedef struct { AVCodec* codecDecoder; AVCodecContext* codecDecoderContext; @@ -91,8 +91,7 @@ struct _H264_CONTEXT_LIBAVCODEC AVBufferRef* hw_frames_ctx; #endif #endif -}; -typedef struct _H264_CONTEXT_LIBAVCODEC H264_CONTEXT_LIBAVCODEC; +} H264_CONTEXT_LIBAVCODEC; static void libavcodec_destroy_encoder(H264_CONTEXT* h264) { diff --git a/libfreerdp/codec/h264_mediacodec.c b/libfreerdp/codec/h264_mediacodec.c index 9e8d98c73..8fe85bb01 100644 --- a/libfreerdp/codec/h264_mediacodec.c +++ b/libfreerdp/codec/h264_mediacodec.c @@ -91,7 +91,7 @@ static const int COLOR_FormatYUV420Flexible = 0x7f420888; static const int MEDIACODEC_MINIMUM_WIDTH = 320; static const int MEDIACODEC_MINIMUM_HEIGHT = 240; -struct _H264_CONTEXT_MEDIACODEC +typedef struct { AMediaCodec* decoder; AMediaFormat* inputFormat; @@ -132,9 +132,7 @@ struct _H264_CONTEXT_MEDIACODEC const char* gAMediaFormatKeyWidth; const char* gAMediaFormatKeyHeight; const char* gAMediaFormatKeyColorFormat; -}; - -typedef struct _H264_CONTEXT_MEDIACODEC H264_CONTEXT_MEDIACODEC; +} H264_CONTEXT_MEDIACODEC; static int load_libmediandk(H264_CONTEXT* h264) { diff --git a/libfreerdp/codec/h264_mf.c b/libfreerdp/codec/h264_mf.c index c640bb9a4..113ffab42 100644 --- a/libfreerdp/codec/h264_mf.c +++ b/libfreerdp/codec/h264_mf.c @@ -72,7 +72,7 @@ typedef HRESULT(__stdcall* pfnMFCreateSample)(IMFSample** ppIMFSample); typedef HRESULT(__stdcall* pfnMFCreateMemoryBuffer)(DWORD cbMaxLength, IMFMediaBuffer** ppBuffer); typedef HRESULT(__stdcall* pfnMFCreateMediaType)(IMFMediaType** ppMFType); -struct _H264_CONTEXT_MF +typedef struct { ICodecAPI* codecApi; IMFTransform* transform; @@ -89,8 +89,7 @@ struct _H264_CONTEXT_MF pfnMFCreateSample MFCreateSample; pfnMFCreateMemoryBuffer MFCreateMemoryBuffer; pfnMFCreateMediaType MFCreateMediaType; -}; -typedef struct _H264_CONTEXT_MF H264_CONTEXT_MF; +} H264_CONTEXT_MF; static HRESULT mf_find_output_type(H264_CONTEXT_MF* sys, const GUID* guid, IMFMediaType** ppMediaType) diff --git a/libfreerdp/codec/h264_openh264.c b/libfreerdp/codec/h264_openh264.c index 214c36805..fde84593a 100644 --- a/libfreerdp/codec/h264_openh264.c +++ b/libfreerdp/codec/h264_openh264.c @@ -40,7 +40,7 @@ typedef void (*pWelsDestroyDecoder)(ISVCDecoder* pDecoder); typedef int (*pWelsCreateSVCEncoder)(ISVCEncoder** ppEncoder); typedef void (*pWelsDestroySVCEncoder)(ISVCEncoder* pEncoder); -struct _H264_CONTEXT_OPENH264 +typedef struct { #if defined(WITH_OPENH264_LOADING) HMODULE lib; @@ -54,8 +54,7 @@ struct _H264_CONTEXT_OPENH264 ISVCDecoder* pDecoder; ISVCEncoder* pEncoder; SEncParamExt EncParamExt; -}; -typedef struct _H264_CONTEXT_OPENH264 H264_CONTEXT_OPENH264; +} H264_CONTEXT_OPENH264; #if defined(WITH_OPENH264_LOADING) static const char* openh264_library_names[] = { diff --git a/libfreerdp/codec/interleaved.c b/libfreerdp/codec/interleaved.c index d516446a3..825d4f601 100644 --- a/libfreerdp/codec/interleaved.c +++ b/libfreerdp/codec/interleaved.c @@ -324,6 +324,16 @@ static INLINE void write_pixel_16(BYTE* _buf, UINT16 _pix) #define ENSURE_CAPACITY(_start, _end, _size) ensure_capacity(_start, _end, _size, 3) #include "include/bitmap.c" +struct S_BITMAP_INTERLEAVED_CONTEXT +{ + BOOL Compressor; + + UINT32 TempSize; + BYTE* TempBuffer; + + wStream* bts; +}; + BOOL interleaved_decompress(BITMAP_INTERLEAVED_CONTEXT* interleaved, const BYTE* pSrcData, UINT32 SrcSize, UINT32 nSrcWidth, UINT32 nSrcHeight, UINT32 bpp, BYTE* pDstData, UINT32 DstFormat, UINT32 nDstStep, UINT32 nXDst, diff --git a/libfreerdp/codec/nsc_encode.c b/libfreerdp/codec/nsc_encode.c index fd9626a6d..a9387fe5c 100644 --- a/libfreerdp/codec/nsc_encode.c +++ b/libfreerdp/codec/nsc_encode.c @@ -35,7 +35,7 @@ #include "nsc_types.h" #include "nsc_encode.h" -struct _NSC_MESSAGE +typedef struct { UINT32 x; UINT32 y; @@ -54,8 +54,7 @@ struct _NSC_MESSAGE UINT32 AlphaPlaneByteCount; UINT8 ColorLossLevel; UINT8 ChromaSubsamplingLevel; -}; -typedef struct _NSC_MESSAGE NSC_MESSAGE; +} NSC_MESSAGE; static BOOL nsc_write_message(NSC_CONTEXT* context, wStream* s, const NSC_MESSAGE* message); diff --git a/libfreerdp/codec/nsc_types.h b/libfreerdp/codec/nsc_types.h index 14c1a946b..874b6dd4e 100644 --- a/libfreerdp/codec/nsc_types.h +++ b/libfreerdp/codec/nsc_types.h @@ -35,7 +35,7 @@ #define ROUND_UP_TO(_b, _n) (_b + ((~(_b & (_n - 1)) + 0x1) & (_n - 1))) #define MINMAX(_v, _l, _h) ((_v) < (_l) ? (_l) : ((_v) > (_h) ? (_h) : (_v))) -struct _NSC_CONTEXT_PRIV +typedef struct { wLog* log; @@ -47,11 +47,9 @@ struct _NSC_CONTEXT_PRIV PROFILER_DEFINE(prof_nsc_decode) PROFILER_DEFINE(prof_nsc_rle_compress_data) PROFILER_DEFINE(prof_nsc_encode) -}; +} NSC_CONTEXT_PRIV; -typedef struct _NSC_CONTEXT_PRIV NSC_CONTEXT_PRIV; - -struct _NSC_CONTEXT +struct S_NSC_CONTEXT { UINT32 OrgByteCount[4]; UINT32 format; diff --git a/libfreerdp/codec/progressive.c b/libfreerdp/codec/progressive.c index 166feb629..405c4d6df 100644 --- a/libfreerdp/codec/progressive.c +++ b/libfreerdp/codec/progressive.c @@ -43,7 +43,7 @@ #define TAG FREERDP_TAG("codec.progressive") -struct _RFX_PROGRESSIVE_UPGRADE_STATE +typedef struct { BOOL nonLL; wBitStream* srl; @@ -54,8 +54,7 @@ struct _RFX_PROGRESSIVE_UPGRADE_STATE UINT32 kp; int nz; BOOL mode; -}; -typedef struct _RFX_PROGRESSIVE_UPGRADE_STATE RFX_PROGRESSIVE_UPGRADE_STATE; +} RFX_PROGRESSIVE_UPGRADE_STATE; static const char* progressive_get_block_type_string(UINT16 blockType) { @@ -1651,14 +1650,13 @@ static INLINE BOOL progressive_tile_read(PROGRESSIVE_CONTEXT* progressive, BOOL return progressive_surface_tile_replace(surface, region, &tile, FALSE); } -struct _PROGRESSIVE_TILE_PROCESS_WORK_PARAM +typedef struct { PROGRESSIVE_CONTEXT* progressive; PROGRESSIVE_BLOCK_REGION* region; const PROGRESSIVE_BLOCK_CONTEXT* context; RFX_PROGRESSIVE_TILE* tile; -}; -typedef struct _PROGRESSIVE_TILE_PROCESS_WORK_PARAM PROGRESSIVE_TILE_PROCESS_WORK_PARAM; +} PROGRESSIVE_TILE_PROCESS_WORK_PARAM; static void CALLBACK progressive_process_tiles_tile_work_callback(PTP_CALLBACK_INSTANCE instance, void* context, PTP_WORK work) diff --git a/libfreerdp/codec/progressive.h b/libfreerdp/codec/progressive.h index 3b4469b20..ac74e9aea 100644 --- a/libfreerdp/codec/progressive.h +++ b/libfreerdp/codec/progressive.h @@ -41,7 +41,7 @@ #define PROGRESSIVE_WBT_TILE_FIRST 0xCCC6 #define PROGRESSIVE_WBT_TILE_UPGRADE 0xCCC7 -struct _RFX_COMPONENT_CODEC_QUANT +typedef struct { BYTE LL3; BYTE HL3; @@ -53,36 +53,32 @@ struct _RFX_COMPONENT_CODEC_QUANT BYTE HL1; BYTE LH1; BYTE HH1; -}; -typedef struct _RFX_COMPONENT_CODEC_QUANT RFX_COMPONENT_CODEC_QUANT; +} RFX_COMPONENT_CODEC_QUANT; -struct _RFX_PROGRESSIVE_CODEC_QUANT +typedef struct { BYTE quality; RFX_COMPONENT_CODEC_QUANT yQuantValues; RFX_COMPONENT_CODEC_QUANT cbQuantValues; RFX_COMPONENT_CODEC_QUANT crQuantValues; -}; -typedef struct _RFX_PROGRESSIVE_CODEC_QUANT RFX_PROGRESSIVE_CODEC_QUANT; +} RFX_PROGRESSIVE_CODEC_QUANT; -struct _PROGRESSIVE_BLOCK +typedef struct { UINT16 blockType; UINT32 blockLen; -}; -typedef struct _PROGRESSIVE_BLOCK PROGRESSIVE_BLOCK; +} PROGRESSIVE_BLOCK; -struct _PROGRESSIVE_BLOCK_SYNC +typedef struct { UINT16 blockType; UINT32 blockLen; UINT32 magic; UINT16 version; -}; -typedef struct _PROGRESSIVE_BLOCK_SYNC PROGRESSIVE_BLOCK_SYNC; +} PROGRESSIVE_BLOCK_SYNC; -struct _PROGRESSIVE_BLOCK_CONTEXT +typedef struct { UINT16 blockType; UINT32 blockLen; @@ -90,10 +86,9 @@ struct _PROGRESSIVE_BLOCK_CONTEXT BYTE ctxId; UINT16 tileSize; BYTE flags; -}; -typedef struct _PROGRESSIVE_BLOCK_CONTEXT PROGRESSIVE_BLOCK_CONTEXT; +} PROGRESSIVE_BLOCK_CONTEXT; -struct _RFX_PROGRESSIVE_TILE +typedef struct { UINT16 blockType; UINT32 blockLen; @@ -150,10 +145,9 @@ struct _RFX_PROGRESSIVE_TILE RFX_COMPONENT_CODEC_QUANT yProgQuant; RFX_COMPONENT_CODEC_QUANT cbProgQuant; RFX_COMPONENT_CODEC_QUANT crProgQuant; -}; -typedef struct _RFX_PROGRESSIVE_TILE RFX_PROGRESSIVE_TILE; +} RFX_PROGRESSIVE_TILE; -struct _PROGRESSIVE_BLOCK_REGION +typedef struct { UINT16 blockType; UINT32 blockLen; @@ -170,10 +164,9 @@ struct _PROGRESSIVE_BLOCK_REGION RFX_COMPONENT_CODEC_QUANT quantVals[0x100]; RFX_PROGRESSIVE_CODEC_QUANT quantProgVals[0x100]; RFX_PROGRESSIVE_TILE* tiles[0x10000]; -}; -typedef struct _PROGRESSIVE_BLOCK_REGION PROGRESSIVE_BLOCK_REGION; +} PROGRESSIVE_BLOCK_REGION; -struct _PROGRESSIVE_BLOCK_FRAME_BEGIN +typedef struct { UINT16 blockType; UINT32 blockLen; @@ -181,17 +174,15 @@ struct _PROGRESSIVE_BLOCK_FRAME_BEGIN UINT32 frameIndex; UINT16 regionCount; PROGRESSIVE_BLOCK_REGION* regions; -}; -typedef struct _PROGRESSIVE_BLOCK_FRAME_BEGIN PROGRESSIVE_BLOCK_FRAME_BEGIN; +} PROGRESSIVE_BLOCK_FRAME_BEGIN; -struct _PROGRESSIVE_BLOCK_FRAME_END +typedef struct { UINT16 blockType; UINT32 blockLen; -}; -typedef struct _PROGRESSIVE_BLOCK_FRAME_END PROGRESSIVE_BLOCK_FRAME_END; +} PROGRESSIVE_BLOCK_FRAME_END; -struct _PROGRESSIVE_SURFACE_CONTEXT +typedef struct { UINT16 id; UINT32 width; @@ -203,20 +194,18 @@ struct _PROGRESSIVE_SURFACE_CONTEXT UINT32 frameId; UINT32 numUpdatedTiles; UINT32* updatedTileIndices; -}; -typedef struct _PROGRESSIVE_SURFACE_CONTEXT PROGRESSIVE_SURFACE_CONTEXT; +} PROGRESSIVE_SURFACE_CONTEXT; -enum _WBT_STATE_FLAG +typedef enum { FLAG_WBT_SYNC = 0x01, FLAG_WBT_FRAME_BEGIN = 0x02, FLAG_WBT_FRAME_END = 0x04, FLAG_WBT_CONTEXT = 0x08, FLAG_WBT_REGION = 0x10 -}; -typedef enum _WBT_STATE_FLAG WBT_STATE_FLAG; +} WBT_STATE_FLAG; -struct _PROGRESSIVE_CONTEXT +struct S_PROGRESSIVE_CONTEXT { BOOL Compressor; diff --git a/libfreerdp/codec/region.c b/libfreerdp/codec/region.c index 3d9e5aa04..861a7ba5a 100644 --- a/libfreerdp/codec/region.c +++ b/libfreerdp/codec/region.c @@ -68,7 +68,7 @@ * rectangles in the same places (of the same width, of course). */ -struct _REGION16_DATA +struct S_REGION16_DATA { long size; long nbRects; diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c index 75ebe4be9..9d9e5429e 100644 --- a/libfreerdp/codec/rfx.c +++ b/libfreerdp/codec/rfx.c @@ -752,12 +752,11 @@ static BOOL rfx_process_message_region(RFX_CONTEXT* context, RFX_MESSAGE* messag return TRUE; } -struct _RFX_TILE_PROCESS_WORK_PARAM +typedef struct { RFX_TILE* tile; RFX_CONTEXT* context; -}; -typedef struct _RFX_TILE_PROCESS_WORK_PARAM RFX_TILE_PROCESS_WORK_PARAM; +} RFX_TILE_PROCESS_WORK_PARAM; static void CALLBACK rfx_process_message_tile_work_callback(PTP_CALLBACK_INSTANCE instance, void* context, PTP_WORK work) @@ -1400,7 +1399,7 @@ static BOOL rfx_write_tile(RFX_CONTEXT* context, wStream* s, RFX_TILE* tile) return TRUE; } -struct _RFX_TILE_COMPOSE_WORK_PARAM +struct S_RFX_TILE_COMPOSE_WORK_PARAM { RFX_TILE* tile; RFX_CONTEXT* context; diff --git a/libfreerdp/codec/rfx_bitstream.h b/libfreerdp/codec/rfx_bitstream.h index b2b57ccb6..3e8424211 100644 --- a/libfreerdp/codec/rfx_bitstream.h +++ b/libfreerdp/codec/rfx_bitstream.h @@ -22,14 +22,13 @@ #include -struct _RFX_BITSTREAM +typedef struct { BYTE* buffer; int nbytes; int byte_pos; int bits_left; -}; -typedef struct _RFX_BITSTREAM RFX_BITSTREAM; +} RFX_BITSTREAM; #define rfx_bitstream_attach(bs, _buffer, _nbytes) \ do \ diff --git a/libfreerdp/codec/rfx_types.h b/libfreerdp/codec/rfx_types.h index a55aa0d85..b6b9c789e 100644 --- a/libfreerdp/codec/rfx_types.h +++ b/libfreerdp/codec/rfx_types.h @@ -42,9 +42,9 @@ } while (0) #endif -typedef struct _RFX_TILE_COMPOSE_WORK_PARAM RFX_TILE_COMPOSE_WORK_PARAM; +typedef struct S_RFX_TILE_COMPOSE_WORK_PARAM RFX_TILE_COMPOSE_WORK_PARAM; -struct _RFX_CONTEXT_PRIV +struct S_RFX_CONTEXT_PRIV { wLog* log; wObjectPool* TilePool; diff --git a/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c b/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c index 84826bc31..1501d7a9a 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c @@ -128,12 +128,11 @@ * dec_2_3_100_sampleimage3.bmp */ -struct _EGFX_SAMPLE_FILE +typedef struct { BYTE* buffer; size_t size; -}; -typedef struct _EGFX_SAMPLE_FILE EGFX_SAMPLE_FILE; +} EGFX_SAMPLE_FILE; static int g_Width = 0; static int g_Height = 0; diff --git a/libfreerdp/codec/xcrush.c b/libfreerdp/codec/xcrush.c index 3a01e1091..cd2ce62b9 100644 --- a/libfreerdp/codec/xcrush.c +++ b/libfreerdp/codec/xcrush.c @@ -34,45 +34,40 @@ #pragma pack(push, 1) -struct _XCRUSH_MATCH_INFO +typedef struct { UINT32 MatchOffset; UINT32 ChunkOffset; UINT32 MatchLength; -}; -typedef struct _XCRUSH_MATCH_INFO XCRUSH_MATCH_INFO; +} XCRUSH_MATCH_INFO; -struct _XCRUSH_CHUNK +typedef struct { UINT32 offset; UINT32 next; -}; -typedef struct _XCRUSH_CHUNK XCRUSH_CHUNK; +} XCRUSH_CHUNK; -struct _XCRUSH_SIGNATURE +typedef struct { UINT16 seed; UINT16 size; -}; -typedef struct _XCRUSH_SIGNATURE XCRUSH_SIGNATURE; +} XCRUSH_SIGNATURE; -struct _RDP61_MATCH_DETAILS +typedef struct { UINT16 MatchLength; UINT16 MatchOutputOffset; UINT32 MatchHistoryOffset; -}; -typedef struct _RDP61_MATCH_DETAILS RDP61_MATCH_DETAILS; +} RDP61_MATCH_DETAILS; -struct _RDP61_COMPRESSED_DATA +typedef struct { BYTE Level1ComprFlags; BYTE Level2ComprFlags; UINT16 MatchCount; RDP61_MATCH_DETAILS* MatchDetails; BYTE* Literals; -}; -typedef struct _RDP61_COMPRESSED_DATA RDP61_COMPRESSED_DATA; +} RDP61_COMPRESSED_DATA; #pragma pack(pop) diff --git a/libfreerdp/codec/yuv.c b/libfreerdp/codec/yuv.c index 85d841421..28debca98 100644 --- a/libfreerdp/codec/yuv.c +++ b/libfreerdp/codec/yuv.c @@ -7,7 +7,7 @@ #define TAG FREERDP_TAG("codec") -struct _YUV_CONTEXT +struct S_YUV_CONTEXT { UINT32 width, height; BOOL useThreads; @@ -18,7 +18,7 @@ struct _YUV_CONTEXT TP_CALLBACK_ENVIRON ThreadPoolEnv; }; -struct s_YUV_PROCESS_WORK_PARAM +typedef struct { YUV_CONTEXT* context; const BYTE* pYUVData[3]; @@ -27,10 +27,9 @@ struct s_YUV_PROCESS_WORK_PARAM BYTE* dest; UINT32 nDstStep; RECTANGLE_16 rect; -}; -typedef struct s_YUV_PROCESS_WORK_PARAM YUV_PROCESS_WORK_PARAM; +} YUV_PROCESS_WORK_PARAM; -struct s_YUV_COMBINE_WORK_PARAM +typedef struct { YUV_CONTEXT* context; const BYTE* pYUVData[3]; @@ -39,10 +38,9 @@ struct s_YUV_COMBINE_WORK_PARAM UINT32 iDstStride[3]; RECTANGLE_16 rect; BYTE type; -}; -typedef struct s_YUV_COMBINE_WORK_PARAM YUV_COMBINE_WORK_PARAM; +} YUV_COMBINE_WORK_PARAM; -struct s_YUV_ENCODE_WORK_PARAM +typedef struct { YUV_CONTEXT* context; const BYTE* pSrcData; @@ -55,8 +53,7 @@ struct s_YUV_ENCODE_WORK_PARAM BYTE* pYUVLumaData[3]; BYTE* pYUVChromaData[3]; UINT32 iStride[3]; -}; -typedef struct s_YUV_ENCODE_WORK_PARAM YUV_ENCODE_WORK_PARAM; +} YUV_ENCODE_WORK_PARAM; static INLINE BOOL avc420_yuv_to_rgb(const BYTE* pYUVData[3], const UINT32 iStride[3], const RECTANGLE_16* rect, UINT32 nDstStep, BYTE* pDstData, diff --git a/libfreerdp/codec/zgfx.c b/libfreerdp/codec/zgfx.c index e9ed0c07c..81c4858d6 100644 --- a/libfreerdp/codec/zgfx.c +++ b/libfreerdp/codec/zgfx.c @@ -42,17 +42,16 @@ * Minimum match length: 3 bytes */ -struct _ZGFX_TOKEN +typedef struct { UINT32 prefixLength; UINT32 prefixCode; UINT32 valueBits; UINT32 tokenType; UINT32 valueBase; -}; -typedef struct _ZGFX_TOKEN ZGFX_TOKEN; +} ZGFX_TOKEN; -struct _ZGFX_CONTEXT +struct S_ZGFX_CONTEXT { BOOL Compressor; @@ -117,25 +116,25 @@ static const ZGFX_TOKEN ZGFX_TOKEN_TABLE[] = { { 0 } }; -static INLINE BOOL zgfx_GetBits(ZGFX_CONTEXT* _zgfx, UINT32 _nbits) +static INLINE BOOL zgfx_GetBits(ZGFX_CONTEXT* zgfx, UINT32 nbits) { - if (!_zgfx) + if (!zgfx) return FALSE; - while (_zgfx->cBitsCurrent < _nbits) + while (zgfx->cBitsCurrent < nbits) { - _zgfx->BitsCurrent <<= 8; + zgfx->BitsCurrent <<= 8; - if (_zgfx->pbInputCurrent < _zgfx->pbInputEnd) - _zgfx->BitsCurrent += *(_zgfx->pbInputCurrent)++; + if (zgfx->pbInputCurrent < zgfx->pbInputEnd) + zgfx->BitsCurrent += *(zgfx->pbInputCurrent)++; - _zgfx->cBitsCurrent += 8; + zgfx->cBitsCurrent += 8; } - _zgfx->cBitsRemaining -= _nbits; - _zgfx->cBitsCurrent -= _nbits; - _zgfx->bits = _zgfx->BitsCurrent >> _zgfx->cBitsCurrent; - _zgfx->BitsCurrent &= ((1 << _zgfx->cBitsCurrent) - 1); + zgfx->cBitsRemaining -= nbits; + zgfx->cBitsCurrent -= nbits; + zgfx->bits = zgfx->BitsCurrent >> zgfx->cBitsCurrent; + zgfx->BitsCurrent &= ((1 << zgfx->cBitsCurrent) - 1); return TRUE; } diff --git a/libfreerdp/core/client.h b/libfreerdp/core/client.h index 7b6f0ce3b..861d249c8 100644 --- a/libfreerdp/core/client.h +++ b/libfreerdp/core/client.h @@ -40,7 +40,7 @@ #define CHANNEL_MAX_COUNT 30 #endif -struct rdp_channel_client_data +typedef struct { PVIRTUALCHANNELENTRY entry; PVIRTUALCHANNELENTRYEX entryEx; @@ -48,10 +48,9 @@ struct rdp_channel_client_data PCHANNEL_INIT_EVENT_EX_FN pChannelInitEventProcEx; void* pInitHandle; void* lpUserParam; -}; -typedef struct rdp_channel_client_data CHANNEL_CLIENT_DATA; +} CHANNEL_CLIENT_DATA; -struct rdp_channel_open_data +typedef struct { char name[CHANNEL_NAME_LEN + 1]; int OpenHandle; @@ -62,17 +61,15 @@ struct rdp_channel_open_data void* lpUserParam; PCHANNEL_OPEN_EVENT_FN pChannelOpenEventProc; PCHANNEL_OPEN_EVENT_EX_FN pChannelOpenEventProcEx; -}; -typedef struct rdp_channel_open_data CHANNEL_OPEN_DATA; +} CHANNEL_OPEN_DATA; -struct _CHANNEL_OPEN_EVENT +typedef struct { void* Data; UINT32 DataLength; void* UserData; CHANNEL_OPEN_DATA* pChannelOpenData; -}; -typedef struct _CHANNEL_OPEN_EVENT CHANNEL_OPEN_EVENT; +} CHANNEL_OPEN_EVENT; /** * pInitHandle: handle that identifies the client connection @@ -80,12 +77,11 @@ typedef struct _CHANNEL_OPEN_EVENT CHANNEL_OPEN_EVENT; * Used by the client with VirtualChannelOpen */ -struct rdp_channel_init_data +typedef struct { rdpChannels* channels; void* pInterface; -}; -typedef struct rdp_channel_init_data CHANNEL_INIT_DATA; +} CHANNEL_INIT_DATA; struct rdp_channels { diff --git a/libfreerdp/core/errinfo.h b/libfreerdp/core/errinfo.h index 852d3b089..c64e969c3 100644 --- a/libfreerdp/core/errinfo.h +++ b/libfreerdp/core/errinfo.h @@ -23,14 +23,13 @@ #include #include -struct _ERRINFO +typedef struct { UINT32 code; const char* name; const char* info; const char* category; -}; -typedef struct _ERRINFO ERRINFO; +} ERRINFO; FREERDP_LOCAL void rdp_print_errinfo(UINT32 code); diff --git a/libfreerdp/core/fastpath.h b/libfreerdp/core/fastpath.h index 6ea0dc979..8f396f093 100644 --- a/libfreerdp/core/fastpath.h +++ b/libfreerdp/core/fastpath.h @@ -114,7 +114,7 @@ enum FASTPATH_INPUT_KBDFLAGS FASTPATH_INPUT_KBDFLAGS_PREFIX_E1 = 0x04 /* for pause sequence */ }; -struct _FASTPATH_UPDATE_PDU_HEADER +typedef struct { BYTE fpOutputHeader; BYTE length1; @@ -125,10 +125,9 @@ struct _FASTPATH_UPDATE_PDU_HEADER BYTE action; BYTE secFlags; UINT16 length; -}; -typedef struct _FASTPATH_UPDATE_PDU_HEADER FASTPATH_UPDATE_PDU_HEADER; +} FASTPATH_UPDATE_PDU_HEADER; -struct _FASTPATH_UPDATE_HEADER +typedef struct { BYTE updateHeader; BYTE compressionFlags; @@ -137,8 +136,7 @@ struct _FASTPATH_UPDATE_HEADER BYTE updateCode; BYTE fragmentation; BYTE compression; -}; -typedef struct _FASTPATH_UPDATE_HEADER FASTPATH_UPDATE_HEADER; +} FASTPATH_UPDATE_HEADER; FREERDP_LOCAL BOOL fastpath_read_header_rdp(rdpFastPath* fastpath, wStream* s, UINT16* length); FREERDP_LOCAL int fastpath_recv_updates(rdpFastPath* fastpath, wStream* s); diff --git a/libfreerdp/core/gateway/http.c b/libfreerdp/core/gateway/http.c index 819a1b541..2fe80bfae 100644 --- a/libfreerdp/core/gateway/http.c +++ b/libfreerdp/core/gateway/http.c @@ -45,7 +45,7 @@ #define WEBSOCKET_MAGIC_GUID "258EAFA5-E914-47DA-95CA-C5AB0DC85B11" -struct _http_context +struct s_http_context { char* Method; char* URI; @@ -61,7 +61,7 @@ struct _http_context char SecWebsocketKey[16]; }; -struct _http_request +struct s_http_request { char* Method; char* URI; @@ -73,7 +73,7 @@ struct _http_request TRANSFER_ENCODING TransferEncoding; }; -struct _http_response +struct s_http_response { size_t count; char** lines; diff --git a/libfreerdp/core/gateway/http.h b/libfreerdp/core/gateway/http.h index 67c9cd626..7f503ce35 100644 --- a/libfreerdp/core/gateway/http.h +++ b/libfreerdp/core/gateway/http.h @@ -70,7 +70,7 @@ #define HTTP_STATUS_GATEWAY_TIMEOUT 504 #define HTTP_STATUS_VERSION_NOT_SUP 505 -typedef enum _TRANSFER_ENCODING +typedef enum { TransferEncodingUnknown, TransferEncodingIdentity, @@ -78,7 +78,7 @@ typedef enum _TRANSFER_ENCODING } TRANSFER_ENCODING; /* HTTP context */ -typedef struct _http_context HttpContext; +typedef struct s_http_context HttpContext; FREERDP_LOCAL HttpContext* http_context_new(void); FREERDP_LOCAL void http_context_free(HttpContext* context); @@ -100,7 +100,7 @@ FREERDP_LOCAL BOOL http_context_enable_websocket_upgrade(HttpContext* context, B FREERDP_LOCAL BOOL http_context_is_websocket_upgrade_enabled(HttpContext* context); /* HTTP request */ -typedef struct _http_request HttpRequest; +typedef struct s_http_request HttpRequest; FREERDP_LOCAL HttpRequest* http_request_new(void); FREERDP_LOCAL void http_request_free(HttpRequest* request); @@ -119,7 +119,7 @@ FREERDP_LOCAL BOOL http_request_set_transfer_encoding(HttpRequest* request, FREERDP_LOCAL wStream* http_request_write(HttpContext* context, HttpRequest* request); /* HTTP response */ -typedef struct _http_response HttpResponse; +typedef struct s_http_response HttpResponse; FREERDP_LOCAL HttpResponse* http_response_new(void); FREERDP_LOCAL void http_response_free(HttpResponse* response); diff --git a/libfreerdp/core/gateway/rdg.c b/libfreerdp/core/gateway/rdg.c index 1c1d44464..43b0909d0 100644 --- a/libfreerdp/core/gateway/rdg.c +++ b/libfreerdp/core/gateway/rdg.c @@ -108,7 +108,7 @@ #define WEBSOCKET_MASK_BIT 0x80 #define WEBSOCKET_FIN_BIT 0x80 -typedef enum _WEBSOCKET_OPCODE +typedef enum { WebsocketContinuationOpcode = 0x0, WebsocketTextOpcode = 0x1, @@ -118,7 +118,7 @@ typedef enum _WEBSOCKET_OPCODE WebsocketPongOpcode = 0xa, } WEBSOCKET_OPCODE; -typedef enum _WEBSOCKET_STATE +typedef enum { WebsocketStateOpcodeAndFin, WebsocketStateLengthAndMasking, @@ -141,7 +141,7 @@ typedef struct wStream* responseStreamBuffer; } rdg_http_websocket_context; -typedef enum _CHUNK_STATE +typedef enum { ChunkStateLenghHeader, ChunkStateData, diff --git a/libfreerdp/core/gateway/rpc.h b/libfreerdp/core/gateway/rpc.h index eb8e1f23b..be94038de 100644 --- a/libfreerdp/core/gateway/rpc.h +++ b/libfreerdp/core/gateway/rpc.h @@ -60,7 +60,7 @@ typedef struct #define RPC_PDU_FLAG_STUB 0x00000001 -typedef struct _RPC_PDU +typedef struct { wStream* s; UINT32 Type; @@ -398,13 +398,12 @@ typedef struct /* fault codes */ -struct _RPC_FAULT_CODE +typedef struct { UINT32 code; const char* name; const char* category; -}; -typedef struct _RPC_FAULT_CODE RPC_FAULT_CODE; +} RPC_FAULT_CODE; #define DEFINE_RPC_FAULT_CODE(_code, cat) \ { \ @@ -544,15 +543,14 @@ typedef union #pragma pack(pop) -struct _RPC_SECURITY_PROVIDER_INFO +typedef struct { UINT32 Id; LONG EvenLegs; LONG NumLegs; -}; -typedef struct _RPC_SECURITY_PROVIDER_INFO RPC_SECURITY_PROVIDER_INFO; +} RPC_SECURITY_PROVIDER_INFO; -enum _RPC_CLIENT_STATE +typedef enum { RPC_CLIENT_STATE_INITIAL, RPC_CLIENT_STATE_ESTABLISHED, @@ -562,10 +560,9 @@ enum _RPC_CLIENT_STATE RPC_CLIENT_STATE_CONTEXT_NEGOTIATED, RPC_CLIENT_STATE_WAIT_RESPONSE, RPC_CLIENT_STATE_FINAL -}; -typedef enum _RPC_CLIENT_STATE RPC_CLIENT_STATE; +} RPC_CLIENT_STATE; -enum _RPC_CLIENT_CALL_STATE +typedef enum { RPC_CLIENT_CALL_STATE_INITIAL, RPC_CLIENT_CALL_STATE_SEND_PDUS, @@ -574,18 +571,16 @@ enum _RPC_CLIENT_CALL_STATE RPC_CLIENT_CALL_STATE_COMPLETE, RPC_CLIENT_CALL_STATE_FAULT, RPC_CLIENT_CALL_STATE_FINAL -}; -typedef enum _RPC_CLIENT_CALL_STATE RPC_CLIENT_CALL_STATE; +} RPC_CLIENT_CALL_STATE; -struct rpc_client_call +typedef struct { UINT32 CallId; UINT32 OpNum; RPC_CLIENT_CALL_STATE State; -}; -typedef struct rpc_client_call RpcClientCall; +} RpcClientCall; -struct rpc_client +typedef struct { rdpContext* context; RPC_PDU* pdu; @@ -597,10 +592,9 @@ struct rpc_client char* host; UINT16 port; BOOL isProxy; -}; -typedef struct rpc_client RpcClient; +} RpcClient; -struct rpc_channel +typedef struct { RpcClient* client; BIO* bio; @@ -608,22 +602,20 @@ struct rpc_channel rdpNtlm* ntlm; HttpContext* http; BYTE Cookie[16]; -}; -typedef struct rpc_channel RpcChannel; +} RpcChannel; /* Ping Originator */ -struct rpc_ping_originator +typedef struct { UINT32 ConnectionTimeout; UINT32 LastPacketSentTimestamp; UINT32 KeepAliveInterval; -}; -typedef struct rpc_ping_originator RpcPingOriginator; +} RpcPingOriginator; /* Client In Channel */ -enum _CLIENT_IN_CHANNEL_STATE +typedef enum { CLIENT_IN_CHANNEL_STATE_INITIAL, CLIENT_IN_CHANNEL_STATE_CONNECTED, @@ -632,10 +624,9 @@ enum _CLIENT_IN_CHANNEL_STATE CLIENT_IN_CHANNEL_STATE_OPENED, CLIENT_IN_CHANNEL_STATE_OPENED_A4W, CLIENT_IN_CHANNEL_STATE_FINAL -}; -typedef enum _CLIENT_IN_CHANNEL_STATE CLIENT_IN_CHANNEL_STATE; +} CLIENT_IN_CHANNEL_STATE; -struct rpc_in_channel +typedef struct { /* Sending Channel */ @@ -652,12 +643,11 @@ struct rpc_in_channel /* Ping Originator */ RpcPingOriginator PingOriginator; -}; -typedef struct rpc_in_channel RpcInChannel; +} RpcInChannel; /* Client Out Channel */ -enum _CLIENT_OUT_CHANNEL_STATE +typedef enum { CLIENT_OUT_CHANNEL_STATE_INITIAL, CLIENT_OUT_CHANNEL_STATE_CONNECTED, @@ -669,10 +659,9 @@ enum _CLIENT_OUT_CHANNEL_STATE CLIENT_OUT_CHANNEL_STATE_OPENED_B3W, CLIENT_OUT_CHANNEL_STATE_RECYCLED, CLIENT_OUT_CHANNEL_STATE_FINAL -}; -typedef enum _CLIENT_OUT_CHANNEL_STATE CLIENT_OUT_CHANNEL_STATE; +} CLIENT_OUT_CHANNEL_STATE; -struct rpc_out_channel +typedef struct { /* Receiving Channel */ @@ -685,12 +674,11 @@ struct rpc_out_channel UINT32 ReceiverAvailableWindow; UINT32 BytesReceived; UINT32 AvailableWindowAdvertised; -}; -typedef struct rpc_out_channel RpcOutChannel; +} RpcOutChannel; /* Client Virtual Connection */ -enum _VIRTUAL_CONNECTION_STATE +typedef enum { VIRTUAL_CONNECTION_STATE_INITIAL, VIRTUAL_CONNECTION_STATE_OUT_CHANNEL_WAIT, @@ -698,10 +686,9 @@ enum _VIRTUAL_CONNECTION_STATE VIRTUAL_CONNECTION_STATE_WAIT_C2, VIRTUAL_CONNECTION_STATE_OPENED, VIRTUAL_CONNECTION_STATE_FINAL -}; -typedef enum _VIRTUAL_CONNECTION_STATE VIRTUAL_CONNECTION_STATE; +} VIRTUAL_CONNECTION_STATE; -struct rpc_virtual_connection +typedef struct { BYTE Cookie[16]; BYTE AssociationGroupId[16]; @@ -710,8 +697,7 @@ struct rpc_virtual_connection RpcInChannel* NonDefaultInChannel; RpcOutChannel* DefaultOutChannel; RpcOutChannel* NonDefaultOutChannel; -}; -typedef struct rpc_virtual_connection RpcVirtualConnection; +} RpcVirtualConnection; /* Virtual Connection Cookie Table */ @@ -722,13 +708,12 @@ typedef struct rpc_virtual_connection RpcVirtualConnection; _rpc_uuid[6], _rpc_uuid[7], _rpc_uuid[8], _rpc_uuid[9], _rpc_uuid[10], _rpc_uuid[11], \ _rpc_uuid[12], _rpc_uuid[13], _rpc_uuid[14], _rpc_uuid[15] -struct rpc_virtual_connection_cookie_entry +typedef struct { BYTE Cookie[16]; UINT32 ReferenceCount; RpcVirtualConnection* Reference; -}; -typedef struct rpc_virtual_connection_cookie_entry RpcVirtualConnectionCookieEntry; +} RpcVirtualConnectionCookieEntry; struct rdp_rpc { diff --git a/libfreerdp/core/gateway/rts_signature.h b/libfreerdp/core/gateway/rts_signature.h index 31f0e8100..c883296c7 100644 --- a/libfreerdp/core/gateway/rts_signature.h +++ b/libfreerdp/core/gateway/rts_signature.h @@ -20,28 +20,25 @@ #ifndef FREERDP_LIB_CORE_GATEWAY_RTS_SIGNATURE_H #define FREERDP_LIB_CORE_GATEWAY_RTS_SIGNATURE_H -typedef struct rts_pdu_signature RtsPduSignature; -typedef struct _RTS_PDU_SIGNATURE_ENTRY RTS_PDU_SIGNATURE_ENTRY; - #include "rts.h" #include #include -struct rts_pdu_signature +typedef struct { UINT16 Flags; UINT16 NumberOfCommands; UINT32 CommandTypes[8]; -}; +} RtsPduSignature; -struct _RTS_PDU_SIGNATURE_ENTRY +typedef struct { UINT32 SignatureId; BOOL SignatureClient; const RtsPduSignature* Signature; const char* PduName; -}; +} RTS_PDU_SIGNATURE_ENTRY; /* RTS PDU Signature IDs */ diff --git a/libfreerdp/core/gateway/tsg.c b/libfreerdp/core/gateway/tsg.c index 17ff6269b..cc733b807 100644 --- a/libfreerdp/core/gateway/tsg.c +++ b/libfreerdp/core/gateway/tsg.c @@ -55,7 +55,7 @@ typedef WCHAR* RESOURCENAME; -typedef struct _tsendpointinfo +typedef struct { RESOURCENAME* resourceName; UINT32 numResourceNames; @@ -64,13 +64,13 @@ typedef struct _tsendpointinfo UINT32 Port; } TSENDPOINTINFO, *PTSENDPOINTINFO; -typedef struct _TSG_PACKET_HEADER +typedef struct { UINT16 ComponentId; UINT16 PacketId; } TSG_PACKET_HEADER, *PTSG_PACKET_HEADER; -typedef struct _TSG_CAPABILITY_NAP +typedef struct { UINT32 capabilities; } TSG_CAPABILITY_NAP, *PTSG_CAPABILITY_NAP; @@ -80,13 +80,13 @@ typedef union TSG_CAPABILITY_NAP tsgCapNap; } TSG_CAPABILITIES_UNION, *PTSG_CAPABILITIES_UNION; -typedef struct _TSG_PACKET_CAPABILITIES +typedef struct { UINT32 capabilityType; TSG_CAPABILITIES_UNION tsgPacket; } TSG_PACKET_CAPABILITIES, *PTSG_PACKET_CAPABILITIES; -typedef struct _TSG_PACKET_VERSIONCAPS +typedef struct { TSG_PACKET_HEADER tsgHeader; PTSG_PACKET_CAPABILITIES tsgCaps; @@ -96,12 +96,12 @@ typedef struct _TSG_PACKET_VERSIONCAPS UINT16 quarantineCapabilities; } TSG_PACKET_VERSIONCAPS, *PTSG_PACKET_VERSIONCAPS; -typedef struct _TSG_PACKET_QUARCONFIGREQUEST +typedef struct { UINT32 flags; } TSG_PACKET_QUARCONFIGREQUEST, *PTSG_PACKET_QUARCONFIGREQUEST; -typedef struct _TSG_PACKET_QUARREQUEST +typedef struct { UINT32 flags; WCHAR* machineName; @@ -110,7 +110,7 @@ typedef struct _TSG_PACKET_QUARREQUEST UINT32 dataLen; } TSG_PACKET_QUARREQUEST, *PTSG_PACKET_QUARREQUEST; -typedef struct _TSG_REDIRECTION_FLAGS +typedef struct { BOOL enableAllRedirections; BOOL disableAllRedirections; @@ -122,7 +122,7 @@ typedef struct _TSG_REDIRECTION_FLAGS BOOL pnpRedirectionDisabled; } TSG_REDIRECTION_FLAGS, *PTSG_REDIRECTION_FLAGS; -typedef struct _TSG_PACKET_RESPONSE +typedef struct { UINT32 flags; UINT32 reserved; @@ -131,7 +131,7 @@ typedef struct _TSG_PACKET_RESPONSE TSG_REDIRECTION_FLAGS redirectionFlags; } TSG_PACKET_RESPONSE, *PTSG_PACKET_RESPONSE; -typedef struct _TSG_PACKET_QUARENC_RESPONSE +typedef struct { UINT32 flags; UINT32 certChainLen; @@ -140,7 +140,7 @@ typedef struct _TSG_PACKET_QUARENC_RESPONSE PTSG_PACKET_VERSIONCAPS versionCaps; } TSG_PACKET_QUARENC_RESPONSE, *PTSG_PACKET_QUARENC_RESPONSE; -typedef struct TSG_PACKET_STRING_MESSAGE +typedef struct { INT32 isDisplayMandatory; INT32 isConsentMandatory; @@ -148,30 +148,30 @@ typedef struct TSG_PACKET_STRING_MESSAGE WCHAR* msgBuffer; } TSG_PACKET_STRING_MESSAGE; -typedef struct TSG_PACKET_REAUTH_MESSAGE +typedef struct { UINT64 tunnelContext; } TSG_PACKET_REAUTH_MESSAGE, *PTSG_PACKET_REAUTH_MESSAGE; -typedef struct _TSG_PACKET_MSG_RESPONSE +typedef struct { UINT32 msgID; UINT32 msgType; INT32 isMsgPresent; } TSG_PACKET_MSG_RESPONSE, *PTSG_PACKET_MSG_RESPONSE; -typedef struct TSG_PACKET_CAPS_RESPONSE +typedef struct { TSG_PACKET_QUARENC_RESPONSE pktQuarEncResponse; TSG_PACKET_MSG_RESPONSE pktConsentMessage; } TSG_PACKET_CAPS_RESPONSE, *PTSG_PACKET_CAPS_RESPONSE; -typedef struct TSG_PACKET_MSG_REQUEST +typedef struct { UINT32 maxMessagesPerBatch; } TSG_PACKET_MSG_REQUEST, *PTSG_PACKET_MSG_REQUEST; -typedef struct _TSG_PACKET_AUTH +typedef struct { TSG_PACKET_VERSIONCAPS tsgVersionCaps; UINT32 cookieLen; @@ -184,7 +184,7 @@ typedef union PTSG_PACKET_AUTH packetAuth; } TSG_INITIAL_PACKET_TYPE_UNION, *PTSG_INITIAL_PACKET_TYPE_UNION; -typedef struct TSG_PACKET_REAUTH +typedef struct { UINT64 tunnelContext; UINT32 packetId; @@ -206,7 +206,7 @@ typedef union PTSG_PACKET_REAUTH packetReauth; } TSG_PACKET_TYPE_UNION; -typedef struct _TSG_PACKET +typedef struct { UINT32 packetId; TSG_PACKET_TYPE_UNION tsgPacket; diff --git a/libfreerdp/core/gateway/tsg.h b/libfreerdp/core/gateway/tsg.h index 9bfb3c7d2..b1616cafc 100644 --- a/libfreerdp/core/gateway/tsg.h +++ b/libfreerdp/core/gateway/tsg.h @@ -35,7 +35,7 @@ typedef struct rdp_tsg rdpTsg; #include #include -enum _TSG_STATE +typedef enum { TSG_STATE_INITIAL, TSG_STATE_CONNECTED, @@ -45,8 +45,7 @@ enum _TSG_STATE TSG_STATE_TUNNEL_CLOSE_PENDING, TSG_STATE_CHANNEL_CLOSE_PENDING, TSG_STATE_FINAL -}; -typedef enum _TSG_STATE TSG_STATE; +} TSG_STATE; #define TsProxyCreateTunnelOpnum 1 #define TsProxyAuthorizeTunnelOpnum 2 diff --git a/libfreerdp/core/nego.h b/libfreerdp/core/nego.h index 028732d89..c30a80028 100644 --- a/libfreerdp/core/nego.h +++ b/libfreerdp/core/nego.h @@ -55,7 +55,7 @@ enum RDP_NEG_FAILURE_FAILURECODES #define AUTHZ_SUCCESS 0x00000000 #define AUTHZ_ACCESS_DENIED 0x0000052E -enum _NEGO_STATE +typedef enum { NEGO_STATE_INITIAL, NEGO_STATE_EXT, /* Extended NLA (NLA + TLS implicit) */ @@ -64,8 +64,7 @@ enum _NEGO_STATE NEGO_STATE_RDP, /* Standard Legacy RDP Encryption */ NEGO_STATE_FAIL, /* Negotiation failure */ NEGO_STATE_FINAL -}; -typedef enum _NEGO_STATE NEGO_STATE; +} NEGO_STATE; /* RDP Negotiation Messages */ enum RDP_NEG_MSG diff --git a/libfreerdp/core/nla.h b/libfreerdp/core/nla.h index a36a71abb..2461772dd 100644 --- a/libfreerdp/core/nla.h +++ b/libfreerdp/core/nla.h @@ -36,7 +36,7 @@ typedef struct rdp_nla rdpNla; #include "transport.h" -enum _NLA_STATE +typedef enum { NLA_STATE_INITIAL, NLA_STATE_NEGO_TOKEN, @@ -44,8 +44,7 @@ enum _NLA_STATE NLA_STATE_AUTH_INFO, NLA_STATE_POST_NEGO, NLA_STATE_FINAL -}; -typedef enum _NLA_STATE NLA_STATE; +} NLA_STATE; FREERDP_LOCAL int nla_authenticate(rdpNla* nla); FREERDP_LOCAL LPTSTR nla_make_spn(const char* ServiceClass, const char* hostname); diff --git a/libfreerdp/core/server.c b/libfreerdp/core/server.c index 9e854c500..2e3473e2a 100644 --- a/libfreerdp/core/server.c +++ b/libfreerdp/core/server.c @@ -50,14 +50,13 @@ } while (0) #endif -struct _wtsChannelMessage +typedef struct { UINT16 channelId; UINT16 reserved; UINT32 length; UINT32 offset; -}; -typedef struct _wtsChannelMessage wtsChannelMessage; +} wtsChannelMessage; static DWORD g_SessionId = 1; static wHashTable* g_ServerHandles = NULL; diff --git a/libfreerdp/core/tcp.c b/libfreerdp/core/tcp.c index 237642e2e..6d474c7d8 100644 --- a/libfreerdp/core/tcp.c +++ b/libfreerdp/core/tcp.c @@ -88,12 +88,11 @@ /* Simple Socket BIO */ -struct _WINPR_BIO_SIMPLE_SOCKET +typedef struct { SOCKET socket; HANDLE hEvent; -}; -typedef struct _WINPR_BIO_SIMPLE_SOCKET WINPR_BIO_SIMPLE_SOCKET; +} WINPR_BIO_SIMPLE_SOCKET; static int transport_bio_simple_init(BIO* bio, SOCKET socket, int shutdown); static int transport_bio_simple_uninit(BIO* bio); @@ -448,14 +447,13 @@ BIO_METHOD* BIO_s_simple_socket(void) /* Buffered Socket BIO */ -struct _WINPR_BIO_BUFFERED_SOCKET +typedef struct { BIO* bufferedBio; BOOL readBlocked; BOOL writeBlocked; RingBuffer xmitBuffer; -}; -typedef struct _WINPR_BIO_BUFFERED_SOCKET WINPR_BIO_BUFFERED_SOCKET; +} WINPR_BIO_BUFFERED_SOCKET; static long transport_bio_buffered_callback(BIO* bio, int mode, const char* argp, int argi, long argl, long ret) diff --git a/libfreerdp/core/test/TestConnect.c b/libfreerdp/core/test/TestConnect.c index e3f300c21..cb75bf7c0 100644 --- a/libfreerdp/core/test/TestConnect.c +++ b/libfreerdp/core/test/TestConnect.c @@ -10,12 +10,13 @@ static HANDLE s_sync = NULL; static int runInstance(int argc, char* argv[], freerdp** inst, DWORD timeout) { int rc = -1; - RDP_CLIENT_ENTRY_POINTS clientEntryPoints; - ZeroMemory(&clientEntryPoints, sizeof(RDP_CLIENT_ENTRY_POINTS)); + RDP_CLIENT_ENTRY_POINTS clientEntryPoints = { 0 }; + rdpContext* context; + clientEntryPoints.Size = sizeof(RDP_CLIENT_ENTRY_POINTS); clientEntryPoints.Version = RDP_CLIENT_INTERFACE_VERSION; clientEntryPoints.ContextSize = sizeof(rdpContext); - rdpContext* context = freerdp_client_context_new(&clientEntryPoints); + context = freerdp_client_context_new(&clientEntryPoints); if (!context) goto finish; diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c index 3c7cbf834..78c50caa6 100644 --- a/libfreerdp/crypto/tls.c +++ b/libfreerdp/crypto/tls.c @@ -70,12 +70,11 @@ * #define MICROSOFT_IOS_SNI_BUG */ -struct _BIO_RDP_TLS +typedef struct { SSL* ssl; CRITICAL_SECTION lock; -}; -typedef struct _BIO_RDP_TLS BIO_RDP_TLS; +} BIO_RDP_TLS; static int tls_verify_certificate(rdpTls* tls, CryptoCert cert, const char* hostname, UINT16 port); static void tls_print_certificate_name_mismatch_error(const char* hostname, UINT16 port, diff --git a/libfreerdp/emu/scard/smartcard_virtual_gids.c b/libfreerdp/emu/scard/smartcard_virtual_gids.c index 60c0a7a7c..f24c2e155 100644 --- a/libfreerdp/emu/scard/smartcard_virtual_gids.c +++ b/libfreerdp/emu/scard/smartcard_virtual_gids.c @@ -202,7 +202,7 @@ static const BYTE g_GidsAppFCI[] = { 0x61, 0x12, 0x4F, 0x0B, 0xA0, 0x00, 0x00, 0 0x54, 0x46, 0x59, 0x02, 0x01, 0x73, 0x03, 0x40, 0x01, 0xC0 }; /* -typedef struct _CARD_CACHE_FILE_FORMAT +typedef struct { BYTE bVersion; // Cache version BYTE bPinsFreshness; // Card PIN diff --git a/libfreerdp/locale/keyboard_layout.c b/libfreerdp/locale/keyboard_layout.c index e6f8175a2..39eda82da 100644 --- a/libfreerdp/locale/keyboard_layout.c +++ b/libfreerdp/locale/keyboard_layout.c @@ -710,13 +710,12 @@ static const RDP_KEYBOARD_LAYOUT RDP_KEYBOARD_LAYOUT_TABLE[] = { { 0x0000046a, "Yoruba" }, }; -struct _RDP_KEYBOARD_LAYOUT_VARIANT +typedef struct { DWORD code; /* Keyboard layout code */ DWORD id; /* Keyboard variant ID */ const char* name; /* Keyboard layout variant name */ -}; -typedef struct _RDP_KEYBOARD_LAYOUT_VARIANT RDP_KEYBOARD_LAYOUT_VARIANT; +} RDP_KEYBOARD_LAYOUT_VARIANT; static const RDP_KEYBOARD_LAYOUT_VARIANT RDP_KEYBOARD_LAYOUT_VARIANT_TABLE[] = { { KBD_ARABIC_102, 0x0028, "Arabic (102)" }, @@ -768,13 +767,12 @@ static const RDP_KEYBOARD_LAYOUT_VARIANT RDP_KEYBOARD_LAYOUT_VARIANT_TABLE[] = { /* Input Method Editor (IME) */ -struct _RDP_KEYBOARD_IME +typedef struct { DWORD code; /* Keyboard layout code */ const char* file; /* IME file */ const char* name; /* Keyboard layout name */ -}; -typedef struct _RDP_KEYBOARD_IME RDP_KEYBOARD_IME; +} RDP_KEYBOARD_IME; /* Global Input Method Editors (IME) */ diff --git a/libfreerdp/locale/keyboard_sun.c b/libfreerdp/locale/keyboard_sun.c index 6b25d50d0..e7367e5d7 100644 --- a/libfreerdp/locale/keyboard_sun.c +++ b/libfreerdp/locale/keyboard_sun.c @@ -55,14 +55,13 @@ * keyboard layout indicated by the index given (in this case, 33, or US-English). */ -struct _SOLARIS_KEYBOARD +typedef struct { UINT32 type; /* Solaris keyboard type */ UINT32 layout; /* Layout */ char* xkbType; /* XKB keyboard */ UINT32 keyboardLayoutId; /* XKB keyboard layout */ -}; -typedef struct _SOLARIS_KEYBOARD SOLARIS_KEYBOARD; +} SOLARIS_KEYBOARD; static const SOLARIS_KEYBOARD SOLARIS_KEYBOARD_TABLE[] = { { 4, 0, "sun(type4)", KBD_US }, /* US4 */ diff --git a/libfreerdp/locale/keyboard_xkbfile.c b/libfreerdp/locale/keyboard_xkbfile.c index bdf9a390d..5d2f5230c 100644 --- a/libfreerdp/locale/keyboard_xkbfile.c +++ b/libfreerdp/locale/keyboard_xkbfile.c @@ -41,12 +41,11 @@ #include #include -struct _XKB_KEY_NAME_SCANCODE +typedef struct { const char* xkb_keyname; /* XKB keyname */ DWORD rdp_scancode; -}; -typedef struct _XKB_KEY_NAME_SCANCODE XKB_KEY_NAME_SCANCODE; +} XKB_KEY_NAME_SCANCODE; static const XKB_KEY_NAME_SCANCODE XKB_KEY_NAME_SCANCODE_TABLE[] = { { "AB00", RDP_SCANCODE_LSHIFT }, diff --git a/libfreerdp/locale/locale.c b/libfreerdp/locale/locale.c index 0955180fa..9b8e8566a 100644 --- a/libfreerdp/locale/locale.c +++ b/libfreerdp/locale/locale.c @@ -43,14 +43,13 @@ #define LOCALE_LANGUAGE_LEN 6 #define LOCALE_COUNTRY_LEN 10 -struct _SYSTEM_LOCALE +typedef struct { char language[LOCALE_LANGUAGE_LEN]; /* Two or three letter language code */ char country[LOCALE_COUNTRY_LEN]; /* Two or three letter country code (Sometimes with Cyrl_ prefix) */ DWORD code; /* 32-bit unsigned integer corresponding to the locale */ -}; -typedef struct _SYSTEM_LOCALE SYSTEM_LOCALE; +} SYSTEM_LOCALE; /* * Refer to MSDN article "Locale Identifier Constants and Strings": @@ -274,12 +273,11 @@ static const SYSTEM_LOCALE SYSTEM_LOCALE_TABLE[] = { { "zu", "ZA", ZULU } /* Windows XP SP2 and later: Zulu/isiZulu (South Africa) */ }; -struct _LOCALE_NAME +typedef struct { DWORD localeId; const char* name; -}; -typedef struct _LOCALE_NAME LOCALE_NAME; +} LOCALE_NAME; static const LOCALE_NAME LOCALE_NAME_TABLE[] = { { AFRIKAANS, "AFRIKAANS" }, @@ -483,12 +481,11 @@ static const LOCALE_NAME LOCALE_NAME_TABLE[] = { { ZULU, "ZULU" } }; -struct _LOCALE_KEYBOARD_LAYOUTS +typedef struct { DWORD locale; /* Locale ID */ DWORD keyboardLayouts[5]; /* array of associated keyboard layouts */ -}; -typedef struct _LOCALE_KEYBOARD_LAYOUTS LOCALE_KEYBOARD_LAYOUTS; +} LOCALE_KEYBOARD_LAYOUTS; /* TODO: Use KBD_* defines instead of hardcoded values */ diff --git a/libfreerdp/locale/xkb_layout_ids.c b/libfreerdp/locale/xkb_layout_ids.c index 223f7d10c..5724701c9 100644 --- a/libfreerdp/locale/xkb_layout_ids.c +++ b/libfreerdp/locale/xkb_layout_ids.c @@ -31,20 +31,18 @@ #include "liblocale.h" -struct _XKB_VARIANT +typedef struct { const char* variant; /* XKB Keyboard layout variant */ UINT32 keyboardLayoutID; /* Keyboard Layout ID */ -}; -typedef struct _XKB_VARIANT XKB_VARIANT; +} XKB_VARIANT; -struct _XKB_LAYOUT +typedef struct { const char* layout; /* XKB Keyboard layout */ UINT32 keyboardLayoutID; /* Keyboard Layout ID */ const XKB_VARIANT* variants; -}; -typedef struct _XKB_LAYOUT XKB_LAYOUT; +} XKB_LAYOUT; /* Those have been generated automatically and are waiting to be filled by hand */ diff --git a/libfreerdp/utils/profiler.c b/libfreerdp/utils/profiler.c index acbe3a126..1f0444fc7 100644 --- a/libfreerdp/utils/profiler.c +++ b/libfreerdp/utils/profiler.c @@ -29,7 +29,7 @@ #define TAG FREERDP_TAG("utils") -struct _PROFILER +struct S_PROFILER { char* name; STOPWATCH* stopwatch; diff --git a/libfreerdp/utils/smartcard_call.c b/libfreerdp/utils/smartcard_call.c index 789083ab8..fc5917007 100644 --- a/libfreerdp/utils/smartcard_call.c +++ b/libfreerdp/utils/smartcard_call.c @@ -56,7 +56,7 @@ #define SCARD_MAX_TIMEOUT 60000 -struct _scard_call_context +struct s_scard_call_context { HANDLE StartedEvent; wLinkedList* names; @@ -71,7 +71,7 @@ struct _scard_call_context void (*fn_free)(void*); }; -struct _scard_context_element +struct s_scard_context_element { void* context; void (*fn_free)(void*); @@ -90,7 +90,8 @@ static LONG smartcard_EstablishContext_Call(scard_call_context* smartcard, wStre if (ret.ReturnCode == SCARD_S_SUCCESS) { const void* key = (void*)(size_t)hContext; - struct _scard_context_element* pContext = calloc(1, sizeof(struct _scard_context_element)); + struct s_scard_context_element* pContext = + calloc(1, sizeof(struct s_scard_context_element)); if (!pContext) return STATUS_NO_MEMORY; @@ -1810,7 +1811,7 @@ LONG smartcard_irp_device_control_call(scard_call_context* smartcard, wStream* o static void context_free(void* arg) { - struct _scard_context_element* element = arg; + struct s_scard_context_element* element = arg; if (!arg) return; @@ -1921,7 +1922,7 @@ BOOL smarcard_call_set_callbacks(scard_call_context* ctx, void* userdata, void* smartcard_call_get_context(scard_call_context* ctx, SCARDCONTEXT hContext) { - struct _scard_context_element* element; + struct s_scard_context_element* element; WINPR_ASSERT(ctx); element = HashTable_GetItemValue(ctx->rgSCardContextList, (void*)hContext); diff --git a/server/Mac/mf_audin.c b/server/Mac/mf_audin.c index 36e10392b..25212c1c8 100644 --- a/server/Mac/mf_audin.c +++ b/server/Mac/mf_audin.c @@ -57,8 +57,8 @@ static UINT mf_peer_audin_open_result(audin_server_context* context, UINT32 resu * * @return 0 on success, otherwise a Win32 error code */ -static UINT mf_peer_audin_receive_samples(audin_server_context* context, const void* buf, - int nframes) +static UINT mf_peer_audin_receive_samples(audin_server_context* context, const AUDIO_FORMAT* format, + wStream* buf, size_t nframes) { return CHANNEL_RC_OK; } diff --git a/server/Mac/mf_peer.c b/server/Mac/mf_peer.c index 31cbda033..53ab88bad 100644 --- a/server/Mac/mf_peer.c +++ b/server/Mac/mf_peer.c @@ -46,6 +46,9 @@ #include "CoreVideo/CoreVideo.h" +#include +#define TAG SERVER_TAG("mac") + // refactor these static int info_last_sec = 0; static int info_last_nsec = 0; @@ -324,7 +327,6 @@ static void* mf_peer_main_loop(void* arg) WINPR_ASSERT(client); WINPR_ASSERT(client->settings); - WINPR_ASSERT(client->input); if (!mf_peer_init(client)) { @@ -363,7 +365,7 @@ static void* mf_peer_main_loop(void* arg) { DWORD status; HANDLE handles[MAXIMUM_WAIT_OBJECTS] = { 0 }; - DWORD count = client->GetEventHandles(handles, ARRAYSIZE(handles)); + DWORD count = client->GetEventHandles(client, handles, ARRAYSIZE(handles)); if ((count == 0) || (count == MAXIMUM_WAIT_OBJECTS)) { @@ -373,7 +375,7 @@ static void* mf_peer_main_loop(void* arg) handles[count++] = WTSVirtualChannelManagerGetEventHandle(context->vcm); - status = WaitForMultipleObjects(handles, count, FALSE, INFINITE); + status = WaitForMultipleObjects(count, handles, FALSE, INFINITE); if (status == WAIT_FAILED) { WLog_ERR(TAG, "WaitForMultipleObjects failed"); diff --git a/server/Mac/mf_rdpsnd.h b/server/Mac/mf_rdpsnd.h index 2fddfdc1b..3b3da2a6e 100644 --- a/server/Mac/mf_rdpsnd.h +++ b/server/Mac/mf_rdpsnd.h @@ -40,7 +40,7 @@ void mf_peer_rdpsnd_input_callback(void* inUserData, AudioQueueRef inAQ, const AudioStreamPacketDescription* inPacketDescs); #define SND_NUMBUFFERS 3 -struct _AQRecorderState +typedef struct { AudioStreamBasicDescription dataFormat; AudioQueueRef queue; @@ -50,9 +50,7 @@ struct _AQRecorderState SInt64 currentPacket; bool isRunning; RdpsndServerContext* snd_context; -}; - -typedef struct _AQRecorderState AQRecorderState; +} AQRecorderState; BOOL mf_peer_rdpsnd_init(mfPeerContext* context); BOOL mf_peer_rdpsnd_stop(void); diff --git a/server/Mac/mfreerdp.c b/server/Mac/mfreerdp.c index 661653def..f92fb75c4 100644 --- a/server/Mac/mfreerdp.c +++ b/server/Mac/mfreerdp.c @@ -44,6 +44,9 @@ #include "mfreerdp.h" #include "mf_peer.h" +#include +#define TAG SERVER_TAG("mac") + static void mf_server_main_loop(freerdp_listener* instance) { WINPR_ASSERT(instance); diff --git a/server/Windows/CMakeLists.txt b/server/Windows/CMakeLists.txt index c3a2c0eb6..379b96f22 100644 --- a/server/Windows/CMakeLists.txt +++ b/server/Windows/CMakeLists.txt @@ -89,7 +89,7 @@ endif() if(NOT CMAKE_WINDOWS_VERSION STREQUAL "WINXP") - set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} d3d11 dxgi dxguid) + set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} d3d11 dxgi) endif() set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} dsound) diff --git a/server/Windows/wf_interface.c b/server/Windows/wf_interface.c index f28f70fe7..169e4d0f9 100644 --- a/server/Windows/wf_interface.c +++ b/server/Windows/wf_interface.c @@ -117,7 +117,7 @@ static DWORD WINAPI wf_server_main_loop(LPVOID lpParam) break; } - status = WaitForMultipleObjects(handles, count, FALSE, INFINITE); + status = WaitForMultipleObjects(count, handles, FALSE, INFINITE); if (status == WAIT_FAILED) { WLog_ERR(TAG, "WaitForMultipleObjects failed"); diff --git a/server/Windows/wf_peer.c b/server/Windows/wf_peer.c index b834fc822..a644758e8 100644 --- a/server/Windows/wf_peer.c +++ b/server/Windows/wf_peer.c @@ -189,7 +189,7 @@ static DWORD WINAPI wf_peer_socket_listener(LPVOID lpParam) break; } - status = WaitForMultipleObjects(handles, count, FALSE, INFINITE); + status = WaitForMultipleObjects(count, handles, FALSE, INFINITE); if (status == WAIT_FAILED) { WLog_ERR(TAG, "WaitForMultipleObjects failed"); diff --git a/server/proxy/channels/pf_channel_rdpdr.c b/server/proxy/channels/pf_channel_rdpdr.c index 882f54b1d..496198cc6 100644 --- a/server/proxy/channels/pf_channel_rdpdr.c +++ b/server/proxy/channels/pf_channel_rdpdr.c @@ -65,7 +65,7 @@ typedef enum STATE_CLIENT_CHANNEL_RUNNING = 0x10 } pf_channel_client_state; -typedef struct _pf_channel_client_context +typedef struct { pf_channel_common_context common; pf_channel_client_state state; diff --git a/server/proxy/proxy_modules.h b/server/proxy/proxy_modules.h index ad43ff5bf..cc2fe8d92 100644 --- a/server/proxy/proxy_modules.h +++ b/server/proxy/proxy_modules.h @@ -26,7 +26,7 @@ #include -enum _PF_FILTER_TYPE +typedef enum { FILTER_TYPE_KEYBOARD, /* proxyKeyboardEventInfo */ FILTER_TYPE_MOUSE, /* proxyMouseEventInfo */ @@ -38,10 +38,9 @@ enum _PF_FILTER_TYPE FILTER_TYPE_CLIENT_PASSTHROUGH_CHANNEL_CREATE, /* proxyChannelDataEventInfo */ FILTER_LAST -}; -typedef enum _PF_FILTER_TYPE PF_FILTER_TYPE; +} PF_FILTER_TYPE; -enum _PF_HOOK_TYPE +typedef enum { HOOK_TYPE_CLIENT_INIT_CONNECT, HOOK_TYPE_CLIENT_UNINIT_CONNECT, @@ -60,8 +59,7 @@ enum _PF_HOOK_TYPE HOOK_TYPE_SERVER_SESSION_END, HOOK_LAST -}; -typedef enum _PF_HOOK_TYPE PF_HOOK_TYPE; +} PF_HOOK_TYPE; #ifdef __cplusplus extern "C" diff --git a/server/shadow/X11/x11_shadow.c b/server/shadow/X11/x11_shadow.c index 253573150..9e68ffc2b 100644 --- a/server/shadow/X11/x11_shadow.c +++ b/server/shadow/X11/x11_shadow.c @@ -53,22 +53,20 @@ static UINT32 x11_shadow_enum_monitors(MONITOR_DEF* monitors, UINT32 maxMonitors #include -struct _SHADOW_PAM_AUTH_DATA +typedef struct { const char* user; const char* domain; const char* password; -}; -typedef struct _SHADOW_PAM_AUTH_DATA SHADOW_PAM_AUTH_DATA; +} SHADOW_PAM_AUTH_DATA; -struct _SHADOW_PAM_AUTH_INFO +typedef struct { char* service_name; pam_handle_t* handle; struct pam_conv pamc; SHADOW_PAM_AUTH_DATA appdata; -}; -typedef struct _SHADOW_PAM_AUTH_INFO SHADOW_PAM_AUTH_INFO; +} SHADOW_PAM_AUTH_INFO; static int x11_shadow_pam_conv(int num_msg, const struct pam_message** msg, struct pam_response** resp, void* appdata_ptr) diff --git a/server/shadow/shadow_client.c b/server/shadow/shadow_client.c index 5bfa6ff41..f0b2d6ec3 100644 --- a/server/shadow/shadow_client.c +++ b/server/shadow/shadow_client.c @@ -38,12 +38,11 @@ #define TAG CLIENT_TAG("shadow") -struct _SHADOW_GFX_STATUS +typedef struct { BOOL gfxOpened; BOOL gfxSurfaceCreated; -}; -typedef struct _SHADOW_GFX_STATUS SHADOW_GFX_STATUS; +} SHADOW_GFX_STATUS; static INLINE BOOL shadow_client_rdpgfx_new_surface(rdpShadowClient* client) { diff --git a/server/shadow/shadow_subsystem_builtin.c b/server/shadow/shadow_subsystem_builtin.c index 0bba2c3f1..ceb7744eb 100644 --- a/server/shadow/shadow_subsystem_builtin.c +++ b/server/shadow/shadow_subsystem_builtin.c @@ -22,12 +22,11 @@ #include -struct _RDP_SHADOW_SUBSYSTEM +typedef struct { const char* name; pfnShadowSubsystemEntry entry; -}; -typedef struct _RDP_SHADOW_SUBSYSTEM RDP_SHADOW_SUBSYSTEM; +} RDP_SHADOW_SUBSYSTEM; #ifdef WITH_SHADOW_X11 extern int X11_ShadowSubsystemEntry(RDP_SHADOW_ENTRY_POINTS* pEntryPoints); diff --git a/uwac/libuwac/uwac-window.c b/uwac/libuwac/uwac-window.c index 4b065e1ba..a2bf55dd7 100644 --- a/uwac/libuwac/uwac-window.c +++ b/uwac/libuwac/uwac-window.c @@ -497,7 +497,7 @@ UwacWindow* UwacCreateWindowShm(UwacDisplay* display, uint32_t width, uint32_t h errno = 0; val = strtoul(env, &endp, 10); - if (!errno && val != 0 && val != ULONG_MAX) + if (!errno && val != 0 && val != UINT32_MAX) ivi_surface_id = val; } diff --git a/winpr/include/winpr/bitstream.h b/winpr/include/winpr/bitstream.h index ef083cb51..47a8b3269 100644 --- a/winpr/include/winpr/bitstream.h +++ b/winpr/include/winpr/bitstream.h @@ -26,7 +26,7 @@ #include #include -struct _wBitStream +typedef struct { const BYTE* buffer; BYTE* pointer; @@ -37,8 +37,7 @@ struct _wBitStream UINT32 offset; UINT32 prefetch; UINT32 accumulator; -}; -typedef struct _wBitStream wBitStream; +} wBitStream; #define BITDUMP_MSB_FIRST 0x00000001 #define BITDUMP_STDERR 0x00000002 diff --git a/winpr/include/winpr/clipboard.h b/winpr/include/winpr/clipboard.h index bbf2f5f95..49dcca83d 100644 --- a/winpr/include/winpr/clipboard.h +++ b/winpr/include/winpr/clipboard.h @@ -23,31 +23,29 @@ #include #include -typedef struct _wClipboard wClipboard; +typedef struct s_wClipboard wClipboard; typedef void* (*CLIPBOARD_SYNTHESIZE_FN)(wClipboard* clipboard, UINT32 formatId, const void* data, UINT32* pSize); -struct _wClipboardFileSizeRequest +typedef struct { UINT32 streamId; UINT32 listIndex; -}; -typedef struct _wClipboardFileSizeRequest wClipboardFileSizeRequest; +} wClipboardFileSizeRequest; -struct _wClipboardFileRangeRequest +typedef struct { UINT32 streamId; UINT32 listIndex; UINT32 nPositionLow; UINT32 nPositionHigh; UINT32 cbRequested; -}; -typedef struct _wClipboardFileRangeRequest wClipboardFileRangeRequest; +} wClipboardFileRangeRequest; -typedef struct _wClipboardDelegate wClipboardDelegate; +typedef struct s_wClipboardDelegate wClipboardDelegate; -struct _wClipboardDelegate +struct s_wClipboardDelegate { wClipboard* clipboard; void* custom; diff --git a/winpr/include/winpr/cmdline.h b/winpr/include/winpr/cmdline.h index 658a5629b..5221df1f5 100644 --- a/winpr/include/winpr/cmdline.h +++ b/winpr/include/winpr/cmdline.h @@ -96,10 +96,7 @@ #define BoolValueTrue ((LPSTR)1) #define BoolValueFalse ((LPSTR)0) -typedef struct _COMMAND_LINE_ARGUMENT_A COMMAND_LINE_ARGUMENT_A; -typedef struct _COMMAND_LINE_ARGUMENT_W COMMAND_LINE_ARGUMENT_W; - -struct _COMMAND_LINE_ARGUMENT_A +typedef struct { LPCSTR Name; DWORD Flags; @@ -109,9 +106,9 @@ struct _COMMAND_LINE_ARGUMENT_A LONG Index; LPCSTR Alias; LPCSTR Text; -}; +} COMMAND_LINE_ARGUMENT_A; -struct _COMMAND_LINE_ARGUMENT_W +typedef struct { LPCWSTR Name; DWORD Flags; @@ -121,7 +118,7 @@ struct _COMMAND_LINE_ARGUMENT_W LONG Index; LPCWSTR Alias; LPCWSTR Text; -}; +} COMMAND_LINE_ARGUMENT_W; #ifdef UNICODE #define COMMAND_LINE_ARGUMENT COMMAND_LINE_ARGUMENT_W diff --git a/winpr/include/winpr/collections.h b/winpr/include/winpr/collections.h index c1e76b463..2f660dc32 100644 --- a/winpr/include/winpr/collections.h +++ b/winpr/include/winpr/collections.h @@ -44,19 +44,18 @@ extern "C" typedef void (*OBJECT_FREE_FN)(void* obj); typedef BOOL (*OBJECT_EQUALS_FN)(const void* objA, const void* objB); - struct _wObject + typedef struct { OBJECT_NEW_FN fnObjectNew; OBJECT_INIT_FN fnObjectInit; OBJECT_UNINIT_FN fnObjectUninit; OBJECT_FREE_FN fnObjectFree; OBJECT_EQUALS_FN fnObjectEquals; - }; - typedef struct _wObject wObject; + } wObject; /* System.Collections.Queue */ - typedef struct _wQueue wQueue; + typedef struct s_wQueue wQueue; WINPR_API size_t Queue_Count(wQueue* queue); @@ -114,7 +113,7 @@ extern "C" /* System.Collections.Stack */ - typedef struct _wStack wStack; + typedef struct s_wStack wStack; WINPR_API size_t Stack_Count(wStack* stack); WINPR_API BOOL Stack_IsSynchronized(wStack* stack); @@ -134,7 +133,7 @@ extern "C" /* System.Collections.ArrayList */ - typedef struct _wArrayList wArrayList; + typedef struct s_wArrayList wArrayList; WINPR_API size_t ArrayList_Capacity(wArrayList* arrayList); WINPR_API size_t ArrayList_Count(wArrayList* arrayList); @@ -181,20 +180,19 @@ extern "C" /* WARNING: Do not access structs directly, the API will be reworked * to make this opaque. */ - struct _wDictionary + typedef struct { BOOL synchronized; CRITICAL_SECTION lock; - }; - typedef struct _wDictionary wDictionary; + } wDictionary; /* System.Collections.Specialized.ListDictionary */ - typedef struct _wListDictionaryItem wListDictionaryItem; + typedef struct s_wListDictionaryItem wListDictionaryItem; /* WARNING: Do not access structs directly, the API will be reworked * to make this opaque. */ - struct _wListDictionaryItem + struct s_wListDictionaryItem { void* key; void* value; @@ -204,7 +202,7 @@ extern "C" /* WARNING: Do not access structs directly, the API will be reworked * to make this opaque. */ - struct _wListDictionary + typedef struct { BOOL synchronized; CRITICAL_SECTION lock; @@ -212,8 +210,7 @@ extern "C" wListDictionaryItem* head; wObject objectKey; wObject objectValue; - }; - typedef struct _wListDictionary wListDictionary; + } wListDictionary; #define ListDictionary_KeyObject(_dictionary) (&_dictionary->objectKey) #define ListDictionary_ValueObject(_dictionary) (&_dictionary->objectValue) @@ -241,7 +238,7 @@ extern "C" /* System.Collections.Generic.LinkedList */ - typedef struct _wLinkedList wLinkedList; + typedef struct s_wLinkedList wLinkedList; WINPR_API int LinkedList_Count(wLinkedList* list); WINPR_API void* LinkedList_First(wLinkedList* list); @@ -272,18 +269,17 @@ extern "C" /* WARNING: Do not access structs directly, the API will be reworked * to make this opaque. */ - struct _wReference + typedef struct { UINT32 Count; void* Pointer; - }; - typedef struct _wReference wReference; + } wReference; typedef int (*REFERENCE_FREE)(void* context, void* ptr); /* WARNING: Do not access structs directly, the API will be reworked * to make this opaque. */ - struct _wReferenceTable + typedef struct { UINT32 size; CRITICAL_SECTION lock; @@ -291,8 +287,7 @@ extern "C" BOOL synchronized; wReference* array; REFERENCE_FREE ReferenceFree; - }; - typedef struct _wReferenceTable wReferenceTable; + } wReferenceTable; WINPR_API UINT32 ReferenceTable_Add(wReferenceTable* referenceTable, void* ptr); WINPR_API UINT32 ReferenceTable_Release(wReferenceTable* referenceTable, void* ptr); @@ -305,14 +300,13 @@ extern "C" /* WARNING: Do not access structs directly, the API will be reworked * to make this opaque. */ - struct _wCountdownEvent + typedef struct { DWORD count; CRITICAL_SECTION lock; HANDLE event; DWORD initialCount; - }; - typedef struct _wCountdownEvent wCountdownEvent; + } wCountdownEvent; WINPR_API DWORD CountdownEvent_CurrentCount(wCountdownEvent* countdown); WINPR_API DWORD CountdownEvent_InitialCount(wCountdownEvent* countdown); @@ -330,7 +324,7 @@ extern "C" typedef UINT32 (*HASH_TABLE_HASH_FN)(const void* key); - typedef struct _wHashTable wHashTable; + typedef struct s_wHashTable wHashTable; typedef BOOL (*HASH_TABLE_FOREACH_FN)(const void* key, void* value, void* arg); @@ -373,7 +367,7 @@ extern "C" /* BufferPool */ - typedef struct _wBufferPool wBufferPool; + typedef struct s_wBufferPool wBufferPool; WINPR_API SSIZE_T BufferPool_GetPoolSize(wBufferPool* pool); WINPR_API SSIZE_T BufferPool_GetBufferSize(wBufferPool* pool, const void* buffer); @@ -387,7 +381,7 @@ extern "C" /* ObjectPool */ - typedef struct _wObjectPool wObjectPool; + typedef struct s_wObjectPool wObjectPool; WINPR_API void* ObjectPool_Take(wObjectPool* pool); WINPR_API void ObjectPool_Return(wObjectPool* pool, void* obj); @@ -400,11 +394,11 @@ extern "C" /* Message Queue */ - typedef struct _wMessage wMessage; + typedef struct s_wMessage wMessage; typedef void (*MESSAGE_FREE_FN)(wMessage* message); - struct _wMessage + struct s_wMessage { UINT32 id; void* context; @@ -414,7 +408,7 @@ extern "C" MESSAGE_FREE_FN Free; }; - typedef struct _wMessageQueue wMessageQueue; + typedef struct s_wMessageQueue wMessageQueue; #define WMQ_QUIT 0xFFFFFFFF @@ -472,12 +466,11 @@ extern "C" /* Message Pipe */ - struct _wMessagePipe + typedef struct { wMessageQueue* In; wMessageQueue* Out; - }; - typedef struct _wMessagePipe wMessagePipe; + } wMessagePipe; WINPR_API void MessagePipe_PostQuit(wMessagePipe* pipe, int nExitCode); @@ -486,25 +479,23 @@ extern "C" /* Publisher/Subscriber Pattern */ - struct _wEventArgs + typedef struct { DWORD Size; const char* Sender; - }; - typedef struct _wEventArgs wEventArgs; + } wEventArgs; typedef void (*pEventHandler)(void* context, const wEventArgs* e); #define MAX_EVENT_HANDLERS 32 - struct _wEventType + typedef struct { const char* EventName; wEventArgs EventArgs; size_t EventHandlerCount; pEventHandler EventHandlers[MAX_EVENT_HANDLERS]; - }; - typedef struct _wEventType wEventType; + } wEventType; #define EventArgsInit(_event_args, _sender) \ memset(_event_args, 0, sizeof(*_event_args)); \ @@ -534,9 +525,9 @@ extern "C" return PubSub_Unsubscribe(pubSub, #name, (pEventHandler)EventHandler); \ } -#define DEFINE_EVENT_BEGIN(name) \ - typedef struct _##name##EventArgs \ - { \ +#define DEFINE_EVENT_BEGIN(name) \ + typedef struct \ + { \ wEventArgs e; #define DEFINE_EVENT_END(name) \ @@ -555,7 +546,7 @@ extern "C" } \ } - typedef struct _wPubSub wPubSub; + typedef struct s_wPubSub wPubSub; WINPR_API void PubSub_Lock(wPubSub* pubSub); WINPR_API void PubSub_Unlock(wPubSub* pubSub); @@ -576,7 +567,7 @@ extern "C" WINPR_API void PubSub_Free(wPubSub* pubSub); /* BipBuffer */ - typedef struct _wBipBuffer wBipBuffer; + typedef struct s_wBipBuffer wBipBuffer; WINPR_API BOOL BipBuffer_Grow(wBipBuffer* bb, size_t size); WINPR_API void BipBuffer_Clear(wBipBuffer* bb); diff --git a/winpr/include/winpr/comm.h b/winpr/include/winpr/comm.h index 648722601..9eb535c8d 100644 --- a/winpr/include/winpr/comm.h +++ b/winpr/include/winpr/comm.h @@ -202,7 +202,7 @@ #define RTS_CONTROL_TOGGLE 0x03 // http://msdn.microsoft.com/en-us/library/windows/desktop/aa363214%28v=vs.85%29.aspx -typedef struct _DCB +typedef struct { DWORD DCBlength; DWORD BaudRate; @@ -234,7 +234,7 @@ typedef struct _DCB WORD wReserved1; } DCB, *LPDCB; -typedef struct _COMM_CONFIG +typedef struct { DWORD dwSize; WORD wVersion; @@ -246,7 +246,7 @@ typedef struct _COMM_CONFIG WCHAR wcProviderData[1]; } COMMCONFIG, *LPCOMMCONFIG; -typedef struct _COMMPROP +typedef struct { WORD wPacketLength; WORD wPacketVersion; @@ -268,7 +268,7 @@ typedef struct _COMMPROP WCHAR wcProvChar[1]; } COMMPROP, *LPCOMMPROP; -typedef struct _COMMTIMEOUTS +typedef struct { DWORD ReadIntervalTimeout; DWORD ReadTotalTimeoutMultiplier; @@ -277,7 +277,7 @@ typedef struct _COMMTIMEOUTS DWORD WriteTotalTimeoutConstant; } COMMTIMEOUTS, *LPCOMMTIMEOUTS; -typedef struct _COMSTAT +typedef struct { DWORD fCtsHold : 1; DWORD fDsrHold : 1; @@ -366,7 +366,7 @@ extern "C" * IOCTLs table according the server's serial driver: * http://msdn.microsoft.com/en-us/library/windows/hardware/dn265347%28v=vs.85%29.aspx */ - typedef enum _SERIAL_DRIVER_ID + typedef enum { SerialDriverUnknown = 0, SerialDriverSerialSys, @@ -456,7 +456,7 @@ extern "C" /* http://msdn.microsoft.com/en-us/library/windows/hardware/ff551803(v=vs.85).aspx */ #define IOCTL_USBPRINT_GET_1284_ID 0x220034 - typedef struct __SERIAL_IOCTL_NAME + typedef struct { ULONG number; const char* name; diff --git a/winpr/include/winpr/crypto.h b/winpr/include/winpr/crypto.h index 207f6565b..7cefbd908 100644 --- a/winpr/include/winpr/crypto.h +++ b/winpr/include/winpr/crypto.h @@ -208,7 +208,7 @@ typedef ULONG_PTR NCRYPT_SECRET_HANDLE; #define CALG_ECDH (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_ECDH) #define CALG_ECMQV (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_ANY | ALG_SID_ECMQV) -typedef struct _CRYPTOAPI_BLOB +typedef struct { DWORD cbData; BYTE* pbData; @@ -218,26 +218,26 @@ typedef struct _CRYPTOAPI_BLOB CRYPT_DATA_BLOB, *PCRYPT_DATA_BLOB, CRYPT_HASH_BLOB, *PCRYPT_HASH_BLOB, CRYPT_DIGEST_BLOB, *PCRYPT_DIGEST_BLOB, CRYPT_DER_BLOB, *PCRYPT_DER_BLOB, CRYPT_ATTR_BLOB, *PCRYPT_ATTR_BLOB; -typedef struct _CRYPT_ALGORITHM_IDENTIFIER +typedef struct { LPSTR pszObjId; CRYPT_OBJID_BLOB Parameters; } CRYPT_ALGORITHM_IDENTIFIER, *PCRYPT_ALGORITHM_IDENTIFIER; -typedef struct _CRYPT_BIT_BLOB +typedef struct { DWORD cbData; BYTE* pbData; DWORD cUnusedBits; } CRYPT_BIT_BLOB, *PCRYPT_BIT_BLOB; -typedef struct _CERT_PUBLIC_KEY_INFO +typedef struct { CRYPT_ALGORITHM_IDENTIFIER Algorithm; CRYPT_BIT_BLOB PublicKey; } CERT_PUBLIC_KEY_INFO, *PCERT_PUBLIC_KEY_INFO; -typedef struct _CERT_EXTENSION +typedef struct { LPSTR pszObjId; BOOL fCritical; @@ -245,7 +245,7 @@ typedef struct _CERT_EXTENSION } CERT_EXTENSION, *PCERT_EXTENSION; typedef const CERT_EXTENSION* PCCERT_EXTENSION; -typedef struct _CERT_INFO +typedef struct { DWORD dwVersion; CRYPT_INTEGER_BLOB SerialNumber; @@ -265,7 +265,7 @@ typedef void* HCERTSTORE; typedef ULONG_PTR HCRYPTPROV; typedef ULONG_PTR HCRYPTPROV_LEGACY; -typedef struct _CERT_CONTEXT +typedef struct { DWORD dwCertEncodingType; BYTE* pbCertEncoded; @@ -551,7 +551,7 @@ extern "C" #define CRYPTPROTECT_FIRST_RESERVED_FLAGVAL 0x0FFFFFFF #define CRYPTPROTECT_LAST_RESERVED_FLAGVAL 0xFFFFFFFF -typedef struct _CRYPTPROTECT_PROMPTSTRUCT +typedef struct { DWORD cbSize; DWORD dwPromptFlags; @@ -674,7 +674,7 @@ typedef enum WINPR_MD_SHAKE256 = 15 } WINPR_MD_TYPE; -typedef struct _winpr_hmac_ctx_private_st WINPR_HMAC_CTX; +typedef struct winpr_hmac_ctx_private_st WINPR_HMAC_CTX; #ifdef __cplusplus extern "C" @@ -701,7 +701,7 @@ extern "C" * Generic Digest API */ -typedef struct _winpr_digest_ctx_private_st WINPR_DIGEST_CTX; +typedef struct winpr_digest_ctx_private_st WINPR_DIGEST_CTX; #ifdef __cplusplus extern "C" @@ -743,7 +743,7 @@ extern "C" * RC4 */ -typedef struct _winpr_rc4_ctx_private_st WINPR_RC4_CTX; +typedef struct winpr_rc4_ctx_private_st WINPR_RC4_CTX; #ifdef __cplusplus extern "C" @@ -821,7 +821,7 @@ extern "C" #define WINPR_CIPHER_CAMELLIA_192_CCM 47 #define WINPR_CIPHER_CAMELLIA_256_CCM 48 -typedef struct _winpr_cipher_ctx_private_st WINPR_CIPHER_CTX; +typedef struct winpr_cipher_ctx_private_st WINPR_CIPHER_CTX; #ifdef __cplusplus extern "C" diff --git a/winpr/include/winpr/file.h b/winpr/include/winpr/file.h index c3b541869..b9a0614cb 100644 --- a/winpr/include/winpr/file.h +++ b/winpr/include/winpr/file.h @@ -182,12 +182,13 @@ #define MOVEFILE_CREATE_HARDLINK 0x10 #define MOVEFILE_FAIL_IF_NOT_TRACKABLE 0x20 -typedef union _FILE_SEGMENT_ELEMENT { +typedef union +{ PVOID64 Buffer; ULONGLONG Alignment; } FILE_SEGMENT_ELEMENT, *PFILE_SEGMENT_ELEMENT; -typedef struct _WIN32_FIND_DATAA +typedef struct { DWORD dwFileAttributes; FILETIME ftCreationTime; @@ -201,7 +202,7 @@ typedef struct _WIN32_FIND_DATAA CHAR cAlternateFileName[14]; } WIN32_FIND_DATAA, *PWIN32_FIND_DATAA, *LPWIN32_FIND_DATAA; -typedef struct _WIN32_FIND_DATAW +typedef struct { DWORD dwFileAttributes; FILETIME ftCreationTime; @@ -215,13 +216,13 @@ typedef struct _WIN32_FIND_DATAW WCHAR cAlternateFileName[14]; } WIN32_FIND_DATAW, *PWIN32_FIND_DATAW, *LPWIN32_FIND_DATAW; -typedef enum _FINDEX_INFO_LEVELS +typedef enum { FindExInfoStandard, FindExInfoMaxInfoLevel } FINDEX_INFO_LEVELS; -typedef enum _FINDEX_SEARCH_OPS +typedef enum { FindExSearchNameMatch, FindExSearchLimitToDirectories, @@ -285,7 +286,7 @@ extern "C" WINPR_API BOOL FlushFileBuffers(HANDLE hFile); - typedef struct _WIN32_FILE_ATTRIBUTE_DATA + typedef struct { DWORD dwFileAttributes; FILETIME ftCreationTime; @@ -295,7 +296,7 @@ extern "C" DWORD nFileSizeLow; } WIN32_FILE_ATTRIBUTE_DATA, *LPWIN32_FILE_ATTRIBUTE_DATA; - typedef enum _GET_FILEEX_INFO_LEVELS + typedef enum { GetFileExInfoStandard, GetFileExMaxInfoLevel @@ -424,7 +425,7 @@ typedef HANDLE (*pcCreateFileA)(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile); -typedef struct _HANDLE_CREATOR +typedef struct { pcIsFileHandled IsHandled; pcCreateFileA CreateFileA; diff --git a/winpr/include/winpr/image.h b/winpr/include/winpr/image.h index 00c0cb02d..915d6e896 100644 --- a/winpr/include/winpr/image.h +++ b/winpr/include/winpr/image.h @@ -25,17 +25,16 @@ #pragma pack(push, 1) -struct _WINPR_BITMAP_FILE_HEADER +typedef struct { BYTE bfType[2]; UINT32 bfSize; UINT16 bfReserved1; UINT16 bfReserved2; UINT32 bfOffBits; -}; -typedef struct _WINPR_BITMAP_FILE_HEADER WINPR_BITMAP_FILE_HEADER; +} WINPR_BITMAP_FILE_HEADER; -struct _WINPR_BITMAP_INFO_HEADER +typedef struct { UINT32 biSize; INT32 biWidth; @@ -48,18 +47,16 @@ struct _WINPR_BITMAP_INFO_HEADER INT32 biYPelsPerMeter; UINT32 biClrUsed; UINT32 biClrImportant; -}; -typedef struct _WINPR_BITMAP_INFO_HEADER WINPR_BITMAP_INFO_HEADER; +} WINPR_BITMAP_INFO_HEADER; -struct _WINPR_BITMAP_CORE_HEADER +typedef struct { UINT32 bcSize; UINT16 bcWidth; UINT16 bcHeight; UINT16 bcPlanes; UINT16 bcBitCount; -}; -typedef struct _WINPR_BITMAP_CORE_HEADER WINPR_BITMAP_CORE_HEADER; +} WINPR_BITMAP_CORE_HEADER; #pragma pack(pop) @@ -68,7 +65,7 @@ typedef struct _WINPR_BITMAP_CORE_HEADER WINPR_BITMAP_CORE_HEADER; #define WINPR_IMAGE_BMP_HEADER_LEN 54 -struct _wImage +typedef struct { int type; UINT32 width; @@ -77,8 +74,7 @@ struct _wImage UINT32 scanline; UINT32 bitsPerPixel; UINT32 bytesPerPixel; -}; -typedef struct _wImage wImage; +} wImage; #ifdef __cplusplus extern "C" diff --git a/winpr/include/winpr/ini.h b/winpr/include/winpr/ini.h index 442645c58..37090b945 100644 --- a/winpr/include/winpr/ini.h +++ b/winpr/include/winpr/ini.h @@ -23,7 +23,7 @@ #include #include -typedef struct _wIniFile wIniFile; +typedef struct s_wIniFile wIniFile; #ifdef __cplusplus extern "C" diff --git a/winpr/include/winpr/interlocked.h b/winpr/include/winpr/interlocked.h index f641dd52b..f6b959362 100644 --- a/winpr/include/winpr/interlocked.h +++ b/winpr/include/winpr/interlocked.h @@ -37,19 +37,19 @@ extern "C" ((type*)(((ULONG_PTR)address) - (ULONG_PTR)(&(((type*)0)->field)))) #endif - typedef struct _WINPR_LIST_ENTRY WINPR_LIST_ENTRY; - typedef struct _WINPR_LIST_ENTRY* WINPR_PLIST_ENTRY; + typedef struct S_WINPR_LIST_ENTRY WINPR_LIST_ENTRY; + typedef struct S_WINPR_LIST_ENTRY* WINPR_PLIST_ENTRY; - struct _WINPR_LIST_ENTRY + struct S_WINPR_LIST_ENTRY { WINPR_PLIST_ENTRY Flink; WINPR_PLIST_ENTRY Blink; }; - typedef struct _WINPR_SINGLE_LIST_ENTRY WINPR_SINGLE_LIST_ENTRY; - typedef struct _WINPR_SINGLE_LIST_ENTRY* WINPR_PSINGLE_LIST_ENTRY; + typedef struct S_WINPR_SINGLE_LIST_ENTRY WINPR_SINGLE_LIST_ENTRY; + typedef struct S_WINPR_SINGLE_LIST_ENTRY* WINPR_PSINGLE_LIST_ENTRY; - struct _WINPR_SINGLE_LIST_ENTRY + struct S_WINPR_SINGLE_LIST_ENTRY { WINPR_PSINGLE_LIST_ENTRY Next; }; @@ -70,8 +70,8 @@ extern "C" #ifdef _WIN64 - typedef struct _WINPR_SLIST_ENTRY* WINPR_PSLIST_ENTRY; - typedef struct DECLSPEC_ALIGN(16) _WINPR_SLIST_ENTRY + typedef struct S_WINPR_SLIST_ENTRY* WINPR_PSLIST_ENTRY; + typedef struct DECLSPEC_ALIGN(16) S_WINPR_SLIST_ENTRY { WINPR_PSLIST_ENTRY Next; } WINPR_SLIST_ENTRY; @@ -95,7 +95,8 @@ extern "C" #ifdef _WIN64 - typedef union DECLSPEC_ALIGN(16) _WINPR_SLIST_HEADER { + typedef union DECLSPEC_ALIGN(16) + { struct { ULONGLONG Alignment; @@ -125,7 +126,8 @@ extern "C" #else /* _WIN64 */ - typedef union _WINPR_SLIST_HEADER { + typedef union + { ULONGLONG Alignment; struct @@ -167,19 +169,15 @@ extern "C" #else /* _WIN32 */ #define WINPR_LIST_ENTRY LIST_ENTRY -#define _WINPR_LIST_ENTRY _LIST_ENTRY #define WINPR_PLIST_ENTRY PLIST_ENTRY #define WINPR_SINGLE_LIST_ENTRY SINGLE_LIST_ENTRY -#define _WINPR_SINGLE_LIST_ENTRY _SINGLE_LIST_ENTRY #define WINPR_PSINGLE_LIST_ENTRY PSINGLE_LIST_ENTRY #define WINPR_SLIST_ENTRY SLIST_ENTRY -#define _WINPR_SLIST_ENTRY _SLIST_ENTRY #define WINPR_PSLIST_ENTRY PSLIST_ENTRY #define WINPR_SLIST_HEADER SLIST_HEADER -#define _WINPR_SLIST_HEADER _SLIST_HEADER #define WINPR_PSLIST_HEADER PSLIST_HEADER #endif /* _WIN32 */ diff --git a/winpr/include/winpr/io.h b/winpr/include/winpr/io.h index aee1ee99a..2a0e34ce6 100644 --- a/winpr/include/winpr/io.h +++ b/winpr/include/winpr/io.h @@ -31,11 +31,12 @@ #include -typedef struct _OVERLAPPED +typedef struct { ULONG_PTR Internal; ULONG_PTR InternalHigh; - union { + union + { struct { DWORD Offset; @@ -46,7 +47,7 @@ typedef struct _OVERLAPPED HANDLE hEvent; } OVERLAPPED, *LPOVERLAPPED; -typedef struct _OVERLAPPED_ENTRY +typedef struct { ULONG_PTR lpCompletionKey; LPOVERLAPPED lpOverlapped; diff --git a/winpr/include/winpr/nt.h b/winpr/include/winpr/nt.h index c58158550..16838a54e 100644 --- a/winpr/include/winpr/nt.h +++ b/winpr/include/winpr/nt.h @@ -1293,7 +1293,7 @@ static INLINE NTSTATUS NTSTATUS_FROM_WIN32(long x) #endif #ifndef __MINGW32__ -typedef enum _FILE_INFORMATION_CLASS +typedef enum { FileDirectoryInformation = 1, FileFullDirectoryInformation, @@ -1389,7 +1389,7 @@ typedef enum _FILE_INFORMATION_CLASS typedef CONST char* PCSZ; -typedef struct _STRING +typedef struct { USHORT Length; USHORT MaximumLength; @@ -1405,7 +1405,7 @@ typedef STRING OEM_STRING; typedef PSTRING POEM_STRING; typedef CONST STRING* PCOEM_STRING; -typedef struct _LSA_UNICODE_STRING +typedef struct { USHORT Length; USHORT MaximumLength; @@ -1422,7 +1422,7 @@ typedef struct _LSA_UNICODE_STRING #define OBJ_FORCE_ACCESS_CHECK 0x00000400L #define OBJ_VALID_ATTRIBUTES 0x000007F2L -typedef struct _OBJECT_ATTRIBUTES +typedef struct { ULONG Length; HANDLE RootDirectory; @@ -1433,9 +1433,10 @@ typedef struct _OBJECT_ATTRIBUTES } OBJECT_ATTRIBUTES; typedef OBJECT_ATTRIBUTES* POBJECT_ATTRIBUTES; -typedef struct _IO_STATUS_BLOCK +typedef struct { - union { + union + { #ifdef _WIN32 NTSTATUS Status; #else @@ -1452,24 +1453,23 @@ typedef VOID (*PIO_APC_ROUTINE)(PVOID ApcContext, PIO_STATUS_BLOCK IoStatusBlock #if !defined(_WIN32) -typedef struct _PEB PEB; -typedef struct _PEB* PPEB; +typedef struct S_PEB PEB; +typedef struct S_PEB* PPEB; -typedef struct _TEB TEB; -typedef struct _TEB* PTEB; +typedef struct S_TEB TEB; +typedef struct S_TEB* PTEB; /** * Process Environment Block */ -struct _THREAD_BLOCK_ID +typedef struct { DWORD ThreadId; TEB* ThreadEnvironmentBlock; -}; -typedef struct _THREAD_BLOCK_ID THREAD_BLOCK_ID; +} THREAD_BLOCK_ID; -struct _PEB +struct S_PEB { DWORD ThreadCount; DWORD ThreadArraySize; @@ -1480,7 +1480,7 @@ struct _PEB * Thread Environment Block */ -struct _TEB +struct S_TEB { PEB* ProcessEnvironmentBlock; diff --git a/winpr/include/winpr/pool.h b/winpr/include/winpr/pool.h index 922228ffa..22142c9da 100644 --- a/winpr/include/winpr/pool.h +++ b/winpr/include/winpr/pool.h @@ -30,33 +30,33 @@ typedef DWORD TP_VERSION, *PTP_VERSION; -typedef struct _TP_CALLBACK_INSTANCE TP_CALLBACK_INSTANCE, *PTP_CALLBACK_INSTANCE; +typedef struct S_TP_CALLBACK_INSTANCE TP_CALLBACK_INSTANCE, *PTP_CALLBACK_INSTANCE; typedef VOID (*PTP_SIMPLE_CALLBACK)(PTP_CALLBACK_INSTANCE Instance, PVOID Context); -typedef struct _TP_POOL TP_POOL, *PTP_POOL; +typedef struct S_TP_POOL TP_POOL, *PTP_POOL; -typedef struct _TP_POOL_STACK_INFORMATION +typedef struct { SIZE_T StackReserve; SIZE_T StackCommit; } TP_POOL_STACK_INFORMATION, *PTP_POOL_STACK_INFORMATION; -typedef struct _TP_CLEANUP_GROUP TP_CLEANUP_GROUP, *PTP_CLEANUP_GROUP; +typedef struct S_TP_CLEANUP_GROUP TP_CLEANUP_GROUP, *PTP_CLEANUP_GROUP; typedef VOID (*PTP_CLEANUP_GROUP_CANCEL_CALLBACK)(PVOID ObjectContext, PVOID CleanupContext); -typedef struct _TP_CALLBACK_ENVIRON_V1 +typedef struct { TP_VERSION Version; PTP_POOL Pool; PTP_CLEANUP_GROUP CleanupGroup; PTP_CLEANUP_GROUP_CANCEL_CALLBACK CleanupGroupCancelCallback; PVOID RaceDll; - struct _ACTIVATION_CONTEXT* ActivationContext; PTP_SIMPLE_CALLBACK FinalizationCallback; - union { + union + { DWORD Flags; struct { @@ -69,17 +69,13 @@ typedef struct _TP_CALLBACK_ENVIRON_V1 typedef TP_CALLBACK_ENVIRON_V1 TP_CALLBACK_ENVIRON, *PTP_CALLBACK_ENVIRON; -#endif /* _WIN32 not defined */ - -typedef struct _TP_WORK TP_WORK, *PTP_WORK; -typedef struct _TP_TIMER TP_TIMER, *PTP_TIMER; +typedef struct S_TP_WORK TP_WORK, *PTP_WORK; +typedef struct S_TP_TIMER TP_TIMER, *PTP_TIMER; typedef DWORD TP_WAIT_RESULT; -typedef struct _TP_WAIT TP_WAIT, *PTP_WAIT; +typedef struct S_TP_WAIT TP_WAIT, *PTP_WAIT; -typedef struct _TP_IO TP_IO, *PTP_IO; - -#ifndef _WIN32 +typedef struct S_TP_IO TP_IO, *PTP_IO; typedef VOID (*PTP_WORK_CALLBACK)(PTP_CALLBACK_INSTANCE Instance, PVOID Context, PTP_WORK Work); typedef VOID (*PTP_TIMER_CALLBACK)(PTP_CALLBACK_INSTANCE Instance, PVOID Context, PTP_TIMER Timer); @@ -110,7 +106,6 @@ typedef VOID (*PTP_WIN32_IO_CALLBACK)(PTP_CALLBACK_INSTANCE Instance, PVOID Cont #endif - #if !defined(_WIN32) #define WINPR_THREAD_POOL 1 #elif defined(_WIN32) && (_WIN32_WINNT < 0x0600) @@ -215,7 +210,6 @@ extern "C" #define SetThreadpoolThreadMinimum winpr_SetThreadpoolThreadMinimum #define SetThreadpoolThreadMaximum winpr_SetThreadpoolThreadMaximum - /* Callback */ WINPR_API BOOL winpr_CallbackMayRunLong(PTP_CALLBACK_INSTANCE pci); @@ -255,14 +249,9 @@ extern "C" static INLINE VOID InitializeThreadpoolEnvironment(PTP_CALLBACK_ENVIRON pcbe) { + const TP_CALLBACK_ENVIRON empty = { 0 }; + *pcbe = empty; pcbe->Version = 1; - pcbe->Pool = NULL; - pcbe->CleanupGroup = NULL; - pcbe->CleanupGroupCancelCallback = NULL; - pcbe->RaceDll = NULL; - pcbe->ActivationContext = NULL; - pcbe->FinalizationCallback = NULL; - pcbe->u.Flags = 0; } static INLINE VOID DestroyThreadpoolEnvironment(PTP_CALLBACK_ENVIRON pcbe) diff --git a/winpr/include/winpr/rpc.h b/winpr/include/winpr/rpc.h index 908806c14..4d8ffd4c6 100644 --- a/winpr/include/winpr/rpc.h +++ b/winpr/include/winpr/rpc.h @@ -22,7 +22,7 @@ #include -typedef struct _CONTEXT_HANDLE +typedef struct { UINT32 ContextType; BYTE ContextUuid[16]; @@ -81,14 +81,14 @@ typedef void* I_RPC_HANDLE; typedef I_RPC_HANDLE RPC_BINDING_HANDLE; typedef RPC_BINDING_HANDLE handle_t; -typedef struct _RPC_BINDING_VECTOR +typedef struct { unsigned long Count; RPC_BINDING_HANDLE BindingH[1]; } RPC_BINDING_VECTOR; #define rpc_binding_vector_t RPC_BINDING_VECTOR -typedef struct _UUID_VECTOR +typedef struct { unsigned long Count; UUID* Uuid[1]; @@ -97,7 +97,7 @@ typedef struct _UUID_VECTOR typedef void* RPC_IF_HANDLE; -typedef struct _RPC_IF_ID +typedef struct { UUID Uuid; unsigned short VersMajor; @@ -151,13 +151,13 @@ typedef struct _RPC_IF_ID #define RPC_C_FULL_CERT_CHAIN 0x0001 -typedef struct _RPC_PROTSEQ_VECTORA +typedef struct { unsigned int Count; unsigned char* Protseq[1]; } RPC_PROTSEQ_VECTORA; -typedef struct _RPC_PROTSEQ_VECTORW +typedef struct { unsigned int Count; unsigned short* Protseq[1]; @@ -169,7 +169,7 @@ typedef struct _RPC_PROTSEQ_VECTORW #define RPC_PROTSEQ_VECTOR RPC_PROTSEQ_VECTORA #endif -typedef struct _RPC_POLICY +typedef struct { unsigned int Length; unsigned long EndpointFlags; @@ -255,7 +255,7 @@ typedef void* RPC_AUTHZ_HANDLE; #define RPC_C_SECURITY_QOS_VERSION 1L #define RPC_C_SECURITY_QOS_VERSION_1 1L -typedef struct _RPC_SECURITY_QOS +typedef struct { unsigned long Version; unsigned long Capabilities; @@ -281,7 +281,7 @@ typedef struct _RPC_SECURITY_QOS #define RPC_C_HTTP_FLAG_USE_FIRST_AUTH_SCHEME 2 #define RPC_C_HTTP_FLAG_IGNORE_CERT_CN_INVALID 8 -typedef struct _RPC_HTTP_TRANSPORT_CREDENTIALS_W +typedef struct { SEC_WINNT_AUTH_IDENTITY_W* TransportCredentials; unsigned long Flags; @@ -291,7 +291,7 @@ typedef struct _RPC_HTTP_TRANSPORT_CREDENTIALS_W unsigned short* ServerCertificateSubject; } RPC_HTTP_TRANSPORT_CREDENTIALS_W, *PRPC_HTTP_TRANSPORT_CREDENTIALS_W; -typedef struct _RPC_HTTP_TRANSPORT_CREDENTIALS_A +typedef struct { SEC_WINNT_AUTH_IDENTITY_A* TransportCredentials; unsigned long Flags; @@ -301,7 +301,7 @@ typedef struct _RPC_HTTP_TRANSPORT_CREDENTIALS_A unsigned char* ServerCertificateSubject; } RPC_HTTP_TRANSPORT_CREDENTIALS_A, *PRPC_HTTP_TRANSPORT_CREDENTIALS_A; -typedef struct _RPC_SECURITY_QOS_V2_W +typedef struct { unsigned long Version; unsigned long Capabilities; @@ -314,7 +314,7 @@ typedef struct _RPC_SECURITY_QOS_V2_W } u; } RPC_SECURITY_QOS_V2_W, *PRPC_SECURITY_QOS_V2_W; -typedef struct _RPC_SECURITY_QOS_V2_A +typedef struct { unsigned long Version; unsigned long Capabilities; @@ -329,7 +329,7 @@ typedef struct _RPC_SECURITY_QOS_V2_A #define RPC_C_SECURITY_QOS_VERSION_3 3L -typedef struct _RPC_SECURITY_QOS_V3_W +typedef struct { unsigned long Version; unsigned long Capabilities; @@ -343,7 +343,7 @@ typedef struct _RPC_SECURITY_QOS_V3_W void* Sid; } RPC_SECURITY_QOS_V3_W, *PRPC_SECURITY_QOS_V3_W; -typedef struct _RPC_SECURITY_QOS_V3_A +typedef struct { unsigned long Version; unsigned long Capabilities; @@ -357,7 +357,7 @@ typedef struct _RPC_SECURITY_QOS_V3_A void* Sid; } RPC_SECURITY_QOS_V3_A, *PRPC_SECURITY_QOS_V3_A; -typedef enum _RPC_HTTP_REDIRECTOR_STAGE +typedef enum { RPCHTTP_RS_REDIRECT = 1, RPCHTTP_RS_ACCESS_1, @@ -419,7 +419,7 @@ typedef int (*RPC_MGMT_AUTHORIZATION_FN)(RPC_BINDING_HANDLE ClientBinding, #define RPC_IF_ALLOW_LOCAL_ONLY 0x0020 #define RPC_IF_SEC_NO_CACHE 0x0040 -typedef struct _RPC_BINDING_HANDLE_OPTIONS_V1 +typedef struct { unsigned long Version; unsigned long Flags; @@ -437,7 +437,7 @@ typedef struct RPC_SECURITY_QOS* SecurityQos; } RPC_BINDING_HANDLE_SECURITY_V1, RPC_BINDING_HANDLE_SECURITY; -typedef struct _RPC_BINDING_HANDLE_TEMPLATE +typedef struct { unsigned long Version; unsigned long Flags; diff --git a/winpr/include/winpr/schannel.h b/winpr/include/winpr/schannel.h index d9e2d6525..e4d5fabd3 100644 --- a/winpr/include/winpr/schannel.h +++ b/winpr/include/winpr/schannel.h @@ -42,19 +42,19 @@ #define SECPKG_ATTR_CIPHER_STRENGTHS 87 #define SECPKG_ATTR_SUPPORTED_PROTOCOLS 88 -typedef struct _SecPkgCred_SupportedAlgs +typedef struct { DWORD cSupportedAlgs; ALG_ID* palgSupportedAlgs; } SecPkgCred_SupportedAlgs, *PSecPkgCred_SupportedAlgs; -typedef struct _SecPkgCred_CipherStrengths +typedef struct { DWORD dwMinimumCipherStrength; DWORD dwMaximumCipherStrength; } SecPkgCred_CipherStrengths, *PSecPkgCred_CipherStrengths; -typedef struct _SecPkgCred_SupportedProtocols +typedef struct { DWORD grbitProtocol; } SecPkgCred_SupportedProtocols, *PSecPkgCred_SupportedProtocols; @@ -84,18 +84,13 @@ enum eTlsHashAlgorithm #define SCH_CRED_V3 0x00000003 #define SCHANNEL_CRED_VERSION 0x00000004 -struct _HMAPPER; - -typedef struct _SCHANNEL_CRED +typedef struct { DWORD dwVersion; DWORD cCreds; PCCERT_CONTEXT* paCred; HCERTSTORE hRootStore; - DWORD cMappers; - struct _HMAPPER** aphMappers; - DWORD cSupportedAlgs; ALG_ID* palgSupportedAlgs; @@ -115,7 +110,7 @@ typedef struct _SCHANNEL_CRED #define SCH_CRED_MAX_SUPPORTED_ALGS 256 #define SCH_CRED_MAX_SUPPORTED_CERTS 100 -typedef struct _SCHANNEL_CERT_HASH +typedef struct { DWORD dwLength; DWORD dwFlags; @@ -123,7 +118,7 @@ typedef struct _SCHANNEL_CERT_HASH BYTE ShaHash[20]; } SCHANNEL_CERT_HASH, *PSCHANNEL_CERT_HASH; -typedef struct _SCHANNEL_CERT_HASH_STORE +typedef struct { DWORD dwLength; DWORD dwFlags; @@ -166,7 +161,7 @@ typedef struct _SCHANNEL_CERT_HASH_STORE #define SCHANNEL_ALERT 2 #define SCHANNEL_SESSION 3 -typedef struct _SCHANNEL_ALERT_TOKEN +typedef struct { DWORD dwTokenType; DWORD dwAlertType; @@ -204,13 +199,13 @@ typedef struct _SCHANNEL_ALERT_TOKEN #define SSL_SESSION_ENABLE_RECONNECTS 1 #define SSL_SESSION_DISABLE_RECONNECTS 2 -typedef struct _SCHANNEL_SESSION_TOKEN +typedef struct { DWORD dwTokenType; DWORD dwFlags; } SCHANNEL_SESSION_TOKEN; -typedef struct _SCHANNEL_CLIENT_SIGNATURE +typedef struct { DWORD cbLength; ALG_ID aiHash; diff --git a/winpr/include/winpr/security.h b/winpr/include/winpr/security.h index 9dd5748ad..0d71b2113 100644 --- a/winpr/include/winpr/security.h +++ b/winpr/include/winpr/security.h @@ -34,7 +34,7 @@ #define ANYSIZE_ARRAY 1 -typedef enum _SECURITY_IMPERSONATION_LEVEL +typedef enum { SecurityAnonymous, SecurityIdentification, @@ -135,7 +135,7 @@ typedef enum _SECURITY_IMPERSONATION_LEVEL typedef PVOID PACCESS_TOKEN; typedef PVOID PCLAIMS_BLOB; -typedef struct _LUID_AND_ATTRIBUTES +typedef struct { LUID Luid; DWORD Attributes; @@ -143,12 +143,12 @@ typedef struct _LUID_AND_ATTRIBUTES typedef LUID_AND_ATTRIBUTES LUID_AND_ATTRIBUTES_ARRAY[ANYSIZE_ARRAY]; typedef LUID_AND_ATTRIBUTES_ARRAY* PLUID_AND_ATTRIBUTES_ARRAY; -typedef struct _SID_IDENTIFIER_AUTHORITY +typedef struct { BYTE Value[6]; } SID_IDENTIFIER_AUTHORITY, *PSID_IDENTIFIER_AUTHORITY; -typedef struct _SID +typedef struct { BYTE Revision; BYTE SubAuthorityCount; @@ -156,7 +156,7 @@ typedef struct _SID DWORD SubAuthority[ANYSIZE_ARRAY]; } SID, *PISID; -typedef enum _SID_NAME_USE +typedef enum { SidTypeUser = 1, SidTypeGroup, @@ -171,7 +171,7 @@ typedef enum _SID_NAME_USE } SID_NAME_USE, *PSID_NAME_USE; -typedef struct _SID_AND_ATTRIBUTES +typedef struct { PSID Sid; DWORD Attributes; @@ -182,21 +182,21 @@ typedef SID_AND_ATTRIBUTES_ARRAY* PSID_AND_ATTRIBUTES_ARRAY; typedef ULONG_PTR SID_HASH_ENTRY, *PSID_HASH_ENTRY; -typedef struct _SID_AND_ATTRIBUTES_HASH +typedef struct { DWORD SidCount; PSID_AND_ATTRIBUTES SidAttr; SID_HASH_ENTRY Hash[SID_HASH_SIZE]; } SID_AND_ATTRIBUTES_HASH, *PSID_AND_ATTRIBUTES_HASH; -typedef enum _TOKEN_TYPE +typedef enum { TokenPrimary = 1, TokenImpersonation } TOKEN_TYPE; typedef TOKEN_TYPE* PTOKEN_TYPE; -typedef enum _TOKEN_ELEVATION_TYPE +typedef enum { TokenElevationTypeDefault = 1, TokenElevationTypeFull, @@ -204,7 +204,7 @@ typedef enum _TOKEN_ELEVATION_TYPE } TOKEN_ELEVATION_TYPE, *PTOKEN_ELEVATION_TYPE; -typedef enum _TOKEN_INFORMATION_CLASS +typedef enum { TokenUser = 1, TokenGroups, @@ -250,49 +250,49 @@ typedef enum _TOKEN_INFORMATION_CLASS } TOKEN_INFORMATION_CLASS, *PTOKEN_INFORMATION_CLASS; -typedef struct _TOKEN_USER +typedef struct { SID_AND_ATTRIBUTES User; } TOKEN_USER, *PTOKEN_USER; -typedef struct _TOKEN_GROUPS +typedef struct { DWORD GroupCount; SID_AND_ATTRIBUTES Groups[ANYSIZE_ARRAY]; } TOKEN_GROUPS, *PTOKEN_GROUPS; -typedef struct _TOKEN_PRIVILEGES +typedef struct { DWORD PrivilegeCount; LUID_AND_ATTRIBUTES Privileges[ANYSIZE_ARRAY]; } TOKEN_PRIVILEGES, *PTOKEN_PRIVILEGES; -typedef struct _TOKEN_OWNER +typedef struct { PSID Owner; } TOKEN_OWNER, *PTOKEN_OWNER; -typedef struct _TOKEN_PRIMARY_GROUP +typedef struct { PSID PrimaryGroup; } TOKEN_PRIMARY_GROUP, *PTOKEN_PRIMARY_GROUP; -typedef struct _TOKEN_DEFAULT_DACL +typedef struct { PACL DefaultDacl; } TOKEN_DEFAULT_DACL, *PTOKEN_DEFAULT_DACL; -typedef struct _TOKEN_USER_CLAIMS +typedef struct { PCLAIMS_BLOB UserClaims; } TOKEN_USER_CLAIMS, *PTOKEN_USER_CLAIMS; -typedef struct _TOKEN_DEVICE_CLAIMS +typedef struct { PCLAIMS_BLOB DeviceClaims; } TOKEN_DEVICE_CLAIMS, *PTOKEN_DEVICE_CLAIMS; -typedef struct _TOKEN_GROUPS_AND_PRIVILEGES +typedef struct { DWORD SidCount; DWORD SidLength; @@ -306,27 +306,27 @@ typedef struct _TOKEN_GROUPS_AND_PRIVILEGES LUID AuthenticationId; } TOKEN_GROUPS_AND_PRIVILEGES, *PTOKEN_GROUPS_AND_PRIVILEGES; -typedef struct _TOKEN_LINKED_TOKEN +typedef struct { HANDLE LinkedToken; } TOKEN_LINKED_TOKEN, *PTOKEN_LINKED_TOKEN; -typedef struct _TOKEN_ELEVATION +typedef struct { DWORD TokenIsElevated; } TOKEN_ELEVATION, *PTOKEN_ELEVATION; -typedef struct _TOKEN_MANDATORY_LABEL +typedef struct { SID_AND_ATTRIBUTES Label; } TOKEN_MANDATORY_LABEL, *PTOKEN_MANDATORY_LABEL; -typedef struct _TOKEN_MANDATORY_POLICY +typedef struct { DWORD Policy; } TOKEN_MANDATORY_POLICY, *PTOKEN_MANDATORY_POLICY; -typedef struct _TOKEN_ACCESS_INFORMATION +typedef struct { PSID_AND_ATTRIBUTES_HASH SidHash; PSID_AND_ATTRIBUTES_HASH RestrictedSidHash; @@ -341,18 +341,18 @@ typedef struct _TOKEN_ACCESS_INFORMATION PSID_AND_ATTRIBUTES_HASH CapabilitiesHash; } TOKEN_ACCESS_INFORMATION, *PTOKEN_ACCESS_INFORMATION; -typedef struct _TOKEN_AUDIT_POLICY +typedef struct { BYTE PerUserPolicy[((POLICY_AUDIT_SUBCATEGORY_COUNT) >> 1) + 1]; } TOKEN_AUDIT_POLICY, *PTOKEN_AUDIT_POLICY; -typedef struct _TOKEN_SOURCE +typedef struct { CHAR SourceName[TOKEN_SOURCE_LENGTH]; LUID SourceIdentifier; } TOKEN_SOURCE, *PTOKEN_SOURCE; -typedef struct _TOKEN_STATISTICS +typedef struct { LUID TokenId; LUID AuthenticationId; @@ -366,7 +366,7 @@ typedef struct _TOKEN_STATISTICS LUID ModifiedId; } TOKEN_STATISTICS, *PTOKEN_STATISTICS; -typedef struct _TOKEN_CONTROL +typedef struct { LUID TokenId; LUID AuthenticationId; @@ -374,12 +374,12 @@ typedef struct _TOKEN_CONTROL TOKEN_SOURCE TokenSource; } TOKEN_CONTROL, *PTOKEN_CONTROL; -typedef struct _TOKEN_ORIGIN +typedef struct { LUID OriginatingLogonSession; } TOKEN_ORIGIN, *PTOKEN_ORIGIN; -typedef enum _MANDATORY_LEVEL +typedef enum { MandatoryLevelUntrusted = 0, MandatoryLevelLow, @@ -391,7 +391,7 @@ typedef enum _MANDATORY_LEVEL } MANDATORY_LEVEL, *PMANDATORY_LEVEL; -typedef struct _TOKEN_APPCONTAINER_INFORMATION +typedef struct { PSID TokenAppContainer; } TOKEN_APPCONTAINER_INFORMATION, *PTOKEN_APPCONTAINER_INFORMATION; diff --git a/winpr/include/winpr/shell.h b/winpr/include/winpr/shell.h index 55050aab6..376ebb102 100644 --- a/winpr/include/winpr/shell.h +++ b/winpr/include/winpr/shell.h @@ -35,7 +35,7 @@ #else /* Shell clipboard formats */ -struct _FILEDESCRIPTORW +typedef struct { DWORD dwFlags; CLSID clsid; @@ -48,11 +48,10 @@ struct _FILEDESCRIPTORW DWORD nFileSizeHigh; DWORD nFileSizeLow; WCHAR cFileName[260]; -}; -typedef struct _FILEDESCRIPTORW FILEDESCRIPTORW; +} FILEDESCRIPTORW; /* Legacy definition, some types do not match the windows equivalent. */ -struct _FILEDESCRIPTOR +typedef struct { DWORD dwFlags; BYTE clsid[16]; @@ -65,8 +64,7 @@ struct _FILEDESCRIPTOR DWORD nFileSizeHigh; DWORD nFileSizeLow; WCHAR cFileName[260]; -}; -typedef struct _FILEDESCRIPTOR FILEDESCRIPTOR; +} FILEDESCRIPTOR; /* FILEDESCRIPTOR.dwFlags */ typedef enum diff --git a/winpr/include/winpr/smartcard.h b/winpr/include/winpr/smartcard.h index 8023ba520..3e52f92a2 100644 --- a/winpr/include/winpr/smartcard.h +++ b/winpr/include/winpr/smartcard.h @@ -261,7 +261,7 @@ #pragma pack(push, 1) -typedef struct _SCARD_IO_REQUEST +typedef struct { DWORD dwProtocol; DWORD cbPciLength; @@ -396,7 +396,7 @@ typedef struct BYTE rgbAtr[36]; } SCARD_READERSTATEW, *PSCARD_READERSTATEW, *LPSCARD_READERSTATEW; -typedef struct _SCARD_ATRMASK +typedef struct { DWORD cbAtr; BYTE rgbAtr[36]; @@ -1111,7 +1111,7 @@ typedef LONG(WINAPI* fnSCardListReadersWithDeviceInstanceIdW)(SCARDCONTEXT hCont typedef LONG(WINAPI* fnSCardAudit)(SCARDCONTEXT hContext, DWORD dwEvent); -struct _SCardApiFunctionTable +typedef struct { DWORD dwVersion; DWORD dwFlags; @@ -1192,9 +1192,7 @@ struct _SCardApiFunctionTable fnSCardListReadersWithDeviceInstanceIdA pfnSCardListReadersWithDeviceInstanceIdA; fnSCardListReadersWithDeviceInstanceIdW pfnSCardListReadersWithDeviceInstanceIdW; fnSCardAudit pfnSCardAudit; -}; - -typedef struct _SCardApiFunctionTable SCardApiFunctionTable; +} SCardApiFunctionTable; typedef SCardApiFunctionTable* PSCardApiFunctionTable; #ifdef __cplusplus diff --git a/winpr/include/winpr/sspi.h b/winpr/include/winpr/sspi.h index 97ae99a10..481d575e9 100644 --- a/winpr/include/winpr/sspi.h +++ b/winpr/include/winpr/sspi.h @@ -45,12 +45,11 @@ typedef CHAR SEC_CHAR; typedef WCHAR SEC_WCHAR; -struct _SECURITY_INTEGER +typedef struct { UINT32 LowPart; INT32 HighPart; -}; -typedef struct _SECURITY_INTEGER SECURITY_INTEGER; +} SECURITY_INTEGER; typedef SECURITY_INTEGER TimeStamp; typedef SECURITY_INTEGER* PTimeStamp; @@ -69,7 +68,7 @@ typedef LONG SECURITY_STATUS; #pragma clang diagnostic pop #endif -struct _SecPkgInfoA +typedef struct { UINT32 fCapabilities; UINT16 wVersion; @@ -77,11 +76,10 @@ struct _SecPkgInfoA UINT32 cbMaxToken; SEC_CHAR* Name; SEC_CHAR* Comment; -}; -typedef struct _SecPkgInfoA SecPkgInfoA; +} SecPkgInfoA; typedef SecPkgInfoA* PSecPkgInfoA; -struct _SecPkgInfoW +typedef struct { UINT32 fCapabilities; UINT16 wVersion; @@ -89,8 +87,7 @@ struct _SecPkgInfoW UINT32 cbMaxToken; SEC_WCHAR* Name; SEC_WCHAR* Comment; -}; -typedef struct _SecPkgInfoW SecPkgInfoW; +} SecPkgInfoW; typedef SecPkgInfoW* PSecPkgInfoW; #ifdef UNICODE @@ -302,35 +299,31 @@ typedef SecPkgInfoW* PSecPkgInfoW; #if !defined(_WIN32) || defined(_UWP) -struct _SecPkgContext_AccessToken +typedef struct { void* AccessToken; -}; -typedef struct _SecPkgContext_AccessToken SecPkgContext_AccessToken; +} SecPkgContext_AccessToken; -struct _SecPkgContext_SessionAppData +typedef struct { UINT32 dwFlags; UINT32 cbAppData; BYTE* pbAppData; -}; -typedef struct _SecPkgContext_SessionAppData SecPkgContext_SessionAppData; +} SecPkgContext_SessionAppData; -struct _SecPkgContext_Authority +typedef struct { char* sAuthorityName; -}; -typedef struct _SecPkgContext_Authority SecPkgContext_Authority; +} SecPkgContext_Authority; -struct _SecPkgContext_ClientSpecifiedTarget +typedef struct { char* sTargetName; -}; -typedef struct _SecPkgContext_ClientSpecifiedTarget SecPkgContext_ClientSpecifiedTarget; +} SecPkgContext_ClientSpecifiedTarget; typedef UINT32 ALG_ID; -struct _SecPkgContext_ConnectionInfo +typedef struct { UINT32 dwProtocol; ALG_ID aiCipher; @@ -339,24 +332,21 @@ struct _SecPkgContext_ConnectionInfo UINT32 dwHashStrength; ALG_ID aiExch; UINT32 dwExchStrength; -}; -typedef struct _SecPkgContext_ConnectionInfo SecPkgContext_ConnectionInfo; +} SecPkgContext_ConnectionInfo; -struct _SecPkgContext_ClientCreds +typedef struct { UINT32 AuthBufferLen; BYTE* AuthBuffer; -}; -typedef struct _SecPkgContext_ClientCreds SecPkgContext_ClientCreds; +} SecPkgContext_ClientCreds; -struct _SecPkgContex_DceInfo +typedef struct { UINT32 AuthzSvc; void* pPac; -}; -typedef struct _SecPkgContex_DceInfo SecPkgContex_DceInfo; +} SecPkgContex_DceInfo; -struct _SEC_CHANNEL_BINDINGS +typedef struct { UINT32 dwInitiatorAddrType; UINT32 cbInitiatorLength; @@ -366,141 +356,122 @@ struct _SEC_CHANNEL_BINDINGS UINT32 dwAcceptorOffset; UINT32 cbApplicationDataLength; UINT32 dwApplicationDataOffset; -}; -typedef struct _SEC_CHANNEL_BINDINGS SEC_CHANNEL_BINDINGS; +} SEC_CHANNEL_BINDINGS; -struct _SecPkgContext_EapKeyBlock +typedef struct { BYTE rgbKeys[128]; BYTE rgbIVs[64]; -}; -typedef struct _SecPkgContext_EapKeyBlock SecPkgContext_EapKeyBlock; +} SecPkgContext_EapKeyBlock; -struct _SecPkgContext_Flags +typedef struct { UINT32 Flags; -}; -typedef struct _SecPkgContext_Flags SecPkgContext_Flags; +} SecPkgContext_Flags; -struct _SecPkgContext_KeyInfo +typedef struct { char* sSignatureAlgorithmName; char* sEncryptAlgorithmName; UINT32 KeySize; UINT32 SignatureAlgorithm; UINT32 EncryptAlgorithm; -}; -typedef struct _SecPkgContext_KeyInfo SecPkgContext_KeyInfo; +} SecPkgContext_KeyInfo; -struct _SecPkgContext_Lifespan +typedef struct { TimeStamp tsStart; TimeStamp tsExpiry; -}; -typedef struct _SecPkgContext_Lifespan SecPkgContext_Lifespan; +} SecPkgContext_Lifespan; -struct _SecPkgContext_Names +typedef struct { char* sUserName; -}; -typedef struct _SecPkgContext_Names SecPkgContext_Names; +} SecPkgContext_Names; -struct _SecPkgContext_NativeNames +typedef struct { char* sClientName; char* sServerName; -}; -typedef struct _SecPkgContext_NativeNames SecPkgContext_NativeNames; +} SecPkgContext_NativeNames; -struct _SecPkgContext_NegotiationInfo +typedef struct { SecPkgInfo* PackageInfo; UINT32 NegotiationState; -}; -typedef struct _SecPkgContext_NegotiationInfo SecPkgContext_NegotiationInfo; +} SecPkgContext_NegotiationInfo; -struct _SecPkgContext_PackageInfo +typedef struct { SecPkgInfo* PackageInfo; -}; -typedef struct _SecPkgContext_PackageInfo SecPkgContext_PackageInfo; +} SecPkgContext_PackageInfo; -struct _SecPkgContext_PasswordExpiry +typedef struct { TimeStamp tsPasswordExpires; -}; -typedef struct _SecPkgContext_PasswordExpiry SecPkgContext_PasswordExpiry; +} SecPkgContext_PasswordExpiry; -struct _SecPkgContext_SessionKey +typedef struct { UINT32 SessionKeyLength; BYTE* SessionKey; -}; -typedef struct _SecPkgContext_SessionKey SecPkgContext_SessionKey; +} SecPkgContext_SessionKey; -struct _SecPkgContext_SessionInfo +typedef struct { UINT32 dwFlags; UINT32 cbSessionId; BYTE rgbSessionId[32]; -}; -typedef struct _SecPkgContext_SessionInfo SecPkgContext_SessionInfo; +} SecPkgContext_SessionInfo; -struct _SecPkgContext_Sizes +typedef struct { UINT32 cbMaxToken; UINT32 cbMaxSignature; UINT32 cbBlockSize; UINT32 cbSecurityTrailer; -}; -typedef struct _SecPkgContext_Sizes SecPkgContext_Sizes; +} SecPkgContext_Sizes; -struct _SecPkgContext_StreamSizes +typedef struct { UINT32 cbHeader; UINT32 cbTrailer; UINT32 cbMaximumMessage; UINT32 cBuffers; UINT32 cbBlockSize; -}; -typedef struct _SecPkgContext_StreamSizes SecPkgContext_StreamSizes; +} SecPkgContext_StreamSizes; -struct _SecPkgContext_SubjectAttributes +typedef struct { void* AttributeInfo; -}; -typedef struct _SecPkgContext_SubjectAttributes SecPkgContext_SubjectAttributes; +} SecPkgContext_SubjectAttributes; -struct _SecPkgContext_SupportedSignatures +typedef struct { UINT16 cSignatureAndHashAlgorithms; UINT16* pSignatureAndHashAlgorithms; -}; -typedef struct _SecPkgContext_SupportedSignatures SecPkgContext_SupportedSignatures; +} SecPkgContext_SupportedSignatures; -struct _SecPkgContext_TargetInformation +typedef struct { UINT32 MarshalledTargetInfoLength; BYTE* MarshalledTargetInfo; -}; -typedef struct _SecPkgContext_TargetInformation SecPkgContext_TargetInformation; +} SecPkgContext_TargetInformation; /* Security Credentials Attributes */ #define SECPKG_CRED_ATTR_NAMES 1 -struct _SecPkgCredentials_NamesA +typedef struct { SEC_CHAR* sUserName; -}; -typedef struct _SecPkgCredentials_NamesA SecPkgCredentials_NamesA; +} SecPkgCredentials_NamesA; typedef SecPkgCredentials_NamesA* PSecPkgCredentials_NamesA; -struct _SecPkgCredentials_NamesW +typedef struct { SEC_WCHAR* sUserName; -}; -typedef struct _SecPkgCredentials_NamesW SecPkgCredentials_NamesW; +} SecPkgCredentials_NamesW; typedef SecPkgCredentials_NamesW* PSecPkgCredentials_NamesW; #ifdef UNICODE @@ -514,15 +485,13 @@ typedef SecPkgCredentials_NamesW* PSecPkgCredentials_NamesW; #endif #if !defined(_WIN32) || defined(_UWP) || defined(__MINGW32__) -struct _SecPkgContext_Bindings +typedef struct { UINT32 BindingsLength; SEC_CHANNEL_BINDINGS* Bindings; -}; -typedef struct _SecPkgContext_Bindings SecPkgContext_Bindings; +} SecPkgContext_Bindings; #endif - /* InitializeSecurityContext Flags */ #define ISC_REQ_DELEGATE 0x00000001 @@ -640,7 +609,7 @@ typedef struct _SecPkgContext_Bindings SecPkgContext_Bindings; #ifndef _AUTH_IDENTITY_DEFINED #define _AUTH_IDENTITY_DEFINED -typedef struct _SEC_WINNT_AUTH_IDENTITY_W +typedef struct { /* TSPasswordCreds */ UINT16* User; @@ -652,7 +621,7 @@ typedef struct _SEC_WINNT_AUTH_IDENTITY_W UINT32 Flags; } SEC_WINNT_AUTH_IDENTITY_W, *PSEC_WINNT_AUTH_IDENTITY_W; -typedef struct _SEC_WINNT_AUTH_IDENTITY_A +typedef struct { /* TSPasswordCreds */ BYTE* User; @@ -664,7 +633,7 @@ typedef struct _SEC_WINNT_AUTH_IDENTITY_A UINT32 Flags; } SEC_WINNT_AUTH_IDENTITY_A, *PSEC_WINNT_AUTH_IDENTITY_A; -struct _SEC_WINNT_AUTH_IDENTITY +typedef struct { /* TSPasswordCreds */ UINT16* User; @@ -674,8 +643,7 @@ struct _SEC_WINNT_AUTH_IDENTITY UINT16* Password; UINT32 PasswordLength; UINT32 Flags; -}; -typedef struct _SEC_WINNT_AUTH_IDENTITY SEC_WINNT_AUTH_IDENTITY; +} SEC_WINNT_AUTH_IDENTITY; #endif /* _AUTH_IDENTITY_DEFINED */ @@ -683,12 +651,11 @@ typedef struct _SEC_WINNT_AUTH_IDENTITY SEC_WINNT_AUTH_IDENTITY; #pragma clang diagnostic pop #endif -struct _SecHandle +typedef struct { ULONG_PTR dwLower; ULONG_PTR dwUpper; -}; -typedef struct _SecHandle SecHandle; +} SecHandle; typedef SecHandle* PSecHandle; typedef SecHandle CredHandle; @@ -735,22 +702,20 @@ typedef CtxtHandle* PCtxtHandle; #if !defined(_WIN32) || defined(_UWP) -struct _SecBuffer +typedef struct { ULONG cbBuffer; ULONG BufferType; void* pvBuffer; -}; -typedef struct _SecBuffer SecBuffer; +} SecBuffer; typedef SecBuffer* PSecBuffer; -struct _SecBufferDesc +typedef struct { ULONG ulVersion; ULONG cBuffers; PSecBuffer pBuffers; -}; -typedef struct _SecBufferDesc SecBufferDesc; +} SecBufferDesc; typedef SecBufferDesc* PSecBufferDesc; typedef void(SEC_ENTRY* SEC_GET_KEY_FN)(void* Arg, void* Principal, UINT32 KeyVer, void** Key, @@ -942,7 +907,7 @@ typedef SECURITY_STATUS(SEC_ENTRY* SET_CONTEXT_ATTRIBUTES_FN_W)(PCtxtHandle phCo #define SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION_4 \ 4 /* Interface has all routines through ChangeAccountPassword */ -struct _SecurityFunctionTableA +typedef struct { UINT32 dwVersion; ENUMERATE_SECURITY_PACKAGES_FN_A EnumerateSecurityPackagesA; @@ -972,11 +937,10 @@ struct _SecurityFunctionTableA ENCRYPT_MESSAGE_FN EncryptMessage; DECRYPT_MESSAGE_FN DecryptMessage; SET_CONTEXT_ATTRIBUTES_FN_A SetContextAttributesA; -}; -typedef struct _SecurityFunctionTableA SecurityFunctionTableA; +} SecurityFunctionTableA; typedef SecurityFunctionTableA* PSecurityFunctionTableA; -struct _SecurityFunctionTableW +typedef struct { UINT32 dwVersion; ENUMERATE_SECURITY_PACKAGES_FN_W EnumerateSecurityPackagesW; @@ -1006,8 +970,7 @@ struct _SecurityFunctionTableW ENCRYPT_MESSAGE_FN EncryptMessage; DECRYPT_MESSAGE_FN DecryptMessage; SET_CONTEXT_ATTRIBUTES_FN_W SetContextAttributesW; -}; -typedef struct _SecurityFunctionTableW SecurityFunctionTableW; +} SecurityFunctionTableW; typedef SecurityFunctionTableW* PSecurityFunctionTableW; typedef PSecurityFunctionTableA(SEC_ENTRY* INIT_SECURITY_INTERFACE_A)(void); @@ -1153,52 +1116,45 @@ extern "C" #define SECPKG_ATTR_AUTH_NTLM_HASH_CB 1108 #define SECPKG_ATTR_AUTH_NTLM_HASH_CB_DATA 1109 - struct _SecPkgContext_AuthIdentity + typedef struct { char User[256 + 1]; char Domain[256 + 1]; - }; - typedef struct _SecPkgContext_AuthIdentity SecPkgContext_AuthIdentity; + } SecPkgContext_AuthIdentity; - struct _SecPkgContext_AuthPassword + typedef struct { char Password[256 + 1]; - }; - typedef struct _SecPkgContext_AuthPassword SecPkgContext_AuthPassword; + } SecPkgContext_AuthPassword; - struct _SecPkgContext_AuthNtlmHash + typedef struct { int Version; BYTE NtlmHash[16]; - }; - typedef struct _SecPkgContext_AuthNtlmHash SecPkgContext_AuthNtlmHash; + } SecPkgContext_AuthNtlmHash; - struct _SecPkgContext_AuthNtlmTimestamp + typedef struct { BYTE Timestamp[8]; BOOL ChallengeOrResponse; - }; - typedef struct _SecPkgContext_AuthNtlmTimestamp SecPkgContext_AuthNtlmTimestamp; + } SecPkgContext_AuthNtlmTimestamp; - struct _SecPkgContext_AuthNtlmClientChallenge + typedef struct { BYTE ClientChallenge[8]; - }; - typedef struct _SecPkgContext_AuthNtlmClientChallenge SecPkgContext_AuthNtlmClientChallenge; + } SecPkgContext_AuthNtlmClientChallenge; - struct _SecPkgContext_AuthNtlmServerChallenge + typedef struct { BYTE ServerChallenge[8]; - }; - typedef struct _SecPkgContext_AuthNtlmServerChallenge SecPkgContext_AuthNtlmServerChallenge; + } SecPkgContext_AuthNtlmServerChallenge; - struct _SecPkgContext_AuthNtlmMessage + typedef struct { UINT32 type; UINT32 length; BYTE* buffer; - }; - typedef struct _SecPkgContext_AuthNtlmMessage SecPkgContext_AuthNtlmMessage; + } SecPkgContext_AuthNtlmMessage; #define SSPI_INTERFACE_WINPR 0x00000001 #define SSPI_INTERFACE_NATIVE 0x00000002 diff --git a/winpr/include/winpr/sspicli.h b/winpr/include/winpr/sspicli.h index aebd9d7bd..bea9e9a7b 100644 --- a/winpr/include/winpr/sspicli.h +++ b/winpr/include/winpr/sspicli.h @@ -42,7 +42,7 @@ #define LOGON32_PROVIDER_WINNT50 3 #define LOGON32_PROVIDER_VIRTUAL 4 -typedef struct _QUOTA_LIMITS +typedef struct { SIZE_T PagedPoolLimit; SIZE_T NonPagedPoolLimit; diff --git a/winpr/include/winpr/stream.h b/winpr/include/winpr/stream.h index 500ac4e45..db2e6ad40 100644 --- a/winpr/include/winpr/stream.h +++ b/winpr/include/winpr/stream.h @@ -34,9 +34,9 @@ extern "C" { #endif - typedef struct _wStreamPool wStreamPool; + typedef struct s_wStreamPool wStreamPool; - struct _wStream + typedef struct { BYTE* buffer; BYTE* pointer; @@ -47,8 +47,7 @@ extern "C" wStreamPool* pool; BOOL isAllocatedStream; BOOL isOwner; - }; - typedef struct _wStream wStream; + } wStream; static INLINE size_t Stream_Capacity(const wStream* _s); WINPR_API size_t Stream_GetRemainingCapacity(const wStream* _s); diff --git a/winpr/include/winpr/synch.h b/winpr/include/winpr/synch.h index 20b8a3372..aaebb5823 100644 --- a/winpr/include/winpr/synch.h +++ b/winpr/include/winpr/synch.h @@ -129,7 +129,7 @@ extern "C" /* Critical Section */ - typedef struct _RTL_CRITICAL_SECTION + typedef struct { PVOID DebugInfo; LONG LockCount; @@ -202,7 +202,7 @@ extern "C" #define CREATE_WAITABLE_TIMER_MANUAL_RESET 0x00000001 - typedef struct _REASON_CONTEXT + typedef struct { ULONG Version; DWORD Flags; @@ -320,7 +320,7 @@ extern "C" #define RTL_RUN_ONCE_CTX_RESERVED_BITS 2 - typedef struct _RTL_RUN_ONCE + typedef struct { PVOID Ptr; } RTL_RUN_ONCE, *PRTL_RUN_ONCE; @@ -363,7 +363,7 @@ extern "C" #ifdef WINPR_SYNCHRONIZATION_BARRIER - typedef struct _RTL_BARRIER + typedef struct { DWORD Reserved1; DWORD Reserved2; diff --git a/winpr/include/winpr/sysinfo.h b/winpr/include/winpr/sysinfo.h index c14e999d9..aec87d0ea 100644 --- a/winpr/include/winpr/sysinfo.h +++ b/winpr/include/winpr/sysinfo.h @@ -73,9 +73,10 @@ extern "C" #define PROCESSOR_ARM_7TDMI 70001 #define PROCESSOR_OPTIL 0x494F - typedef struct _SYSTEM_INFO + typedef struct { - union { + union + { DWORD dwOemId; struct @@ -99,7 +100,7 @@ extern "C" WINPR_API void GetSystemInfo(LPSYSTEM_INFO lpSystemInfo); WINPR_API void GetNativeSystemInfo(LPSYSTEM_INFO lpSystemInfo); - typedef struct _OSVERSIONINFOA + typedef struct { DWORD dwOSVersionInfoSize; DWORD dwMajorVersion; @@ -109,7 +110,7 @@ extern "C" CHAR szCSDVersion[128]; } OSVERSIONINFOA, *POSVERSIONINFOA, *LPOSVERSIONINFOA; - typedef struct _OSVERSIONINFOW + typedef struct { DWORD dwOSVersionInfoSize; DWORD dwMajorVersion; @@ -119,7 +120,7 @@ extern "C" WCHAR szCSDVersion[128]; } OSVERSIONINFOW, *POSVERSIONINFOW, *LPOSVERSIONINFOW; - typedef struct _OSVERSIONINFOEXA + typedef struct { DWORD dwOSVersionInfoSize; DWORD dwMajorVersion; @@ -134,7 +135,7 @@ extern "C" BYTE wReserved; } OSVERSIONINFOEXA, *POSVERSIONINFOEXA, *LPOSVERSIONINFOEXA; - typedef struct _OSVERSIONINFOEXW + typedef struct { DWORD dwOSVersionInfoSize; DWORD dwMajorVersion; @@ -276,7 +277,7 @@ extern "C" WINPR_API DWORD GetTickCount(void); - typedef enum _COMPUTER_NAME_FORMAT + typedef enum { ComputerNameNetBIOS, ComputerNameDnsHostname, diff --git a/winpr/include/winpr/thread.h b/winpr/include/winpr/thread.h index c7961e90d..2faafb08f 100644 --- a/winpr/include/winpr/thread.h +++ b/winpr/include/winpr/thread.h @@ -33,7 +33,7 @@ extern "C" #ifndef _WIN32 - typedef struct _STARTUPINFOA + typedef struct { DWORD cb; LPSTR lpReserved; @@ -55,7 +55,7 @@ extern "C" HANDLE hStdError; } STARTUPINFOA, *LPSTARTUPINFOA; - typedef struct _STARTUPINFOW + typedef struct { DWORD cb; LPWSTR lpReserved; diff --git a/winpr/include/winpr/timezone.h b/winpr/include/winpr/timezone.h index a2bf0aba1..d1c2f3e2f 100644 --- a/winpr/include/winpr/timezone.h +++ b/winpr/include/winpr/timezone.h @@ -32,7 +32,7 @@ extern "C" #ifndef _WIN32 - typedef struct _TIME_ZONE_INFORMATION + typedef struct { LONG Bias; WCHAR StandardName[32]; @@ -43,7 +43,7 @@ extern "C" LONG DaylightBias; } TIME_ZONE_INFORMATION, *PTIME_ZONE_INFORMATION, *LPTIME_ZONE_INFORMATION; - typedef struct _TIME_DYNAMIC_ZONE_INFORMATION + typedef struct { LONG Bias; WCHAR StandardName[32]; diff --git a/winpr/include/winpr/tools/makecert.h b/winpr/include/winpr/tools/makecert.h index dbb71a8b7..3e3225147 100644 --- a/winpr/include/winpr/tools/makecert.h +++ b/winpr/include/winpr/tools/makecert.h @@ -27,7 +27,7 @@ extern "C" { #endif - typedef struct _MAKECERT_CONTEXT MAKECERT_CONTEXT; + typedef struct S_MAKECERT_CONTEXT MAKECERT_CONTEXT; WINPR_API int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv); diff --git a/winpr/include/winpr/user.h b/winpr/include/winpr/user.h index 558bfdb6f..d819f43f0 100644 --- a/winpr/include/winpr/user.h +++ b/winpr/include/winpr/user.h @@ -180,13 +180,13 @@ typedef struct tagBITMAPINFOHEADER DWORD biClrImportant; } BITMAPINFOHEADER, FAR *LPBITMAPINFOHEADER, *PBITMAPINFOHEADER; -typedef struct tagBITMAPINFO +typedef struct { BITMAPINFOHEADER bmiHeader; RGBQUAD bmiColors[1]; } BITMAPINFO, FAR *LPBITMAPINFO, *PBITMAPINFO; -typedef enum _ORIENTATION_PREFERENCE +typedef enum { ORIENTATION_PREFERENCE_NONE = 0x0, ORIENTATION_PREFERENCE_LANDSCAPE = 0x1, diff --git a/winpr/include/winpr/winsock.h b/winpr/include/winpr/winsock.h index c13d6c7ed..f699d59eb 100644 --- a/winpr/include/winpr/winsock.h +++ b/winpr/include/winpr/winsock.h @@ -178,7 +178,8 @@ struct sockaddr_in6_old IN6_ADDR sin6_addr; }; -typedef union sockaddr_gen { +typedef union sockaddr_gen +{ struct sockaddr Address; struct sockaddr_in AddressIn; struct sockaddr_in6_old AddressIn6; @@ -199,26 +200,25 @@ typedef union sockaddr_gen { #pragma clang diagnostic pop #endif -struct _INTERFACE_INFO +typedef struct { ULONG iiFlags; sockaddr_gen iiAddress; sockaddr_gen iiBroadcastAddress; sockaddr_gen iiNetmask; -}; -typedef struct _INTERFACE_INFO INTERFACE_INFO; +} INTERFACE_INFO; typedef INTERFACE_INFO* LPINTERFACE_INFO; #define MAX_PROTOCOL_CHAIN 7 #define WSAPROTOCOL_LEN 255 -typedef struct _WSAPROTOCOLCHAIN +typedef struct { int ChainLen; DWORD ChainEntries[MAX_PROTOCOL_CHAIN]; } WSAPROTOCOLCHAIN, *LPWSAPROTOCOLCHAIN; -typedef struct _WSAPROTOCOL_INFOA +typedef struct { DWORD dwServiceFlags1; DWORD dwServiceFlags2; @@ -242,7 +242,7 @@ typedef struct _WSAPROTOCOL_INFOA CHAR szProtocol[WSAPROTOCOL_LEN + 1]; } WSAPROTOCOL_INFOA, *LPWSAPROTOCOL_INFOA; -typedef struct _WSAPROTOCOL_INFOW +typedef struct { DWORD dwServiceFlags1; DWORD dwServiceFlags2; diff --git a/winpr/include/winpr/wlog.h b/winpr/include/winpr/wlog.h index 6605c976c..b8bdaf0ef 100644 --- a/winpr/include/winpr/wlog.h +++ b/winpr/include/winpr/wlog.h @@ -64,7 +64,7 @@ extern "C" #define WLOG_APPENDER_JOURNALD 5 #define WLOG_APPENDER_UDP 6 - struct _wLogMessage + typedef struct { DWORD Type; @@ -96,11 +96,10 @@ extern "C" void* PacketData; size_t PacketLength; DWORD PacketFlags; - }; - typedef struct _wLogMessage wLogMessage; - typedef struct _wLogLayout wLogLayout; - typedef struct _wLogAppender wLogAppender; - typedef struct _wLog wLog; + } wLogMessage; + typedef struct s_wLogLayout wLogLayout; + typedef struct s_wLogAppender wLogAppender; + typedef struct s_wLog wLog; #define WLOG_PACKET_INBOUND 1 #define WLOG_PACKET_OUTBOUND 2 @@ -207,14 +206,13 @@ extern "C" typedef BOOL (*wLogCallbackImage_t)(const wLogMessage* msg); typedef BOOL (*wLogCallbackPackage_t)(const wLogMessage* msg); - struct _wLogCallbacks + typedef struct { wLogCallbackData_t data; wLogCallbackImage_t image; wLogCallbackMessage_t message; wLogCallbackPackage_t package; - }; - typedef struct _wLogCallbacks wLogCallbacks; + } wLogCallbacks; #ifdef __cplusplus } diff --git a/winpr/include/winpr/wtsapi.h b/winpr/include/winpr/wtsapi.h index dd1714e93..d8c69fd82 100644 --- a/winpr/include/winpr/wtsapi.h +++ b/winpr/include/winpr/wtsapi.h @@ -317,7 +317,7 @@ typedef HRESULT(VCAPITYPE* PFNVCAPIGETINSTANCE)(REFIID refiid, PULONG pNumObjs, WTS_SECURITY_RESET | WTS_SECURITY_VIRTUAL_CHANNELS | WTS_SECURITY_REMOTE_CONTROL | \ WTS_SECURITY_LOGON | WTS_SECURITY_MESSAGE | WTS_SECURITY_CONNECT | WTS_SECURITY_DISCONNECT) -typedef enum _WTS_CONNECTSTATE_CLASS +typedef enum { WTSActive, WTSConnected, @@ -331,31 +331,31 @@ typedef enum _WTS_CONNECTSTATE_CLASS WTSInit } WTS_CONNECTSTATE_CLASS; -typedef struct _WTS_SERVER_INFOW +typedef struct { LPWSTR pServerName; } WTS_SERVER_INFOW, *PWTS_SERVER_INFOW; -typedef struct _WTS_SERVER_INFOA +typedef struct { LPSTR pServerName; } WTS_SERVER_INFOA, *PWTS_SERVER_INFOA; -typedef struct _WTS_SESSION_INFOW +typedef struct { DWORD SessionId; LPWSTR pWinStationName; WTS_CONNECTSTATE_CLASS State; } WTS_SESSION_INFOW, *PWTS_SESSION_INFOW; -typedef struct _WTS_SESSION_INFOA +typedef struct { DWORD SessionId; LPSTR pWinStationName; WTS_CONNECTSTATE_CLASS State; } WTS_SESSION_INFOA, *PWTS_SESSION_INFOA; -typedef struct _WTS_SESSION_INFO_1W +typedef struct { DWORD ExecEnvId; WTS_CONNECTSTATE_CLASS State; @@ -367,7 +367,7 @@ typedef struct _WTS_SESSION_INFO_1W LPWSTR pFarmName; } WTS_SESSION_INFO_1W, *PWTS_SESSION_INFO_1W; -typedef struct _WTS_SESSION_INFO_1A +typedef struct { DWORD ExecEnvId; WTS_CONNECTSTATE_CLASS State; @@ -379,7 +379,7 @@ typedef struct _WTS_SESSION_INFO_1A LPSTR pFarmName; } WTS_SESSION_INFO_1A, *PWTS_SESSION_INFO_1A; -typedef struct _WTS_PROCESS_INFOW +typedef struct { DWORD SessionId; DWORD ProcessId; @@ -387,7 +387,7 @@ typedef struct _WTS_PROCESS_INFOW PSID pUserSid; } WTS_PROCESS_INFOW, *PWTS_PROCESS_INFOW; -typedef struct _WTS_PROCESS_INFOA +typedef struct { DWORD SessionId; DWORD ProcessId; @@ -399,7 +399,7 @@ typedef struct _WTS_PROCESS_INFOA #define WTS_PROTOCOL_TYPE_ICA 1 #define WTS_PROTOCOL_TYPE_RDP 2 -typedef enum _WTS_INFO_CLASS +typedef enum { WTSInitialProgram, WTSApplicationName, @@ -433,7 +433,7 @@ typedef enum _WTS_INFO_CLASS WTSIsRemoteSession } WTS_INFO_CLASS; -typedef struct _WTSCONFIGINFOW +typedef struct { ULONG version; ULONG fConnectClientDrivesAtLogon; @@ -448,7 +448,7 @@ typedef struct _WTSCONFIGINFOW WCHAR ApplicationName[MAX_PATH + 1]; } WTSCONFIGINFOW, *PWTSCONFIGINFOW; -typedef struct _WTSCONFIGINFOA +typedef struct { ULONG version; ULONG fConnectClientDrivesAtLogon; @@ -463,7 +463,7 @@ typedef struct _WTSCONFIGINFOA CHAR ApplicationName[MAX_PATH + 1]; } WTSCONFIGINFOA, *PWTSCONFIGINFOA; -typedef struct _WTSINFOW +typedef struct { WTS_CONNECTSTATE_CLASS State; DWORD SessionId; @@ -483,7 +483,7 @@ typedef struct _WTSINFOW LARGE_INTEGER _CurrentTime; /* Conflicts with X11 headers */ } WTSINFOW, *PWTSINFOW; -typedef struct _WTSINFOA +typedef struct { WTS_CONNECTSTATE_CLASS State; DWORD SessionId; @@ -507,7 +507,7 @@ typedef struct _WTSINFOA #define WTS_SESSIONSTATE_LOCK 0x00000000 #define WTS_SESSIONSTATE_UNLOCK 0x00000001 -typedef struct _WTSINFOEX_LEVEL1_W +typedef struct { ULONG SessionId; WTS_CONNECTSTATE_CLASS SessionState; @@ -528,7 +528,7 @@ typedef struct _WTSINFOEX_LEVEL1_W DWORD OutgoingCompressedBytes; } WTSINFOEX_LEVEL1_W, *PWTSINFOEX_LEVEL1_W; -typedef struct _WTSINFOEX_LEVEL1_A +typedef struct { ULONG SessionId; WTS_CONNECTSTATE_CLASS SessionState; @@ -549,27 +549,29 @@ typedef struct _WTSINFOEX_LEVEL1_A DWORD OutgoingCompressedBytes; } WTSINFOEX_LEVEL1_A, *PWTSINFOEX_LEVEL1_A; -typedef union _WTSINFOEX_LEVEL_W { +typedef union +{ WTSINFOEX_LEVEL1_W WTSInfoExLevel1; } WTSINFOEX_LEVEL_W, *PWTSINFOEX_LEVEL_W; -typedef union _WTSINFOEX_LEVEL_A { +typedef union +{ WTSINFOEX_LEVEL1_A WTSInfoExLevel1; } WTSINFOEX_LEVEL_A, *PWTSINFOEX_LEVEL_A; -typedef struct _WTSINFOEXW +typedef struct { DWORD Level; WTSINFOEX_LEVEL_W Data; } WTSINFOEXW, *PWTSINFOEXW; -typedef struct _WTSINFOEXA +typedef struct { DWORD Level; WTSINFOEX_LEVEL_A Data; } WTSINFOEXA, *PWTSINFOEXA; -typedef struct _WTSCLIENTW +typedef struct { WCHAR ClientName[CLIENTNAME_LENGTH + 1]; WCHAR Domain[DOMAIN_LENGTH + 1]; @@ -592,7 +594,7 @@ typedef struct _WTSCLIENTW WCHAR DeviceId[MAX_PATH + 1]; } WTSCLIENTW, *PWTSCLIENTW; -typedef struct _WTSCLIENTA +typedef struct { CHAR ClientName[CLIENTNAME_LENGTH + 1]; CHAR Domain[DOMAIN_LENGTH + 1]; @@ -618,13 +620,13 @@ typedef struct _WTSCLIENTA #define PRODUCTINFO_COMPANYNAME_LENGTH 256 #define PRODUCTINFO_PRODUCTID_LENGTH 4 -typedef struct _WTS_PRODUCT_INFOA +typedef struct { CHAR CompanyName[PRODUCTINFO_COMPANYNAME_LENGTH]; CHAR ProductID[PRODUCTINFO_PRODUCTID_LENGTH]; } PRODUCT_INFOA; -typedef struct _WTS_PRODUCT_INFOW +typedef struct { WCHAR CompanyName[PRODUCTINFO_COMPANYNAME_LENGTH]; WCHAR ProductID[PRODUCTINFO_PRODUCTID_LENGTH]; @@ -633,7 +635,7 @@ typedef struct _WTS_PRODUCT_INFOW #define VALIDATIONINFORMATION_LICENSE_LENGTH 16384 #define VALIDATIONINFORMATION_HARDWAREID_LENGTH 20 -typedef struct _WTS_VALIDATION_INFORMATIONA +typedef struct { PRODUCT_INFOA ProductInfo; BYTE License[VALIDATIONINFORMATION_LICENSE_LENGTH]; @@ -642,7 +644,7 @@ typedef struct _WTS_VALIDATION_INFORMATIONA DWORD HardwareIDLength; } WTS_VALIDATION_INFORMATIONA, *PWTS_VALIDATION_INFORMATIONA; -typedef struct _WTS_VALIDATION_INFORMATIONW +typedef struct { PRODUCT_INFOW ProductInfo; BYTE License[VALIDATIONINFORMATION_LICENSE_LENGTH]; @@ -651,20 +653,20 @@ typedef struct _WTS_VALIDATION_INFORMATIONW DWORD HardwareIDLength; } WTS_VALIDATION_INFORMATIONW, *PWTS_VALIDATION_INFORMATIONW; -typedef struct _WTS_CLIENT_ADDRESS +typedef struct { DWORD AddressFamily; BYTE Address[20]; } WTS_CLIENT_ADDRESS, *PWTS_CLIENT_ADDRESS; -typedef struct _WTS_CLIENT_DISPLAY +typedef struct { DWORD HorizontalResolution; DWORD VerticalResolution; DWORD ColorDepth; } WTS_CLIENT_DISPLAY, *PWTS_CLIENT_DISPLAY; -typedef enum _WTS_CONFIG_CLASS +typedef enum { WTSUserConfigInitialProgram, WTSUserConfigWorkingDirectory, @@ -688,12 +690,12 @@ typedef enum _WTS_CONFIG_CLASS WTSUserConfigUser } WTS_CONFIG_CLASS; -typedef enum _WTS_CONFIG_SOURCE +typedef enum { WTSUserConfigSourceSAM } WTS_CONFIG_SOURCE; -typedef struct _WTSUSERCONFIGA +typedef struct { DWORD Source; DWORD InheritInitialProgram; @@ -715,7 +717,7 @@ typedef struct _WTSUSERCONFIGA CHAR TerminalServerHomeDirDrive[WTS_DRIVE_LENGTH + 1]; } WTSUSERCONFIGA, *PWTSUSERCONFIGA; -typedef struct _WTSUSERCONFIGW +typedef struct { DWORD Source; DWORD InheritInitialProgram; @@ -754,7 +756,7 @@ typedef struct _WTSUSERCONFIGW #define REMOTECONTROL_KBDCTRL_HOTKEY 0x2 #define REMOTECONTROL_KBDALT_HOTKEY 0x4 -typedef enum _WTS_VIRTUAL_CLASS +typedef enum { WTSVirtualClientData, WTSVirtualFileHandle, @@ -762,7 +764,7 @@ typedef enum _WTS_VIRTUAL_CLASS WTSVirtualChannelReady /* Extended */ } WTS_VIRTUAL_CLASS; -typedef struct _WTS_SESSION_ADDRESS +typedef struct { DWORD AddressFamily; BYTE Address[20]; @@ -781,7 +783,7 @@ typedef struct _WTS_SESSION_ADDRESS #define WTS_PROCESS_INFO_LEVEL_0 0 #define WTS_PROCESS_INFO_LEVEL_1 1 -typedef struct _WTS_PROCESS_INFO_EXW +typedef struct { DWORD SessionId; DWORD ProcessId; @@ -797,7 +799,7 @@ typedef struct _WTS_PROCESS_INFO_EXW LARGE_INTEGER KernelTime; } WTS_PROCESS_INFO_EXW, *PWTS_PROCESS_INFO_EXW; -typedef struct _WTS_PROCESS_INFO_EXA +typedef struct { DWORD SessionId; DWORD ProcessId; @@ -813,7 +815,7 @@ typedef struct _WTS_PROCESS_INFO_EXA LARGE_INTEGER KernelTime; } WTS_PROCESS_INFO_EXA, *PWTS_PROCESS_INFO_EXA; -typedef enum _WTS_TYPE_CLASS +typedef enum { WTSTypeProcessInfoLevel0, WTSTypeProcessInfoLevel1, @@ -825,7 +827,7 @@ typedef WTSLISTENERNAMEW* PWTSLISTENERNAMEW; typedef CHAR WTSLISTENERNAMEA[WTS_LISTENER_NAME_LENGTH + 1]; typedef WTSLISTENERNAMEA* PWTSLISTENERNAMEA; -typedef struct _WTSLISTENERCONFIGW +typedef struct { ULONG version; ULONG fEnableListener; @@ -860,7 +862,7 @@ typedef struct _WTSLISTENERCONFIGW WCHAR InitialProgram[MAX_PATH + 1]; } WTSLISTENERCONFIGW, *PWTSLISTENERCONFIGW; -typedef struct _WTSLISTENERCONFIGA +typedef struct { ULONG version; ULONG fEnableListener; @@ -1414,7 +1416,7 @@ typedef BOOL(WINAPI* WTS_LOGON_USER_FN)(HANDLE hServer, LPCSTR username, LPCSTR typedef BOOL(WINAPI* WTS_LOGOFF_USER_FN)(HANDLE hServer); -struct _WtsApiFunctionTable +typedef struct { DWORD dwVersion; DWORD dwFlags; @@ -1486,8 +1488,7 @@ struct _WtsApiFunctionTable WTS_LOGOFF_USER_FN pLogoffUser; WTS_START_REMOTE_CONTROL_SESSION_EX_FN_W pStartRemoteControlSessionExW; WTS_START_REMOTE_CONTROL_SESSION_EX_FN_A pStartRemoteControlSessionExA; -}; -typedef struct _WtsApiFunctionTable WtsApiFunctionTable; +} WtsApiFunctionTable; typedef WtsApiFunctionTable* PWtsApiFunctionTable; typedef const WtsApiFunctionTable*(CDECL* INIT_WTSAPI_FN)(void); diff --git a/winpr/libwinpr/clipboard/clipboard.h b/winpr/libwinpr/clipboard/clipboard.h index c50c08fec..8c99bf90f 100644 --- a/winpr/libwinpr/clipboard/clipboard.h +++ b/winpr/libwinpr/clipboard/clipboard.h @@ -24,25 +24,22 @@ #include -typedef struct _wClipboardFormat wClipboardFormat; -typedef struct _wClipboardSynthesizer wClipboardSynthesizer; +typedef struct +{ + UINT32 syntheticId; + CLIPBOARD_SYNTHESIZE_FN pfnSynthesize; +} wClipboardSynthesizer; -struct _wClipboardFormat +typedef struct { UINT32 formatId; char* formatName; UINT32 numSynthesizers; wClipboardSynthesizer* synthesizers; -}; +} wClipboardFormat; -struct _wClipboardSynthesizer -{ - UINT32 syntheticId; - CLIPBOARD_SYNTHESIZE_FN pfnSynthesize; -}; - -struct _wClipboard +struct s_wClipboard { UINT64 ownerId; diff --git a/winpr/libwinpr/comm/comm_ioctl.h b/winpr/libwinpr/comm/comm_ioctl.h index 955e03419..6467a4313 100644 --- a/winpr/libwinpr/comm/comm_ioctl.h +++ b/winpr/libwinpr/comm/comm_ioctl.h @@ -55,12 +55,12 @@ extern "C" #define MARK_PARITY 3 #define SPACE_PARITY 4 - typedef struct _SERIAL_BAUD_RATE + typedef struct { ULONG BaudRate; } SERIAL_BAUD_RATE, *PSERIAL_BAUD_RATE; - typedef struct _SERIAL_CHARS + typedef struct { UCHAR EofChar; UCHAR ErrorChar; @@ -70,14 +70,14 @@ extern "C" UCHAR XoffChar; } SERIAL_CHARS, *PSERIAL_CHARS; - typedef struct _SERIAL_LINE_CONTROL + typedef struct { UCHAR StopBits; UCHAR Parity; UCHAR WordLength; } SERIAL_LINE_CONTROL, *PSERIAL_LINE_CONTROL; - typedef struct _SERIAL_HANDFLOW + typedef struct { ULONG ControlHandShake; ULONG FlowReplace; @@ -123,7 +123,7 @@ extern "C" #define SERIAL_SP_TELNET ((ULONG)0x00000102) #define SERIAL_SP_X25 ((ULONG)0x00000103) - typedef struct _SERIAL_TIMEOUTS + typedef struct { ULONG ReadIntervalTimeout; ULONG ReadTotalTimeoutMultiplier; @@ -141,7 +141,7 @@ extern "C" #define SERIAL_MSR_RI 0x40 #define SERIAL_MSR_DCD 0x80 - typedef struct _SERIAL_QUEUE_SIZE + typedef struct { ULONG InSize; ULONG OutSize; @@ -152,7 +152,7 @@ extern "C" #define SERIAL_PURGE_TXCLEAR 0x00000004 #define SERIAL_PURGE_RXCLEAR 0x00000008 - typedef struct _SERIAL_STATUS + typedef struct { ULONG Errors; ULONG HoldReasons; @@ -188,7 +188,7 @@ extern "C" * * FIXME: better have to use input and output buffers for all functions? */ - typedef struct _SERIAL_DRIVER + typedef struct { SERIAL_DRIVER_ID id; TCHAR* name; diff --git a/winpr/libwinpr/crypto/crypto.h b/winpr/libwinpr/crypto/crypto.h index ddf1c38b2..c5ec0dd9b 100644 --- a/winpr/libwinpr/crypto/crypto.h +++ b/winpr/libwinpr/crypto/crypto.h @@ -22,7 +22,7 @@ #ifndef _WIN32 -struct _WINPR_PROTECTED_MEMORY_BLOCK +typedef struct { BYTE* pData; DWORD cbData; @@ -30,15 +30,13 @@ struct _WINPR_PROTECTED_MEMORY_BLOCK BYTE key[32]; BYTE iv[32]; BYTE salt[8]; -}; -typedef struct _WINPR_PROTECTED_MEMORY_BLOCK WINPR_PROTECTED_MEMORY_BLOCK; +} WINPR_PROTECTED_MEMORY_BLOCK; -struct _WINPR_CERTSTORE +typedef struct { LPCSTR lpszStoreProvider; DWORD dwMsgAndCertEncodingType; -}; -typedef struct _WINPR_CERTSTORE WINPR_CERTSTORE; +} WINPR_CERTSTORE; #endif diff --git a/winpr/libwinpr/file/generic.c b/winpr/libwinpr/file/generic.c index cf89b1362..063a5196b 100644 --- a/winpr/libwinpr/file/generic.c +++ b/winpr/libwinpr/file/generic.c @@ -848,14 +848,13 @@ BOOL WINAPI SetFileTime(HANDLE hFile, const FILETIME* lpCreationTime, return FALSE; } -struct _WIN32_FILE_SEARCH +typedef struct { DIR* pDir; LPSTR lpPath; LPSTR lpPattern; struct dirent* pDirent; -}; -typedef struct _WIN32_FILE_SEARCH WIN32_FILE_SEARCH; +} WIN32_FILE_SEARCH; static BOOL FindDataFromStat(const char* path, const struct stat* fileStat, LPWIN32_FIND_DATAA lpFindFileData) diff --git a/winpr/libwinpr/handle/handle.h b/winpr/libwinpr/handle/handle.h index c97a97441..3c2c32faf 100644 --- a/winpr/libwinpr/handle/handle.h +++ b/winpr/libwinpr/handle/handle.h @@ -84,7 +84,7 @@ typedef BOOL (*pcUnlockFileEx)(HANDLE hFile, DWORD dwReserved, DWORD nNumberOfBy typedef BOOL (*pcSetFileTime)(HANDLE hFile, const FILETIME* lpCreationTime, const FILETIME* lpLastAccessTime, const FILETIME* lpLastWriteTime); -typedef struct _HANDLE_OPS +typedef struct { pcIsHandled IsHandled; pcCloseHandle CloseHandle; diff --git a/winpr/libwinpr/input/virtualkey.c b/winpr/libwinpr/input/virtualkey.c index c4548b514..380bf55da 100644 --- a/winpr/libwinpr/input/virtualkey.c +++ b/winpr/libwinpr/input/virtualkey.c @@ -29,12 +29,11 @@ * Virtual Key Codes */ -struct _VIRTUAL_KEY_CODE +typedef struct { DWORD code; /* Windows Virtual Key Code */ const char* name; /* Virtual Key Code Name */ -}; -typedef struct _VIRTUAL_KEY_CODE VIRTUAL_KEY_CODE; +} VIRTUAL_KEY_CODE; static const VIRTUAL_KEY_CODE VIRTUAL_KEY_CODE_TABLE[256] = { { 0, NULL }, @@ -295,12 +294,11 @@ static const VIRTUAL_KEY_CODE VIRTUAL_KEY_CODE_TABLE[256] = { { 0, NULL } }; -struct _XKB_KEYNAME +typedef struct { const char* name; DWORD vkcode; -}; -typedef struct _XKB_KEYNAME XKB_KEYNAME; +} XKB_KEYNAME; static XKB_KEYNAME XKB_KEYNAME_TABLE[] = { { "BKSP", VK_BACK }, diff --git a/winpr/libwinpr/interlocked/test/TestInterlockedDList.c b/winpr/libwinpr/interlocked/test/TestInterlockedDList.c index 0b8338837..043038058 100644 --- a/winpr/libwinpr/interlocked/test/TestInterlockedDList.c +++ b/winpr/libwinpr/interlocked/test/TestInterlockedDList.c @@ -4,7 +4,7 @@ #include #include -typedef struct _LIST_ITEM +typedef struct { WINPR_LIST_ENTRY ItemEntry; ULONG Signature; diff --git a/winpr/libwinpr/interlocked/test/TestInterlockedSList.c b/winpr/libwinpr/interlocked/test/TestInterlockedSList.c index 61fdb8135..e3d5e1d70 100644 --- a/winpr/libwinpr/interlocked/test/TestInterlockedSList.c +++ b/winpr/libwinpr/interlocked/test/TestInterlockedSList.c @@ -4,7 +4,7 @@ #include #include -typedef struct _PROGRAM_ITEM +typedef struct { WINPR_SLIST_ENTRY ItemEntry; ULONG Signature; diff --git a/winpr/libwinpr/io/io.h b/winpr/libwinpr/io/io.h index e077b2c3d..17d001395 100644 --- a/winpr/libwinpr/io/io.h +++ b/winpr/libwinpr/io/io.h @@ -26,13 +26,11 @@ #include "../handle/handle.h" -typedef struct _DEVICE_OBJECT_EX DEVICE_OBJECT_EX; - -struct _DEVICE_OBJECT_EX +typedef struct { char* DeviceName; char* DeviceFileName; -}; +} DEVICE_OBJECT_EX; #endif diff --git a/winpr/libwinpr/pipe/pipe.c b/winpr/libwinpr/pipe/pipe.c index f8222d7a9..021e37650 100644 --- a/winpr/libwinpr/pipe/pipe.c +++ b/winpr/libwinpr/pipe/pipe.c @@ -73,7 +73,7 @@ static wArrayList* g_NamedPipeServerSockets = NULL; -typedef struct _NamedPipeServerSocketEntry +typedef struct { char* name; int serverfd; diff --git a/winpr/libwinpr/pool/pool.h b/winpr/libwinpr/pool/pool.h index af8641164..fbf48a823 100644 --- a/winpr/libwinpr/pool/pool.h +++ b/winpr/libwinpr/pool/pool.h @@ -20,11 +20,14 @@ #ifndef WINPR_POOL_PRIVATE_H #define WINPR_POOL_PRIVATE_H +#include #include #include #include #include +#if defined(_WIN32) +#if (_WIN32_WINNT < _WIN32_WINNT_WIN6) struct _TP_CALLBACK_INSTANCE { PTP_WORK Work; @@ -64,14 +67,56 @@ struct _TP_IO struct _TP_CLEANUP_GROUP { -#ifndef _WIN32 + void* dummy; +}; + +#endif +#else +struct S_TP_CALLBACK_INSTANCE +{ + PTP_WORK Work; +}; + +struct S_TP_POOL +{ + DWORD Minimum; + DWORD Maximum; + wArrayList* Threads; + wQueue* PendingQueue; + HANDLE TerminateEvent; + wCountdownEvent* WorkComplete; +}; + +struct S_TP_WORK +{ + PVOID CallbackParameter; + PTP_WORK_CALLBACK WorkCallback; + PTP_CALLBACK_ENVIRON CallbackEnvironment; +}; + +struct S_TP_TIMER +{ + void* dummy; +}; + +struct S_TP_WAIT +{ + void* dummy; +}; + +struct S_TP_IO +{ + void* dummy; +}; + +struct S_TP_CLEANUP_GROUP +{ wArrayList* groups; PTP_CALLBACK_ENVIRON env; -#else - void* dummy; -#endif }; +#endif + PTP_POOL GetDefaultThreadpool(void); #endif /* WINPR_POOL_PRIVATE_H */ diff --git a/winpr/libwinpr/pool/work.c b/winpr/libwinpr/pool/work.c index 87f9bf538..434a085ca 100644 --- a/winpr/libwinpr/pool/work.c +++ b/winpr/libwinpr/pool/work.c @@ -66,7 +66,6 @@ static TP_CALLBACK_ENVIRON DEFAULT_CALLBACK_ENVIRONMENT = { NULL, /* CleanupGroup */ NULL, /* CleanupGroupCancelCallback */ NULL, /* RaceDll */ - NULL, /* ActivationContext */ NULL, /* FinalizationCallback */ { 0 } /* Flags */ }; diff --git a/winpr/libwinpr/registry/registry_reg.h b/winpr/libwinpr/registry/registry_reg.h index ab3b34f3b..8bbb0a6f6 100644 --- a/winpr/libwinpr/registry/registry_reg.h +++ b/winpr/libwinpr/registry/registry_reg.h @@ -21,11 +21,11 @@ #include -typedef struct _reg Reg; -typedef struct _reg_key RegKey; -typedef struct _reg_val RegVal; +typedef struct s_reg Reg; +typedef struct s_reg_key RegKey; +typedef struct s_reg_val RegVal; -struct _reg +struct s_reg { FILE* fp; char* line; @@ -37,7 +37,7 @@ struct _reg RegKey* root_key; }; -struct _reg_val +struct s_reg_val { char* name; DWORD type; @@ -51,7 +51,7 @@ struct _reg_val } data; }; -struct _reg_key +struct s_reg_key { char* name; DWORD type; diff --git a/winpr/libwinpr/smartcard/smartcard_pcsc.c b/winpr/libwinpr/smartcard/smartcard_pcsc.c index 82dafcbc9..a12c33b85 100644 --- a/winpr/libwinpr/smartcard/smartcard_pcsc.c +++ b/winpr/libwinpr/smartcard/smartcard_pcsc.c @@ -159,7 +159,7 @@ typedef PCSC_LONG (*fnPCSCSCardGetAttrib)(SCARDHANDLE hCard, PCSC_DWORD dwAttrId typedef PCSC_LONG (*fnPCSCSCardSetAttrib)(SCARDHANDLE hCard, PCSC_DWORD dwAttrId, LPCBYTE pbAttr, PCSC_DWORD cbAttrLen); -struct _PCSCFunctionTable +typedef struct { fnPCSCSCardEstablishContext pfnSCardEstablishContext; fnPCSCSCardReleaseContext pfnSCardReleaseContext; @@ -179,11 +179,7 @@ struct _PCSCFunctionTable fnPCSCSCardCancel pfnSCardCancel; fnPCSCSCardGetAttrib pfnSCardGetAttrib; fnPCSCSCardSetAttrib pfnSCardSetAttrib; -}; -typedef struct _PCSCFunctionTable PCSCFunctionTable; - -typedef struct _PCSC_SCARDCONTEXT PCSC_SCARDCONTEXT; -typedef struct _PCSC_SCARDHANDLE PCSC_SCARDHANDLE; +} PCSCFunctionTable; typedef struct { @@ -192,7 +188,7 @@ typedef struct BYTE* data; } PCSC_CACHE_ITEM; -struct _PCSC_SCARDCONTEXT +typedef struct { SCARDHANDLE owner; CRITICAL_SECTION lock; @@ -200,13 +196,13 @@ struct _PCSC_SCARDCONTEXT DWORD dwCardHandleCount; BOOL isTransactionLocked; wHashTable* cache; -}; +} PCSC_SCARDCONTEXT; -struct _PCSC_SCARDHANDLE +typedef struct { BOOL shared; SCARDCONTEXT hSharedContext; -}; +} PCSC_SCARDHANDLE; static HMODULE g_PCSCModule = NULL; static PCSCFunctionTable g_PCSC = { 0 }; diff --git a/winpr/libwinpr/sspi/CredSSP/credssp.c b/winpr/libwinpr/sspi/CredSSP/credssp.c index 6e168c1c9..f949fc560 100644 --- a/winpr/libwinpr/sspi/CredSSP/credssp.c +++ b/winpr/libwinpr/sspi/CredSSP/credssp.c @@ -27,7 +27,7 @@ #include "credssp.h" #include "../sspi.h" -#include "../log.h" +#include "../../log.h" #define TAG WINPR_TAG("sspi.CredSSP") diff --git a/winpr/libwinpr/sspi/CredSSP/credssp.h b/winpr/libwinpr/sspi/CredSSP/credssp.h index 00a465e0f..35369de9e 100644 --- a/winpr/libwinpr/sspi/CredSSP/credssp.h +++ b/winpr/libwinpr/sspi/CredSSP/credssp.h @@ -24,11 +24,10 @@ #include "../sspi.h" -struct _CREDSSP_CONTEXT +typedef struct { BOOL server; -}; -typedef struct _CREDSSP_CONTEXT CREDSSP_CONTEXT; +} CREDSSP_CONTEXT; CREDSSP_CONTEXT* credssp_ContextNew(void); void credssp_ContextFree(CREDSSP_CONTEXT* context); diff --git a/winpr/libwinpr/sspi/Kerberos/kerberos.c b/winpr/libwinpr/sspi/Kerberos/kerberos.c index f3a48a2e7..f07805487 100644 --- a/winpr/libwinpr/sspi/Kerberos/kerberos.c +++ b/winpr/libwinpr/sspi/Kerberos/kerberos.c @@ -44,7 +44,7 @@ #include "../../log.h" #define TAG WINPR_TAG("sspi.Kerberos") -struct _KRB_CONTEXT +struct s_KRB_CONTEXT { CtxtHandle context; SSPI_CREDENTIALS* credentials; diff --git a/winpr/libwinpr/sspi/Kerberos/kerberos.h b/winpr/libwinpr/sspi/Kerberos/kerberos.h index 0c18f5f2d..70e66edf7 100644 --- a/winpr/libwinpr/sspi/Kerberos/kerberos.h +++ b/winpr/libwinpr/sspi/Kerberos/kerberos.h @@ -32,7 +32,7 @@ #include #endif -typedef struct _KRB_CONTEXT KRB_CONTEXT; +typedef struct s_KRB_CONTEXT KRB_CONTEXT; extern const SecPkgInfoA KERBEROS_SecPkgInfoA; extern const SecPkgInfoW KERBEROS_SecPkgInfoW; diff --git a/winpr/libwinpr/sspi/NTLM/ntlm.h b/winpr/libwinpr/sspi/NTLM/ntlm.h index 1f24e7962..6b14032cd 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm.h +++ b/winpr/libwinpr/sspi/NTLM/ntlm.h @@ -66,7 +66,7 @@ #define NTLMSSP_NEGOTIATE_OEM 0x00000002 /* B (30) */ #define NTLMSSP_NEGOTIATE_UNICODE 0x00000001 /* A (31) */ -enum _NTLM_STATE +typedef enum { NTLM_STATE_INITIAL, NTLM_STATE_NEGOTIATE, @@ -74,14 +74,14 @@ enum _NTLM_STATE NTLM_STATE_AUTHENTICATE, NTLM_STATE_COMPLETION, NTLM_STATE_FINAL -}; -typedef enum _NTLM_STATE NTLM_STATE; +} NTLM_STATE; #ifdef __MINGW32__ typedef MSV1_0_AVID NTLM_AV_ID; #if __MINGW64_VERSION_MAJOR < 9 -enum { +enum +{ MsvAvTimestamp = MsvAvFlags + 1, MsvAvRestrictions, MsvAvTargetName, @@ -91,7 +91,7 @@ enum { #endif #else -enum _NTLM_AV_ID +typedef enum { MsvAvEOL, MsvAvNbComputerName, @@ -104,16 +104,14 @@ enum _NTLM_AV_ID MsvAvSingleHost, MsvAvTargetName, MsvAvChannelBindings -}; -typedef enum _NTLM_AV_ID NTLM_AV_ID; +} NTLM_AV_ID; #endif /* __MINGW32__ */ -struct _NTLM_AV_PAIR +typedef struct { UINT16 AvId; UINT16 AvLen; -}; -typedef struct _NTLM_AV_PAIR NTLM_AV_PAIR; +} NTLM_AV_PAIR; #define MSV_AV_FLAGS_AUTHENTICATION_CONSTRAINED 0x00000001 #define MSV_AV_FLAGS_MESSAGE_INTEGRITY_CHECK 0x00000002 @@ -126,33 +124,30 @@ typedef struct _NTLM_AV_PAIR NTLM_AV_PAIR; #define WINDOWS_MINOR_VERSION_2 0x02 #define NTLMSSP_REVISION_W2K3 0x0F -struct _NTLM_VERSION_INFO +typedef struct { UINT8 ProductMajorVersion; UINT8 ProductMinorVersion; UINT16 ProductBuild; BYTE Reserved[3]; UINT8 NTLMRevisionCurrent; -}; -typedef struct _NTLM_VERSION_INFO NTLM_VERSION_INFO; +} NTLM_VERSION_INFO; -struct _NTLM_SINGLE_HOST_DATA +typedef struct { UINT32 Size; UINT32 Z4; UINT32 DataPresent; UINT32 CustomData; BYTE MachineID[32]; -}; -typedef struct _NTLM_SINGLE_HOST_DATA NTLM_SINGLE_HOST_DATA; +} NTLM_SINGLE_HOST_DATA; -struct _NTLM_RESPONSE +typedef struct { BYTE Response[24]; -}; -typedef struct _NTLM_RESPONSE NTLM_RESPONSE; +} NTLM_RESPONSE; -struct _NTLMv2_CLIENT_CHALLENGE +typedef struct { UINT8 RespType; UINT8 HiRespType; @@ -163,33 +158,29 @@ struct _NTLMv2_CLIENT_CHALLENGE UINT32 Reserved3; NTLM_AV_PAIR* AvPairs; UINT32 cbAvPairs; -}; -typedef struct _NTLMv2_CLIENT_CHALLENGE NTLMv2_CLIENT_CHALLENGE; +} NTLMv2_CLIENT_CHALLENGE; -struct _NTLMv2_RESPONSE +typedef struct { BYTE Response[16]; NTLMv2_CLIENT_CHALLENGE Challenge; -}; -typedef struct _NTLMv2_RESPONSE NTLMv2_RESPONSE; +} NTLMv2_RESPONSE; -struct _NTLM_MESSAGE_FIELDS +typedef struct { UINT16 Len; UINT16 MaxLen; PBYTE Buffer; UINT32 BufferOffset; -}; -typedef struct _NTLM_MESSAGE_FIELDS NTLM_MESSAGE_FIELDS; +} NTLM_MESSAGE_FIELDS; -struct _NTLM_MESSAGE_HEADER +typedef struct { BYTE Signature[8]; UINT32 MessageType; -}; -typedef struct _NTLM_MESSAGE_HEADER NTLM_MESSAGE_HEADER; +} NTLM_MESSAGE_HEADER; -struct _NTLM_NEGOTIATE_MESSAGE +typedef struct { BYTE Signature[8]; UINT32 MessageType; @@ -197,10 +188,9 @@ struct _NTLM_NEGOTIATE_MESSAGE NTLM_VERSION_INFO Version; NTLM_MESSAGE_FIELDS DomainName; NTLM_MESSAGE_FIELDS Workstation; -}; -typedef struct _NTLM_NEGOTIATE_MESSAGE NTLM_NEGOTIATE_MESSAGE; +} NTLM_NEGOTIATE_MESSAGE; -struct _NTLM_CHALLENGE_MESSAGE +typedef struct { BYTE Signature[8]; UINT32 MessageType; @@ -210,10 +200,9 @@ struct _NTLM_CHALLENGE_MESSAGE NTLM_VERSION_INFO Version; NTLM_MESSAGE_FIELDS TargetName; NTLM_MESSAGE_FIELDS TargetInfo; -}; -typedef struct _NTLM_CHALLENGE_MESSAGE NTLM_CHALLENGE_MESSAGE; +} NTLM_CHALLENGE_MESSAGE; -struct _NTLM_AUTHENTICATE_MESSAGE +typedef struct { BYTE Signature[8]; UINT32 MessageType; @@ -226,10 +215,9 @@ struct _NTLM_AUTHENTICATE_MESSAGE NTLM_MESSAGE_FIELDS NtChallengeResponse; NTLM_MESSAGE_FIELDS EncryptedRandomSessionKey; BYTE MessageIntegrityCheck[16]; -}; -typedef struct _NTLM_AUTHENTICATE_MESSAGE NTLM_AUTHENTICATE_MESSAGE; +} NTLM_AUTHENTICATE_MESSAGE; -struct _NTLM_CONTEXT +typedef struct { BOOL server; BOOL NTLMv2; @@ -292,8 +280,7 @@ struct _NTLM_CONTEXT BYTE ServerSealingKey[16]; psPeerComputeNtlmHash HashCallback; void* HashCallbackArg; -}; -typedef struct _NTLM_CONTEXT NTLM_CONTEXT; +} NTLM_CONTEXT; SECURITY_STATUS ntlm_computeProofValue(NTLM_CONTEXT* ntlm, SecBuffer* ntproof); SECURITY_STATUS ntlm_computeMicValue(NTLM_CONTEXT* ntlm, SecBuffer* micvalue); diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_message.c b/winpr/libwinpr/sspi/NTLM/ntlm_message.c index bbee5b49d..86e644cb4 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_message.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm_message.c @@ -33,7 +33,7 @@ #include "ntlm_message.h" -#include "../log.h" +#include "../../log.h" #define TAG WINPR_TAG("sspi.NTLM") static const char NTLM_SIGNATURE[8] = { 'N', 'T', 'L', 'M', 'S', 'S', 'P', '\0' }; diff --git a/winpr/libwinpr/sspi/Negotiate/negotiate.c b/winpr/libwinpr/sspi/Negotiate/negotiate.c index 51297653c..94b73301c 100644 --- a/winpr/libwinpr/sspi/Negotiate/negotiate.c +++ b/winpr/libwinpr/sspi/Negotiate/negotiate.c @@ -29,7 +29,7 @@ #include "negotiate.h" #include "../sspi.h" -#include "../log.h" +#include "../../log.h" #define TAG WINPR_TAG("negotiate") extern const SecurityFunctionTableA NTLM_SecurityFunctionTableA; diff --git a/winpr/libwinpr/sspi/Negotiate/negotiate.h b/winpr/libwinpr/sspi/Negotiate/negotiate.h index 7887f817f..14becae01 100644 --- a/winpr/libwinpr/sspi/Negotiate/negotiate.h +++ b/winpr/libwinpr/sspi/Negotiate/negotiate.h @@ -26,16 +26,15 @@ #define NTLM_OID "1.3.6.1.4.1.311.2.2.10" -enum _NEGOTIATE_STATE +typedef enum { NEGOTIATE_STATE_INITIAL, NEGOTIATE_STATE_NEGOINIT, NEGOTIATE_STATE_NEGORESP, NEGOTIATE_STATE_FINAL -}; -typedef enum _NEGOTIATE_STATE NEGOTIATE_STATE; +} NEGOTIATE_STATE; -struct _NEGOTIATE_CONTEXT +typedef struct { NEGOTIATE_STATE state; UINT32 NegotiateFlags; @@ -47,8 +46,7 @@ struct _NEGOTIATE_CONTEXT BOOL kerberos; const SecurityFunctionTableA* sspiA; const SecurityFunctionTableW* sspiW; -}; -typedef struct _NEGOTIATE_CONTEXT NEGOTIATE_CONTEXT; +} NEGOTIATE_CONTEXT; extern const SecPkgInfoA NEGOTIATE_SecPkgInfoA; extern const SecPkgInfoW NEGOTIATE_SecPkgInfoW; diff --git a/winpr/libwinpr/sspi/Schannel/schannel.c b/winpr/libwinpr/sspi/Schannel/schannel.c index ee638b18c..4f9c65918 100644 --- a/winpr/libwinpr/sspi/Schannel/schannel.c +++ b/winpr/libwinpr/sspi/Schannel/schannel.c @@ -27,7 +27,7 @@ #include "schannel.h" #include "../sspi.h" -#include "../log.h" +#include "../../log.h" static char* SCHANNEL_PACKAGE_NAME = "Schannel"; diff --git a/winpr/libwinpr/sspi/Schannel/schannel.h b/winpr/libwinpr/sspi/Schannel/schannel.h index 6b110fc3d..76ca18a55 100644 --- a/winpr/libwinpr/sspi/Schannel/schannel.h +++ b/winpr/libwinpr/sspi/Schannel/schannel.h @@ -27,20 +27,18 @@ #include "schannel_openssl.h" -struct _SCHANNEL_CREDENTIALS +typedef struct { SCHANNEL_CRED cred; ULONG fCredentialUse; -}; -typedef struct _SCHANNEL_CREDENTIALS SCHANNEL_CREDENTIALS; +} SCHANNEL_CREDENTIALS; -struct _SCHANNEL_CONTEXT +typedef struct { BOOL server; SCHANNEL_CRED cred; SCHANNEL_OPENSSL* openssl; -}; -typedef struct _SCHANNEL_CONTEXT SCHANNEL_CONTEXT; +} SCHANNEL_CONTEXT; SCHANNEL_CONTEXT* schannel_ContextNew(void); void schannel_ContextFree(SCHANNEL_CONTEXT* context); diff --git a/winpr/libwinpr/sspi/Schannel/schannel_openssl.c b/winpr/libwinpr/sspi/Schannel/schannel_openssl.c index 7b8b00d97..c33084c1f 100644 --- a/winpr/libwinpr/sspi/Schannel/schannel_openssl.c +++ b/winpr/libwinpr/sspi/Schannel/schannel_openssl.c @@ -35,7 +35,7 @@ #include #include -struct _SCHANNEL_OPENSSL +struct S_SCHANNEL_OPENSSL { SSL* ssl; SSL_CTX* ctx; diff --git a/winpr/libwinpr/sspi/Schannel/schannel_openssl.h b/winpr/libwinpr/sspi/Schannel/schannel_openssl.h index ac6207cd9..589b2a497 100644 --- a/winpr/libwinpr/sspi/Schannel/schannel_openssl.h +++ b/winpr/libwinpr/sspi/Schannel/schannel_openssl.h @@ -27,7 +27,7 @@ /* OpenSSL includes windows.h */ #include -typedef struct _SCHANNEL_OPENSSL SCHANNEL_OPENSSL; +typedef struct S_SCHANNEL_OPENSSL SCHANNEL_OPENSSL; int schannel_openssl_client_init(SCHANNEL_OPENSSL* context); int schannel_openssl_server_init(SCHANNEL_OPENSSL* context); diff --git a/winpr/libwinpr/sspi/sspi.h b/winpr/libwinpr/sspi/sspi.h index 81c4b60a1..da0860f3f 100644 --- a/winpr/libwinpr/sspi/sspi.h +++ b/winpr/libwinpr/sspi/sspi.h @@ -28,15 +28,14 @@ #define SSPI_CREDENTIALS_HASH_LENGTH_OFFSET 512 -struct _SSPI_CREDENTIALS +typedef struct { DWORD flags; ULONG fCredentialUse; SEC_GET_KEY_FN pGetKeyFn; void* pvGetKeyArgument; SEC_WINNT_AUTH_IDENTITY identity; -}; -typedef struct _SSPI_CREDENTIALS SSPI_CREDENTIALS; +} SSPI_CREDENTIALS; SSPI_CREDENTIALS* sspi_CredentialsNew(void); void sspi_CredentialsFree(SSPI_CREDENTIALS* credentials); diff --git a/winpr/libwinpr/sspi/sspi_gss.h b/winpr/libwinpr/sspi/sspi_gss.h index ffbf2d1be..c1ba903ff 100644 --- a/winpr/libwinpr/sspi/sspi_gss.h +++ b/winpr/libwinpr/sspi/sspi_gss.h @@ -35,13 +35,10 @@ #define SSPI_GSSAPI #define SSPI_GSSOID -struct sspi_gss_name_struct; typedef struct sspi_gss_name_struct* sspi_gss_name_t; -struct sspi_gss_cred_id_struct; typedef struct sspi_gss_cred_id_struct* sspi_gss_cred_id_t; -struct sspi_gss_ctx_id_struct; typedef struct sspi_gss_ctx_id_struct* sspi_gss_ctx_id_t; typedef struct sspi_gss_OID_desc_struct @@ -615,7 +612,7 @@ extern "C" } #endif -struct _GSSAPI_FUNCTION_TABLE +typedef struct { fn_sspi_gss_acquire_cred gss_acquire_cred; fn_sspi_gss_release_cred gss_release_cred; @@ -663,8 +660,7 @@ struct _GSSAPI_FUNCTION_TABLE fn_sspi_gss_pseudo_random gss_pseudo_random; fn_sspi_gss_store_cred gss_store_cred; fn_sspi_gss_set_neg_mechs gss_set_neg_mechs; -}; -typedef struct _GSSAPI_FUNCTION_TABLE GSSAPI_FUNCTION_TABLE; +} GSSAPI_FUNCTION_TABLE; GSSAPI_FUNCTION_TABLE* SEC_ENTRY gssApi_InitSecurityInterface(void); diff --git a/winpr/libwinpr/sspi/sspi_winpr.c b/winpr/libwinpr/sspi/sspi_winpr.c index 94be2c2d8..cef0d1b6d 100644 --- a/winpr/libwinpr/sspi/sspi_winpr.c +++ b/winpr/libwinpr/sspi/sspi_winpr.c @@ -55,19 +55,17 @@ static const SecPkgInfoW* SecPkgInfoW_LIST[] = { &NTLM_SecPkgInfoW, &KERBEROS_Se static SecurityFunctionTableA winpr_SecurityFunctionTableA; static SecurityFunctionTableW winpr_SecurityFunctionTableW; -struct _SecurityFunctionTableA_NAME +typedef struct { const SEC_CHAR* Name; const SecurityFunctionTableA* SecurityFunctionTable; -}; -typedef struct _SecurityFunctionTableA_NAME SecurityFunctionTableA_NAME; +} SecurityFunctionTableA_NAME; -struct _SecurityFunctionTableW_NAME +typedef struct { const SEC_WCHAR* Name; const SecurityFunctionTableW* SecurityFunctionTable; -}; -typedef struct _SecurityFunctionTableW_NAME SecurityFunctionTableW_NAME; +} SecurityFunctionTableW_NAME; static const SecurityFunctionTableA_NAME SecurityFunctionTableA_NAME_LIST[] = { { "NTLM", &NTLM_SecurityFunctionTableA }, @@ -94,20 +92,18 @@ static const SecurityFunctionTableW_NAME SecurityFunctionTableW_NAME_LIST[] = { #define SecHandle_LOWER_MAX 0xFFFFFFFF #define SecHandle_UPPER_MAX 0xFFFFFFFE -struct _CONTEXT_BUFFER_ALLOC_ENTRY +typedef struct { void* contextBuffer; UINT32 allocatorIndex; -}; -typedef struct _CONTEXT_BUFFER_ALLOC_ENTRY CONTEXT_BUFFER_ALLOC_ENTRY; +} CONTEXT_BUFFER_ALLOC_ENTRY; -struct _CONTEXT_BUFFER_ALLOC_TABLE +typedef struct { UINT32 cEntries; UINT32 cMaxEntries; CONTEXT_BUFFER_ALLOC_ENTRY* entries; -}; -typedef struct _CONTEXT_BUFFER_ALLOC_TABLE CONTEXT_BUFFER_ALLOC_TABLE; +} CONTEXT_BUFFER_ALLOC_TABLE; static CONTEXT_BUFFER_ALLOC_TABLE ContextBufferAllocTable = { 0 }; diff --git a/winpr/libwinpr/sspi/test/TestNTLM.c b/winpr/libwinpr/sspi/test/TestNTLM.c index a867feffc..978829e83 100644 --- a/winpr/libwinpr/sspi/test/TestNTLM.c +++ b/winpr/libwinpr/sspi/test/TestNTLM.c @@ -74,7 +74,7 @@ static const BYTE TEST_NTLM_V2_HASH[16] = { 0x4c, 0x7f, 0x70, 0x6f, 0x7d, 0xde, #define NTLM_PACKAGE_NAME NTLM_SSP_NAME -struct _TEST_NTLM_CLIENT +typedef struct { CtxtHandle context; ULONG cbMaxToken; @@ -94,8 +94,7 @@ struct _TEST_NTLM_CLIENT SecPkgInfo* pPackageInfo; SecurityFunctionTable* table; SEC_WINNT_AUTH_IDENTITY identity; -}; -typedef struct _TEST_NTLM_CLIENT TEST_NTLM_CLIENT; +} TEST_NTLM_CLIENT; static int test_ntlm_client_init(TEST_NTLM_CLIENT* ntlm, const char* user, const char* domain, const char* password) @@ -284,7 +283,7 @@ static void test_ntlm_client_free(TEST_NTLM_CLIENT* ntlm) free(ntlm); } -struct _TEST_NTLM_SERVER +typedef struct { CtxtHandle context; ULONG cbMaxToken; @@ -305,8 +304,7 @@ struct _TEST_NTLM_SERVER SecPkgInfo* pPackageInfo; SecurityFunctionTable* table; SEC_WINNT_AUTH_IDENTITY identity; -}; -typedef struct _TEST_NTLM_SERVER TEST_NTLM_SERVER; +} TEST_NTLM_SERVER; static int test_ntlm_server_init(TEST_NTLM_SERVER* ntlm) { diff --git a/winpr/libwinpr/thread/thread.h b/winpr/libwinpr/thread/thread.h index 5a073a554..60f56e6f9 100644 --- a/winpr/libwinpr/thread/thread.h +++ b/winpr/libwinpr/thread/thread.h @@ -62,19 +62,17 @@ struct winpr_thread void* exit_stack; #endif }; -typedef struct winpr_thread WINPR_THREAD; WINPR_THREAD* winpr_GetCurrentThread(VOID); -struct winpr_process +typedef struct { WINPR_HANDLE_DEF(); pid_t pid; int status; DWORD dwExitCode; -}; -typedef struct winpr_process WINPR_PROCESS; +} WINPR_PROCESS; #endif diff --git a/winpr/libwinpr/timezone/TimeZones.h b/winpr/libwinpr/timezone/TimeZones.h index a60854cea..54c9f2d9a 100644 --- a/winpr/libwinpr/timezone/TimeZones.h +++ b/winpr/libwinpr/timezone/TimeZones.h @@ -7,17 +7,16 @@ #include -struct _TIME_ZONE_RULE_ENTRY +typedef struct { UINT64 TicksStart; UINT64 TicksEnd; INT32 DaylightDelta; SYSTEMTIME StandardDate; SYSTEMTIME DaylightDate; -}; -typedef struct _TIME_ZONE_RULE_ENTRY TIME_ZONE_RULE_ENTRY; +} TIME_ZONE_RULE_ENTRY; -struct _TIME_ZONE_ENTRY +typedef struct { const char* Id; INT32 Bias; @@ -27,8 +26,7 @@ struct _TIME_ZONE_ENTRY const char* DaylightName; const TIME_ZONE_RULE_ENTRY* RuleTable; UINT32 RuleTableCount; -}; -typedef struct _TIME_ZONE_ENTRY TIME_ZONE_ENTRY; +} TIME_ZONE_ENTRY; extern const TIME_ZONE_ENTRY TimeZoneTable[]; extern const size_t TimeZoneTableNrElements; diff --git a/winpr/libwinpr/timezone/WindowsZones.h b/winpr/libwinpr/timezone/WindowsZones.h index 2972ee5f0..231c0c66b 100644 --- a/winpr/libwinpr/timezone/WindowsZones.h +++ b/winpr/libwinpr/timezone/WindowsZones.h @@ -6,12 +6,11 @@ #include -struct _WINDOWS_TZID_ENTRY +typedef struct { const char* windows; const char* tzid; -}; -typedef struct _WINDOWS_TZID_ENTRY WINDOWS_TZID_ENTRY; +} WINDOWS_TZID_ENTRY; extern const WINDOWS_TZID_ENTRY WindowsTimeZoneIdTable[]; extern const size_t WindowsTimeZoneIdTableNrElements; diff --git a/winpr/libwinpr/utils/collections/ArrayList.c b/winpr/libwinpr/utils/collections/ArrayList.c index 5f09693ed..b9e9dd8b1 100644 --- a/winpr/libwinpr/utils/collections/ArrayList.c +++ b/winpr/libwinpr/utils/collections/ArrayList.c @@ -31,7 +31,7 @@ #define va_copy(dest, src) (dest = src) #endif -struct _wArrayList +struct s_wArrayList { size_t capacity; size_t growthFactor; diff --git a/winpr/libwinpr/utils/collections/BipBuffer.c b/winpr/libwinpr/utils/collections/BipBuffer.c index 3fd5e9866..3e1a5b701 100644 --- a/winpr/libwinpr/utils/collections/BipBuffer.c +++ b/winpr/libwinpr/utils/collections/BipBuffer.c @@ -27,14 +27,13 @@ #include -struct _wBipBlock +typedef struct { size_t index; size_t size; -}; -typedef struct _wBipBlock wBipBlock; +} wBipBlock; -struct _wBipBuffer +struct s_wBipBuffer { size_t size; BYTE* buffer; diff --git a/winpr/libwinpr/utils/collections/BufferPool.c b/winpr/libwinpr/utils/collections/BufferPool.c index 2f04c4fbe..c32273388 100644 --- a/winpr/libwinpr/utils/collections/BufferPool.c +++ b/winpr/libwinpr/utils/collections/BufferPool.c @@ -27,16 +27,15 @@ /* WARNING: Do not access structs directly, the API will be reworked * to make this opaque. */ -struct _wBufferPoolItem +typedef struct { SSIZE_T size; void* buffer; -}; -typedef struct _wBufferPoolItem wBufferPoolItem; +} wBufferPoolItem; /* WARNING: Do not access structs directly, the API will be reworked * to make this opaque. */ -struct _wBufferPool +struct s_wBufferPool { SSIZE_T fixedSize; DWORD alignment; diff --git a/winpr/libwinpr/utils/collections/HashTable.c b/winpr/libwinpr/utils/collections/HashTable.c index b8b6fb22b..45c1f8507 100644 --- a/winpr/libwinpr/utils/collections/HashTable.c +++ b/winpr/libwinpr/utils/collections/HashTable.c @@ -34,9 +34,9 @@ * http://www.pomakis.com/hashtable/hashtable.h */ -typedef struct _wKeyValuePair wKeyValuePair; +typedef struct s_wKeyValuePair wKeyValuePair; -struct _wKeyValuePair +struct s_wKeyValuePair { void* key; void* value; @@ -45,7 +45,7 @@ struct _wKeyValuePair BOOL markedForRemove; }; -struct _wHashTable +struct s_wHashTable { BOOL synchronized; CRITICAL_SECTION lock; diff --git a/winpr/libwinpr/utils/collections/LinkedList.c b/winpr/libwinpr/utils/collections/LinkedList.c index 8c7d02b5b..97ea14ff4 100644 --- a/winpr/libwinpr/utils/collections/LinkedList.c +++ b/winpr/libwinpr/utils/collections/LinkedList.c @@ -24,16 +24,16 @@ #include #include -typedef struct _wLinkedListItem wLinkedListNode; +typedef struct s_wLinkedListItem wLinkedListNode; -struct _wLinkedListItem +struct s_wLinkedListItem { void* value; wLinkedListNode* prev; wLinkedListNode* next; }; -struct _wLinkedList +struct s_wLinkedList { int count; int initial; diff --git a/winpr/libwinpr/utils/collections/MessageQueue.c b/winpr/libwinpr/utils/collections/MessageQueue.c index 21d3d6ab8..181e46b35 100644 --- a/winpr/libwinpr/utils/collections/MessageQueue.c +++ b/winpr/libwinpr/utils/collections/MessageQueue.c @@ -27,7 +27,7 @@ #include -struct _wMessageQueue +struct s_wMessageQueue { size_t head; size_t tail; diff --git a/winpr/libwinpr/utils/collections/ObjectPool.c b/winpr/libwinpr/utils/collections/ObjectPool.c index abe275187..5d95ff5fa 100644 --- a/winpr/libwinpr/utils/collections/ObjectPool.c +++ b/winpr/libwinpr/utils/collections/ObjectPool.c @@ -26,7 +26,7 @@ #include -struct _wObjectPool +struct s_wObjectPool { size_t size; size_t capacity; diff --git a/winpr/libwinpr/utils/collections/PubSub.c b/winpr/libwinpr/utils/collections/PubSub.c index 306be1bd7..95dd9989f 100644 --- a/winpr/libwinpr/utils/collections/PubSub.c +++ b/winpr/libwinpr/utils/collections/PubSub.c @@ -30,7 +30,7 @@ * http://msdn.microsoft.com/en-us/library/awbftdfh.aspx */ -struct _wPubSub +struct s_wPubSub { CRITICAL_SECTION lock; BOOL synchronized; diff --git a/winpr/libwinpr/utils/collections/Queue.c b/winpr/libwinpr/utils/collections/Queue.c index 59187157a..5febe31ae 100644 --- a/winpr/libwinpr/utils/collections/Queue.c +++ b/winpr/libwinpr/utils/collections/Queue.c @@ -26,7 +26,7 @@ #include -struct _wQueue +struct s_wQueue { size_t capacity; size_t growthFactor; diff --git a/winpr/libwinpr/utils/collections/Stack.c b/winpr/libwinpr/utils/collections/Stack.c index 92fc3b0ca..b8f12e940 100644 --- a/winpr/libwinpr/utils/collections/Stack.c +++ b/winpr/libwinpr/utils/collections/Stack.c @@ -24,7 +24,7 @@ #include #include -struct _wStack +struct s_wStack { size_t size; size_t capacity; diff --git a/winpr/libwinpr/utils/collections/StreamPool.c b/winpr/libwinpr/utils/collections/StreamPool.c index 46edb19fd..b36a6342e 100644 --- a/winpr/libwinpr/utils/collections/StreamPool.c +++ b/winpr/libwinpr/utils/collections/StreamPool.c @@ -28,7 +28,7 @@ #include "../stream.h" -struct _wStreamPool +struct s_wStreamPool { size_t aSize; size_t aCapacity; diff --git a/winpr/libwinpr/utils/corkscrew/map_info.h b/winpr/libwinpr/utils/corkscrew/map_info.h index 5ad6ebe16..dc2275e38 100644 --- a/winpr/libwinpr/utils/corkscrew/map_info.h +++ b/winpr/libwinpr/utils/corkscrew/map_info.h @@ -28,7 +28,7 @@ extern "C" { #endif - typedef struct map_info + typedef struct { struct map_info* next; uintptr_t start; diff --git a/winpr/libwinpr/utils/ini.c b/winpr/libwinpr/utils/ini.c index 1baf77840..f956177ca 100644 --- a/winpr/libwinpr/utils/ini.c +++ b/winpr/libwinpr/utils/ini.c @@ -32,23 +32,21 @@ #include -struct _wIniFileKey +typedef struct { char* name; char* value; -}; -typedef struct _wIniFileKey wIniFileKey; +} wIniFileKey; -struct _wIniFileSection +typedef struct { char* name; size_t nKeys; size_t cKeys; wIniFileKey** keys; -}; -typedef struct _wIniFileSection wIniFileSection; +} wIniFileSection; -struct _wIniFile +struct s_wIniFile { FILE* fp; char* line; diff --git a/winpr/libwinpr/utils/lodepng/lodepng.h b/winpr/libwinpr/utils/lodepng/lodepng.h index ef700aedc..591f8aaf5 100644 --- a/winpr/libwinpr/utils/lodepng/lodepng.h +++ b/winpr/libwinpr/utils/lodepng/lodepng.h @@ -72,7 +72,7 @@ the custom_zlib field of the compress and decompress settings*/ #ifdef LODEPNG_COMPILE_PNG /*The PNG color types (also used for raw).*/ -typedef enum LodePNGColorType +typedef enum { LCT_GREY = 0, /*greyscale: 1,2,4,8,16 bit*/ LCT_RGB = 2, /*RGB: 8,16 bit*/ @@ -245,7 +245,7 @@ Color mode of an image. Contains all information required to decode the pixel bits to RGBA colors. This information is the same as used in the PNG file format, and is used both for PNG and raw image data in LodePNG. */ -typedef struct LodePNGColorMode +typedef struct { /*header (IHDR)*/ LodePNGColorType @@ -326,7 +326,7 @@ size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode* colo #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS /*The information of a Time chunk in PNG.*/ -typedef struct LodePNGTime +typedef struct { unsigned year; /*2 bytes used (0-65535)*/ unsigned month; /*1-12*/ @@ -338,7 +338,7 @@ typedef struct LodePNGTime #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ /*Information about the PNG image, except pixels, width and height.*/ -typedef struct LodePNGInfo +typedef struct { /*header (IHDR), palette (PLTE) and transparency (tRNS) chunks*/ unsigned compression_method; /*compression method of the original file. Always 0.*/ @@ -456,7 +456,7 @@ unsigned lodepng_convert(unsigned char* out, const unsigned char* in, LodePNGCol Settings for the decoder. This contains settings for the PNG and the Zlib decoder, but not the Info settings from the Info structs. */ -typedef struct LodePNGDecoderSettings +typedef struct { LodePNGDecompressSettings zlibsettings; /*in here is the setting to ignore Adler32 checksums*/ @@ -478,7 +478,7 @@ void lodepng_decoder_settings_init(LodePNGDecoderSettings* settings); #ifdef LODEPNG_COMPILE_ENCODER /*automatically use color type with less bits per pixel if losslessly possible. Default: AUTO*/ -typedef enum LodePNGFilterStrategy +typedef enum { /*every filter at zero*/ LFS_ZERO, @@ -499,7 +499,7 @@ typedef enum LodePNGFilterStrategy /*Gives characteristics about the colors of the image, which helps decide which color model to use for encoding. Used internally by default if "auto_convert" is enabled. Public because it's useful for custom algorithms.*/ -typedef struct LodePNGColorProfile +typedef struct { unsigned colored; /*not greyscale*/ unsigned key; /*if true, image is not opaque. Only if true and alpha is false, color key is @@ -526,7 +526,7 @@ unsigned lodepng_auto_choose_color(LodePNGColorMode* mode_out, const unsigned ch unsigned w, unsigned h, const LodePNGColorMode* mode_in); /*Settings for the encoder.*/ -typedef struct LodePNGEncoderSettings +typedef struct { LodePNGCompressSettings zlibsettings; /*settings for the zlib encoder, such as window size, ...*/ @@ -563,7 +563,7 @@ void lodepng_encoder_settings_init(LodePNGEncoderSettings* settings); #if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) /*The settings, state and information for extended encoding and decoding.*/ -typedef struct LodePNGState +typedef struct { #ifdef LODEPNG_COMPILE_DECODER LodePNGDecoderSettings decoder; /*the decoding settings*/ diff --git a/winpr/libwinpr/utils/print.c b/winpr/libwinpr/utils/print.c index 8482950f2..c97a7dddf 100644 --- a/winpr/libwinpr/utils/print.c +++ b/winpr/libwinpr/utils/print.c @@ -29,7 +29,7 @@ #include #include -#include "trio.h" +#include "trio/trio.h" #include "../log.h" diff --git a/winpr/libwinpr/utils/trio/trio.c b/winpr/libwinpr/utils/trio/trio.c index b64b7cd15..966e7bb67 100644 --- a/winpr/libwinpr/utils/trio/trio.c +++ b/winpr/libwinpr/utils/trio/trio.c @@ -834,20 +834,20 @@ typedef struct } trio_custom_t; /* General trio "class" */ -typedef struct _trio_class_t +typedef struct s_trio_class_t { /* * The function to write characters to a stream. */ - void(*OutStream) TRIO_PROTO((struct _trio_class_t*, int)); + void(*OutStream) TRIO_PROTO((struct s_trio_class_t*, int)); /* * The function to read characters from a stream. */ - void(*InStream) TRIO_PROTO((struct _trio_class_t*, int*)); + void(*InStream) TRIO_PROTO((struct s_trio_class_t*, int*)); /* * The function to undo read characters from a stream. */ - void(*UndoStream) TRIO_PROTO((struct _trio_class_t*)); + void(*UndoStream) TRIO_PROTO((struct s_trio_class_t*)); /* * The current location in the stream. */ @@ -883,7 +883,7 @@ typedef struct _trio_class_t } trio_class_t; /* References (for user-defined callbacks) */ -typedef struct _trio_reference_t +typedef struct { trio_class_t* data; trio_parameter_t* parameter; @@ -891,9 +891,9 @@ typedef struct _trio_reference_t #if TRIO_FEATURE_USER_DEFINED /* Registered entries (for user-defined callbacks) */ -typedef struct _trio_userdef_t +typedef struct s_trio_userdef_t { - struct _trio_userdef_t* next; + struct s_trio_userdef_t* next; trio_callback_t callback; char* name; } trio_userdef_t; diff --git a/winpr/libwinpr/utils/trio/triostr.c b/winpr/libwinpr/utils/trio/triostr.c index 6832ad5ae..4d19cbc83 100644 --- a/winpr/libwinpr/utils/trio/triostr.c +++ b/winpr/libwinpr/utils/trio/triostr.c @@ -145,7 +145,7 @@ * Structures */ -struct _trio_string_t +struct s_trio_string_t { char* content; size_t length; diff --git a/winpr/libwinpr/utils/trio/triostr.h b/winpr/libwinpr/utils/trio/triostr.h index 3e967ca73..585fff991 100644 --- a/winpr/libwinpr/utils/trio/triostr.h +++ b/winpr/libwinpr/utils/trio/triostr.h @@ -389,7 +389,7 @@ extern "C" * Opaque type for dynamic strings */ - typedef struct _trio_string_t trio_string_t; + typedef struct s_trio_string_t trio_string_t; #if defined(TRIO_FUNC_STRING_APPEND) TRIO_PUBLIC_STRING int trio_string_append TRIO_PROTO((trio_string_t * self, diff --git a/winpr/libwinpr/utils/wlog/BinaryAppender.c b/winpr/libwinpr/utils/wlog/BinaryAppender.c index 822a9b393..fcf343e2b 100644 --- a/winpr/libwinpr/utils/wlog/BinaryAppender.c +++ b/winpr/libwinpr/utils/wlog/BinaryAppender.c @@ -30,7 +30,7 @@ #include #include -struct _wLogBinaryAppender +typedef struct { WLOG_APPENDER_COMMON(); @@ -38,8 +38,7 @@ struct _wLogBinaryAppender char* FilePath; char* FullFileName; FILE* FileDescriptor; -}; -typedef struct _wLogBinaryAppender wLogBinaryAppender; +} wLogBinaryAppender; static BOOL WLog_BinaryAppender_Open(wLog* log, wLogAppender* appender) { diff --git a/winpr/libwinpr/utils/wlog/CallbackAppender.c b/winpr/libwinpr/utils/wlog/CallbackAppender.c index 5d4b090d1..0ddef2a99 100644 --- a/winpr/libwinpr/utils/wlog/CallbackAppender.c +++ b/winpr/libwinpr/utils/wlog/CallbackAppender.c @@ -23,13 +23,12 @@ #include "CallbackAppender.h" -struct _wLogCallbackAppender +typedef struct { WLOG_APPENDER_COMMON(); wLogCallbacks* callbacks; -}; -typedef struct _wLogCallbackAppender wLogCallbackAppender; +} wLogCallbackAppender; static BOOL WLog_CallbackAppender_Open(wLog* log, wLogAppender* appender) { diff --git a/winpr/libwinpr/utils/wlog/ConsoleAppender.c b/winpr/libwinpr/utils/wlog/ConsoleAppender.c index e39dfaf53..96b4176f6 100644 --- a/winpr/libwinpr/utils/wlog/ConsoleAppender.c +++ b/winpr/libwinpr/utils/wlog/ConsoleAppender.c @@ -33,13 +33,12 @@ #define WLOG_CONSOLE_STDERR 2 #define WLOG_CONSOLE_DEBUG 4 -struct _wLogConsoleAppender +typedef struct { WLOG_APPENDER_COMMON(); int outputStream; -}; -typedef struct _wLogConsoleAppender wLogConsoleAppender; +} wLogConsoleAppender; static BOOL WLog_ConsoleAppender_Open(wLog* log, wLogAppender* appender) { diff --git a/winpr/libwinpr/utils/wlog/DataMessage.c b/winpr/libwinpr/utils/wlog/DataMessage.c index 34d519626..0dd7b0a67 100644 --- a/winpr/libwinpr/utils/wlog/DataMessage.c +++ b/winpr/libwinpr/utils/wlog/DataMessage.c @@ -23,7 +23,7 @@ #include "wlog.h" -#include "wlog/DataMessage.h" +#include "DataMessage.h" #include diff --git a/winpr/libwinpr/utils/wlog/FileAppender.c b/winpr/libwinpr/utils/wlog/FileAppender.c index 8303826b3..97b8ba870 100644 --- a/winpr/libwinpr/utils/wlog/FileAppender.c +++ b/winpr/libwinpr/utils/wlog/FileAppender.c @@ -29,7 +29,7 @@ #include #include -struct _wLogFileAppender +typedef struct { WLOG_APPENDER_COMMON(); @@ -37,8 +37,7 @@ struct _wLogFileAppender char* FilePath; char* FullFileName; FILE* FileDescriptor; -}; -typedef struct _wLogFileAppender wLogFileAppender; +} wLogFileAppender; static BOOL WLog_FileAppender_SetOutputFileName(wLogFileAppender* appender, const char* filename) { diff --git a/winpr/libwinpr/utils/wlog/ImageMessage.c b/winpr/libwinpr/utils/wlog/ImageMessage.c index 041c3ab75..84c7e9d8e 100644 --- a/winpr/libwinpr/utils/wlog/ImageMessage.c +++ b/winpr/libwinpr/utils/wlog/ImageMessage.c @@ -24,7 +24,7 @@ #include "wlog.h" #include -#include "wlog/ImageMessage.h" +#include "ImageMessage.h" BOOL WLog_ImageMessage_Write(char* filename, void* data, size_t width, size_t height, size_t bpp) { diff --git a/winpr/libwinpr/utils/wlog/JournaldAppender.c b/winpr/libwinpr/utils/wlog/JournaldAppender.c index 1b93d9da6..d56c19ea2 100644 --- a/winpr/libwinpr/utils/wlog/JournaldAppender.c +++ b/winpr/libwinpr/utils/wlog/JournaldAppender.c @@ -31,13 +31,12 @@ #include #include -struct _wLogJournaldAppender +typedef struct { WLOG_APPENDER_COMMON(); char* identifier; FILE* stream; -}; -typedef struct _wLogJournaldAppender wLogJournaldAppender; +} wLogJournaldAppender; static BOOL WLog_JournaldAppender_Open(wLog* log, wLogAppender* appender) { diff --git a/winpr/libwinpr/utils/wlog/Layout.c b/winpr/libwinpr/utils/wlog/Layout.c index 1aa5b1875..d8c267f73 100644 --- a/winpr/libwinpr/utils/wlog/Layout.c +++ b/winpr/libwinpr/utils/wlog/Layout.c @@ -33,7 +33,7 @@ #include "wlog.h" -#include "wlog/Layout.h" +#include "Layout.h" #if defined __linux__ && !defined ANDROID #include diff --git a/winpr/libwinpr/utils/wlog/Layout.h b/winpr/libwinpr/utils/wlog/Layout.h index 3358e7525..80d41a9d8 100644 --- a/winpr/libwinpr/utils/wlog/Layout.h +++ b/winpr/libwinpr/utils/wlog/Layout.h @@ -26,7 +26,7 @@ * Log Layout */ -struct _wLogLayout +struct s_wLogLayout { DWORD Type; @@ -36,6 +36,4 @@ struct _wLogLayout wLogLayout* WLog_Layout_New(wLog* log); void WLog_Layout_Free(wLog* log, wLogLayout* layout); -#include "wlog/wlog.h" - #endif /* WINPR_WLOG_LAYOUT_PRIVATE_H */ diff --git a/winpr/libwinpr/utils/wlog/PacketMessage.c b/winpr/libwinpr/utils/wlog/PacketMessage.c index 4aac562b9..285cfd7d4 100644 --- a/winpr/libwinpr/utils/wlog/PacketMessage.c +++ b/winpr/libwinpr/utils/wlog/PacketMessage.c @@ -25,7 +25,7 @@ #include "wlog.h" -#include "wlog/PacketMessage.h" +#include "PacketMessage.h" #include #include diff --git a/winpr/libwinpr/utils/wlog/PacketMessage.h b/winpr/libwinpr/utils/wlog/PacketMessage.h index c9f804130..088ee8f98 100644 --- a/winpr/libwinpr/utils/wlog/PacketMessage.h +++ b/winpr/libwinpr/utils/wlog/PacketMessage.h @@ -24,7 +24,7 @@ #define PCAP_MAGIC_NUMBER 0xA1B2C3D4 -struct _wPcapHeader +typedef struct { UINT32 magic_number; /* magic number */ UINT16 version_major; /* major version number */ @@ -33,29 +33,25 @@ struct _wPcapHeader UINT32 sigfigs; /* accuracy of timestamps */ UINT32 snaplen; /* max length of captured packets, in octets */ UINT32 network; /* data link type */ -}; -typedef struct _wPcapHeader wPcapHeader; +} wPcapHeader; -struct _wPcapRecordHeader +typedef struct { UINT32 ts_sec; /* timestamp seconds */ UINT32 ts_usec; /* timestamp microseconds */ UINT32 incl_len; /* number of octets of packet saved in file */ UINT32 orig_len; /* actual length of packet */ -}; -typedef struct _wPcapRecordHeader wPcapRecordHeader; +} wPcapRecordHeader; -typedef struct _wPcapRecord wPcapRecord; - -struct _wPcapRecord +typedef struct s_wPcapRecort { wPcapRecordHeader header; void* data; size_t length; - wPcapRecord* next; -}; + struct s_wPcapRecort* next; +} wPcapRecord; -struct _wPcap +typedef struct { FILE* fp; char* name; @@ -66,23 +62,21 @@ struct _wPcap wPcapRecord* head; wPcapRecord* tail; wPcapRecord* record; -}; -typedef struct _wPcap wPcap; +} wPcap; wPcap* Pcap_Open(char* name, BOOL write); void Pcap_Close(wPcap* pcap); void Pcap_Flush(wPcap* pcap); -struct _wEthernetHeader +typedef struct { BYTE Destination[6]; BYTE Source[6]; UINT16 Type; -}; -typedef struct _wEthernetHeader wEthernetHeader; +} wEthernetHeader; -struct _wIPv4Header +typedef struct { BYTE Version; BYTE InternetHeaderLength; @@ -96,10 +90,9 @@ struct _wIPv4Header UINT16 HeaderChecksum; UINT32 SourceAddress; UINT32 DestinationAddress; -}; -typedef struct _wIPv4Header wIPv4Header; +} wIPv4Header; -struct _wTcpHeader +typedef struct { UINT16 SourcePort; UINT16 DestinationPort; @@ -111,8 +104,7 @@ struct _wTcpHeader UINT16 Window; UINT16 Checksum; UINT16 UrgentPointer; -}; -typedef struct _wTcpHeader wTcpHeader; +} wTcpHeader; BOOL WLog_PacketMessage_Write(wPcap* pcap, void* data, size_t length, DWORD flags); diff --git a/winpr/libwinpr/utils/wlog/SyslogAppender.c b/winpr/libwinpr/utils/wlog/SyslogAppender.c index 876c2dd3a..fe6d1e9ca 100644 --- a/winpr/libwinpr/utils/wlog/SyslogAppender.c +++ b/winpr/libwinpr/utils/wlog/SyslogAppender.c @@ -25,11 +25,10 @@ #include "SyslogAppender.h" #include -struct _wLogSyslogAppender +typedef struct { WLOG_APPENDER_COMMON(); -}; -typedef struct _wLogSyslogAppender wLogSyslogAppender; +} wLogSyslogAppender; static int getSyslogLevel(DWORD level) { diff --git a/winpr/libwinpr/utils/wlog/UdpAppender.c b/winpr/libwinpr/utils/wlog/UdpAppender.c index e4e5d8ecd..140cd44f8 100644 --- a/winpr/libwinpr/utils/wlog/UdpAppender.c +++ b/winpr/libwinpr/utils/wlog/UdpAppender.c @@ -28,15 +28,14 @@ #include "wlog.h" -struct _wLogUdpAppender +typedef struct { WLOG_APPENDER_COMMON(); char* host; struct sockaddr targetAddr; int targetAddrLen; SOCKET sock; -}; -typedef struct _wLogUdpAppender wLogUdpAppender; +} wLogUdpAppender; static BOOL WLog_UdpAppender_Open(wLog* log, wLogAppender* appender) { diff --git a/winpr/libwinpr/utils/wlog/UdpAppender.h b/winpr/libwinpr/utils/wlog/UdpAppender.h index c2d99a93e..f2b891a04 100644 --- a/winpr/libwinpr/utils/wlog/UdpAppender.h +++ b/winpr/libwinpr/utils/wlog/UdpAppender.h @@ -26,7 +26,7 @@ #include -#include "wlog/wlog.h" +#include "wlog.h" wLogAppender* WLog_UdpAppender_New(wLog* log); diff --git a/winpr/libwinpr/utils/wlog/wlog.c b/winpr/libwinpr/utils/wlog/wlog.c index c9e20f14f..8ecfc8e42 100644 --- a/winpr/libwinpr/utils/wlog/wlog.c +++ b/winpr/libwinpr/utils/wlog/wlog.c @@ -38,13 +38,12 @@ #include "wlog.h" -struct _wLogFilter +typedef struct { DWORD Level; LPSTR* Names; size_t NameCount; -}; -typedef struct _wLogFilter wLogFilter; +} wLogFilter; #define WLOG_FILTER_NOT_FILTERED -1 #define WLOG_FILTER_NOT_INITIALIZED -2 diff --git a/winpr/libwinpr/utils/wlog/wlog.h b/winpr/libwinpr/utils/wlog/wlog.h index 523e38092..40e087cf3 100644 --- a/winpr/libwinpr/utils/wlog/wlog.h +++ b/winpr/libwinpr/utils/wlog/wlog.h @@ -57,12 +57,12 @@ typedef void (*WLOG_APPENDER_FREE)(wLogAppender* appender); WLOG_APPENDER_FREE Free; \ WLOG_APPENDER_SET Set -struct _wLogAppender +struct s_wLogAppender { WLOG_APPENDER_COMMON(); }; -struct _wLog +struct s_wLog { LPSTR Name; LONG FilterLevel; @@ -84,7 +84,7 @@ struct _wLog extern const char* WLOG_LEVELS[7]; BOOL WLog_Layout_GetMessagePrefix(wLog* log, wLogLayout* layout, wLogMessage* message); -#include "wlog/Layout.h" -#include "wlog/Appender.h" +#include "Layout.h" +#include "Appender.h" #endif /* WINPR_WLOG_PRIVATE_H */ diff --git a/winpr/libwinpr/wtsapi/wtsapi_win32.c b/winpr/libwinpr/wtsapi/wtsapi_win32.c index 4358cb2d9..dfdfa57e4 100644 --- a/winpr/libwinpr/wtsapi/wtsapi_win32.c +++ b/winpr/libwinpr/wtsapi/wtsapi_win32.c @@ -35,7 +35,7 @@ #define WTSAPI_CHANNEL_MAGIC 0x44484356 #define TAG WINPR_TAG("wtsapi") -struct _WTSAPI_CHANNEL +typedef struct { UINT32 magic; HANDLE hServer; @@ -57,8 +57,7 @@ struct _WTSAPI_CHANNEL BOOL waitObjectMode; OVERLAPPED overlapped; CHANNEL_PDU_HEADER* header; -}; -typedef struct _WTSAPI_CHANNEL WTSAPI_CHANNEL; +} WTSAPI_CHANNEL; static BOOL g_Initialized = FALSE; static HMODULE g_WinStaModule = NULL; diff --git a/winpr/tools/makecert/makecert.c b/winpr/tools/makecert/makecert.c index 77f8398a2..d0b2cdca1 100644 --- a/winpr/tools/makecert/makecert.c +++ b/winpr/tools/makecert/makecert.c @@ -38,7 +38,7 @@ #include -struct _MAKECERT_CONTEXT +struct S_MAKECERT_CONTEXT { int argc; char** argv;