summaryrefslogtreecommitdiffstats
path: root/uirdesktop/types.h
diff options
context:
space:
mode:
authorjsorg71 <jsorg71>2006-06-26 00:16:09 +0000
committerjsorg71 <jsorg71>2006-06-26 00:16:09 +0000
commita2b270e57ab4381f4572ab04338d29f16aec3893 (patch)
tree6a79e7f6b3ab619fa52fb120659d792efeb6dfac /uirdesktop/types.h
parentbaf82d45bcd8e2c55dc3e2ec2540d6c3c52778c1 (diff)
downloadxrdp-proprietary-a2b270e57ab4381f4572ab04338d29f16aec3893.tar.gz
xrdp-proprietary-a2b270e57ab4381f4572ab04338d29f16aec3893.zip
win32 stuff
Diffstat (limited to 'uirdesktop/types.h')
-rw-r--r--uirdesktop/types.h40
1 files changed, 21 insertions, 19 deletions
diff --git a/uirdesktop/types.h b/uirdesktop/types.h
index eed9d8ab..2dc230dc 100644
--- a/uirdesktop/types.h
+++ b/uirdesktop/types.h
@@ -32,16 +32,16 @@ typedef signed short sint16;
typedef unsigned int uint32;
typedef signed int sint32;
-typedef void *HBITMAP;
-typedef void *HGLYPH;
-typedef void *HCOLOURMAP;
-typedef void *HCURSOR;
+typedef void *RD_HBITMAP;
+typedef void *RD_HGLYPH;
+typedef void *RD_HCOLOURMAP;
+typedef void *RD_HCURSOR;
-typedef struct _POINT
+typedef struct _RD_POINT
{
sint16 x, y;
}
-POINT;
+RD_POINT;
typedef struct _COLOURENTRY
{
@@ -95,7 +95,7 @@ typedef struct _FONTGLYPH
sint16 baseline;
uint16 width;
uint16 height;
- HBITMAP pixmap;
+ RD_HBITMAP pixmap;
}
FONTGLYPH;
@@ -155,7 +155,7 @@ typedef struct
uint16 wBitsPerSample;
uint16 cbSize;
uint8 cb[MAX_CBSIZE];
-} WAVEFORMATEX;
+} RD_WAVEFORMATEX;
typedef struct _RDPCOMP
{
@@ -166,20 +166,20 @@ typedef struct _RDPCOMP
RDPCOMP;
/* RDPDR */
-typedef uint32 NTSTATUS;
-typedef uint32 NTHANDLE;
+typedef uint32 RD_NTSTATUS;
+typedef uint32 RD_NTHANDLE;
typedef struct _DEVICE_FNS
{
- NTSTATUS(*create) (uint32 device, uint32 desired_access, uint32 share_mode,
+ RD_NTSTATUS(*create) (uint32 device, uint32 desired_access, uint32 share_mode,
uint32 create_disposition, uint32 flags_and_attributes, char *filename,
- NTHANDLE * handle);
- NTSTATUS(*close) (NTHANDLE handle);
- NTSTATUS(*read) (NTHANDLE handle, uint8 * data, uint32 length, uint32 offset,
+ RD_NTHANDLE * handle);
+ RD_NTSTATUS(*close) (RD_NTHANDLE handle);
+ RD_NTSTATUS(*read) (RD_NTHANDLE handle, uint8 * data, uint32 length, uint32 offset,
uint32 * result);
- NTSTATUS(*write) (NTHANDLE handle, uint8 * data, uint32 length, uint32 offset,
+ RD_NTSTATUS(*write) (RD_NTHANDLE handle, uint8 * data, uint32 length, uint32 offset,
uint32 * result);
- NTSTATUS(*device_control) (NTHANDLE handle, uint32 request, STREAM in, STREAM out);
+ RD_NTSTATUS(*device_control) (RD_NTHANDLE handle, uint32 request, STREAM in, STREAM out);
}
DEVICE_FNS;
@@ -187,7 +187,7 @@ DEVICE_FNS;
typedef struct rdpdr_device_info
{
uint32 device_type;
- NTHANDLE handle;
+ RD_NTHANDLE handle;
char name[8];
char *local_path;
void *pdevice_data;
@@ -251,7 +251,8 @@ NOTIFY;
#ifndef PATH_MAX
#define PATH_MAX 256
#endif
-
+
+#ifndef _WIN32
typedef struct fileinfo
{
uint32 device_id, flags_and_attributes, accessmask;
@@ -263,6 +264,7 @@ typedef struct fileinfo
NOTIFY notify;
uint32 info_class;
}
-FILEINFO;
+FILEINFO;
+#endif
typedef BOOL(*str_handle_lines_t) (const char *line, void *data);