Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[tkreuzer] 34718: - int -> intptr_t - unsigned long -> uintptr_t - #undef _MINGW_IMPORT in ctype.c, to avoid warnings
by tkreuzer＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: tkreuzer Date: Wed Jul 23 19:54:12 2008 New Revision: 34718 URL: http://svn.reactos.org/svn/reactos?rev=34718&view=rev Log: - int -> intptr_t - unsigned long -> uintptr_t - #undef _MINGW_IMPORT in ctype.c, to avoid warnings Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/process/_system.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/process/process.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/lnx_vfprintf.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/lnx_vfwprint.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/ctype.c Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/process/_system.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/process/_system.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/process/_system.c [iso-8859-1] Wed Jul 23 19:54:12 2008 @@ -108,7 +108,7 @@ CloseHandle(ProcessInformation.hThread); // system should wait untill the calling process is finished - _cwait(&nStatus,(int)ProcessInformation.hProcess,0); + _cwait(&nStatus,(intptr_t)ProcessInformation.hProcess,0); CloseHandle(ProcessInformation.hProcess); return nStatus; Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/process/process.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/process/process.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/process/process.c [iso-8859-1] Wed Jul 23 19:54:12 2008 @@ -182,7 +182,7 @@ return str; } -static int +static intptr_t do_spawnT(int mode, const _TCHAR* cmdname, const _TCHAR* args, const _TCHAR* envp) { STARTUPINFO StartupInfo = {0}; @@ -304,7 +304,7 @@ { case _P_NOWAIT: case _P_NOWAITO: - return((int)ProcessInformation.hProcess); + return((intptr_t)ProcessInformation.hProcess); case _P_OVERLAY: CloseHandle(ProcessInformation.hProcess); _exit(0); @@ -317,7 +317,7 @@ CloseHandle(ProcessInformation.hProcess); return( 0); } - return( (int)ProcessInformation.hProcess); + return( (intptr_t)ProcessInformation.hProcess); } /* Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/lnx_vfprintf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/lnx_vfprintf.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/lnx_vfprintf.c [iso-8859-1] Wed Jul 23 19:54:12 2008 @@ -788,7 +788,7 @@ flags |= ZEROPAD; } result = number(f, - (unsigned long) va_arg(args, void *), 16, + (uintptr_t) va_arg(args, void *), 16, field_width, precision, flags); if (result < 0) return -1; Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/lnx_vfwprint.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/lnx_vfwprint.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/lnx_vfwprint.c [iso-8859-1] Wed Jul 23 19:54:12 2008 @@ -761,7 +761,7 @@ flags |= ZEROPAD; } result = number(f, - (unsigned long) va_arg(args, void *), 16, + (uintptr_t) va_arg(args, void *), 16, field_width, precision, flags); if (result < 0) return -1; Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/ctype.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] Wed Jul 23 19:54:12 2008 @@ -1,4 +1,6 @@ #include <string.h> +#undef __MINGW_IMPORT +#define __MINGW_IMPORT #include <ctype.h> #undef _pctype

1 0

[tkreuzer] 34717: Patch from Samuel Serapion ("encoded", samdwise51 at gmail dot com): - fix prototypes of _findfirst, _findnext, _findclose, _findfirsti64, _findnexti64 _wfindfirst, _wfindnext, _wfindfirst64, _wfindnext64, strndup, - fix a number of pointer to int casts
by tkreuzer＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: tkreuzer Date: Wed Jul 23 19:20:01 2008 New Revision: 34717 URL: http://svn.reactos.org/svn/reactos?rev=34717&view=rev Log: Patch from Samuel Serapion ("encoded", samdwise51 at gmail dot com): - fix prototypes of _findfirst, _findnext, _findclose, _findfirsti64, _findnexti64 _wfindfirst, _wfindnext, _wfindfirst64, _wfindnext64, strndup, - fix a number of pointer to int casts Modified: branches/ros-amd64-bringup/reactos/include/crt/io.h branches/ros-amd64-bringup/reactos/include/reactos/wine/library.h branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/misc/getargs.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/search/lfind.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/search/lsearch.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/find.c Modified: branches/ros-amd64-bringup/reactos/include/crt/io.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/io.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/io.h [iso-8859-1] Wed Jul 23 19:20:01 2008 @@ -129,10 +129,10 @@ * _findclose calls. _findnext also returns -1 if no match could be found, * and 0 if a match was found. Call _findclose when you are finished. */ -/* FIXME: Should these all use intptr_t, as per recent MSDN docs? */ -_CRTIMP long __cdecl __MINGW_NOTHROW _findfirst (const char*, struct _finddata_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW _findnext (long, struct _finddata_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW _findclose (long); + +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _findfirst (const char*, struct _finddata_t*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _findnext (intptr_t, struct _finddata_t*); +_CRTIMP int __cdecl __MINGW_NOTHROW _findclose (intptr_t); _CRTIMP int __cdecl __MINGW_NOTHROW _chdir (const char*); _CRTIMP char* __cdecl __MINGW_NOTHROW _getcwd (char*, int); @@ -143,8 +143,8 @@ #ifdef __MSVCRT__ _CRTIMP __int64 __cdecl __MINGW_NOTHROW _filelengthi64(int); -_CRTIMP long __cdecl __MINGW_NOTHROW _findfirsti64(const char*, struct _finddatai64_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW _findnexti64(long, struct _finddatai64_t*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _findfirsti64(const char*, struct _finddatai64_t*); +_CRTIMP int __cdecl __MINGW_NOTHROW _findnexti64(intptr_t, struct _finddatai64_t*); _CRTIMP __int64 __cdecl __MINGW_NOTHROW _lseeki64(int, __int64, int); _CRTIMP __int64 __cdecl __MINGW_NOTHROW _telli64(int); /* These require newer versions of msvcrt.dll (6.1 or higher). */ @@ -259,14 +259,14 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _waccess(const wchar_t*, int); _CRTIMP int __cdecl __MINGW_NOTHROW _wchmod(const wchar_t*, int); _CRTIMP int __cdecl __MINGW_NOTHROW _wcreat(const wchar_t*, int); -_CRTIMP long __cdecl __MINGW_NOTHROW _wfindfirst(const wchar_t*, struct _wfinddata_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW _wfindnext(long, struct _wfinddata_t *); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wfindfirst(const wchar_t*, struct _wfinddata_t*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wfindnext(intptr_t, struct _wfinddata_t *); _CRTIMP int __cdecl __MINGW_NOTHROW _wunlink(const wchar_t*); _CRTIMP int __cdecl __MINGW_NOTHROW _wopen(const wchar_t*, int, ...); _CRTIMP int __cdecl __MINGW_NOTHROW _wsopen(const wchar_t*, int, int, ...); _CRTIMP wchar_t * __cdecl __MINGW_NOTHROW _wmktemp(wchar_t*); -_CRTIMP long __cdecl __MINGW_NOTHROW _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW _wfindnexti64(long, struct _wfinddatai64_t*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*); +_CRTIMP int __cdecl __MINGW_NOTHROW _wfindnexti64(intptr_t, struct _wfinddatai64_t*); #if __MSVCRT_VERSION__ >= 0x0601 _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wfindfirst64(const wchar_t*, struct __wfinddata64_t*); _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wfindnext64(intptr_t, struct __wfinddata64_t*); Modified: branches/ros-amd64-bringup/reactos/include/reactos/wine/library.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/wine/library.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/wine/library.h [iso-8859-1] Wed Jul 23 19:20:01 2008 @@ -23,6 +23,7 @@ #include <stdarg.h> #include <sys/types.h> +#include <stdint.h> #include <windef.h> #include <winbase.h> @@ -131,9 +132,9 @@ /* helper functions to manipulate the LDT_ENTRY structure */ inline static void wine_ldt_set_base( LDT_ENTRY *ent, const void *base ) { - ent->BaseLow = (WORD)(unsigned long)base; - ent->HighWord.Bits.BaseMid = (BYTE)((unsigned long)base >> 16); - ent->HighWord.Bits.BaseHi = (BYTE)((unsigned long)base >> 24); + ent->BaseLow = (WORD)(intptr_t)base; + ent->HighWord.Bits.BaseMid = (BYTE)((intptr_t)base >> 16); + ent->HighWord.Bits.BaseHi = (BYTE)((intptr_t)base >> 24); } inline static void wine_ldt_set_limit( LDT_ENTRY *ent, unsigned int limit ) { @@ -144,8 +145,8 @@ inline static void *wine_ldt_get_base( const LDT_ENTRY *ent ) { return (void *)(ent->BaseLow | - (unsigned long)ent->HighWord.Bits.BaseMid << 16 | - (unsigned long)ent->HighWord.Bits.BaseHi << 24); + (intptr_t)ent->HighWord.Bits.BaseMid << 16 | + (intptr_t)ent->HighWord.Bits.BaseHi << 24); } inline static unsigned int wine_ldt_get_limit( const LDT_ENTRY *ent ) { Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c [iso-8859-1] Wed Jul 23 19:20:01 2008 @@ -13,6 +13,7 @@ /* Needed for the atexit prototype. */ #include <stdlib.h> +#include <stddef.h> typedef void (*func_ptr) (void); extern func_ptr __CTOR_LIST__[]; @@ -37,8 +38,8 @@ void __do_global_ctors (void) { - unsigned long nptrs = (unsigned long) __CTOR_LIST__[0]; - unsigned i; + unsigned long nptrs = (unsigned long) (ptrdiff_t) __CTOR_LIST__[0]; + unsigned long i; /* * If the first entry in the constructor list is -1 then the list @@ -47,8 +48,7 @@ */ if (nptrs == -1) { - for (nptrs = 0; __CTOR_LIST__[nptrs + 1] != 0; nptrs++) - ; + for (nptrs = 0; __CTOR_LIST__[nptrs + 1] != 0; nptrs++); } /* @@ -77,3 +77,4 @@ } } + Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] Wed Jul 23 19:20:01 2008 @@ -28,12 +28,12 @@ static void do_pseudo_reloc (void* start, void* end, void* base) { - DWORD reloc_target; + ptrdiff_t reloc_target; runtime_pseudo_reloc* r; for (r = (runtime_pseudo_reloc*) start; r < (runtime_pseudo_reloc*) end; r++) { - reloc_target = (DWORD) base + r->target; - *((DWORD*) reloc_target) += r->addend; + reloc_target = (ptrdiff_t) base + r->target; + *((ptrdiff_t*) reloc_target) += r->addend; } } Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/misc/getargs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/misc/getargs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/misc/getargs.c [iso-8859-1] Wed Jul 23 19:20:01 2008 @@ -24,7 +24,7 @@ extern HANDLE hHeap; -char* strndup(char* name, int len) +char* strndup(char* name, size_t len) { char *s = malloc(len + 1); if (s != NULL) @@ -35,7 +35,7 @@ return s; } -wchar_t* wcsndup(wchar_t* name, int len) +wchar_t* wcsndup(wchar_t* name, size_t len) { wchar_t *s = malloc((len + 1) * sizeof(wchar_t)); if (s != NULL) @@ -362,3 +362,4 @@ return &__wargv; } + Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/search/lfind.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/search/lfind.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/search/lfind.c [iso-8859-1] Wed Jul 23 19:20:01 2008 @@ -1,12 +1,11 @@ +#include <stdlib.h> #include <search.h> -#include <stdlib.h> - /* * @implemented */ -void *_lfind(const void *key, const void *base, size_t *nelp, - size_t width, int (*compar)(const void *, const void *)) +void *_lfind(const void *key, const void *base, unsigned int *nelp, + unsigned int width, int (*compar)(const void *, const void *)) { char* char_base = (char*)base; unsigned int i; @@ -19,3 +18,4 @@ return NULL; } + Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/search/lsearch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/search/lsearch.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/search/lsearch.c [iso-8859-1] Wed Jul 23 19:20:01 2008 @@ -1,11 +1,11 @@ -#include <search.h> #include <stdlib.h> #include <string.h> +#include <search.h> /* * @implemented */ -void *_lsearch(const void *key, void *base, size_t *nelp, size_t width, +void *_lsearch(const void *key, void *base, unsigned int *nelp, unsigned int width, int (*compar)(const void *, const void *)) { void *ret_find = _lfind(key,base,nelp,width,compar); @@ -19,3 +19,4 @@ return base; } + Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/find.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/find.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/find.c [iso-8859-1] Wed Jul 23 19:20:01 2008 @@ -4,17 +4,13 @@ /* * @implemented */ -#if defined(_UNICODE) || !(__MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 3) -long -#else -int -#endif +intptr_t _tfindfirst(const _TCHAR* _name, struct _tfinddata_t* result) { WIN32_FIND_DATA FindFileData; long hFindFile; - hFindFile = (long)FindFirstFile(_name, &FindFileData); + hFindFile = (intptr_t)FindFirstFile(_name, &FindFileData); if (hFindFile == -1) { _dosmaperr(GetLastError()); return -1; @@ -33,13 +29,7 @@ /* * @implemented */ -int _tfindnext( -#if defined(_UNICODE) || !(__MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 3) - long handle, -#else - int handle, -#endif - struct _tfinddata_t* result) +intptr_t _tfindnext(intptr_t handle, struct _tfinddata_t* result) { WIN32_FIND_DATA FindFileData; @@ -62,12 +52,12 @@ /* * @implemented */ -long _tfindfirsti64(const _TCHAR *_name, struct _tfinddatai64_t *result) +intptr_t _tfindfirsti64(const _TCHAR *_name, struct _tfinddatai64_t *result) { WIN32_FIND_DATA FindFileData; long hFindFile; - hFindFile = (long)FindFirstFile(_name, &FindFileData); + hFindFile = (intptr_t)FindFirstFile(_name, &FindFileData); if (hFindFile == -1) { _dosmaperr(GetLastError()); @@ -85,14 +75,10 @@ return hFindFile; } -//_CRTIMP long __cdecl _findfirsti64(const char*, struct _finddatai64_t*); -//_CRTIMP int __cdecl _findnexti64(long, struct _finddatai64_t*); - - /* * @implemented */ -int _tfindnexti64(long handle, struct _tfinddatai64_t *result) +int _tfindnexti64(intptr_t handle, struct _tfinddatai64_t *result) { WIN32_FIND_DATA FindFileData; @@ -119,15 +105,9 @@ /* * @implemented */ -int _findclose( -#if __MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 3 - int handle -#else - long handle -#endif - ) +int _findclose(intptr_t handle) { - if (!FindClose((void*)handle)) { + if (!FindClose((HANDLE)handle)) { _dosmaperr(GetLastError()); return -1; }

1 0

[tkreuzer] 34716: rtl: - amd64/add debug_asm.S (FIXME) - cast AtomName to ULONG_PTR instead of ULONG - RtlQueryProcessdebugInformation(): cast teb->Cid.UniqueProcess to ULONG_PTR for assignment to Pid. (should ProcessId parameter be ULONG_PTR, too?) - vs(w)nprintf: cast argument to ULONG_PTR instead of unsigned long for a %p - comment out some inlined Interlocked functions that shouldn't be there anyway Now rtl can be compiled
by tkreuzer＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: tkreuzer Date: Wed Jul 23 18:56:37 2008 New Revision: 34716 URL: http://svn.reactos.org/svn/reactos?rev=34716&view=rev Log: rtl: - amd64/add debug_asm.S (FIXME) - cast AtomName to ULONG_PTR instead of ULONG - RtlQueryProcessdebugInformation(): cast teb->Cid.UniqueProcess to ULONG_PTR for assignment to Pid. (should ProcessId parameter be ULONG_PTR, too?) - vs(w)nprintf: cast argument to ULONG_PTR instead of unsigned long for a %p - comment out some inlined Interlocked functions that shouldn't be there anyway Now rtl can be compiled Added: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/debug_asm.S (with props) Modified: branches/ros-amd64-bringup/reactos/lib/rtl/atom.c branches/ros-amd64-bringup/reactos/lib/rtl/dbgbuffer.c branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild branches/ros-amd64-bringup/reactos/lib/rtl/sprintf.c branches/ros-amd64-bringup/reactos/lib/rtl/srw.c branches/ros-amd64-bringup/reactos/lib/rtl/swprintf.c Added: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/debug_asm.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/debug_asm.S (added) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/debug_asm.S [iso-8859-1] Wed Jul 23 18:56:37 2008 @@ -1,0 +1,77 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Run-Time Library + * PURPOSE: Debug Routines + * FILE: lib/rtl/i386/debug.S + * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) + */ + +.intel_syntax noprefix + +/* GLOBALS ****************************************************************/ + +.globl _DbgBreakPoint +.globl _DbgBreakPointWithStatus +.globl _DbgUserBreakPoint +.globl _DebugService +.globl _DebugService2 +.globl _DbgBreakPointNoBugCheck +.globl _RtlpBreakWithStatusInstruction + +/* FUNCTIONS ***************************************************************/ + +.func DbgBreakPointNoBugCheck +_DbgBreakPointNoBugCheck: + int 3 + ret +.endfunc + +.func DbgBreakPoint +_DbgBreakPoint: +_DbgUserBreakPoint: + int 3 + ret +.endfunc + +.func DbgBreakPointWithStatus +_DbgBreakPointWithStatus: + mov eax, ecx + +_RtlpBreakWithStatusInstruction: + int 3 + ret +.endfunc + +.func DebugService2 +_DebugService2: + /* Call the interrupt */ +// mov eax, [rbp+8] +// int 0x2D + int 3 + +.endfunc + +.func DebugService +_DebugService: + + /* Save the registers */ + push rcx + push rbx + push rdi + push rdi + push rbx + + /* Call the Interrupt */ + // FIXME: setup registers + int 0x2D + int 3 + + /* Restore registers */ + pop rbx + pop rdi + pop rdi + pop rbx + + /* Return */ + ret 20 +.endfunc Propchange: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/debug_asm.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/rtl/atom.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/atom.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/atom.c [iso-8859-1] Wed Jul 23 18:56:37 2008 @@ -90,9 +90,9 @@ DPRINT("RtlpCheckIntegerAtom(AtomName '%S' AtomValue %p)\n", AtomName, AtomValue); - if (!((ULONG)AtomName & 0xFFFF0000)) - { - LoValue = (USHORT)((ULONG)AtomName & 0xFFFF); + if (!((ULONG_PTR)AtomName & 0xFFFF0000)) + { + LoValue = (USHORT)((ULONG_PTR)AtomName & 0xFFFF); if (LoValue == 0) LoValue = 0xC000; Modified: branches/ros-amd64-bringup/reactos/lib/rtl/dbgbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] Wed Jul 23 18:56:37 2008 @@ -234,7 +234,7 @@ IN OUT PRTL_DEBUG_INFORMATION Buf) { NTSTATUS Status = STATUS_SUCCESS; - ULONG Pid = (ULONG) NtCurrentTeb()->Cid.UniqueProcess; + ULONG Pid = (ULONG_PTR) NtCurrentTeb()->Cid.UniqueProcess; Buf->Flags = DebugInfoMask; Buf->OffsetFree = sizeof(RTL_DEBUG_INFORMATION); @@ -319,7 +319,7 @@ Buf->TargetProcessHandle = NtCurrentProcess(); ClientId.UniqueThread = 0; - ClientId.UniqueProcess = (HANDLE)ProcessId; + ClientId.UniqueProcess = (HANDLE)(ULONG_PTR)ProcessId; InitializeObjectAttributes(&ObjectAttributes, NULL, 0, Modified: branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Wed Jul 23 18:56:37 2008 @@ -33,8 +33,13 @@ <directory name="arm"> <file>debug_asm.S</file> </directory> - <file>mem.c</file> - <file>memgen.c</file> + <file>mem.c</file> + <file>memgen.c</file> + </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>debug_asm.S</file> + </directory> </if> <directory name="austin"> <file>avl.c</file> Modified: branches/ros-amd64-bringup/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/sprintf.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/sprintf.c [iso-8859-1] Wed Jul 23 18:56:37 2008 @@ -577,7 +577,7 @@ flags |= ZEROPAD; } str = number(str, end, - (unsigned long) va_arg(args, void *), 16, + (ULONG_PTR) va_arg(args, void *), 16, field_width, precision, flags); continue; Modified: branches/ros-amd64-bringup/reactos/lib/rtl/srw.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/srw.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/srw.c [iso-8859-1] Wed Jul 23 18:56:37 2008 @@ -21,6 +21,7 @@ /* FIXME *********************************************************************/ /* FIXME: Interlocked functions that need to be made into a public header */ +#if 0 FORCEINLINE LONG InterlockedAnd(IN OUT volatile LONG *Target, @@ -60,6 +61,7 @@ return j; } +#endif /* FUNCTIONS *****************************************************************/ @@ -87,7 +89,7 @@ RTL_SRWLOCK_SHARED | RTL_SRWLOCK_CONTENTION_LOCK) #define RTL_SRWLOCK_BITS 4 -#if defined(__GNUC__) +#if defined(__GNUC__) && !defined(_M_AMD64) /* This macro will cause the code to assert if compiled with a buggy version of GCC that doesn't align the wait blocks properly on the stack! */ #define ASSERT_SRW_WAITBLOCK(ptr) \ Modified: branches/ros-amd64-bringup/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/swprintf.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/swprintf.c [iso-8859-1] Wed Jul 23 18:56:37 2008 @@ -575,7 +575,7 @@ flags |= ZEROPAD; } str = number(str, end, - (unsigned long) va_arg(args, void *), 16, + (ULONG_PTR) va_arg(args, void *), 16, field_width, precision, flags); continue;

1 0

[tkreuzer] 34715: comment out a few libs for now that don't build
by tkreuzer＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: tkreuzer Date: Wed Jul 23 18:40:33 2008 New Revision: 34715 URL: http://svn.reactos.org/svn/reactos?rev=34715&view=rev Log: comment out a few libs for now that don't build Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/3rdparty.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/3rdparty.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/3rdparty.rbuild [iso-8859-1] Wed Jul 23 18:40:33 2008 @@ -4,24 +4,30 @@ <directory name="adns"> <xi:include href="adns/adns.rbuild" /> </directory> + <directory name="expat"> <xi:include href="expat/expat.rbuild" /> </directory> <directory name="icu4ros"> <xi:include href="icu4ros/icu4ros.rbuild" /> </directory> + <directory name="libxml2"> <xi:include href="libxml2/libxml2.rbuild" /> </directory> + <directory name="zlib"> <xi:include href="zlib/zlib.rbuild" /> </directory>

1 0

[tkreuzer] 34714: recyclebin: - DWORD -> SIZE_T and SIZE_T -> DWORD
by tkreuzer＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: tkreuzer Date: Wed Jul 23 18:37:01 2008 New Revision: 34714 URL: http://svn.reactos.org/svn/reactos?rev=34714&view=rev Log: recyclebin: - DWORD -> SIZE_T and SIZE_T -> DWORD Modified: branches/ros-amd64-bringup/reactos/lib/recyclebin/recyclebin_v5.c branches/ros-amd64-bringup/reactos/lib/recyclebin/recyclebin_v5_enumerator.c Modified: branches/ros-amd64-bringup/reactos/lib/recyclebin/recyclebin_v5.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/recyclebin/recyclebin_v5.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/recyclebin/recyclebin_v5.c [iso-8859-1] Wed Jul 23 18:37:01 2008 @@ -558,7 +558,7 @@ LPWSTR FileName; /* Pointer into BufferName buffer */ LPCSTR DesktopIniContents = "[.ShellClassInfo]\r\nCLSID={645FF040-5081-101B-9F08-00AA002F954E}\r\n"; INFO2_HEADER Info2Contents[] = { { 5, 0, 0, 0x320, 0 } }; - SIZE_T BytesToWrite, BytesWritten, Needed; + DWORD BytesToWrite, BytesWritten, Needed; HANDLE hFile = INVALID_HANDLE_VALUE; HRESULT hr; @@ -670,7 +670,7 @@ HANDLE tokenHandle = INVALID_HANDLE_VALUE; PTOKEN_USER TokenUserInfo = NULL; LPWSTR StringSid = NULL, p; - SIZE_T Needed, DirectoryLength; + DWORD Needed, DirectoryLength; INT len; HRESULT hr; Modified: branches/ros-amd64-bringup/reactos/lib/recyclebin/recyclebin_v5_enumerator.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/recyclebin/recyclebin_v5_enumerator.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/recyclebin/recyclebin_v5_enumerator.c [iso-8859-1] Wed Jul 23 18:37:01 2008 @@ -191,9 +191,9 @@ static HRESULT STDMETHODCALLTYPE RecycleBin5File_RecycleBinFile_GetFileName( IN IRecycleBinFile *This, - IN DWORD BufferSize, + IN SIZE_T BufferSize, IN OUT LPWSTR Buffer, - OUT DWORD *RequiredSize) + OUT SIZE_T *RequiredSize) { struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); DWORD dwRequired;

1 0

[tkreuzer] 34713: fix NtCurrentTeb()
by tkreuzer＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: tkreuzer Date: Wed Jul 23 18:28:07 2008 New Revision: 34713 URL: http://svn.reactos.org/svn/reactos?rev=34713&view=rev Log: fix NtCurrentTeb() Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] Wed Jul 23 18:28:07 2008 @@ -4153,7 +4153,7 @@ #elif defined (_M_AMD64) FORCEINLINE struct _TEB * NtCurrentTeb(VOID) { - return __readgsqword(FIELD_OFFSET(NT_TIB, Self)); + return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB, Self)); } #else static __inline__ struct _TEB * NtCurrentTeb(void)

1 0

[tkreuzer] 34712: fix KeGetCurrentPrcb() inline function
by tkreuzer＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: tkreuzer Date: Wed Jul 23 18:18:45 2008 New Revision: 34712 URL: http://svn.reactos.org/svn/reactos?rev=34712&view=rev Log: fix KeGetCurrentPrcb() inline function Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Wed Jul 23 18:18:45 2008 @@ -296,7 +296,7 @@ struct _KPRCB * KeGetCurrentPrcb(VOID) { - return (struct _KPRCB *)(ULONG_PTR)__readfsdword(FIELD_OFFSET(KPCR, Prcb)); + return (struct _KPRCB *)(ULONG_PTR)__readgsqword(FIELD_OFFSET(KPCR, Prcb)); } //

1 0

[tkreuzer] 34711: add amd64 ketypes.h and mmtypes.h copied from x86
by tkreuzer＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: tkreuzer Date: Wed Jul 23 18:17:46 2008 New Revision: 34711 URL: http://svn.reactos.org/svn/reactos?rev=34711&view=rev Log: add amd64 ketypes.h and mmtypes.h copied from x86 Added: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h (with props) branches/ros-amd64-bringup/reactos/include/ndk/amd64/mmtypes.h (with props) Modified: branches/ros-amd64-bringup/reactos/include/ndk/arch/ketypes.h Added: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h (added) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Wed Jul 23 18:17:46 2008 @@ -1,0 +1,725 @@ +/*++ NDK Version: 0098 + +Copyright (c) Alex Ionescu. All rights reserved. + +Header Name: + + ketypes.h (X86) + +Abstract: + + i386 Type definitions for the Kernel services. + +Author: + + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 + +--*/ + +#ifndef _I386_KETYPES_H +#define _I386_KETYPES_H + +// +// Dependencies +// + +// +// KPCR Access for non-IA64 builds +// +#define K0IPCR ((ULONG_PTR)(KIP0PCRADDRESS)) +#define PCR ((volatile KPCR * const)K0IPCR) +#if defined(CONFIG_SMP) || defined(NT_BUILD) +#undef KeGetPcr +#define KeGetPcr() ((volatile KPCR * const)__readfsdword(0x1C)) +#endif + +// +// Machine Types +// +#define MACHINE_TYPE_ISA 0x0000 +#define MACHINE_TYPE_EISA 0x0001 +#define MACHINE_TYPE_MCA 0x0002 + +// +// X86 80386 Segment Types +// +#define I386_TASK_GATE 0x5 +#define I386_TSS 0x9 +#define I386_ACTIVE_TSS 0xB +#define I386_CALL_GATE 0xC +#define I386_INTERRUPT_GATE 0xE +#define I386_TRAP_GATE 0xF + +// +// Selector Names +// +#define RPL_MASK 0x0003 +#define MODE_MASK 0x0001 +#define KGDT_R0_CODE 0x8 +#define KGDT_R0_DATA 0x10 +#define KGDT_R3_CODE 0x18 +#define KGDT_R3_DATA 0x20 +#define KGDT_TSS 0x28 +#define KGDT_R0_PCR 0x30 +#define KGDT_R3_TEB 0x38 +#define KGDT_LDT 0x48 +#define KGDT_DF_TSS 0x50 +#define KGDT_NMI_TSS 0x58 + +// +// CR4 +// +#define CR4_VME 0x1 +#define CR4_PVI 0x2 +#define CR4_TSD 0x4 +#define CR4_DE 0x8 +#define CR4_PSE 0x10 +#define CR4_PAE 0x20 +#define CR4_MCE 0x40 +#define CR4_PGE 0x80 +#define CR4_FXSR 0x200 +#define CR4_XMMEXCPT 0x400 + +// +// EFlags +// +#define EFLAGS_CF 0x01L +#define EFLAGS_ZF 0x40L +#define EFLAGS_TF 0x100L +#define EFLAGS_INTERRUPT_MASK 0x200L +#define EFLAGS_DF 0x400L +#define EFLAGS_NESTED_TASK 0x4000L +#define EFLAGS_V86_MASK 0x20000 +#define EFLAGS_ALIGN_CHECK 0x40000 +#define EFLAGS_VIF 0x80000 +#define EFLAGS_VIP 0x100000 +#define EFLAGS_USER_SANITIZE 0x3F4DD7 +#define EFLAG_SIGN 0x8000 +#define EFLAG_ZERO 0x4000 + +// +// IPI Types +// +#define IPI_APC 1 +#define IPI_DPC 2 +#define IPI_FREEZE 4 +#define IPI_PACKET_READY 8 +#define IPI_SYNCH_REQUEST 16 + +// +// PRCB Flags +// +#define PRCB_MAJOR_VERSION 1 +#define PRCB_BUILD_DEBUG 1 +#define PRCB_BUILD_UNIPROCESSOR 2 + +// +// HAL Variables +// +#define INITIAL_STALL_COUNT 0x64 + +// +// IOPM Definitions +// +#define IO_ACCESS_MAP_NONE 0 +#define IOPM_OFFSET FIELD_OFFSET(KTSS, IoMaps[0].IoMap) +#define KiComputeIopmOffset(MapNumber) \ + (MapNumber == IO_ACCESS_MAP_NONE) ? \ + (USHORT)(sizeof(KTSS)) : \ + (USHORT)(FIELD_OFFSET(KTSS, IoMaps[MapNumber-1].IoMap)) + +// +// Static Kernel-Mode Address start (use MM_KSEG0_BASE for actual) +// +#define KSEG0_BASE 0x80000000 + +// +// Synchronization-level IRQL +// +#ifndef CONFIG_SMP +#define SYNCH_LEVEL DISPATCH_LEVEL +#else +#define SYNCH_LEVEL (IPI_LEVEL - 1) +#endif + +// +// Trap Frame Definition +// +typedef struct _KTRAP_FRAME +{ + ULONG DbgEbp; + ULONG DbgEip; + ULONG DbgArgMark; + ULONG DbgArgPointer; + ULONG TempSegCs; + ULONG TempEsp; + ULONG Dr0; + ULONG Dr1; + ULONG Dr2; + ULONG Dr3; + ULONG Dr6; + ULONG Dr7; + ULONG SegGs; + ULONG SegEs; + ULONG SegDs; + ULONG Edx; + ULONG Ecx; + ULONG Eax; + ULONG PreviousPreviousMode; + struct _EXCEPTION_REGISTRATION_RECORD FAR *ExceptionList; + ULONG SegFs; + ULONG Edi; + ULONG Esi; + ULONG Ebx; + ULONG Ebp; + ULONG ErrCode; + ULONG Eip; + ULONG SegCs; + ULONG EFlags; + ULONG HardwareEsp; + ULONG HardwareSegSs; + ULONG V86Es; + ULONG V86Ds; + ULONG V86Fs; + ULONG V86Gs; +} KTRAP_FRAME, *PKTRAP_FRAME; + +// +// LDT Entry Definition +// +#ifndef _LDT_ENTRY_DEFINED +#define _LDT_ENTRY_DEFINED +typedef struct _LDT_ENTRY +{ + USHORT LimitLow; + USHORT BaseLow; + union + { + struct + { + UCHAR BaseMid; + UCHAR Flags1; + UCHAR Flags2; + UCHAR BaseHi; + } Bytes; + struct + { + ULONG BaseMid:8; + ULONG Type:5; + ULONG Dpl:2; + ULONG Pres:1; + ULONG LimitHi:4; + ULONG Sys:1; + ULONG Reserved_0:1; + ULONG Default_Big:1; + ULONG Granularity:1; + ULONG BaseHi:8; + } Bits; + } HighWord; +} LDT_ENTRY, *PLDT_ENTRY, *LPLDT_ENTRY; +#endif + +// +// GDT Entry Definition +// +typedef struct _KGDTENTRY +{ + USHORT LimitLow; + USHORT BaseLow; + union + { + struct + { + UCHAR BaseMid; + UCHAR Flags1; + UCHAR Flags2; + UCHAR BaseHi; + } Bytes; + struct + { + ULONG BaseMid:8; + ULONG Type:5; + ULONG Dpl:2; + ULONG Pres:1; + ULONG LimitHi:4; + ULONG Sys:1; + ULONG Reserved_0:1; + ULONG Default_Big:1; + ULONG Granularity:1; + ULONG BaseHi:8; + } Bits; + } HighWord; +} KGDTENTRY, *PKGDTENTRY; + +// +// IDT Entry Access Definition +// +typedef struct _KIDT_ACCESS +{ + union + { + struct + { + UCHAR Reserved; + UCHAR SegmentType:4; + UCHAR SystemSegmentFlag:1; + UCHAR Dpl:2; + UCHAR Present:1; + }; + USHORT Value; + }; +} KIDT_ACCESS, *PKIDT_ACCESS; + +// +// IDT Entry Definition +// +typedef struct _KIDTENTRY +{ + USHORT Offset; + USHORT Selector; + USHORT Access; + USHORT ExtendedOffset; +} KIDTENTRY, *PKIDTENTRY; + +typedef struct _DESCRIPTOR +{ + USHORT Pad; + USHORT Limit; + ULONG Base; +} KDESCRIPTOR, *PKDESCRIPTOR; + +#ifndef NTOS_MODE_USER +// +// Macro to get current KPRCB +// +FORCEINLINE +struct _KPRCB * +KeGetCurrentPrcb(VOID) +{ + return (struct _KPRCB *)(ULONG_PTR)__readfsdword(FIELD_OFFSET(KPCR, Prcb)); +} + +// +// FN/FX (FPU) Save Area Structures +// +typedef struct _FNSAVE_FORMAT +{ + ULONG ControlWord; + ULONG StatusWord; + ULONG TagWord; + ULONG ErrorOffset; + ULONG ErrorSelector; + ULONG DataOffset; + ULONG DataSelector; + UCHAR RegisterArea[80]; +} FNSAVE_FORMAT, *PFNSAVE_FORMAT; + +typedef struct _FXSAVE_FORMAT +{ + USHORT ControlWord; + USHORT StatusWord; + USHORT TagWord; + USHORT ErrorOpcode; + ULONG ErrorOffset; + ULONG ErrorSelector; + ULONG DataOffset; + ULONG DataSelector; + ULONG MXCsr; + ULONG MXCsrMask; + UCHAR RegisterArea[128]; + UCHAR Reserved3[128]; + UCHAR Reserved4[224]; + UCHAR Align16Byte[8]; +} FXSAVE_FORMAT, *PFXSAVE_FORMAT; + +typedef struct _FX_SAVE_AREA +{ + union + { + FNSAVE_FORMAT FnArea; + FXSAVE_FORMAT FxArea; + } U; + ULONG NpxSavedCpu; + ULONG Cr0NpxState; +} FX_SAVE_AREA, *PFX_SAVE_AREA; + +// +// Special Registers Structure (outside of CONTEXT) +// +typedef struct _KSPECIAL_REGISTERS +{ + ULONG Cr0; + ULONG Cr2; + ULONG Cr3; + ULONG Cr4; + ULONG KernelDr0; + ULONG KernelDr1; + ULONG KernelDr2; + ULONG KernelDr3; + ULONG KernelDr6; + ULONG KernelDr7; + KDESCRIPTOR Gdtr; + KDESCRIPTOR Idtr; + USHORT Tr; + USHORT Ldtr; + ULONG Reserved[6]; +} KSPECIAL_REGISTERS, *PKSPECIAL_REGISTERS; + +// +// Processor State Data +// +typedef struct _KPROCESSOR_STATE +{ + CONTEXT ContextFrame; + KSPECIAL_REGISTERS SpecialRegisters; +} KPROCESSOR_STATE, *PKPROCESSOR_STATE; + +// +// Processor Region Control Block +// +#pragma pack(push,4) +typedef struct _KPRCB +{ + USHORT MinorVersion; + USHORT MajorVersion; + struct _KTHREAD *CurrentThread; + struct _KTHREAD *NextThread; + struct _KTHREAD *IdleThread; + UCHAR Number; + UCHAR Reserved; + USHORT BuildType; + KAFFINITY SetMember; + UCHAR CpuType; + UCHAR CpuID; + USHORT CpuStep; + KPROCESSOR_STATE ProcessorState; + ULONG KernelReserved[16]; + ULONG HalReserved[16]; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG CFlushSize; + UCHAR PrcbPad0[88]; +#else + UCHAR PrcbPad0[92]; +#endif + KSPIN_LOCK_QUEUE LockQueue[LockQueueMaximumLock]; + struct _KTHREAD *NpxThread; + ULONG InterruptCount; + ULONG KernelTime; + ULONG UserTime; + ULONG DpcTime; + ULONG DebugDpcTime; + ULONG InterruptTime; + ULONG AdjustDpcThreshold; + ULONG PageColor; + UCHAR SkipTick; + UCHAR DebuggerSavedIRQL; +#if (NTDDI_VERSION >= NTDDI_WS03) + UCHAR NodeColor; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + UCHAR PollSlot; +#else + UCHAR Spare1; +#endif + ULONG NodeShiftedColor; +#else + UCHAR Spare1[6]; +#endif + struct _KNODE *ParentNode; + ULONG MultiThreadProcessorSet; + struct _KPRCB *MultiThreadSetMaster; +#if (NTDDI_VERSION >= NTDDI_WS03) + ULONG SecondaryColorMask; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG DpcTimeLimit; +#else + LONG Sleeping; +#endif +#else + ULONG ThreadStartCount[2]; +#endif + ULONG CcFastReadNoWait; + ULONG CcFastReadWait; + ULONG CcFastReadNotPossible; + ULONG CcCopyReadNoWait; + ULONG CcCopyReadWait; + ULONG CcCopyReadNoWaitMiss; +#if (NTDDI_VERSION < NTDDI_LONGHORN) + ULONG KeAlignmentFixupCount; +#endif + ULONG SpareCounter0; +#if (NTDDI_VERSION < NTDDI_LONGHORN) + ULONG KeDcacheFlushCount; + ULONG KeExceptionDispatchCount; + ULONG KeFirstLevelTbFills; + ULONG KeFloatingEmulationCount; + ULONG KeIcacheFlushCount; + ULONG KeSecondLevelTbFills; + ULONG KeSystemCalls; +#endif + volatile ULONG IoReadOperationCount; + volatile ULONG IoWriteOperationCount; + volatile ULONG IoOtherOperationCount; + LARGE_INTEGER IoReadTransferCount; + LARGE_INTEGER IoWriteTransferCount; + LARGE_INTEGER IoOtherTransferCount; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG CcFastMdlReadNoWait; + ULONG CcFastMdlReadWait; + ULONG CcFastMdlReadNotPossible; + ULONG CcMapDataNoWait; + ULONG CcMapDataWait; + ULONG CcPinMappedDataCount; + ULONG CcPinReadNoWait; + ULONG CcPinReadWait; + ULONG CcMdlReadNoWait; + ULONG CcMdlReadWait; + ULONG CcLazyWriteHotSpots; + ULONG CcLazyWriteIos; + ULONG CcLazyWritePages; + ULONG CcDataFlushes; + ULONG CcDataPages; + ULONG CcLostDelayedWrites; + ULONG CcFastReadResourceMiss; + ULONG CcCopyReadWaitMiss; + ULONG CcFastMdlReadResourceMiss; + ULONG CcMapDataNoWaitMiss; + ULONG CcMapDataWaitMiss; + ULONG CcPinReadNoWaitMiss; + ULONG CcPinReadWaitMiss; + ULONG CcMdlReadNoWaitMiss; + ULONG CcMdlReadWaitMiss; + ULONG CcReadAheadIos; + ULONG KeAlignmentFixupCount; + ULONG KeExceptionDispatchCount; + ULONG KeSystemCalls; + ULONG PrcbPad1[3]; +#else + ULONG SpareCounter1[8]; +#endif + PP_LOOKASIDE_LIST PPLookasideList[16]; + PP_LOOKASIDE_LIST PPNPagedLookasideList[32]; + PP_LOOKASIDE_LIST PPPagedLookasideList[32]; + volatile ULONG PacketBarrier; + volatile ULONG ReverseStall; + PVOID IpiFrame; + UCHAR PrcbPad2[52]; + volatile PVOID CurrentPacket[3]; + volatile ULONG TargetSet; + volatile PKIPI_WORKER WorkerRoutine; + volatile ULONG IpiFrozen; + UCHAR PrcbPad3[40]; + volatile ULONG RequestSummary; + volatile struct _KPRCB *SignalDone; + UCHAR PrcbPad4[56]; + struct _KDPC_DATA DpcData[2]; + PVOID DpcStack; + ULONG MaximumDpcQueueDepth; + ULONG DpcRequestRate; + ULONG MinimumDpcRate; + volatile UCHAR DpcInterruptRequested; + volatile UCHAR DpcThreadRequested; + volatile UCHAR DpcRoutineActive; + volatile UCHAR DpcThreadActive; + ULONG PrcbLock; + ULONG DpcLastCount; + volatile ULONG TimerHand; + volatile ULONG TimerRequest; + PVOID DpcThread; + KEVENT DpcEvent; + UCHAR ThreadDpcEnable; + volatile BOOLEAN QuantumEnd; + UCHAR PrcbPad50; + volatile UCHAR IdleSchedule; + LONG DpcSetEventRequest; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + LONG Sleeping; + ULONG PeriodicCount; + ULONG PeriodicBias; + UCHAR PrcbPad5[6]; +#else + UCHAR PrcbPad5[18]; +#endif + LONG TickOffset; + KDPC CallDpc; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + LONG ClockKeepAlive; + UCHAR ClockCheckSlot; + UCHAR ClockPollCycle; + UCHAR PrcbPad6[2]; + LONG DpcWatchdogPeriod; + LONG DpcWatchDogCount; + LONG ThreadWatchdogPeriod; + LONG ThreadWatchDogCount; + ULONG PrcbPad70[2]; +#else + ULONG PrcbPad7[8]; +#endif + LIST_ENTRY WaitListHead; + ULONG ReadySummary; + ULONG QueueIndex; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + SINGLE_LIST_ENTRY DeferredReadyListHead; + ULONGLONG StartCycles; + ULONGLONG CycleTime; + ULONGLONG PrcbPad71[3]; + LIST_ENTRY DispatcherReadyListHead[32]; +#else + LIST_ENTRY DispatcherReadyListHead[32]; + SINGLE_LIST_ENTRY DeferredReadyListHead; + ULONG PrcbPad72[11]; +#endif + PVOID ChainedInterruptList; + LONG LookasideIrpFloat; + volatile LONG MmPageFaultCount; + volatile LONG MmCopyOnWriteCount; + volatile LONG MmTransitionCount; + volatile LONG MmCacheTransitionCount; + volatile LONG MmDemandZeroCount; + volatile LONG MmPageReadCount; + volatile LONG MmPageReadIoCount; + volatile LONG MmCacheReadCount; + volatile LONG MmCacheIoCount; + volatile LONG MmDirtyPagesWriteCount; + volatile LONG MmDirtyWriteIoCount; + volatile LONG MmMappedPagesWriteCount; + volatile LONG MmMappedWriteIoCount; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG CachedCommit; + ULONG CachedResidentAvailable; + PVOID HyperPte; + UCHAR CpuVendor; + UCHAR PrcbPad9[3]; +#else + ULONG SpareFields0[1]; +#endif + CHAR VendorString[13]; + UCHAR InitialApicId; + UCHAR LogicalProcessorsPerPhysicalProcessor; + ULONG MHz; + ULONG FeatureBits; + LARGE_INTEGER UpdateSignature; + volatile LARGE_INTEGER IsrTime; + LARGE_INTEGER SpareField1; + FX_SAVE_AREA NpxSaveArea; + PROCESSOR_POWER_STATE PowerState; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + KDPC DpcWatchdogDoc; + KTIMER DpcWatchdogTimer; + PVOID WheaInfo; + PVOID EtwSupport; + SLIST_HEADER InterruptObjectPool; + LARGE_INTEGER HyperCallPagePhysical; + LARGE_INTEGER HyperCallPageVirtual; + PVOID RateControl; + CACHE_DESCRIPTOR Cache[5]; + ULONG CacheCount; + ULONG CacheProcessorMask[5]; + UCHAR LogicalProcessorsPerCore; + UCHAR PrcbPad8[3]; + ULONG PackageProcessorSet; + ULONG CoreProcessorSet; +#endif +} KPRCB, *PKPRCB; + +// +// Processor Control Region +// +typedef struct _KIPCR +{ + union + { + NT_TIB NtTib; + struct + { + struct _EXCEPTION_REGISTRATION_RECORD *Used_ExceptionList; + PVOID Used_StackBase; + PVOID PerfGlobalGroupMask; + PVOID TssCopy; + ULONG ContextSwitches; + KAFFINITY SetMemberCopy; + PVOID Used_Self; + }; + }; + struct _KPCR *Self; + struct _KPRCB *Prcb; + KIRQL Irql; + ULONG IRR; + ULONG IrrActive; + ULONG IDR; + PVOID KdVersionBlock; + PKIDTENTRY IDT; + PKGDTENTRY GDT; + struct _KTSS *TSS; + USHORT MajorVersion; + USHORT MinorVersion; + KAFFINITY SetMember; + ULONG StallScaleFactor; + UCHAR SparedUnused; + UCHAR Number; + UCHAR Reserved; + UCHAR L2CacheAssociativity; + ULONG VdmAlert; + ULONG KernelReserved[14]; + ULONG SecondLevelCacheSize; + ULONG HalReserved[16]; + ULONG InterruptMode; + UCHAR Spare1; + ULONG KernelReserved2[17]; + KPRCB PrcbData; +} KIPCR, *PKIPCR; +#pragma pack(pop) + +// +// TSS Definition +// +typedef struct _KiIoAccessMap +{ + UCHAR DirectionMap[32]; + UCHAR IoMap[8196]; +} KIIO_ACCESS_MAP; + +typedef struct _KTSS +{ + USHORT Backlink; + USHORT Reserved0; + ULONG Esp0; + USHORT Ss0; + USHORT Reserved1; + ULONG NotUsed1[4]; + ULONG CR3; + ULONG Eip; + ULONG EFlags; + ULONG Eax; + ULONG Ecx; + ULONG Edx; + ULONG Ebx; + ULONG Esp; + ULONG Ebp; + ULONG Esi; + ULONG Edi; + USHORT Es; + USHORT Reserved2; + USHORT Cs; + USHORT Reserved3; + USHORT Ss; + USHORT Reserved4; + USHORT Ds; + USHORT Reserved5; + USHORT Fs; + USHORT Reserved6; + USHORT Gs; + USHORT Reserved7; + USHORT LDT; + USHORT Reserved8; + USHORT Flags; + USHORT IoMapBase; + KIIO_ACCESS_MAP IoMaps[1]; + UCHAR IntDirectionMap[32]; +} KTSS, *PKTSS; + +// +// i386 CPUs don't have exception frames +// +typedef struct _KEXCEPTION_FRAME KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; +#endif +#endif Propchange: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/include/ndk/amd64/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/mmtypes.h (added) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] Wed Jul 23 18:17:46 2008 @@ -1,0 +1,169 @@ +/*++ NDK Version: 0095 + +Copyright (c) Alex Ionescu. All rights reserved. + +Header Name: + + mmtypes.h (X86) + +Abstract: + + i386 Type definitions for the Memory Manager + +Author: + + Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + +--*/ + +#ifndef _AMD64_MMTYPES_H +#define _AMD64_MMTYPES_H + +// +// Dependencies +// + +// +// Page-related Macros +// +#define PAGE_SIZE 0x1000 +#define PAGE_SHIFT 12L +#define MM_ALLOCATION_GRANULARITY 0x10000 +#define MM_ALLOCATION_GRANULARITY_SHIFT 16L + +// +// Sanity checks for Paging Macros +// +#ifdef C_ASSERT +C_ASSERT(PAGE_SIZE == (1 << PAGE_SHIFT)); +C_ASSERT(MM_ALLOCATION_GRANULARITY == (1 << MM_ALLOCATION_GRANULARITY_SHIFT)); +C_ASSERT(MM_ALLOCATION_GRANULARITY && + !(MM_ALLOCATION_GRANULARITY & (MM_ALLOCATION_GRANULARITY - 1))); +C_ASSERT(MM_ALLOCATION_GRANULARITY >= PAGE_SIZE); +#endif + +// +// PAE SEG0 Base? +// +#define KSEG0_BASE_PAE 0xE0000000 + +// +// Page Table Entry Definitions +// +typedef struct _HARDWARE_PTE_X86 +{ + ULONG Valid:1; + ULONG Write:1; + ULONG Owner:1; + ULONG WriteThrough:1; + ULONG CacheDisable:1; + ULONG Accessed:1; + ULONG Dirty:1; + ULONG LargePage:1; + ULONG Global:1; + ULONG CopyOnWrite:1; + ULONG Prototype: 1; + ULONG reserved: 1; + ULONG PageFrameNumber:20; +} HARDWARE_PTE_X86, *PHARDWARE_PTE_X86; + +typedef struct _MMPTE_SOFTWARE +{ + ULONG Valid:1; + ULONG PageFileLow:4; + ULONG Protection:5; + ULONG Prototype:1; + ULONG Transition:1; + ULONG PageFileHigh:20; +} MMPTE_SOFTWARE; + +typedef struct _MMPTE_TRANSITION +{ + ULONG Valid:1; + ULONG Write:1; + ULONG Owner:1; + ULONG WriteThrough:1; + ULONG CacheDisable:1; + ULONG Protection:5; + ULONG Prototype:1; + ULONG Transition:1; + ULONG PageFrameNumber:20; +} MMPTE_TRANSITION; + +typedef struct _MMPTE_PROTOTYPE +{ + ULONG Valid:1; + ULONG ProtoAddressLow:7; + ULONG ReadOnly:1; + ULONG WhichPool:1; + ULONG Prototype:1; + ULONG ProtoAddressHigh:21; +} MMPTE_PROTOTYPE; + +typedef struct _MMPTE_SUBSECTION +{ + ULONG Valid:1; + ULONG SubsectionAddressLow:4; + ULONG Protection:5; + ULONG Prototype:1; + ULONG SubsectionAddressHigh:20; + ULONG WhichPool:1; +} MMPTE_SUBSECTION; + +typedef struct _MMPTE_LIST +{ + ULONG Valid:1; + ULONG OneEntry:1; + ULONG filler0:8; + ULONG NextEntry:20; + ULONG Prototype:1; + ULONG filler1:1; +} MMPTE_LIST; + +#ifndef CONFIG_SMP + +typedef struct _MMPTE_HARDWARE +{ + ULONG Valid:1; + ULONG Write:1; + ULONG Owner:1; + ULONG WriteThrough:1; + ULONG CacheDisable:1; + ULONG Accessed:1; + ULONG Dirty:1; + ULONG LargePage:1; + ULONG Global:1; + ULONG CopyOnWrite:1; + ULONG Prototype:1; + ULONG reserved:1; + ULONG PageFrameNumber:20; +} MMPTE_HARDWARE, *PMMPTE_HARDWARE; + +#else + +typedef struct _MMPTE_HARDWARE +{ + ULONG Valid:1; + ULONG Writable:1; + ULONG Owner:1; + ULONG WriteThrough:1; + ULONG CacheDisable:1; + ULONG Accessed:1; + ULONG Dirty:1; + ULONG LargePage:1; + ULONG Global:1; + ULONG CopyOnWrite:1; + ULONG Prototype:1; + ULONG Write:1; + ULONG PageFrameNumber:20; +} MMPTE_HARDWARE, *PMMPTE_HARDWARE; + +#endif + +// +// Use the right PTE structure +// +#define HARDWARE_PTE HARDWARE_PTE_X86 +#define PHARDWARE_PTE PHARDWARE_PTE_X86 + +#endif Propchange: branches/ros-amd64-bringup/reactos/include/ndk/amd64/mmtypes.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/include/ndk/arch/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/arch/ketypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/arch/ketypes.h [iso-8859-1] Wed Jul 23 18:17:46 2008 @@ -24,6 +24,8 @@ // #ifdef _M_IX86 #include <i386/ketypes.h> +#elif defined(_M_AMD64) +#include <amd64/ketypes.h> #elif defined(_M_PPC) #include <powerpc/ketypes.h> #elif defined(_M_ARM)

1 0

[tkreuzer] 34710: update some loader structs ULONG -> ULONG_PTR / SIZE_T
by tkreuzer＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: tkreuzer Date: Wed Jul 23 18:03:57 2008 New Revision: 34710 URL: http://svn.reactos.org/svn/reactos?rev=34710&view=rev Log: update some loader structs ULONG -> ULONG_PTR / SIZE_T Modified: branches/ros-amd64-bringup/reactos/include/reactos/rosldr.h Modified: branches/ros-amd64-bringup/reactos/include/reactos/rosldr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/rosldr.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/rosldr.h [iso-8859-1] Wed Jul 23 18:03:57 2008 @@ -17,34 +17,34 @@ typedef struct _LOADER_MODULE { - ULONG ModStart; - ULONG ModEnd; - ULONG String; - ULONG Reserved; + ULONG_PTR ModStart; + ULONG_PTR ModEnd; + ULONG_PTR String; + ULONG_PTR Reserved; } LOADER_MODULE, *PLOADER_MODULE; typedef struct _ROS_LOADER_PARAMETER_BLOCK { ULONG Flags; - ULONG MemLower; - ULONG MemHigher; + ULONG_PTR MemLower; + ULONG_PTR MemHigher; ULONG BootDevice; PCHAR CommandLine; ULONG ModsCount; PLOADER_MODULE ModsAddr; UCHAR Syms[12]; - ULONG MmapLength; - ULONG MmapAddr; - ULONG RdLength; - ULONG RdAddr; + SIZE_T MmapLength; + ULONG_PTR MmapAddr; + SIZE_T RdLength; + ULONG_PTR RdAddr; ULONG DrivesCount; PARC_DISK_SIGNATURE DrivesAddr; ULONG ConfigTable; ULONG BootLoaderName; - ULONG PageDirectoryStart; - ULONG PageDirectoryEnd; - ULONG KernelBase; - ULONG ArchExtra; + ULONG_PTR PageDirectoryStart; + ULONG_PTR PageDirectoryEnd; + ULONG_PTR KernelBase; + ULONG_PTR ArchExtra; } ROS_LOADER_PARAMETER_BLOCK, *PROS_LOADER_PARAMETER_BLOCK; extern BOOLEAN AcpiTableDetected;

1 0

[tkreuzer] 34709: add size_t definition to _mingw.h (ported from mingw)
by tkreuzer＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: tkreuzer Date: Wed Jul 23 18:00:47 2008 New Revision: 34709 URL: http://svn.reactos.org/svn/reactos?rev=34709&view=rev Log: add size_t definition to _mingw.h (ported from mingw) Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] Wed Jul 23 18:00:47 2008 @@ -178,6 +178,20 @@ # define __MSVCRT_VERSION__ 0x0600 #endif +#ifndef _SIZE_T_DEFINED +#define _SIZE_T_DEFINED +#undef size_t +#ifdef _WIN64 +#if defined(__GNUC__) && defined(__STRICT_ANSI__) + typedef unsigned int size_t __attribute__ ((mode (DI))); +#else + typedef unsigned __int64 size_t; +#endif +#else + typedef unsigned int size_t; +#endif +#endif + #define __MINGW32_VERSION 3.13 #define __MINGW32_MAJOR_VERSION 3 #define __MINGW32_MINOR_VERSION 13

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008