[ros-diffs] [navaraf] 15950: Use W32API.

Use W32API.
Modified: trunk/reactos/lib/ntdll/csr/lpc.c
Modified: trunk/reactos/lib/ntdll/dbg/debug.c
Modified: trunk/reactos/lib/ntdll/ldr/res.c
Modified: trunk/reactos/lib/ntdll/ldr/startup.c
Modified: trunk/reactos/lib/ntdll/ldr/utils.c
Modified: trunk/reactos/lib/ntdll/ntdll.xml
Modified: trunk/reactos/lib/ntdll/rtl/apc.c
Modified: trunk/reactos/lib/ntdll/rtl/atom.c
Modified: trunk/reactos/lib/ntdll/rtl/callback.c
Modified: trunk/reactos/lib/ntdll/rtl/critical.c
Modified: trunk/reactos/lib/ntdll/rtl/dbgbuffer.c
Modified: trunk/reactos/lib/ntdll/rtl/exception.c
Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c
Modified: trunk/reactos/lib/ntdll/rtl/message.c
Modified: trunk/reactos/lib/ntdll/rtl/misc.c
Modified: trunk/reactos/lib/ntdll/rtl/path.c
Modified: trunk/reactos/lib/ntdll/rtl/process.c
Modified: trunk/reactos/lib/ntdll/rtl/rangelist.c
Modified: trunk/reactos/lib/ntdll/rtl/resource.c
Modified: trunk/reactos/lib/ntdll/stdio/sscanf.c
Modified: trunk/reactos/lib/ntdll/stdlib/mbstowcs.c
Modified: trunk/reactos/lib/ntdll/stdlib/wcstombs.c
  _____  

Modified: trunk/reactos/lib/ntdll/csr/lpc.c
--- trunk/reactos/lib/ntdll/csr/lpc.c	2005-06-17 07:59:43 UTC (rev
15949)
+++ trunk/reactos/lib/ntdll/csr/lpc.c	2005-06-17 08:00:30 UTC (rev
15950)
@@ -104,7 +104,7 @@

       return (STATUS_UNSUCCESSFUL);
     }
 
-   Request->Header.DataSize = Length - sizeof(LPC_MESSAGE);
+   Request->Header.DataSize = Length - LPC_MESSAGE_BASE_SIZE;
    Request->Header.MessageSize = Length;
 
    Status = NtRequestWaitReplyPort(WindowsApiPort,
  _____  

Modified: trunk/reactos/lib/ntdll/dbg/debug.c
--- trunk/reactos/lib/ntdll/dbg/debug.c	2005-06-17 07:59:43 UTC (rev
15949)
+++ trunk/reactos/lib/ntdll/dbg/debug.c	2005-06-17 08:00:30 UTC (rev
15950)
@@ -12,6 +12,7 @@

 /* INCLUDES
*****************************************************************/
 
 #include <ddk/ntddk.h>
+#include <ntos.h>
 #include <ntdll/rtl.h>
 #include <rosrtl/string.h>
 #include <rosrtl/thread.h>
  _____  

Modified: trunk/reactos/lib/ntdll/ldr/res.c
--- trunk/reactos/lib/ntdll/ldr/res.c	2005-06-17 07:59:43 UTC (rev
15949)
+++ trunk/reactos/lib/ntdll/ldr/res.c	2005-06-17 08:00:30 UTC (rev
15950)
@@ -25,11 +25,12 @@

 
 #include <reactos/config.h>
 #include <ddk/ntddk.h>
+#include <ntos.h>
+#include <ntos/ldrtypes.h>
 #include <windows.h>
 #include <string.h>
 #include <wchar.h>
 #include <ntdll/ldr.h>
-#include <ntos/minmax.h>
 
 #define NDEBUG
 #include <ntdll/ntdll.h>
  _____  

Modified: trunk/reactos/lib/ntdll/ldr/startup.c
--- trunk/reactos/lib/ntdll/ldr/startup.c	2005-06-17 07:59:43 UTC
(rev 15949)
+++ trunk/reactos/lib/ntdll/ldr/startup.c	2005-06-17 08:00:30 UTC
(rev 15950)
@@ -32,8 +32,8 @@

 
 extern unsigned int _image_base__;
 
-static CRITICAL_SECTION PebLock;
-static CRITICAL_SECTION LoaderLock;
+static RTL_CRITICAL_SECTION PebLock;
+static RTL_CRITICAL_SECTION LoaderLock;
 static RTL_BITMAP TlsBitMap;
 PLDR_MODULE ExeModule;
 
  _____  

Modified: trunk/reactos/lib/ntdll/ldr/utils.c
--- trunk/reactos/lib/ntdll/ldr/utils.c	2005-06-17 07:59:43 UTC (rev
15949)
+++ trunk/reactos/lib/ntdll/ldr/utils.c	2005-06-17 08:00:30 UTC (rev
15950)
@@ -21,11 +21,12 @@

 
 #include <reactos/config.h>
 #include <ddk/ntddk.h>
+#include <ntos.h>
 #include <windows.h>
 #include <string.h>
 #include <wchar.h>
 #include <ntdll/ldr.h>
-#include <ntos/minmax.h>
+#include <ntdll/rtl.h>
 
 #define LDRP_PROCESS_CREATION_TIME 0x8000000
 
@@ -264,7 +265,7 @@
                                                               TRUE,
 
IMAGE_DIRECTORY_ENTRY_TLS,
                                                               NULL);
-               assert(Module->TlsIndex < LdrpTlsCount);
+               ASSERT(Module->TlsIndex < LdrpTlsCount);
                TlsData = &LdrpTlsArray[Module->TlsIndex];
                TlsData->StartAddressOfRawData =
(PVOID)TlsDirectory->StartAddressOfRawData;
                TlsData->TlsDataSize = TlsDirectory->EndAddressOfRawData
- TlsDirectory->StartAddressOfRawData;
@@ -466,7 +467,7 @@
   PLDR_MODULE Module;
 
   Module = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof
(LDR_MODULE));
-  assert(Module);
+  ASSERT(Module);
   memset(Module, 0, sizeof(LDR_MODULE));
   Module->BaseAddress = (PVOID)ImageBase;
   Module->EntryPoint = NTHeaders->OptionalHeader.AddressOfEntryPoint;
@@ -2076,7 +2077,7 @@
         DPRINT("Mapped %wZ at %x\n", &FullDosName, ImageBase);
         if (MappedAsDataFile)
           {
-            assert(NULL != BaseAddress);
+            ASSERT(NULL != BaseAddress);
             if (NULL != BaseAddress)
               {
                 *BaseAddress = (PVOID) ((char *) *BaseAddress + 1);
  _____  

Modified: trunk/reactos/lib/ntdll/ntdll.xml
--- trunk/reactos/lib/ntdll/ntdll.xml	2005-06-17 07:59:43 UTC (rev
15949)
+++ trunk/reactos/lib/ntdll/ntdll.xml	2005-06-17 08:00:30 UTC (rev
15950)
@@ -3,6 +3,9 @@

 	<importlibrary definition="def/ntdll.def" />
 	<define name="__NTDLL__" />
 	<define name="_DISABLE_TIDENTS" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_WINNT">0x0502</define>
+	<define name="_NTOSKRNL_" />
 	<library>rtl</library>
 	<library>rosrtl</library>
 	<library>string</library>
  _____  

Modified: trunk/reactos/lib/ntdll/rtl/apc.c
--- trunk/reactos/lib/ntdll/rtl/apc.c	2005-06-17 07:59:43 UTC (rev
15949)
+++ trunk/reactos/lib/ntdll/rtl/apc.c	2005-06-17 08:00:30 UTC (rev
15950)
@@ -26,7 +26,7 @@

 
 /* INCLUDES
*****************************************************************/
 
-#include <ddk/ntddk.h>
+#include <ntos.h>
 #include <string.h>
 #include <debug.h>
 
  _____  

Modified: trunk/reactos/lib/ntdll/rtl/atom.c
--- trunk/reactos/lib/ntdll/rtl/atom.c	2005-06-17 07:59:43 UTC (rev
15949)
+++ trunk/reactos/lib/ntdll/rtl/atom.c	2005-06-17 08:00:30 UTC (rev
15950)
@@ -11,7 +11,7 @@

 
 /* INCLUDES
*****************************************************************/
 
-#include <ddk/ntddk.h>
+#include <ntos.h>
 #include <ntdll/rtl.h>
 #include <ntos/heap.h>
 
@@ -653,11 +653,11 @@
 {
    AtomTable->Lock = RtlAllocateHeap(RtlGetProcessHeap(),
 				     HEAP_ZERO_MEMORY,
-				     sizeof(CRITICAL_SECTION));
+				     sizeof(RTL_CRITICAL_SECTION));
    if (AtomTable->Lock == NULL)
      return STATUS_NO_MEMORY;
 
-   RtlInitializeCriticalSection((PCRITICAL_SECTION)AtomTable->Lock);
+
RtlInitializeCriticalSection((PRTL_CRITICAL_SECTION)AtomTable->Lock);
 
    return STATUS_SUCCESS;
 }
@@ -668,7 +668,7 @@
 {
    if (AtomTable->Lock)
      {
-	RtlDeleteCriticalSection((PCRITICAL_SECTION)AtomTable->Lock);
+
RtlDeleteCriticalSection((PRTL_CRITICAL_SECTION)AtomTable->Lock);
 	RtlFreeHeap(RtlGetProcessHeap(),
 		    0,
 		    AtomTable->Lock);
@@ -680,7 +680,7 @@
 static BOOLEAN
 RtlpLockAtomTable(PRTL_ATOM_TABLE AtomTable)
 {
-   RtlEnterCriticalSection((PCRITICAL_SECTION)AtomTable->Lock);
+   RtlEnterCriticalSection((PRTL_CRITICAL_SECTION)AtomTable->Lock);
    return TRUE;
 }
 
@@ -688,7 +688,7 @@
 static VOID
 RtlpUnlockAtomTable(PRTL_ATOM_TABLE AtomTable)
 {
-   RtlLeaveCriticalSection((PCRITICAL_SECTION)AtomTable->Lock);
+   RtlLeaveCriticalSection((PRTL_CRITICAL_SECTION)AtomTable->Lock);
 }
 
 
  _____  

Modified: trunk/reactos/lib/ntdll/rtl/callback.c
--- trunk/reactos/lib/ntdll/rtl/callback.c	2005-06-17 07:59:43 UTC
(rev 15949)
+++ trunk/reactos/lib/ntdll/rtl/callback.c	2005-06-17 08:00:30 UTC
(rev 15950)
@@ -9,15 +9,15 @@

 
 /* INCLUDES
*****************************************************************/
 
-#include <ddk/ntddk.h>
+#include <ntos.h>
 #include <string.h>
 #include <napi/teb.h>
 
 
 /* TYPES
*********************************************************************/
 
-typedef NTSTATUS STDCALL_FUNC (*CALLBACK_FUNCTION)(PVOID Argument,
-					      ULONG ArgumentLength);
+typedef NTSTATUS (STDCALL *KERNEL_CALLBACK_FUNCTION)(PVOID Argument,
+                                                    ULONG
ArgumentLength);
 
 /* FUNCTIONS
*****************************************************************/
 
@@ -28,10 +28,10 @@
 {
    PPEB Peb;
    NTSTATUS Status;
-   CALLBACK_FUNCTION Callback;
+   KERNEL_CALLBACK_FUNCTION Callback;
 
    Peb = NtCurrentPeb();
-   Callback =
(CALLBACK_FUNCTION)Peb->KernelCallbackTable[RoutineIndex];
+   Callback =
(KERNEL_CALLBACK_FUNCTION)Peb->KernelCallbackTable[RoutineIndex];
    Status = Callback(Argument, ArgumentLength);
    ZwCallbackReturn(NULL, 0, Status);
 }
  _____  

Modified: trunk/reactos/lib/ntdll/rtl/critical.c
--- trunk/reactos/lib/ntdll/rtl/critical.c	2005-06-17 07:59:43 UTC
(rev 15949)
+++ trunk/reactos/lib/ntdll/rtl/critical.c	2005-06-17 08:00:30 UTC
(rev 15950)
@@ -12,9 +12,9 @@

 
 /* INCLUDES
******************************************************************/
 
-#include <ddk/ntddk.h>
+#include <windows.h>
+#include <ntos.h>
 #include <ntdll/rtl.h>
-#include <ntos/synch.h>
 
 #define NDEBUG
 #include <ntdll/ntdll.h>
  _____  

Modified: trunk/reactos/lib/ntdll/rtl/dbgbuffer.c
--- trunk/reactos/lib/ntdll/rtl/dbgbuffer.c	2005-06-17 07:59:43 UTC
(rev 15949)
+++ trunk/reactos/lib/ntdll/rtl/dbgbuffer.c	2005-06-17 08:00:30 UTC
(rev 15950)
@@ -36,7 +36,7 @@

 #include <napi/teb.h>
 #include <ntdll/rtl.h>
 #include <ntdll/ldr.h>
-#include <ddk/ntddk.h>
+#include <ntos.h>
 
 #include <rosrtl/thread.h>
 
  _____  

Modified: trunk/reactos/lib/ntdll/rtl/exception.c
--- trunk/reactos/lib/ntdll/rtl/exception.c	2005-06-17 07:59:43 UTC
(rev 15949)
+++ trunk/reactos/lib/ntdll/rtl/exception.c	2005-06-17 08:00:30 UTC
(rev 15950)
@@ -14,15 +14,16 @@

 
 /* INCLUDES
*****************************************************************/
 
-#include <ddk/ntddk.h>
+#include <ntos.h>
 #include <windows.h>
 #include <string.h>
+#include <ntdll/rtl.h>
 #include <napi/teb.h>
 
 #define NDEBUG
 #include <debug.h>
 
-static CRITICAL_SECTION RtlpVectoredExceptionLock;
+static RTL_CRITICAL_SECTION RtlpVectoredExceptionLock;
 static LIST_ENTRY RtlpVectoredExceptionHead;
 
 typedef struct _RTL_VECTORED_EXCEPTION_HANDLER
  _____  

Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c
--- trunk/reactos/lib/ntdll/rtl/libsupp.c	2005-06-17 07:59:43 UTC
(rev 15949)
+++ trunk/reactos/lib/ntdll/rtl/libsupp.c	2005-06-17 08:00:30 UTC
(rev 15950)
@@ -9,7 +9,7 @@

  *
  */
 
-#include <ddk/ntddk.h>
+#include <ntos.h>
 #include <ntdll/rtl.h>
 #include <ctype.h>
 #include <ntos/minmax.h>
  _____  

Modified: trunk/reactos/lib/ntdll/rtl/message.c
--- trunk/reactos/lib/ntdll/rtl/message.c	2005-06-17 07:59:43 UTC
(rev 15949)
+++ trunk/reactos/lib/ntdll/rtl/message.c	2005-06-17 08:00:30 UTC
(rev 15950)
@@ -11,7 +11,9 @@

 
 /* INCLUDES
*****************************************************************/
 
-#include <ddk/ntddk.h>
+#include <ntos.h>
+#include <ntos/ldrtypes.h>
+#include <ddk/ldrfuncs.h>
 
 #define NDEBUG
 #include <ntdll/ntdll.h>
  _____  

Modified: trunk/reactos/lib/ntdll/rtl/misc.c
--- trunk/reactos/lib/ntdll/rtl/misc.c	2005-06-17 07:59:43 UTC (rev
15949)
+++ trunk/reactos/lib/ntdll/rtl/misc.c	2005-06-17 08:00:30 UTC (rev
15950)
@@ -12,7 +12,7 @@

 /* INCLUDES
*****************************************************************/
 
 #include <windows.h>
-#include <ddk/ntddk.h>
+#include <ntos.h>
 #include <ntdll/rtl.h>
 
 #define NDEBUG
  _____  

Modified: trunk/reactos/lib/ntdll/rtl/path.c
--- trunk/reactos/lib/ntdll/rtl/path.c	2005-06-17 07:59:43 UTC (rev
15949)
+++ trunk/reactos/lib/ntdll/rtl/path.c	2005-06-17 08:00:30 UTC (rev
15950)
@@ -10,14 +10,12 @@

 
 /* INCLUDES
******************************************************************/
 
-#include <ddk/ntddk.h>
+#include <ntos.h>
 #include <ntdll/rtl.h>
 #include <ntos/minmax.h>
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <base.h>
-#include <ddk/obfuncs.h>
 
 #define NDEBUG
 #include <ntdll/ntdll.h>
  _____  

Modified: trunk/reactos/lib/ntdll/rtl/process.c
--- trunk/reactos/lib/ntdll/rtl/process.c	2005-06-17 07:59:43 UTC
(rev 15949)
+++ trunk/reactos/lib/ntdll/rtl/process.c	2005-06-17 08:00:30 UTC
(rev 15950)
@@ -11,7 +11,7 @@

 
 /* INCLUDES
****************************************************************/
 
-#include <ddk/ntddk.h>
+#include <ntos.h>
 #include <windows.h>
 #include <napi/i386/segment.h>
 #include <ntdll/ldr.h>
  _____  

Modified: trunk/reactos/lib/ntdll/rtl/rangelist.c
--- trunk/reactos/lib/ntdll/rtl/rangelist.c	2005-06-17 07:59:43 UTC
(rev 15949)
+++ trunk/reactos/lib/ntdll/rtl/rangelist.c	2005-06-17 08:00:30 UTC
(rev 15950)
@@ -26,7 +26,8 @@

 
 /* INCLUDES
****************************************************************/
 
-#include <ddk/ntddk.h>
+#include <ntos.h>
+#include <ntdll/rtl.h>
 
 #define NDEBUG
 #include <ntdll/ntdll.h>
  _____  

Modified: trunk/reactos/lib/ntdll/rtl/resource.c
--- trunk/reactos/lib/ntdll/rtl/resource.c	2005-06-17 07:59:43 UTC
(rev 15949)
+++ trunk/reactos/lib/ntdll/rtl/resource.c	2005-06-17 08:00:30 UTC
(rev 15950)
@@ -18,9 +18,8 @@

  * The code is based on information published in WDJ January 1999
issue.
  */
 
-#include <ddk/ntddk.h>
+#include <ntos.h>
 #include <ntdll/rtl.h>
-#include <ntos/synch.h>
 
 #define NDEBUG
 #include <ntdll/ntdll.h>
  _____  

Modified: trunk/reactos/lib/ntdll/stdio/sscanf.c
--- trunk/reactos/lib/ntdll/stdio/sscanf.c	2005-06-17 07:59:43 UTC
(rev 15949)
+++ trunk/reactos/lib/ntdll/stdio/sscanf.c	2005-06-17 08:00:30 UTC
(rev 15950)
@@ -1,8 +1,8 @@

 /**/
 
 #include <stdio.h>
-#include <ddk/ntddk.h>
-#include <ntos/heap.h>
+#include <ntos.h>
+#include <ntdll/rtl.h>
 
 #define NDEBUG
 #include <ntdll/ntdll.h>
  _____  

Modified: trunk/reactos/lib/ntdll/stdlib/mbstowcs.c
--- trunk/reactos/lib/ntdll/stdlib/mbstowcs.c	2005-06-17 07:59:43 UTC
(rev 15949)
+++ trunk/reactos/lib/ntdll/stdlib/mbstowcs.c	2005-06-17 08:00:30 UTC
(rev 15950)
@@ -6,7 +6,7 @@

  * PURPOSE:         converts a multi byte string to a unicode string
  */
 
-#include <ddk/ntddk.h>
+#include <ntos.h>
 #include <stdlib.h>
 #include <string.h>
 
  _____  

Modified: trunk/reactos/lib/ntdll/stdlib/wcstombs.c
--- trunk/reactos/lib/ntdll/stdlib/wcstombs.c	2005-06-17 07:59:43 UTC
(rev 15949)
+++ trunk/reactos/lib/ntdll/stdlib/wcstombs.c	2005-06-17 08:00:30 UTC
(rev 15950)
@@ -6,7 +6,7 @@

  * PURPOSE:         converts a unicode string to a multi byte string
  */
 
-#include <ddk/ntddk.h>
+#include <ntos.h>
 #include <stdlib.h>
 #include <string.h>