mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[client,windows] fix cast warnings

This commit is contained in:
Armin Novak 2023-07-28 13:39:32 +02:00 committed by akallabeth
parent d04ba8d6ef
commit df3bed95a5
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
client/Windows/wf_rail.c
View File

@ -179,8 +179,9 @@ static void PrintRailWindowState(const WINDOW_ORDER_INFO* orderInfo,
if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_TITLE)
{
char* title = ConvertWCharNToUtf8Alloc(windowState->titleInfo.string,
windowState->titleInfo.length / sizeof(WCHAR), NULL);
const WCHAR* str = (const WCHAR*)windowState->titleInfo.string;
char* title =
ConvertWCharNToUtf8Alloc(str, windowState->titleInfo.length / sizeof(WCHAR), NULL);
WLog_INFO(TAG, "\tTitleInfo: %s (length = %hu)", title, windowState->titleInfo.length);
free(title);
}
@ -451,6 +452,7 @@ static BOOL wf_rail_window_common(rdpContext* context, const WINDOW_ORDER_INFO*
if (fieldFlags & WINDOW_ORDER_FIELD_TITLE)
{
const WCHAR* str = (const WCHAR*)windowState->titleInfo.string;
char* title = NULL;
if (windowState->titleInfo.length == 0)
@ -462,8 +464,7 @@ static BOOL wf_rail_window_common(rdpContext* context, const WINDOW_ORDER_INFO*
}
}
else if (!(title = ConvertWCharNToUtf8Alloc(
windowState->titleInfo.string,
windowState->titleInfo.length / sizeof(WCHAR), NULL)))
str, windowState->titleInfo.length / sizeof(WCHAR), NULL)))
{
WLog_ERR(TAG, "failed to convert window title");
/* error handled below */
@ -577,6 +578,7 @@ static BOOL wf_rail_window_common(rdpContext* context, const WINDOW_ORDER_INFO*
if (fieldFlags & WINDOW_ORDER_FIELD_TITLE)
{
const WCHAR* str = (const WCHAR*)windowState->titleInfo.string;
char* title = NULL;
if (windowState->titleInfo.length == 0)
@ -587,9 +589,8 @@ static BOOL wf_rail_window_common(rdpContext* context, const WINDOW_ORDER_INFO*
return FALSE;
}
}
else if (!(title = ConvertWCharNToUtf8Alloc(windowState->titleInfo.string,
windowState->titleInfo.length / sizeof(WCHAR),
NULL)))
else if (!(title = ConvertWCharNToUtf8Alloc(
str, windowState->titleInfo.length / sizeof(WCHAR), NULL)))
{
WLog_ERR(TAG, "failed to convert window title");
return FALSE;
@ -597,7 +598,7 @@ static BOOL wf_rail_window_common(rdpContext* context, const WINDOW_ORDER_INFO*
free(railWindow->title);
railWindow->title = title;
SetWindowTextW(railWindow->hWnd, windowState->titleInfo.string);
SetWindowTextW(railWindow->hWnd, str);
}
if (fieldFlags & WINDOW_ORDER_FIELD_CLIENT_AREA_OFFSET)