branch update for HEAD-2003021201

[reactos.git] / include / napi / types.h

diff --git a/include/napi/types.h b/include/napi/types.h
index 694ae40..b71f43b 100644 (file)
--- a/include/napi/types.h
+++ b/include/napi/types.h
@@ -3,16 +3,6 @@
 
 // these should be moved to a file like ntdef.h
 
-typedef const int CINT;
-
-typedef LONG NTSTATUS, *PNTSTATUS;
-
-typedef ULONG DEVICE_TYPE;
-
-
-
-
-
 enum
 {
    DIRECTORY_QUERY,
@@ -25,19 +15,6 @@ enum
 /*
  * General type for status information
  */
-//typedef LONG NTSTATUS;
-
-typedef struct _UNICODE_STRING
-{
-   USHORT Length;
-   USHORT MaximumLength;
-   PWSTR Buffer;
-} UNICODE_STRING, *PUNICODE_STRING;
-
-typedef enum _SECTION_INHERIT {
-    ViewShare = 1,
-    ViewUnmap = 2
-} SECTION_INHERIT;
 
 typedef enum _NT_PRODUCT_TYPE
 {
@@ -46,6 +23,14 @@ typedef enum _NT_PRODUCT_TYPE
    NtProductServer
 } NT_PRODUCT_TYPE, *PNT_PRODUCT_TYPE;
 
+typedef ULARGE_INTEGER TIME, *PTIME;
+
+#ifndef __USE_W32API
+
+typedef const int CINT;
+typedef LONG NTSTATUS, *PNTSTATUS;
+typedef ULONG DEVICE_TYPE;
+
 /*  File information for IRP_MJ_QUERY_INFORMATION (and SET)  */
 typedef enum _FILE_INFORMATION_CLASS
 {
@@ -77,24 +62,25 @@ typedef enum _FILE_INFORMATION_CLASS
   FileMailslotQueryInformation,
   FileMailslotSetInformation,
   FileCompressionInformation,
-  FileCopyOnWriteInformation,
+  FileObjectIdInformation,
   FileCompletionInformation,
   FileMoveClusterInformation,
-  FileOleClassIdInformation,
-  FileOleStateBitsInformation,
+  FileQuotaInformation,
+  FileReparsePointInformation,
   FileNetworkOpenInformation,
-  FileObjectIdInformation,
-  FileOleAllInformation,
-  FileOleDirectoryInformation,
-  FileContentIndexInformation,
-  FileInheritContentIndexInformation,
-  FileOleInformation,
+  FileAttributeTagInformation,
+  FileTrackingInformation,
+  FileIdBothDirectoryInformation,
+  FileIdFullDirectoryInformation,
+  FileValidDataLengthInformation,
+  FileShortNameInformation,
   FileMaximumInformation,
 } FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS;
 
-typedef ULONG WAIT_TYPE;
-typedef USHORT CSHORT;
-
+typedef enum _SECTION_INHERIT {
+    ViewShare = 1,
+    ViewUnmap = 2
+} SECTION_INHERIT;
 
 #if 0
 typedef struct _TIME {
@@ -103,6 +89,9 @@ typedef struct _TIME {
 } TIME, *PTIME;
 #endif
 
-typedef ULARGE_INTEGER TIME, *PTIME;
+/* W32 XP has 'LARGE_INTEGER' although it could be 'ULARGE_INTEGER' before */
+typedef LARGE_INTEGER TIME, *PTIME;
+
+#endif /* !__USE_W32API */
 
 #endif /* __INCLUDE_NAPI_TYPES_H */