morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[warnigns] fix Wshorten-64-to-32

Browse Source
This commit is contained in:
akallabeth
2024-10-14 15:50:38 +02:00
parent f88eda3f11
commit 78acedb40e
138 changed files with 1307 additions and 869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/Sample/sfreerdp.c
View File

@@ -268,8 +268,10 @@ static BOOL test_peer_draw_background(freerdp_peer* client)
{
WLog_DBG(TAG, "Using RemoteFX codec");
rfx_context_set_pixel_format(context->rfx_context, colorFormat);
WINPR_ASSERT(bpp <= UINT16_MAX);
if (!rfx_compose_message(context->rfx_context, s, &rect, 1, rgb_data, rect.width,
rect.height, rect.width * bpp))
rect.height, (UINT32)(bpp * rect.width)))
{
goto out;
}
@@ -284,8 +286,10 @@ static BOOL test_peer_draw_background(freerdp_peer* client)
{
WLog_DBG(TAG, "Using NSCodec");
nsc_context_set_parameters(context->nsc_context, NSC_COLOR_FORMAT, colorFormat);
WINPR_ASSERT(bpp <= UINT16_MAX);
nsc_compose_message(context->nsc_context, s, rgb_data, rect.width, rect.height,
rect.width * bpp);
(UINT32)(bpp * rect.width));
const UINT32 NSCodecId = freerdp_settings_get_uint32(settings, FreeRDP_NSCodecId);
WINPR_ASSERT(NSCodecId <= UINT16_MAX);
cmd.bmp.codecID = (UINT16)NSCodecId;
@@ -1043,7 +1047,12 @@ static int hook_peer_write_pdu(rdpTransport* transport, wStream* s)
if ((last_ts > 0) && (ts > last_ts))
{
UINT64 diff = ts - last_ts;
Sleep(diff);
while (diff > 0)
{
UINT32 d = diff > UINT32_MAX ? UINT32_MAX : (UINT32)diff;
diff -= d;
Sleep(d);
}
}
last_ts = ts;
rc = peerCtx->io.WritePdu(transport, ls);

10
server/proxy/channels/pf_channel_drdynvc.c
View File

@@ -363,11 +363,11 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir
const size_t nameLen = Stream_GetRemainingLength(s);
const size_t len = strnlen(name, nameLen);
if ((len == 0) || (len == nameLen))
if ((len == 0) || (len == nameLen) || (dynChannelId > UINT16_MAX))
return PF_CHANNEL_RESULT_ERROR;
wStream* currentPacket = channelTracker_getCurrentPacket(tracker);
dev.channel_id = dynChannelId;
dev.channel_id = (UINT16)dynChannelId;
dev.channel_name = name;
dev.data = Stream_Buffer(s);
dev.data_len = Stream_GetPosition(currentPacket);
@@ -392,7 +392,7 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir
return PF_CHANNEL_RESULT_DROP; /* Silently drop */
dynChannel = DynamicChannelContext_new(dynChannelContext->log, pdata->ps, name,
dynChannelId);
(UINT32)dynChannelId);
if (!dynChannel)
{
WLog_Print(dynChannelContext->log, WLOG_ERROR,
@@ -493,7 +493,9 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir
WLog_Print(dynChannelContext->log, WLOG_DEBUG,
"DynvcTracker(%s [%s]): %s DATA_FIRST currentPacketLength=%" PRIu64 "",
dynChannel->channelName, drdynvc_get_packet_type(cmd), direction, Length);
trackerState->currentDataLength = Length;
if (Length > UINT32_MAX)
return PF_CHANNEL_RESULT_ERROR;
trackerState->currentDataLength = (UINT32)Length;
trackerState->CurrentDataReceived = 0;
trackerState->CurrentDataFragments = 0;

4
server/proxy/pf_client.c
View File

@@ -408,12 +408,12 @@ static BOOL pf_client_load_channels(freerdp* instance)
{
CHANNEL_DEF* channels = (CHANNEL_DEF*)freerdp_settings_get_pointer_array_writable(
settings, FreeRDP_ChannelDefArray, 0);
size_t size = freerdp_settings_get_uint32(settings, FreeRDP_ChannelCount);
UINT32 size = freerdp_settings_get_uint32(settings, FreeRDP_ChannelCount);
UINT32 id = MCS_GLOBAL_CHANNEL_ID + 1;
WINPR_ASSERT(channels || (size == 0));
size_t x = 0;
UINT32 x = 0;
for (; x < size;)
{
CHANNEL_DEF* cur = &channels[x];

2
server/proxy/pf_config.c
View File

@@ -936,7 +936,7 @@ static BOOL pf_config_copy_string_list(char*** dst, size_t* size, char** src, si
if (srcSize != 0)
{
char* csv = CommandLineToCommaSeparatedValues(srcSize, src);
char* csv = CommandLineToCommaSeparatedValues((INT32)srcSize, src);
*dst = CommandLineParseCommaSeparatedValues(csv, size);
free(csv);
}

2
server/proxy/pf_server.c
View File

@@ -101,7 +101,7 @@ static BOOL pf_server_parse_target_from_routing_token(rdpContext* context, rdpSe
if (p > USHRT_MAX)
return FALSE;
if (!freerdp_settings_set_uint32(settings, portID, p))
if (!freerdp_settings_set_uint32(settings, portID, (USHORT)p))
return FALSE;
}

11
server/shadow/X11/x11_shadow.c
View File

@@ -666,10 +666,10 @@ static int x11_shadow_blend_cursor(x11ShadowSubsystem* subsystem)
}
if ((nXDst + nWidth) > surface->width)
nWidth = surface->width - nXDst;
nWidth = (nXDst > surface->width) ? 0 : (UINT32)(surface->width - nXDst);
if ((nYDst + nHeight) > surface->height)
nHeight = surface->height - nYDst;
nHeight = (nYDst > surface->height) ? 0 : (UINT32)(surface->height - nYDst);
pSrcData = subsystem->cursorPixels;
nSrcStep = subsystem->cursorWidth * 4;
@@ -926,8 +926,6 @@ static DWORD WINAPI x11_shadow_subsystem_thread(LPVOID arg)
XEvent xevent;
DWORD status = 0;
DWORD nCount = 0;
UINT64 cTime = 0;
DWORD dwTimeout = 0;
DWORD dwInterval = 0;
UINT64 frameTime = 0;
HANDLE events[32];
@@ -943,8 +941,9 @@ static DWORD WINAPI x11_shadow_subsystem_thread(LPVOID arg)
while (1)
{
cTime = GetTickCount64();
dwTimeout = (cTime > frameTime) ? 0 : frameTime - cTime;
const UINT64 cTime = GetTickCount64();
const DWORD dwTimeout =
(DWORD)((cTime > frameTime) ? 0 : MIN(UINT32_MAX, frameTime - cTime));
status = WaitForMultipleObjects(nCount, events, FALSE, dwTimeout);
if (WaitForSingleObject(MessageQueue_Event(MsgPipe->In), 0) == WAIT_OBJECT_0)

2
server/shadow/X11/x11_shadow.h
View File

@@ -84,7 +84,7 @@ struct x11_shadow_subsystem
UINT32 cursorHotY;
UINT32 cursorWidth;
UINT32 cursorHeight;
UINT32 cursorId;
UINT64 cursorId;
BYTE* cursorPixels;
UINT32 cursorMaxWidth;
UINT32 cursorMaxHeight;

12
server/shadow/shadow_capture.c
View File

@@ -247,8 +247,8 @@ int shadow_capture_compare_with_format(const BYTE* WINPR_RESTRICT pData1, UINT32
if (!tw)
tw = 16;
const BYTE* p1 = &pData1[(ty * 16 * nStep1) + (tx * 16ull * bppA)];
const BYTE* p2 = &pData2[(ty * 16 * nStep2) + (tx * 16ull * bppB)];
const BYTE* p1 = &pData1[(ty * 16ULL * nStep1) + (tx * 16ull * bppA)];
const BYTE* p2 = &pData2[(ty * 16ULL * nStep2) + (tx * 16ull * bppB)];
for (size_t k = 0; k < th; k++)
{
@@ -266,10 +266,10 @@ int shadow_capture_compare_with_format(const BYTE* WINPR_RESTRICT pData1, UINT32
{
rowEqual = FALSE;
if (l > tx)
l = tx;
l = (UINT32)tx;
if (r < tx)
r = tx;
r = (UINT32)tx;
}
}
@@ -278,10 +278,10 @@ int shadow_capture_compare_with_format(const BYTE* WINPR_RESTRICT pData1, UINT32
allEqual = FALSE;
if (t > ty)
t = ty;
t = (UINT32)ty;
if (b < ty)
b = ty;
b = (UINT32)ty;
}
}