Merge pull request #3786 from lambdageek/dev-42584-take2

[mono.git] / mono / io-layer / uglify.h

diff --git a/mono/io-layer/uglify.h b/mono/io-layer/uglify.h
index 4b2579fc462fbaed78cbcbc6d4e42bacda682166..5176da07ea7f2aa98f284fbf665d6f7d1cd2d629 100644 (file)
--- a/mono/io-layer/uglify.h
+++ b/mono/io-layer/uglify.h
@@ -1,3 +1,12 @@
+/*
+ * uglify.h:  Optional header to provide the nasty w32 typedefs
+ *
+ * Author:
+ *     Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_UGLIFY_H_
 #define _WAPI_UGLIFY_H_
 
@@ -7,8 +16,12 @@
 
 #include "mono/io-layer/wapi.h"
 
-typedef const guchar *LPCTSTR;         /* replace this with gunichar */
+typedef const gunichar2 *LPCTSTR;
+typedef gunichar2 *LPTSTR;
+typedef const char *LPCSTR;
+typedef char *LPSTR;
 typedef guint8 BYTE;
+typedef guint8 *LPBYTE;
 typedef guint16 WORD;
 typedef guint32 DWORD;
 typedef gpointer PVOID;
@@ -20,25 +33,35 @@ typedef guint32 ULONG;
 typedef gint32 *PLONG;
 typedef guint64 LONGLONG;
 typedef gunichar2 TCHAR;
+typedef size_t SIZE_T;
+typedef guint64 ULONG64;
+typedef guint UINT;
+typedef gconstpointer LPCVOID;
+
+typedef gpointer HANDLE;
+typedef gpointer *LPHANDLE;
+typedef guint32 SOCKET;
+typedef gpointer HMODULE;
+typedef gpointer HINSTANCE;
+typedef gpointer HWND;
+typedef gpointer HKEY;
 
-typedef WapiHandle *HANDLE;
-typedef WapiHandle **LPHANDLE;
-typedef WapiHandle *SOCKET;    /* NB: w32 defines this to be int */
+typedef WapiSecurityAttributes SECURITY_ATTRIBUTES;
 typedef WapiSecurityAttributes *LPSECURITY_ATTRIBUTES;
 typedef WapiOverlapped *LPOVERLAPPED;
-typedef WapiThreadStart LPTHREAD_START_ROUTINE;
-typedef WapiCriticalSection CRITICAL_SECTION;
-typedef WapiCriticalSection *LPCRITICAL_SECTION;
+typedef WapiOverlappedCB LPOVERLAPPED_COMPLETION_ROUTINE;
 typedef WapiFileTime FILETIME;
 typedef WapiFileTime *LPFILETIME;
 typedef WapiSystemTime SYSTEMTIME;
 typedef WapiSystemTime *LPSYSTEMTIME;
 typedef WapiWSAData WSADATA;
 typedef WapiWSAData *LDWSADATA;
+typedef WapiWSABuf WSABUF;
+typedef WapiWSABuf *LPWSABUF;
 typedef WapiLargeInteger LARGE_INTEGER;
 typedef WapiLargeInteger *PLARGE_INTEGER;
-typedef WapiSystemInfo SYSTEM_INFO;
-typedef WapiSystemInfo *LPSYSTEM_INFO;
+typedef WapiULargeInteger ULARGE_INTEGER;
+typedef WapiULargeInteger *PULARGE_INTEGER;
 typedef WapiFloatingSaveArea FLOATING_SAVE_AREA;
 typedef WapiFloatingSaveArea *PFLOATING_SAVE_AREA;
 typedef WapiContext CONTEXT;
@@ -47,6 +70,47 @@ typedef WapiFindData WIN32_FIND_DATA;
 typedef WapiFindData *LPWIN32_FIND_DATA;
 typedef WapiFileAttributesData WIN32_FILE_ATTRIBUTE_DATA;
 typedef WapiGetFileExInfoLevels GET_FILEEX_INFO_LEVELS;
+typedef WapiStartupInfo STARTUPINFO;
+typedef WapiStartupInfo *LPSTARTUPINFO;
+typedef WapiProcessInformation PROCESS_INFORMATION;
+typedef WapiFixedFileInfo VS_FIXEDFILEINFO;
+typedef WapiModuleInfo MODULEINFO;
+typedef WapiModuleInfo *LPMODULEINFO;
+typedef WapiImageDosHeader IMAGE_DOS_HEADER;
+typedef WapiImageDosHeader *PIMAGE_DOS_HEADER;
+typedef WapiImageFileHeader IMAGE_FILE_HEADER;
+typedef WapiImageFileHeader *PIMAGE_FILE_HEADER;
+typedef WapiImageDataDirectory IMAGE_DATA_DIRECTORY;
+typedef WapiImageDataDirectory *PIMAGE_DATA_DIRECTORY;
+typedef WapiImageOptionalHeader32 IMAGE_OPTIONAL_HEADER32;
+typedef WapiImageOptionalHeader32 *PIMAGE_OPTIONAL_HEADER32;
+typedef WapiImageOptionalHeader64 IMAGE_OPTIONAL_HEADER64;
+typedef WapiImageOptionalHeader64 *PIMAGE_OPTIONAL_HEADER64;
+typedef WapiImageOptionalHeader IMAGE_OPTIONAL_HEADER;
+typedef WapiImageOptionalHeader *PIMAGE_OPTIONAL_HEADER;
+typedef WapiImageNTHeaders32 IMAGE_NT_HEADERS32;
+typedef WapiImageNTHeaders32 *PIMAGE_NT_HEADERS32;
+typedef WapiImageNTHeaders64 IMAGE_NT_HEADERS64;
+typedef WapiImageNTHeaders64 *PIMAGE_NT_HEADERS64;
+typedef WapiImageNTHeaders IMAGE_NT_HEADERS;
+typedef WapiImageNTHeaders *PIMAGE_NT_HEADERS;
+typedef WapiImageSectionHeader IMAGE_SECTION_HEADER;
+typedef WapiImageSectionHeader *PIMAGE_SECTION_HEADER;
+typedef WapiImageResourceDirectory IMAGE_RESOURCE_DIRECTORY;
+typedef WapiImageResourceDirectory *PIMAGE_RESOURCE_DIRECTORY;
+typedef WapiImageResourceDirectoryEntry IMAGE_RESOURCE_DIRECTORY_ENTRY;
+typedef WapiImageResourceDirectoryEntry *PIMAGE_RESOURCE_DIRECTORY_ENTRY;
+typedef WapiImageResourceDataEntry IMAGE_RESOURCE_DATA_ENTRY;
+typedef WapiImageResourceDataEntry *PIMAGE_RESOURCE_DATA_ENTRY;
+typedef WapiShellExecuteInfo SHELLEXECUTEINFO;
+typedef WapiShellExecuteInfo *LPSHELLEXECUTEINFO;
+typedef WapiTransmitFileBuffers TRANSMIT_FILE_BUFFERS;
+typedef WapiTransmitFileBuffers *PTRANSMIT_FILE_BUFFERS;
+typedef WapiTransmitFileBuffers *LPTRANSMIT_FILE_BUFFERS;
+typedef WapiDisconnectExFn LPFN_DISCONNECTEX;
+typedef WapiTransmitFileFn LPFN_TRANSMITFILE;
+typedef WapiGuid GUID;
+typedef WapiGuid *LPGUID;
 
 #define CONST const
 #define VOID void