maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-249: Remove now-unnecessary status.h FreeRDP compatibility header.

Browse Source
This commit is contained in:
Michael Jumper 2019-12-23 13:35:32 -08:00
parent d7bbee35b0
commit 4752863b5b
8 changed files with 6 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/protocols/rdp/Makefile.am
View File

@ -113,7 +113,6 @@ noinst_HEADERS = \
rdp.h \ rdp.h \
resolution.h \ resolution.h \
settings.h \ settings.h \
status.h \
stream.h \ stream.h \
unicode.h \ unicode.h \
user.h user.h

2
src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-dir-info.c
View File

@ -20,10 +20,10 @@
#include "config.h" #include "config.h"
#include "channels/rdpdr/rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include "fs.h" #include "fs.h"
#include "status.h"
#include "unicode.h" #include "unicode.h"
#include <guacamole/unicode.h> #include <guacamole/unicode.h>
#include <winpr/file.h>
#include <winpr/stream.h> #include <winpr/stream.h>
#include <stddef.h> #include <stddef.h>

2
src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-file-info.c
View File

@ -20,9 +20,9 @@
#include "config.h" #include "config.h"
#include "channels/rdpdr/rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include "fs.h" #include "fs.h"
#include "status.h"
#include "unicode.h" #include "unicode.h"
#include <winpr/file.h>
#include <winpr/stream.h> #include <winpr/stream.h>
#include <winpr/wtypes.h> #include <winpr/wtypes.h>

2
src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-vol-info.c
View File

@ -21,9 +21,9 @@
#include "channels/rdpdr/rdpdr-messages.h" #include "channels/rdpdr/rdpdr-messages.h"
#include "channels/rdpdr/rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include "fs.h" #include "fs.h"
#include "status.h"
#include <guacamole/unicode.h> #include <guacamole/unicode.h>
#include <winpr/file.h>
#include <winpr/stream.h> #include <winpr/stream.h>
#include <winpr/wtypes.h> #include <winpr/wtypes.h>

2
src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages.c
View File

@ -25,11 +25,11 @@
#include "channels/rdpdr/rdpdr-messages.h" #include "channels/rdpdr/rdpdr-messages.h"
#include "channels/rdpdr/rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include "fs.h" #include "fs.h"
#include "status.h"
#include "unicode.h" #include "unicode.h"
#include <freerdp/channels/rdpdr.h> #include <freerdp/channels/rdpdr.h>
#include <guacamole/client.h> #include <guacamole/client.h>
#include <winpr/file.h>
#include <winpr/stream.h> #include <winpr/stream.h>
#include <winpr/wtypes.h> #include <winpr/wtypes.h>

2
src/protocols/rdp/channels/rdpdr/rdpdr-printer.c
View File

@ -23,7 +23,6 @@
#include "channels/rdpdr/rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include "print-job.h" #include "print-job.h"
#include "rdp.h" #include "rdp.h"
#include "status.h"
#include "unicode.h" #include "unicode.h"
#include <freerdp/channels/rdpdr.h> #include <freerdp/channels/rdpdr.h>
@ -33,6 +32,7 @@
#include <guacamole/stream.h> #include <guacamole/stream.h>
#include <guacamole/unicode.h> #include <guacamole/unicode.h>
#include <guacamole/user.h> #include <guacamole/user.h>
#include <winpr/file.h>
#include <winpr/stream.h> #include <winpr/stream.h>
#include <errno.h> #include <errno.h>

2
src/protocols/rdp/fs.c
View File

@ -20,7 +20,6 @@
#include "config.h" #include "config.h"
#include "fs.h" #include "fs.h"
#include "status.h"
#include "stream.h" #include "stream.h"
#include <guacamole/client.h> #include <guacamole/client.h>
@ -29,6 +28,7 @@
#include <guacamole/socket.h> #include <guacamole/socket.h>
#include <guacamole/string.h> #include <guacamole/string.h>
#include <guacamole/user.h> #include <guacamole/user.h>
#include <winpr/file.h>
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>

65
src/protocols/rdp/status.h
View File

@ -1,65 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
#ifndef GUAC_RDP_STATUS_H
#define GUAC_RDP_STATUS_H
/**
* RDP-specific status constants.
*
* @file rdp_status.h
*/
#include "config.h"
/* Include any constants from winpr/file.h, if available */
#ifdef ENABLE_WINPR
#include <winpr/file.h>
#endif
/* Constants which MAY be defined within FreeRDP */
#ifndef STATUS_SUCCESS
#define STATUS_SUCCESS 0x00000000
#define STATUS_NO_MORE_FILES 0x80000006
#define STATUS_DEVICE_OFF_LINE 0x80000010
#define STATUS_NOT_IMPLEMENTED 0xC0000002
#define STATUS_INVALID_PARAMETER 0xC000000D
#define STATUS_NO_SUCH_FILE 0xC000000F
#define STATUS_END_OF_FILE 0xC0000011
#define STATUS_ACCESS_DENIED 0xC0000022
#define STATUS_OBJECT_NAME_COLLISION 0xC0000035
#define STATUS_DISK_FULL 0xC000007F
#define STATUS_FILE_INVALID 0xC0000098
#define STATUS_FILE_IS_A_DIRECTORY 0xC00000BA
#define STATUS_NOT_SUPPORTED 0xC00000BB
#define STATUS_NOT_A_DIRECTORY 0xC0000103
#define STATUS_TOO_MANY_OPENED_FILES 0xC000011F
#define STATUS_CANNOT_DELETE 0xC0000121
#define STATUS_FILE_DELETED 0xC0000123
#define STATUS_FILE_CLOSED 0xC0000128
#endif
/* Constants which are NEVER defined within FreeRDP */
#define STATUS_FILE_SYSTEM_LIMITATION 0xC0000427
#define STATUS_FILE_TOO_LARGE 0xC0000904
#endif