freerdp: get rid of old types

2026-04-14 16:34:18 +09:00 · 2012-10-09 03:26:39 -04:00
parent 1bf8a45519
commit 9d064171a7
265 changed files with 3634 additions and 3668 deletions
--- a/include/freerdp/altsec.h
+++ b/include/freerdp/altsec.h
@@ -38,129 +38,129 @@

 struct _OFFSCREEN_DELETE_LIST
 {
-	uint32 sIndices;
-	uint32 cIndices;
+	UINT32 sIndices;
+	UINT32 cIndices;
 	UINT16* indices;
 };
 typedef struct _OFFSCREEN_DELETE_LIST OFFSCREEN_DELETE_LIST;

 struct _CREATE_OFFSCREEN_BITMAP_ORDER
 {
-	uint32 id;
-	uint32 cx;
-	uint32 cy;
+	UINT32 id;
+	UINT32 cx;
+	UINT32 cy;
 	OFFSCREEN_DELETE_LIST deleteList;
 };
 typedef struct _CREATE_OFFSCREEN_BITMAP_ORDER CREATE_OFFSCREEN_BITMAP_ORDER;

 struct _SWITCH_SURFACE_ORDER
 {
-	uint32 bitmapId;
+	UINT32 bitmapId;
 };
 typedef struct _SWITCH_SURFACE_ORDER SWITCH_SURFACE_ORDER;

 struct _NINE_GRID_BITMAP_INFO
 {
-	uint32 flFlags;
-	uint32 ulLeftWidth;
-	uint32 ulRightWidth;
-	uint32 ulTopHeight;
-	uint32 ulBottomHeight;
-	uint32 crTransparent;
+	UINT32 flFlags;
+	UINT32 ulLeftWidth;
+	UINT32 ulRightWidth;
+	UINT32 ulTopHeight;
+	UINT32 ulBottomHeight;
+	UINT32 crTransparent;
 };
 typedef struct _NINE_GRID_BITMAP_INFO NINE_GRID_BITMAP_INFO;

 struct _CREATE_NINE_GRID_BITMAP_ORDER
 {
-	uint32 bitmapBpp;
-	uint32 bitmapId;
-	uint32 cx;
-	uint32 cy;
+	UINT32 bitmapBpp;
+	UINT32 bitmapId;
+	UINT32 cx;
+	UINT32 cy;
 	NINE_GRID_BITMAP_INFO nineGridInfo;
 };
 typedef struct _CREATE_NINE_GRID_BITMAP_ORDER CREATE_NINE_GRID_BITMAP_ORDER;

 struct _FRAME_MARKER_ORDER
 {
-	uint32 action;
+	UINT32 action;
 };
 typedef struct _FRAME_MARKER_ORDER FRAME_MARKER_ORDER;

 struct _STREAM_BITMAP_FIRST_ORDER
 {
-	uint32 bitmapFlags;
-	uint32 bitmapBpp;
-	uint32 bitmapType;
-	uint32 bitmapWidth;
-	uint32 bitmapHeight;
-	uint32 bitmapSize;
-	uint32 bitmapBlockSize;
+	UINT32 bitmapFlags;
+	UINT32 bitmapBpp;
+	UINT32 bitmapType;
+	UINT32 bitmapWidth;
+	UINT32 bitmapHeight;
+	UINT32 bitmapSize;
+	UINT32 bitmapBlockSize;
 	BYTE* bitmapBlock;
 };
 typedef struct _STREAM_BITMAP_FIRST_ORDER STREAM_BITMAP_FIRST_ORDER;

 struct _STREAM_BITMAP_NEXT_ORDER
 {
-	uint32 bitmapFlags;
-	uint32 bitmapType;
-	uint32 bitmapBlockSize;
+	UINT32 bitmapFlags;
+	UINT32 bitmapType;
+	UINT32 bitmapBlockSize;
 	BYTE* bitmapBlock;
 };
 typedef struct _STREAM_BITMAP_NEXT_ORDER STREAM_BITMAP_NEXT_ORDER;

 struct _DRAW_GDIPLUS_FIRST_ORDER
 {
-	uint32 cbSize;
-	uint32 cbTotalSize;
-	uint32 cbTotalEmfSize;
+	UINT32 cbSize;
+	UINT32 cbTotalSize;
+	UINT32 cbTotalEmfSize;
 	BYTE* emfRecords;
 };
 typedef struct _DRAW_GDIPLUS_FIRST_ORDER DRAW_GDIPLUS_FIRST_ORDER;

 struct _DRAW_GDIPLUS_NEXT_ORDER
 {
-	uint32 cbSize;
+	UINT32 cbSize;
 	BYTE* emfRecords;
 };
 typedef struct _DRAW_GDIPLUS_NEXT_ORDER DRAW_GDIPLUS_NEXT_ORDER;

 struct _DRAW_GDIPLUS_END_ORDER
 {
-	uint32 cbSize;
-	uint32 cbTotalSize;
-	uint32 cbTotalEmfSize;
+	UINT32 cbSize;
+	UINT32 cbTotalSize;
+	UINT32 cbTotalEmfSize;
 	BYTE* emfRecords;
 };
 typedef struct _DRAW_GDIPLUS_END_ORDER DRAW_GDIPLUS_END_ORDER;

 struct _DRAW_GDIPLUS_CACHE_FIRST_ORDER
 {
-	uint32 flags;
-	uint32 cacheType;
-	uint32 cacheIndex;
-	uint32 cbSize;
-	uint32 cbTotalSize;
+	UINT32 flags;
+	UINT32 cacheType;
+	UINT32 cacheIndex;
+	UINT32 cbSize;
+	UINT32 cbTotalSize;
 	BYTE* emfRecords;
 };
 typedef struct _DRAW_GDIPLUS_CACHE_FIRST_ORDER DRAW_GDIPLUS_CACHE_FIRST_ORDER;

 struct _DRAW_GDIPLUS_CACHE_NEXT_ORDER
 {
-	uint32 flags;
-	uint32 cacheType;
-	uint32 cacheIndex;
-	uint32 cbSize;
+	UINT32 flags;
+	UINT32 cacheType;
+	UINT32 cacheIndex;
+	UINT32 cbSize;
 	BYTE* emfRecords;
 };
 typedef struct _DRAW_GDIPLUS_CACHE_NEXT_ORDER DRAW_GDIPLUS_CACHE_NEXT_ORDER;

 struct _DRAW_GDIPLUS_CACHE_END_ORDER
 {
-	uint32 flags;
-	uint32 cacheType;
-	uint32 cacheIndex;
-	uint32 cbSize;
-	uint32 cbTotalSize;
+	UINT32 flags;
+	UINT32 cacheType;
+	UINT32 cacheIndex;
+	UINT32 cbSize;
+	UINT32 cbTotalSize;
 	BYTE* emfRecords;
 };
 typedef struct _DRAW_GDIPLUS_CACHE_END_ORDER DRAW_GDIPLUS_CACHE_END_ORDER;
@@ -181,7 +181,7 @@ typedef void (*pDrawGdiPlusCacheEnd)(rdpContext* context, DRAW_GDIPLUS_CACHE_END
 struct rdp_altsec_update
 {
 	rdpContext* context; /* 0 */
-	uint32 paddingA[16 - 1]; /* 1 */
+	UINT32 paddingA[16 - 1]; /* 1 */

 	pCreateOffscreenBitmap CreateOffscreenBitmap; /* 16 */
 	pSwitchSurface SwitchSurface; /* 17 */
@@ -195,7 +195,7 @@ struct rdp_altsec_update
 	pDrawGdiPlusCacheFirst DrawGdiPlusCacheFirst; /* 25 */
 	pDrawGdiPlusCacheNext DrawGdiPlusCacheNext; /* 26 */
 	pDrawGdiPlusCacheEnd DrawGdiPlusCacheEnd; /* 27 */
-	uint32 paddingB[32 - 28]; /* 28 */
+	UINT32 paddingB[32 - 28]; /* 28 */

 	/* internal */

--- a/include/freerdp/cache/bitmap.h
+++ b/include/freerdp/cache/bitmap.h
@@ -33,7 +33,7 @@ typedef struct rdp_bitmap_cache rdpBitmapCache;

 struct _BITMAP_V2_CELL
 {
-	uint32 number;
+	UINT32 number;
 	rdpBitmap** entries;
 };

@@ -45,11 +45,11 @@ struct rdp_bitmap_cache
 	pCacheBitmapV2 CacheBitmapV2; /* 3 */
 	pCacheBitmapV3 CacheBitmapV3; /* 4 */
 	pBitmapUpdate BitmapUpdate; /* 5 */
-	uint32 paddingA[16 - 6]; /* 6 */
+	UINT32 paddingA[16 - 6]; /* 6 */

-	uint32 maxCells; /* 16 */
+	UINT32 maxCells; /* 16 */
 	BITMAP_V2_CELL* cells; /* 17 */
-	uint32 paddingB[32 - 18]; /* 18 */
+	UINT32 paddingB[32 - 18]; /* 18 */

 	/* internal */

@@ -59,8 +59,8 @@ struct rdp_bitmap_cache
 	rdpSettings* settings;
 };

-FREERDP_API rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmap_cache, uint32 id, uint32 index);
-FREERDP_API void bitmap_cache_put(rdpBitmapCache* bitmap_cache, uint32 id, uint32 index, rdpBitmap* bitmap);
+FREERDP_API rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmap_cache, UINT32 id, UINT32 index);
+FREERDP_API void bitmap_cache_put(rdpBitmapCache* bitmap_cache, UINT32 id, UINT32 index, rdpBitmap* bitmap);

 FREERDP_API void bitmap_cache_register_callbacks(rdpUpdate* update);

--- a/include/freerdp/cache/brush.h
+++ b/include/freerdp/cache/brush.h
@@ -33,7 +33,7 @@ typedef struct rdp_brush_cache rdpBrushCache;

 struct _BRUSH_ENTRY
 {
-	uint32 bpp;
+	UINT32 bpp;
 	void* entry;
 };

@@ -43,21 +43,21 @@ struct rdp_brush_cache
 	pCacheBrush CacheBrush; /* 1 */
 	pPolygonSC PolygonSC; /* 2 */
 	pPolygonCB PolygonCB; /* 3 */
-	uint32 paddingA[16 - 4]; /* 4 */
+	UINT32 paddingA[16 - 4]; /* 4 */

-	uint32 maxEntries; /* 16 */
-	uint32 maxMonoEntries; /* 17 */
+	UINT32 maxEntries; /* 16 */
+	UINT32 maxMonoEntries; /* 17 */
 	BRUSH_ENTRY* entries; /* 18 */
 	BRUSH_ENTRY* monoEntries; /* 19 */
-	uint32 paddingB[32 - 20]; /* 20 */
+	UINT32 paddingB[32 - 20]; /* 20 */

 	/* internal */

 	rdpSettings* settings;
 };

-FREERDP_API void* brush_cache_get(rdpBrushCache* brush, uint32 index, uint32* bpp);
-FREERDP_API void brush_cache_put(rdpBrushCache* brush, uint32 index, void* entry, uint32 bpp);
+FREERDP_API void* brush_cache_get(rdpBrushCache* brush, UINT32 index, UINT32* bpp);
+FREERDP_API void brush_cache_put(rdpBrushCache* brush, UINT32 index, void* entry, UINT32 bpp);

 FREERDP_API void brush_cache_register_callbacks(rdpUpdate* update);

--- a/include/freerdp/cache/glyph.h
+++ b/include/freerdp/cache/glyph.h
@@ -34,15 +34,15 @@ typedef struct rdp_glyph_cache rdpGlyphCache;

 struct _GLYPH_CACHE
 {
-	uint32 number;
-	uint32 maxCellSize;
+	UINT32 number;
+	UINT32 maxCellSize;
 	rdpGlyph** entries;
 };

 struct _FRAGMENT_CACHE_ENTRY
 {
 	void* fragment;
-	uint32 size;
+	UINT32 size;
 };

 struct _FRAGMENT_CACHE
@@ -59,11 +59,11 @@ struct rdp_glyph_cache
 	rdpSettings* settings;
 };

-FREERDP_API rdpGlyph* glyph_cache_get(rdpGlyphCache* glyph_cache, uint32 id, uint32 index);
-FREERDP_API void glyph_cache_put(rdpGlyphCache* glyph_cache, uint32 id, uint32 index, rdpGlyph* entry);
+FREERDP_API rdpGlyph* glyph_cache_get(rdpGlyphCache* glyph_cache, UINT32 id, UINT32 index);
+FREERDP_API void glyph_cache_put(rdpGlyphCache* glyph_cache, UINT32 id, UINT32 index, rdpGlyph* entry);

-FREERDP_API void* glyph_cache_fragment_get(rdpGlyphCache* glyph, uint32 index, uint32* count);
-FREERDP_API void glyph_cache_fragment_put(rdpGlyphCache* glyph, uint32 index, uint32 count, void* entry);
+FREERDP_API void* glyph_cache_fragment_get(rdpGlyphCache* glyph, UINT32 index, UINT32* count);
+FREERDP_API void glyph_cache_fragment_put(rdpGlyphCache* glyph, UINT32 index, UINT32 count, void* entry);

 FREERDP_API void glyph_cache_register_callbacks(rdpUpdate* update);

--- a/include/freerdp/cache/nine_grid.h
+++ b/include/freerdp/cache/nine_grid.h
@@ -40,20 +40,20 @@ struct rdp_nine_grid_cache
 {
 	pDrawNineGrid DrawNineGrid; /* 0 */
 	pMultiDrawNineGrid MultiDrawNineGrid; /* 1 */
-	uint32 paddingA[16 - 2]; /* 2 */
+	UINT32 paddingA[16 - 2]; /* 2 */

-	uint32 maxEntries; /* 16 */
-	uint32 maxSize; /* 17 */
+	UINT32 maxEntries; /* 16 */
+	UINT32 maxSize; /* 17 */
 	NINE_GRID_ENTRY* entries; /* 18 */
-	uint32 paddingB[32 - 19]; /* 19 */
+	UINT32 paddingB[32 - 19]; /* 19 */

 	/* internal */

 	rdpSettings* settings;
 };

-FREERDP_API void* nine_grid_cache_get(rdpNineGridCache* nine_grid, uint32 index);
-FREERDP_API void nine_grid_cache_put(rdpNineGridCache* nine_grid, uint32 index, void* entry);
+FREERDP_API void* nine_grid_cache_get(rdpNineGridCache* nine_grid, UINT32 index);
+FREERDP_API void nine_grid_cache_put(rdpNineGridCache* nine_grid, UINT32 index, void* entry);

 FREERDP_API void nine_grid_cache_register_callbacks(rdpUpdate* update);

--- a/include/freerdp/cache/offscreen.h
+++ b/include/freerdp/cache/offscreen.h
@@ -32,10 +32,10 @@ typedef struct rdp_offscreen_cache rdpOffscreenCache;

 struct rdp_offscreen_cache
 {
-	uint32 maxSize; /* 0 */
-	uint32 maxEntries; /* 1 */
+	UINT32 maxSize; /* 0 */
+	UINT32 maxEntries; /* 1 */
 	rdpBitmap** entries; /* 2 */
-	uint32 currentSurface; /* 3 */
+	UINT32 currentSurface; /* 3 */

 	/* internal */

@@ -43,9 +43,9 @@ struct rdp_offscreen_cache
 	rdpSettings* settings;
 };

-FREERDP_API rdpBitmap* offscreen_cache_get(rdpOffscreenCache* offscreen_cache, uint32 index);
-FREERDP_API void offscreen_cache_put(rdpOffscreenCache* offscreen_cache, uint32 index, rdpBitmap* bitmap);
-FREERDP_API void offscreen_cache_delete(rdpOffscreenCache* offscreen, uint32 index);
+FREERDP_API rdpBitmap* offscreen_cache_get(rdpOffscreenCache* offscreen_cache, UINT32 index);
+FREERDP_API void offscreen_cache_put(rdpOffscreenCache* offscreen_cache, UINT32 index, rdpBitmap* bitmap);
+FREERDP_API void offscreen_cache_delete(rdpOffscreenCache* offscreen, UINT32 index);

 FREERDP_API void offscreen_cache_register_callbacks(rdpUpdate* update);

--- a/include/freerdp/cache/palette.h
+++ b/include/freerdp/cache/palette.h
@@ -38,7 +38,7 @@ struct _PALETTE_TABLE_ENTRY

 struct rdp_palette_cache
 {
-	uint32 maxEntries; /* 0 */
+	UINT32 maxEntries; /* 0 */
 	PALETTE_TABLE_ENTRY* entries; /* 1 */

 	/* internal */
@@ -46,8 +46,8 @@ struct rdp_palette_cache
 	rdpSettings* settings;
 };

-FREERDP_API void* palette_cache_get(rdpPaletteCache* palette, uint32 index);
-FREERDP_API void palette_cache_put(rdpPaletteCache* palette, uint32 index, void* entry);
+FREERDP_API void* palette_cache_get(rdpPaletteCache* palette, UINT32 index);
+FREERDP_API void palette_cache_put(rdpPaletteCache* palette, UINT32 index, void* entry);

 FREERDP_API void palette_cache_register_callbacks(rdpUpdate* update);

--- a/include/freerdp/cache/pointer.h
+++ b/include/freerdp/cache/pointer.h
@@ -33,7 +33,7 @@ typedef struct rdp_pointer_cache rdpPointerCache;

 struct rdp_pointer_cache
 {
-	uint32 cacheSize; /* 0 */
+	UINT32 cacheSize; /* 0 */
 	rdpPointer** entries; /* 1 */

 	/* internal */
@@ -42,8 +42,8 @@ struct rdp_pointer_cache
 	rdpSettings* settings;
 };

-FREERDP_API rdpPointer* pointer_cache_get(rdpPointerCache* pointer_cache, uint32 index);
-FREERDP_API void pointer_cache_put(rdpPointerCache* pointer_cache, uint32 index, rdpPointer* pointer);
+FREERDP_API rdpPointer* pointer_cache_get(rdpPointerCache* pointer_cache, UINT32 index);
+FREERDP_API void pointer_cache_put(rdpPointerCache* pointer_cache, UINT32 index, rdpPointer* pointer);

 FREERDP_API void pointer_cache_register_callbacks(rdpUpdate* update);

--- a/include/freerdp/channels/rdpdr.h
+++ b/include/freerdp/channels/rdpdr.h
@@ -474,9 +474,9 @@ typedef void (*pcFreeDevice)(DEVICE* device);

 struct _DEVICE
 {
-	uint32 id;
+	UINT32 id;

-	uint32 type;
+	UINT32 type;
 	char* name;
 	STREAM* data;

@@ -492,13 +492,13 @@ struct _IRP

 	DEVICE* device;
 	DEVMAN* devman;
-	uint32 FileId;
-	uint32 CompletionId;
-	uint32 MajorFunction;
-	uint32 MinorFunction;
+	UINT32 FileId;
+	UINT32 CompletionId;
+	UINT32 MajorFunction;
+	UINT32 MinorFunction;
 	STREAM* input;

-	uint32 IoStatus;
+	UINT32 IoStatus;
 	STREAM* output;

 	pcIRPResponse Complete;
@@ -508,7 +508,7 @@ struct _IRP
 struct _DEVMAN
 {
 	rdpSvcPlugin* plugin;
-	uint32 id_sequence;
+	UINT32 id_sequence;
 	LIST* devices;
 };

--- a/include/freerdp/channels/rdpsnd.h
+++ b/include/freerdp/channels/rdpsnd.h
@@ -29,7 +29,7 @@ struct rdpsnd_format
 {
 	UINT16 wFormatTag;
 	UINT16 nChannels;
-	uint32 nSamplesPerSec;
+	UINT32 nSamplesPerSec;
 	UINT16 nBlockAlign;
 	UINT16 wBitsPerSample;
 	UINT16 cbSize;
--- a/include/freerdp/channels/wtsvc.h
+++ b/include/freerdp/channels/wtsvc.h
@@ -68,7 +68,7 @@ FREERDP_API BOOL WTSVirtualChannelManagerCheckFileDescriptor(WTSVirtualChannelMa
 FREERDP_API void* WTSVirtualChannelOpenEx(
 	/* __in */ WTSVirtualChannelManager* vcm,
 	/* __in */ const char* pVirtualName,
-	/* __in */ uint32 flags);
+	/* __in */ UINT32 flags);

 /**
 * Returns information about a specified virtual channel.
@@ -80,7 +80,7 @@ FREERDP_API BOOL WTSVirtualChannelQuery(
 	/* __in */  void* hChannelHandle,
 	/* __in */  WTS_VIRTUAL_CLASS WtsVirtualClass,
 	/* __out */ void** ppBuffer,
-	/* __out */ uint32* pBytesReturned);
+	/* __out */ UINT32* pBytesReturned);

 /**
 * Frees memory allocated by WTSVirtualChannelQuery
@@ -107,10 +107,10 @@ FREERDP_API void WTSFreeMemory(
 */
 FREERDP_API BOOL WTSVirtualChannelRead(
 	/* __in */  void* hChannelHandle,
-	/* __in */  uint32 TimeOut,
+	/* __in */  UINT32 TimeOut,
 	/* __out */ BYTE* Buffer,
-	/* __in */  uint32 BufferSize,
-	/* __out */ uint32* pBytesRead);
+	/* __in */  UINT32 BufferSize,
+	/* __out */ UINT32* pBytesRead);

 /**
 * Writes data to the server end of a virtual channel.
@@ -118,8 +118,8 @@ FREERDP_API BOOL WTSVirtualChannelRead(
 FREERDP_API BOOL WTSVirtualChannelWrite(
 	/* __in */  void* hChannelHandle,
 	/* __in */  BYTE* Buffer,
-	/* __in */  uint32 Length,
-	/* __out */ uint32* pBytesWritten);
+	/* __in */  UINT32 Length,
+	/* __out */ UINT32* pBytesWritten);

 /**
 * Closes an open virtual channel handle.
--- a/include/freerdp/client/cliprdr.h
+++ b/include/freerdp/client/cliprdr.h
@@ -49,17 +49,17 @@ typedef RDP_EVENT RDP_CB_MONITOR_READY_EVENT;
 struct _RDP_CB_FORMAT_LIST_EVENT
 {
 	RDP_EVENT event;
-	uint32* formats;
+	UINT32* formats;
 	UINT16 num_formats;
 	BYTE* raw_format_data;
-	uint32 raw_format_data_size;
+	UINT32 raw_format_data_size;
 };
 typedef struct _RDP_CB_FORMAT_LIST_EVENT RDP_CB_FORMAT_LIST_EVENT;

 struct _RDP_CB_DATA_REQUEST_EVENT
 {
 	RDP_EVENT event;
-	uint32 format;
+	UINT32 format;
 };
 typedef struct _RDP_CB_DATA_REQUEST_EVENT RDP_CB_DATA_REQUEST_EVENT;

@@ -67,7 +67,7 @@ struct _RDP_CB_DATA_RESPONSE_EVENT
 {
 	RDP_EVENT event;
 	BYTE* data;
-	uint32 size;
+	UINT32 size;
 };
 typedef struct _RDP_CB_DATA_RESPONSE_EVENT RDP_CB_DATA_RESPONSE_EVENT;

--- a/include/freerdp/client/tsmf.h
+++ b/include/freerdp/client/tsmf.h
@@ -33,8 +33,8 @@ struct _RDP_VIDEO_FRAME_EVENT
 {
 	RDP_EVENT event;
 	BYTE* frame_data;
-	uint32 frame_size;
-	uint32 frame_pixfmt;
+	UINT32 frame_size;
+	UINT32 frame_pixfmt;
 	INT16 frame_width;
 	INT16 frame_height;
 	INT16 x;
--- a/include/freerdp/codec/color.h
+++ b/include/freerdp/codec/color.h
@@ -242,19 +242,19 @@ FREERDP_API BYTE* freerdp_glyph_convert(int width, int height, BYTE* data);
 FREERDP_API void   freerdp_bitmap_flip(BYTE * src, BYTE * dst, int scanLineSz, int height);
 FREERDP_API BYTE* freerdp_image_flip(BYTE* srcData, BYTE* dstData, int width, int height, int bpp);
 FREERDP_API BYTE* freerdp_icon_convert(BYTE* srcData, BYTE* dstData, BYTE* mask, int width, int height, int bpp, HCLRCONV clrconv);
-FREERDP_API BYTE* freerdp_mono_image_convert(BYTE* srcData, int width, int height, int srcBpp, int dstBpp, uint32 bgcolor, uint32 fgcolor, HCLRCONV clrconv);
+FREERDP_API BYTE* freerdp_mono_image_convert(BYTE* srcData, int width, int height, int srcBpp, int dstBpp, UINT32 bgcolor, UINT32 fgcolor, HCLRCONV clrconv);
 FREERDP_API void freerdp_alpha_cursor_convert(BYTE* alphaData, BYTE* xorMask, BYTE* andMask, int width, int height, int bpp, HCLRCONV clrconv);
 FREERDP_API void freerdp_image_swap_color_order(BYTE* data, int width, int height);

-FREERDP_API uint32 freerdp_color_convert_var(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv);
-FREERDP_API uint32 freerdp_color_convert_rgb(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv);
-FREERDP_API uint32 freerdp_color_convert_bgr(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv);
-FREERDP_API uint32 freerdp_color_convert_rgb_bgr(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv);
-FREERDP_API uint32 freerdp_color_convert_bgr_rgb(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv);
-FREERDP_API uint32 freerdp_color_convert_var_rgb(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv);
-FREERDP_API uint32 freerdp_color_convert_var_bgr(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv);
+FREERDP_API UINT32 freerdp_color_convert_var(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv);
+FREERDP_API UINT32 freerdp_color_convert_rgb(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv);
+FREERDP_API UINT32 freerdp_color_convert_bgr(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv);
+FREERDP_API UINT32 freerdp_color_convert_rgb_bgr(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv);
+FREERDP_API UINT32 freerdp_color_convert_bgr_rgb(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv);
+FREERDP_API UINT32 freerdp_color_convert_var_rgb(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv);
+FREERDP_API UINT32 freerdp_color_convert_var_bgr(UINT32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv);

-FREERDP_API HCLRCONV freerdp_clrconv_new(uint32 flags);
+FREERDP_API HCLRCONV freerdp_clrconv_new(UINT32 flags);
 FREERDP_API void freerdp_clrconv_free(HCLRCONV clrconv);

 #ifdef __cplusplus
--- a/include/freerdp/codec/mppc_dec.h
+++ b/include/freerdp/codec/mppc_dec.h
@@ -45,11 +45,11 @@ struct rdp_mppc_dec
 	BYTE* history_ptr;
 };

-FREERDP_API int decompress_rdp(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, uint32* roff, uint32* rlen);
-FREERDP_API int decompress_rdp_4(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, uint32* roff, uint32* rlen);
-FREERDP_API int decompress_rdp_5(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, uint32* roff, uint32* rlen);
-FREERDP_API int decompress_rdp_6(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, uint32* roff, uint32* rlen);
-FREERDP_API int decompress_rdp_61(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, uint32* roff, uint32* rlen);
+FREERDP_API int decompress_rdp(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, UINT32* roff, UINT32* rlen);
+FREERDP_API int decompress_rdp_4(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, UINT32* roff, UINT32* rlen);
+FREERDP_API int decompress_rdp_5(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, UINT32* roff, UINT32* rlen);
+FREERDP_API int decompress_rdp_6(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, UINT32* roff, UINT32* rlen);
+FREERDP_API int decompress_rdp_61(struct rdp_mppc_dec* dec, BYTE* cbuf, int len, int ctype, UINT32* roff, UINT32* rlen);
 FREERDP_API struct rdp_mppc_dec* mppc_dec_new(void);
 FREERDP_API void mppc_dec_free(struct rdp_mppc_dec* dec);

--- a/include/freerdp/codec/nsc.h
+++ b/include/freerdp/codec/nsc.h
@@ -33,7 +33,7 @@ extern "C" {
 /* NSCODEC_BITMAP_STREAM */
 struct _NSC_STREAM
 {
-	uint32 PlaneByteCount[4];
+	UINT32 PlaneByteCount[4];
 	BYTE ColorLossLevel;
 	BYTE ChromaSubSamplingLevel;
 	UINT16 Reserved;
@@ -46,13 +46,13 @@ typedef struct _NSC_CONTEXT_PRIV NSC_CONTEXT_PRIV;
 typedef struct _NSC_CONTEXT NSC_CONTEXT;
 struct _NSC_CONTEXT
 {
-	uint32 OrgByteCount[4];	/* original byte length of luma, chroma orange, chroma green, alpha variable in order */
+	UINT32 OrgByteCount[4];	/* original byte length of luma, chroma orange, chroma green, alpha variable in order */
 	NSC_STREAM nsc_stream;
 	UINT16 bpp;
 	UINT16 width;
 	UINT16 height;
 	BYTE* bmpdata;     /* final argb values in little endian order */
-	uint32 bmpdata_length; /* the maximum length of the buffer that bmpdata points to */
+	UINT32 bmpdata_length; /* the maximum length of the buffer that bmpdata points to */
 	RDP_PIXEL_FORMAT pixel_format;

 	/* color palette allocated by the application */
@@ -65,10 +65,10 @@ struct _NSC_CONTEXT
 };

 FREERDP_API NSC_CONTEXT* nsc_context_new(void);
-FREERDP_API void nsc_context_set_cpu_opt(NSC_CONTEXT* context, uint32 cpu_opt);
+FREERDP_API void nsc_context_set_cpu_opt(NSC_CONTEXT* context, UINT32 cpu_opt);
 FREERDP_API void nsc_context_set_pixel_format(NSC_CONTEXT* context, RDP_PIXEL_FORMAT pixel_format);
 FREERDP_API void nsc_process_message(NSC_CONTEXT* context, UINT16 bpp,
-	UINT16 width, UINT16 height, BYTE* data, uint32 length);
+	UINT16 width, UINT16 height, BYTE* data, UINT32 length);
 FREERDP_API void nsc_compose_message(NSC_CONTEXT* context, STREAM* s,
 	BYTE* bmpdata, int width, int height, int rowstride);
 FREERDP_API void nsc_context_free(NSC_CONTEXT* context);
--- a/include/freerdp/codec/rfx.h
+++ b/include/freerdp/codec/rfx.h
@@ -82,9 +82,9 @@ struct _RFX_CONTEXT
 	UINT16 width;
 	UINT16 height;
 	RLGR_MODE mode;
-	uint32 version;
-	uint32 codec_id;
-	uint32 codec_version;
+	UINT32 version;
+	UINT32 codec_id;
+	UINT32 codec_version;
 	RDP_PIXEL_FORMAT pixel_format;
 	BYTE bits_per_pixel;

@@ -92,10 +92,10 @@ struct _RFX_CONTEXT
 	const BYTE* palette;

 	/* temporary data within a frame */
-	uint32 frame_idx;
+	UINT32 frame_idx;
 	BOOL header_processed;
 	BYTE num_quants;
-	uint32* quants;
+	UINT32* quants;
 	BYTE quant_idx_y;
 	BYTE quant_idx_cb;
 	BYTE quant_idx_cr;
@@ -103,8 +103,8 @@ struct _RFX_CONTEXT
 	/* routines */
 	void (*decode_ycbcr_to_rgb)(INT16* y_r_buf, INT16* cb_g_buf, INT16* cr_b_buf);
 	void (*encode_rgb_to_ycbcr)(INT16* y_r_buf, INT16* cb_g_buf, INT16* cr_b_buf);
-	void (*quantization_decode)(INT16* buffer, const uint32* quantization_values);
-	void (*quantization_encode)(INT16* buffer, const uint32* quantization_values);
+	void (*quantization_decode)(INT16* buffer, const UINT32* quantization_values);
+	void (*quantization_encode)(INT16* buffer, const UINT32* quantization_values);
 	void (*dwt_2d_decode)(INT16* buffer, INT16* dwt_buffer);
 	void (*dwt_2d_encode)(INT16* buffer, INT16* dwt_buffer);

@@ -115,11 +115,11 @@ typedef struct _RFX_CONTEXT RFX_CONTEXT;

 FREERDP_API RFX_CONTEXT* rfx_context_new(void);
 FREERDP_API void rfx_context_free(RFX_CONTEXT* context);
-FREERDP_API void rfx_context_set_cpu_opt(RFX_CONTEXT* context, uint32 cpu_opt);
+FREERDP_API void rfx_context_set_cpu_opt(RFX_CONTEXT* context, UINT32 cpu_opt);
 FREERDP_API void rfx_context_set_pixel_format(RFX_CONTEXT* context, RDP_PIXEL_FORMAT pixel_format);
 FREERDP_API void rfx_context_reset(RFX_CONTEXT* context);

-FREERDP_API RFX_MESSAGE* rfx_process_message(RFX_CONTEXT* context, BYTE* data, uint32 length);
+FREERDP_API RFX_MESSAGE* rfx_process_message(RFX_CONTEXT* context, BYTE* data, UINT32 length);
 FREERDP_API UINT16 rfx_message_get_tile_count(RFX_MESSAGE* message);
 FREERDP_API RFX_TILE* rfx_message_get_tile(RFX_MESSAGE* message, int index);
 FREERDP_API UINT16 rfx_message_get_rect_count(RFX_MESSAGE* message);
--- a/include/freerdp/crypto/ber.h
+++ b/include/freerdp/crypto/ber.h
@@ -76,9 +76,9 @@ FREERDP_API int ber_write_octet_string_tag(STREAM* s, int length);
 FREERDP_API int ber_skip_octet_string(int length);
 FREERDP_API BOOL ber_read_BOOL(STREAM* s, BOOL* value);
 FREERDP_API void ber_write_BOOL(STREAM* s, BOOL value);
-FREERDP_API BOOL ber_read_integer(STREAM* s, uint32* value);
-FREERDP_API int ber_write_integer(STREAM* s, uint32 value);
+FREERDP_API BOOL ber_read_integer(STREAM* s, UINT32* value);
+FREERDP_API int ber_write_integer(STREAM* s, UINT32 value);
 FREERDP_API BOOL ber_read_integer_length(STREAM* s, int* length);
-FREERDP_API int ber_skip_integer(uint32 value);
+FREERDP_API int ber_skip_integer(UINT32 value);

 #endif /* FREERDP_CRYPTO_BER_H */
--- a/include/freerdp/crypto/crypto.h
+++ b/include/freerdp/crypto/crypto.h
@@ -80,43 +80,43 @@ struct crypto_cert_struct
 typedef struct crypto_sha1_struct* CryptoSha1;

 FREERDP_API CryptoSha1 crypto_sha1_init(void);
-FREERDP_API void crypto_sha1_update(CryptoSha1 sha1, const BYTE* data, uint32 length);
+FREERDP_API void crypto_sha1_update(CryptoSha1 sha1, const BYTE* data, UINT32 length);
 FREERDP_API void crypto_sha1_final(CryptoSha1 sha1, BYTE* out_data);

 #define	CRYPTO_MD5_DIGEST_LENGTH	MD5_DIGEST_LENGTH
 typedef struct crypto_md5_struct* CryptoMd5;

 FREERDP_API CryptoMd5 crypto_md5_init(void);
-FREERDP_API void crypto_md5_update(CryptoMd5 md5, const BYTE* data, uint32 length);
+FREERDP_API void crypto_md5_update(CryptoMd5 md5, const BYTE* data, UINT32 length);
 FREERDP_API void crypto_md5_final(CryptoMd5 md5, BYTE* out_data);

 typedef struct crypto_rc4_struct* CryptoRc4;

-FREERDP_API CryptoRc4 crypto_rc4_init(const BYTE* key, uint32 length);
-FREERDP_API void crypto_rc4(CryptoRc4 rc4, uint32 length, const BYTE* in_data, BYTE* out_data);
+FREERDP_API CryptoRc4 crypto_rc4_init(const BYTE* key, UINT32 length);
+FREERDP_API void crypto_rc4(CryptoRc4 rc4, UINT32 length, const BYTE* in_data, BYTE* out_data);
 FREERDP_API void crypto_rc4_free(CryptoRc4 rc4);

 typedef struct crypto_des3_struct* CryptoDes3;

 FREERDP_API CryptoDes3 crypto_des3_encrypt_init(const BYTE* key, const BYTE* ivec);
 FREERDP_API CryptoDes3 crypto_des3_decrypt_init(const BYTE* key, const BYTE* ivec);
-FREERDP_API void crypto_des3_encrypt(CryptoDes3 des3, uint32 length, const BYTE *in_data, BYTE *out_data);
-FREERDP_API void crypto_des3_decrypt(CryptoDes3 des3, uint32 length, const BYTE *in_data, BYTE* out_data);
+FREERDP_API void crypto_des3_encrypt(CryptoDes3 des3, UINT32 length, const BYTE *in_data, BYTE *out_data);
+FREERDP_API void crypto_des3_decrypt(CryptoDes3 des3, UINT32 length, const BYTE *in_data, BYTE* out_data);
 FREERDP_API void crypto_des3_free(CryptoDes3 des3);

 typedef struct crypto_hmac_struct* CryptoHmac;

 FREERDP_API CryptoHmac crypto_hmac_new(void);
-FREERDP_API void crypto_hmac_sha1_init(CryptoHmac hmac, const BYTE *data, uint32 length);
-FREERDP_API void crypto_hmac_update(CryptoHmac hmac, const BYTE *data, uint32 length);
-FREERDP_API void crypto_hmac_final(CryptoHmac hmac, BYTE *out_data, uint32 length);
+FREERDP_API void crypto_hmac_sha1_init(CryptoHmac hmac, const BYTE *data, UINT32 length);
+FREERDP_API void crypto_hmac_update(CryptoHmac hmac, const BYTE *data, UINT32 length);
+FREERDP_API void crypto_hmac_final(CryptoHmac hmac, BYTE *out_data, UINT32 length);
 FREERDP_API void crypto_hmac_free(CryptoHmac hmac);

 typedef struct crypto_cert_struct* CryptoCert;

 #include <freerdp/crypto/certificate.h>

-FREERDP_API CryptoCert crypto_cert_read(BYTE* data, uint32 length);
+FREERDP_API CryptoCert crypto_cert_read(BYTE* data, UINT32 length);
 FREERDP_API char* crypto_cert_fingerprint(X509* xcert);
 FREERDP_API char* crypto_cert_subject(X509* xcert);
 FREERDP_API char* crypto_cert_subject_common_name(X509* xcert, int* length);
@@ -134,10 +134,10 @@ extern const BYTE tssk_modulus[];
 extern const BYTE tssk_privateExponent[];
 extern const BYTE tssk_exponent[];

-FREERDP_API void crypto_rsa_public_encrypt(const BYTE* input, int length, uint32 key_length, const BYTE* modulus, const BYTE* exponent, BYTE* output);
-FREERDP_API void crypto_rsa_public_decrypt(const BYTE* input, int length, uint32 key_length, const BYTE* modulus, const BYTE* exponent, BYTE* output);
-FREERDP_API void crypto_rsa_private_encrypt(const BYTE* input, int length, uint32 key_length, const BYTE* modulus, const BYTE* private_exponent, BYTE* output);
-FREERDP_API void crypto_rsa_private_decrypt(const BYTE* input, int length, uint32 key_length, const BYTE* modulus, const BYTE* private_exponent, BYTE* output);
+FREERDP_API void crypto_rsa_public_encrypt(const BYTE* input, int length, UINT32 key_length, const BYTE* modulus, const BYTE* exponent, BYTE* output);
+FREERDP_API void crypto_rsa_public_decrypt(const BYTE* input, int length, UINT32 key_length, const BYTE* modulus, const BYTE* exponent, BYTE* output);
+FREERDP_API void crypto_rsa_private_encrypt(const BYTE* input, int length, UINT32 key_length, const BYTE* modulus, const BYTE* private_exponent, BYTE* output);
+FREERDP_API void crypto_rsa_private_decrypt(const BYTE* input, int length, UINT32 key_length, const BYTE* modulus, const BYTE* private_exponent, BYTE* output);
 FREERDP_API void crypto_reverse(BYTE* data, int length);
 FREERDP_API void crypto_nonce(BYTE* nonce, int size);

--- a/include/freerdp/crypto/er.h
+++ b/include/freerdp/crypto/er.h
@@ -73,16 +73,16 @@ FREERDP_API int er_write_sequence_tag(STREAM* s, int length, BOOL flag);
 FREERDP_API int er_skip_sequence(int length);
 FREERDP_API int er_skip_sequence_tag(int length);
 FREERDP_API BOOL er_read_bit_string(STREAM* s, int* length, BYTE* padding);
-FREERDP_API BOOL er_write_bit_string_tag(STREAM* s, uint32 length, BYTE padding, BOOL flag);
+FREERDP_API BOOL er_write_bit_string_tag(STREAM* s, UINT32 length, BYTE padding, BOOL flag);
 FREERDP_API BOOL er_read_octet_string(STREAM* s, int* length);
 FREERDP_API void er_write_octet_string(STREAM* s, BYTE* oct_str, int length, BOOL flag);
 FREERDP_API int er_write_octet_string_tag(STREAM* s, int length, BOOL flag);
 FREERDP_API int er_skip_octet_string(int length);
 FREERDP_API BOOL er_read_BOOL(STREAM* s, BOOL* value);
 FREERDP_API void er_write_BOOL(STREAM* s, BOOL value);
-FREERDP_API BOOL er_read_integer(STREAM* s, uint32* value);
-FREERDP_API int er_write_integer(STREAM* s, sint32 value);
+FREERDP_API BOOL er_read_integer(STREAM* s, UINT32* value);
+FREERDP_API int er_write_integer(STREAM* s, INT32 value);
 FREERDP_API BOOL er_read_integer_length(STREAM* s, int* length);
-FREERDP_API int er_skip_integer(sint32 value);
+FREERDP_API int er_skip_integer(INT32 value);

 #endif /* FREERDP_CRYPTO_ER_H */
--- a/include/freerdp/crypto/per.h
+++ b/include/freerdp/crypto/per.h
@@ -33,9 +33,9 @@ FREERDP_API BOOL per_read_number_of_sets(STREAM* s, BYTE* number);
 FREERDP_API void per_write_number_of_sets(STREAM* s, BYTE number);
 FREERDP_API BOOL per_read_padding(STREAM* s, int length);
 FREERDP_API void per_write_padding(STREAM* s, int length);
-FREERDP_API BOOL per_read_integer(STREAM* s, uint32* integer);
+FREERDP_API BOOL per_read_integer(STREAM* s, UINT32* integer);
 FREERDP_API BOOL per_read_integer16(STREAM* s, UINT16* integer, UINT16 min);
-FREERDP_API void per_write_integer(STREAM* s, uint32 integer);
+FREERDP_API void per_write_integer(STREAM* s, UINT32 integer);
 FREERDP_API void per_write_integer16(STREAM* s, UINT16 integer, UINT16 min);
 FREERDP_API BOOL per_read_enumerated(STREAM* s, BYTE* enumerated, BYTE count);
 FREERDP_API void per_write_enumerated(STREAM* s, BYTE enumerated, BYTE count);
--- a/include/freerdp/dvc.h
+++ b/include/freerdp/dvc.h
@@ -72,7 +72,7 @@ struct _IWTSVirtualChannel
 {
 	/* Starts a write request on the channel. */
 	int (*Write) (IWTSVirtualChannel* pChannel,
-		uint32 cbSize,
+		UINT32 cbSize,
 		BYTE* pBuffer,
 		void* pReserved);
 	/* Closes the channel. */
@@ -85,7 +85,7 @@ struct _IWTSVirtualChannelManager
 	   endpoint, or creates a static channel. */
 	int (*CreateListener) (IWTSVirtualChannelManager* pChannelMgr,
 		const char* pszChannelName,
-		uint32 ulFlags,
+		UINT32 ulFlags,
 		IWTSListenerCallback* pListenerCallback,
 		IWTSListener** ppListener);
 	/* Push a virtual channel event.
@@ -93,9 +93,9 @@ struct _IWTSVirtualChannelManager
 	int (*PushEvent) (IWTSVirtualChannelManager* pChannelMgr,
 		RDP_EVENT* pEvent);
 	/* Find the channel or ID to send data to a specific endpoint. */
-	uint32 (*GetChannelId) (IWTSVirtualChannel * channel);
+	UINT32 (*GetChannelId) (IWTSVirtualChannel * channel);
 	IWTSVirtualChannel* (*FindChannelById) (IWTSVirtualChannelManager* pChannelMgr, 
-		uint32 ChannelId);
+		UINT32 ChannelId);
 };

 struct _IWTSPlugin
@@ -110,7 +110,7 @@ struct _IWTSPlugin
 	/* Notifies the plug-in that the Remote Desktop Connection (RDC) client
 	   has disconnected from the RD Session Host server. */
 	int (*Disconnected) (IWTSPlugin* pPlugin,
-		uint32 dwDisconnectCode);
+		UINT32 dwDisconnectCode);
 	/* Notifies the plug-in that the Remote Desktop Connection (RDC) client
 	   has terminated. */
 	int (*Terminated) (IWTSPlugin* pPlugin);
@@ -131,7 +131,7 @@ struct _IWTSVirtualChannelCallback
 {
 	/* Notifies the user about data that is being received. */
 	int (*OnDataReceived) (IWTSVirtualChannelCallback* pChannelCallback,
-		uint32 cbSize,
+		UINT32 cbSize,
 		BYTE* pBuffer);
 	/* Notifies the user that the channel has been closed. */
 	int (*OnClose) (IWTSVirtualChannelCallback* pChannelCallback);
--- a/include/freerdp/extension.h
+++ b/include/freerdp/extension.h
@@ -35,11 +35,11 @@ struct rdp_ext_plugin
 	int (*uninit) (rdpExtPlugin* plugin, freerdp* instance);
 };

-typedef uint32 (FREERDP_CC* PFREERDP_EXTENSION_HOOK)(rdpExtPlugin* plugin, freerdp* instance);
+typedef UINT32 (FREERDP_CC* PFREERDP_EXTENSION_HOOK)(rdpExtPlugin* plugin, freerdp* instance);

-typedef uint32 (FREERDP_CC* PREGISTEREXTENSION)(rdpExtPlugin* plugin);
-typedef uint32 (FREERDP_CC* PREGISTERPRECONNECTHOOK)(rdpExtPlugin* plugin, PFREERDP_EXTENSION_HOOK hook);
-typedef uint32 (FREERDP_CC* PREGISTERPOSTCONNECTHOOK)(rdpExtPlugin* plugin, PFREERDP_EXTENSION_HOOK hook);
+typedef UINT32 (FREERDP_CC* PREGISTEREXTENSION)(rdpExtPlugin* plugin);
+typedef UINT32 (FREERDP_CC* PREGISTERPRECONNECTHOOK)(rdpExtPlugin* plugin, PFREERDP_EXTENSION_HOOK hook);
+typedef UINT32 (FREERDP_CC* PREGISTERPOSTCONNECTHOOK)(rdpExtPlugin* plugin, PFREERDP_EXTENSION_HOOK hook);

 struct _FREERDP_EXTENSION_ENTRY_POINTS
 {
--- a/include/freerdp/freerdp.h
+++ b/include/freerdp/freerdp.h
@@ -72,7 +72,7 @@ struct rdp_context
 						   Pointer to the client peer.
 						   This is set by a call to freerdp_peer_context_new() during peer initialization.
 						   This field is used only on the server side. */
-	uint32 paddingA[16 - 2]; /* 2 */
+	UINT32 paddingA[16 - 2]; /* 2 */

 	int argc;	/**< (offset 16)
 				   Number of arguments given to the program at launch time.
@@ -82,7 +82,7 @@ struct rdp_context
 					List of arguments given to the program at launch time.
 					Used to keep this data available and used later on, typically just before connection initialization.
 					@see freerdp_parse_args() */
-	uint32 paddingB[32 - 18]; /* 18 */
+	UINT32 paddingB[32 - 18]; /* 18 */

 	rdpRdp* rdp; /**< (offset 32)
 					Pointer to a rdp_rdp structure used to keep the connection's parameters.
@@ -96,7 +96,7 @@ struct rdp_context
 	rdpCache* cache; /* 35 */
 	rdpChannels* channels; /* 36 */
 	rdpGraphics* graphics; /* 37 */
-	uint32 paddingC[64 - 38]; /* 38 */
+	UINT32 paddingC[64 - 38]; /* 38 */
 };

 /** Defines the options for a given instance of RDP connection.
@@ -115,7 +115,7 @@ struct rdp_freerdp
 							  rdpContext field first, and any additional content following it.
 							  Can be allocated by a call to freerdp_context_new().
 							  Must be dealocated by a call to freerdp_context_free() before deallocating the current instance. */
-	uint32 paddingA[16 - 1]; /* 1 */
+	UINT32 paddingA[16 - 1]; /* 1 */

 	rdpInput* input; /* (offset 16)
 						Input handle for the connection.
@@ -126,7 +126,7 @@ struct rdp_freerdp
 	rdpSettings* settings; /**< (offset 18)
 								Pointer to a rdpSettings structure. Will be used to maintain the required RDP settings.
 								Will be initialized by a call to freerdp_context_new() */
-	uint32 paddingB[32 - 19]; /* 19 */
+	UINT32 paddingB[32 - 19]; /* 19 */

 	size_t context_size; /* (offset 32)
 							Specifies the size of the 'context' field. freerdp_context_new() will use this size to allocate the context buffer.
@@ -146,7 +146,7 @@ struct rdp_freerdp
 								   Callback for context deallocation
 								   Can be set before calling freerdp_context_free() to have it executed before deallocation.
 								   Must be set to NULL if not needed. */
-	uint32 paddingC[48 - 35]; /* 35 */
+	UINT32 paddingC[48 - 35]; /* 35 */

 	pPreConnect PreConnect; /**< (offset 48)
 								 Callback for pre-connect operations.
@@ -168,7 +168,7 @@ struct rdp_freerdp
 															 Callback for changed certificate validation. 
 															 Used when a certificate differs from stored fingerprint.
 															 If returns TRUE, the new fingerprint will be trusted and old thrown out. */
-	uint32 paddingD[64 - 51]; /* 51 */
+	UINT32 paddingD[64 - 51]; /* 51 */

 	pSendChannelData SendChannelData; /* (offset 64)
 										 Callback for sending data to a channel.
@@ -178,7 +178,7 @@ struct rdp_freerdp
 											   Callback for receiving data from a channel.
 											   This is called by freerdp_channel_process() (if not NULL).
 											   Clients will typically use a function that calls freerdp_channels_data() to perform the needed tasks. */
-	uint32 paddingE[80 - 66]; /* 66 */
+	UINT32 paddingE[80 - 66]; /* 66 */
 };

 FREERDP_API void freerdp_context_new(freerdp* instance);
@@ -191,7 +191,7 @@ FREERDP_API BOOL freerdp_disconnect(freerdp* instance);
 FREERDP_API BOOL freerdp_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds, int* wcount);
 FREERDP_API BOOL freerdp_check_fds(freerdp* instance);

-FREERDP_API uint32 freerdp_error_info(freerdp* instance);
+FREERDP_API UINT32 freerdp_error_info(freerdp* instance);

 FREERDP_API void freerdp_get_version(int* major, int* minor, int* revision);

--- a/include/freerdp/gdi/32bpp.h
+++ b/include/freerdp/gdi/32bpp.h
@@ -23,7 +23,7 @@

 typedef int (*pLineTo_32bpp)(HGDI_DC hdc, int nXEnd, int nYEnd);

-FREERDP_API uint32 gdi_get_color_32bpp(HGDI_DC hdc, GDI_COLOR color);
+FREERDP_API UINT32 gdi_get_color_32bpp(HGDI_DC hdc, GDI_COLOR color);

 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);
--- a/include/freerdp/gdi/bitmap.h
+++ b/include/freerdp/gdi/bitmap.h
@@ -27,13 +27,13 @@ FREERDP_API GDI_COLOR gdi_GetPixel(HGDI_DC hdc, int nXPos, int nYPos);
 FREERDP_API GDI_COLOR gdi_SetPixel(HGDI_DC hdc, int X, int Y, GDI_COLOR crColor);
 FREERDP_API BYTE gdi_GetPixel_8bpp(HGDI_BITMAP hBmp, int X, int Y);
 FREERDP_API UINT16 gdi_GetPixel_16bpp(HGDI_BITMAP hBmp, int X, int Y);
-FREERDP_API uint32 gdi_GetPixel_32bpp(HGDI_BITMAP hBmp, int X, int Y);
+FREERDP_API UINT32 gdi_GetPixel_32bpp(HGDI_BITMAP hBmp, int X, int Y);
 FREERDP_API BYTE* gdi_GetPointer_8bpp(HGDI_BITMAP hBmp, int X, int Y);
 FREERDP_API UINT16* gdi_GetPointer_16bpp(HGDI_BITMAP hBmp, int X, int Y);
-FREERDP_API uint32* gdi_GetPointer_32bpp(HGDI_BITMAP hBmp, int X, int Y);
+FREERDP_API UINT32* gdi_GetPointer_32bpp(HGDI_BITMAP hBmp, int X, int Y);
 FREERDP_API void gdi_SetPixel_8bpp(HGDI_BITMAP hBmp, int X, int Y, BYTE pixel);
 FREERDP_API void gdi_SetPixel_16bpp(HGDI_BITMAP hBmp, int X, int Y, UINT16 pixel);
-FREERDP_API void gdi_SetPixel_32bpp(HGDI_BITMAP hBmp, int X, int Y, uint32 pixel);
+FREERDP_API void gdi_SetPixel_32bpp(HGDI_BITMAP hBmp, int X, int Y, UINT32 pixel);
 FREERDP_API HGDI_BITMAP gdi_CreateBitmap(int nWidth, int nHeight, int cBitsPerPixel, BYTE* data);
 FREERDP_API HGDI_BITMAP gdi_CreateCompatibleBitmap(HGDI_DC hdc, int nWidth, int nHeight);
 FREERDP_API int gdi_BitBlt(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc, int rop);
--- a/include/freerdp/gdi/gdi.h
+++ b/include/freerdp/gdi/gdi.h
@@ -281,13 +281,13 @@ struct rdp_gdi
 	gdiBitmap* image;
 };

-FREERDP_API uint32 gdi_rop3_code(BYTE code);
+FREERDP_API UINT32 gdi_rop3_code(BYTE code);
 FREERDP_API BYTE* gdi_get_bitmap_pointer(HGDI_DC hdcBmp, int x, int y);
 FREERDP_API BYTE* gdi_get_brush_pointer(HGDI_DC hdcBrush, int x, int y);
 FREERDP_API int gdi_is_mono_pixel_set(BYTE* data, int x, int y, int width);
 FREERDP_API void gdi_resize(rdpGdi* gdi, int width, int height);

-FREERDP_API int gdi_init(freerdp* instance, uint32 flags, BYTE* buffer);
+FREERDP_API int gdi_init(freerdp* instance, UINT32 flags, BYTE* buffer);
 FREERDP_API void gdi_free(freerdp* instance);

 #ifdef WITH_DEBUG_GDI
--- a/include/freerdp/gdi/pen.h
+++ b/include/freerdp/gdi/pen.h
@@ -26,6 +26,6 @@
 FREERDP_API HGDI_PEN gdi_CreatePen(int fnPenStyle, int nWidth, int crColor);
 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);
+FREERDP_API UINT32 gdi_GetPenColor_32bpp(HGDI_PEN pen);

 #endif /* __GDI_PEN_H */
--- a/include/freerdp/graphics.h
+++ b/include/freerdp/graphics.h
@@ -47,23 +47,23 @@ struct rdp_bitmap
 	pBitmap_Paint Paint; /* 3 */
 	pBitmap_Decompress Decompress; /* 4 */
 	pBitmap_SetSurface SetSurface; /* 5 */
-	uint32 paddingA[16 - 6];  /* 6 */
+	UINT32 paddingA[16 - 6];  /* 6 */

-	uint32 left; /* 16 */
-	uint32 top; /* 17 */
-	uint32 right; /* 18 */
-	uint32 bottom; /* 19 */
-	uint32 width; /* 20 */
-	uint32 height; /* 21 */
-	uint32 bpp; /* 22 */
-	uint32 flags; /* 23 */
-	uint32 length; /* 24 */
+	UINT32 left; /* 16 */
+	UINT32 top; /* 17 */
+	UINT32 right; /* 18 */
+	UINT32 bottom; /* 19 */
+	UINT32 width; /* 20 */
+	UINT32 height; /* 21 */
+	UINT32 bpp; /* 22 */
+	UINT32 flags; /* 23 */
+	UINT32 length; /* 24 */
 	BYTE* data; /* 25 */
-	uint32 paddingB[32 - 26]; /* 26 */
+	UINT32 paddingB[32 - 26]; /* 26 */

 	BOOL compressed; /* 32 */
 	BOOL ephemeral; /* 33 */
-	uint32 paddingC[64 - 34]; /* 34 */
+	UINT32 paddingC[64 - 34]; /* 34 */
 };

 FREERDP_API rdpBitmap* Bitmap_Alloc(rdpContext* context);
@@ -93,18 +93,18 @@ struct rdp_pointer
 	pPointer_Set Set; /* 3 */
 	pPointer_SetNull SetNull; /* 4*/
 	pPointer_SetDefault SetDefault; /* 5 */
-	uint32 paddingA[16 - 6]; /* 6 */
+	UINT32 paddingA[16 - 6]; /* 6 */

-	uint32 xPos; /* 16 */
-	uint32 yPos; /* 17 */
-	uint32 width; /* 18 */
-	uint32 height; /* 19 */
-	uint32 xorBpp; /* 20 */
-	uint32 lengthAndMask; /* 21 */
-	uint32 lengthXorMask; /* 22 */
+	UINT32 xPos; /* 16 */
+	UINT32 yPos; /* 17 */
+	UINT32 width; /* 18 */
+	UINT32 height; /* 19 */
+	UINT32 xorBpp; /* 20 */
+	UINT32 lengthAndMask; /* 21 */
+	UINT32 lengthXorMask; /* 22 */
 	BYTE* xorMaskData; /* 23 */
 	BYTE* andMaskData; /* 24 */
-	uint32 paddingB[32 - 25]; /* 25 */
+	UINT32 paddingB[32 - 25]; /* 25 */
 };

 FREERDP_API rdpPointer* Pointer_Alloc(rdpContext* context);
@@ -119,8 +119,8 @@ FREERDP_API void Pointer_SetDefault(rdpContext* context);
 typedef void (*pGlyph_New)(rdpContext* context, rdpGlyph* glyph);
 typedef void (*pGlyph_Free)(rdpContext* context, rdpGlyph* glyph);
 typedef void (*pGlyph_Draw)(rdpContext* context, rdpGlyph* glyph, int x, int y);
-typedef void (*pGlyph_BeginDraw)(rdpContext* context, int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor);
-typedef void (*pGlyph_EndDraw)(rdpContext* context, int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor);
+typedef void (*pGlyph_BeginDraw)(rdpContext* context, int x, int y, int width, int height, UINT32 bgcolor, UINT32 fgcolor);
+typedef void (*pGlyph_EndDraw)(rdpContext* context, int x, int y, int width, int height, UINT32 bgcolor, UINT32 fgcolor);

 struct rdp_glyph
 {
@@ -130,23 +130,23 @@ struct rdp_glyph
 	pGlyph_Draw Draw; /* 3 */
 	pGlyph_BeginDraw BeginDraw; /* 4 */
 	pGlyph_EndDraw EndDraw; /* 5 */
-	uint32 paddingA[16 - 6]; /* 6 */
+	UINT32 paddingA[16 - 6]; /* 6 */

-	sint32 x; /* 16 */
-	sint32 y; /* 17 */
-	uint32 cx; /* 18 */
-	uint32 cy; /* 19 */
-	uint32 cb; /* 20 */
+	INT32 x; /* 16 */
+	INT32 y; /* 17 */
+	UINT32 cx; /* 18 */
+	UINT32 cy; /* 19 */
+	UINT32 cb; /* 20 */
 	BYTE* aj; /* 21 */
-	uint32 paddingB[32 - 22]; /* 22 */
+	UINT32 paddingB[32 - 22]; /* 22 */
 };

 FREERDP_API rdpGlyph* Glyph_Alloc(rdpContext* context);
 FREERDP_API void Glyph_New(rdpContext* context, rdpGlyph* glyph);
 FREERDP_API void Glyph_Free(rdpContext* context, rdpGlyph* glyph);
 FREERDP_API void Glyph_Draw(rdpContext* context, rdpGlyph* glyph, int x, int y);
-FREERDP_API void Glyph_BeginDraw(rdpContext* context, int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor);
-FREERDP_API void Glyph_EndDraw(rdpContext* context, int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor);
+FREERDP_API void Glyph_BeginDraw(rdpContext* context, int x, int y, int width, int height, UINT32 bgcolor, UINT32 fgcolor);
+FREERDP_API void Glyph_EndDraw(rdpContext* context, int x, int y, int width, int height, UINT32 bgcolor, UINT32 fgcolor);

 /* Graphics Module */

@@ -156,7 +156,7 @@ struct rdp_graphics
 	rdpBitmap* Bitmap_Prototype; /* 1 */
 	rdpPointer* Pointer_Prototype; /* 2 */
 	rdpGlyph* Glyph_Prototype; /* 3 */
-	uint32 paddingA[16 - 4]; /* 4 */
+	UINT32 paddingA[16 - 4]; /* 4 */
 };

 FREERDP_API void graphics_register_bitmap(rdpGraphics* graphics, rdpBitmap* bitmap);
--- a/include/freerdp/input.h
+++ b/include/freerdp/input.h
@@ -54,7 +54,7 @@ typedef struct rdp_input rdpInput;

 #define RDP_CLIENT_INPUT_PDU_HEADER_LENGTH	4

-typedef void (*pSynchronizeEvent)(rdpInput* input, uint32 flags);
+typedef void (*pSynchronizeEvent)(rdpInput* input, UINT32 flags);
 typedef void (*pKeyboardEvent)(rdpInput* input, UINT16 flags, UINT16 code);
 typedef void (*pUnicodeKeyboardEvent)(rdpInput* input, UINT16 flags, UINT16 code);
 typedef void (*pMouseEvent)(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y);
@@ -64,19 +64,19 @@ struct rdp_input
 {
 	rdpContext* context; /* 0 */
 	void* param1; /* 1 */
-	uint32 paddingA[16 - 2]; /* 2 */
+	UINT32 paddingA[16 - 2]; /* 2 */

 	pSynchronizeEvent SynchronizeEvent; /* 16 */
 	pKeyboardEvent KeyboardEvent; /* 17 */
 	pUnicodeKeyboardEvent UnicodeKeyboardEvent; /* 18 */
 	pMouseEvent MouseEvent; /* 19 */
 	pExtendedMouseEvent ExtendedMouseEvent; /* 20 */
-	uint32 paddingB[32 - 21]; /* 21 */
+	UINT32 paddingB[32 - 21]; /* 21 */
 };

-FREERDP_API void freerdp_input_send_synchronize_event(rdpInput* input, uint32 flags);
+FREERDP_API void freerdp_input_send_synchronize_event(rdpInput* input, UINT32 flags);
 FREERDP_API void freerdp_input_send_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code);
-FREERDP_API void freerdp_input_send_keyboard_event_ex(rdpInput* input, BOOL down, uint32 rdp_scancode);
+FREERDP_API void freerdp_input_send_keyboard_event_ex(rdpInput* input, BOOL down, UINT32 rdp_scancode);
 FREERDP_API void freerdp_input_send_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code);
 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);
--- a/include/freerdp/locale/keyboard.h
+++ b/include/freerdp/locale/keyboard.h
@@ -31,7 +31,7 @@

 struct _RDP_KEYBOARD_LAYOUT
 {
-	uint32 code; /* Keyboard layout code */
+	UINT32 code; /* Keyboard layout code */
 	char* name; /* Keyboard layout name */
 };
 typedef struct _RDP_KEYBOARD_LAYOUT RDP_KEYBOARD_LAYOUT;
@@ -198,11 +198,11 @@ typedef struct _RDP_KEYBOARD_LAYOUT RDP_KEYBOARD_LAYOUT;
 #define KBD_TYPE_NOKIA_9140					0x00000006 /* Nokia 9140 and similar keyboards */
 #define KBD_TYPE_JAPANESE					0x00000007 /* Japanese keyboard */

-FREERDP_API uint32 freerdp_keyboard_init(uint32 keyboardLayoutId);
-FREERDP_API RDP_KEYBOARD_LAYOUT* freerdp_keyboard_get_layouts(uint32 types);
-FREERDP_API const char* freerdp_keyboard_get_layout_name_from_id(uint32 keyboardLayoutId);
-FREERDP_API RDP_SCANCODE freerdp_keyboard_get_rdp_scancode_from_x11_keycode(uint32 keycode);
-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);
+FREERDP_API UINT32 freerdp_keyboard_init(UINT32 keyboardLayoutId);
+FREERDP_API RDP_KEYBOARD_LAYOUT* freerdp_keyboard_get_layouts(UINT32 types);
+FREERDP_API const char* freerdp_keyboard_get_layout_name_from_id(UINT32 keyboardLayoutId);
+FREERDP_API RDP_SCANCODE freerdp_keyboard_get_rdp_scancode_from_x11_keycode(UINT32 keycode);
+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 */
--- a/include/freerdp/locale/locale.h
+++ b/include/freerdp/locale/locale.h
@@ -230,8 +230,8 @@
 #define YORUBA						0x046A
 #define ZULU						0x0435

-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);
+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 */
--- a/include/freerdp/locale/vkcodes.h
+++ b/include/freerdp/locale/vkcodes.h
@@ -303,7 +303,7 @@
 #define VK_PA1		0xFD /* PA1 key */
 #define VK_OEM_CLEAR	0xFE /* Clear key */

-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);
+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 */
--- a/include/freerdp/peer.h
+++ b/include/freerdp/peer.h
@@ -72,7 +72,7 @@ struct rdp_freerdp_peer
 	psPeerSendChannelData SendChannelData;
 	psPeerReceiveChannelData ReceiveChannelData;

-	uint32 ack_frame_id;
+	UINT32 ack_frame_id;
 	BOOL local;
 	BOOL connected;
 	BOOL activated;
--- a/include/freerdp/pointer.h
+++ b/include/freerdp/pointer.h
@@ -33,26 +33,26 @@

 struct _POINTER_POSITION_UPDATE
 {
-	uint32 xPos;
-	uint32 yPos;
+	UINT32 xPos;
+	UINT32 yPos;
 };
 typedef struct _POINTER_POSITION_UPDATE POINTER_POSITION_UPDATE;

 struct _POINTER_SYSTEM_UPDATE
 {
-	uint32 type;
+	UINT32 type;
 };
 typedef struct _POINTER_SYSTEM_UPDATE POINTER_SYSTEM_UPDATE;

 struct _POINTER_COLOR_UPDATE
 {
-	uint32 cacheIndex;
-	uint32 xPos;
-	uint32 yPos;
-	uint32 width;
-	uint32 height;
-	uint32 lengthAndMask;
-	uint32 lengthXorMask;
+	UINT32 cacheIndex;
+	UINT32 xPos;
+	UINT32 yPos;
+	UINT32 width;
+	UINT32 height;
+	UINT32 lengthAndMask;
+	UINT32 lengthXorMask;
 	BYTE* xorMaskData;
 	BYTE* andMaskData;
 };
@@ -60,14 +60,14 @@ typedef struct _POINTER_COLOR_UPDATE POINTER_COLOR_UPDATE;

 struct _POINTER_NEW_UPDATE
 {
-	uint32 xorBpp;
+	UINT32 xorBpp;
 	POINTER_COLOR_UPDATE colorPtrAttr;
 };
 typedef struct _POINTER_NEW_UPDATE POINTER_NEW_UPDATE;

 struct _POINTER_CACHED_UPDATE
 {
-	uint32 cacheIndex;
+	UINT32 cacheIndex;
 };
 typedef struct _POINTER_CACHED_UPDATE POINTER_CACHED_UPDATE;

@@ -80,14 +80,14 @@ typedef void (*pPointerCached)(rdpContext* context, POINTER_CACHED_UPDATE* point
 struct rdp_pointer_update
 {
 	rdpContext* context; /* 0 */
-	uint32 paddingA[16 - 1]; /* 1 */
+	UINT32 paddingA[16 - 1]; /* 1 */

 	pPointerPosition PointerPosition; /* 16 */
 	pPointerSystem PointerSystem; /* 17 */
 	pPointerColor PointerColor; /* 18 */
 	pPointerNew PointerNew; /* 19 */
 	pPointerCached PointerCached; /* 20 */
-	uint32 paddingB[32 - 21]; /* 21 */
+	UINT32 paddingB[32 - 21]; /* 21 */

 	/* internal */

--- a/include/freerdp/primary.h
+++ b/include/freerdp/primary.h
@@ -27,21 +27,21 @@

 struct rdp_bounds
 {
-	sint32 left;
-	sint32 top;
-	sint32 right;
-	sint32 bottom;
+	INT32 left;
+	INT32 top;
+	INT32 right;
+	INT32 bottom;
 };
 typedef struct rdp_bounds rdpBounds;

 struct rdp_brush
 {
-	uint32 x;
-	uint32 y;
-	uint32 bpp;
-	uint32 style;
-	uint32 hatch;
-	uint32 index;
+	UINT32 x;
+	UINT32 y;
+	UINT32 bpp;
+	UINT32 style;
+	UINT32 hatch;
+	UINT32 index;
 	BYTE* data;
 	BYTE p8x8[8];
 };
@@ -49,313 +49,313 @@ typedef struct rdp_brush rdpBrush;

 struct _ORDER_INFO
 {
-	uint32 orderType;
-	uint32 fieldFlags;
+	UINT32 orderType;
+	UINT32 fieldFlags;
 	rdpBounds bounds;
-	sint32 deltaBoundLeft;
-	sint32 deltaBoundTop;
-	sint32 deltaBoundRight;
-	sint32 deltaBoundBottom;
+	INT32 deltaBoundLeft;
+	INT32 deltaBoundTop;
+	INT32 deltaBoundRight;
+	INT32 deltaBoundBottom;
 	BOOL deltaCoordinates;
 };
 typedef struct _ORDER_INFO ORDER_INFO;

 struct _DSTBLT_ORDER
 {
-	sint32 nLeftRect;
-	sint32 nTopRect;
-	sint32 nWidth;
-	sint32 nHeight;
-	uint32 bRop;
+	INT32 nLeftRect;
+	INT32 nTopRect;
+	INT32 nWidth;
+	INT32 nHeight;
+	UINT32 bRop;
 };
 typedef struct _DSTBLT_ORDER DSTBLT_ORDER;

 struct _PATBLT_ORDER
 {
-	sint32 nLeftRect;
-	sint32 nTopRect;
-	sint32 nWidth;
-	sint32 nHeight;
-	uint32 bRop;
-	uint32 backColor;
-	uint32 foreColor;
+	INT32 nLeftRect;
+	INT32 nTopRect;
+	INT32 nWidth;
+	INT32 nHeight;
+	UINT32 bRop;
+	UINT32 backColor;
+	UINT32 foreColor;
 	rdpBrush brush;
 };
 typedef struct _PATBLT_ORDER PATBLT_ORDER;

 struct _SCRBLT_ORDER
 {
-	sint32 nLeftRect;
-	sint32 nTopRect;
-	sint32 nWidth;
-	sint32 nHeight;
-	uint32 bRop;
-	sint32 nXSrc;
-	sint32 nYSrc;
+	INT32 nLeftRect;
+	INT32 nTopRect;
+	INT32 nWidth;
+	INT32 nHeight;
+	UINT32 bRop;
+	INT32 nXSrc;
+	INT32 nYSrc;
 };
 typedef struct _SCRBLT_ORDER SCRBLT_ORDER;

 struct _OPAQUE_RECT_ORDER
 {
-	sint32 nLeftRect;
-	sint32 nTopRect;
-	sint32 nWidth;
-	sint32 nHeight;
-	uint32 color;
+	INT32 nLeftRect;
+	INT32 nTopRect;
+	INT32 nWidth;
+	INT32 nHeight;
+	UINT32 color;
 };
 typedef struct _OPAQUE_RECT_ORDER OPAQUE_RECT_ORDER;

 struct _DRAW_NINE_GRID_ORDER
 {
-	sint32 srcLeft;
-	sint32 srcTop;
-	sint32 srcRight;
-	sint32 srcBottom;
-	uint32 bitmapId;
+	INT32 srcLeft;
+	INT32 srcTop;
+	INT32 srcRight;
+	INT32 srcBottom;
+	UINT32 bitmapId;
 };
 typedef struct _DRAW_NINE_GRID_ORDER DRAW_NINE_GRID_ORDER;

 struct _DELTA_RECT
 {
-	sint32 left;
-	sint32 top;
-	sint32 width;
-	sint32 height;
+	INT32 left;
+	INT32 top;
+	INT32 width;
+	INT32 height;
 };
 typedef struct _DELTA_RECT DELTA_RECT;

 struct _MULTI_DSTBLT_ORDER
 {
-	sint32 nLeftRect;
-	sint32 nTopRect;
-	sint32 nWidth;
-	sint32 nHeight;
-	uint32 bRop;
-	uint32 numRectangles;
-	uint32 cbData;
+	INT32 nLeftRect;
+	INT32 nTopRect;
+	INT32 nWidth;
+	INT32 nHeight;
+	UINT32 bRop;
+	UINT32 numRectangles;
+	UINT32 cbData;
 	DELTA_RECT rectangles[45];
 };
 typedef struct _MULTI_DSTBLT_ORDER MULTI_DSTBLT_ORDER;

 struct _MULTI_PATBLT_ORDER
 {
-	sint32 nLeftRect;
-	sint32 nTopRect;
-	sint32 nWidth;
-	sint32 nHeight;
-	uint32 bRop;
-	uint32 backColor;
-	uint32 foreColor;
+	INT32 nLeftRect;
+	INT32 nTopRect;
+	INT32 nWidth;
+	INT32 nHeight;
+	UINT32 bRop;
+	UINT32 backColor;
+	UINT32 foreColor;
 	rdpBrush brush;
-	uint32 numRectangles;
-	uint32 cbData;
+	UINT32 numRectangles;
+	UINT32 cbData;
 	DELTA_RECT rectangles[45];
 };
 typedef struct _MULTI_PATBLT_ORDER MULTI_PATBLT_ORDER;

 struct _MULTI_SCRBLT_ORDER
 {
-	sint32 nLeftRect;
-	sint32 nTopRect;
-	sint32 nWidth;
-	sint32 nHeight;
-	uint32 bRop;
-	sint32 nXSrc;
-	sint32 nYSrc;
-	uint32 numRectangles;
-	uint32 cbData;
+	INT32 nLeftRect;
+	INT32 nTopRect;
+	INT32 nWidth;
+	INT32 nHeight;
+	UINT32 bRop;
+	INT32 nXSrc;
+	INT32 nYSrc;
+	UINT32 numRectangles;
+	UINT32 cbData;
 	DELTA_RECT rectangles[45];
 };
 typedef struct _MULTI_SCRBLT_ORDER MULTI_SCRBLT_ORDER;

 struct _MULTI_OPAQUE_RECT_ORDER
 {
-	sint32 nLeftRect;
-	sint32 nTopRect;
-	sint32 nWidth;
-	sint32 nHeight;
-	uint32 color;
-	uint32 numRectangles;
-	uint32 cbData;
+	INT32 nLeftRect;
+	INT32 nTopRect;
+	INT32 nWidth;
+	INT32 nHeight;
+	UINT32 color;
+	UINT32 numRectangles;
+	UINT32 cbData;
 	DELTA_RECT rectangles[45];
 };
 typedef struct _MULTI_OPAQUE_RECT_ORDER MULTI_OPAQUE_RECT_ORDER;

 struct _MULTI_DRAW_NINE_GRID_ORDER
 {
-	sint32 srcLeft;
-	sint32 srcTop;
-	sint32 srcRight;
-	sint32 srcBottom;
-	uint32 bitmapId;
-	uint32 nDeltaEntries;
-	uint32 cbData;
+	INT32 srcLeft;
+	INT32 srcTop;
+	INT32 srcRight;
+	INT32 srcBottom;
+	UINT32 bitmapId;
+	UINT32 nDeltaEntries;
+	UINT32 cbData;
 	BYTE* codeDeltaList;
 };
 typedef struct _MULTI_DRAW_NINE_GRID_ORDER MULTI_DRAW_NINE_GRID_ORDER;

 struct _LINE_TO_ORDER
 {
-	uint32 backMode;
-	sint32 nXStart;
-	sint32 nYStart;
-	sint32 nXEnd;
-	sint32 nYEnd;
-	uint32 backColor;
-	uint32 bRop2;
-	uint32 penStyle;
-	uint32 penWidth;
-	uint32 penColor;
+	UINT32 backMode;
+	INT32 nXStart;
+	INT32 nYStart;
+	INT32 nXEnd;
+	INT32 nYEnd;
+	UINT32 backColor;
+	UINT32 bRop2;
+	UINT32 penStyle;
+	UINT32 penWidth;
+	UINT32 penColor;
 };
 typedef struct _LINE_TO_ORDER LINE_TO_ORDER;

 struct _DELTA_POINT
 {
-	sint32 x;
-	sint32 y;
+	INT32 x;
+	INT32 y;
 };
 typedef struct _DELTA_POINT DELTA_POINT;

 struct _POLYLINE_ORDER
 {
-	sint32 xStart;
-	sint32 yStart;
-	uint32 bRop2;
-	uint32 penColor;
-	uint32 numPoints;
-	uint32 cbData;
+	INT32 xStart;
+	INT32 yStart;
+	UINT32 bRop2;
+	UINT32 penColor;
+	UINT32 numPoints;
+	UINT32 cbData;
 	DELTA_POINT* points;
 };
 typedef struct _POLYLINE_ORDER POLYLINE_ORDER;

 struct _MEMBLT_ORDER
 {
-	uint32 cacheId;
-	uint32 colorIndex;
-	sint32 nLeftRect;
-	sint32 nTopRect;
-	sint32 nWidth;
-	sint32 nHeight;
-	uint32 bRop;
-	sint32 nXSrc;
-	sint32 nYSrc;
-	uint32 cacheIndex;
+	UINT32 cacheId;
+	UINT32 colorIndex;
+	INT32 nLeftRect;
+	INT32 nTopRect;
+	INT32 nWidth;
+	INT32 nHeight;
+	UINT32 bRop;
+	INT32 nXSrc;
+	INT32 nYSrc;
+	UINT32 cacheIndex;
 	rdpBitmap* bitmap;
 };
 typedef struct _MEMBLT_ORDER MEMBLT_ORDER;

 struct _MEM3BLT_ORDER
 {
-	uint32 cacheId;
-	uint32 colorIndex;
-	sint32 nLeftRect;
-	sint32 nTopRect;
-	sint32 nWidth;
-	sint32 nHeight;
-	uint32 bRop;
-	sint32 nXSrc;
-	sint32 nYSrc;
-	uint32 backColor;
-	uint32 foreColor;
+	UINT32 cacheId;
+	UINT32 colorIndex;
+	INT32 nLeftRect;
+	INT32 nTopRect;
+	INT32 nWidth;
+	INT32 nHeight;
+	UINT32 bRop;
+	INT32 nXSrc;
+	INT32 nYSrc;
+	UINT32 backColor;
+	UINT32 foreColor;
 	rdpBrush brush;
-	uint32 cacheIndex;
+	UINT32 cacheIndex;
 	rdpBitmap* bitmap;
 };
 typedef struct _MEM3BLT_ORDER MEM3BLT_ORDER;

 struct _SAVE_BITMAP_ORDER
 {
-	uint32 savedBitmapPosition;
-	sint32 nLeftRect;
-	sint32 nTopRect;
-	sint32 nRightRect;
-	sint32 nBottomRect;
-	uint32 operation;
+	UINT32 savedBitmapPosition;
+	INT32 nLeftRect;
+	INT32 nTopRect;
+	INT32 nRightRect;
+	INT32 nBottomRect;
+	UINT32 operation;
 };
 typedef struct _SAVE_BITMAP_ORDER SAVE_BITMAP_ORDER;

 struct _GLYPH_FRAGMENT_INDEX
 {
-	uint32 index;
-	uint32 delta;
+	UINT32 index;
+	UINT32 delta;
 };
 typedef struct _GLYPH_FRAGMENT_INDEX GLYPH_FRAGMENT_INDEX;

 struct _GLYPH_FRAGMENT
 {
-	uint32 operation;
-	uint32 index;
-	uint32 size;
-	uint32 nindices;
+	UINT32 operation;
+	UINT32 index;
+	UINT32 size;
+	UINT32 nindices;
 	GLYPH_FRAGMENT_INDEX* indices;
 };
 typedef struct _GLYPH_FRAGMENT GLYPH_FRAGMENT;

 struct _GLYPH_INDEX_ORDER
 {
-	uint32 cacheId;
-	uint32 flAccel;
-	uint32 ulCharInc;
-	uint32 fOpRedundant;
-	uint32 backColor;
-	uint32 foreColor;
-	sint32 bkLeft;
-	sint32 bkTop;
-	sint32 bkRight;
-	sint32 bkBottom;
-	sint32 opLeft;
-	sint32 opTop;
-	sint32 opRight;
-	sint32 opBottom;
+	UINT32 cacheId;
+	UINT32 flAccel;
+	UINT32 ulCharInc;
+	UINT32 fOpRedundant;
+	UINT32 backColor;
+	UINT32 foreColor;
+	INT32 bkLeft;
+	INT32 bkTop;
+	INT32 bkRight;
+	INT32 bkBottom;
+	INT32 opLeft;
+	INT32 opTop;
+	INT32 opRight;
+	INT32 opBottom;
 	rdpBrush brush;
-	sint32 x;
-	sint32 y;
-	uint32 cbData;
+	INT32 x;
+	INT32 y;
+	UINT32 cbData;
 	BYTE data[256];
 };
 typedef struct _GLYPH_INDEX_ORDER GLYPH_INDEX_ORDER;

 struct _FAST_INDEX_ORDER
 {
-	uint32 cacheId;
-	uint32 flAccel;
-	uint32 ulCharInc;
-	uint32 backColor;
-	uint32 foreColor;
-	sint32 bkLeft;
-	sint32 bkTop;
-	sint32 bkRight;
-	sint32 bkBottom;
-	sint32 opLeft;
-	sint32 opTop;
-	sint32 opRight;
-	sint32 opBottom;
+	UINT32 cacheId;
+	UINT32 flAccel;
+	UINT32 ulCharInc;
+	UINT32 backColor;
+	UINT32 foreColor;
+	INT32 bkLeft;
+	INT32 bkTop;
+	INT32 bkRight;
+	INT32 bkBottom;
+	INT32 opLeft;
+	INT32 opTop;
+	INT32 opRight;
+	INT32 opBottom;
 	BOOL opaqueRect;
-	sint32 x;
-	sint32 y;
-	uint32 cbData;
+	INT32 x;
+	INT32 y;
+	UINT32 cbData;
 	BYTE data[256];
 };
 typedef struct _FAST_INDEX_ORDER FAST_INDEX_ORDER;

 struct _FAST_GLYPH_ORDER
 {
-	uint32 cacheId;
-	uint32 flAccel;
-	uint32 ulCharInc;
-	uint32 backColor;
-	uint32 foreColor;
-	sint32 bkLeft;
-	sint32 bkTop;
-	sint32 bkRight;
-	sint32 bkBottom;
-	sint32 opLeft;
-	sint32 opTop;
-	sint32 opRight;
-	sint32 opBottom;
-	sint32 x;
-	sint32 y;
-	uint32 cbData;
+	UINT32 cacheId;
+	UINT32 flAccel;
+	UINT32 ulCharInc;
+	UINT32 backColor;
+	UINT32 foreColor;
+	INT32 bkLeft;
+	INT32 bkTop;
+	INT32 bkRight;
+	INT32 bkBottom;
+	INT32 opLeft;
+	INT32 opTop;
+	INT32 opRight;
+	INT32 opBottom;
+	INT32 x;
+	INT32 y;
+	UINT32 cbData;
 	BYTE data[256];
 	void* glyph_data;
 };
@@ -363,55 +363,55 @@ typedef struct _FAST_GLYPH_ORDER FAST_GLYPH_ORDER;

 struct _POLYGON_SC_ORDER
 {
-	sint32 xStart;
-	sint32 yStart;
-	uint32 bRop2;
-	uint32 fillMode;
-	uint32 brushColor;
-	uint32 numPoints;
-	uint32 cbData;
+	INT32 xStart;
+	INT32 yStart;
+	UINT32 bRop2;
+	UINT32 fillMode;
+	UINT32 brushColor;
+	UINT32 numPoints;
+	UINT32 cbData;
 	DELTA_POINT* points;
 };
 typedef struct _POLYGON_SC_ORDER POLYGON_SC_ORDER;

 struct _POLYGON_CB_ORDER
 {
-	sint32 xStart;
-	sint32 yStart;
-	uint32 bRop2;
-	uint32 backMode;
-	uint32 fillMode;
-	uint32 backColor;
-	uint32 foreColor;
+	INT32 xStart;
+	INT32 yStart;
+	UINT32 bRop2;
+	UINT32 backMode;
+	UINT32 fillMode;
+	UINT32 backColor;
+	UINT32 foreColor;
 	rdpBrush brush;
-	uint32 numPoints;
-	uint32 cbData;
+	UINT32 numPoints;
+	UINT32 cbData;
 	DELTA_POINT* points;
 };
 typedef struct _POLYGON_CB_ORDER POLYGON_CB_ORDER;

 struct _ELLIPSE_SC_ORDER
 {
-	sint32 leftRect;
-	sint32 topRect;
-	sint32 rightRect;
-	sint32 bottomRect;
-	uint32 bRop2;
-	uint32 fillMode;
-	uint32 color;
+	INT32 leftRect;
+	INT32 topRect;
+	INT32 rightRect;
+	INT32 bottomRect;
+	UINT32 bRop2;
+	UINT32 fillMode;
+	UINT32 color;
 };
 typedef struct _ELLIPSE_SC_ORDER ELLIPSE_SC_ORDER;

 struct _ELLIPSE_CB_ORDER
 {
-	sint32 leftRect;
-	sint32 topRect;
-	sint32 rightRect;
-	sint32 bottomRect;
-	uint32 bRop2;
-	uint32 fillMode;
-	uint32 backColor;
-	uint32 foreColor;
+	INT32 leftRect;
+	INT32 topRect;
+	INT32 rightRect;
+	INT32 bottomRect;
+	UINT32 bRop2;
+	UINT32 fillMode;
+	UINT32 backColor;
+	UINT32 foreColor;
 	rdpBrush brush;
 };
 typedef struct _ELLIPSE_CB_ORDER ELLIPSE_CB_ORDER;
@@ -442,7 +442,7 @@ typedef void (*pEllipseCB)(rdpContext* context, ELLIPSE_CB_ORDER* ellipse_cb);
 struct rdp_primary_update
 {
 	rdpContext* context; /* 0 */
-	uint32 paddingA[16 - 1]; /* 1 */
+	UINT32 paddingA[16 - 1]; /* 1 */

 	pDstBlt DstBlt; /* 16 */
 	pPatBlt PatBlt; /* 17 */
@@ -466,7 +466,7 @@ struct rdp_primary_update
 	pPolygonCB PolygonCB; /* 35 */
 	pEllipseSC EllipseSC; /* 36 */
 	pEllipseCB EllipseCB; /* 37 */
-	uint32 paddingB[48 - 38]; /* 38 */
+	UINT32 paddingB[48 - 38]; /* 38 */

 	/* internal */

--- a/include/freerdp/rail.h
+++ b/include/freerdp/rail.h
@@ -159,8 +159,8 @@ typedef struct _RAIL_UNICODE_STRING RAIL_UNICODE_STRING;

 struct _HIGH_CONTRAST
 {
-	uint32 flags;
-	uint32 colorSchemeLength;
+	UINT32 flags;
+	UINT32 colorSchemeLength;
 	RAIL_UNICODE_STRING colorScheme;
 };
 typedef struct _HIGH_CONTRAST HIGH_CONTRAST;
@@ -169,13 +169,13 @@ typedef struct _HIGH_CONTRAST HIGH_CONTRAST;

 struct _RAIL_HANDSHAKE_ORDER
 {
-	uint32 buildNumber;
+	UINT32 buildNumber;
 };
 typedef struct _RAIL_HANDSHAKE_ORDER RAIL_HANDSHAKE_ORDER;

 struct _RAIL_CLIENT_STATUS_ORDER
 {
-	uint32 flags;
+	UINT32 flags;
 };
 typedef struct _RAIL_CLIENT_STATUS_ORDER RAIL_CLIENT_STATUS_ORDER;

@@ -192,15 +192,15 @@ struct _RAIL_EXEC_RESULT_ORDER
 {
 	UINT16 flags;
 	UINT16 execResult;
-	uint32 rawResult;
+	UINT32 rawResult;
 	RAIL_UNICODE_STRING exeOrFile;
 };
 typedef struct _RAIL_EXEC_RESULT_ORDER RAIL_EXEC_RESULT_ORDER;

 struct _RAIL_SYSPARAM_ORDER
 {
-	uint32 param;
-	uint32 params;
+	UINT32 param;
+	UINT32 params;
 	BOOL dragFullWindows;
 	BOOL keyboardCues;
 	BOOL keyboardPref;
@@ -216,14 +216,14 @@ typedef struct _RAIL_SYSPARAM_ORDER RAIL_SYSPARAM_ORDER;

 struct _RAIL_ACTIVATE_ORDER
 {
-	uint32 windowId;
+	UINT32 windowId;
 	BOOL enabled;
 };
 typedef struct _RAIL_ACTIVATE_ORDER RAIL_ACTIVATE_ORDER;

 struct _RAIL_SYSMENU_ORDER
 {
-	uint32 windowId;
+	UINT32 windowId;
 	UINT16 left;
 	UINT16 top;
 };
@@ -231,22 +231,22 @@ typedef struct _RAIL_SYSMENU_ORDER RAIL_SYSMENU_ORDER;

 struct _RAIL_SYSCOMMAND_ORDER
 {
-	uint32 windowId;
+	UINT32 windowId;
 	UINT16 command;
 };
 typedef struct _RAIL_SYSCOMMAND_ORDER RAIL_SYSCOMMAND_ORDER;

 struct _RAIL_NOTIFY_EVENT_ORDER
 {
-	uint32 windowId;
-	uint32 notifyIconId;
-	uint32 message;
+	UINT32 windowId;
+	UINT32 notifyIconId;
+	UINT32 message;
 };
 typedef struct _RAIL_NOTIFY_EVENT_ORDER RAIL_NOTIFY_EVENT_ORDER;

 struct _RAIL_MINMAXINFO_ORDER
 {
-	uint32 windowId;
+	UINT32 windowId;
 	UINT16 maxWidth;
 	UINT16 maxHeight;
 	UINT16 maxPosX;
@@ -260,7 +260,7 @@ typedef struct _RAIL_MINMAXINFO_ORDER RAIL_MINMAXINFO_ORDER;

 struct _RAIL_LOCALMOVESIZE_ORDER
 {
-	uint32 windowId;
+	UINT32 windowId;
 	BOOL isMoveSizeStart;
 	UINT16 moveSizeType;
 	UINT16 posX;
@@ -270,7 +270,7 @@ typedef struct _RAIL_LOCALMOVESIZE_ORDER RAIL_LOCALMOVESIZE_ORDER;

 struct _RAIL_WINDOWMOVE_ORDER
 {
-	uint32 windowId;
+	UINT32 windowId;
 	UINT16 left;
 	UINT16 top;
 	UINT16 right;
@@ -280,13 +280,13 @@ typedef struct _RAIL_WINDOWMOVE_ORDER RAIL_WINDOW_MOVE_ORDER;

 struct _RAIL_GET_APPID_REQ_ORDER
 {
-	uint32 windowId;
+	UINT32 windowId;
 };
 typedef struct _RAIL_GET_APPID_REQ_ORDER RAIL_GET_APPID_REQ_ORDER;

 struct _RAIL_GET_APPID_RESP_ORDER
 {
-	uint32 windowId;
+	UINT32 windowId;
 	RAIL_UNICODE_STRING applicationId;
 	BYTE applicationIdBuffer[512];
 };
@@ -294,7 +294,7 @@ typedef struct _RAIL_GET_APPID_RESP_ORDER RAIL_GET_APPID_RESP_ORDER;

 struct _RAIL_LANGBARINFO_ORDER
 {
-	uint32 languageBarStatus;
+	UINT32 languageBarStatus;
 };
 typedef struct _RAIL_LANGBARINFO_ORDER RAIL_LANGBAR_INFO_ORDER;

--- a/include/freerdp/rail/window.h
+++ b/include/freerdp/rail/window.h
@@ -38,31 +38,31 @@ struct rdp_window
 	char* title;
 	rdpIcon* bigIcon;
 	rdpIcon* smallIcon;
-	uint32 fieldFlags;
+	UINT32 fieldFlags;
 	rdpWindow* prev;
 	rdpWindow* next;
-	uint32 windowId;
-	uint32 ownerWindowId;
-	uint32 style;
-	uint32 extendedStyle;
+	UINT32 windowId;
+	UINT32 ownerWindowId;
+	UINT32 style;
+	UINT32 extendedStyle;
 	BYTE showState;
 	RAIL_UNICODE_STRING titleInfo;
-	uint32 clientOffsetX;
-	uint32 clientOffsetY;
-	uint32 clientAreaWidth;
-	uint32 clientAreaHeight;
+	UINT32 clientOffsetX;
+	UINT32 clientOffsetY;
+	UINT32 clientAreaWidth;
+	UINT32 clientAreaHeight;
 	BYTE RPContent;
-	uint32 rootParentHandle;
-	sint32 windowOffsetX;
-	sint32 windowOffsetY;
-	uint32 windowClientDeltaX;
-	uint32 windowClientDeltaY;
-	uint32 windowWidth;
-	uint32 windowHeight;
+	UINT32 rootParentHandle;
+	INT32 windowOffsetX;
+	INT32 windowOffsetY;
+	UINT32 windowClientDeltaX;
+	UINT32 windowClientDeltaY;
+	UINT32 windowWidth;
+	UINT32 windowHeight;
 	UINT16 numWindowRects;
 	RECTANGLE_16* windowRects;
-	uint32 visibleOffsetX;
-	uint32 visibleOffsetY;
+	UINT32 visibleOffsetX;
+	UINT32 visibleOffsetY;
 	UINT16 numVisibilityRects;
 	RECTANGLE_16* visibilityRects;
 };
--- a/include/freerdp/rail/window_list.h
+++ b/include/freerdp/rail/window_list.h
@@ -42,7 +42,7 @@ FREERDP_API void window_list_rewind(rdpWindowList* list);
 FREERDP_API BOOL window_list_has_next(rdpWindowList* list);
 FREERDP_API rdpWindow* window_list_get_next(rdpWindowList* list);

-FREERDP_API rdpWindow* window_list_get_by_id(rdpWindowList* list, uint32 windowId);
+FREERDP_API rdpWindow* window_list_get_by_id(rdpWindowList* list, UINT32 windowId);
 FREERDP_API rdpWindow* window_list_get_by_extra_id(rdpWindowList* list, void* extraId);

 FREERDP_API void window_list_create(rdpWindowList* list, WINDOW_ORDER_INFO* orderInfo, WINDOW_STATE_ORDER* window_state);
--- a/include/freerdp/scancode.h
+++ b/include/freerdp/scancode.h
@@ -27,7 +27,7 @@
 * The extended flag is for all practical an important 9th bit with a strange encoding - not just a modifier.
 */

-typedef uint32 RDP_SCANCODE;	/* Our own representation of a RDP protocol scancode */
+typedef UINT32 RDP_SCANCODE;	/* Our own representation of a RDP protocol scancode */
 #define RDP_SCANCODE_CODE(_rdp_scancode) ((BYTE)(_rdp_scancode & 0xFF))
 #define RDP_SCANCODE_EXTENDED(_rdp_scancode) (((_rdp_scancode) & 0x100) ? TRUE : FALSE)
 #define MAKE_RDP_SCANCODE(_code, _extended) (((_code) & 0xFF) | ((_extended) ? 0x100 : 0))
--- a/include/freerdp/secondary.h
+++ b/include/freerdp/secondary.h
@@ -68,12 +68,12 @@

 struct _CACHE_BITMAP_ORDER
 {
-	uint32 cacheId;
-	uint32 bitmapBpp;
-	uint32 bitmapWidth;
-	uint32 bitmapHeight;
-	uint32 bitmapLength;
-	uint32 cacheIndex;
+	UINT32 cacheId;
+	UINT32 bitmapBpp;
+	UINT32 bitmapWidth;
+	UINT32 bitmapHeight;
+	UINT32 bitmapLength;
+	UINT32 cacheIndex;
 	BOOL compressed;
 	BYTE bitmapComprHdr[8];
 	BYTE* bitmapDataStream;
@@ -82,71 +82,71 @@ typedef struct _CACHE_BITMAP_ORDER CACHE_BITMAP_ORDER;

 struct _CACHE_BITMAP_V2_ORDER
 {
-	uint32 cacheId;
-	uint32 flags;
-	uint32 key1;
-	uint32 key2;
-	uint32 bitmapBpp;
-	uint32 bitmapWidth;
-	uint32 bitmapHeight;
-	uint32 bitmapLength;
-	uint32 cacheIndex;
+	UINT32 cacheId;
+	UINT32 flags;
+	UINT32 key1;
+	UINT32 key2;
+	UINT32 bitmapBpp;
+	UINT32 bitmapWidth;
+	UINT32 bitmapHeight;
+	UINT32 bitmapLength;
+	UINT32 cacheIndex;
 	BOOL compressed;
-	uint32 cbCompFirstRowSize;
-	uint32 cbCompMainBodySize;
-	uint32 cbScanWidth;
-	uint32 cbUncompressedSize;
+	UINT32 cbCompFirstRowSize;
+	UINT32 cbCompMainBodySize;
+	UINT32 cbScanWidth;
+	UINT32 cbUncompressedSize;
 	BYTE* bitmapDataStream;
 };
 typedef struct _CACHE_BITMAP_V2_ORDER CACHE_BITMAP_V2_ORDER;

 struct _BITMAP_DATA_EX
 {
-	uint32 bpp;
-	uint32 codecID;
-	uint32 width;
-	uint32 height;
-	uint32 length;
+	UINT32 bpp;
+	UINT32 codecID;
+	UINT32 width;
+	UINT32 height;
+	UINT32 length;
 	BYTE* data;
 };
 typedef struct _BITMAP_DATA_EX BITMAP_DATA_EX;

 struct _CACHE_BITMAP_V3_ORDER
 {
-	uint32 cacheId;
-	uint32 bpp;
-	uint32 flags;
-	uint32 cacheIndex;
-	uint32 key1;
-	uint32 key2;
+	UINT32 cacheId;
+	UINT32 bpp;
+	UINT32 flags;
+	UINT32 cacheIndex;
+	UINT32 key1;
+	UINT32 key2;
 	BITMAP_DATA_EX bitmapData;
 };
 typedef struct _CACHE_BITMAP_V3_ORDER CACHE_BITMAP_V3_ORDER;

 struct _CACHE_COLOR_TABLE_ORDER
 {
-	uint32 cacheIndex;
-	uint32 numberColors;
-	uint32* colorTable;
+	UINT32 cacheIndex;
+	UINT32 numberColors;
+	UINT32* colorTable;
 };
 typedef struct _CACHE_COLOR_TABLE_ORDER CACHE_COLOR_TABLE_ORDER;

 struct _GLYPH_DATA
 {
-	uint32 cacheIndex;
-	sint32 x;
-	sint32 y;
-	uint32 cx;
-	uint32 cy;
-	uint32 cb;
+	UINT32 cacheIndex;
+	INT32 x;
+	INT32 y;
+	UINT32 cx;
+	UINT32 cy;
+	UINT32 cb;
 	BYTE* aj;
 };
 typedef struct _GLYPH_DATA GLYPH_DATA;

 struct _CACHE_GLYPH_ORDER
 {
-	uint32 cacheId;
-	uint32 cGlyphs;
+	UINT32 cacheId;
+	UINT32 cGlyphs;
 	GLYPH_DATA* glyphData[255];
 	BYTE* unicodeCharacters;
 };
@@ -154,21 +154,21 @@ typedef struct _CACHE_GLYPH_ORDER CACHE_GLYPH_ORDER;

 struct _GLYPH_DATA_V2
 {
-	uint32 cacheIndex;
-	sint32 x;
-	sint32 y;
-	uint32 cx;
-	uint32 cy;
-	uint32 cb;
+	UINT32 cacheIndex;
+	INT32 x;
+	INT32 y;
+	UINT32 cx;
+	UINT32 cy;
+	UINT32 cb;
 	BYTE* aj;
 };
 typedef struct _GLYPH_DATA_V2 GLYPH_DATA_V2;

 struct _CACHE_GLYPH_V2_ORDER
 {
-	uint32 cacheId;
-	uint32 flags;
-	uint32 cGlyphs;
+	UINT32 cacheId;
+	UINT32 flags;
+	UINT32 cGlyphs;
 	GLYPH_DATA_V2* glyphData[255];
 	BYTE* unicodeCharacters;
 };
@@ -176,12 +176,12 @@ typedef struct _CACHE_GLYPH_V2_ORDER CACHE_GLYPH_V2_ORDER;

 struct _CACHE_BRUSH_ORDER
 {
-	uint32 index;
-	uint32 bpp;
-	uint32 cx;
-	uint32 cy;
-	uint32 style;
-	uint32 length;
+	UINT32 index;
+	UINT32 bpp;
+	UINT32 cx;
+	UINT32 cy;
+	UINT32 style;
+	UINT32 length;
 	BYTE* data;
 };
 typedef struct _CACHE_BRUSH_ORDER CACHE_BRUSH_ORDER;
@@ -197,7 +197,7 @@ typedef void (*pCacheBrush)(rdpContext* context, CACHE_BRUSH_ORDER* cache_brush_
 struct rdp_secondary_update
 {
 	rdpContext* context; /* 0 */
-	uint32 paddingA[16 - 1]; /* 1 */
+	UINT32 paddingA[16 - 1]; /* 1 */

 	pCacheBitmap CacheBitmap; /* 16 */
 	pCacheBitmapV2 CacheBitmapV2; /* 17 */
@@ -206,7 +206,7 @@ struct rdp_secondary_update
 	pCacheGlyph CacheGlyph; /* 20 */
 	pCacheGlyphV2 CacheGlyphV2; /* 21 */
 	pCacheBrush CacheBrush; /* 22 */
-	uint32 paddingE[32 - 23]; /* 23 */
+	UINT32 paddingE[32 - 23]; /* 23 */

 	/* internal */

--- a/include/freerdp/server/audin.h
+++ b/include/freerdp/server/audin.h
@@ -30,7 +30,7 @@ typedef BOOL (*psAudinServerOpen)(audin_server_context* context);
 typedef BOOL (*psAudinServerClose)(audin_server_context* context);

 typedef void (*psAudinServerOpening)(audin_server_context* context);
-typedef void (*psAudinServerOpenResult)(audin_server_context* context, uint32 result);
+typedef void (*psAudinServerOpenResult)(audin_server_context* context, UINT32 result);
 typedef void (*psAudinServerReceiveSamples)(audin_server_context* context, const void* buf, int nframes);

 struct _audin_server_context
--- a/include/freerdp/settings.h
+++ b/include/freerdp/settings.h
@@ -112,31 +112,31 @@ typedef struct
 /* TIME_ZONE_INFORMATION */
 struct _TIME_ZONE_INFO
 {
-	uint32 bias;
+	UINT32 bias;
 	char standardName[32];
 	SYSTEM_TIME standardDate;
-	uint32 standardBias;
+	UINT32 standardBias;
 	char daylightName[32];
 	SYSTEM_TIME daylightDate;
-	uint32 daylightBias;
+	UINT32 daylightBias;
 };
 typedef struct _TIME_ZONE_INFO TIME_ZONE_INFO;

 /* ARC_CS_PRIVATE_PACKET */
 typedef struct
 {
-	uint32 cbLen;
-	uint32 version;
-	uint32 logonId;
+	UINT32 cbLen;
+	UINT32 version;
+	UINT32 logonId;
 	BYTE securityVerifier[16];
 } ARC_CS_PRIVATE_PACKET;

 /* ARC_SC_PRIVATE_PACKET */
 typedef struct
 {
-	uint32 cbLen;
-	uint32 version;
-	uint32 logonId;
+	UINT32 cbLen;
+	UINT32 version;
+	UINT32 logonId;
 	BYTE arcRandomBits[16];
 } ARC_SC_PRIVATE_PACKET;

@@ -144,14 +144,14 @@ typedef struct

 struct rdp_CertBlob
 {
-	uint32 length;
+	UINT32 length;
 	BYTE* data;
 };
 typedef struct rdp_CertBlob rdpCertBlob;

 struct rdp_X509CertChain
 {
-	uint32 count;
+	UINT32 count;
 	rdpCertBlob* array;
 };
 typedef struct rdp_X509CertChain rdpX509CertChain;
@@ -212,7 +212,7 @@ typedef struct _BITMAP_CACHE_CELL_INFO BITMAP_CACHE_CELL_INFO;

 struct _BITMAP_CACHE_V2_CELL_INFO
 {
-	uint32 numEntries;
+	UINT32 numEntries;
 	BOOL persistent;
 };
 typedef struct _BITMAP_CACHE_V2_CELL_INFO BITMAP_CACHE_V2_CELL_INFO;
@@ -252,29 +252,29 @@ struct rdp_monitor
 struct rdp_settings
 {
 	ALIGN64 void* instance; /* 0 */
-	uint64 paddingA[16 - 1]; /* 1 */
+	UINT64 paddingA[16 - 1]; /* 1 */

 	/* Core Protocol Parameters */
-	ALIGN64 uint32 width; /* 16 */
-	ALIGN64 uint32 height; /* 17 */
-	ALIGN64 uint32 rdp_version; /* 18 */
-	ALIGN64 uint32 color_depth; /* 19 */
-	ALIGN64 uint32 kbd_layout; /* 20 */
-	ALIGN64 uint32 kbd_type; /* 21 */
-	ALIGN64 uint32 kbd_subtype; /* 22 */
-	ALIGN64 uint32 kbd_fn_keys; /* 23 */
-	ALIGN64 uint32 client_build; /* 24 */
-	ALIGN64 uint32 requested_protocols; /* 25 */
-	ALIGN64 uint32 selected_protocol; /* 26 */
-	ALIGN64 uint32 encryption_method; /* 27 */
-	ALIGN64 uint32 encryption_level; /* 28 */
+	ALIGN64 UINT32 width; /* 16 */
+	ALIGN64 UINT32 height; /* 17 */
+	ALIGN64 UINT32 rdp_version; /* 18 */
+	ALIGN64 UINT32 color_depth; /* 19 */
+	ALIGN64 UINT32 kbd_layout; /* 20 */
+	ALIGN64 UINT32 kbd_type; /* 21 */
+	ALIGN64 UINT32 kbd_subtype; /* 22 */
+	ALIGN64 UINT32 kbd_fn_keys; /* 23 */
+	ALIGN64 UINT32 client_build; /* 24 */
+	ALIGN64 UINT32 requested_protocols; /* 25 */
+	ALIGN64 UINT32 selected_protocol; /* 26 */
+	ALIGN64 UINT32 encryption_method; /* 27 */
+	ALIGN64 UINT32 encryption_level; /* 28 */
 	ALIGN64 BOOL authentication; /* 29 */
-	ALIGN64 uint32 negotiationFlags; /* 30 */
+	ALIGN64 UINT32 negotiationFlags; /* 30 */
 	ALIGN64 BOOL security_layer_negotiation; /* 31 */
-	uint64 paddingB[48 - 32]; /* 32 */
+	UINT64 paddingB[48 - 32]; /* 32 */

 	/* Connection Settings */
-	ALIGN64 uint32 port; /* 48 */
+	ALIGN64 UINT32 port; /* 48 */
 	ALIGN64 BOOL ipv6; /* 49 */
 	ALIGN64 char* hostname; /* 50 */
 	ALIGN64 char* username; /* 51 */
@@ -286,7 +286,7 @@ struct rdp_settings
 	ALIGN64 char* client_dir; /* 57 */
 	ALIGN64 BOOL autologon; /* 58 */
 	ALIGN64 BOOL compression; /* 59 */
-	ALIGN64 uint32 performance_flags; /* 60 */
+	ALIGN64 UINT32 performance_flags; /* 60 */
 	ALIGN64 BYTE* password_cookie; /* 61 */
 	ALIGN64 DWORD password_cookie_length; /* 62 */
 	ALIGN64 char* kerberos_kdc; /* 63 */
@@ -299,9 +299,9 @@ struct rdp_settings
 	ALIGN64 BOOL authentication_only; /* 70 */
 	ALIGN64 BOOL from_stdin; /* 71 */
 	ALIGN64 BOOL send_preconnection_pdu; /* 72 */
-	ALIGN64 uint32 preconnection_id; /* 73 */
+	ALIGN64 UINT32 preconnection_id; /* 73 */
 	ALIGN64 char* preconnection_blob; /* 74 */
-	uint64 paddingC[80 - 75]; /* 75 */
+	UINT64 paddingC[80 - 75]; /* 75 */

 	/* User Interface Parameters */
 	ALIGN64 BOOL sw_gdi; /* 80 */
@@ -309,61 +309,61 @@ struct rdp_settings
 	ALIGN64 BOOL fullscreen; /* 82 */
 	ALIGN64 BOOL grab_keyboard; /* 83 */
 	ALIGN64 BOOL decorations; /* 84 */
-	ALIGN64 uint32 percent_screen; /* 85 */
+	ALIGN64 UINT32 percent_screen; /* 85 */
 	ALIGN64 BOOL mouse_motion; /* 86 */
 	ALIGN64 char* window_title; /* 87 */
-	ALIGN64 uint64 parent_window_xid; /* 88 */
-	uint64 paddingD[112 - 89]; /* 89 */
+	ALIGN64 UINT64 parent_window_xid; /* 88 */
+	UINT64 paddingD[112 - 89]; /* 89 */

 	/* Internal Parameters */
 	ALIGN64 char* home_path; /* 112 */
-	ALIGN64 uint32 share_id; /* 113 */
-	ALIGN64 uint32 pdu_source; /* 114 */
+	ALIGN64 UINT32 share_id; /* 113 */
+	ALIGN64 UINT32 pdu_source; /* 114 */
 	ALIGN64 void* unused115; /* 115 */
 	ALIGN64 BOOL server_mode; /* 116 */
 	ALIGN64 char* config_path; /* 117 */
 	ALIGN64 char* current_path; /* 118 */
 	ALIGN64 char* development_path; /* 119 */
 	ALIGN64 BOOL development_mode; /* 120 */
-	uint64 paddingE[144 - 121]; /* 121 */
+	UINT64 paddingE[144 - 121]; /* 121 */

 	/* Security */
 	ALIGN64 BOOL encryption; /* 144 */
 	ALIGN64 BOOL tls_security; /* 145 */
 	ALIGN64 BOOL nla_security; /* 146 */
 	ALIGN64 BOOL rdp_security; /* 147 */
-	ALIGN64 uint32 ntlm_version; /* 148 */
+	ALIGN64 UINT32 ntlm_version; /* 148 */
 	ALIGN64 BOOL salted_checksum; /* 149 */
-	uint64 paddingF[160 - 150]; /* 150 */
+	UINT64 paddingF[160 - 150]; /* 150 */

 	/* Session */
 	ALIGN64 BOOL console_audio; /* 160 */
 	ALIGN64 BOOL console_session; /* 161 */
-	ALIGN64 uint32 redirected_session_id; /* 162 */
+	ALIGN64 UINT32 redirected_session_id; /* 162 */
 	ALIGN64 BOOL audio_playback; /* 163 */
 	ALIGN64 BOOL audio_capture; /* 164 */
-	uint64 paddingG[176 - 165]; /* 165 */
+	UINT64 paddingG[176 - 165]; /* 165 */

 	/* Output Control */
 	ALIGN64 BOOL refresh_rect; /* 176 */
 	ALIGN64 BOOL suppress_output; /* 177 */
 	ALIGN64 BOOL desktop_resize; /* 178 */
-	uint64 paddingH[192 - 179]; /* 179 */
+	UINT64 paddingH[192 - 179]; /* 179 */

 	/* Reconnection */
 	ALIGN64 BOOL auto_reconnection; /* 192 */
 	ALIGN64 ARC_CS_PRIVATE_PACKET* client_auto_reconnect_cookie; /* 193 */
 	ALIGN64 ARC_SC_PRIVATE_PACKET* server_auto_reconnect_cookie; /* 194 */
-	uint64 paddingI[208 - 195]; /* 195 */
+	UINT64 paddingI[208 - 195]; /* 195 */

 	/* Time Zone */
 	ALIGN64 TIME_ZONE_INFO* client_time_zone; /* 208 */
-	uint64 paddingJ[216 - 209]; /* 209 */
+	UINT64 paddingJ[216 - 209]; /* 209 */

 	/* Capabilities */
-	ALIGN64 uint32 os_major_type; /* 216 */
-	ALIGN64 uint32 os_minor_type; /* 217 */
-	ALIGN64 uint32 vc_chunk_size; /* 218 */
+	ALIGN64 UINT32 os_major_type; /* 216 */
+	ALIGN64 UINT32 os_minor_type; /* 217 */
+	ALIGN64 UINT32 vc_chunk_size; /* 218 */
 	ALIGN64 BOOL sound_beeps; /* 219 */
 	ALIGN64 BOOL smooth_fonts; /* 220 */
 	ALIGN64 BOOL frame_marker; /* 221 */
@@ -376,9 +376,9 @@ struct rdp_settings
 	ALIGN64 BOOL disable_full_window_drag; /* 228 */
 	ALIGN64 BOOL disable_menu_animations; /* 229 */
 	ALIGN64 BOOL disable_theming; /* 230 */
-	ALIGN64 uint32 connection_type; /* 231 */
-	ALIGN64 uint32 multifrag_max_request_size; /* 232 */
-	uint64 paddingK[248 - 233]; /* 233 */
+	ALIGN64 UINT32 connection_type; /* 231 */
+	ALIGN64 UINT32 multifrag_max_request_size; /* 232 */
+	UINT64 paddingK[248 - 233]; /* 233 */

 	/* Certificate */
 	ALIGN64 char* cert_file; /* 248 */
@@ -394,77 +394,77 @@ struct rdp_settings
 	ALIGN64 char* rdp_key_file; /* 258 */
 	ALIGN64 rdpKey* server_key; /* 259 */
 	ALIGN64 char* certificate_name; /* 260 */
-	uint64 paddingL[280 - 261]; /* 261 */
+	UINT64 paddingL[280 - 261]; /* 261 */

 	/* Codecs */
 	ALIGN64 BOOL rfx_codec; /* 280 */
 	ALIGN64 BOOL ns_codec; /* 281 */
-	ALIGN64 uint32 rfx_codec_id; /* 282 */
-	ALIGN64 uint32 ns_codec_id; /* 283 */
-	ALIGN64 uint32 rfx_codec_mode; /* 284 */
+	ALIGN64 UINT32 rfx_codec_id; /* 282 */
+	ALIGN64 UINT32 ns_codec_id; /* 283 */
+	ALIGN64 UINT32 rfx_codec_mode; /* 284 */
 	ALIGN64 BOOL frame_acknowledge; /* 285 */
 	ALIGN64 BOOL jpeg_codec; /* 286 */
-	ALIGN64 uint32 jpeg_codec_id; /* 287 */
-	ALIGN64 uint32 jpeg_quality; /* 288 */
-	ALIGN64 uint32 v3_codec_id; /* 289 */
+	ALIGN64 UINT32 jpeg_codec_id; /* 287 */
+	ALIGN64 UINT32 jpeg_quality; /* 288 */
+	ALIGN64 UINT32 v3_codec_id; /* 289 */
 	ALIGN64 BOOL rfx_codec_only; /* 290 */
-	uint64 paddingM[296 - 291]; /* 291 */
+	UINT64 paddingM[296 - 291]; /* 291 */

 	/* Recording */
 	ALIGN64 BOOL dump_rfx; /* 296 */
 	ALIGN64 BOOL play_rfx; /* 297 */
 	ALIGN64 char* dump_rfx_file; /* 298 */
 	ALIGN64 char* play_rfx_file; /* 299 */
-	uint64 paddingN[312 - 300]; /* 300 */
+	UINT64 paddingN[312 - 300]; /* 300 */

 	/* RemoteApp */
 	ALIGN64 BOOL remote_app; /* 312 */
-	ALIGN64 uint32 num_icon_caches; /* 313 */
-	ALIGN64 uint32 num_icon_cache_entries; /* 314 */
+	ALIGN64 UINT32 num_icon_caches; /* 313 */
+	ALIGN64 UINT32 num_icon_cache_entries; /* 314 */
 	ALIGN64 BOOL rail_langbar_supported; /* 315 */
-	uint64 paddingO[320 - 316]; /* 316 */
+	UINT64 paddingO[320 - 316]; /* 316 */

 	/* Pointer */
 	ALIGN64 BOOL large_pointer; /* 320 */
 	ALIGN64 BOOL color_pointer; /* 321 */
-	ALIGN64 uint32 pointer_cache_size; /* 322 */
-	uint64 paddingP[328 - 323]; /* 323 */
+	ALIGN64 UINT32 pointer_cache_size; /* 322 */
+	UINT64 paddingP[328 - 323]; /* 323 */

 	/* Bitmap Cache */
 	ALIGN64 BOOL bitmap_cache; /* 328 */
 	ALIGN64 BOOL bitmap_cache_v3; /* 329 */
 	ALIGN64 BOOL persistent_bitmap_cache; /* 330 */
-	ALIGN64 uint32 bitmapCacheV2NumCells; /* 331 */
+	ALIGN64 UINT32 bitmapCacheV2NumCells; /* 331 */
 	ALIGN64 BITMAP_CACHE_V2_CELL_INFO* bitmapCacheV2CellInfo; /* 332 */
-	uint64 paddingQ[344 - 333]; /* 333 */
+	UINT64 paddingQ[344 - 333]; /* 333 */

 	/* Offscreen Bitmap Cache */
 	ALIGN64 BOOL offscreen_bitmap_cache; /* 344 */
-	ALIGN64 uint32 offscreen_bitmap_cache_size; /* 345 */
-	ALIGN64 uint32 offscreen_bitmap_cache_entries; /* 346 */
-	uint64 paddingR[352 - 347]; /* 347 */
+	ALIGN64 UINT32 offscreen_bitmap_cache_size; /* 345 */
+	ALIGN64 UINT32 offscreen_bitmap_cache_entries; /* 346 */
+	UINT64 paddingR[352 - 347]; /* 347 */

 	/* Glyph Cache */
 	ALIGN64 BOOL glyph_cache; /* 352 */
-	ALIGN64 uint32 glyphSupportLevel; /* 353 */
+	ALIGN64 UINT32 glyphSupportLevel; /* 353 */
 	ALIGN64 GLYPH_CACHE_DEFINITION* glyphCache; /* 354 */
 	ALIGN64 GLYPH_CACHE_DEFINITION* fragCache; /* 355 */
-	uint64 paddingS[360 - 356]; /* 356 */
+	UINT64 paddingS[360 - 356]; /* 356 */

 	/* Draw Nine Grid */
 	ALIGN64 BOOL draw_nine_grid; /* 360 */
-	ALIGN64 uint32 draw_nine_grid_cache_size; /* 361 */
-	ALIGN64 uint32 draw_nine_grid_cache_entries; /* 362 */
-	uint64 paddingT[368 - 363]; /* 363 */
+	ALIGN64 UINT32 draw_nine_grid_cache_size; /* 361 */
+	ALIGN64 UINT32 draw_nine_grid_cache_entries; /* 362 */
+	UINT64 paddingT[368 - 363]; /* 363 */

 	/* Draw GDI+ */
 	ALIGN64 BOOL draw_gdi_plus; /* 368 */
 	ALIGN64 BOOL draw_gdi_plus_cache; /* 369 */
-	uint64 paddingU[376 - 370]; /* 370 */
+	UINT64 paddingU[376 - 370]; /* 370 */

 	/* Desktop Composition */
 	ALIGN64 BOOL desktop_composition; /* 376 */
-	uint64 paddingV[384 - 377]; /* 377 */
+	UINT64 paddingV[384 - 377]; /* 377 */

 	/* Channels */
 	ALIGN64 int num_channels;
--- a/include/freerdp/svc.h
+++ b/include/freerdp/svc.h
@@ -36,19 +36,19 @@
 struct _CHANNEL_DEF
 {
 	char name[CHANNEL_NAME_LEN + 1];
-	uint32 options;
+	UINT32 options;
 };
 typedef struct _CHANNEL_DEF CHANNEL_DEF;
 typedef CHANNEL_DEF* PCHANNEL_DEF;
 typedef CHANNEL_DEF** PPCHANNEL_DEF;

 typedef void (FREERDP_CC * PCHANNEL_INIT_EVENT_FN)(void* pInitHandle,
-	uint32 event, void* pData, uint32 dataLength);
+	UINT32 event, void* pData, UINT32 dataLength);


-typedef void (FREERDP_CC * PCHANNEL_OPEN_EVENT_FN)(uint32 openHandle,
-	uint32 event, void* pData, uint32 dataLength,
-	uint32 totalLength, uint32 dataFlags);
+typedef void (FREERDP_CC * PCHANNEL_OPEN_EVENT_FN)(UINT32 openHandle,
+	UINT32 event, void* pData, UINT32 dataLength,
+	UINT32 totalLength, UINT32 dataFlags);

 #define CHANNEL_RC_OK                             0
 #define CHANNEL_RC_ALREADY_INITIALIZED            1
@@ -71,24 +71,24 @@ typedef void (FREERDP_CC * PCHANNEL_OPEN_EVENT_FN)(uint32 openHandle,

 #define VIRTUAL_CHANNEL_VERSION_WIN2000         1

-typedef uint32 (FREERDP_CC * PVIRTUALCHANNELINIT)(void** ppInitHandle,
-	PCHANNEL_DEF pChannel, int channelCount, uint32 versionRequested,
+typedef UINT32 (FREERDP_CC * PVIRTUALCHANNELINIT)(void** ppInitHandle,
+	PCHANNEL_DEF pChannel, int channelCount, UINT32 versionRequested,
 	PCHANNEL_INIT_EVENT_FN pChannelInitEventProc);
-typedef uint32 (FREERDP_CC * PVIRTUALCHANNELOPEN)(void* pInitHandle,
-	uint32* pOpenHandle, char* pChannelName,
+typedef UINT32 (FREERDP_CC * PVIRTUALCHANNELOPEN)(void* pInitHandle,
+	UINT32* pOpenHandle, char* pChannelName,
 	PCHANNEL_OPEN_EVENT_FN pChannelOpenEventProc);
-typedef uint32 (FREERDP_CC * PVIRTUALCHANNELCLOSE)(uint32 openHandle);
+typedef UINT32 (FREERDP_CC * PVIRTUALCHANNELCLOSE)(UINT32 openHandle);

-typedef uint32 (FREERDP_CC * PVIRTUALCHANNELWRITE)(uint32 openHandle,
-	void* pData, uint32 dataLength, void* pUserData);
+typedef UINT32 (FREERDP_CC * PVIRTUALCHANNELWRITE)(UINT32 openHandle,
+	void* pData, UINT32 dataLength, void* pUserData);

-typedef uint32 (FREERDP_CC * PVIRTUALCHANNELEVENTPUSH)(uint32 openHandle,
+typedef UINT32 (FREERDP_CC * PVIRTUALCHANNELEVENTPUSH)(UINT32 openHandle,
 	RDP_EVENT* event);

 struct _CHANNEL_ENTRY_POINTS
 {
-	uint32 cbSize;
-	uint32 protocolVersion;
+	UINT32 cbSize;
+	UINT32 protocolVersion;
 	PVIRTUALCHANNELINIT  pVirtualChannelInit;
 	PVIRTUALCHANNELOPEN  pVirtualChannelOpen;
 	PVIRTUALCHANNELCLOSE pVirtualChannelClose;
@@ -101,8 +101,8 @@ typedef int (FREERDP_CC * PVIRTUALCHANNELENTRY)(PCHANNEL_ENTRY_POINTS pEntryPoin

 struct _CHANNEL_ENTRY_POINTS_EX
 {
-	uint32 cbSize;
-	uint32 protocolVersion;
+	UINT32 cbSize;
+	UINT32 protocolVersion;
 	PVIRTUALCHANNELINIT  pVirtualChannelInit;
 	PVIRTUALCHANNELOPEN  pVirtualChannelOpen;
 	PVIRTUALCHANNELCLOSE pVirtualChannelClose;
--- a/include/freerdp/types.h
+++ b/include/freerdp/types.h
@@ -25,40 +25,6 @@

 #include <freerdp/config.h>

-#ifdef _WIN32
-#include <windef.h>
-#endif
-
-#ifdef FREERDP_HAVE_LIMITS_H
-#include <limits.h>
-#endif
-
-#ifdef FREERDP_HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#ifdef FREERDP_HAVE_INTTYPES_H
-
-#include <inttypes.h>
-typedef uint32_t uint32;
-typedef int32_t sint32;
-typedef uint64_t uint64;
-typedef int64_t sint64;
-
-#else
-
-typedef unsigned int uint32;
-typedef signed int sint32;
-#ifdef _WIN32
-typedef unsigned __int64 uint64;
-typedef signed __int64 sint64;
-#else
-typedef unsigned long long uint64;
-typedef signed long long sint64;
-#endif
-
-#endif /* HAVE_INTTYPES_H */
-
 #ifndef MIN
 #define MIN(x,y)	(((x) < (y)) ? (x) : (y))
 #endif
@@ -71,7 +37,7 @@ typedef signed long long sint64;

 typedef struct
 {
-	uint32 time_low;
+	UINT32 time_low;
 	UINT16 time_mid;
 	UINT16 time_hi_and_version;
 	BYTE clock_seq_hi_and_reserved;
--- a/include/freerdp/update.h
+++ b/include/freerdp/update.h
@@ -39,19 +39,19 @@ typedef struct rdp_update rdpUpdate;

 struct _BITMAP_DATA
 {
-	uint32 destLeft;
-	uint32 destTop;
-	uint32 destRight;
-	uint32 destBottom;
-	uint32 width;
-	uint32 height;
-	uint32 bitsPerPixel;
-	uint32 flags;
-	uint32 bitmapLength;
-	uint32 cbCompFirstRowSize;
-	uint32 cbCompMainBodySize;
-	uint32 cbScanWidth;
-	uint32 cbUncompressedSize;
+	UINT32 destLeft;
+	UINT32 destTop;
+	UINT32 destRight;
+	UINT32 destBottom;
+	UINT32 width;
+	UINT32 height;
+	UINT32 bitsPerPixel;
+	UINT32 flags;
+	UINT32 bitmapLength;
+	UINT32 cbCompFirstRowSize;
+	UINT32 cbCompMainBodySize;
+	UINT32 cbScanWidth;
+	UINT32 cbUncompressedSize;
 	BYTE* bitmapDataStream;
 	BOOL compressed;
 };
@@ -59,8 +59,8 @@ typedef struct _BITMAP_DATA BITMAP_DATA;

 struct _BITMAP_UPDATE
 {
-	uint32 count;
-	uint32 number;
+	UINT32 count;
+	UINT32 number;
 	BITMAP_DATA* rectangles;
 };
 typedef struct _BITMAP_UPDATE BITMAP_UPDATE;
@@ -77,14 +77,14 @@ typedef struct _PALETTE_ENTRY PALETTE_ENTRY;

 struct _PALETTE_UPDATE
 {
-	uint32 number;
+	UINT32 number;
 	PALETTE_ENTRY entries[256];
 };
 typedef struct _PALETTE_UPDATE PALETTE_UPDATE;

 struct rdp_palette
 {
-	uint32 count;
+	UINT32 count;
 	PALETTE_ENTRY* entries;
 };
 typedef struct rdp_palette rdpPalette;
@@ -93,8 +93,8 @@ typedef struct rdp_palette rdpPalette;

 struct _PLAY_SOUND_UPDATE
 {
-	uint32 duration;
-	uint32 frequency;
+	UINT32 duration;
+	UINT32 frequency;
 };
 typedef struct _PLAY_SOUND_UPDATE PLAY_SOUND_UPDATE;

@@ -102,24 +102,24 @@ typedef struct _PLAY_SOUND_UPDATE PLAY_SOUND_UPDATE;

 struct _SURFACE_BITS_COMMAND
 {
-	uint32 cmdType;
-	uint32 destLeft;
-	uint32 destTop;
-	uint32 destRight;
-	uint32 destBottom;
-	uint32 bpp;
-	uint32 codecID;
-	uint32 width;
-	uint32 height;
-	uint32 bitmapDataLength;
+	UINT32 cmdType;
+	UINT32 destLeft;
+	UINT32 destTop;
+	UINT32 destRight;
+	UINT32 destBottom;
+	UINT32 bpp;
+	UINT32 codecID;
+	UINT32 width;
+	UINT32 height;
+	UINT32 bitmapDataLength;
 	BYTE* bitmapData;
 };
 typedef struct _SURFACE_BITS_COMMAND SURFACE_BITS_COMMAND;

 struct _SURFACE_FRAME_MARKER
 {
-	uint32 frameAction;
-	uint32 frameId;
+	UINT32 frameAction;
+	UINT32 frameId;
 };
 typedef struct _SURFACE_FRAME_MARKER SURFACE_FRAME_MARKER;

@@ -151,7 +151,7 @@ typedef void (*pSurfaceFrameMarker)(rdpContext* context, SURFACE_FRAME_MARKER* s
 struct rdp_update
 {
 	rdpContext* context; /* 0 */
-	uint32 paddingA[16 - 1]; /* 1 */
+	UINT32 paddingA[16 - 1]; /* 1 */

 	pBeginPaint BeginPaint; /* 16 */
 	pEndPaint EndPaint; /* 17 */
@@ -161,23 +161,23 @@ struct rdp_update
 	pBitmapUpdate BitmapUpdate; /* 21 */
 	pPalette Palette; /* 22 */
 	pPlaySound PlaySound; /* 23 */
-	uint32 paddingB[32 - 24]; /* 24 */
+	UINT32 paddingB[32 - 24]; /* 24 */

 	rdpPointerUpdate* pointer; /* 32 */
 	rdpPrimaryUpdate* primary; /* 33 */
 	rdpSecondaryUpdate* secondary; /* 34 */
 	rdpAltSecUpdate* altsec; /* 35 */
 	rdpWindowUpdate* window; /* 36 */
-	uint32 paddingC[48 - 37]; /* 37 */
+	UINT32 paddingC[48 - 37]; /* 37 */

 	pRefreshRect RefreshRect; /* 48 */
 	pSuppressOutput SuppressOutput; /* 49 */
-	uint32 paddingD[64 - 50]; /* 50 */
+	UINT32 paddingD[64 - 50]; /* 50 */

 	pSurfaceCommand SurfaceCommand; /* 64 */
 	pSurfaceBits SurfaceBits; /* 65 */
 	pSurfaceFrameMarker SurfaceFrameMarker; /* 66 */
-	uint32 paddingE[80 - 67]; /* 67 */
+	UINT32 paddingE[80 - 67]; /* 67 */

 	/* internal */

--- a/include/freerdp/utils/dsp.h
+++ b/include/freerdp/utils/dsp.h
@@ -32,9 +32,9 @@ union _ADPCM
 	struct
 	{
 		BYTE predictor[2];
-		sint32 delta[2];
-		sint32 sample1[2];
-		sint32 sample2[2];
+		INT32 delta[2];
+		INT32 sample1[2];
+		INT32 sample2[2];
 	} ms;
 };
 typedef union _ADPCM ADPCM;
@@ -43,20 +43,20 @@ typedef struct _FREERDP_DSP_CONTEXT FREERDP_DSP_CONTEXT;
 struct _FREERDP_DSP_CONTEXT
 {
 	BYTE* resampled_buffer;
-	uint32 resampled_size;
-	uint32 resampled_frames;
-	uint32 resampled_maxlength;
+	UINT32 resampled_size;
+	UINT32 resampled_frames;
+	UINT32 resampled_maxlength;

 	BYTE* adpcm_buffer;
-	uint32 adpcm_size;
-	uint32 adpcm_maxlength;
+	UINT32 adpcm_size;
+	UINT32 adpcm_maxlength;

 	ADPCM adpcm;

 	void (*resample)(FREERDP_DSP_CONTEXT* context,
 		const BYTE* src, int bytes_per_sample,
-		uint32 schan, uint32 srate, int sframes,
-		uint32 rchan, uint32 rrate);
+		UINT32 schan, UINT32 srate, int sframes,
+		UINT32 rchan, UINT32 rrate);

 	void (*decode_ima_adpcm)(FREERDP_DSP_CONTEXT* context,
 		const BYTE* src, int size, int channels, int block_size);
--- a/include/freerdp/utils/msusb.h
+++ b/include/freerdp/utils/msusb.h
@@ -36,21 +36,21 @@
 	((UINT16) (*((BYTE *) (_p)))) + \
 	((UINT16) (*(((BYTE *) (_p)) + 1)) << 8); \
 	} while (0)
-#define data_read_uint32(_p, _v) do { _v = \
-	(uint32) (*((BYTE *) (_p))) + \
-	((uint32) (*(((BYTE *) (_p)) + 1)) << 8) + \
-	((uint32) (*(((BYTE *) (_p)) + 2)) << 16) + \
-	((uint32) (*(((BYTE *) (_p)) + 3)) << 24); \
+#define data_read_UINT32(_p, _v) do { _v = \
+	(UINT32) (*((BYTE *) (_p))) + \
+	((UINT32) (*(((BYTE *) (_p)) + 1)) << 8) + \
+	((UINT32) (*(((BYTE *) (_p)) + 2)) << 16) + \
+	((UINT32) (*(((BYTE *) (_p)) + 3)) << 24); \
 	} while (0)
-#define data_read_uint64(_p, _v) do { _v = \
-	(uint64) (*((BYTE *) (_p))) + \
-	((uint64) (*(((BYTE *) (_p)) + 1)) << 8) + \
-	((uint64) (*(((BYTE *) (_p)) + 2)) << 16) + \
-	((uint64) (*(((BYTE *) (_p)) + 3)) << 24) + \
-	((uint64) (*(((BYTE *) (_p)) + 4)) << 32) + \
-	((uint64) (*(((BYTE *) (_p)) + 5)) << 40) + \
-	((uint64) (*(((BYTE *) (_p)) + 6)) << 48) + \
-	((uint64) (*(((BYTE *) (_p)) + 7)) << 56); \
+#define data_read_UINT64(_p, _v) do { _v = \
+	(UINT64) (*((BYTE *) (_p))) + \
+	((UINT64) (*(((BYTE *) (_p)) + 1)) << 8) + \
+	((UINT64) (*(((BYTE *) (_p)) + 2)) << 16) + \
+	((UINT64) (*(((BYTE *) (_p)) + 3)) << 24) + \
+	((UINT64) (*(((BYTE *) (_p)) + 4)) << 32) + \
+	((UINT64) (*(((BYTE *) (_p)) + 5)) << 40) + \
+	((UINT64) (*(((BYTE *) (_p)) + 6)) << 48) + \
+	((UINT64) (*(((BYTE *) (_p)) + 7)) << 56); \
 	} while (0)

 #define data_write_BYTE(_p, _v) do { \
@@ -60,21 +60,21 @@
 	*((BYTE *) _p) = (BYTE) (((UINT16) (_v)) & 0xff); \
 	*(((BYTE *) _p) + 1) = (BYTE) ((((UINT16) (_v)) >> 8) & 0xff); \
 	} while (0)
-#define data_write_uint32(_p, _v) do { \
-	*((BYTE *) _p) = (BYTE) (((uint32) (_v)) & 0xff); \
-	*(((BYTE *) _p) + 1) = (BYTE) ((((uint32) (_v)) >> 8) & 0xff); \
-	*(((BYTE *) _p) + 2) = (BYTE) ((((uint32) (_v)) >> 16) & 0xff); \
-	*(((BYTE *) _p) + 3) = (BYTE) ((((uint32) (_v)) >> 24) & 0xff); \
+#define data_write_UINT32(_p, _v) do { \
+	*((BYTE *) _p) = (BYTE) (((UINT32) (_v)) & 0xff); \
+	*(((BYTE *) _p) + 1) = (BYTE) ((((UINT32) (_v)) >> 8) & 0xff); \
+	*(((BYTE *) _p) + 2) = (BYTE) ((((UINT32) (_v)) >> 16) & 0xff); \
+	*(((BYTE *) _p) + 3) = (BYTE) ((((UINT32) (_v)) >> 24) & 0xff); \
 	} while (0)
-#define data_write_uint64(_p, _v) do { \
-	*((BYTE *) _p) = (BYTE) (((uint64) (_v)) & 0xff); \
-	*(((BYTE *) _p) + 1) = (BYTE) ((((uint64) (_v)) >> 8) & 0xff); \
-	*(((BYTE *) _p) + 2) = (BYTE) ((((uint64) (_v)) >> 16) & 0xff); \
-	*(((BYTE *) _p) + 3) = (BYTE) ((((uint64) (_v)) >> 24) & 0xff); \
-	*(((BYTE *) _p) + 4) = (BYTE) ((((uint64) (_v)) >> 32) & 0xff); \
-	*(((BYTE *) _p) + 5) = (BYTE) ((((uint64) (_v)) >> 40) & 0xff); \
-	*(((BYTE *) _p) + 6) = (BYTE) ((((uint64) (_v)) >> 48) & 0xff); \
-	*(((BYTE *) _p) + 7) = (BYTE) ((((uint64) (_v)) >> 56) & 0xff); \
+#define data_write_UINT64(_p, _v) do { \
+	*((BYTE *) _p) = (BYTE) (((UINT64) (_v)) & 0xff); \
+	*(((BYTE *) _p) + 1) = (BYTE) ((((UINT64) (_v)) >> 8) & 0xff); \
+	*(((BYTE *) _p) + 2) = (BYTE) ((((UINT64) (_v)) >> 16) & 0xff); \
+	*(((BYTE *) _p) + 3) = (BYTE) ((((UINT64) (_v)) >> 24) & 0xff); \
+	*(((BYTE *) _p) + 4) = (BYTE) ((((UINT64) (_v)) >> 32) & 0xff); \
+	*(((BYTE *) _p) + 5) = (BYTE) ((((UINT64) (_v)) >> 40) & 0xff); \
+	*(((BYTE *) _p) + 6) = (BYTE) ((((UINT64) (_v)) >> 48) & 0xff); \
+	*(((BYTE *) _p) + 7) = (BYTE) ((((UINT64) (_v)) >> 56) & 0xff); \
 	} while (0)

 typedef struct _MSUSB_INTERFACE_DESCRIPTOR MSUSB_INTERFACE_DESCRIPTOR;
@@ -84,9 +84,9 @@ typedef struct _MSUSB_CONFIG_DESCRIPTOR	MSUSB_CONFIG_DESCRIPTOR;
 struct _MSUSB_PIPE_DESCRIPTOR
 {
 	UINT16 MaximumPacketSize;
-	uint32 MaximumTransferSize;
-	uint32 PipeFlags;
-	uint32 PipeHandle;
+	UINT32 MaximumTransferSize;
+	UINT32 PipeFlags;
+	UINT32 PipeHandle;
 	BYTE  bEndpointAddress;
 	BYTE  bInterval;
 	BYTE  PipeType;
@@ -99,8 +99,8 @@ struct _MSUSB_INTERFACE_DESCRIPTOR
 	UINT16 NumberOfPipesExpected;
 	BYTE  InterfaceNumber;
 	BYTE  AlternateSetting;
-	uint32 NumberOfPipes;
-	uint32 InterfaceHandle;
+	UINT32 NumberOfPipes;
+	UINT32 InterfaceHandle;
 	BYTE  bInterfaceClass;
 	BYTE  bInterfaceSubClass;
 	BYTE  bInterfaceProtocol;
@@ -112,25 +112,25 @@ struct _MSUSB_CONFIG_DESCRIPTOR
 {
 	UINT16 wTotalLength;
 	BYTE  bConfigurationValue;
-	uint32 ConfigurationHandle;
-	uint32 NumInterfaces;
+	UINT32 ConfigurationHandle;
+	UINT32 NumInterfaces;
 	MSUSB_INTERFACE_DESCRIPTOR ** MsInterfaces;
 	int InitCompleted;
 	int MsOutSize;
 } __attribute__((packed));

 /* MSUSB_PIPE exported functions */
-void msusb_mspipes_replace(MSUSB_INTERFACE_DESCRIPTOR* MsInterface, MSUSB_PIPE_DESCRIPTOR** NewMsPipes, uint32 NewNumberOfPipes);
+void msusb_mspipes_replace(MSUSB_INTERFACE_DESCRIPTOR* MsInterface, MSUSB_PIPE_DESCRIPTOR** NewMsPipes, UINT32 NewNumberOfPipes);

 /* MSUSB_INTERFACE exported functions */
 void msusb_msinterface_replace(MSUSB_CONFIG_DESCRIPTOR* MsConfig, BYTE InterfaceNumber, MSUSB_INTERFACE_DESCRIPTOR* NewMsInterface);
-MSUSB_INTERFACE_DESCRIPTOR* msusb_msinterface_read(BYTE* data, uint32 data_size, int* offset);
+MSUSB_INTERFACE_DESCRIPTOR* msusb_msinterface_read(BYTE* data, UINT32 data_size, int* offset);
 int msusb_msinterface_write(MSUSB_INTERFACE_DESCRIPTOR* MsInterface, BYTE* data, int* offset);

 /* MSUSB_CONFIG exported functions */
 MSUSB_CONFIG_DESCRIPTOR* msusb_msconfig_new();
 void msusb_msconfig_free(MSUSB_CONFIG_DESCRIPTOR* MsConfig);
-MSUSB_CONFIG_DESCRIPTOR* msusb_msconfig_read(BYTE* data, uint32 data_size, uint32 NumInterfaces);
+MSUSB_CONFIG_DESCRIPTOR* msusb_msconfig_read(BYTE* data, UINT32 data_size, UINT32 NumInterfaces);
 int msusb_msconfig_write(MSUSB_CONFIG_DESCRIPTOR* MsConfg, BYTE* data, int * offset);
 void msusb_msconfig_dump(MSUSB_CONFIG_DESCRIPTOR* MsConfg);

--- a/include/freerdp/utils/pcap.h
+++ b/include/freerdp/utils/pcap.h
@@ -25,22 +25,22 @@

 struct _pcap_header
 {
-	uint32 magic_number;   /* magic number */
+	UINT32 magic_number;   /* magic number */
 	UINT16 version_major;  /* major version number */
 	UINT16 version_minor;  /* minor version number */
-	sint32 thiszone;       /* GMT to local correction */
-	uint32 sigfigs;        /* accuracy of timestamps */
-	uint32 snaplen;        /* max length of captured packets, in octets */
-	uint32 network;        /* data link type */
+	INT32 thiszone;       /* GMT to local correction */
+	UINT32 sigfigs;        /* accuracy of timestamps */
+	UINT32 snaplen;        /* max length of captured packets, in octets */
+	UINT32 network;        /* data link type */
 };
 typedef struct _pcap_header pcap_header;

 struct _pcap_record_header
 {
-	uint32 ts_sec;         /* timestamp seconds */
-	uint32 ts_usec;        /* timestamp microseconds */
-	uint32 incl_len;       /* number of octets of packet saved in file */
-	uint32 orig_len;       /* actual length of packet */
+	UINT32 ts_sec;         /* timestamp seconds */
+	UINT32 ts_usec;        /* timestamp microseconds */
+	UINT32 incl_len;       /* number of octets of packet saved in file */
+	UINT32 orig_len;       /* actual length of packet */
 };
 typedef struct _pcap_record_header pcap_record_header;

@@ -50,7 +50,7 @@ struct _pcap_record
 {
 	pcap_record_header header;
 	void* data;
-	uint32 length;
+	UINT32 length;
 	pcap_record* next;
 };

@@ -71,7 +71,7 @@ typedef struct rdp_pcap rdpPcap;
 FREERDP_API rdpPcap* pcap_open(char* name, BOOL write);
 FREERDP_API void pcap_close(rdpPcap* pcap);

-FREERDP_API void pcap_add_record(rdpPcap* pcap, void* data, uint32 length);
+FREERDP_API void pcap_add_record(rdpPcap* pcap, void* data, UINT32 length);
 FREERDP_API BOOL pcap_has_next_record(rdpPcap* pcap);
 FREERDP_API BOOL pcap_get_next_record(rdpPcap* pcap, pcap_record* record);
 FREERDP_API BOOL pcap_get_next_record_header(rdpPcap* pcap, pcap_record* record);
--- a/include/freerdp/utils/rail.h
+++ b/include/freerdp/utils/rail.h
@@ -29,7 +29,7 @@ FREERDP_API void rail_unicode_string_free(RAIL_UNICODE_STRING* unicode_string);
 FREERDP_API void rail_read_unicode_string(STREAM* s, RAIL_UNICODE_STRING* unicode_string);
 FREERDP_API void rail_write_unicode_string(STREAM* s, RAIL_UNICODE_STRING* unicode_string);
 FREERDP_API void rail_write_unicode_string_value(STREAM* s, RAIL_UNICODE_STRING* 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);
+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 */
--- a/include/freerdp/utils/sleep.h
+++ b/include/freerdp/utils/sleep.h
@@ -23,7 +23,7 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>

-FREERDP_API void freerdp_sleep(uint32 seconds);
-FREERDP_API void freerdp_usleep(uint32 useconds);
+FREERDP_API void freerdp_sleep(UINT32 seconds);
+FREERDP_API void freerdp_usleep(UINT32 useconds);

 #endif /* __SLEEP_UTILS_H */
--- a/include/freerdp/utils/stopwatch.h
+++ b/include/freerdp/utils/stopwatch.h
@@ -42,6 +42,6 @@ FREERDP_API void stopwatch_stop(STOPWATCH* stopwatch);
 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);
+FREERDP_API void stopwatch_get_elapsed_time_in_useconds(STOPWATCH* stopwatch, UINT32* sec, UINT32* usec);

 #endif /* __UTILS_STOPWATCH_H */
--- a/include/freerdp/utils/stream.h
+++ b/include/freerdp/utils/stream.h
@@ -67,21 +67,21 @@ FREERDP_API void stream_extend(STREAM* stream, int request_size);
 	(UINT16)(*_s->p) + \
 	(UINT16)(((UINT16)(*(_s->p + 1))) << 8); \
 	_s->p += 2; } while (0)
-#define stream_read_uint32(_s, _v) do { _v = \
-	(uint32)(*_s->p) + \
-	(((uint32)(*(_s->p + 1))) << 8) + \
-	(((uint32)(*(_s->p + 2))) << 16) + \
-	(((uint32)(*(_s->p + 3))) << 24); \
+#define stream_read_UINT32(_s, _v) do { _v = \
+	(UINT32)(*_s->p) + \
+	(((UINT32)(*(_s->p + 1))) << 8) + \
+	(((UINT32)(*(_s->p + 2))) << 16) + \
+	(((UINT32)(*(_s->p + 3))) << 24); \
 	_s->p += 4; } while (0)
-#define stream_read_uint64(_s, _v) do { _v = \
-	(uint64)(*_s->p) + \
-	(((uint64)(*(_s->p + 1))) << 8) + \
-	(((uint64)(*(_s->p + 2))) << 16) + \
-	(((uint64)(*(_s->p + 3))) << 24) + \
-	(((uint64)(*(_s->p + 4))) << 32) + \
-	(((uint64)(*(_s->p + 5))) << 40) + \
-	(((uint64)(*(_s->p + 6))) << 48) + \
-	(((uint64)(*(_s->p + 7))) << 56); \
+#define stream_read_UINT64(_s, _v) do { _v = \
+	(UINT64)(*_s->p) + \
+	(((UINT64)(*(_s->p + 1))) << 8) + \
+	(((UINT64)(*(_s->p + 2))) << 16) + \
+	(((UINT64)(*(_s->p + 3))) << 24) + \
+	(((UINT64)(*(_s->p + 4))) << 32) + \
+	(((UINT64)(*(_s->p + 5))) << 40) + \
+	(((UINT64)(*(_s->p + 6))) << 48) + \
+	(((UINT64)(*(_s->p + 7))) << 56); \
 	_s->p += 8; } while (0)
 #define stream_read(_s, _b, _n) do { \
 	memcpy(_b, (_s->p), (_n)); \
@@ -93,20 +93,20 @@ FREERDP_API void stream_extend(STREAM* stream, int request_size);
 #define stream_write_UINT16(_s, _v) do { \
 	*_s->p++ = (_v) & 0xFF; \
 	*_s->p++ = ((_v) >> 8) & 0xFF; } while (0)
-#define stream_write_uint32(_s, _v) do { \
+#define stream_write_UINT32(_s, _v) do { \
 	*_s->p++ = (_v) & 0xFF; \
 	*_s->p++ = ((_v) >> 8) & 0xFF; \
 	*_s->p++ = ((_v) >> 16) & 0xFF; \
 	*_s->p++ = ((_v) >> 24) & 0xFF; } while (0)
-#define stream_write_uint64(_s, _v) do { \
-	*_s->p++ = (uint64)(_v) & 0xFF; \
-	*_s->p++ = ((uint64)(_v) >> 8) & 0xFF; \
-	*_s->p++ = ((uint64)(_v) >> 16) & 0xFF; \
-	*_s->p++ = ((uint64)(_v) >> 24) & 0xFF; \
-	*_s->p++ = ((uint64)(_v) >> 32) & 0xFF; \
-	*_s->p++ = ((uint64)(_v) >> 40) & 0xFF; \
-	*_s->p++ = ((uint64)(_v) >> 48) & 0xFF; \
-	*_s->p++ = ((uint64)(_v) >> 56) & 0xFF; } while (0)
+#define stream_write_UINT64(_s, _v) do { \
+	*_s->p++ = (UINT64)(_v) & 0xFF; \
+	*_s->p++ = ((UINT64)(_v) >> 8) & 0xFF; \
+	*_s->p++ = ((UINT64)(_v) >> 16) & 0xFF; \
+	*_s->p++ = ((UINT64)(_v) >> 24) & 0xFF; \
+	*_s->p++ = ((UINT64)(_v) >> 32) & 0xFF; \
+	*_s->p++ = ((UINT64)(_v) >> 40) & 0xFF; \
+	*_s->p++ = ((UINT64)(_v) >> 48) & 0xFF; \
+	*_s->p++ = ((UINT64)(_v) >> 56) & 0xFF; } while (0)
 #define stream_write(_s, _b, _n) do { \
 	memcpy(_s->p, (_b), (_n)); \
 	_s->p += (_n); \
@@ -125,43 +125,43 @@ FREERDP_API void stream_extend(STREAM* stream, int request_size);
 	(UINT16)(*_s->p) + \
 	(((UINT16)(*(_s->p + 1))) << 8); \
 	} while (0)
-#define stream_peek_uint32(_s, _v) do { _v = \
-	(uint32)(*_s->p) + \
-	(((uint32)(*(_s->p + 1))) << 8) + \
-	(((uint32)(*(_s->p + 2))) << 16) + \
-	(((uint32)(*(_s->p + 3))) << 24); \
+#define stream_peek_UINT32(_s, _v) do { _v = \
+	(UINT32)(*_s->p) + \
+	(((UINT32)(*(_s->p + 1))) << 8) + \
+	(((UINT32)(*(_s->p + 2))) << 16) + \
+	(((UINT32)(*(_s->p + 3))) << 24); \
 	} while (0)
-#define stream_peek_uint64(_s, _v) do { _v = \
-	(uint64)(*_s->p) + \
-	(((uint64)(*(_s->p + 1))) << 8) + \
-	(((uint64)(*(_s->p + 2))) << 16) + \
-	(((uint64)(*(_s->p + 3))) << 24) + \
-	(((uint64)(*(_s->p + 4))) << 32) + \
-	(((uint64)(*(_s->p + 5))) << 40) + \
-	(((uint64)(*(_s->p + 6))) << 48) + \
-	(((uint64)(*(_s->p + 7))) << 56); \
+#define stream_peek_UINT64(_s, _v) do { _v = \
+	(UINT64)(*_s->p) + \
+	(((UINT64)(*(_s->p + 1))) << 8) + \
+	(((UINT64)(*(_s->p + 2))) << 16) + \
+	(((UINT64)(*(_s->p + 3))) << 24) + \
+	(((UINT64)(*(_s->p + 4))) << 32) + \
+	(((UINT64)(*(_s->p + 5))) << 40) + \
+	(((UINT64)(*(_s->p + 6))) << 48) + \
+	(((UINT64)(*(_s->p + 7))) << 56); \
 	} while (0)

 #define stream_seek_BYTE(_s)	stream_seek(_s, 1)
 #define stream_seek_UINT16(_s)	stream_seek(_s, 2)
-#define stream_seek_uint32(_s)	stream_seek(_s, 4)
-#define stream_seek_uint64(_s)	stream_seek(_s, 8)
+#define stream_seek_UINT32(_s)	stream_seek(_s, 4)
+#define stream_seek_UINT64(_s)	stream_seek(_s, 8)

 #define stream_read_UINT16_be(_s, _v) do { _v = \
 	(((UINT16)(*_s->p)) << 8) + \
 	(UINT16)(*(_s->p + 1)); \
 	_s->p += 2; } while (0)
-#define stream_read_uint32_be(_s, _v) do { _v = \
-	(((uint32)(*(_s->p))) << 24) + \
-	(((uint32)(*(_s->p + 1))) << 16) + \
-	(((uint32)(*(_s->p + 2))) << 8) + \
-	(((uint32)(*(_s->p + 3)))); \
+#define stream_read_UINT32_be(_s, _v) do { _v = \
+	(((UINT32)(*(_s->p))) << 24) + \
+	(((UINT32)(*(_s->p + 1))) << 16) + \
+	(((UINT32)(*(_s->p + 2))) << 8) + \
+	(((UINT32)(*(_s->p + 3)))); \
 	_s->p += 4; } while (0)

 #define stream_write_UINT16_be(_s, _v) do { \
 	*_s->p++ = ((_v) >> 8) & 0xFF; \
 	*_s->p++ = (_v) & 0xFF; } while (0)
-#define stream_write_uint32_be(_s, _v) do { \
+#define stream_write_UINT32_be(_s, _v) do { \
 	stream_write_UINT16_be(_s, ((_v) >> 16 & 0xFFFF)); \
 	stream_write_UINT16_be(_s, ((_v) & 0xFFFF)); \
 	} while (0)
--- a/include/freerdp/utils/string.h
+++ b/include/freerdp/utils/string.h
@@ -28,7 +28,7 @@ struct rdp_string
 {
 	char* ascii;
 	char* unicode;
-	uint32 length;
+	UINT32 length;
 };
 typedef struct rdp_string rdpString;

--- a/include/freerdp/utils/time.h
+++ b/include/freerdp/utils/time.h
@@ -30,9 +30,9 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>

-FREERDP_API uint64 freerdp_windows_gmtime();
-FREERDP_API uint64 freerdp_get_windows_time_from_unix_time(time_t unix_time);
-FREERDP_API time_t freerdp_get_unix_time_from_windows_time(uint64 windows_time);
+FREERDP_API UINT64 freerdp_windows_gmtime();
+FREERDP_API UINT64 freerdp_get_windows_time_from_unix_time(time_t unix_time);
+FREERDP_API time_t freerdp_get_unix_time_from_windows_time(UINT64 windows_time);
 FREERDP_API time_t freerdp_get_unix_time_from_generalized_time(const char* generalized_time);

 #endif /* FREERDP_TIME_UTILS_H */
--- a/include/freerdp/window.h
+++ b/include/freerdp/window.h
@@ -122,22 +122,22 @@

 struct _WINDOW_ORDER_INFO
 {
-	uint32 windowId;
-	uint32 fieldFlags;
-	uint32 notifyIconId;
+	UINT32 windowId;
+	UINT32 fieldFlags;
+	UINT32 notifyIconId;
 };
 typedef struct _WINDOW_ORDER_INFO WINDOW_ORDER_INFO;

 struct _ICON_INFO
 {
-	uint32 cacheEntry;
-	uint32 cacheId;
-	uint32 bpp;
-	uint32 width;
-	uint32 height;
-	uint32 cbColorTable;
-	uint32 cbBitsMask;
-	uint32 cbBitsColor;
+	UINT32 cacheEntry;
+	UINT32 cacheId;
+	UINT32 bpp;
+	UINT32 width;
+	UINT32 height;
+	UINT32 cbColorTable;
+	UINT32 cbBitsMask;
+	UINT32 cbBitsColor;
 	BYTE* bitsMask;
 	BYTE* colorTable;
 	BYTE* bitsColor;
@@ -146,15 +146,15 @@ typedef struct _ICON_INFO ICON_INFO;

 struct _CACHED_ICON_INFO
 {
-	uint32 cacheEntry;
-	uint32 cacheId;
+	UINT32 cacheEntry;
+	UINT32 cacheId;
 };
 typedef struct _CACHED_ICON_INFO CACHED_ICON_INFO;

 struct _NOTIFY_ICON_INFOTIP
 {
-	uint32 timeout;
-	uint32 flags;
+	UINT32 timeout;
+	UINT32 flags;
 	RAIL_UNICODE_STRING text;
 	RAIL_UNICODE_STRING title;
 };
@@ -162,28 +162,28 @@ typedef struct _NOTIFY_ICON_INFOTIP NOTIFY_ICON_INFOTIP;

 struct _WINDOW_STATE_ORDER
 {
-	uint32 ownerWindowId;
-	uint32 style;
-	uint32 extendedStyle;
-	uint32 showState;
+	UINT32 ownerWindowId;
+	UINT32 style;
+	UINT32 extendedStyle;
+	UINT32 showState;
 	RAIL_UNICODE_STRING titleInfo;
-	uint32 clientOffsetX;
-	uint32 clientOffsetY;
-	uint32 clientAreaWidth;
-	uint32 clientAreaHeight;
-	uint32 RPContent;
-	uint32 rootParentHandle;
-	uint32 windowOffsetX;
-	uint32 windowOffsetY;
-	uint32 windowClientDeltaX;
-	uint32 windowClientDeltaY;
-	uint32 windowWidth;
-	uint32 windowHeight;
-	uint32 numWindowRects;
+	UINT32 clientOffsetX;
+	UINT32 clientOffsetY;
+	UINT32 clientAreaWidth;
+	UINT32 clientAreaHeight;
+	UINT32 RPContent;
+	UINT32 rootParentHandle;
+	UINT32 windowOffsetX;
+	UINT32 windowOffsetY;
+	UINT32 windowClientDeltaX;
+	UINT32 windowClientDeltaY;
+	UINT32 windowWidth;
+	UINT32 windowHeight;
+	UINT32 numWindowRects;
 	RECTANGLE_16* windowRects;
-	uint32 visibleOffsetX;
-	uint32 visibleOffsetY;
-	uint32 numVisibilityRects;
+	UINT32 visibleOffsetX;
+	UINT32 visibleOffsetY;
+	UINT32 numVisibilityRects;
 	RECTANGLE_16* visibilityRects;
 };
 typedef struct _WINDOW_STATE_ORDER WINDOW_STATE_ORDER;
@@ -202,10 +202,10 @@ typedef struct _WINDOW_CACHED_ICON_ORDER WINDOW_CACHED_ICON_ORDER;

 struct _NOTIFY_ICON_STATE_ORDER
 {
-	uint32 version;
+	UINT32 version;
 	RAIL_UNICODE_STRING toolTip;
 	NOTIFY_ICON_INFOTIP infoTip;
-	uint32 state;
+	UINT32 state;
 	ICON_INFO icon;
 	CACHED_ICON_INFO cachedIcon;
 };
@@ -213,9 +213,9 @@ typedef struct _NOTIFY_ICON_STATE_ORDER NOTIFY_ICON_STATE_ORDER;

 struct _MONITORED_DESKTOP_ORDER
 {
-	uint32 activeWindowId;
-	uint32 numWindowIds;
-	uint32* windowIds;
+	UINT32 activeWindowId;
+	UINT32 numWindowIds;
+	UINT32* windowIds;
 };
 typedef struct _MONITORED_DESKTOP_ORDER MONITORED_DESKTOP_ORDER;

@@ -233,7 +233,7 @@ typedef void (*pNonMonitoredDesktop)(rdpContext* context, WINDOW_ORDER_INFO* ord
 struct rdp_window_update
 {
 	rdpContext* context; /* 0 */
-	uint32 paddingA[16 - 1]; /* 1 */
+	UINT32 paddingA[16 - 1]; /* 1 */

 	pWindowCreate WindowCreate; /* 16 */
 	pWindowUpdate WindowUpdate; /* 17 */
@@ -245,7 +245,7 @@ struct rdp_window_update
 	pNotifyIconDelete NotifyIconDelete; /* 23 */
 	pMonitoredDesktop MonitoredDesktop; /* 24 */
 	pNonMonitoredDesktop NonMonitoredDesktop; /* 25 */
-	uint32 paddingB[32 - 26]; /* 26 */
+	UINT32 paddingB[32 - 26]; /* 26 */

 	/* internal */