mirror of
https://github.com/FreeRDP/FreeRDP.git
synced 2025-06-03 00:00:20 +00:00
fixed const and type cast warnings
This commit is contained in:
parent
0186a9b303
commit
bd7e2263ad
@ -673,7 +673,7 @@ wlf_cliprdr_server_format_data_request(CliprdrClientContext* context,
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
size_t len = 0;
|
size_t len = 0;
|
||||||
cdata = ConvertUtf8NToWCharAlloc(data, size, &len);
|
cdata = ConvertUtf8NToWCharAlloc((char*)data, size, &len);
|
||||||
free(data);
|
free(data);
|
||||||
data = NULL;
|
data = NULL;
|
||||||
|
|
||||||
|
@ -1248,9 +1248,9 @@ UINT xf_AppUpdateWindowFromSurface(xfContext* xfc, gdiGfxSurface* surface)
|
|||||||
if (!appWindow->image)
|
if (!appWindow->image)
|
||||||
{
|
{
|
||||||
WINPR_ASSERT(xfc->depth != 0);
|
WINPR_ASSERT(xfc->depth != 0);
|
||||||
appWindow->image =
|
appWindow->image = XCreateImage(xfc->display, xfc->visual, xfc->depth, ZPixmap, 0,
|
||||||
XCreateImage(xfc->display, xfc->visual, xfc->depth, ZPixmap, 0, surface->data,
|
(char*)surface->data, surface->width, surface->height,
|
||||||
surface->width, surface->height, xfc->scanline_pad, surface->scanline);
|
xfc->scanline_pad, surface->scanline);
|
||||||
if (!appWindow->image)
|
if (!appWindow->image)
|
||||||
{
|
{
|
||||||
WLog_WARN(TAG,
|
WLog_WARN(TAG,
|
||||||
|
@ -105,7 +105,7 @@ static BOOL rdp_read_info_null_string(UINT32 flags, wStream* s, size_t cbLen, CH
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const char* domain = Stream_Pointer(s);
|
const char* domain = (const char*)Stream_Pointer(s);
|
||||||
if (!Stream_SafeSeek(s, cbLen))
|
if (!Stream_SafeSeek(s, cbLen))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
@ -175,13 +175,13 @@ WCHAR* _wcsstr(const WCHAR* str, const WCHAR* strSearch)
|
|||||||
WINPR_ASSERT(strSearch);
|
WINPR_ASSERT(strSearch);
|
||||||
|
|
||||||
if (strSearch[0] == '\0')
|
if (strSearch[0] == '\0')
|
||||||
return str;
|
return (WCHAR*)str;
|
||||||
|
|
||||||
const size_t searchLen = _wcslen(strSearch);
|
const size_t searchLen = _wcslen(strSearch);
|
||||||
while (*str)
|
while (*str)
|
||||||
{
|
{
|
||||||
if (_wcsncmp(str, strSearch, searchLen) == 0)
|
if (_wcsncmp(str, strSearch, searchLen) == 0)
|
||||||
return str;
|
return (WCHAR*)str;
|
||||||
str++;
|
str++;
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -812,8 +812,8 @@ static SECURITY_STATUS NCryptP11EnumKeys(NCRYPT_PROV_HANDLE hProvider, LPCWSTR p
|
|||||||
return NTE_NO_MORE_ITEMS;
|
return NTE_NO_MORE_ITEMS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static SECURITY_STATUS get_piv_container_name(NCryptP11KeyHandle* key, BYTE* piv_tag, BYTE* output,
|
static SECURITY_STATUS get_piv_container_name(NCryptP11KeyHandle* key, const BYTE* piv_tag,
|
||||||
size_t output_len)
|
BYTE* output, size_t output_len)
|
||||||
{
|
{
|
||||||
CK_SLOT_INFO slot_info = { 0 };
|
CK_SLOT_INFO slot_info = { 0 };
|
||||||
CK_FUNCTION_LIST_PTR p11 = NULL;
|
CK_FUNCTION_LIST_PTR p11 = NULL;
|
||||||
|
@ -614,9 +614,9 @@ BOOL sspi_CopyAuthIdentityFieldsA(const SEC_WINNT_AUTH_IDENTITY_INFO* identity,
|
|||||||
char** pDomain, char** pPassword)
|
char** pDomain, char** pPassword)
|
||||||
{
|
{
|
||||||
BOOL success = FALSE;
|
BOOL success = FALSE;
|
||||||
char* UserA = NULL;
|
const char* UserA = NULL;
|
||||||
char* DomainA = NULL;
|
const char* DomainA = NULL;
|
||||||
char* PasswordA = NULL;
|
const char* PasswordA = NULL;
|
||||||
const WCHAR* UserW = NULL;
|
const WCHAR* UserW = NULL;
|
||||||
const WCHAR* DomainW = NULL;
|
const WCHAR* DomainW = NULL;
|
||||||
const WCHAR* PasswordW = NULL;
|
const WCHAR* PasswordW = NULL;
|
||||||
@ -710,9 +710,9 @@ BOOL sspi_CopyAuthIdentityFieldsW(const SEC_WINNT_AUTH_IDENTITY_INFO* identity,
|
|||||||
const char* UserA = NULL;
|
const char* UserA = NULL;
|
||||||
const char* DomainA = NULL;
|
const char* DomainA = NULL;
|
||||||
const char* PasswordA = NULL;
|
const char* PasswordA = NULL;
|
||||||
WCHAR* UserW = NULL;
|
const WCHAR* UserW = NULL;
|
||||||
WCHAR* DomainW = NULL;
|
const WCHAR* DomainW = NULL;
|
||||||
WCHAR* PasswordW = NULL;
|
const WCHAR* PasswordW = NULL;
|
||||||
UINT32 UserLength = 0;
|
UINT32 UserLength = 0;
|
||||||
UINT32 DomainLength = 0;
|
UINT32 DomainLength = 0;
|
||||||
UINT32 PasswordLength = 0;
|
UINT32 PasswordLength = 0;
|
||||||
@ -866,12 +866,12 @@ int sspi_CopyAuthIdentity(SEC_WINNT_AUTH_IDENTITY* identity,
|
|||||||
{
|
{
|
||||||
int status;
|
int status;
|
||||||
UINT32 identityFlags;
|
UINT32 identityFlags;
|
||||||
char* UserA = NULL;
|
const char* UserA = NULL;
|
||||||
char* DomainA = NULL;
|
const char* DomainA = NULL;
|
||||||
char* PasswordA = NULL;
|
const char* PasswordA = NULL;
|
||||||
WCHAR* UserW = NULL;
|
const WCHAR* UserW = NULL;
|
||||||
WCHAR* DomainW = NULL;
|
const WCHAR* DomainW = NULL;
|
||||||
WCHAR* PasswordW = NULL;
|
const WCHAR* PasswordW = NULL;
|
||||||
UINT32 UserLength = 0;
|
UINT32 UserLength = 0;
|
||||||
UINT32 DomainLength = 0;
|
UINT32 DomainLength = 0;
|
||||||
UINT32 PasswordLength = 0;
|
UINT32 PasswordLength = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user