Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 15999: Use NTDLL Common Header.
by ion＠svn.reactos.com 17 Jun '05

17 Jun '05

Use NTDLL Common Header. Modified: trunk/reactos/lib/ntdll/csr/capture.c Modified: trunk/reactos/lib/ntdll/csr/lpc.c Modified: trunk/reactos/lib/ntdll/csr/probe.c Modified: trunk/reactos/lib/ntdll/csr/thread.c Modified: trunk/reactos/lib/ntdll/dbg/brkpoint.c Modified: trunk/reactos/lib/ntdll/dbg/debug.c Modified: trunk/reactos/lib/ntdll/dbg/print.c Modified: trunk/reactos/lib/ntdll/ldr/elf.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/main/dllmain.c 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/crc32.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/handle.c Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c Modified: trunk/reactos/lib/ntdll/rtl/math.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/propvar.c Modified: trunk/reactos/lib/ntdll/rtl/rangelist.c Modified: trunk/reactos/lib/ntdll/rtl/resource.c Modified: trunk/reactos/lib/ntdll/rtl/teb.c Modified: trunk/reactos/lib/ntdll/rtl/timerqueue.c Modified: trunk/reactos/lib/ntdll/rtl/trace.c Modified: trunk/reactos/lib/ntdll/stdio/sprintf.c Modified: trunk/reactos/lib/ntdll/stdio/sscanf.c Modified: trunk/reactos/lib/ntdll/stdio/swprintf.c Modified: trunk/reactos/lib/ntdll/stdlib/mbstowcs.c Modified: trunk/reactos/lib/ntdll/stdlib/wcstombs.c Modified: trunk/reactos/lib/ntdll/string/wstring.c _____ Modified: trunk/reactos/lib/ntdll/csr/capture.c --- trunk/reactos/lib/ntdll/csr/capture.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/csr/capture.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -8,14 +8,8 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntdll/csr.h> -#include <string.h> - -#include <csrss/csrss.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h> /* GLOBALS *******************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/csr/lpc.c --- trunk/reactos/lib/ntdll/csr/lpc.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/csr/lpc.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -13,15 +13,8 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntdll/csr.h> -#include <string.h> -#include <rosrtl/string.h> - -#include <csrss/csrss.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h> /* GLOBALS *******************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/csr/probe.c --- trunk/reactos/lib/ntdll/csr/probe.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/csr/probe.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -7,11 +7,9 @@ * AUTHOR: Eric Kohl * DATE: 2001-06-17 */ -#define NTOS_MODE_USER -#include <ntos.h> - + #define NDEBUG -#include <ntdll/rtl.h> +#include <ntdll.h> /* * @implemented _____ Modified: trunk/reactos/lib/ntdll/csr/thread.c --- trunk/reactos/lib/ntdll/csr/thread.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/csr/thread.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -5,16 +5,9 @@ * FILE: lib/ntdll/csr/propvar.c * PURPOSE: CSRSS threads API */ -#define NTOS_MODE_USER -#include <ntos.h> -#include <ntdll/csr.h> -#include <string.h> - -#include <csrss/csrss.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h> /* * @implemented _____ Modified: trunk/reactos/lib/ntdll/dbg/brkpoint.c --- trunk/reactos/lib/ntdll/dbg/brkpoint.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/dbg/brkpoint.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -11,8 +11,8 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <debug.h> +#define NDEBUG +#include <ntdll.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/dbg/debug.c --- trunk/reactos/lib/ntdll/dbg/debug.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/dbg/debug.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -11,12 +11,8 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntos.h> -#include <ntdll/rtl.h> -#include <rosrtl/string.h> -#include <rosrtl/thread.h> -#include <ntdll/dbg.h> +#define NDEBUG +#include <ntdll.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/dbg/print.c --- trunk/reactos/lib/ntdll/dbg/print.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/dbg/print.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -9,12 +9,9 @@ * Created 28/12/1999 */ -#include <ddk/ntddk.h> -#include <stdarg.h> -#include <stdio.h> -#include <string.h> +#define NDEBUG +#include <ntdll.h> - /* FUNCTIONS ***************************************************************/ ULONG DbgService (ULONG Service, PVOID Context1, PVOID Context2); _____ Modified: trunk/reactos/lib/ntdll/ldr/elf.c --- trunk/reactos/lib/ntdll/ldr/elf.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/ldr/elf.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -42,6 +42,9 @@ * John Polstra <jdp(a)polstra.com>. */ +#define NDEBUG +#include <ntdll.h> + #if 0 #ifndef __GNUC__ _____ Modified: trunk/reactos/lib/ntdll/ldr/res.c --- trunk/reactos/lib/ntdll/ldr/res.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/ldr/res.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -23,17 +23,8 @@ /* INCLUDES *****************************************************************/ -#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> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h> /* PROTOTYPES ****************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/ldr/startup.c --- trunk/reactos/lib/ntdll/ldr/startup.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/ldr/startup.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -10,20 +10,10 @@ /* INCLUDES *****************************************************************/ -#include <reactos/config.h> -#include <ddk/ntddk.h> -#include <windows.h> -#include <ntdll/ldr.h> -#include <ntdll/rtl.h> -#include <csrss/csrss.h> -#include <ntdll/csr.h> +#define NDEBUG +#include <ntdll.h> #include <user32/callback.h> -#include <rosrtl/string.h> -#define NDEBUG -#include <ntdll/ntdll.h> - - VOID RtlInitializeHeapManager (VOID); VOID LdrpInitLoader(VOID); _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -19,22 +19,11 @@ /* INCLUDES *****************************************************************/ -#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 <ntdll/rtl.h> +#define NDEBUG +#include <ntdll.h> #define LDRP_PROCESS_CREATION_TIME 0x8000000 -#ifdef DBG_NTDLL_LDR_UTILS -#define NDEBUG -#endif -#include <ntdll/ntdll.h> - /* GLOBALS *******************************************************************/ typedef struct _TLS_DATA _____ Modified: trunk/reactos/lib/ntdll/main/dllmain.c --- trunk/reactos/lib/ntdll/main/dllmain.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/main/dllmain.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -7,11 +7,8 @@ * PROGRAMMER: */ -#include <ddk/ntddk.h> -#include <stdarg.h> -#include <stdio.h> -#include <ntdll/ntdll.h> -#include <windows.h> +#define NDEBUG +#include <ntdll.h> BOOL WINAPI DllMainCRTStartup(HINSTANCE hinstDll, DWORD fdwReason, _____ Modified: trunk/reactos/lib/ntdll/rtl/apc.c --- trunk/reactos/lib/ntdll/rtl/apc.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/apc.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -26,9 +26,8 @@ /* INCLUDES *****************************************************************/ -#include <ntos.h> -#include <string.h> -#include <debug.h> +#define NDEBUG +#include <ntdll.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/atom.c --- trunk/reactos/lib/ntdll/rtl/atom.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/atom.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -11,14 +11,9 @@ /* INCLUDES *****************************************************************/ -#include <ntos.h> -#include <ntdll/rtl.h> -#include <ntos/heap.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h> - /* LOCAL TYPES ***************************************************************/ typedef struct _RTL_ATOM_ENTRY _____ Modified: trunk/reactos/lib/ntdll/rtl/callback.c --- trunk/reactos/lib/ntdll/rtl/callback.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/callback.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -9,11 +9,8 @@ /* INCLUDES *****************************************************************/ -#include <ntos.h> -#include <string.h> -#include <napi/teb.h> - - +#define NDEBUG +#include <ntdll.h> /* TYPES *********************************************************************/ typedef NTSTATUS (STDCALL *KERNEL_CALLBACK_FUNCTION)(PVOID Argument, _____ Modified: trunk/reactos/lib/ntdll/rtl/crc32.c --- trunk/reactos/lib/ntdll/rtl/crc32.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/crc32.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -17,9 +17,8 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> - +#define NDEBUG +#include <ntdll.h> /* FUNCTIONS ****************************************************************/ /* CRC polynomial 0xedb88320 */ _____ Modified: trunk/reactos/lib/ntdll/rtl/critical.c --- trunk/reactos/lib/ntdll/rtl/critical.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/critical.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -12,12 +12,9 @@ /* INCLUDES ******************************************************************/ -#include <windows.h> -#include <ntos.h> #include <ntdll/rtl.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/dbgbuffer.c --- trunk/reactos/lib/ntdll/rtl/dbgbuffer.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/dbgbuffer.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -31,17 +31,8 @@ /* INCLUDES *****************************************************************/ -#include <windows.h> -#include <ntos/types.h> -#include <napi/teb.h> -#include <ntdll/rtl.h> -#include <ntdll/ldr.h> -#include <ntos.h> - -#include <rosrtl/thread.h> - #define NDEBUG -#include <debug.h> +#include <ntdll.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/exception.c --- trunk/reactos/lib/ntdll/rtl/exception.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/exception.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -14,14 +14,8 @@ /* INCLUDES *****************************************************************/ -#include <ntos.h> -#include <windows.h> -#include <string.h> -#include <ntdll/rtl.h> -#include <napi/teb.h> - #define NDEBUG -#include <debug.h> +#include <ntdll.h> static RTL_CRITICAL_SECTION RtlpVectoredExceptionLock; static LIST_ENTRY RtlpVectoredExceptionHead; _____ Modified: trunk/reactos/lib/ntdll/rtl/handle.c --- trunk/reactos/lib/ntdll/rtl/handle.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/handle.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -9,11 +9,8 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c --- trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -9,13 +9,8 @@ * */ -#include <ntos.h> -#include <ntdll/rtl.h> -#include <ctype.h> -#include <ntos/minmax.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/math.c --- trunk/reactos/lib/ntdll/rtl/math.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/math.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -17,8 +17,9 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#define NDEBUG +#include <ntdll.h> - double atan (double __x); double ceil (double __x); double cos (double __x); _____ Modified: trunk/reactos/lib/ntdll/rtl/message.c --- trunk/reactos/lib/ntdll/rtl/message.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/message.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -11,14 +11,10 @@ /* INCLUDES *****************************************************************/ -#include <ntos.h> -#include <ntos/ldrtypes.h> +#define NDEBUG +#include <ntdll.h> #include <ddk/ldrfuncs.h> -#define NDEBUG -#include <ntdll/ntdll.h> - - /* FUNCTIONS *****************************************************************/ /* _____ Modified: trunk/reactos/lib/ntdll/rtl/misc.c --- trunk/reactos/lib/ntdll/rtl/misc.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/misc.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -11,12 +11,8 @@ /* INCLUDES *****************************************************************/ -#include <windows.h> -#include <ntos.h> -#include <ntdll/rtl.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h> /********************************************************************** * NAME EXPORTED _____ Modified: trunk/reactos/lib/ntdll/rtl/path.c --- trunk/reactos/lib/ntdll/rtl/path.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/path.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -10,15 +10,8 @@ /* INCLUDES ******************************************************************/ -#include <ntos.h> -#include <ntdll/rtl.h> -#include <ntos/minmax.h> -#include <string.h> -#include <stdio.h> -#include <ctype.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h> /* DEFINITONS and MACROS ******************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/process.c --- trunk/reactos/lib/ntdll/rtl/process.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/process.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -11,15 +11,8 @@ /* INCLUDES ****************************************************************/ -#include <ntos.h> -#include <windows.h> -#include <napi/i386/segment.h> -#include <ntdll/ldr.h> -#include <ntdll/base.h> -#include <ntdll/rtl.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/propvar.c --- trunk/reactos/lib/ntdll/rtl/propvar.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/propvar.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -5,8 +5,8 @@ * FILE: lib/ntdll/csr/propvar.c * PURPOSE: CSRSS properties and variants API */ -#define NTOS_MODE_USER -#include <ntos.h> +#define NDEBUG +#include <ntdll.h> /* * @unimplemented _____ Modified: trunk/reactos/lib/ntdll/rtl/rangelist.c --- trunk/reactos/lib/ntdll/rtl/rangelist.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/rangelist.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -26,14 +26,9 @@ /* INCLUDES ****************************************************************/ -#include <ntos.h> -#include <ntdll/rtl.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h> -#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) - typedef struct _RTL_RANGE_ENTRY { LIST_ENTRY Entry; _____ Modified: trunk/reactos/lib/ntdll/rtl/resource.c --- trunk/reactos/lib/ntdll/rtl/resource.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/resource.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -18,11 +18,8 @@ * The code is based on information published in WDJ January 1999 issue. */ -#include <ntos.h> -#include <ntdll/rtl.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/teb.c --- trunk/reactos/lib/ntdll/rtl/teb.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/teb.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -6,8 +6,8 @@ * PURPOSE: */ -#include <ddk/ntddk.h> -#include <napi/teb.h> +#define NDEBUG +#include <ntdll.h> PTEB STDCALL _____ Modified: trunk/reactos/lib/ntdll/rtl/timerqueue.c --- trunk/reactos/lib/ntdll/rtl/timerqueue.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/timerqueue.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -26,10 +26,8 @@ /* INCLUDES ****************************************************************/ -#include <ddk/ntddk.h> - #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h> typedef VOID (CALLBACK *WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN ); _____ Modified: trunk/reactos/lib/ntdll/rtl/trace.c --- trunk/reactos/lib/ntdll/rtl/trace.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/rtl/trace.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -26,11 +26,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntdll/trace.h> -#include <string.h> -#include <stdarg.h> - +#define NDEBUG #include <ntdll.h> /* GLOBALS *******************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/stdio/sprintf.c --- trunk/reactos/lib/ntdll/stdio/sprintf.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/stdio/sprintf.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -20,16 +20,12 @@ * Wirzenius wrote this portably, Torvalds fucked it up :-) */ -#include <ddk/ntddk.h> -#include <stdarg.h> -#include <stdlib.h> #define __NO_CTYPE_INLINES #include <ctype.h> -#include <string.h> #include <limits.h> #define NDEBUG -#include <ntdll/ntdll.h> +#include <ntdll.h> #define ZEROPAD 1 /* pad with zero */ _____ Modified: trunk/reactos/lib/ntdll/stdio/sscanf.c --- trunk/reactos/lib/ntdll/stdio/sscanf.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/stdio/sscanf.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -1,13 +1,9 @@ /**/ +#define NDEBUG +#include <ntdll.h> #include <stdio.h> -#include <ntos.h> -#include <ntdll/rtl.h> -#define NDEBUG -#include <ntdll/ntdll.h> - - /* helper function for *scanf. Returns the value of character c in the * given base, or -1 if the given character is not a digit of the base. */ _____ Modified: trunk/reactos/lib/ntdll/stdio/swprintf.c --- trunk/reactos/lib/ntdll/stdio/swprintf.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/stdio/swprintf.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -22,17 +22,11 @@ * Wirzenius wrote this portably, Torvalds fucked it up :-) */ -#include <ddk/ntddk.h> -#include <stdarg.h> -#include <stdlib.h> -#include <ctype.h> +#define NDEBUG +#include <ntdll.h> #include <wchar.h> #include <limits.h> -#define NDEBUG -#include <ntdll/ntdll.h> - - #define ZEROPAD 1 /* pad with zero */ #define SIGN 2 /* unsigned/signed long */ #define PLUS 4 /* show plus */ _____ Modified: trunk/reactos/lib/ntdll/stdlib/mbstowcs.c --- trunk/reactos/lib/ntdll/stdlib/mbstowcs.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/stdlib/mbstowcs.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -6,10 +6,10 @@ * PURPOSE: converts a multi byte string to a unicode string */ -#include <ntos.h> +#define NDEBUG +#include <ntdll.h> #include <stdlib.h> #include <string.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/ntdll/stdlib/wcstombs.c --- trunk/reactos/lib/ntdll/stdlib/wcstombs.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/stdlib/wcstombs.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -6,7 +6,8 @@ * PURPOSE: converts a unicode string to a multi byte string */ -#include <ntos.h> +#define NDEBUG +#include <ntdll.h> #include <stdlib.h> #include <string.h> _____ Modified: trunk/reactos/lib/ntdll/string/wstring.c --- trunk/reactos/lib/ntdll/string/wstring.c 2005-06-17 17:22:19 UTC (rev 15998) +++ trunk/reactos/lib/ntdll/string/wstring.c 2005-06-17 17:22:27 UTC (rev 15999) @@ -12,7 +12,6 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> #include <wchar.h>

1 0

[ion] 15998: Add NTDLL Common Header
by ion＠svn.reactos.com 17 Jun '05

17 Jun '05

Add NTDLL Common Header Added: trunk/reactos/lib/ntdll/inc/ Added: trunk/reactos/lib/ntdll/inc/ntdll.h Modified: trunk/reactos/lib/ntdll/ntdll.xml _____ Added: trunk/reactos/lib/ntdll/inc/ntdll.h --- trunk/reactos/lib/ntdll/inc/ntdll.h 2005-06-17 17:22:12 UTC (rev 15997) +++ trunk/reactos/lib/ntdll/inc/ntdll.h 2005-06-17 17:22:19 UTC (rev 15998) @@ -0,0 +1,36 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: lib/ntdll/inc/ntdll.h + * PURPOSE: Native Libary Header + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +/* SDK/DDK/NDK Headers. */ +#include <ddk/ntddk.h> /* FIXME: NDK */ +#include <ddk/ntifs.h> /* FIXME: NDK */ +#include <windows.h> +#include <ntos/ldrtypes.h> /* FIXME: NDK */ + +/* NTDLL Public Headers. FIXME: USE NDK */ +#include <ntdll/csr.h> +#include <ntdll/rtl.h> +#include <ntdll/ldr.h> +#include <ntdll/ntdll.h> + +/* ROSRTL Headers */ +#include <rosrtl/string.h> /* FIXME: KILL ROSRTL */ + +/* Helper Macros FIXME: NDK */ +#define ROUNDUP(a,b) ((((a)+(b)-1)/(b))*(b)) +#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) +#ifndef HIWORD +#define HIWORD(l) ((WORD)(((DWORD)(l) >> 16) & 0xFFFF)) +#endif +#ifndef LOWORD +#define LOWORD(l) ((WORD)(l)) +#endif + +/* EOF */ _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-06-17 17:22:12 UTC (rev 15997) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-06-17 17:22:19 UTC (rev 15998) @@ -1,6 +1,7 @@ <module name="ntdll" type="nativedll" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll"> <bootstrap base="reactos/system32" /> <importlibrary definition="def/ntdll.def" /> + <include base="ntdll">inc</include> <define name="__NTDLL__" /> <define name="_DISABLE_TIDENTS" /> <define name="__USE_W32API" />

1 0

[ion] 15997: Enable PCH for rtl
by ion＠svn.reactos.com 17 Jun '05

17 Jun '05

Enable PCH for rtl Modified: trunk/reactos/lib/rtl/rtl.xml _____ Modified: trunk/reactos/lib/rtl/rtl.xml --- trunk/reactos/lib/rtl/rtl.xml 2005-06-17 17:18:58 UTC (rev 15996) +++ trunk/reactos/lib/rtl/rtl.xml 2005-06-17 17:22:12 UTC (rev 15997) @@ -48,4 +48,5 @@ <file>unicode.c</file> <file>unicodeprefix.c</file> <file>version.c</file> + <pch>rtl.h</pch> </module>

1 0

[blight] 15996: Remove #include <poppack.h> - there is no pshpack beeing included.
by blight＠svn.reactos.com 17 Jun '05

17 Jun '05

Remove #include <poppack.h> - there is no pshpack beeing included. Modified: trunk/reactos/include/wine/shtypes.h _____ Modified: trunk/reactos/include/wine/shtypes.h --- trunk/reactos/include/wine/shtypes.h 2005-06-17 17:15:55 UTC (rev 15995) +++ trunk/reactos/include/wine/shtypes.h 2005-06-17 17:18:58 UTC (rev 15996) @@ -16,7 +16,6 @@ STRRET_CSTR = 2 } STRRET_TYPE; -#include <poppack.h> #ifdef __cplusplus } #endif

1 0

[navaraf] 15995: Use W32API.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Use W32API. Modified: trunk/reactos/drivers/bus/acpi/acpi.xml Modified: trunk/reactos/drivers/storage/atapi/atapi.c Modified: trunk/reactos/drivers/storage/atapi/atapi.xml Modified: trunk/reactos/drivers/storage/cdrom/cdrom.c Modified: trunk/reactos/drivers/storage/cdrom/cdrom.xml Modified: trunk/reactos/drivers/storage/class2/class2.c Modified: trunk/reactos/drivers/storage/class2/class2.xml Modified: trunk/reactos/drivers/storage/disk/disk.c Modified: trunk/reactos/drivers/storage/disk/disk.xml Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c Modified: trunk/reactos/drivers/storage/diskdump/diskdump.xml Modified: trunk/reactos/drivers/storage/floppy/floppy.h Modified: trunk/reactos/drivers/storage/floppy/floppy.xml Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.xml Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h _____ Modified: trunk/reactos/drivers/bus/acpi/acpi.xml --- trunk/reactos/drivers/bus/acpi/acpi.xml 2005-06-17 17:14:57 UTC (rev 15994) +++ trunk/reactos/drivers/bus/acpi/acpi.xml 2005-06-17 17:15:55 UTC (rev 15995) @@ -1,7 +1,7 @@ <module name="acpi" type="kernelmodedriver" installbase="system32/drivers" installname="acpi.sys" warnings="true"> <include base="acpi">include</include> <include base="acpi">ospm/include</include> - <define name="__USE_W32API" /> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <directory name="dispatcher"> _____ Modified: trunk/reactos/drivers/storage/atapi/atapi.c --- trunk/reactos/drivers/storage/atapi/atapi.c 2005-06-17 17:14:57 UTC (rev 15994) +++ trunk/reactos/drivers/storage/atapi/atapi.c 2005-06-17 17:15:55 UTC (rev 15995) @@ -52,7 +52,6 @@ #include <ddk/srb.h> #include <ddk/scsi.h> #include <ddk/ntddscsi.h> -#include <ntos/kefuncs.h> #include "atapi.h" _____ Modified: trunk/reactos/drivers/storage/atapi/atapi.xml --- trunk/reactos/drivers/storage/atapi/atapi.xml 2005-06-17 17:14:57 UTC (rev 15994) +++ trunk/reactos/drivers/storage/atapi/atapi.xml 2005-06-17 17:15:55 UTC (rev 15995) @@ -1,5 +1,6 @@ <module name="atapi" type="kernelmodedriver" installbase="system32/drivers" installname="atapi.sys"> <bootstrap base="reactos" /> + <define name="__USE_W32API" /> <include base="atapi">.</include> <library>ntoskrnl</library> <library>hal</library> _____ Modified: trunk/reactos/drivers/storage/cdrom/cdrom.c --- trunk/reactos/drivers/storage/cdrom/cdrom.c 2005-06-17 17:14:57 UTC (rev 15994) +++ trunk/reactos/drivers/storage/cdrom/cdrom.c 2005-06-17 17:15:55 UTC (rev 15995) @@ -35,9 +35,12 @@ #include <ddk/ntddk.h> #include <ddk/scsi.h> +#include <ddk/ntddscsi.h> +#include <ddk/ntdddisk.h> +#include <ddk/ntddcdrm.h> #include <ddk/class2.h> -#include <ddk/ntddscsi.h> #include <ntos/minmax.h> +#include <stdio.h> #define NDEBUG #include <debug.h> @@ -134,7 +137,7 @@ CdromTimerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); -VOID +VOID STDCALL CdromWorkItem(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); @@ -1633,7 +1636,7 @@ } -VOID +VOID STDCALL CdromWorkItem(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) { _____ Modified: trunk/reactos/drivers/storage/cdrom/cdrom.xml --- trunk/reactos/drivers/storage/cdrom/cdrom.xml 2005-06-17 17:14:57 UTC (rev 15994) +++ trunk/reactos/drivers/storage/cdrom/cdrom.xml 2005-06-17 17:15:55 UTC (rev 15995) @@ -1,5 +1,6 @@ <module name="cdrom" type="kernelmodedriver" installbase="system32/drivers" installname="cdrom.sys"> <bootstrap base="reactos" /> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <library>class2</library> _____ Modified: trunk/reactos/drivers/storage/class2/class2.c --- trunk/reactos/drivers/storage/class2/class2.c 2005-06-17 17:14:57 UTC (rev 15994) +++ trunk/reactos/drivers/storage/class2/class2.c 2005-06-17 17:15:55 UTC (rev 15995) @@ -33,12 +33,15 @@ /* INCLUDES *****************************************************************/ #include <ddk/ntddk.h> +#include <ddk/ntdddisk.h> #include <ddk/scsi.h> #include <ddk/class2.h> +#include <stdio.h> #define NDEBUG #include <debug.h> +#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #define VERSION "0.0.2" _____ Modified: trunk/reactos/drivers/storage/class2/class2.xml --- trunk/reactos/drivers/storage/class2/class2.xml 2005-06-17 17:14:57 UTC (rev 15994) +++ trunk/reactos/drivers/storage/class2/class2.xml 2005-06-17 17:15:55 UTC (rev 15995) @@ -1,5 +1,6 @@ <module name="class2" type="kernelmodedriver" installbase="system32/drivers" installname="class2.sys"> <bootstrap base="reactos" /> + <define name="__USE_W32API" /> <importlibrary definition="class2.def" /> <library>ntoskrnl</library> <library>hal</library> _____ Modified: trunk/reactos/drivers/storage/disk/disk.c --- trunk/reactos/drivers/storage/disk/disk.c 2005-06-17 17:14:57 UTC (rev 15994) +++ trunk/reactos/drivers/storage/disk/disk.c 2005-06-17 17:15:55 UTC (rev 15995) @@ -28,9 +28,11 @@ /* INCLUDES *****************************************************************/ #include <ddk/ntddk.h> +#include <ddk/ntdddisk.h> #include <ddk/scsi.h> #include <ddk/class2.h> #include <ddk/ntddscsi.h> +#include <stdio.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/drivers/storage/disk/disk.xml --- trunk/reactos/drivers/storage/disk/disk.xml 2005-06-17 17:14:57 UTC (rev 15994) +++ trunk/reactos/drivers/storage/disk/disk.xml 2005-06-17 17:15:55 UTC (rev 15995) @@ -1,5 +1,6 @@ <module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="disk.sys" warnings="true"> <bootstrap base="reactos" /> + <define name="__USE_W32API" /> <linkerflag>-lgcc</linkerflag> <library>ntoskrnl</library> <library>hal</library> _____ Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c --- trunk/reactos/drivers/storage/diskdump/diskdump.c 2005-06-17 17:14:57 UTC (rev 15994) +++ trunk/reactos/drivers/storage/diskdump/diskdump.c 2005-06-17 17:15:55 UTC (rev 15995) @@ -29,8 +29,10 @@ #include <ddk/ntddk.h> #include <ddk/scsi.h> +#include <ddk/ntdddisk.h> +#include <ddk/ntddscsi.h> #include <ddk/class2.h> -#include <ddk/ntddscsi.h> +#include <ntos.h> #include <napi/core.h> #include "../scsiport/scsiport_int.h" _____ Modified: trunk/reactos/drivers/storage/diskdump/diskdump.xml --- trunk/reactos/drivers/storage/diskdump/diskdump.xml 2005-06-17 17:14:57 UTC (rev 15994) +++ trunk/reactos/drivers/storage/diskdump/diskdump.xml 2005-06-17 17:15:55 UTC (rev 15995) @@ -1,5 +1,6 @@ <module name="diskdump" type="kernelmodedriver" installbase="system32/drivers" installname="diskdump.sys"> <bootstrap base="reactos" /> + <define name="__USE_W32API" /> <library definition="diskdump.def" /> <library>ntoskrnl</library> <library>hal</library> _____ Modified: trunk/reactos/drivers/storage/floppy/floppy.h --- trunk/reactos/drivers/storage/floppy/floppy.h 2005-06-17 17:14:57 UTC (rev 15994) +++ trunk/reactos/drivers/storage/floppy/floppy.h 2005-06-17 17:15:55 UTC (rev 15995) @@ -29,13 +29,11 @@ #define MAX_DRIVES_PER_CONTROLLER 4 #define MAX_CONTROLLERS 4 -#ifdef _MSC_VER /* MS doesn't prototype this but the w2k kernel exports it */ int _cdecl swprintf(const WCHAR *, ...); /* need ioctls in ddk build mode */ #include <ntdddisk.h> -#endif /* missing from ros headers */ /* TODO: fix this right */ _____ Modified: trunk/reactos/drivers/storage/floppy/floppy.xml --- trunk/reactos/drivers/storage/floppy/floppy.xml 2005-06-17 17:14:57 UTC (rev 15994) +++ trunk/reactos/drivers/storage/floppy/floppy.xml 2005-06-17 17:15:55 UTC (rev 15995) @@ -1,5 +1,6 @@ <module name="floppy" type="kernelmodedriver" installbase="system32/drivers" installname="floppy.sys"> <bootstrap base="reactos" /> + <define name="__USE_W32API" /> <include base="floppy">.</include> <library>ntoskrnl</library> <library>hal</library> _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c --- trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-06-17 17:14:57 UTC (rev 15994) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-06-17 17:15:55 UTC (rev 15995) @@ -33,7 +33,7 @@ #include <ddk/scsi.h> #include <ddk/ntddscsi.h> #include <ntos/minmax.h> -#include <rosrtl/string.h> +#include <stdio.h> #define NDEBUG #include <debug.h> @@ -2337,7 +2337,8 @@ { PSCSI_PORT_LUN_EXTENSION LunExtension; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; + UNICODE_STRING KeyName = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Hardware\\DeviceMap\\Scsi"); UNICODE_STRING ValueName; WCHAR NameBuffer[64]; ULONG Disposition; @@ -2365,8 +2366,6 @@ } /* Open or create the 'Scsi' subkey */ - RtlRosInitUnicodeStringFromLiteral(&KeyName, - L"\\Registry\\Machine\\Hardware\\DeviceMap\\Scsi"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport.xml --- trunk/reactos/drivers/storage/scsiport/scsiport.xml 2005-06-17 17:14:57 UTC (rev 15994) +++ trunk/reactos/drivers/storage/scsiport/scsiport.xml 2005-06-17 17:15:55 UTC (rev 15995) @@ -1,5 +1,6 @@ <module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys"> <bootstrap base="reactos" /> + <define name="__USE_W32API" /> <importlibrary definition="scsiport.def" /> <include base="scsiport">.</include> <library>ntoskrnl</library> _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h --- trunk/reactos/drivers/storage/scsiport/scsiport_int.h 2005-06-17 17:14:57 UTC (rev 15994) +++ trunk/reactos/drivers/storage/scsiport/scsiport_int.h 2005-06-17 17:15:55 UTC (rev 15995) @@ -7,6 +7,9 @@ #define VERSION "0.0.3" +#define PAGE_ROUND_UP(x) ( (((ULONG_PTR)x)%PAGE_SIZE) ? ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG_PTR)x) ) +#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) + typedef enum _SCSI_PORT_TIMER_STATES { IDETimerIdle,

1 0

[navaraf] 15994: Fix the export of HalExamineMBR. It mustn't be aliased since we need to have it named correctly in the import library.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Fix the export of HalExamineMBR. It mustn't be aliased since we need to have it named correctly in the import library. Modified: trunk/reactos/ntoskrnl/include/internal/xhal.h Modified: trunk/reactos/ntoskrnl/io/disk.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def _____ Modified: trunk/reactos/ntoskrnl/include/internal/xhal.h --- trunk/reactos/ntoskrnl/include/internal/xhal.h 2005-06-17 17:12:17 UTC (rev 15993) +++ trunk/reactos/ntoskrnl/include/internal/xhal.h 2005-06-17 17:14:57 UTC (rev 15994) @@ -5,11 +5,12 @@ xHalQueryDriveLayout(IN PUNICODE_STRING DeviceName, OUT PDRIVE_LAYOUT_INFORMATION *LayoutInfo); +#undef HalExamineMBR VOID FASTCALL -xHalExamineMBR(IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG MBRTypeIdentifier, - OUT PVOID *Buffer); +HalExamineMBR(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG MBRTypeIdentifier, + OUT PVOID *Buffer); VOID FASTCALL xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock, _____ Modified: trunk/reactos/ntoskrnl/io/disk.c --- trunk/reactos/ntoskrnl/io/disk.c 2005-06-17 17:12:17 UTC (rev 15993) +++ trunk/reactos/ntoskrnl/io/disk.c 2005-06-17 17:14:57 UTC (rev 15994) @@ -65,7 +65,7 @@ (pHalSetSystemInformation) NULL, // HalSetSystemInformation (pHalQueryBusSlots) NULL, // HalQueryBusSlots 0, - (pHalExamineMBR) xHalExamineMBR, + (pHalExamineMBR) HalExamineMBR, (pHalIoAssignDriveLetters) xHalIoAssignDriveLetters, (pHalIoReadPartitionTable) xHalIoReadPartitionTable, (pHalIoSetPartitionInformation) xHalIoSetPartitionInformation, @@ -302,16 +302,16 @@ VOID FASTCALL -xHalExamineMBR(IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG MBRTypeIdentifier, - OUT PVOID *Buffer) +HalExamineMBR(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG MBRTypeIdentifier, + OUT PVOID *Buffer) { LARGE_INTEGER SectorOffset; PPARTITION_SECTOR Sector; NTSTATUS Status; - DPRINT("xHalExamineMBR()\n"); + DPRINT("HalExamineMBR()\n"); *Buffer = NULL; @@ -760,10 +760,10 @@ SectorSize = 4096; /* Check for 'Ontrack Disk Manager' */ - xHalExamineMBR(DeviceObject, - SectorSize, - 0x54, - &MbrBuffer); + HalExamineMBR(DeviceObject, + SectorSize, + 0x54, + &MbrBuffer); if (MbrBuffer != NULL) { DPRINT("Found 'Ontrack Disk Manager'\n"); @@ -772,10 +772,10 @@ } /* Check for 'EZ-Drive' */ - xHalExamineMBR(DeviceObject, - SectorSize, - 0x55, - &MbrBuffer); + HalExamineMBR(DeviceObject, + SectorSize, + 0x55, + &MbrBuffer); if (MbrBuffer != NULL) { DPRINT("Found 'EZ-Drive'\n"); @@ -1012,10 +1012,10 @@ SectorSize = 4096; /* Check for 'Ontrack Disk Manager' */ - xHalExamineMBR (DeviceObject, - SectorSize, - 0x54, - (PVOID*)(PVOID)&PartitionSector); + HalExamineMBR (DeviceObject, + SectorSize, + 0x54, + (PVOID*)(PVOID)&PartitionSector); if (PartitionSector != NULL) { DPRINT ("Found 'Ontrack Disk Manager'\n"); @@ -1024,10 +1024,10 @@ } /* Check for 'EZ-Drive' */ - xHalExamineMBR (DeviceObject, - SectorSize, - 0x55, - (PVOID*)(PVOID)&PartitionSector); + HalExamineMBR (DeviceObject, + SectorSize, + 0x55, + (PVOID*)(PVOID)&PartitionSector); if (PartitionSector != NULL) { DPRINT ("Found 'EZ-Drive'\n"); @@ -1224,10 +1224,10 @@ SectorSize = 4096; /* Check for 'Ontrack Disk Manager' */ - xHalExamineMBR (DeviceObject, - SectorSize, - 0x54, - (PVOID*)(PVOID)&PartitionSector); + HalExamineMBR (DeviceObject, + SectorSize, + 0x54, + (PVOID*)(PVOID)&PartitionSector); if (PartitionSector != NULL) { DPRINT ("Found 'Ontrack Disk Manager'\n"); @@ -1236,10 +1236,10 @@ } /* Check for 'EZ-Drive' */ - xHalExamineMBR (DeviceObject, - SectorSize, - 0x55, - (PVOID*)(PVOID)&PartitionSector); + HalExamineMBR (DeviceObject, + SectorSize, + 0x55, + (PVOID*)(PVOID)&PartitionSector); if (PartitionSector != NULL) { DPRINT ("Found 'EZ-Drive'\n"); _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-06-17 17:12:17 UTC (rev 15993) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-06-17 17:14:57 UTC (rev 15994) @@ -275,7 +275,7 @@ FsRtlUninitializeOplock@4 HalDispatchTable DATA HalPrivateDispatchTable DATA -@HalExamineMBR=@xHalExamineMBR@16 +@HalExamineMBR@16 InbvAcquireDisplayOwnership@0 InbvCheckDisplayOwnership@0 InbvDisplayString@4

1 0

[navaraf] 15993: - Move DRIVE_LAYOUT_INFORMATION_MBR, DRIVE_LAYOUT_INFORMATION_GPT and
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

- Move DRIVE_LAYOUT_INFORMATION_MBR, DRIVE_LAYOUT_INFORMATION_GPT and PARTITION_INFORMATION_MBR structures from winddk.h to ntdddisk.h. - Add definitions of IOCTL_DISK_HISTOGRAM_STRUCTURE, IOCTL_DISK_HISTOGRAM_DATA, IOCTL_DISK_HISTOGRAM_RESET, IOCTL_DISK_LOGGING, IOCTL_DISK_REQUEST_DATA, IOCTL_DISK_REQUEST_STRUCTURE, PARTITION_INFORMATION_MBR, DRIVE_LAYOUT_INFORMATION and IO_QUERY_DEVICE_DATA_FORMAT. Modified: trunk/reactos/w32api/include/ddk/ntdddisk.h Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/ntdddisk.h --- trunk/reactos/w32api/include/ddk/ntdddisk.h 2005-06-17 17:08:04 UTC (rev 15992) +++ trunk/reactos/w32api/include/ddk/ntdddisk.h 2005-06-17 17:12:17 UTC (rev 15993) @@ -90,6 +90,15 @@ #define IOCTL_DISK_GROW_PARTITION \ CTL_CODE(IOCTL_DISK_BASE, 0x0034, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_HISTOGRAM_STRUCTURE \ + CTL_CODE(IOCTL_DISK_BASE, 0x000c, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_DISK_HISTOGRAM_DATA \ + CTL_CODE(IOCTL_DISK_BASE, 0x000d, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_DISK_HISTOGRAM_RESET \ + CTL_CODE(IOCTL_DISK_BASE, 0x000e, METHOD_BUFFERED, FILE_ANY_ACCESS) + #define IOCTL_DISK_INTERNAL_CLEAR_VERIFY \ CTL_CODE(IOCTL_DISK_BASE, 0x0101, METHOD_NEITHER, FILE_ANY_ACCESS) @@ -99,6 +108,9 @@ #define IOCTL_DISK_IS_WRITABLE \ CTL_CODE(IOCTL_DISK_BASE, 0x0009, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_LOGGING \ + CTL_CODE(IOCTL_DISK_BASE, 0x000a, METHOD_BUFFERED, FILE_ANY_ACCESS) + #define IOCTL_DISK_PERFORMANCE \ CTL_CODE(IOCTL_DISK_BASE, 0x0008, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -108,6 +120,12 @@ #define IOCTL_DISK_REASSIGN_BLOCKS \ CTL_CODE(IOCTL_DISK_BASE, 0x0007, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_REQUEST_DATA \ + CTL_CODE(IOCTL_DISK_BASE, 0x0010, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_DISK_REQUEST_STRUCTURE \ + CTL_CODE(IOCTL_DISK_BASE, 0x000f, METHOD_BUFFERED, FILE_ANY_ACCESS) + #define IOCTL_DISK_RESERVE \ CTL_CODE(IOCTL_DISK_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) @@ -325,6 +343,13 @@ WCHAR StorageManagerName[8]; } DISK_PERFORMANCE, *PDISK_PERFORMANCE; +typedef struct _PARTITION_INFORMATION_MBR { + UCHAR PartitionType; + BOOLEAN BootIndicator; + BOOLEAN RecognizedPartition; + ULONG HiddenSectors; +} PARTITION_INFORMATION_MBR, *PPARTITION_INFORMATION_MBR; + typedef struct _PARTITION_INFORMATION_EX { PARTITION_STYLE PartitionStyle; LARGE_INTEGER StartingOffset; @@ -337,6 +362,23 @@ } DUMMYUNIONNAME; } PARTITION_INFORMATION_EX, *PPARTITION_INFORMATION_EX; +typedef struct _DRIVE_LAYOUT_INFORMATION { + ULONG PartitionCount; + ULONG Signature; + PARTITION_INFORMATION PartitionEntry[1]; +} DRIVE_LAYOUT_INFORMATION, *PDRIVE_LAYOUT_INFORMATION; + +typedef struct _DRIVE_LAYOUT_INFORMATION_MBR { + ULONG Signature; +} DRIVE_LAYOUT_INFORMATION_MBR, *PDRIVE_LAYOUT_INFORMATION_MBR; + +typedef struct _DRIVE_LAYOUT_INFORMATION_GPT { + GUID DiskId; + LARGE_INTEGER StartingUsableOffset; + LARGE_INTEGER UsableLength; + ULONG MaxPartitionCount; +} DRIVE_LAYOUT_INFORMATION_GPT, *PDRIVE_LAYOUT_INFORMATION_GPT; + typedef struct _FORMAT_EX_PARAMETERS { MEDIA_TYPE MediaType; ULONG StartCylinderNumber; _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-06-17 17:08:04 UTC (rev 15992) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-06-17 17:12:17 UTC (rev 15993) @@ -1091,26 +1091,6 @@ IRP_RETRY_IO_COMPLETION = 0x4000 }; - -typedef struct _DRIVE_LAYOUT_INFORMATION_MBR { - ULONG Signature; -} DRIVE_LAYOUT_INFORMATION_MBR, *PDRIVE_LAYOUT_INFORMATION_MBR; - -typedef struct _DRIVE_LAYOUT_INFORMATION_GPT { - GUID DiskId; - LARGE_INTEGER StartingUsableOffset; - LARGE_INTEGER UsableLength; - ULONG MaxPartitionCount; -} DRIVE_LAYOUT_INFORMATION_GPT, *PDRIVE_LAYOUT_INFORMATION_GPT; - -typedef struct _PARTITION_INFORMATION_MBR { - UCHAR PartitionType; - BOOLEAN BootIndicator; - BOOLEAN RecognizedPartition; - ULONG HiddenSectors; -} PARTITION_INFORMATION_MBR, *PPARTITION_INFORMATION_MBR; - - typedef struct _BOOTDISK_INFORMATION { LONGLONG BootPartitionOffset; LONGLONG SystemPartitionOffset; @@ -3715,6 +3695,13 @@ IN ULONG PeripheralNumber, IN PKEY_VALUE_FULL_INFORMATION *PeripheralInformation); +typedef enum _IO_QUERY_DEVICE_DATA_FORMAT { + IoQueryDeviceIdentifier = 0, + IoQueryDeviceConfigurationData, + IoQueryDeviceComponentInformation, + IoQueryDeviceMaxData +} IO_QUERY_DEVICE_DATA_FORMAT, *PIO_QUERY_DEVICE_DATA_FORMAT; + typedef enum _WORK_QUEUE_TYPE { CriticalWorkQueue, DelayedWorkQueue,

1 0

[navaraf] 15992: - Get rid of STDCALL_FUNC usage in napi/core.h.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

- Get rid of STDCALL_FUNC usage in napi/core.h. - Allow including ntos.h and ntdddisk.h at the same time. Modified: trunk/reactos/include/napi/core.h Modified: trunk/reactos/include/ntos/disk.h _____ Modified: trunk/reactos/include/napi/core.h --- trunk/reactos/include/napi/core.h 2005-06-17 16:58:15 UTC (rev 15991) +++ trunk/reactos/include/napi/core.h 2005-06-17 17:08:04 UTC (rev 15992) @@ -26,10 +26,10 @@ typedef struct MM_CORE_DUMP_FUNCTIONS { - NTSTATUS STDCALL_FUNC (*DumpPrepare)(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers); - NTSTATUS STDCALL_FUNC (*DumpInit)(VOID); - NTSTATUS STDCALL_FUNC (*DumpWrite)(LARGE_INTEGER Address, PMDL Mdl); - NTSTATUS STDCALL_FUNC (*DumpFinish)(VOID); + NTSTATUS (STDCALL *DumpPrepare)(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers); + NTSTATUS (STDCALL *DumpInit)(VOID); + NTSTATUS (STDCALL *DumpWrite)(LARGE_INTEGER Address, PMDL Mdl); + NTSTATUS (STDCALL *DumpFinish)(VOID); } MM_CORE_DUMP_FUNCTIONS, *PMM_CORE_DUMP_FUNCTIONS; #endif /* __INCLUDE_NAPI_CORE_H */ _____ Modified: trunk/reactos/include/ntos/disk.h --- trunk/reactos/include/ntos/disk.h 2005-06-17 16:58:15 UTC (rev 15991) +++ trunk/reactos/include/ntos/disk.h 2005-06-17 17:08:04 UTC (rev 15992) @@ -12,6 +12,8 @@ #ifndef __INCLUDE_DISK_H #define __INCLUDE_DISK_H +#ifndef __NTDDDISK_H + #define IOCTL_DISK_BASE FILE_DEVICE_DISK #define IOCTL_DISK_GET_DRIVE_GEOMETRY CTL_CODE(IOCTL_DISK_BASE, 0x0000, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -179,6 +181,8 @@ typedef DRIVE_LAYOUT_INFORMATION *PDRIVE_LAYOUT_INFORMATION; #endif +#endif + #endif /* __INCLUDE_DISK_H */ /* EOF */

1 0

[navaraf] 15991: Fix definition of LPC_MAX_MESSAGE for __USE_W32API case.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Fix definition of LPC_MAX_MESSAGE for __USE_W32API case. Modified: trunk/reactos/include/ntos/zwtypes.h _____ Modified: trunk/reactos/include/ntos/zwtypes.h --- trunk/reactos/include/ntos/zwtypes.h 2005-06-17 16:35:17 UTC (rev 15990) +++ trunk/reactos/include/ntos/zwtypes.h 2005-06-17 16:58:15 UTC (rev 15991) @@ -1727,11 +1727,22 @@ #define MAX_MESSAGE_DATA (0x130) +#ifdef __USE_W32API +typedef union _LPC_MAX_MESSAGE +{ + LPC_MESSAGE Header; + struct { + BYTE LpcHeader[LPC_MESSAGE_BASE_SIZE]; + BYTE Data[MAX_MESSAGE_DATA]; + }; +} LPC_MAX_MESSAGE, *PLPC_MAX_MESSAGE; +#else typedef struct _LPC_MAX_MESSAGE { LPC_MESSAGE Header; BYTE Data[MAX_MESSAGE_DATA]; } LPC_MAX_MESSAGE, *PLPC_MAX_MESSAGE; +#endif typedef struct _LPC_PORT_BASIC_INFORMATION {

1 0

[navaraf] 15990: Fix packing of structures.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Fix packing of structures. Modified: trunk/reactos/include/sm/api.h _____ Modified: trunk/reactos/include/sm/api.h --- trunk/reactos/include/sm/api.h 2005-06-17 16:26:04 UTC (rev 15989) +++ trunk/reactos/include/sm/api.h 2005-06-17 16:35:17 UTC (rev 15990) @@ -4,13 +4,11 @@ #include <sm/ns.h> -#pragma pack(push,4) - /*** DATA TYPES ******************************************************/ #define SM_SB_NAME_MAX_LENGTH 120 -#pragma pack(push,4) +#include <pshpack4.h> /* SmConnectApiPort (SS->SM) */ typedef struct _SM_CONNECT_DATA @@ -136,7 +134,7 @@ }; } SM_PORT_MESSAGE, * PSM_PORT_MESSAGE; -#pragma pack(pop) +#include <poppack.h> /*** MACRO ***********************************************************/

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs