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

Disabled file locking, added response checks.

This commit is contained in:
Armin Novak 2015-10-22 10:01:12 +02:00
parent 34191cdafc
commit d5385471a5
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/Windows/wf_cliprdr.c
View File

@ -1230,9 +1230,6 @@ static UINT cliprdr_send_data_request(wfClipboard* clipboard, UINT32 formatId)
!clipboard->context->ClientFormatDataRequest)
return ERROR_INTERNAL_ERROR;
formatDataRequest.msgType = CB_FORMAT_DATA_REQUEST;
formatDataRequest.msgFlags = CB_RESPONSE_OK;
formatDataRequest.requestedFormatId = formatId;
clipboard->requestedFormatId = formatId;
@ -1264,6 +1261,7 @@ static UINT cliprdr_send_request_filecontents(wfClipboard* clipboard, const void
fileContentsRequest.nPositionHigh = positionhigh;
fileContentsRequest.cbRequested = nreq;
fileContentsRequest.clipDataId = 0;
fileContentsRequest.msgFlags = 0;
rc = clipboard->context->ClientFileContentsRequest(clipboard->context, &fileContentsRequest);
@ -1719,8 +1717,7 @@ static UINT wf_cliprdr_send_client_capabilities(wfClipboard* clipboard)
generalCapabilitySet.generalFlags =
CB_USE_LONG_FORMAT_NAMES |
CB_STREAM_FILECLIP_ENABLED |
CB_FILECLIP_NO_FILE_PATHS |
CB_CAN_LOCK_CLIPDATA;
CB_FILECLIP_NO_FILE_PATHS;
return clipboard->context->ClientCapabilities(clipboard->context, &capabilities);
}
@ -1861,6 +1858,9 @@ static UINT wf_cliprdr_server_format_list_response(CliprdrClientContext* context
(void)context;
(void)formatListResponse;
if (formatListResponse->msgFlags != CB_RESPONSE_OK)
return E_FAIL;
return CHANNEL_RC_OK;
}
@ -2069,8 +2069,6 @@ exit:
CloseClipboard();
}
ZeroMemory(&response, sizeof(CLIPRDR_FORMAT_DATA_RESPONSE));
response.msgFlags = CB_RESPONSE_OK;
response.dataLen = size;
response.requestedFormatData = (BYTE*) buff;
@ -2094,6 +2092,9 @@ static UINT wf_cliprdr_server_format_data_response(CliprdrClientContext* context
HANDLE hMem;
wfClipboard* clipboard;
if (formatDataResponse->msgFlags != CB_RESPONSE_OK)
return E_FAIL;
if (!context || !formatDataResponse)
return ERROR_INTERNAL_ERROR;
@ -2313,6 +2314,9 @@ static UINT wf_cliprdr_server_file_contents_response(CliprdrClientContext* conte
{
wfClipboard* clipboard;
if (fileContentsResponse->msgFlags != CB_RESPONSE_OK)
return E_FAIL;
if (!context || !fileContentsResponse)
return ERROR_INTERNAL_ERROR;