Changed GUID_DEFINED to _GUID_DEFINED for compatibility (prevent conflict) with mingw...

[reactos.git] / reactos / include / structs.h

diff --git a/reactos/include/structs.h b/reactos/include/structs.h
index ef379fe..7f7587c 100644 (file)
--- a/reactos/include/structs.h
+++ b/reactos/include/structs.h
@@ -83,16 +83,6 @@ typedef struct tagACCESSTIMEOUT {
   DWORD iTimeOutMSec;
 } ACCESSTIMEOUT;
 
-typedef struct _ACL_REVISION_INFORMATION {
-  DWORD   AclRevision;
-} ACL_REVISION_INFORMATION;
-
-typedef struct _ACL_SIZE_INFORMATION {
-  DWORD   AceCount;
-  DWORD   AclBytesInUse;
-  DWORD   AclBytesFree;
-} ACL_SIZE_INFORMATION;
-
 typedef struct _ACTION_HEADER {
   ULONG   transport_id;
   USHORT  action_code;
@@ -267,10 +257,13 @@ typedef struct {
   DWORD        bV4GammaBlue;
 } BITMAPV4HEADER,   *LPBITMAPV4HEADER, *PBITMAPV4HEADER;
 
+#ifndef _BLOB_DEFINED
+#define _BLOB_DEFINED
 typedef struct _BLOB {
   ULONG   cbSize;
   BYTE    *pBlobData;
 } BLOB;
+#endif
 
 typedef struct _SHITEMID {
   USHORT cb;
@@ -2103,6 +2096,18 @@ typedef  struct  tagHELPINFO {
   POINT  MousePos;
 } HELPINFO,   *LPHELPINFO;
 
+typedef struct {
+    DWORD   mkSize;
+    CHAR    mkKeyList;
+    CHAR    szKeyphrase[1];
+} MULTIKEYHELPA, *PMULTIKEYHELPA, *LPMULTIKEYHELPA;
+
+typedef struct {
+    DWORD   mkSize;
+    WCHAR   mkKeyList;
+    WCHAR   szKeyphrase[1];
+} MULTIKEYHELPW, *PMULTIKEYHELPW, *LPMULTIKEYHELPW;
+
 typedef struct {
   int   wStructSize;
   int   x;
@@ -2113,6 +2118,27 @@ typedef struct {
   TCHAR rgchMember[2];
 } HELPWININFO;
 
+typedef struct {
+       int wStructSize;
+       int x;
+       int y;
+       int dx;
+       int dy;
+       int wMax;
+       CHAR rgchMember[2];
+} HELPWININFOA, *PHELPWININFOA, *LPHELPWININFOA;
+
+typedef struct {
+       int wStructSize;
+       int x;
+       int y;
+       int dx;
+       int dy;
+       int wMax;
+       WCHAR rgchMember[2];
+} HELPWININFOW, *PHELPWININFOW, *LPHELPWININFOW;
+
+
 typedef struct tagHIGHCONTRAST {
   UINT cbSize;
   DWORD dwFlags;
@@ -2771,8 +2797,8 @@ typedef struct _SERVICE_ADDRESSES {
   SERVICE_ADDRESS   Addresses[1];
 } SERVICE_ADDRESSES, *LPSERVICE_ADDRESSES;
 
-#ifndef GUID_DEFINED
-#define GUID_DEFINED
+#ifndef _GUID_DEFINED
+#define _GUID_DEFINED
 typedef struct _GUID
 {
     unsigned long  Data1;
@@ -3450,7 +3476,7 @@ typedef struct _RGNDATAHEADER {
 
 typedef struct _RGNDATA {
   RGNDATAHEADER rdh;
-  char*          Buffer;
+  char          Buffer[1];
 } RGNDATA, *PRGNDATA, *LPRGNDATA;
 
 typedef struct tagSCROLLINFO {
@@ -3851,12 +3877,14 @@ typedef struct tagTPMPARAMS {
   RECT rcExclude;
 } TPMPARAMS,   *LPTPMPARAMS;
 
+#if 0 // RobD - typedef removed due to conflict with mingw headers
 typedef struct _TRANSMIT_FILE_BUFFERS {
   PVOID Head;
   DWORD HeadLength;
   PVOID Tail;
   DWORD TailLength;
 } TRANSMIT_FILE_BUFFERS;
+#endif
 
 typedef struct _TT_HITTESTINFO {
   HWND hwnd;