[ros-diffs] [ion] 16107: More NDK fixes, remove duplicated debug functions from ntdll, use rosrtl header where neded in ntdll.

More NDK fixes, remove duplicated debug functions from ntdll, use rosrtl
header where neded in ntdll.
Modified: trunk/reactos/include/ndk/pstypes.h
Modified: trunk/reactos/include/ndk/rtlfuncs.h
Modified: trunk/reactos/include/ndk/rtltypes.h
Modified: trunk/reactos/include/ndk/umtypes.h
Modified: trunk/reactos/include/ntdll/ntdll.h
Modified: trunk/reactos/lib/ntdll/dbg/debug.c
Modified: trunk/reactos/lib/ntdll/inc/ntdll.h
  _____  

Modified: trunk/reactos/include/ndk/pstypes.h
--- trunk/reactos/include/ndk/pstypes.h	2005-06-19 19:56:01 UTC (rev
16106)
+++ trunk/reactos/include/ndk/pstypes.h	2005-06-19 20:01:07 UTC (rev
16107)
@@ -72,7 +72,6 @@

 /* ENUMERATIONS
**************************************************************/
 
 /* FUNCTION TYPES
************************************************************/
-typedef DWORD (STDCALL* PTHREAD_START_ROUTINE) (LPVOID);
 typedef VOID (STDCALL *PPEBLOCKROUTINE)(PVOID);
 
 typedef NTSTATUS 
  _____  

Modified: trunk/reactos/include/ndk/rtlfuncs.h
--- trunk/reactos/include/ndk/rtlfuncs.h	2005-06-19 19:56:01 UTC
(rev 16106)
+++ trunk/reactos/include/ndk/rtlfuncs.h	2005-06-19 20:01:07 UTC
(rev 16107)
@@ -364,6 +364,15 @@

 
 VOID
 STDCALL
+RtlAssert (
+	PVOID FailedAssertion,
+	PVOID FileName,
+	ULONG LineNumber,
+	PCHAR Message
+	);
+
+VOID
+STDCALL
 RtlCopyLuid(
     IN PLUID LuidDest,
     IN PLUID LuidSrc
@@ -713,6 +722,14 @@
     
 NTSTATUS
 STDCALL
+RtlUnicodeStringToAnsiString (
+	IN OUT	PANSI_STRING	DestinationString,
+	IN	PUNICODE_STRING	SourceString,
+	IN	BOOLEAN		AllocateDestinationString
+	);
+    
+NTSTATUS
+STDCALL
 RtlUnicodeStringToInteger (
 	IN	PUNICODE_STRING	String,
 	IN	ULONG		Base,
  _____  

Modified: trunk/reactos/include/ndk/rtltypes.h
--- trunk/reactos/include/ndk/rtltypes.h	2005-06-19 19:56:01 UTC
(rev 16106)
+++ trunk/reactos/include/ndk/rtltypes.h	2005-06-19 20:01:07 UTC
(rev 16107)
@@ -49,15 +49,29 @@

 
 /* FUNCTION TYPES
************************************************************/
 typedef NTSTATUS
-(*PHEAP_ENUMERATION_ROUTINE)(IN PVOID HeapHandle,
-                             IN PVOID UserParam);
+(*PHEAP_ENUMERATION_ROUTINE)(
+    IN PVOID HeapHandle,
+    IN PVOID UserParam
+);
 
 typedef EXCEPTION_DISPOSITION 
-(*PEXCEPTION_HANDLER)(struct _EXCEPTION_RECORD*, 
-                      PVOID, 
-                      struct _CONTEXT*, 
-                      PVOID);
-                      
+(*PEXCEPTION_HANDLER)(
+    struct _EXCEPTION_RECORD*, 
+    PVOID, 
+    struct _CONTEXT*, 
+    PVOID
+);
+
+typedef DWORD (STDCALL *PTHREAD_START_ROUTINE)(
+    LPVOID Parameter
+);
+
+typedef VOID
+(STDCALL *PRTL_BASE_PROCESS_START_ROUTINE)(
+    PTHREAD_START_ROUTINE StartAddress,
+    PVOID Parameter
+);
+                        
 /* TYPES
*********************************************************************/
 
 typedef unsigned short RTL_ATOM;
  _____  

Modified: trunk/reactos/include/ndk/umtypes.h
--- trunk/reactos/include/ndk/umtypes.h	2005-06-19 19:56:01 UTC (rev
16106)
+++ trunk/reactos/include/ndk/umtypes.h	2005-06-19 20:01:07 UTC (rev
16107)
@@ -46,6 +46,17 @@

 #define NT_WARNING(x) ((ULONG)(x)>>30==2)
 #define NT_ERROR(x) ((ULONG)(x)>>30==3)
 
+/* Object Access Rights FIXME: Some are in w32api's psdk..,is that
normal ?*/
+#define DIRECTORY_QUERY (0x0001)
+#define DIRECTORY_TRAVERSE (0x0002)
+#define DIRECTORY_CREATE_OBJECT (0x0004)
+#define DIRECTORY_CREATE_SUBDIRECTORY (0x0008)
+#define DIRECTORY_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0xF)
+#define EVENT_QUERY_STATE (0x0001)
+#define SEMAPHORE_QUERY_STATE (0x0001)
+#define SYMBOLIC_LINK_QUERY 0x0001
+#define SYMBOLIC_LINK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x1)
+
 /* I/O Control Codes for communicating with Mailslots */
 #define FSCTL_MAILSLOT_PEEK             \
     CTL_CODE(FILE_DEVICE_MAILSLOT, 0, METHOD_NEITHER, FILE_READ_DATA)
@@ -709,6 +720,15 @@
 } FILE_BASIC_INFORMATION, *PFILE_BASIC_INFORMATION;
 
 /* Class 2 */
+typedef struct _FILE_STANDARD_INFORMATION
+{
+    LARGE_INTEGER AllocationSize;
+    LARGE_INTEGER EndOfFile;
+    ULONG NumberOfLinks;
+    BOOLEAN DeletePending;
+    BOOLEAN Directory;
+} FILE_STANDARD_INFORMATION, *PFILE_STANDARD_INFORMATION;
+
 typedef struct _FILE_NETWORK_OPEN_INFORMATION 
 {
     LARGE_INTEGER CreationTime;                                 
  _____  

Modified: trunk/reactos/include/ntdll/ntdll.h
--- trunk/reactos/include/ntdll/ntdll.h	2005-06-19 19:56:01 UTC (rev
16106)
+++ trunk/reactos/include/ntdll/ntdll.h	2005-06-19 20:01:07 UTC (rev
16107)
@@ -3,46 +3,15 @@

 #include <ntos/ntdef.h>
 #endif
 
-#define UNIMPLEMENTED DbgPrint("%s in %s:%d is
unimplemented\n",__FUNCTION__,__FILE__,__LINE__);
-
-#ifndef __USE_W32API
-
-#ifndef NASSERT
-#define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at
%s:%d\n", __FILE__,__LINE__); for(;;);}
-#define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at
%s:%d\n", __FILE__,__LINE__); for(;;);}
-#else
-#define assert(x)
-#define ASSERT(x)
-#endif
-
-#endif
-
 #ifdef NDEBUG
 #if defined(__GNUC__)
 #define TRACE_LDR(args...) if (RtlGetNtGlobalFlags() &
FLG_SHOW_LDR_SNAPS) { DbgPrint("(LDR:%s:%d) ",__FILE__,__LINE__);
DbgPrint(args); }
-#define DPRINT(args...)
 #else
-#define DPRINT
 #endif	/* __GNUC__ */
-#define CHECKPOINT
 #else
 #define TRACE_LDR(args...) do { DbgPrint("(LDR:%s:%d)
",__FILE__,__LINE__); DbgPrint(args); } while(0)
-#define DPRINT(args...) do { DbgPrint("(NTDLL:%s:%d)
",__FILE__,__LINE__); DbgPrint(args); } while(0)
-#define CHECKPOINT do { DbgPrint("(NTDLL:%s:%d)
Checkpoint\n",__FILE__,__LINE__); } while(0)
 #endif
 
-#ifdef DBG
-#if defined(__GNUC__)
-#define DPRINT1(args...) do { DbgPrint("(NTDLL:%s:%d)
",__FILE__,__LINE__); DbgPrint(args); } while(0)
-#else
-#define DPRINT1              DbgPrint("(NTDLL:%s:%d)
",__FILE__,__LINE__); DbgPrint
-#endif
-#define CHECKPOINT1 do { DbgPrint("(NTDLL:%s:%d)
Checkpoint\n",__FILE__,__LINE__); } while(0)
-#else
-#define DPRINT1(args...)
-#define CHECKPOINT1(args...)
-#endif
-
 /* Macros expanding to the appropriate inline assembly to raise a
breakpoint */
 #if defined(_M_IX86)
 #define ASM_BREAKPOINT "\nint $3\n"
  _____  

Modified: trunk/reactos/lib/ntdll/dbg/debug.c
--- trunk/reactos/lib/ntdll/dbg/debug.c	2005-06-19 19:56:01 UTC (rev
16106)
+++ trunk/reactos/lib/ntdll/dbg/debug.c	2005-06-19 20:01:07 UTC (rev
16107)
@@ -13,6 +13,7 @@

 
 #define NDEBUG
 #include <ntdll.h>
+#include <rosrtl/thread.h>
 
 /* FUNCTIONS
*****************************************************************/
 
  _____  

Modified: trunk/reactos/lib/ntdll/inc/ntdll.h
--- trunk/reactos/lib/ntdll/inc/ntdll.h	2005-06-19 19:56:01 UTC (rev
16106)
+++ trunk/reactos/lib/ntdll/inc/ntdll.h	2005-06-19 20:01:07 UTC (rev
16107)
@@ -19,6 +19,7 @@

 #include <ntdll/rtl.h>
 #include <ntdll/ldr.h>
 #include <ntdll/ntdll.h>
+#include <debug.h> /* FIXME REMOVE THIS */
 
 /* ROSRTL Headers */
 #include <rosrtl/string.h> /* FIXME: KILL ROSRTL */