Merge main branch changes to next.
This commit is contained in:
commit
3fa8add971
@ -123,7 +123,7 @@ void guac_rdpdr_process_receive(guac_rdp_common_svc* svc,
|
||||
}
|
||||
|
||||
wStream* guac_rdpdr_new_io_completion(guac_rdpdr_device* device,
|
||||
int completion_id, int status, int size) {
|
||||
unsigned int completion_id, unsigned int status, int size) {
|
||||
|
||||
wStream* output_stream = Stream_New(NULL, 16+size);
|
||||
|
||||
|
||||
@ -212,7 +212,7 @@ typedef struct guac_rdpdr {
|
||||
* requested additional free space.
|
||||
*/
|
||||
wStream* guac_rdpdr_new_io_completion(guac_rdpdr_device* device,
|
||||
int completion_id, int status, int size);
|
||||
unsigned int completion_id, unsigned int status, int size);
|
||||
|
||||
/**
|
||||
* Initializes device redirection support (file transfer, printing, etc.) for
|
||||
|
||||
@ -191,7 +191,7 @@ int guac_rdp_fs_get_errorcode(int err) {
|
||||
|
||||
}
|
||||
|
||||
int guac_rdp_fs_get_status(int err) {
|
||||
unsigned int guac_rdp_fs_get_status(int err) {
|
||||
|
||||
/* Translate GUAC_RDP_FS error code to RDPDR status code */
|
||||
if (err == GUAC_RDP_FS_ENFILE) return STATUS_NO_MORE_FILES;
|
||||
|
||||
@ -366,7 +366,7 @@ int guac_rdp_fs_get_errorcode(int err);
|
||||
* A status code corresponding to the given error code that an
|
||||
* implementation of the RDPDR channel can understand.
|
||||
*/
|
||||
int guac_rdp_fs_get_status(int err);
|
||||
unsigned int guac_rdp_fs_get_status(int err);
|
||||
|
||||
/**
|
||||
* Opens the given file, returning the a new file ID, or an error code less
|
||||
|
||||
Loading…
Reference in New Issue
Block a user