From ba0da0421710c746a407090a9eab1a7748ece9a5 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Tue, 7 Sep 2021 14:40:21 +0200 Subject: [PATCH] Fixed compilation warnings and duplicate defines --- channels/rdpsnd/server/rdpsnd_main.c | 11 ++++----- channels/rdpsnd/server/rdpsnd_main.h | 6 ++--- include/freerdp/channels/rdpdr.h | 18 +------------- include/freerdp/server/rdpsnd.h | 4 ++-- include/freerdp/server/shadow.h | 2 +- server/proxy/pf_server.c | 1 - winpr/include/winpr/file.h | 30 ++++++++++++------------ winpr/include/winpr/shell.h | 8 ------- winpr/libwinpr/environment/environment.c | 4 +--- winpr/libwinpr/file/file.c | 18 ++++++++------ 10 files changed, 39 insertions(+), 63 deletions(-) diff --git a/channels/rdpsnd/server/rdpsnd_main.c b/channels/rdpsnd/server/rdpsnd_main.c index 21260f30c..6e9ef976d 100644 --- a/channels/rdpsnd/server/rdpsnd_main.c +++ b/channels/rdpsnd/server/rdpsnd_main.c @@ -548,11 +548,9 @@ static UINT rdpsnd_server_send_audio_pdu(RdpsndServerContext* context, UINT16 wT * * @return 0 on success, otherwise a Win32 error code */ -static UINT rdpsnd_server_send_samples(RdpsndServerContext* context, const void* buf, int nframes, - UINT16 wTimestamp) +static UINT rdpsnd_server_send_samples(RdpsndServerContext* context, const void* buf, + size_t nframes, UINT16 wTimestamp) { - int cframes; - int cframesize; UINT error = CHANNEL_RC_OK; EnterCriticalSection(&context->priv->lock); @@ -566,8 +564,9 @@ static UINT rdpsnd_server_send_samples(RdpsndServerContext* context, const void* while (nframes > 0) { - cframes = MIN(nframes, context->priv->out_frames - context->priv->out_pending_frames); - cframesize = cframes * context->priv->src_bytes_per_frame; + const size_t cframes = + MIN(nframes, context->priv->out_frames - context->priv->out_pending_frames); + size_t cframesize = cframes * context->priv->src_bytes_per_frame; CopyMemory(context->priv->out_buffer + (context->priv->out_pending_frames * context->priv->src_bytes_per_frame), buf, cframesize); diff --git a/channels/rdpsnd/server/rdpsnd_main.h b/channels/rdpsnd/server/rdpsnd_main.h index f058abbc7..69923996f 100644 --- a/channels/rdpsnd/server/rdpsnd_main.h +++ b/channels/rdpsnd/server/rdpsnd_main.h @@ -46,9 +46,9 @@ struct _rdpsnd_server_private wStream* input_stream; wStream* rdpsnd_pdu; BYTE* out_buffer; - int out_buffer_size; - int out_frames; - int out_pending_frames; + size_t out_buffer_size; + size_t out_frames; + size_t out_pending_frames; UINT32 src_bytes_per_sample; UINT32 src_bytes_per_frame; FREERDP_DSP_CONTEXT* dsp_context; diff --git a/include/freerdp/channels/rdpdr.h b/include/freerdp/channels/rdpdr.h index 07af2600f..59691072e 100644 --- a/include/freerdp/channels/rdpdr.h +++ b/include/freerdp/channels/rdpdr.h @@ -194,23 +194,7 @@ enum RDPDR_PRINTER_ANNOUNCE_FLAG /* [MS-FSCC] FileAttributes */ -#ifndef _WIN32 - -#define FILE_ATTRIBUTE_ARCHIVE 0x00000020 -#define FILE_ATTRIBUTE_COMPRESSED 0x00000800 -#define FILE_ATTRIBUTE_DIRECTORY 0x00000010 -#define FILE_ATTRIBUTE_ENCRYPTED 0x00004000 -#define FILE_ATTRIBUTE_HIDDEN 0x00000002 -#define FILE_ATTRIBUTE_NORMAL 0x00000080 -#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED 0x00002000 -#define FILE_ATTRIBUTE_OFFLINE 0x00001000 -#define FILE_ATTRIBUTE_READONLY 0x00000001 -#define FILE_ATTRIBUTE_REPARSE_POINT 0x00000400 -#define FILE_ATTRIBUTE_SPARSE_FILE 0x00000200 -#define FILE_ATTRIBUTE_SYSTEM 0x00000004 -#define FILE_ATTRIBUTE_TEMPORARY 0x00000100 - -#endif +/* Included with winpr/file.h */ /* [MS-FSCC] FSCTL Structures */ diff --git a/include/freerdp/server/rdpsnd.h b/include/freerdp/server/rdpsnd.h index fa8347359..302e23e9a 100644 --- a/include/freerdp/server/rdpsnd.h +++ b/include/freerdp/server/rdpsnd.h @@ -36,7 +36,7 @@ typedef UINT (*psRdpsndServerInitialize)(RdpsndServerContext* context, BOOL ownT typedef UINT (*psRdpsndServerSelectFormat)(RdpsndServerContext* context, UINT16 client_format_index); typedef UINT (*psRdpsndServerSendSamples)(RdpsndServerContext* context, const void* buf, - int nframes, UINT16 wTimestamp); + size_t nframes, UINT16 wTimestamp); typedef UINT (*psRdpsndServerConfirmBlock)(RdpsndServerContext* context, BYTE confirmBlockNum, UINT16 wtimestamp); typedef UINT (*psRdpsndServerSetVolume)(RdpsndServerContext* context, int left, int right); @@ -64,7 +64,7 @@ struct _rdpsnd_server_context AUDIO_FORMAT* src_format; /* Server audio latency, or buffer size, in milli-seconds. Set by server. */ - int latency; + UINT32 latency; /* Client supported formats. */ AUDIO_FORMAT* client_formats; diff --git a/include/freerdp/server/shadow.h b/include/freerdp/server/shadow.h index 8cfd129d5..5689f036d 100644 --- a/include/freerdp/server/shadow.h +++ b/include/freerdp/server/shadow.h @@ -268,7 +268,7 @@ struct _SHADOW_MSG_OUT_AUDIO_OUT_SAMPLES SHADOW_MSG_OUT common; AUDIO_FORMAT* audio_format; void* buf; - int nFrames; + size_t nFrames; UINT16 wTimestamp; }; typedef struct _SHADOW_MSG_OUT_AUDIO_OUT_SAMPLES SHADOW_MSG_OUT_AUDIO_OUT_SAMPLES; diff --git a/server/proxy/pf_server.c b/server/proxy/pf_server.c index 7d9ad8451..0cfe5961b 100644 --- a/server/proxy/pf_server.c +++ b/server/proxy/pf_server.c @@ -453,7 +453,6 @@ static DWORD WINAPI pf_server_handle_peer(LPVOID arg) DWORD tmp; DWORD status; pServerContext* ps; - rdpContext* pc; proxyData* pdata; freerdp_peer* client = (freerdp_peer*)arg; proxyServer* server; diff --git a/winpr/include/winpr/file.h b/winpr/include/winpr/file.h index 79c9b392c..c3b541869 100644 --- a/winpr/include/winpr/file.h +++ b/winpr/include/winpr/file.h @@ -41,21 +41,21 @@ #define INVALID_SET_FILE_POINTER ((DWORD)-1) #define INVALID_FILE_ATTRIBUTES ((DWORD)-1) -#define FILE_ATTRIBUTE_READONLY 0x00000001 -#define FILE_ATTRIBUTE_HIDDEN 0x00000002 -#define FILE_ATTRIBUTE_SYSTEM 0x00000004 -#define FILE_ATTRIBUTE_DIRECTORY 0x00000010 -#define FILE_ATTRIBUTE_ARCHIVE 0x00000020 -#define FILE_ATTRIBUTE_DEVICE 0x00000040 -#define FILE_ATTRIBUTE_NORMAL 0x00000080 -#define FILE_ATTRIBUTE_TEMPORARY 0x00000100 -#define FILE_ATTRIBUTE_SPARSE_FILE 0x00000200 -#define FILE_ATTRIBUTE_REPARSE_POINT 0x00000400 -#define FILE_ATTRIBUTE_COMPRESSED 0x00000800 -#define FILE_ATTRIBUTE_OFFLINE 0x00001000 -#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED 0x00002000 -#define FILE_ATTRIBUTE_ENCRYPTED 0x00004000 -#define FILE_ATTRIBUTE_VIRTUAL 0x00010000 +#define FILE_ATTRIBUTE_READONLY 0x00000001u +#define FILE_ATTRIBUTE_HIDDEN 0x00000002u +#define FILE_ATTRIBUTE_SYSTEM 0x00000004u +#define FILE_ATTRIBUTE_DIRECTORY 0x00000010u +#define FILE_ATTRIBUTE_ARCHIVE 0x00000020u +#define FILE_ATTRIBUTE_DEVICE 0x00000040u +#define FILE_ATTRIBUTE_NORMAL 0x00000080u +#define FILE_ATTRIBUTE_TEMPORARY 0x00000100u +#define FILE_ATTRIBUTE_SPARSE_FILE 0x00000200u +#define FILE_ATTRIBUTE_REPARSE_POINT 0x00000400u +#define FILE_ATTRIBUTE_COMPRESSED 0x00000800u +#define FILE_ATTRIBUTE_OFFLINE 0x00001000u +#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED 0x00002000u +#define FILE_ATTRIBUTE_ENCRYPTED 0x00004000u +#define FILE_ATTRIBUTE_VIRTUAL 0x00010000u #define FILE_NOTIFY_CHANGE_FILE_NAME 0x00000001 #define FILE_NOTIFY_CHANGE_DIR_NAME 0x00000002 diff --git a/winpr/include/winpr/shell.h b/winpr/include/winpr/shell.h index c843f2d74..55050aab6 100644 --- a/winpr/include/winpr/shell.h +++ b/winpr/include/winpr/shell.h @@ -86,14 +86,6 @@ typedef enum /* Deprecated, here for compatibility */ #define FD_SHOWPROGRESSUI FD_PROGRESSUI -/* FILEDESCRIPTOR.dwFileAttributes */ -#define FILE_ATTRIBUTE_READONLY 0x00000001 -#define FILE_ATTRIBUTE_HIDDEN 0x00000002 -#define FILE_ATTRIBUTE_SYSTEM 0x00000004 -#define FILE_ATTRIBUTE_DIRECTORY 0x00000010 -#define FILE_ATTRIBUTE_ARCHIVE 0x00000020 -#define FILE_ATTRIBUTE_NORMAL 0x00000080 - #ifdef __cplusplus extern "C" { diff --git a/winpr/libwinpr/environment/environment.c b/winpr/libwinpr/environment/environment.c index 8b71217f5..f99df5ae7 100644 --- a/winpr/libwinpr/environment/environment.c +++ b/winpr/libwinpr/environment/environment.c @@ -26,14 +26,12 @@ #include #include #include +#include #include #ifndef _WIN32 -#define stricmp strcasecmp -#define strnicmp strncasecmp - #include #include diff --git a/winpr/libwinpr/file/file.c b/winpr/libwinpr/file/file.c index 5ecdeb6d2..2edc196ae 100644 --- a/winpr/libwinpr/file/file.c +++ b/winpr/libwinpr/file/file.c @@ -57,6 +57,10 @@ #include #endif +#ifndef MIN +#define MIN(x, y) (((x) < (y)) ? (x) : (y)) +#endif + static BOOL FileIsHandled(HANDLE handle) { WINPR_FILE* pFile = (WINPR_FILE*)handle; @@ -840,11 +844,11 @@ static HANDLE FileCreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dw #endif { #ifdef __sun - WLog_ERR(TAG, "F_SETLKW failed with %s [0x%08X]", + WLog_ERR(TAG, "F_SETLKW failed with %s [0x%08X]", strerror(errno), errno); #else - WLog_ERR(TAG, "flock failed with %s [0x%08X]", + WLog_ERR(TAG, "flock failed with %s [0x%08X]", strerror(errno), errno); #endif - strerror(errno), errno); + SetLastError(map_posix_err(errno)); FileCloseHandle(pFile); return INVALID_HANDLE_VALUE; @@ -940,12 +944,12 @@ BOOL GetDiskFreeSpaceA(LPCSTR lpRootPathName, LPDWORD lpSectorsPerCluster, LPDWO #define STATVFS statvfs #endif - struct STATVFS svfst; + struct STATVFS svfst = { 0 }; STATVFS(lpRootPathName, &svfst); - *lpSectorsPerCluster = svfst.f_frsize; + *lpSectorsPerCluster = (UINT32)MIN(svfst.f_frsize, UINT32_MAX); *lpBytesPerSector = 1; - *lpNumberOfFreeClusters = svfst.f_bavail; - *lpTotalNumberOfClusters = svfst.f_blocks; + *lpNumberOfFreeClusters = (UINT32)MIN(svfst.f_bavail, UINT32_MAX); + *lpTotalNumberOfClusters = (UINT32)MIN(svfst.f_blocks, UINT32_MAX); return TRUE; }