branch update for HEAD-2003021201

diff --git a/include/msvcrt/ctype.h b/include/msvcrt/ctype.h
index 877b993..e7a7cf5 100644 (file)
--- a/include/msvcrt/ctype.h
+++ b/include/msvcrt/ctype.h
@@ -121,7 +121,7 @@ int iswxdigit(wint_t);
 
 //wchar_t towlower(wchar_t);
 wchar_t towupper(wchar_t);
-int towlower(wint_t);
+wchar_t towlower(wchar_t);
 //int towupper(wint_t);
 
 int isleadbyte(int);

diff --git a/include/napi/types.h b/include/napi/types.h
index b71f43b..338f8de 100644 (file)
--- a/include/napi/types.h
+++ b/include/napi/types.h
@@ -23,8 +23,6 @@ typedef enum _NT_PRODUCT_TYPE
    NtProductServer
 } NT_PRODUCT_TYPE, *PNT_PRODUCT_TYPE;
 
-typedef ULARGE_INTEGER TIME, *PTIME;
-
 #ifndef __USE_W32API
 
 typedef const int CINT;
@@ -88,6 +86,9 @@ typedef struct _TIME {
        LONG HighPart;
 } TIME, *PTIME;
 #endif
+#if 0
+typedef ULARGE_INTEGER TIME, *PTIME;
+#endif
 
 /* W32 XP has 'LARGE_INTEGER' although it could be 'ULARGE_INTEGER' before */
 typedef LARGE_INTEGER TIME, *PTIME;

diff --git a/include/ntos/disk.h b/include/ntos/disk.h
index b79c8b4..6c3914a 100644 (file)
--- a/include/ntos/disk.h
+++ b/include/ntos/disk.h
@@ -195,13 +195,6 @@ typedef struct _PARTITION_INFORMATION_EX
 #endif /* ANONYMOUSUNIONS */
 } PARTITION_INFORMATION_EX, *PPARTITION_INFORMATION_EX;
 
-typedef struct _DRIVE_LAYOUT_INFORMATION
-{
-  DWORD PartitionCount;
-  DWORD Signature;
-  PARTITION_INFORMATION PartitionEntry[1];
-} DRIVE_LAYOUT_INFORMATION, *PDRIVE_LAYOUT_INFORMATION;
-
 typedef struct _SET_PARTITION_INFORMATION
 {
   ULONG PartitionType;

diff --git a/include/ntos/rtl.h b/include/ntos/rtl.h
index a1f0f2e..4ff366e 100755 (executable)
--- a/include/ntos/rtl.h
+++ b/include/ntos/rtl.h
@@ -176,6 +176,9 @@
                } \
        }
 */
+#ifdef G_GNUC_UNUSED
+static inline PSINGLE_LIST_ENTRY PopEntryList(PSINGLE_LIST_ENTRY ListHead) G_GNUC_UNUSED;
+#endif /* G_GNUC_UNUSED */
 static inline PSINGLE_LIST_ENTRY
 PopEntryList(PSINGLE_LIST_ENTRY ListHead)
 {
@@ -193,6 +196,9 @@ PopEntryList(PSINGLE_LIST_ENTRY ListHead)
 #define RtlCopyMemory(Destination,Source,Length) \
        memcpy((Destination),(Source),(Length))
 
+#ifdef G_GNUC_UNUSED
+static inline VOID PushEntryList(PSINGLE_LIST_ENTRY ListHead,PSINGLE_LIST_ENTRY Entry) G_GNUC_UNUSED;
+#endif /* G_GNUC_UNUSED */
 static
 inline
 VOID
@@ -262,6 +268,9 @@ RemoveHeadList (
        );
 */
 
+#ifdef G_GNUC_UNUSED
+static inline PLIST_ENTRY RemoveHeadList(PLIST_ENTRY ListHead) G_GNUC_UNUSED;
+#endif /* G_GNUC_UNUSED */
 static
 inline
 PLIST_ENTRY
@@ -316,6 +325,9 @@ RemoveTailList (
        );
 */
 
+#ifdef G_GNUC_UNUSED
+static inline PLIST_ENTRY RemoveTailList(PLIST_ENTRY ListHead) G_GNUC_UNUSED;
+#endif /* G_GNUC_UNUSED */
 static
 inline
 PLIST_ENTRY
@@ -510,13 +522,21 @@ extern BOOLEAN NLS_MB_OEM_CODE_PAGE_TAG;
  * length otherwise
  */
 
+/* Prevent hide of the inappropriate passed type by our
+ * de"const" of the string in the macro below.
+ */
+#ifdef G_GNUC_UNUSED
+static inline const WCHAR *_RtlInitUnicodeStringFromLiteral_typecheck(const WCHAR *s) G_GNUC_UNUSED;
+#endif /* G_GNUC_UNUSED */
+static inline const WCHAR *_RtlInitUnicodeStringFromLiteral_typecheck(const WCHAR *s) { return s; }
+
 #define RtlInitUnicodeStringFromLiteral(__PDEST_STRING__,__SOURCE_STRING__) \
  InitializeUnicodeString( \
   (__PDEST_STRING__), \
   sizeof(__SOURCE_STRING__) - sizeof(WCHAR), \
   sizeof(__SOURCE_STRING__), \
-  (__SOURCE_STRING__) \
-)
+  (WCHAR * /* de"const" the string here */ )_RtlInitUnicodeStringFromLiteral_typecheck((__SOURCE_STRING__)) \
+ )
 
 
 /*
@@ -564,6 +584,9 @@ PushEntryList (
 /*
  * An ReactOS extension
  */
+#ifdef G_GNUC_UNUSED
+static inline PSINGLE_LIST_ENTRY PopEntrySList(PSLIST_HEADER ListHead) G_GNUC_UNUSED;
+#endif /* G_GNUC_UNUSED */
 static
 inline
 PSINGLE_LIST_ENTRY
@@ -587,6 +610,9 @@ PSINGLE_LIST_ENTRY
 /*
  * An ReactOS extension
  */
+#ifdef G_GNUC_UNUSED
+static inline VOID PushEntrySList(PSLIST_HEADER ListHead,PSINGLE_LIST_ENTRY Entry) G_GNUC_UNUSED;
+#endif /* G_GNUC_UNUSED */
 static
 inline
 VOID
@@ -1236,7 +1262,16 @@ RtlInsertElementGenericTable (
        IN OUT  PRTL_GENERIC_TABLE      Table,
        IN      PVOID                   Element,
        IN      ULONG                   ElementSize,
-       IN      ULONG                   Unknown4
+       IN      PBOOLEAN                NewElement      OPTIONAL
+       );
+
+PVOID
+STDCALL
+RtlLookupElementGenericTableFull (
+       IN OUT  PRTL_GENERIC_TABLE      Table,
+       IN      PVOID                   Element,
+       OUT     PVOID                   *NodeOrParent,
+       OUT     TABLE_SEARCH_RESULT     *SearchResult
        );
 
 NTSTATUS

diff --git a/include/ntos/rtltypes.h b/include/ntos/rtltypes.h
index 7532839..967d767 100755 (executable)
--- a/include/ntos/rtltypes.h
+++ b/include/ntos/rtltypes.h
@@ -184,6 +184,37 @@ typedef struct _RTL_NLS_TABLE
   PWCHAR DowncaseTable;
 } RTL_NLS_TABLE, *PRTL_NLS_TABLE;
 
+struct _RTL_GENERIC_TABLE;
+
+typedef enum _RTL_GENERIC_COMPARE_RESULTS
+{
+  GenericLessThan,
+  GenericGreaterThan,
+  GenericEqual
+} RTL_GENERIC_COMPARE_RESULTS;
+
+typedef enum _TABLE_SEARCH_RESULT
+{
+  TableEmptyTree,
+  TableFoundNode,
+  TableInsertAsLeft,
+  TableInsertAsRight
+} TABLE_SEARCH_RESULT;
+
+typedef RTL_GENERIC_COMPARE_RESULTS NTAPI
+(*PRTL_GENERIC_COMPARE_ROUTINE)(struct _RTL_GENERIC_TABLE *GenericTable,
+                               PVOID FirstStruct,
+                               PVOID SecondStruct);
+
+typedef PVOID NTAPI
+(*PRTL_GENERIC_ALLOCATE_ROUTINE)(struct _RTL_GENERIC_TABLE *GenericTable,
+                                ULONG ByteSize
+                                );
+
+typedef VOID NTAPI
+(*PRTL_GENERIC_FREE_ROUTINE)(struct _RTL_GENERIC_TABLE *GenericTable,
+                            PVOID Element
+                            );
 
 typedef struct _RTL_GENERIC_TABLE
 {
@@ -193,9 +224,9 @@ typedef struct _RTL_GENERIC_TABLE
   ULONG Unknown4;
   ULONG Unknown5;
   ULONG ElementCount;
-  PVOID CompareRoutine;
-  PVOID AllocateRoutine;
-  PVOID FreeRoutine;
+  PRTL_GENERIC_COMPARE_ROUTINE CompareRoutine;
+  PRTL_GENERIC_ALLOCATE_ROUTINE AllocateRoutine;
+  PRTL_GENERIC_FREE_ROUTINE FreeRoutine;
   ULONG UserParameter;
 } RTL_GENERIC_TABLE, *PRTL_GENERIC_TABLE;
 

diff --git a/include/ntos/types.h b/include/ntos/types.h
index 9d89828..38e131c 100644 (file)
--- a/include/ntos/types.h
+++ b/include/ntos/types.h
@@ -41,25 +41,24 @@ typedef short SHORT;
 #ifndef __USE_W32API
 
 #ifdef i386
+#ifndef STDCALL
 #define STDCALL     __attribute__ ((stdcall))
-#define CDECL       __attribute__ ((cdecl))
+#endif
+#ifndef CDECL
+#define CDECL       __attribute((cdecl))
+#endif
 #define CALLBACK    WINAPI
 #define PASCAL      WINAPI
 #else
-
-#ifdef __GNUC__
+#ifndef STDCALL
 #define STDCALL
+#endif
+#ifndef CDECL
 #define CDECL
+#endif
 #define CALLBACK
 #define PASCAL
-#else
-#define STDCALL __stdcall
-#define CDECL __cdecl
-#define CALLBACK
-#define PASCAL
-#endif /*__GNUC__*/
-
-#endif /*i386*/
+#endif
 
 #ifdef _WIN64
 
@@ -191,26 +190,6 @@ typedef struct _FILETIME
   DWORD dwHighDateTime;
 } FILETIME, *LPFILETIME, *PFILETIME;
 
-#ifdef i386
-#ifndef STDCALL
-#define STDCALL     __attribute__ ((stdcall))
-#endif
-#ifndef CDECL
-#define CDECL       __attribute((cdecl))
-#endif
-#define CALLBACK    WINAPI
-#define PASCAL      WINAPI
-#else
-#ifndef STDCALL
-#define STDCALL
-#endif
-#ifndef CDECL
-#define CDECL
-#endif
-#define CALLBACK
-#define PASCAL
-#endif
-
 typedef struct _LIST_ENTRY
 {
   struct _LIST_ENTRY *Flink;
@@ -226,9 +205,6 @@ typedef struct _SINGLE_LIST_ENTRY
 #define _SLIST_ENTRY _SINGLE_LIST_ENTRY
 #define PSLIST_ENTRY PSINGLE_LIST_ENTRY
 
-typedef DWORD STDCALL (*PTHREAD_START_ROUTINE) (LPVOID);
-typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE;
-
 typedef struct _UNICODE_STRING
 {
   USHORT Length;

diff --git a/include/ntos/zwtypes.h b/include/ntos/zwtypes.h
index cc1fe02..9b58d00 100755 (executable)
--- a/include/ntos/zwtypes.h
+++ b/include/ntos/zwtypes.h
@@ -997,6 +997,24 @@ typedef struct _FILE_BOTH_DIRECTORY_INFORMATION {
 } FILE_BOTH_DIRECTORY_INFORMATION, *PFILE_BOTH_DIRECTORY_INFORMATION,
   FILE_BOTH_DIR_INFORMATION, *PFILE_BOTH_DIR_INFORMATION;
 
+typedef struct _FILE_ID_BOTH_DIR_INFORMATION {
+       ULONG NextEntryOffset;
+       ULONG FileIndex;
+       LARGE_INTEGER CreationTime;
+       LARGE_INTEGER LastAccessTime;
+       LARGE_INTEGER LastWriteTime;
+       LARGE_INTEGER ChangeTime;
+       LARGE_INTEGER EndOfFile;
+       LARGE_INTEGER AllocationSize;
+       ULONG FileAttributes;
+       ULONG FileNameLength;
+       ULONG EaSize;
+       CCHAR ShortNameLength;
+       WCHAR ShortName[12];
+       LARGE_INTEGER FileId;
+       WCHAR FileName[1];
+} FILE_ID_BOTH_DIR_INFORMATION, *PFILE_ID_BOTH_DIR_INFORMATION;
+
 /*
        NotifyFilter / CompletionFilter:
 

diff --git a/include/unicode.h b/include/unicode.h
index 4109814..db244ae 100644 (file)
--- a/include/unicode.h
+++ b/include/unicode.h
@@ -32,6 +32,8 @@
 #ifndef _GNU_H_WINDOWS32_UNICODEFUNCTIONS
 #define _GNU_H_WINDOWS32_UNICODEFUNCTIONS
 
+#include <funcs.h>     /* for LPPROGRESS_ROUTINE */
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h
index a007ba8..38115dc 100644 (file)
--- a/ntoskrnl/include/internal/cc.h
+++ b/ntoskrnl/include/internal/cc.h
@@ -59,8 +59,6 @@ typedef struct _INTERNAL_BCB
   BOOLEAN Dirty;
 } INTERNAL_BCB, *PINTERNAL_BCB;
 
-#endif /* LIBCAPTIVE */
-
 VOID STDCALL
 CcMdlReadCompleteDev (IN PMDL          MdlChain,
                      IN PDEVICE_OBJECT DeviceObject);
@@ -130,5 +128,7 @@ CcRosRequestCacheSegment (BCB*                  Bcb,
                          PBOOLEAN          UptoDate,
                          CACHE_SEGMENT**   CacheSeg);
 
+#endif /* LIBCAPTIVE */
+
 
 #endif

diff --git a/ntoskrnl/ntoskrnl.def b/ntoskrnl/ntoskrnl.def
index 06a6c1c..d2daada 100644 (file)
--- a/ntoskrnl/ntoskrnl.def
+++ b/ntoskrnl/ntoskrnl.def
@@ -978,11 +978,9 @@ ZwWaitForSingleObject@12
 ZwWriteFile@36
 ZwYieldExecution@0
 _abnormal_termination
-_alldiv
-_allmul
-_allrem
-_allshl
-_allshr
+_alldiv@16
+_allmul@16
+_allrem@16
 _aulldiv
 _aullrem
 _aullshr