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

libfreerdp: header cleanup

This commit is contained in:
Marc-André Moreau 2012-12-14 00:25:48 -05:00
parent 808fc210e3
commit 709e66a596
86 changed files with 276 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/freerdp/altsec.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __UPDATE_ALTSEC_H
#define __UPDATE_ALTSEC_H
#ifndef FREERDP_UPDATE_ALTSEC_H
#define FREERDP_UPDATE_ALTSEC_H
#include <freerdp/types.h>
@ -214,4 +214,4 @@ struct rdp_altsec_update
};
typedef struct rdp_altsec_update rdpAltSecUpdate;
#endif /* __UPDATE_ALTSEC_H */
#endif /* FREERDP_UPDATE_ALTSEC_H */

6
include/freerdp/cache/bitmap.h vendored
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __BITMAP_V2_CACHE_H
#define __BITMAP_V2_CACHE_H
#ifndef FREERDP_BITMAP_V2_CACHE_H
#define FREERDP_BITMAP_V2_CACHE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -67,4 +67,4 @@ FREERDP_API void bitmap_cache_register_callbacks(rdpUpdate* update);
FREERDP_API rdpBitmapCache* bitmap_cache_new(rdpSettings* settings);
FREERDP_API void bitmap_cache_free(rdpBitmapCache* bitmap_cache);
#endif /* __BITMAP_V2_CACHE_H */
#endif /* FREERDP_BITMAP_V2_CACHE_H */

6
include/freerdp/cache/brush.h vendored
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __BRUSH_CACHE_H
#define __BRUSH_CACHE_H
#ifndef FREERDP_BRUSH_CACHE_H
#define FREERDP_BRUSH_CACHE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -64,4 +64,4 @@ FREERDP_API void brush_cache_register_callbacks(rdpUpdate* update);
FREERDP_API rdpBrushCache* brush_cache_new(rdpSettings* settings);
FREERDP_API void brush_cache_free(rdpBrushCache* brush);
#endif /* __BRUSH_CACHE_H */
#endif /* FREERDP_BRUSH_CACHE_H */

6
include/freerdp/cache/cache.h vendored
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __CACHE_H
#define __CACHE_H
#ifndef FREERDP_CACHE_H
#define FREERDP_CACHE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -51,4 +51,4 @@ struct rdp_cache
FREERDP_API rdpCache* cache_new(rdpSettings* settings);
FREERDP_API void cache_free(rdpCache* cache);
#endif /* __CACHE_H */
#endif /* FREERDP_CACHE_H */

6
include/freerdp/cache/glyph.h vendored
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GLYPH_CACHE_H
#define __GLYPH_CACHE_H
#ifndef FREERDP_GLYPH_CACHE_H
#define FREERDP_GLYPH_CACHE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -70,4 +70,4 @@ FREERDP_API void glyph_cache_register_callbacks(rdpUpdate* update);
FREERDP_API rdpGlyphCache* glyph_cache_new(rdpSettings* settings);
FREERDP_API void glyph_cache_free(rdpGlyphCache* glyph);
#endif /* __GLYPH_CACHE_H */
#endif /* FREERDP_GLYPH_CACHE_H */

6
include/freerdp/cache/nine_grid.h vendored
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __NINE_GRID_CACHE_H
#define __NINE_GRID_CACHE_H
#ifndef FREERDP_NINE_GRID_CACHE_H
#define FREERDP_NINE_GRID_CACHE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -60,4 +60,4 @@ FREERDP_API void nine_grid_cache_register_callbacks(rdpUpdate* update);
FREERDP_API rdpNineGridCache* nine_grid_cache_new(rdpSettings* settings);
FREERDP_API void nine_grid_cache_free(rdpNineGridCache* nine_grid);
#endif /* __NINE_GRID_CACHE_H */
#endif /* FREERDP_NINE_GRID_CACHE_H */

6
include/freerdp/cache/offscreen.h vendored
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __OFFSCREEN_CACHE_H
#define __OFFSCREEN_CACHE_H
#ifndef FREERDP_OFFSCREEN_CACHE_H
#define FREERDP_OFFSCREEN_CACHE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -52,4 +52,4 @@ FREERDP_API void offscreen_cache_register_callbacks(rdpUpdate* update);
FREERDP_API rdpOffscreenCache* offscreen_cache_new(rdpSettings* settings);
FREERDP_API void offscreen_cache_free(rdpOffscreenCache* offscreen);
#endif /* __OFFSCREEN_CACHE_H */
#endif /* FREERDP_OFFSCREEN_CACHE_H */

6
include/freerdp/cache/palette.h vendored
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __PALETTE_CACHE_H
#define __PALETTE_CACHE_H
#ifndef FREERDP_PALETTE_CACHE_H
#define FREERDP_PALETTE_CACHE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -54,4 +54,4 @@ FREERDP_API void palette_cache_register_callbacks(rdpUpdate* update);
FREERDP_API rdpPaletteCache* palette_cache_new(rdpSettings* settings);
FREERDP_API void palette_cache_free(rdpPaletteCache* palette_cache);
#endif /* __PALETTE_CACHE_H */
#endif /* FREERDP_PALETTE_CACHE_H */

6
include/freerdp/cache/pointer.h vendored
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __POINTER_CACHE_H
#define __POINTER_CACHE_H
#ifndef FREERDP_POINTER_CACHE_H
#define FREERDP_POINTER_CACHE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -50,4 +50,4 @@ FREERDP_API void pointer_cache_register_callbacks(rdpUpdate* update);
FREERDP_API rdpPointerCache* pointer_cache_new(rdpSettings* settings);
FREERDP_API void pointer_cache_free(rdpPointerCache* pointer_cache);
#endif /* __POINTER_CACHE_H */
#endif /* FREERDP_POINTER_CACHE_H */

6
include/freerdp/channels/channels.h
View File

@ -18,8 +18,8 @@
* limitations under the License.
*/
#ifndef __FREERDP_CHANNELS_H
#define __FREERDP_CHANNELS_H
#ifndef FREERDP_CHANNELS_H
#define FREERDP_CHANNELS_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -52,4 +52,4 @@ FREERDP_API void freerdp_channels_close(rdpChannels* channels, freerdp* instance
}
#endif
#endif /* __FREERDP_CHANNELS_H */
#endif /* FREERDP_CHANNELS_H */

6
include/freerdp/channels/wtsvc.h
View File

@ -29,8 +29,8 @@
* implementation are thread-safe.
*/
#ifndef __FREERDP_WTSVC_H
#define __FREERDP_WTSVC_H
#ifndef FREERDP_WTSVC_H
#define FREERDP_WTSVC_H
#include <freerdp/types.h>
#include <freerdp/peer.h>
@ -127,4 +127,4 @@ FREERDP_API BOOL WTSVirtualChannelWrite(
FREERDP_API BOOL WTSVirtualChannelClose(
/* __in */ void* hChannelHandle);
#endif /* __FREERDP_WTSVC_H */
#endif /* FREERDP_WTSVC_H */

6
include/freerdp/client/cliprdr.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __CLIPRDR_PLUGIN
#define __CLIPRDR_PLUGIN
#ifndef FREERDP_CHANNEL_CLIENT_CLIPRDR_H
#define FREERDP_CHANNEL_CLIENT_CLIPRDR_H
/**
* Event Types
@ -71,4 +71,4 @@ struct _RDP_CB_DATA_RESPONSE_EVENT
};
typedef struct _RDP_CB_DATA_RESPONSE_EVENT RDP_CB_DATA_RESPONSE_EVENT;
#endif /* __CLIPRDR_PLUGIN */
#endif /* FREERDP_CHANNEL_CLIENT_CLIPRDR_H */

7
include/freerdp/client/cmdline.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef FREERDP_CLIENT_CMDLINE
#define FREERDP_CLIENT_CMDLINE
#ifndef FREERDP_CLIENT_CMDLINE_H
#define FREERDP_CLIENT_CMDLINE_H
#include <freerdp/api.h>
#include <freerdp/freerdp.h>
@ -36,5 +36,4 @@ FREERDP_API int freerdp_client_add_device_channel(rdpSettings* settings, int cou
FREERDP_API int freerdp_client_add_static_channel(rdpSettings* settings, int count, char** params);
FREERDP_API int freerdp_client_add_dynamic_channel(rdpSettings* settings, int count, char** params);
#endif /* FREERDP_CLIENT_CMDLINE */
#endif /* FREERDP_CLIENT_CMDLINE_H */

6
include/freerdp/client/file.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef FREERDP_CLIENT_RDP_FILE
#define FREERDP_CLIENT_RDP_FILE
#ifndef FREERDP_CLIENT_RDP_FILE_H
#define FREERDP_CLIENT_RDP_FILE_H
#include <freerdp/api.h>
#include <freerdp/freerdp.h>
@ -140,4 +140,4 @@ FREERDP_API BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, r
FREERDP_API rdpFile* freerdp_client_rdp_file_new();
FREERDP_API void freerdp_client_rdp_file_free(rdpFile* file);
#endif /* FREERDP_CLIENT_RDP_FILE */
#endif /* FREERDP_CLIENT_RDP_FILE_H */

6
include/freerdp/client/tsmf.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __TSMF_PLUGIN
#define __TSMF_PLUGIN
#ifndef FREERDP_CHANNEL_CLIENT_TSMF_H
#define FREERDP_CHANNEL_CLIENT_TSMF_H
/**
* Event Types
@ -61,4 +61,4 @@ typedef struct _RDP_REDRAW_EVENT RDP_REDRAW_EVENT;
#define RDP_PIXFMT_I420 0x30323449
#define RDP_PIXFMT_YV12 0x32315659
#endif /* __TSMF_PLUGIN */
#endif /* FREERDP_CHANNEL_CLIENT_TSMF_H */

6
include/freerdp/codec/bitmap.h
View File

@ -17,12 +17,12 @@
* limitations under the License.
*/
#ifndef __BITMAP_H
#define __BITMAP_H
#ifndef FREERDP_CODEC_BITMAP_H
#define FREERDP_CODEC_BITMAP_H
#include <freerdp/api.h>
#include <freerdp/types.h>
FREERDP_API BOOL bitmap_decompress(BYTE* srcData, BYTE* dstData, int width, int height, int size, int srcBpp, int dstBpp);
#endif /* __BITMAP_H */
#endif /* FREERDP_CODEC_BITMAP_H */

6
include/freerdp/codec/color.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __COLOR_H
#define __COLOR_H
#ifndef FREERDP_CODEC_COLOR_H
#define FREERDP_CODEC_COLOR_H
#include <freerdp/api.h>
#include <freerdp/freerdp.h>
@ -264,4 +264,4 @@ FREERDP_API void freerdp_clrconv_free(HCLRCONV clrconv);
}
#endif
#endif /* __COLOR_H */
#endif /* FREERDP_CODEC_COLOR_H */

6
include/freerdp/codec/mppc_dec.h
View File

@ -18,8 +18,8 @@
* limitations under the License.
*/
#ifndef __MPPC_H
#define __MPPC_H
#ifndef FREERDP_CODEC_MPPC_DECODER_H
#define FREERDP_CODEC_MPPC_DECODER_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -53,4 +53,4 @@ FREERDP_API int decompress_rdp_61(struct rdp_mppc_dec* dec, BYTE* cbuf, int len,
FREERDP_API struct rdp_mppc_dec* mppc_dec_new(void);
FREERDP_API void mppc_dec_free(struct rdp_mppc_dec* dec);
#endif
#endif /* FREERDP_CODEC_MPPC_DECODER_H */

6
include/freerdp/codec/mppc_enc.h
View File

@ -18,8 +18,8 @@
* limitations under the License.
*/
#ifndef __MPPC_ENC_H
#define __MPPC_ENC_H
#ifndef FREERDP_CODEC_MPPC_ENCODER_H
#define FREERDP_CODEC_MPPC_ENCODER_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -48,4 +48,4 @@ FREERDP_API BOOL compress_rdp_5(struct rdp_mppc_enc* enc, BYTE* srcData, int len
FREERDP_API struct rdp_mppc_enc* mppc_enc_new(int protocol_type);
FREERDP_API void mppc_enc_free(struct rdp_mppc_enc* enc);
#endif
#endif /* FREERDP_CODEC_MPPC_ENCODER_H */

6
include/freerdp/codec/nsc.h
View File

@ -18,8 +18,8 @@
* limitations under the License.
*/
#ifndef __NSC_H
#define __NSC_H
#ifndef FREERDP_CODEC_NSCODEC_H
#define FREERDP_CODEC_NSCODEC_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -77,4 +77,4 @@ FREERDP_API void nsc_context_free(NSC_CONTEXT* context);
}
#endif
#endif /* __NSC_H */
#endif /* FREERDP_CODEC_NSCODEC_H */

6
include/freerdp/codec/rfx.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __RFX_H
#define __RFX_H
#ifndef FREERDP_CODEC_REMOTEFX_H
#define FREERDP_CODEC_REMOTEFX_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -134,4 +134,4 @@ FREERDP_API void rfx_compose_message(RFX_CONTEXT* context, STREAM* s,
}
#endif
#endif /* __RFX_H */
#endif /* FREERDP_CODEC_REMOTEFX_H */

6
include/freerdp/constants.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __FREERDP_CONSTANTS
#define __FREERDP_CONSTANTS
#ifndef FREERDP_CONSTANTS_H
#define FREERDP_CONSTANTS_H
/**
* Codec IDs
@ -110,4 +110,4 @@ typedef enum RDP_PIXEL_FORMAT RDP_PIXEL_FORMAT;
#define OSMINORTYPE_NATIVE_XSERVER 0x0007
#define OSMINORTYPE_PSEUDO_XSERVER 0x0008
#endif
#endif /* FREERDP_CONSTANTS_H */

6
include/freerdp/dvc.h
View File

@ -48,8 +48,8 @@
* Create IWTSVirtualChannelCallback instance if the new channel is accepted
*/
#ifndef __FREERDP_DVC_H
#define __FREERDP_DVC_H
#ifndef FREERDP_DVC_H
#define FREERDP_DVC_H
#include <freerdp/types.h>
#include <freerdp/addin.h>
@ -151,4 +151,4 @@ struct _IDRDYNVC_ENTRY_POINTS
typedef int (*PDVC_PLUGIN_ENTRY) (IDRDYNVC_ENTRY_POINTS*);
#endif
#endif /* FREERDP_DVC_H */

27
include/freerdp/errorcodes.h → include/freerdp/error.h
View File

@ -1,12 +1,24 @@
/*
* File: errorcodes.h
* Author: Arvid
/**
* FreeRDP: A Remote Desktop Protocol Implementation
* Error Codes
*
* Created on April 13, 2012, 9:09 AM
* Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
*
* Licensed 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 ERRORCODES_H
#define ERRORCODES_H
#ifndef FREERDP_ERROR_H
#define FREERDP_ERROR_H
#ifdef __cplusplus
extern "C" {
@ -36,5 +48,4 @@ extern int connectErrorCode;
}
#endif
#endif /* ERRORCODES_H */
#endif /* FREERDP_ERROR_H */

7
include/freerdp/extension.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __RDP_EXTENSION_H
#define __RDP_EXTENSION_H
#ifndef FREERDP_EXTENSION_H
#define FREERDP_EXTENSION_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -55,5 +55,4 @@ typedef FREERDP_EXTENSION_ENTRY_POINTS* PFREERDP_EXTENSION_ENTRY_POINTS;
typedef int (FREERDP_CC* PFREERDP_EXTENSION_ENTRY)(PFREERDP_EXTENSION_ENTRY_POINTS pEntryPoints);
#endif /* __RDP_EXTENSION_H */
#endif /* FREERDP_EXTENSION_H */

8
include/freerdp/freerdp.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __FREERDP_H
#define __FREERDP_H
#ifndef FREERDP_H
#define FREERDP_H
typedef struct rdp_rdp rdpRdp;
typedef struct rdp_gdi rdpGdi;
@ -33,13 +33,13 @@ typedef struct rdp_freerdp_peer freerdp_peer;
#include <freerdp/api.h>
#include <freerdp/types.h>
#include <freerdp/error.h>
#include <freerdp/settings.h>
#include <freerdp/extension.h>
#include <freerdp/utils/stream.h>
#include <freerdp/input.h>
#include <freerdp/update.h>
#include <freerdp/errorcodes.h>
#ifdef __cplusplus
extern "C" {
@ -202,4 +202,4 @@ FREERDP_API void freerdp_free(freerdp* instance);
}
#endif
#endif
#endif /* FREERDP_H */

5
include/freerdp/gdi/16bpp.h
View File

@ -17,6 +17,9 @@
* limitations under the License.
*/
#ifndef FREERDP_GDI_16BPP_H
#define FREERDP_GDI_16BPP_H
#include <freerdp/api.h>
#include <freerdp/freerdp.h>
#include <freerdp/gdi/gdi.h>
@ -29,3 +32,5 @@ FREERDP_API int FillRect_16bpp(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr);
FREERDP_API int BitBlt_16bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc, int rop);
FREERDP_API int PatBlt_16bpp(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop);
FREERDP_API int LineTo_16bpp(HGDI_DC hdc, int nXEnd, int nYEnd);
#endif /* FREERDP_GDI_16BPP_H */

5
include/freerdp/gdi/32bpp.h
View File

@ -17,6 +17,9 @@
* limitations under the License.
*/
#ifndef FREERDP_GDI_32BPP_H
#define FREERDP_GDI_32BPP_H
#include <freerdp/api.h>
#include <freerdp/freerdp.h>
#include <freerdp/gdi/gdi.h>
@ -29,3 +32,5 @@ FREERDP_API int FillRect_32bpp(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr);
FREERDP_API int BitBlt_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc, int rop);
FREERDP_API int PatBlt_32bpp(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop);
FREERDP_API int LineTo_32bpp(HGDI_DC hdc, int nXEnd, int nYEnd);
#endif /* FREERDP_GDI_32BPP_H */

5
include/freerdp/gdi/8bpp.h
View File

@ -17,6 +17,9 @@
* limitations under the License.
*/
#ifndef FREERDP_GDI_8BPP_H
#define FREERDP_GDI_8BPP_H
#include <freerdp/api.h>
#include <freerdp/freerdp.h>
#include <freerdp/gdi/gdi.h>
@ -29,3 +32,5 @@ FREERDP_API int FillRect_8bpp(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr);
FREERDP_API int BitBlt_8bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc, int rop);
FREERDP_API int PatBlt_8bpp(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop);
FREERDP_API int LineTo_8bpp(HGDI_DC hdc, int nXEnd, int nYEnd);
#endif /* FREERDP_GDI_8BPP_H */

6
include/freerdp/gdi/bitmap.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_BITMAP_H
#define __GDI_BITMAP_H
#ifndef FREERDP_GDI_BITMAP_H
#define FREERDP_GDI_BITMAP_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -40,4 +40,4 @@ FREERDP_API int gdi_BitBlt(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth,
typedef int (*p_BitBlt)(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc, int rop);
#endif /* __GDI_BITMAP_H */
#endif /* FREERDP_GDI_BITMAP_H */

6
include/freerdp/gdi/brush.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_BRUSH_H
#define __GDI_BRUSH_H
#ifndef FREERDP_GDI_BRUSH_H
#define FREERDP_GDI_BRUSH_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -29,4 +29,4 @@ FREERDP_API int gdi_PatBlt(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int
typedef int (*p_PatBlt)(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop);
#endif /* __GDI_BRUSH_H */
#endif /* FREERDP_GDI_BRUSH_H */

6
include/freerdp/gdi/clipping.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_CLIPPING_H
#define __GDI_CLIPPING_H
#ifndef FREERDP_GDI_CLIPPING_H
#define FREERDP_GDI_CLIPPING_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -28,4 +28,4 @@ FREERDP_API HGDI_RGN gdi_GetClipRgn(HGDI_DC hdc);
FREERDP_API int gdi_SetNullClipRgn(HGDI_DC hdc);
FREERDP_API int gdi_ClipCoords(HGDI_DC hdc, int *x, int *y, int *w, int *h, int *srcx, int *srcy);
#endif /* __GDI_CLIPPING_H */
#endif /* FREERDP_GDI_CLIPPING_H */

6
include/freerdp/gdi/dc.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_DC_H
#define __GDI_DC_H
#ifndef FREERDP_GDI_DC_H
#define FREERDP_GDI_DC_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -30,4 +30,4 @@ FREERDP_API HGDIOBJECT gdi_SelectObject(HGDI_DC hdc, HGDIOBJECT hgdiobject);
FREERDP_API int gdi_DeleteObject(HGDIOBJECT hgdiobject);
FREERDP_API int gdi_DeleteDC(HGDI_DC hdc);
#endif /* __GDI_DC_H */
#endif /* FREERDP_GDI_DC_H */

6
include/freerdp/gdi/drawing.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_DRAWING_H
#define __GDI_DRAWING_H
#ifndef FREERDP_GDI_DRAWING_H
#define FREERDP_GDI_DRAWING_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -31,4 +31,4 @@ FREERDP_API int gdi_GetBkMode(HGDI_DC hdc);
FREERDP_API int gdi_SetBkMode(HGDI_DC hdc, int iBkMode);
FREERDP_API GDI_COLOR gdi_SetTextColor(HGDI_DC hdc, GDI_COLOR crColor);
#endif /* __GDI_DRAWING_H */
#endif /* FREERDP_GDI_DRAWING_H */

6
include/freerdp/gdi/gdi.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_H
#define __GDI_H
#ifndef FREERDP_GDI_H
#define FREERDP_GDI_H
#include <freerdp/api.h>
#include <freerdp/freerdp.h>
@ -296,4 +296,4 @@ FREERDP_API void gdi_free(freerdp* instance);
#define DEBUG_GDI(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__)
#endif
#endif /* __GDI_H */
#endif /* FREERDP_GDI_H */

6
include/freerdp/gdi/line.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_LINE_H
#define __GDI_LINE_H
#ifndef FREERDP_GDI_LINE_H
#define FREERDP_GDI_LINE_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -31,4 +31,4 @@ FREERDP_API int gdi_MoveToEx(HGDI_DC hdc, int X, int Y, HGDI_POINT lpPoint);
typedef int (*p_LineTo)(HGDI_DC hdc, int nXEnd, int nYEnd);
#endif /* __GDI_LINE_H */
#endif /* FREERDP_GDI_LINE_H */

6
include/freerdp/gdi/palette.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_PALETTE_H
#define __GDI_PALETTE_H
#ifndef FREERDP_GDI_PALETTE_H
#define FREERDP_GDI_PALETTE_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -26,4 +26,4 @@
FREERDP_API HGDI_PALETTE gdi_CreatePalette(HGDI_PALETTE palette);
FREERDP_API HGDI_PALETTE gdi_GetSystemPalette();
#endif /* __GDI_PALETTE_H */
#endif /* FREERDP_GDI_PALETTE_H */

6
include/freerdp/gdi/pen.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_PEN_H
#define __GDI_PEN_H
#ifndef FREERDP_GDI_PEN_H
#define FREERDP_GDI_PEN_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -28,4 +28,4 @@ FREERDP_API BYTE gdi_GetPenColor_8bpp(HGDI_PEN pen);
FREERDP_API UINT16 gdi_GetPenColor_16bpp(HGDI_PEN pen);
FREERDP_API UINT32 gdi_GetPenColor_32bpp(HGDI_PEN pen);
#endif /* __GDI_PEN_H */
#endif /* FREERDP_GDI_PEN_H */

6
include/freerdp/gdi/region.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_REGION_H
#define __GDI_REGION_H
#ifndef FREERDP_GDI_REGION_H
#define FREERDP_GDI_REGION_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -42,4 +42,4 @@ FREERDP_API int gdi_CopyRect(HGDI_RECT dst, HGDI_RECT src);
FREERDP_API int gdi_PtInRect(HGDI_RECT rc, int x, int y);
FREERDP_API int gdi_InvalidateRegion(HGDI_DC hdc, int x, int y, int w, int h);
#endif /* __GDI_REGION_H */
#endif /* FREERDP_GDI_REGION_H */

6
include/freerdp/gdi/shape.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GDI_SHAPE_H
#define __GDI_SHAPE_H
#ifndef FREERDP_GDI_SHAPE_H
#define FREERDP_GDI_SHAPE_H
#include <freerdp/api.h>
#include <freerdp/gdi/gdi.h>
@ -31,4 +31,4 @@ FREERDP_API int gdi_Rectangle(HGDI_DC hdc, int nLeftRect, int nTopRect, int nRig
typedef int (*p_FillRect)(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr);
#endif /* __GDI_SHAPE_H */
#endif /* FREERDP_GDI_SHAPE_H */

6
include/freerdp/graphics.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __GRAPHICS_H
#define __GRAPHICS_H
#ifndef FREERDP_GRAPHICS_H
#define FREERDP_GRAPHICS_H
typedef struct rdp_bitmap rdpBitmap;
typedef struct rdp_pointer rdpPointer;
@ -166,4 +166,4 @@ FREERDP_API void graphics_register_glyph(rdpGraphics* graphics, rdpGlyph* glyph)
FREERDP_API rdpGraphics* graphics_new(rdpContext* context);
FREERDP_API void graphics_free(rdpGraphics* graphics);
#endif /* __GRAPHICS_H */
#endif /* FREERDP_GRAPHICS_H */

6
include/freerdp/input.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __INPUT_API_H
#define __INPUT_API_H
#ifndef FREERDP_INPUT_H
#define FREERDP_INPUT_H
typedef struct rdp_input rdpInput;
@ -81,4 +81,4 @@ FREERDP_API void freerdp_input_send_unicode_keyboard_event(rdpInput* input, UINT
FREERDP_API void freerdp_input_send_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y);
FREERDP_API void freerdp_input_send_extended_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y);
#endif /* __INPUT_API_H */
#endif /* FREERDP_INPUT_H */

7
include/freerdp/listener.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __FREERDP_LISTENER_H
#define __FREERDP_LISTENER_H
#ifndef FREERDP_LISTENER_H
#define FREERDP_LISTENER_H
typedef struct rdp_freerdp_listener freerdp_listener;
@ -63,5 +63,4 @@ FREERDP_API void freerdp_listener_free(freerdp_listener* instance);
}
#endif
#endif
#endif /* FREERDP_LISTENER_H */

6
include/freerdp/locale/keyboard.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __FREERDP_LOCALE_KEYBOARD_H
#define __FREERDP_LOCALE_KEYBOARD_H
#ifndef FREERDP_LOCALE_KEYBOARD_H
#define FREERDP_LOCALE_KEYBOARD_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -205,4 +205,4 @@ FREERDP_API RDP_SCANCODE freerdp_keyboard_get_rdp_scancode_from_x11_keycode(UINT
FREERDP_API UINT32 freerdp_keyboard_get_x11_keycode_from_rdp_scancode(UINT32 scancode, BOOL extended);
FREERDP_API RDP_SCANCODE freerdp_keyboard_get_rdp_scancode_from_virtual_key_code(UINT32 vkcode);
#endif /* __FREERDP_LOCALE_KEYBOARD_H */
#endif /* FREERDP_LOCALE_KEYBOARD_H */

6
include/freerdp/locale/locale.h
View File

@ -24,8 +24,8 @@
* http://www.microsoft.com/globaldev/reference/winxp/xp-lcid.mspx
*/
#ifndef __FREERDP_LOCALE_H
#define __FREERDP_LOCALE_H
#ifndef FREERDP_LOCALE_H
#define FREERDP_LOCALE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -234,4 +234,4 @@ FREERDP_API UINT32 freerdp_get_system_locale_id();
FREERDP_API UINT32 freerdp_detect_keyboard_layout_from_system_locale();
FREERDP_API const char* freerdp_get_system_locale_name_from_id(UINT32 localeId);
#endif /* __FREERDP_LOCALE_H */
#endif /* FREERDP_LOCALE_H */

6
include/freerdp/locale/timezone.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __LOCALE_TIMEZONE_H
#define __LOCALE_TIMEZONE_H
#ifndef FREERDP_LOCALE_TIMEZONE_H
#define FREERDP_LOCALE_TIMEZONE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -26,4 +26,4 @@
FREERDP_API void freerdp_time_zone_detect(TIME_ZONE_INFO* clientTimeZone);
#endif /* __LOCALE_TIMEZONE_H */
#endif /* FREERDP_LOCALE_TIMEZONE_H */

6
include/freerdp/locale/vkcodes.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __FREERDP_VIRTUAL_KEY_CODES_H
#define __FREERDP_VIRTUAL_KEY_CODES_H
#ifndef FREERDP_VIRTUAL_KEY_CODES_H
#define FREERDP_VIRTUAL_KEY_CODES_H
#include <freerdp/types.h>
#include <freerdp/api.h>
@ -306,4 +306,4 @@
FREERDP_API const char* freerdp_keyboard_get_virtual_key_code_name(UINT32 vkcode);
FREERDP_API UINT32 freerdp_keyboard_get_virtual_key_code_from_name(const char* vkcode_name);
#endif /* __FREERDP_VIRTUAL_KEY_CODES_H */
#endif /* FREERDP_VIRTUAL_KEY_CODES_H */

7
include/freerdp/peer.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __FREERDP_PEER_H
#define __FREERDP_PEER_H
#ifndef FREERDP_PEER_H
#define FREERDP_PEER_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -87,5 +87,4 @@ FREERDP_API void freerdp_peer_context_free(freerdp_peer* client);
FREERDP_API freerdp_peer* freerdp_peer_new(int sockfd);
FREERDP_API void freerdp_peer_free(freerdp_peer* client);
#endif /* __FREERDP_PEER_H */
#endif /* FREERDP_PEER_H */

6
include/freerdp/pointer.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __UPDATE_POINTER_H
#define __UPDATE_POINTER_H
#ifndef FREERDP_UPDATE_POINTER_H
#define FREERDP_UPDATE_POINTER_H
#include <freerdp/types.h>
@ -99,4 +99,4 @@ struct rdp_pointer_update
};
typedef struct rdp_pointer_update rdpPointerUpdate;
#endif /* __UPDATE_POINTER_H */
#endif /* FREERDP_UPDATE_POINTER_H */

6
include/freerdp/primary.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __UPDATE_PRIMARY_H
#define __UPDATE_PRIMARY_H
#ifndef FREERDP_UPDATE_PRIMARY_H
#define FREERDP_UPDATE_PRIMARY_H
#include <freerdp/types.h>
@ -496,4 +496,4 @@ struct rdp_primary_update
};
typedef struct rdp_primary_update rdpPrimaryUpdate;
#endif /* __UPDATE_PRIMARY_H */
#endif /* FREERDP_UPDATE_PRIMARY_H */

7
include/freerdp/rail.h
View File

@ -18,8 +18,8 @@
* limitations under the License.
*/
#ifndef __RAIL_GLOBAL_H
#define __RAIL_GLOBAL_H
#ifndef FREERDP_RAIL_GLOBAL_H
#define FREERDP_RAIL_GLOBAL_H
#include <freerdp/types.h>
@ -340,5 +340,4 @@ enum RDP_EVENT_TYPE_RAIL
RDP_EVENT_TYPE_RAIL_CLIENT_LANGBARINFO
};
#endif /* __RAIL_GLOBAL_H */
#endif /* FREERDP_RAIL_GLOBAL_H */

6
include/freerdp/rail/icon.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __RAIL_ICON_CACHE_H
#define __RAIL_ICON_CACHE_H
#ifndef FREERDP_RAIL_ICON_CACHE_H
#define FREERDP_RAIL_ICON_CACHE_H
#include <freerdp/api.h>
#include <freerdp/rail.h>
@ -58,4 +58,4 @@ void icon_cache_put(rdpIconCache* cache, BYTE id, UINT16 index, ICON_INFO* entry
rdpIconCache* icon_cache_new(rdpRail* rail);
void icon_cache_free(rdpIconCache* cache);
#endif /* __RAIL_ICON_H */
#endif /* FREERDP_RAIL_ICON_CACHE_H */

6
include/freerdp/rail/rail.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __RAIL_H
#define __RAIL_H
#ifndef FREERDP_RAIL_H
#define FREERDP_RAIL_H
#include <freerdp/api.h>
#include <freerdp/rail.h>
@ -65,4 +65,4 @@ FREERDP_API void rail_register_update_callbacks(rdpRail* rail, rdpUpdate* update
FREERDP_API rdpRail* rail_new(rdpSettings* settings);
FREERDP_API void rail_free(rdpRail* rail);
#endif /* __RAIL_H */
#endif /* FREERDP_RAIL_H */

6
include/freerdp/rail/window.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __RAIL_WINDOW_H
#define __RAIL_WINDOW_H
#ifndef FREERDP_RAIL_WINDOW_H
#define FREERDP_RAIL_WINDOW_H
#include <freerdp/api.h>
#include <freerdp/rail.h>
@ -73,4 +73,4 @@ FREERDP_API void rail_CreateWindow(rdpRail* rail, rdpWindow* window);
FREERDP_API void rail_UpdateWindow(rdpRail* rail, rdpWindow* window);
FREERDP_API void rail_DestroyWindow(rdpRail* rail, rdpWindow* window);
#endif /* __RAIL_WINDOW_H */
#endif /* FREERDP_RAIL_WINDOW_H */

6
include/freerdp/rail/window_list.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __RAIL_WINDOW_LIST_H
#define __RAIL_WINDOW_LIST_H
#ifndef FREERDP_RAIL_WINDOW_LIST_H
#define FREERDP_RAIL_WINDOW_LIST_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -53,4 +53,4 @@ FREERDP_API void window_list_clear(rdpWindowList* list);
FREERDP_API rdpWindowList* window_list_new(rdpRail* rail);
FREERDP_API void window_list_free(rdpWindowList* list);
#endif /* __RAIL_WINDOW_LIST_H */
#endif /* FREERDP_RAIL_WINDOW_LIST_H */

6
include/freerdp/scancode.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __FREERDP_LOCALE_KEYBOARD_RDP_SCANCODE_H
#define __FREERDP_LOCALE_KEYBOARD_RDP_SCANCODE_H
#ifndef FREERDP_LOCALE_KEYBOARD_RDP_SCANCODE_H
#define FREERDP_LOCALE_KEYBOARD_RDP_SCANCODE_H
/* @msdn{cc240584} says:
* "... (a scancode is an 8-bit value specifying a key location on the keyboard).
@ -182,4 +182,4 @@ typedef UINT32 RDP_SCANCODE; /* Our own representation of a RDP protocol scancod
#define RDP_SCANCODE_NUMLOCK_EXTENDED MAKE_RDP_SCANCODE(0x45, TRUE) /* should be RDP_SCANCODE_NUMLOCK */
#define RDP_SCANCODE_RSHIFT_EXTENDED MAKE_RDP_SCANCODE(0x36, TRUE) /* should be RDP_SCANCODE_RSHIFT */
#endif /* __FREERDP_LOCALE_KEYBOARD_RDP_SCANCODE_H */
#endif /* FREERDP_LOCALE_KEYBOARD_RDP_SCANCODE_H */

6
include/freerdp/secondary.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __UPDATE_SECONDARY_H
#define __UPDATE_SECONDARY_H
#ifndef FREERDP_UPDATE_SECONDARY_H
#define FREERDP_UPDATE_SECONDARY_H
#include <freerdp/types.h>
@ -221,4 +221,4 @@ struct rdp_secondary_update
};
typedef struct rdp_secondary_update rdpSecondaryUpdate;
#endif /* __UPDATE_SECONDARY_H */
#endif /* FREERDP_UPDATE_SECONDARY_H */

6
include/freerdp/server/audin.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __SERVER_AUDIN_H
#define __SERVER_AUDIN_H
#ifndef FREERDP_CHANNEL_AUDIN_SERVER_H
#define FREERDP_CHANNEL_AUDIN_SERVER_H
#include <freerdp/channels/wtsvc.h>
#include <freerdp/channels/rdpsnd.h>
@ -92,4 +92,4 @@ struct _audin_server_context
FREERDP_API audin_server_context* audin_server_context_new(WTSVirtualChannelManager* vcm);
FREERDP_API void audin_server_context_free(audin_server_context* context);
#endif
#endif /* FREERDP_CHANNEL_AUDIN_SERVER_H */

6
include/freerdp/server/rdpsnd.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __SERVER_RDPSND_H
#define __SERVER_RDPSND_H
#ifndef FREERDP_CHANNEL_RDPSND_SERVER_H
#define FREERDP_CHANNEL_RDPSND_SERVER_H
#include <freerdp/channels/wtsvc.h>
#include <freerdp/channels/rdpsnd.h>
@ -94,4 +94,4 @@ struct _rdpsnd_server_context
FREERDP_API rdpsnd_server_context* rdpsnd_server_context_new(WTSVirtualChannelManager* vcm);
FREERDP_API void rdpsnd_server_context_free(rdpsnd_server_context* context);
#endif
#endif /* FREERDP_CHANNEL_RDPSND_SERVER_H */

6
include/freerdp/svc.h
View File

@ -23,8 +23,8 @@
* http://msdn.microsoft.com/en-us/library/aa383580.aspx
*/
#ifndef __FREERDP_SVC_H
#define __FREERDP_SVC_H
#ifndef FREERDP_SVC_H
#define FREERDP_SVC_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -113,4 +113,4 @@ struct _CHANNEL_ENTRY_POINTS_EX
typedef struct _CHANNEL_ENTRY_POINTS_EX CHANNEL_ENTRY_POINTS_EX;
typedef CHANNEL_ENTRY_POINTS_EX* PCHANNEL_ENTRY_POINTS_EX;
#endif
#endif /* FREERDP_SVC_H */

7
include/freerdp/update.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __UPDATE_API_H
#define __UPDATE_API_H
#ifndef FREERDP_UPDATE_H
#define FREERDP_UPDATE_H
typedef struct rdp_update rdpUpdate;
@ -193,5 +193,4 @@ struct rdp_update
SURFACE_FRAME_MARKER surface_frame_marker;
};
#endif /* __UPDATE_API_H */
#endif /* FREERDP_UPDATE_H */

6
include/freerdp/utils/bitmap.h
View File

@ -17,11 +17,11 @@
* limitations under the License.
*/
#ifndef __UTILS_BITMAP_H
#define __UTILS_BITMAP_H
#ifndef FREERDP_UTILS_BITMAP_H
#define FREERDP_UTILS_BITMAP_H
#include <freerdp/api.h>
FREERDP_API void freerdp_bitmap_write(char* filename, void* data, int width, int height, int bpp);
#endif /* __UTILS_BITMAP_H */
#endif /* FREERDP_UTILS_BITMAP_H */

6
include/freerdp/utils/debug.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __UTILS_DEBUG_H
#define __UTILS_DEBUG_H
#ifndef FREERDP_UTILS_DEBUG_H
#define FREERDP_UTILS_DEBUG_H
#include <stdio.h>
@ -33,4 +33,4 @@
#define DEBUG(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__)
#endif
#endif /* __UTILS_DEBUG_H */
#endif /* FREERDP_UTILS_DEBUG_H */

6
include/freerdp/utils/dsp.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __DSP_UTILS_H
#define __DSP_UTILS_H
#ifndef FREERDP_UTILS_DSP_H
#define FREERDP_UTILS_DSP_H
#include <freerdp/api.h>
@ -73,5 +73,5 @@ FREERDP_API FREERDP_DSP_CONTEXT* freerdp_dsp_context_new(void);
FREERDP_API void freerdp_dsp_context_free(FREERDP_DSP_CONTEXT* context);
#define freerdp_dsp_context_reset_adpcm(_c) memset(&_c->adpcm, 0, sizeof(ADPCM))
#endif /* __DSP_UTILS_H */
#endif /* FREERDP_UTILS_DSP_H */

6
include/freerdp/utils/event.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __EVENT_UTILS_H
#define __EVENT_UTILS_H
#ifndef FREERDP_UTILS_EVENT_H
#define FREERDP_UTILS_EVENT_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -27,4 +27,4 @@ FREERDP_API RDP_EVENT* freerdp_event_new(UINT16 event_class, UINT16 event_type,
RDP_EVENT_CALLBACK on_event_free_callback, void* user_data);
FREERDP_API void freerdp_event_free(RDP_EVENT* event);
#endif
#endif /* FREERDP_UTILS_EVENT_H */

6
include/freerdp/utils/file.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __FILE_UTILS_H
#define __FILE_UTILS_H
#ifndef FREERDP_UTILS_FILE_H
#define FREERDP_UTILS_FILE_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -35,4 +35,4 @@ FREERDP_API char* freerdp_get_parent_path(char* base_path, int depth);
FREERDP_API BOOL freerdp_path_contains_separator(char* path);
FREERDP_API void freerdp_detect_paths(rdpSettings* settings);
#endif /* __FILE_UTILS_H */
#endif /* FREERDP_UTILS_FILE_H */

6
include/freerdp/utils/list.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __LIST_UTILS_H
#define __LIST_UTILS_H
#ifndef FREERDP_UTILS_LIST_H
#define FREERDP_UTILS_LIST_H
#include <freerdp/api.h>
@ -50,4 +50,4 @@ FREERDP_API void* list_next(LIST* list, void* data);
FREERDP_API void* list_remove(LIST* list, void* data);
FREERDP_API int list_size(LIST* list);
#endif /* __LIST_UTILS_H */
#endif /* FREERDP_UTILS_LIST_H */

6
include/freerdp/utils/msusb.h
View File

@ -18,8 +18,8 @@
* limitations under the License.
*/
#ifndef __MSCONFIG_H
#define __MSCONFIG_H
#ifndef FREERDP_UTILS_MSCONFIG_H
#define FREERDP_UTILS_MSCONFIG_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -135,4 +135,4 @@ FREERDP_API MSUSB_CONFIG_DESCRIPTOR* msusb_msconfig_read(BYTE* data, UINT32 data
FREERDP_API int msusb_msconfig_write(MSUSB_CONFIG_DESCRIPTOR* MsConfg, BYTE* data, int * offset);
FREERDP_API void msusb_msconfig_dump(MSUSB_CONFIG_DESCRIPTOR* MsConfg);
#endif
#endif /* FREERDP_UTILS_MSCONFIG_H */

6
include/freerdp/utils/passphrase.h
View File

@ -17,12 +17,12 @@
* limitations under the License.
*/
#ifndef __UTILS_PASSPHRASE_H
#define __UTILS_PASSPHRASE_H
#ifndef FREERDP_UTILS_PASSPHRASE_H
#define FREERDP_UTILS_PASSPHRASE_H
#include <stdlib.h>
#include <freerdp/api.h>
FREERDP_API char* freerdp_passphrase_read(const char* prompt, char* buf, size_t bufsiz, int from_stdin);
#endif /* __UTILS_PASSPHRASE_H */
#endif /* FREERDP_UTILS_PASSPHRASE_H */

6
include/freerdp/utils/pcap.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __UTILS_PCAP_H
#define __UTILS_PCAP_H
#ifndef FREERDP_UTILS_PCAP_H
#define FREERDP_UTILS_PCAP_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -78,4 +78,4 @@ FREERDP_API BOOL pcap_get_next_record_header(rdpPcap* pcap, pcap_record* record)
FREERDP_API BOOL pcap_get_next_record_content(rdpPcap* pcap, pcap_record* record);
FREERDP_API void pcap_flush(rdpPcap* pcap);
#endif /* __UTILS_PCAP_H */
#endif /* FREERDP_UTILS_PCAP_H */

6
include/freerdp/utils/profiler.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __UTILS_PROFILER_H
#define __UTILS_PROFILER_H
#ifndef FREERDP_UTILS_PROFILER_H
#define FREERDP_UTILS_PROFILER_H
#include <freerdp/api.h>
#include <freerdp/utils/stopwatch.h>
@ -62,4 +62,4 @@ FREERDP_API void profiler_print_footer();
#define PROFILER_PRINT_FOOTER do { } while (0)
#endif
#endif /* __UTILS_PROFILER_H */
#endif /* FREERDP_UTILS_PROFILER_H */

6
include/freerdp/utils/rail.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __RAIL_UTILS_H
#define __RAIL_UTILS_H
#ifndef FREERDP_UTILS_RAIL_H
#define FREERDP_UTILS_RAIL_H
#include <freerdp/api.h>
#include <freerdp/rail.h>
@ -32,4 +32,4 @@ FREERDP_API void rail_write_unicode_string_value(STREAM* s, RAIL_UNICODE_STRING*
FREERDP_API void* rail_clone_order(UINT32 event_type, void* order);
FREERDP_API void rail_free_cloned_order(UINT32 event_type, void* order);
#endif /* __RAIL_UTILS_H */
#endif /* FREERDP_UTILS_RAIL_H */

6
include/freerdp/utils/signal.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __UTILS_SIGNAL_H
#define __UTILS_SIGNAL_H
#ifndef FREERDP_UTILS_SIGNAL_H
#define FREERDP_UTILS_SIGNAL_H
#include <freerdp/api.h>
#ifndef _WIN32
@ -33,4 +33,4 @@ extern struct termios new_flags;
FREERDP_API int freerdp_handle_signals(void);
#endif /* __UTILS_SIGNAL_H */
#endif /* FREERDP_UTILS_SIGNAL_H */

6
include/freerdp/utils/sleep.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __SLEEP_UTILS_H
#define __SLEEP_UTILS_H
#ifndef FREERDP_UTILS_SLEEP_H
#define FREERDP_UTILS_SLEEP_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -26,4 +26,4 @@
FREERDP_API void freerdp_sleep(UINT32 seconds);
FREERDP_API void freerdp_usleep(UINT32 useconds);
#endif /* __SLEEP_UTILS_H */
#endif /* FREERDP_UTILS_SLEEP_H */

6
include/freerdp/utils/stopwatch.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __UTILS_STOPWATCH_H
#define __UTILS_STOPWATCH_H
#ifndef FREERDP_UTILS_STOPWATCH_H
#define FREERDP_UTILS_STOPWATCH_H
#include <time.h>
@ -44,4 +44,4 @@ FREERDP_API void stopwatch_reset(STOPWATCH* stopwatch);
FREERDP_API double stopwatch_get_elapsed_time_in_seconds(STOPWATCH* stopwatch);
FREERDP_API void stopwatch_get_elapsed_time_in_useconds(STOPWATCH* stopwatch, UINT32* sec, UINT32* usec);
#endif /* __UTILS_STOPWATCH_H */
#endif /* FREERDP_UTILS_STOPWATCH_H */

6
include/freerdp/utils/stream.h
View File

@ -18,8 +18,8 @@
* limitations under the License.
*/
#ifndef __STREAM_UTILS_H
#define __STREAM_UTILS_H
#ifndef FREERDP_UTILS_STREAM_H
#define FREERDP_UTILS_STREAM_H
#include <string.h>
#include <freerdp/api.h>
@ -172,5 +172,5 @@ FREERDP_API void stream_extend(STREAM* stream, int request_size);
_src->p += _n; \
} while (0)
#endif /* __STREAM_UTILS_H */
#endif /* FREERDP_UTILS_STREAM_H */

6
include/freerdp/utils/string.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __STRING_UTILS_H
#define __STRING_UTILS_H
#ifndef FREERDP_UTILS_STRING_H
#define FREERDP_UTILS_STRING_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -35,4 +35,4 @@ typedef struct rdp_string rdpString;
FREERDP_API void freerdp_string_read_length32(STREAM* s, rdpString* string);
FREERDP_API void freerdp_string_free(rdpString* string);
#endif /* __STRING_UTILS_H */
#endif /* FREERDP_UTILS_STRING_H */

6
include/freerdp/utils/svc_plugin.h
View File

@ -18,8 +18,8 @@
* limitations under the License.
*/
#ifndef __SVC_PLUGIN_UTILS_H
#define __SVC_PLUGIN_UTILS_H
#ifndef FREERDP_UTILS_SVC_PLUGIN_H
#define FREERDP_UTILS_SVC_PLUGIN_H
/* static channel plugin base implementation */
@ -60,4 +60,4 @@ FREERDP_API int svc_plugin_send_event(rdpSvcPlugin* plugin, RDP_EVENT* event);
#define DEBUG_SVC(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__)
#endif
#endif /* __SVC_PLUGIN_UTILS_H */
#endif /* FREERDP_UTILS_SVC_PLUGIN_H */

6
include/freerdp/utils/thread.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __THREAD_UTILS_H
#define __THREAD_UTILS_H
#ifndef FREERDP_UTILS_THREAD_H
#define FREERDP_UTILS_THREAD_H
#include <freerdp/api.h>
#include <freerdp/types.h>
@ -58,4 +58,4 @@ FREERDP_API void freerdp_thread_free(freerdp_thread* thread);
#define freerdp_thread_lock(_t) WaitForSingleObject(_t->mutex, INFINITE)
#define freerdp_thread_unlock(_t) ReleaseMutex(_t->mutex)
#endif /* __THREAD_UTILS_H */
#endif /* FREERDP_UTILS_THREAD_H */

4
include/freerdp/utils/time.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef FREERDP_TIME_UTILS_H
#define FREERDP_TIME_UTILS_H
#ifndef FREERDP_UTILS_TIME_H
#define FREERDP_UTILS_TIME_H
#define __USE_XOPEN
#include <time.h>

6
include/freerdp/utils/uds.h
View File

@ -17,12 +17,12 @@
* limitations under the License.
*/
#ifndef FREERDP_UDS_UTILS_H
#define FREERDP_UDS_UTILS_H
#ifndef FREERDP_UTILS_UDS_H
#define FREERDP_UTILS_UDS_H
#include <freerdp/api.h>
#include <freerdp/types.h>
FREERDP_API int freerdp_uds_connect(const char* path);
#endif /* FREERDP_UDS_UTILS_H */
#endif /* FREERDP_UTILS_UDS_H */

8
include/freerdp/utils/unicode.h
View File

@ -17,16 +17,16 @@
* limitations under the License.
*/
#ifndef __UNICODE_UTILS_H
#define __UNICODE_UTILS_H
#ifndef FREERDP_UTILS_UNICODE_H
#define FREERDP_UTILS_UNICODE_H
#include <stdio.h>
#include <string.h>
#include <freerdp/api.h>
#include <freerdp/api.h>
#include <freerdp/types.h>
FREERDP_API int freerdp_AsciiToUnicodeAlloc(const CHAR* str, WCHAR** wstr, int length);
FREERDP_API int freerdp_UnicodeToAsciiAlloc(const WCHAR* wstr, CHAR** str, int length);
#endif /* __UNICODE_UTILS_H */
#endif /* FREERDP_UTILS_UNICODE_H */

6
include/freerdp/window.h
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#ifndef __UPDATE_WINDOW_H
#define __UPDATE_WINDOW_H
#ifndef FREERDP_UPDATE_WINDOW_H
#define FREERDP_UPDATE_WINDOW_H
#include <freerdp/types.h>
@ -258,4 +258,4 @@ struct rdp_window_update
};
typedef struct rdp_window_update rdpWindowUpdate;
#endif /* __UPDATE_WINDOW_H */
#endif /* FREERDP_UPDATE_WINDOW_H */

2
libfreerdp/core/connection.c
View File

@ -29,7 +29,7 @@
#include <winpr/crt.h>
#include <freerdp/errorcodes.h>
#include <freerdp/error.h>
/**
* Connection Sequence\n

2
libfreerdp/core/freerdp.c
View File

@ -32,7 +32,7 @@
#include <winpr/crt.h>
#include <freerdp/freerdp.h>
#include <freerdp/errorcodes.h>
#include <freerdp/error.h>
#include <freerdp/locale/keyboard.h>
/* connectErrorCode is 'extern' in errorcodes.h. See comment there.*/

4
libfreerdp/core/transport.c
View File

@ -27,12 +27,12 @@
#include <winpr/crt.h>
#include <winpr/synch.h>
#include <winpr/print.h>
#include <freerdp/error.h>
#include <freerdp/utils/tcp.h>
#include <freerdp/utils/sleep.h>
#include <freerdp/utils/stream.h>
#include <winpr/print.h>
#include <freerdp/errorcodes.h>
#include <time.h>
#include <errno.h>