mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10456 from akallabeth/warn_backport

Browse Source 
Warn backport
This commit is contained in:
akallabeth 2024-08-08 11:41:09 +02:00 committed by GitHub
commit 5b14b7cbdd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
channels/ainput/server/ainput_main.c
View File

@ -222,7 +222,7 @@ static HANDLE ainput_server_get_channel_handle(ainput_server* ainput)
WINPR_ASSERT(ainput);
if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualEventHandle, &buffer,
if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualEventHandle, (void**)&buffer,
&BytesReturned) == TRUE)
{
if (BytesReturned == sizeof(HANDLE))
@ -416,7 +416,7 @@ ainput_server_context* ainput_server_context_new(HANDLE vcm)
goto fail;
return &ainput->context;
fail:
ainput_server_context_free(ainput);
ainput_server_context_free(&ainput->context);
return NULL;
}
@ -539,8 +539,8 @@ UINT ainput_server_context_poll_int(ainput_server_context* context)
BYTE* buffer = NULL;
DWORD BytesReturned = 0;
if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer,
&BytesReturned) != TRUE)
if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady,
(void**)&buffer, &BytesReturned) != TRUE)
{
WLog_ERR(TAG, "WTSVirtualChannelReady failed,");
}

2
libfreerdp/codec/dsp_ffmpeg.c
View File

@ -423,7 +423,7 @@ static BOOL ffmpeg_encode_frame(AVCodecContext* context, AVFrame* in, AVPacket*
uint8_t** pp = in->extended_data;
for (int y = 0; y < in->channels; y++)
{
float* data = pp[y];
float* data = (float*)pp[y];
for (int x = 0; x < in->nb_samples; x++)
{
const float val1 = data[x];

28
server/proxy/modules/capture/CMakeLists.txt
View File

@ -17,17 +17,19 @@
# limitations under the License.
#
set(PLUGIN_NAME "proxy-capture-plugin")
# deactivated: does not work
add_library(${PLUGIN_NAME} MODULE
cap_main.c
cap_config.c
cap_config.h
cap_protocol.c
cap_protocol.h
)
set_target_properties(${PLUGIN_NAME} PROPERTIES PREFIX "")
set_target_properties(${PLUGIN_NAME} PROPERTIES NO_SONAME 1)
set_target_properties(${PLUGIN_NAME} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${FREERDP_PROXY_PLUGINDIR}")
#set(PLUGIN_NAME "proxy-capture-plugin")
#
#add_library(${PLUGIN_NAME} MODULE
# cap_main.c
# cap_config.c
# cap_config.h
# cap_protocol.c
# cap_protocol.h
#)
#
#set_target_properties(${PLUGIN_NAME} PROPERTIES PREFIX "")
#set_target_properties(${PLUGIN_NAME} PROPERTIES NO_SONAME 1)
#set_target_properties(${PLUGIN_NAME} PROPERTIES
#LIBRARY_OUTPUT_DIRECTORY "${FREERDP_PROXY_PLUGINDIR}")

8
winpr/libwinpr/crt/unicode.c
View File

@ -215,8 +215,8 @@ int MultiByteToWideChar(UINT CodePage, DWORD dwFlags, LPCSTR lpMultiByteStr, int
else
{
targetLength =
ucnv_convert("UTF-16LE", "UTF-8", targetStart, targetCapacity * sizeof(WCHAR),
lpMultiByteStr, cbMultiByte, &error);
ucnv_convert("UTF-16LE", "UTF-8", (char*)targetStart,
targetCapacity * sizeof(WCHAR), lpMultiByteStr, cbMultiByte, &error);
if (targetLength > 0)
targetLength /= sizeof(WCHAR);
cchWideChar = U_SUCCESS(error) ? targetLength : 0;
@ -353,14 +353,14 @@ int WideCharToMultiByte(UINT CodePage, DWORD dwFlags, LPCWSTR lpWideCharStr, int
#if defined(UCNV_CONVERT)
if (cbMultiByte == 0)
{
targetLength = ucnv_convert("UTF-8", "UTF-16LE", NULL, 0, lpWideCharStr,
targetLength = ucnv_convert("UTF-8", "UTF-16LE", NULL, 0, (char*)lpWideCharStr,
cchWideChar * sizeof(WCHAR), &error);
cbMultiByte = targetLength;
}
else
{
targetLength = ucnv_convert("UTF-8", "UTF-16LE", targetStart, targetCapacity,
lpWideCharStr, cchWideChar * sizeof(WCHAR), &error);
(char*)lpWideCharStr, cchWideChar * sizeof(WCHAR), &error);
cbMultiByte = U_SUCCESS(error) ? targetLength : 0;
}