[ros-diffs] [sginsberg] 35032: - Clean up ntdll a bit

Author: sginsberg
Date: Sat Aug  2 07:46:02 2008
New Revision: 35032

URL: http://svn.reactos.org/svn/reactos?rev=35032&view=rev
Log:
- Clean up ntdll a bit

Added:
    trunk/reactos/dll/ntdll/dispatch/   (props changed)
      - copied from r35027, trunk/reactos/dll/ntdll/main/
    trunk/reactos/dll/ntdll/include/   (props changed)
      - copied from r35027, trunk/reactos/dll/ntdll/inc/
Removed:
    trunk/reactos/dll/ntdll/inc/
    trunk/reactos/dll/ntdll/main/
Modified:
    trunk/reactos/dll/ntdll/csr/capture.c
    trunk/reactos/dll/ntdll/dispatch/dispatch.c
    trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S
    trunk/reactos/dll/ntdll/include/ntdll.h
    trunk/reactos/dll/ntdll/include/ntdllp.h
    trunk/reactos/dll/ntdll/ldr/elf.c
    trunk/reactos/dll/ntdll/ldr/startup.c
    trunk/reactos/dll/ntdll/ldr/utils.c
    trunk/reactos/dll/ntdll/ntdll.rbuild
    trunk/reactos/dll/ntdll/rtl/version.c

Modified: trunk/reactos/dll/ntdll/csr/capture.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/capture.c?re…
==============================================================================
--- trunk/reactos/dll/ntdll/csr/capture.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/csr/capture.c [iso-8859-1] Sat Aug  2 07:46:02 2008
@@ -2,7 +2,7 @@
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            lib/ntdll/csr/capture.c
- * PURPOSE:         routines for probing and capturing CSR API Messages
+ * PURPOSE:         Routines for probing and capturing CSR API Messages
  * PROGRAMMER:      Alex Ionescu (alex(a)relsoft.net)
  */
 

Propchange: trunk/reactos/dll/ntdll/dispatch/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug  2 07:46:02 2008
@@ -1,0 +1,7 @@
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
+*.ncb
+*.suo
+*.sln

Propchange: trunk/reactos/dll/ntdll/dispatch/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: trunk/reactos/dll/ntdll/dispatch/dispatch.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/dispatc…
==============================================================================
--- trunk/reactos/dll/ntdll/dispatch/dispatch.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/dispatch/dispatch.c [iso-8859-1] Sat Aug  2 07:46:02 2008
@@ -1,6 +1,7 @@
-/* COPYRIGHT:       See COPYING in the top level directory
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS NT Library
- * FILE:            lib/ntdll/main/dispatch.c
+ * FILE:            dll/ntdll/dispatch/dispatch.c
  * PURPOSE:         User-Mode NT Dispatchers
  * PROGRAMERS:      Alex Ionescu (alex(a)relsoft.net)
  *                  David Welch <welch(a)cwcom.net>

Modified: trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/i386/di…
==============================================================================
--- trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S [iso-8859-1] Sat Aug  2 07:46:02
2008
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS NT Library
- * FILE:            lib/ntdll/main/i386/dispatch.S
+ * FILE:            dl/ntdll/dispatch/i386/dispatch.S
  * PURPOSE:         User-Mode NT Dispatchers
  * PROGRAMMERS:     Alex Ionescu (alex(a)relsoft.net)
  */

Propchange: trunk/reactos/dll/ntdll/include/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug  2 07:46:02 2008
@@ -1,0 +1,7 @@
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
+*.ncb
+*.suo
+*.sln

Propchange: trunk/reactos/dll/ntdll/include/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: trunk/reactos/dll/ntdll/include/ntdll.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdll.h?…
==============================================================================
--- trunk/reactos/dll/ntdll/include/ntdll.h [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/include/ntdll.h [iso-8859-1] Sat Aug  2 07:46:02 2008
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS System Libraries
- * FILE:            lib/ntdll/inc/ntdll.h
+ * FILE:            dll/ntdll/include/ntdll.h
  * PURPOSE:         Native Libary Header
  * PROGRAMMER:      Alex Ionescu (alex(a)relsoft.net)
  */

Modified: trunk/reactos/dll/ntdll/include/ntdllp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h…
==============================================================================
--- trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] Sat Aug  2 07:46:02 2008
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS System Libraries
- * FILE:            lib/ntdll/inc/ntdllp.h
+ * FILE:            dll/ntdll/include/ntdllp.h
  * PURPOSE:         Native Libary Internal Header
  * PROGRAMMER:      Alex Ionescu (alex(a)relsoft.net)
  */

Modified: trunk/reactos/dll/ntdll/ldr/elf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/elf.c?rev=35…
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/elf.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/elf.c [iso-8859-1] Sat Aug  2 07:46:02 2008
@@ -1,6 +1,3 @@
-/* $Id$
-*/
-
 /*
  * REACTOS ELF LOADER
  *
@@ -35,6 +32,7 @@
  *
  * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.101 2004/11/02 09:42:21 ssouhlal Exp $
  */
+
 
 /*
  * Dynamic linker for ELF.

Modified: trunk/reactos/dll/ntdll/ldr/startup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re…
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Sat Aug  2 07:46:02 2008
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            lib/ntdll/ldr/startup.c

Modified: trunk/reactos/dll/ntdll/ldr/utils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=…
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Sat Aug  2 07:46:02 2008
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            lib/ntdll/ldr/utils.c

Modified: trunk/reactos/dll/ntdll/ntdll.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev…
==============================================================================
--- trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] Sat Aug  2 07:46:02 2008
@@ -4,8 +4,8 @@
 	<module name="ntdll" type="win32dll" entrypoint="0"
baseaddress="${BASEADDRESS_NTDLL}" installbase="system32"
installname="ntdll.dll">
 		<bootstrap installbase="$(CDOUTPUT)/system32" />
 		<importlibrary definition="def/ntdll_$(ARCH).def" />
-		<include base="ntdll">inc</include>
-		<include base="ntdll"
root="intermediate">def</include>
+		<include base="ntdll">include</include>
+		<include base="ntdll" root="intermediate"></include>
 		<include base="ReactOS">include/reactos/subsys</include>
 		<define name="__NTDLL__" />
 		<define name="_DISABLE_TIDENTS" />
@@ -25,11 +25,7 @@
 		<directory name="dbg">
 			<file>dbgui.c</file>
 		</directory>
-		<directory name="ldr">
-			<file>startup.c</file>
-			<file>utils.c</file>
-		</directory>
-		<directory name="main">
+		<directory name="dispatch">
 			<if property="ARCH" value="i386">
 				<directory name="i386">
 					<file>dispatch.S</file>
@@ -44,6 +40,13 @@
 				<file>dispatch.c</file>
 			</ifnot>
 		</directory>
+		<directory name="include">
+			<pch>ntdll.h</pch>
+		</directory>
+		<directory name="ldr">
+			<file>startup.c</file>
+			<file>utils.c</file>
+		</directory>
 		<directory name="rtl">
 			<file>libsupp.c</file>
 			<file>version.c</file>
@@ -51,8 +54,5 @@
 		<directory name="def">
 			<file>ntdll.rc</file>
 		</directory>
-		<directory name="inc">
-			<pch>ntdll.h</pch>
-		</directory>
 	</module>
 </group>

Modified: trunk/reactos/dll/ntdll/rtl/version.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/version.c?re…
==============================================================================
--- trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] Sat Aug  2 07:46:02 2008
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/ntdll/rtl/process.c