Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[tkreuzer] 49567: [CRT] Revert renaming change to tchar.h, which does not contain any assembly

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 11 17:12:12 2010 New Revision: 49567 URL: http://svn.reactos.org/svn/reactos?rev=49567&view=rev Log: [CRT] Revert renaming change to tchar.h, which does not contain any assembly Added: branches/cmake-bringup/lib/sdk/crt/string/i386/tchar.h - copied unchanged from r49566, branches/cmake-bringup/lib/sdk/crt/string/i386/tchar.inc Removed: branches/cmake-bringup/lib/sdk/crt/string/i386/tchar.inc Removed: branches/cmake-bringup/lib/sdk/crt/string/i386/tchar.inc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tchar.inc [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tchar.inc (removed) @@ -1,59 +1,0 @@ -/* $Id$ - */ - -#ifndef __TCHAR_INC_S__ -#define __TCHAR_INC_S__ - -#ifdef _UNICODE - -#define _tcscat _wcscat -#define _tcschr _wcschr -#define _tcscmp _wcscmp -#define _tcscpy _wcscpy -#define _tcslen _wcslen -#define _tcsncat _wcsncat -#define _tcsncmp _wcsncmp -#define _tcsncpy _wcsncpy -#define _tcsnlen _wcsnlen -#define _tcsrchr _wcsrchr - -#define _tscas scasw -#define _tlods lodsw -#define _tstos stosw - -#define _tsize 2 - -#define _treg(_O_) _O_ ## x - -#define _tdec(_O_) sub _O_, 2 -#define _tinc(_O_) add _O_, 2 - -#else - -#define _tcscat _strcat -#define _tcschr _strchr -#define _tcscmp _strcmp -#define _tcscpy _strcpy -#define _tcslen _strlen -#define _tcsncat _strncat -#define _tcsncmp _strncmp -#define _tcsncpy _strncpy -#define _tcsnlen _strnlen -#define _tcsrchr _strrchr - -#define _tscas scasb -#define _tlods lodsb -#define _tstos stosb - -#define _tsize 1 - -#define _treg(_O_) _O_ ## l - -#define _tdec(_O_) dec _O_ -#define _tinc(_O_) inc _O_ - -#endif - -#endif - -/* EOF */

14 years, 1 month

[tkreuzer] 49566: [CRT] Rename a number of .h files that contain assembly code into .inc to better reflect their purpose

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 11 17:10:09 2010 New Revision: 49566 URL: http://svn.reactos.org/svn/reactos?rev=49566&view=rev Log: [CRT] Rename a number of .h files that contain assembly code into .inc to better reflect their purpose Added: branches/cmake-bringup/lib/sdk/crt/string/i386/tchar.inc - copied unchanged from r49555, branches/cmake-bringup/lib/sdk/crt/string/i386/tchar.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcscat.inc - copied unchanged from r49555, branches/cmake-bringup/lib/sdk/crt/string/i386/tcscat.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcschr.inc - copied unchanged from r49555, branches/cmake-bringup/lib/sdk/crt/string/i386/tcschr.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcscmp.inc - copied unchanged from r49555, branches/cmake-bringup/lib/sdk/crt/string/i386/tcscmp.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcscpy.inc - copied unchanged from r49555, branches/cmake-bringup/lib/sdk/crt/string/i386/tcscpy.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcslen.inc - copied unchanged from r49555, branches/cmake-bringup/lib/sdk/crt/string/i386/tcslen.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncat.inc - copied unchanged from r49555, branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncat.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncmp.inc - copied unchanged from r49555, branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncmp.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncpy.inc - copied unchanged from r49555, branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncpy.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcsnlen.inc - copied unchanged from r49555, branches/cmake-bringup/lib/sdk/crt/string/i386/tcsnlen.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcsrchr.inc - copied unchanged from r49555, branches/cmake-bringup/lib/sdk/crt/string/i386/tcsrchr.h Removed: branches/cmake-bringup/lib/sdk/crt/string/i386/tchar.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcscat.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcschr.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcscmp.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcscpy.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcslen.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncat.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncmp.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncpy.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcsnlen.h branches/cmake-bringup/lib/sdk/crt/string/i386/tcsrchr.h Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/strcat_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/strchr_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/strcmp_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/strcpy_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/strlen_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/strncat_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/strncmp_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/strncpy_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/strnlen_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/strrchr_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/wcscat_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/wcschr_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/wcscmp_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/wcscpy_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/wcslen_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/wcsncat_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/wcsncmp_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/wcsncpy_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/wcsnlen_asm.s branches/cmake-bringup/lib/sdk/crt/string/i386/wcsrchr_asm.s Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/strcat_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/strcat_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/strcat_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -1,6 +1,6 @@ /* $Id$ */ -#include "tcscat.h" +#include "tcscat.inc" /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/strchr_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/strchr_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/strchr_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -1,6 +1,6 @@ /* $Id$ */ -#include "tcschr.h" +#include "tcschr.inc" /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/strcmp_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/strcmp_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/strcmp_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -1,6 +1,6 @@ /* $Id$ */ -#include "tcscmp.h" +#include "tcscmp.inc" /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/strcpy_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/strcpy_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/strcpy_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -1,6 +1,6 @@ /* $Id$ */ -#include "tcscpy.h" +#include "tcscpy.inc" /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/strlen_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/strlen_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/strlen_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -1,6 +1,6 @@ /* $Id$ */ -#include "tcslen.h" +#include "tcslen.inc" /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/strncat_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/strncat_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/strncat_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -1,6 +1,6 @@ /* $Id$ */ -#include "tcsncat.h" +#include "tcsncat.inc" /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/strncmp_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/strncmp_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/strncmp_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -1,6 +1,6 @@ /* $Id$ */ -#include "tcsncmp.h" +#include "tcsncmp.inc" /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/strncpy_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/strncpy_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/strncpy_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -1,6 +1,6 @@ /* $Id$ */ -#include "tcsncpy.h" +#include "tcsncpy.inc" /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/strnlen_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/strnlen_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/strnlen_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -1,6 +1,6 @@ /* $Id$ */ -#include "tcsnlen.h" +#include "tcsnlen.inc" /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/strrchr_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/strrchr_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/strrchr_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -1,6 +1,6 @@ /* $Id$ */ -#include "tcsrchr.h" +#include "tcsrchr.inc" /* EOF */ Removed: branches/cmake-bringup/lib/sdk/crt/string/i386/tchar.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tchar.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tchar.h (removed) @@ -1,59 +1,0 @@ -/* $Id$ - */ - -#ifndef __TCHAR_INC_S__ -#define __TCHAR_INC_S__ - -#ifdef _UNICODE - -#define _tcscat _wcscat -#define _tcschr _wcschr -#define _tcscmp _wcscmp -#define _tcscpy _wcscpy -#define _tcslen _wcslen -#define _tcsncat _wcsncat -#define _tcsncmp _wcsncmp -#define _tcsncpy _wcsncpy -#define _tcsnlen _wcsnlen -#define _tcsrchr _wcsrchr - -#define _tscas scasw -#define _tlods lodsw -#define _tstos stosw - -#define _tsize 2 - -#define _treg(_O_) _O_ ## x - -#define _tdec(_O_) sub _O_, 2 -#define _tinc(_O_) add _O_, 2 - -#else - -#define _tcscat _strcat -#define _tcschr _strchr -#define _tcscmp _strcmp -#define _tcscpy _strcpy -#define _tcslen _strlen -#define _tcsncat _strncat -#define _tcsncmp _strncmp -#define _tcsncpy _strncpy -#define _tcsnlen _strnlen -#define _tcsrchr _strrchr - -#define _tscas scasb -#define _tlods lodsb -#define _tstos stosb - -#define _tsize 1 - -#define _treg(_O_) _O_ ## l - -#define _tdec(_O_) dec _O_ -#define _tinc(_O_) inc _O_ - -#endif - -#endif - -/* EOF */ Removed: branches/cmake-bringup/lib/sdk/crt/string/i386/tcscat.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcscat.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcscat.h (removed) @@ -1,35 +1,0 @@ -/* $Id$ - */ - -#include "tchar.h" -#include <reactos/asm.h> - -PUBLIC _tcscat -.code - -_tcscat: - push esi - push edi - mov edi, [esp + 12] - mov esi, [esp + 16] - - xor eax, eax - mov ecx, -1 - cld - - repne _tscas - _tdec(edi) - -.L1: - _tlods - _tstos - test _treg(a), _treg(a) - jnz .L1 - - mov eax, [esp + 12] - pop edi - pop esi - ret - -END -/* EOF */ Removed: branches/cmake-bringup/lib/sdk/crt/string/i386/tcschr.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcschr.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcschr.h (removed) @@ -1,32 +1,0 @@ -/* $Id$ - */ - -#include "tchar.h" -#include <reactos/asm.h> - -PUBLIC _tcschr -.code - -_tcschr: - push esi - mov esi, [esp + 8] - mov edx, [esp + 12] - cld - -.L1: - _tlods - cmp _treg(d), _treg(a) - je .L2 - test _treg(a), _treg(a) - jnz .L1 - mov esi, _tsize - -.L2: - mov eax, esi - _tdec(eax) - - pop esi - ret - -END -/* EOF */ Removed: branches/cmake-bringup/lib/sdk/crt/string/i386/tcscmp.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcscmp.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcscmp.h (removed) @@ -1,37 +1,0 @@ -/* $Id$ - */ - -#include "tchar.h" -#include <reactos/asm.h> - -PUBLIC _tcscmp -.code - -_tcscmp: - push esi - push edi - mov esi, [esp + 12] - mov edi, [esp + 16] - xor eax, eax - cld - -.L1: - _tlods - _tscas - jne .L2 - test eax, eax - jne .L1 - xor eax, eax - jmp .L3 - -.L2: - sbb eax, eax - or al, 1 - -.L3: - pop edi - pop esi - ret - -END -/* EOF */ Removed: branches/cmake-bringup/lib/sdk/crt/string/i386/tcscpy.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcscpy.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcscpy.h (removed) @@ -1,30 +1,0 @@ -/* $Id$ - */ - -#include "tchar.h" -#include <reactos/asm.h> - -PUBLIC _tcscpy -.code - -_tcscpy: - push esi - push edi - mov edi, [esp + 12] - mov esi, [esp + 16] - cld - -.L1: - _tlods - _tstos - test _treg(a), _treg(a) - jnz .L1 - - mov eax, [esp + 12] - - pop edi - pop esi - ret - -END -/* EOF */ Removed: branches/cmake-bringup/lib/sdk/crt/string/i386/tcslen.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcslen.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcslen.h (removed) @@ -1,32 +1,0 @@ -/* $Id$ -*/ - -#include "tchar.h" -#include <reactos/asm.h> - -PUBLIC _tcslen -.code - -_tcslen: - push edi - mov edi, [esp + 8] - xor eax, eax - test edi, edi - jz _tcslen_end - - mov ecx, -1 - cld - - repne _tscas - - not ecx - dec ecx - - mov eax, ecx - -_tcslen_end: - pop edi - ret - -END -/* EOF */ Removed: branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncat.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncat.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncat.h (removed) @@ -1,45 +1,0 @@ -/* $Id$ - */ - -#include "tchar.h" -#include <reactos/asm.h> - -PUBLIC _tcsncat -.code - -_tcsncat: - push esi - push edi - mov edi, [esp + 12] - mov esi, [esp + 16] - cld - - xor eax, eax - mov ecx, -1 - repne _tscas - _tdec(edi) - - mov ecx, [esp + 20] - -.L1: - dec ecx - js .L2 - _tlods - _tstos - test _treg(a), _treg(a) - jne .L1 - jmp .L3 - -.L2: - xor eax, eax - _tstos - -.L3: - mov eax, [esp + 12] - pop edi - pop esi - - ret - -END -/* EOF */ Removed: branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncmp.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncmp.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncmp.h (removed) @@ -1,43 +1,0 @@ -/* $Id$ - */ - -#include "tchar.h" -#include <reactos/asm.h> - -PUBLIC _tcsncmp -.code - -_tcsncmp: - push esi - push edi - mov esi, [esp + 12] /* s1 */ - mov edi, [esp + 16] /* s2 */ - mov ecx, [esp + 20] /* n */ - - xor eax, eax - cld - -.L1: - dec ecx - js .L2 - _tlods - _tscas - jne .L3 - test eax, eax - jne .L1 - -.L2: - xor eax, eax - jmp .L4 - -.L3: - sbb eax, eax - or al, 1 - -.L4: - pop edi - pop esi - ret - -END -/* EOF */ Removed: branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncpy.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncpy.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncpy.h (removed) @@ -1,37 +1,0 @@ -/* $Id$ - */ - -#include "tchar.h" -#include <reactos/asm.h> - -PUBLIC _tcsncpy -.code - -_tcsncpy: - push esi - push edi - mov edi, [esp + 12] /* s1 */ - mov esi, [esp + 16] /* s2 */ - mov ecx, [esp + 20] /* n */ - - xor eax, eax - cld - -.L1: - dec ecx - js .L2 - _tlods - _tstos - test _treg(a), _treg(a) - jnz .L1 - rep _tstos - -.L2: - mov eax, [esp + 12] - - pop edi - pop esi - ret - -END -/* EOF */ Removed: branches/cmake-bringup/lib/sdk/crt/string/i386/tcsnlen.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcsnlen.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcsnlen.h (removed) @@ -1,33 +1,0 @@ -/* $Id$ -*/ - -#include "tchar.h" -#include <reactos/asm.h> - -PUBLIC _tcsnlen -.code - -_tcsnlen: - push edi - mov edi, [esp + 8] - mov ecx, [esp + 12] - xor eax, eax - test ecx, ecx - jz .L1 - mov edx, ecx - - cld - - repne _tscas - - sete al - sub edx, ecx - sub edx, eax - mov eax, edx - -.L1: - pop edi - ret - -END -/* EOF */ Removed: branches/cmake-bringup/lib/sdk/crt/string/i386/tcsrchr.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcsrchr.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcsrchr.h (removed) @@ -1,34 +1,0 @@ -/* $Id$ - */ - -#include "tchar.h" -#include <reactos/asm.h> - -PUBLIC _tcsrchr -.code - -_tcsrchr: - push esi - mov esi, [esp + 8] - mov edx, [esp + 12] - - cld - mov ecx, _tsize - -.L1: - _tlods - cmp _treg(d), _treg(a) - jne .L2 - mov ecx, esi - -.L2: - test _treg(a), _treg(a) - jnz .L1 - - mov eax, ecx - _tdec(eax) - pop esi - ret - -END -/* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/wcscat_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/wcscat_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/wcscat_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -2,6 +2,6 @@ */ #define _UNICODE -#include "tcscat.h" +#include "tcscat.inc" /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/wcschr_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/wcschr_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/wcschr_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -2,6 +2,6 @@ */ #define _UNICODE -#include "tcschr.h" +#include "tcschr.inc" /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/wcscmp_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/wcscmp_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/wcscmp_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -2,6 +2,6 @@ */ #define _UNICODE -#include "tcscmp.h" +#include "tcscmp.inc" /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/wcscpy_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/wcscpy_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/wcscpy_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -2,6 +2,6 @@ */ #define _UNICODE -#include "tcscpy.h" +#include "tcscpy.inc" /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/wcslen_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/wcslen_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/wcslen_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -2,6 +2,6 @@ */ #define _UNICODE -#include "tcslen.h" +#include "tcslen.inc" /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/wcsncat_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/wcsncat_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/wcsncat_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -2,6 +2,6 @@ */ #define _UNICODE -#include "tcsncat.h" +#include "tcsncat.inc" /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/wcsncmp_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/wcsncmp_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/wcsncmp_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -2,6 +2,6 @@ */ #define _UNICODE -#include "tcsncmp.h" +#include "tcsncmp.inc" /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/wcsncpy_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/wcsncpy_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/wcsncpy_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -2,6 +2,6 @@ */ #define _UNICODE -#include "tcsncpy.h" +#include "tcsncpy.inc" /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/wcsnlen_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/wcsnlen_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/wcsnlen_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -2,6 +2,6 @@ */ #define _UNICODE -#include "tcsnlen.h" +#include "tcsnlen.inc" /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/wcsrchr_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/wcsrchr_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/wcsrchr_asm.s [iso-8859-1] Thu Nov 11 17:10:09 2010 @@ -2,6 +2,6 @@ */ #define _UNICODE -#include "tcsrchr.h" +#include "tcsrchr.inc" /* EOF */

14 years, 1 month

[jgardou] 49565: [HEADERS] - move stlport headers to the c++ directory - add a specific _reactos.h configuration file for stlport - add cerrno to c++ headers - __declspec(nothrow) must be placed be...

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Nov 11 15:58:18 2010 New Revision: 49565 URL: http://svn.reactos.org/svn/reactos?rev=49565&view=rev Log: [HEADERS] - move stlport headers to the c++ directory - add a specific _reactos.h configuration file for stlport - add cerrno to c++ headers - __declspec(nothrow) must be placed before calling convention with msvc. GCC doesn't care. We now use our headers with both msvc and gcc. Added: branches/cmake-bringup/include/c++/cerrno (with props) branches/cmake-bringup/include/c++/stlport/ - copied from r49554, branches/cmake-bringup/include/stlport/ branches/cmake-bringup/include/c++/stlport/stl/config/_reactos.h (with props) Removed: branches/cmake-bringup/include/stlport/ Modified: branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/include/c++/cstdio branches/cmake-bringup/include/c++/new branches/cmake-bringup/include/c++/stlport/stl/_limits.h branches/cmake-bringup/include/c++/stlport/stl/config/_system.h branches/cmake-bringup/include/crt/float.h Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Thu Nov 11 15:58:18 2010 @@ -121,15 +121,11 @@ ENDMACRO(add_minicd) macro(set_cpp) - include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/stlport) + include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport) set(IS_CPP 1) add_definitions( - -D_STLP_NATIVE_CPP_C_INCLUDE_PATH=../c++ - -D_STLP_NATIVE_C_INCLUDE_PATH=../crt - -D_STLP_NATIVE_CPP_RUNTIME_INCLUDE_PATH=../c++ - -D_STLP_USE_NEW_C_HEADERS - -D_STLP_NO_TYPEINFO - ) + -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++ + -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt) endmacro() MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd Added: branches/cmake-bringup/include/c++/cerrno URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/c… ============================================================================== --- branches/cmake-bringup/include/c++/cerrno (added) +++ branches/cmake-bringup/include/c++/cerrno [iso-8859-1] Thu Nov 11 15:58:18 2010 @@ -1,0 +1,10 @@ +// C++ forwarding C errno header. + +#pragma once + +#include <errno.h> + +// Adhere to section 17.4.1.2 clause 5 of ISO 14882:1998 +#ifndef errno +#define errno errno +#endif Propchange: branches/cmake-bringup/include/c++/cerrno ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/include/c++/cstdio URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/c… ============================================================================== --- branches/cmake-bringup/include/c++/cstdio [iso-8859-1] (original) +++ branches/cmake-bringup/include/c++/cstdio [iso-8859-1] Thu Nov 11 15:58:18 2010 @@ -94,4 +94,5 @@ using ::vfprintf; using ::vprintf; using ::vsprintf; + using ::vsnprintf; } Modified: branches/cmake-bringup/include/c++/new URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/n… ============================================================================== --- branches/cmake-bringup/include/c++/new [iso-8859-1] (original) +++ branches/cmake-bringup/include/c++/new [iso-8859-1] Thu Nov 11 15:58:18 2010 @@ -32,19 +32,17 @@ new_handler set_new_handler(new_handler) throw(); -void* operator new (std::size_t size) throw (std::bad_alloc); void* operator new (std::size_t size, const std::nothrow_t& nothrow_constant) throw(); -void* operator new (std::size_t size, void* ptr) throw(); -void* operator new[] (std::size_t size) throw (std::bad_alloc); +inline void* operator new (std::size_t size, void* ptr) throw() { return ptr; } void* operator new[] (std::size_t size, const std::nothrow_t& nothrow_constant) throw(); -void* operator new[] (std::size_t size, void* ptr) throw(); +inline void* operator new[] (std::size_t size, void* ptr) throw() { return ptr; } void operator delete (void* ptr) throw (); void operator delete (void* ptr, const std::nothrow_t& nothrow_constant) throw(); -void operator delete (void* ptr, void* voidptr2) throw(); +inline void operator delete (void* ptr, void* voidptr2) throw() { } void operator delete[] (void* ptr) throw (); void operator delete[] (void* ptr, const std::nothrow_t& nothrow_constant) throw(); -void operator delete[] (void* ptr, void* voidptr2) throw(); +inline void operator delete[] (void* ptr, void* voidptr2) throw() { } //@} } // extern "C++" Modified: branches/cmake-bringup/include/c++/stlport/stl/_limits.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/s… ============================================================================== --- branches/cmake-bringup/include/c++/stlport/stl/_limits.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/c++/stlport/stl/_limits.h [iso-8859-1] Thu Nov 11 15:58:18 2010 @@ -52,6 +52,13 @@ denorm_present = 1 }; +#ifdef min +# undef min +#endif +#ifdef max +# undef max +#endif + _STLP_MOVE_TO_PRIV_NAMESPACE // Base class for all specializations of numeric_limits. @@ -59,8 +66,8 @@ class _Numeric_limits_base { public: - static __number (_STLP_CALL min)() _STLP_NOTHROW { return __number(); } - static __number (_STLP_CALL max)() _STLP_NOTHROW { return __number(); } + static __number _STLP_CALL min() _STLP_NOTHROW { return __number(); } + static __number _STLP_CALL max() _STLP_NOTHROW { return __number(); } _STLP_STATIC_CONSTANT(int, digits = 0); _STLP_STATIC_CONSTANT(int, digits10 = 0); @@ -118,8 +125,8 @@ class _Integer_limits : public _Numeric_limits_base<_Int> { public: - static _Int (_STLP_CALL min) () _STLP_NOTHROW { return (_Int)__imin; } - static _Int (_STLP_CALL max) () _STLP_NOTHROW { return (_Int)__imax; } + static _Int _STLP_CALL min () _STLP_NOTHROW { return (_Int)__imin; } + static _Int _STLP_CALL max () _STLP_NOTHROW { return (_Int)__imax; } _STLP_STATIC_CONSTANT(int, digits = (__idigits < 0) ? ((int)((sizeof(_Int) * (CHAR_BIT))) - ((__imin == 0) ? 0 : 1)) : (__idigits)); _STLP_STATIC_CONSTANT(int, digits10 = (digits * 301UL) / 1000); Added: branches/cmake-bringup/include/c++/stlport/stl/config/_reactos.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/s… ============================================================================== --- branches/cmake-bringup/include/c++/stlport/stl/config/_reactos.h (added) +++ branches/cmake-bringup/include/c++/stlport/stl/config/_reactos.h [iso-8859-1] Thu Nov 11 15:58:18 2010 @@ -1,0 +1,308 @@ +/* + * Copyright (c) 2010 + * Jérôme Gardou + * + * + * This material is provided "as is", with absolutely no warranty expressed + * or implied. Any use is at your own risk. + * + * This file is in public domain. + */ + +/* + * Purpose of this file : + * + * A list of COMPILER-SPECIFIC portion of STLport settings. + * This file is provided to help in manual configuration + * of STLport. This file is being included by stlcomp.h + * when STLport is unable to identify your compiler. + * Please remove the error diagnostic below before adjusting + * macros. + * + */ +#ifndef _STLP_REACTOS_H +#define _STLP_REACTOS_H + +#if !defined (_STLP_COMPILER) +# ifdef _MSC_VER +# define _STLP_COMPILER "Microsoft Visual Studio C++" +# define _STLP_MSVC _MSC_VER +# define _STLP_MSVC_LIB _MSC_VER +# elif defined __MINGW32__ +# define _STLP_COMPILER "gcc" +# else +# error "Unrecognized compiler for reactos!" +# endif +#endif + +// We are WIN32 +#define _STLP_WIN32 + +// We declspec +#define _STLP_IMPORT_DECLSPEC __declspec(dllimport) +#define _STLP_EXPORT_DECLSPEC __declspec(dllexport) + +//========================================================== + +// the values choosen here as defaults try to give +// maximum functionality on the most conservative settings + +// Mostly correct guess, change it for Alpha (and other environments +// that has 64-bit "long") +# define _STLP_UINT32_T unsigned __int32 + +// Disables wchar_t functionality +// # define _STLP_NO_WCHAR_T 1 + +// Define if wchar_t is not an intrinsic type, and is actually a typedef to unsigned short. +// # define _STLP_WCHAR_T_IS_USHORT 1 + +// Uncomment if long long is available +# define _STLP_LONG_LONG __int64 +// Uncomment if long double is not available +// # define _STLP_NO_LONG_DOUBLE 1 + +// Uncomment this if your compiler does not support "typename" keyword +// # define _STLP_NEED_TYPENAME 1 + +// Uncomment this if your compiler does not support "mutable" keyword +// # define _STLP_NEED_MUTABLE 1 + +// Uncomment this if your compiler does not support "explicit" keyword +// # define _STLP_NEED_EXPLICIT 1 + +// Uncomment if new-style-casts like const_cast<> are not available +// # define _STLP_NO_NEW_STYLE_CASTS 1 + +// Uncomment this if your compiler does not have "bool" type +// # define _STLP_NO_BOOL 1 + +// Uncomment this if your compiler does not have "bool" type, but has "bool" keyword reserved +// # define _STLP_DONT_USE_BOOL_TYPEDEF 1 + +// Uncomment this if your compiler does not have "bool" type, but defines "bool" in <yvals.h> +// # define _STLP_YVALS_H 1 + +// Uncomment this if your compiler has limited or no default template arguments for classes +// # define _STLP_LIMITED_DEFAULT_TEMPLATES 1 + +// Uncomment this if your compiler support only complete (not dependent on other parameters) +// types as default parameters for class templates +// # define _STLP_DEFAULT_TYPE_PARAM 1 + +// Uncomment this if your compiler do not support default parameters in template class methods +// # define _STLP_DONT_SUP_DFLT_PARAM 1 + +// Uncomment this if your compiler has problem with not-type +// default template parameters +// # define _STLP_NO_DEFAULT_NON_TYPE_PARAM 1 + +// Define if compiler has +// trouble with functions getting non-type-parameterized classes as parameters +// # define _STLP_NON_TYPE_TMPL_PARAM_BUG 1 + +// Uncomment this if your compiler does not support namespaces +// # define _STLP_HAS_NO_NAMESPACES 1 + +// Uncomment if "using" keyword does not work with template types +// # define _STLP_BROKEN_USING_DIRECTIVE 1 + +// Uncomment this if your compiler does not support exceptions +// # define _STLP_HAS_NO_EXCEPTIONS 1 + +// Uncomment this when you are able to detect that the user do not +// want to use the exceptions feature. +// # define _STLP_DONT_USE_EXCEPTIONS 1 + +// Uncomment this if your compiler does not support exception specifications +// # define _STLP_NO_EXCEPTION_SPEC + +// Define this if your compiler requires return statement after throw() +// # define _STLP_THROW_RETURN_BUG 1 + +// Define this if your compiler do not support return of void +// # define _STLP_DONT_RETURN_VOID 1 + +// Header <new> that comes with the compiler +// does not define bad_alloc exception +// # define _STLP_NO_BAD_ALLOC 1 + +// Define this if your compiler do not throw bad_alloc from the new operator +// # define _STLP_NEW_DONT_THROW_BAD_ALLOC 1 + +// Define this if your compiler has no rtti support or if it has been disabled +// # define _STLP_NO_RTTI 1 + +// Define this if there is no native type_info definition +# define _STLP_NO_TYPEINFO 1 + +// Uncomment if member template methods are not available +// # define _STLP_NO_MEMBER_TEMPLATES 1 + +// Uncomment if member template classes are not available +// # define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1 + +// Uncomment if your compiler do not support the std::allocator rebind technique +// This is a special case of bad member template classes support, it is automatically +// defined if _STLP_NO_MEMBER_TEMPLATE_CLASSES is defined. +// # define _STLP_DONT_SUPPORT_REBIND_MEMBER_TEMPLATE 1 + +// Uncomment if no "template" keyword should be used with member template classes +// # define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1 + +// Compiler does not accept friend declaration qualified with namespace name. +// # define _STLP_NO_QUALIFIED_FRIENDS 1 + +// Uncomment if partial specialization is not available +// # define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1 + +// Define if class being partially specialized require full name (template parameters) +// of itself for method declarations +// # define _STLP_PARTIAL_SPEC_NEEDS_TEMPLATE_ARGS + +// Compiler has problem with qualified specializations (cont int, volatile int...) +// # define _STLP_QUALIFIED_SPECIALIZATION_BUG + +// Compiler has problems specializing members of partially +// specialized class +// # define _STLP_MEMBER_SPECIALIZATION_BUG + +// Uncomment if partial order of template functions is not available +// # define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1 + +// Uncomment if specialization of methods is not allowed +// # define _STLP_NO_METHOD_SPECIALIZATION 1 + +// Uncomment if full specialization does not use partial spec. syntax : template <> struct .... +// # define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX 1 + +// Uncomment if compiler does not support explicit template arguments for functions +// # define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS + +// Uncomment this if your compiler can't inline while(), for() +// # define _STLP_LOOP_INLINE_PROBLEMS 1 + +// Define if the compiler fails to match a template function argument of base +// # define _STLP_BASE_MATCH_BUG 1 + +// Define if the compiler fails to match a template function argument of base +// (non-template) +//# define _STLP_NONTEMPL_BASE_MATCH_BUG 1 + +// Define if the compiler rejects outline method definition +// explicitly taking nested types/typedefs +// # define _STLP_NESTED_TYPE_PARAM_BUG 1 + +// Compiler requires typename keyword on outline method definition +// explicitly taking nested types/typedefs +// #define _STLP_TYPENAME_ON_RETURN_TYPE + +// Define if the baseclass typedefs not visible from outside +// # define _STLP_BASE_TYPEDEF_OUTSIDE_BUG 1 + +// if your compiler have serious problems with typedefs, try this one +// # define _STLP_BASE_TYPEDEF_BUG 1 + +// Uncomment if getting errors compiling mem_fun* adaptors +// # define _STLP_MEMBER_POINTER_PARAM_BUG 1 + +// Uncomment if the compiler can't handle a constant-initializer in the +// declaration of a static const data member of integer type. +// (See section 9.4.2, paragraph 4, of the C++ standard.) +// # define _STLP_STATIC_CONST_INIT_BUG + +// Uncomment to indicate that the compiler do not like static constant +// definition. +// Meaningfull only if _STLP_STATIC_CONST_INIT_BUG is not defined. +// # define _STLP_NO_STATIC_CONST_DEFINITION + +// Define if default constructor for builtin integer type fails to initialize it to 0 +// In expression like new(&char) char(): +//# define _STLP_DEF_CONST_PLCT_NEW_BUG 1 +// In default function parameter like _M_method(_Tp __x = _Tp()) +//# define _STLP_DEF_CONST_DEF_PARAM_BUG 1 + +// Defined if constructor +// required to explicitly call member's default constructors for const objects +// # define _STLP_CONST_CONSTRUCTOR_BUG 1 + +// Defined if the compiler has trouble calling POD-types constructors/destructors +// # define _STLP_TRIVIAL_CONSTRUCTOR_BUG 1 +// # define _STLP_TRIVIAL_DESTRUCTOR_BUG 1 + +// Define if having problems specializing maps/sets with +// key type being const +// # define _STLP_MULTI_CONST_TEMPLATE_ARG_BUG + +// Uncomment this to disable -> operators on all iterators +// # define _STLP_NO_ARROW_OPERATOR 1 + +// Uncomment this to disble at() member functions for containers +// # define _STLP_NO_AT_MEMBER_FUNCTION 1 + +// Define this if compiler lacks <exception> header +// # define _STLP_NO_EXCEPTION_HEADER 1 + +// Uncomment this if your C library has lrand48() function +// # define _STLP_RAND48 1 + +// Uncomment if native new-style C library headers lile <cstddef>, etc are not available. +// # define _STLP_HAS_NO_NEW_C_HEADERS 1 + +// uncomment if new-style headers <new> is available +// # define _STLP_HAS_NEW_NEW_HEADER 1 + +// uncomment this if <iostream> and other STD headers put their stuff in ::namespace, +// not std:: +// # define _STLP_VENDOR_GLOBAL_STD + +// uncomment this if <cstdio> and the like put stuff in ::namespace, +// not std:: +// # define _STLP_VENDOR_GLOBAL_CSTD + +// uncomment this if your compiler consider as ambiguous a function imported within +// the stlport namespace and called without scope (:: or std::) +// # define _STLP_NO_USING_FOR_GLOBAL_FUNCTIONS 1 + +// uncomment this if your compiler define all the C math functions C++ additional +// overloads in ::namespace and not only in std::. +// # define _STLP_HAS_GLOBAL_C_MATH_FUNCTIONS 1 + +#define MKSTRING_(a) #a +#define MKSTRING(a) MKSTRING_(a) +#define _STLP_NATIVE_C_HEADER(header) MKSTRING(NATIVE_C_INCLUDE/header) +#define _STLP_NATIVE_CPP_C_HEADER(header) MKSTRING(NATIVE_CPP_INCLUDE/header) +#define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) MKSTRING(NATIVE_CPP_INCLUDE/header) + + +// This macro constructs header path from directory and name. +// You may change it if your compiler does not understand "/". + +// This macro constructs native include header path from include path and name. +// You may have do define it if experimenting problems with preprocessor +// # define _STLP_NATIVE_HEADER(header) _STLP_MAKE_HEADER(_STLP_NATIVE_INCLUDE_PATH,header) + +// Same for C headers +// #define _STLP_NATIVE_C_HEADER(header) + +//========================================================== + +// We have no llabs, lldiv, etc. +#define _STLP_NO_VENDOR_STDLIB_L + +// new_handler is in global namespace +# define _STLP_GLOBAL_NEW_HANDLER + +// terminate function is in global namespace +#define _STLP_VENDOR_TERMINATE_STD + +// We don't want stlport to use its own namespace +#define _STLP_NO_OWN_NAMESPACE + +// Calling convention +#define _STLP_CALL __cdecl + +// Include stlport windows specifics +#include "_windows.h" + +#endif Propchange: branches/cmake-bringup/include/c++/stlport/stl/config/_reactos.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/include/c++/stlport/stl/config/_system.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/s… ============================================================================== --- branches/cmake-bringup/include/c++/stlport/stl/config/_system.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/c++/stlport/stl/config/_system.h [iso-8859-1] Thu Nov 11 15:58:18 2010 @@ -36,7 +36,9 @@ #ifndef __stl_config__system_h #define __stl_config__system_h -#if defined (__sun) +#if defined (__REACTOS__) +# include <stl/config/_reactos.h> +#elif defined (__sun) # include <stl/config/_solaris.h> # if defined (__GNUC__) # include <stl/config/_gcc.h> Modified: branches/cmake-bringup/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/float… ============================================================================== --- branches/cmake-bringup/include/crt/float.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/float.h [iso-8859-1] Thu Nov 11 15:58:18 2010 @@ -104,12 +104,12 @@ /* Set the FPU control word as cw = (cw & ~unMask) | (unNew & unMask), * i.e. change the bits in unMask to have the values they have in unNew, * leaving other bits unchanged. */ -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _controlfp (unsigned int unNew, unsigned int unMask); -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _control87 (unsigned int unNew, unsigned int unMask); +__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _controlfp (unsigned int unNew, unsigned int unMask); +__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _control87 (unsigned int unNew, unsigned int unMask); -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _clearfp (void); /* Clear the FPU status word */ -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _statusfp (void); /* Report the FPU status word */ +__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _clearfp (void); /* Clear the FPU status word */ +__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _statusfp (void); /* Report the FPU status word */ #define _clear87 _clearfp #define _status87 _statusfp @@ -123,8 +123,8 @@ per fninit. To use the MSVCRT.dll _fpreset, include CRT_fp8.o when building your application. */ -void __cdecl __MINGW_NOTHROW _fpreset (void); -void __cdecl __MINGW_NOTHROW fpreset (void); +__MINGW_NOTHROW void __cdecl _fpreset (void); +__MINGW_NOTHROW void __cdecl fpreset (void); /* Global 'variable' for the current floating point error code. */ __MINGW_NOTHROW _CRTIMP int * __cdecl __fpecode(void); @@ -135,15 +135,15 @@ * but they really belong in math.h. */ -_CRTIMP double __cdecl __MINGW_NOTHROW _chgsign (double); -_CRTIMP double __cdecl __MINGW_NOTHROW _copysign (double, double); -_CRTIMP double __cdecl __MINGW_NOTHROW _logb (double); -_CRTIMP double __cdecl __MINGW_NOTHROW _nextafter (double, double); -_CRTIMP double __cdecl __MINGW_NOTHROW _scalb (double, long); +__MINGW_NOTHROW _CRTIMP double __cdecl _chgsign (double); +__MINGW_NOTHROW _CRTIMP double __cdecl _copysign (double, double); +__MINGW_NOTHROW _CRTIMP double __cdecl _logb (double); +__MINGW_NOTHROW _CRTIMP double __cdecl _nextafter (double, double); +__MINGW_NOTHROW _CRTIMP double __cdecl _scalb (double, long); -_CRTIMP int __cdecl __MINGW_NOTHROW _finite (double); -_CRTIMP int __cdecl __MINGW_NOTHROW _fpclass (double); -_CRTIMP int __cdecl __MINGW_NOTHROW _isnan (double); +__MINGW_NOTHROW _CRTIMP int __cdecl _finite (double); +__MINGW_NOTHROW _CRTIMP int __cdecl _fpclass (double); +__MINGW_NOTHROW _CRTIMP int __cdecl _isnan (double); #ifdef __cplusplus }

14 years, 1 month

[tkreuzer] 49564: [BUILDNO] Silence warnings on MSVC builds

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 11 15:33:28 2010 New Revision: 49564 URL: http://svn.reactos.org/svn/reactos?rev=49564&view=rev Log: [BUILDNO] Silence warnings on MSVC builds Modified: branches/cmake-bringup/tools/buildno/buildno.cpp Modified: branches/cmake-bringup/tools/buildno/buildno.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/buildno/bui… ============================================================================== --- branches/cmake-bringup/tools/buildno/buildno.cpp [iso-8859-1] (original) +++ branches/cmake-bringup/tools/buildno/buildno.cpp [iso-8859-1] Thu Nov 11 15:33:28 2010 @@ -23,6 +23,11 @@ * Added -p option to make it simply print the * version number, but skip buildno.h generation. */ + +#ifdef _MSC_VER +#pragma warning ( disable : 4996 ) +#endif//_MSC_VER + #include <stdio.h> #include <stdlib.h> #include <time.h>

14 years, 1 month

[tkreuzer] 49563: [GENINCDATA] Fix a bug that caused excessive quotes in the output

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 11 15:29:20 2010 New Revision: 49563 URL: http://svn.reactos.org/svn/reactos?rev=49563&view=rev Log: [GENINCDATA] Fix a bug that caused excessive quotes in the output Modified: branches/cmake-bringup/include/asm/genincdata.c Modified: branches/cmake-bringup/include/asm/genincdata.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/genin… ============================================================================== --- branches/cmake-bringup/include/asm/genincdata.c [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/genincdata.c [iso-8859-1] Thu Nov 11 15:29:20 2010 @@ -27,7 +27,7 @@ #define TYPE_CONSTANT 2 #define TYPE_HEADER 3 -#define RAW(x) {TYPE_RAW, #x, 0} +#define RAW(x) {TYPE_RAW, x, 0} #define CONSTANT(name) {TYPE_CONSTANT, #name, name} #define OFFSET(name, struct, member) {TYPE_CONSTANT, #name, FIELD_OFFSET(struct, member)} #define RELOFFSET(name, struct, member, to) {TYPE_CONSTANT, #name, FIELD_OFFSET(struct, member) - FIELD_OFFSET(struct, to)}

14 years, 1 month

[tkreuzer] 49562: [CMAKE] Add importlib target for acledit

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 11 15:28:02 2010 New Revision: 49562 URL: http://svn.reactos.org/svn/reactos?rev=49562&view=rev Log: [CMAKE] Add importlib target for acledit Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit… ============================================================================== --- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Thu Nov 11 15:28:02 2010 @@ -1,19 +1,22 @@ set_unicode() + +spec2def(acledit.dll acledit.spec) list(APPEND SOURCE acledit.c stubs.c - acledit.rc) + acledit.rc + ${CMAKE_CURRENT_BINARY_DIR}/acledit.def) + add_library(acledit SHARED ${SOURCE}) set_module_type(acledit win32dll) -set_pdef_file(acledit acledit.pdef) - add_importlibs(acledit ntdll) add_cab_target(acledit 1) -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/acledit.def) +add_importlib_target(acledit.spec) +

14 years, 1 month

[tkreuzer] 49561: [ASM] add genincdata, a module that will be compiled as a dll to provide the data for geninc to be converted into an .inc file.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 11 13:40:29 2010 New Revision: 49561 URL: http://svn.reactos.org/svn/reactos?rev=49561&view=rev Log: [ASM] add genincdata, a module that will be compiled as a dll to provide the data for geninc to be converted into an .inc file. Added: branches/cmake-bringup/include/asm/ (with props) branches/cmake-bringup/include/asm/CMakeLists.txt (with props) branches/cmake-bringup/include/asm/genincdata.c (with props) Modified: branches/cmake-bringup/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Thu Nov 11 13:40:29 2010 @@ -41,9 +41,9 @@ add_subdirectory(lib) if(NOT MSVC) -export(TARGETS widl winebuild nci buildno gendib cabman cdmake mkhive spec2pdef FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) +export(TARGETS widl winebuild nci buildno gendib cabman cdmake mkhive spec2pdef geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) else() -export(TARGETS winebuild nci buildno gendib cabman cdmake mkhive spec2pdef FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) +export(TARGETS winebuild nci buildno gendib cabman cdmake mkhive spec2pdef geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) endif() else() @@ -118,6 +118,7 @@ add_subdirectory(include/reactos/idl) add_subdirectory(include/reactos/wine) add_subdirectory(include/reactos/mc) +add_subdirectory(include/asm) include(baseaddress.cmake) Propchange: branches/cmake-bringup/include/asm/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Nov 11 13:40:29 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/cmake-bringup/include/asm/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/cmake-bringup/include/asm/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/cmake-bringup/include/asm/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/cmake-bringup/include/asm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/CMake… ============================================================================== --- branches/cmake-bringup/include/asm/CMakeLists.txt (added) +++ branches/cmake-bringup/include/asm/CMakeLists.txt [iso-8859-1] Thu Nov 11 13:40:29 2010 @@ -1,0 +1,28 @@ + +add_library(genincdata SHARED genincdata.c) + +set_entrypoint(genincdata DummyEntry) + +if(MSVC) +set(OPT_MS "-ms") +else() +set(OPT_MS "") +endif() + +if(ARCH MATCHES i386) +set(_filename ks386) +endif() +if(ARCH MATCHES amd64) +set(_filename ksamd64) +endif() + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_filename}.inc + COMMAND native-geninc ${CMAKE_CURRENT_BINARY_DIR}/genincdata.dll ${CMAKE_CURRENT_BINARY_DIR}/${_filename}.inc ${OPT_MS} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/genincdata.dll +) + +add_custom_target( + ${_filename} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_filename}.inc +) Propchange: branches/cmake-bringup/include/asm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/include/asm/genincdata.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/genin… ============================================================================== --- branches/cmake-bringup/include/asm/genincdata.c (added) +++ branches/cmake-bringup/include/asm/genincdata.c [iso-8859-1] Thu Nov 11 13:40:29 2010 @@ -1,0 +1,1585 @@ +#undef __MSVCRT__ +#include <psdk/ntverp.h> + +/* DDK/IFS/NDK Headers */ +#include <excpt.h> +#include <ntdef.h> +#include <ntifs.h> +#include <arc/arc.h> +#include <ntndk.h> +#include <bugcodes.h> + +/* KD Support */ +#define NOEXTAPI +#include <windbgkd.h> +#include <wdbgexts.h> +#include <kddll.h> + +typedef struct +{ + char Type; + char Name[55]; + ULONGLONG Value; +} ASMGENDATA; + +#define TYPE_END 0 +#define TYPE_RAW 1 +#define TYPE_CONSTANT 2 +#define TYPE_HEADER 3 + +#define RAW(x) {TYPE_RAW, #x, 0} +#define CONSTANT(name) {TYPE_CONSTANT, #name, name} +#define OFFSET(name, struct, member) {TYPE_CONSTANT, #name, FIELD_OFFSET(struct, member)} +#define RELOFFSET(name, struct, member, to) {TYPE_CONSTANT, #name, FIELD_OFFSET(struct, member) - FIELD_OFFSET(struct, to)} +#define SIZE(name, struct) {TYPE_CONSTANT, #name, sizeof(struct)} +#define HEADER(x) {TYPE_HEADER, x, 0} + +#if defined(_MSC_VER) +#pragma section(".asmdef") +__declspec(allocate(".asmdef")) +#elif defined(__GNUC__) +__attribute__ ((section (x))) ASMGENDATA Table[] = +#else +#error Your compiler is not supported. +#endif +ASMGENDATA Table[] = +{ + +/* PORTABLE CONSTANTS ********************************************************/ + + HEADER("Pointer size"), + SIZE(SizeofPointer, PVOID), + + HEADER("Breakpoints"), + CONSTANT(BREAKPOINT_BREAK), + CONSTANT(BREAKPOINT_PRINT), + CONSTANT(BREAKPOINT_PROMPT), + CONSTANT(BREAKPOINT_LOAD_SYMBOLS), + CONSTANT(BREAKPOINT_UNLOAD_SYMBOLS), + CONSTANT(BREAKPOINT_COMMAND_STRING), + + HEADER("Context Frame Flags"), + CONSTANT(CONTEXT_FULL), + CONSTANT(CONTEXT_CONTROL), + CONSTANT(CONTEXT_INTEGER), + CONSTANT(CONTEXT_SEGMENTS), + CONSTANT(CONTEXT_FLOATING_POINT), + CONSTANT(CONTEXT_DEBUG_REGISTERS), + + HEADER("Exception flags"), + CONSTANT(EXCEPTION_NONCONTINUABLE), + CONSTANT(EXCEPTION_UNWINDING), + CONSTANT(EXCEPTION_EXIT_UNWIND), + CONSTANT(EXCEPTION_STACK_INVALID), + CONSTANT(EXCEPTION_NESTED_CALL), + CONSTANT(EXCEPTION_TARGET_UNWIND), + CONSTANT(EXCEPTION_COLLIDED_UNWIND), + CONSTANT(EXCEPTION_UNWIND), + CONSTANT(EXCEPTION_EXECUTE_HANDLER), + CONSTANT(EXCEPTION_CONTINUE_SEARCH), + CONSTANT(EXCEPTION_CONTINUE_EXECUTION), +#ifdef _X86_ + //CONSTANT(EXCEPTION_CHAIN_END), + //CONSTANT(FIXED_NTVDMSTATE_LINEAR), +#endif + + HEADER("Exception types"), + CONSTANT(ExceptionContinueExecution), + CONSTANT(ExceptionContinueSearch), + CONSTANT(ExceptionNestedException), + CONSTANT(ExceptionCollidedUnwind), + + HEADER("Lock Queue"), + CONSTANT(LOCK_QUEUE_WAIT), + CONSTANT(LOCK_QUEUE_OWNER), + CONSTANT(LockQueueDispatcherLock), + + HEADER("Performance Definitions"), +// CONSTANT(PERF_CONTEXTSWAP_OFFSET), +// CONSTANT(PERF_CONTEXTSWAP_FLAG), +// CONSTANT(PERF_INTERRUPT_OFFSET), +// CONSTANT(PERF_INTERRUPT_FLAG), +// CONSTANT(PERF_PROFILE_OFFSET), +// CONSTANT(PERF_PROFILE_FLAG), +// CONSTANT(PERF_SYSCALL_OFFSET), +// CONSTANT(PERF_SYSCALL_FLAG), +// CONSTANT(PERF_SPINLOCK_OFFSET), +// CONSTANT(PERF_SPINLOCK_FLAG), +// CONSTANT(NTOS_YIELD_MACRO), + + HEADER("Process states"), + CONSTANT(ProcessInMemory), + CONSTANT(ProcessOutOfMemory), + CONSTANT(ProcessInTransition), + + HEADER("Processor mode"), + CONSTANT(KernelMode), + CONSTANT(UserMode), + + HEADER("Status codes"), + CONSTANT(STATUS_ACCESS_VIOLATION), + CONSTANT(STATUS_ASSERTION_FAILURE), + CONSTANT(STATUS_ARRAY_BOUNDS_EXCEEDED), + CONSTANT(STATUS_BAD_COMPRESSION_BUFFER), + CONSTANT(STATUS_BREAKPOINT), + CONSTANT(STATUS_CALLBACK_POP_STACK), + CONSTANT(STATUS_DATATYPE_MISALIGNMENT), + CONSTANT(STATUS_FLOAT_DENORMAL_OPERAND), + CONSTANT(STATUS_FLOAT_DIVIDE_BY_ZERO), + CONSTANT(STATUS_FLOAT_INEXACT_RESULT), + CONSTANT(STATUS_FLOAT_INVALID_OPERATION), + CONSTANT(STATUS_FLOAT_OVERFLOW), + CONSTANT(STATUS_FLOAT_STACK_CHECK), + CONSTANT(STATUS_FLOAT_UNDERFLOW), + CONSTANT(STATUS_FLOAT_MULTIPLE_FAULTS), + CONSTANT(STATUS_FLOAT_MULTIPLE_TRAPS), + CONSTANT(STATUS_GUARD_PAGE_VIOLATION), + CONSTANT(STATUS_ILLEGAL_FLOAT_CONTEXT), + CONSTANT(STATUS_ILLEGAL_INSTRUCTION), + CONSTANT(STATUS_INSTRUCTION_MISALIGNMENT), + CONSTANT(STATUS_INVALID_HANDLE), + CONSTANT(STATUS_INVALID_LOCK_SEQUENCE), + CONSTANT(STATUS_INVALID_OWNER), + CONSTANT(STATUS_INVALID_PARAMETER), + CONSTANT(STATUS_INVALID_PARAMETER_1), + CONSTANT(STATUS_INVALID_SYSTEM_SERVICE), +// CONSTANT(STATUS_INVALID_THREAD), + CONSTANT(STATUS_INTEGER_DIVIDE_BY_ZERO), + CONSTANT(STATUS_INTEGER_OVERFLOW), + CONSTANT(STATUS_IN_PAGE_ERROR), + CONSTANT(STATUS_KERNEL_APC), + CONSTANT(STATUS_LONGJUMP), + CONSTANT(STATUS_NO_CALLBACK_ACTIVE), + CONSTANT(STATUS_NO_EVENT_PAIR), + CONSTANT(STATUS_PRIVILEGED_INSTRUCTION), + CONSTANT(STATUS_SINGLE_STEP), + CONSTANT(STATUS_STACK_BUFFER_OVERRUN), + CONSTANT(STATUS_STACK_OVERFLOW), + CONSTANT(STATUS_SUCCESS), + CONSTANT(STATUS_THREAD_IS_TERMINATING), + CONSTANT(STATUS_TIMEOUT), + CONSTANT(STATUS_UNWIND), + CONSTANT(STATUS_UNWIND_CONSOLIDATE), + CONSTANT(STATUS_USER_APC), + CONSTANT(STATUS_WAKE_SYSTEM_DEBUGGER), + + HEADER("TLS defines"), + CONSTANT(TLS_MINIMUM_AVAILABLE), + CONSTANT(TLS_EXPANSION_SLOTS), + + HEADER("Thread states"), + CONSTANT(Initialized), + CONSTANT(Ready), + CONSTANT(Running), + CONSTANT(Standby), + CONSTANT(Terminated), + CONSTANT(Waiting), + + HEADER("Wait type / reason"), + CONSTANT(WrExecutive), + CONSTANT(WrMutex), + CONSTANT(WrDispatchInt), + CONSTANT(WrQuantumEnd), + CONSTANT(WrEventPair), + CONSTANT(WaitAny), + CONSTANT(WaitAll), + + HEADER("Interrupt object types"), +// CONSTANT(InLevelSensitive), +// CONSTANT(InLatched), + + HEADER("Bug Check Codes"), + CONSTANT(APC_INDEX_MISMATCH), + CONSTANT(INVALID_AFFINITY_SET), + CONSTANT(INVALID_DATA_ACCESS_TRAP), + CONSTANT(IRQL_NOT_GREATER_OR_EQUAL), + CONSTANT(IRQL_NOT_LESS_OR_EQUAL), + CONSTANT(NO_USER_MODE_CONTEXT), + CONSTANT(SPIN_LOCK_ALREADY_OWNED), + CONSTANT(SPIN_LOCK_NOT_OWNED), + CONSTANT(THREAD_NOT_MUTEX_OWNER), + CONSTANT(TRAP_CAUSE_UNKNOWN), + CONSTANT(KMODE_EXCEPTION_NOT_HANDLED), + CONSTANT(KERNEL_APC_PENDING_DURING_EXIT), + CONSTANT(PANIC_STACK_SWITCH), + CONSTANT(DATA_BUS_ERROR), + CONSTANT(INSTRUCTION_BUS_ERROR), + CONSTANT(SYSTEM_EXIT_OWNED_MUTEX), +// CONSTANT(SYSTEM_UNWIND_PREVIOUS_USER), +// CONSTANT(SYSTEM_SERVICE_EXCEPTION), +// CONSTANT(INTERRUPT_UNWIND_ATTEMPTED), +// CONSTANT(INTERRUPT_EXCEPTION_NOT_HANDLED), + CONSTANT(PAGE_FAULT_WITH_INTERRUPTS_OFF), + CONSTANT(IRQL_GT_ZERO_AT_SYSTEM_SERVICE), + CONSTANT(DATA_COHERENCY_EXCEPTION), + CONSTANT(INSTRUCTION_COHERENCY_EXCEPTION), + CONSTANT(HAL1_INITIALIZATION_FAILED), + CONSTANT(UNEXPECTED_KERNEL_MODE_TRAP), + CONSTANT(NMI_HARDWARE_FAILURE), + CONSTANT(SPIN_LOCK_INIT_FAILURE), + CONSTANT(ATTEMPTED_SWITCH_FROM_DPC), +// CONSTANT(MUTEX_ALREADY_OWNED), +// CONSTANT(HARDWARE_INTERRUPT_STORM), +// CONSTANT(RECURSIVE_MACHINE_CHECK), +// CONSTANT(RECURSIVE_NMI), + + HEADER("IRQL"), + CONSTANT(PASSIVE_LEVEL), + CONSTANT(APC_LEVEL), + CONSTANT(DISPATCH_LEVEL), +#ifdef _M_AMD64 + CONSTANT(CLOCK_LEVEL), +#else + CONSTANT(CLOCK1_LEVEL), + CONSTANT(CLOCK2_LEVEL), +#endif + CONSTANT(IPI_LEVEL), + CONSTANT(POWER_LEVEL), + CONSTANT(PROFILE_LEVEL), + CONSTANT(HIGH_LEVEL), + RAW("#ifdef NT_UP"), + {1, "SYNCH_LEVEL", DISPATCH_LEVEL}, + RAW("#else"), + {1, "SYNCH_LEVEL", (IPI_LEVEL - 2)}, + RAW("#endif"), + + HEADER("Stack sizes"), + CONSTANT(KERNEL_STACK_SIZE), + CONSTANT(KERNEL_LARGE_STACK_SIZE), + CONSTANT(KERNEL_LARGE_STACK_COMMIT), +// CONSTANT(DOUBLE_FAULT_STACK_SIZE), +#ifdef _M_AMD64 + CONSTANT(KERNEL_MCA_EXCEPTION_STACK_SIZE), + CONSTANT(NMI_STACK_SIZE), +#endif + + HEADER("Thread flags"), +// CONSTANT(THREAD_FLAGS_CYCLE_PROFILING), +// CONSTANT(THREAD_FLAGS_CYCLE_PROFILING_LOCK_BIT), +// CONSTANT(THREAD_FLAGS_CYCLE_PROFILING_LOCK), +// CONSTANT(THREAD_FLAGS_COUNTER_PROFILING), +// CONSTANT(THREAD_FLAGS_COUNTER_PROFILING_LOCK_BIT), +// CONSTANT(THREAD_FLAGS_COUNTER_PROFILING_LOCK), +// CONSTANT(THREAD_FLAGS_CPU_THROTTLED), +// CONSTANT(THREAD_FLAGS_CPU_THROTTLED_BIT), +// CONSTANT(THREAD_FLAGS_ACCOUNTING_ANY), + + HEADER("Miscellaneous Definitions"), +// CONSTANT(BASE_PRIORITY_THRESHOLD), +// CONSTANT(EVENT_PAIR_INCREMENT), + CONSTANT(LOW_REALTIME_PRIORITY), + CONSTANT(CLOCK_QUANTUM_DECREMENT), +// CONSTANT(READY_SKIP_QUANTUM), +// CONSTANT(THREAD_QUANTUM), + CONSTANT(WAIT_QUANTUM_DECREMENT), +// CONSTANT(ROUND_TRIP_DECREMENT_COUNT), + CONSTANT(MAXIMUM_PROCESSORS), + CONSTANT(INITIAL_STALL_COUNT), +// CONSTANT(EXCEPTION_EXECUTE_FAULT), +// CONSTANT(KCACHE_ERRATA_MONITOR_FLAGS), +// CONSTANT(KI_EXCEPTION_GP_FAULT), +// CONSTANT(KI_EXCEPTION_INVALID_OP), +// CONSTANT(KI_EXCEPTION_INTEGER_DIVIDE_BY_ZERO), + CONSTANT(KI_EXCEPTION_ACCESS_VIOLATION), +// CONSTANT(TARGET_FREEZE), +// CONSTANT(BlackHole), + CONSTANT(Executive), + CONSTANT(FALSE), + CONSTANT(TRUE), + CONSTANT(DBG_STATUS_CONTROL_C), + CONSTANT(USER_SHARED_DATA), +// CONSTANT(MM_SHARED_USER_DATA_VA), + CONSTANT(PAGE_SIZE), +// CONSTANT(KERNEL_STACK_CONTROL_LARGE_STACK), +// CONSTANT(KI_DPC_ALL_FLAGS), +// CONSTANT(DISPATCH_LENGTH), + CONSTANT(MAXIMUM_IDTVECTOR), +// CONSTANT(MAXIMUM_PRIMARY_VECTOR), + CONSTANT(PRIMARY_VECTOR_BASE), + CONSTANT(RPL_MASK), + CONSTANT(MODE_MASK), +// CONSTANT(KTHREAD_AUTO_ALIGNMENT_BIT), +// CONSTANT(KTHREAD_GUI_THREAD_MASK), +// CONSTANT(KI_SLIST_FAULT_COUNT_MAXIMUM), + CONSTANT(NUMBER_SERVICE_TABLES), + CONSTANT(SERVICE_NUMBER_MASK), + CONSTANT(SERVICE_TABLE_SHIFT), + CONSTANT(SERVICE_TABLE_MASK), + CONSTANT(SERVICE_TABLE_TEST), + +/* ARCHITECTURE SPECIFIC CONTSTANTS ******************************************/ + +#if defined(_M_AMD64) || defined(_M_IX86) + + HEADER("CR0 flags"), + CONSTANT(CR0_PE), + CONSTANT(CR0_MP), + CONSTANT(CR0_EM), + CONSTANT(CR0_TS), + CONSTANT(CR0_ET), + CONSTANT(CR0_NE), + CONSTANT(CR0_WP), + CONSTANT(CR0_AM), + CONSTANT(CR0_NW), + CONSTANT(CR0_CD), + CONSTANT(CR0_PG), + + HEADER("CR4 flags"), + CONSTANT(CR4_VME), + CONSTANT(CR4_PVI), + CONSTANT(CR4_TSD), + CONSTANT(CR4_DE), + CONSTANT(CR4_PSE), + CONSTANT(CR4_PAE), + CONSTANT(CR4_MCE), + CONSTANT(CR4_PGE), + CONSTANT(CR4_FXSR), + CONSTANT(CR4_XMMEXCPT), +#if defined(_M_IX86) +// CONSTANT(CR4_PGE_V), +// CONSTANT(CR4_XSAVE), +#elif defined(_M_AMD64) + CONSTANT(CR4_CHANNELS), +#endif + + HEADER("KeFeatureBits flags"), + CONSTANT(KF_RDTSC), + CONSTANT(KF_CR4), + CONSTANT(KF_GLOBAL_PAGE), + CONSTANT(KF_LARGE_PAGE), + CONSTANT(KF_CMPXCHG8B), + CONSTANT(KF_FAST_SYSCALL), +#ifdef _M_IX86 + CONSTANT(KF_V86_VIS), +// CONSTANT(KF_XSTATE), +#endif + + HEADER("Machine type definitions"), + CONSTANT(MACHINE_TYPE_ISA), + CONSTANT(MACHINE_TYPE_EISA), + CONSTANT(MACHINE_TYPE_MCA), + +#endif + +#ifdef _M_IX86 + + HEADER("EFLAGS"), + CONSTANT(EFLAGS_TF), + CONSTANT(EFLAGS_INTERRUPT_MASK), + CONSTANT(EFLAGS_V86_MASK), + CONSTANT(EFLAGS_ALIGN_CHECK), + CONSTANT(EFLAGS_VIF), + CONSTANT(EFLAGS_VIP), + CONSTANT(EFLAGS_USER_SANITIZE), + + HEADER("KDGT selectors"), + CONSTANT(KGDT_R3_DATA), + CONSTANT(KGDT_R3_CODE), + CONSTANT(KGDT_R0_CODE), + CONSTANT(KGDT_R0_DATA), + CONSTANT(KGDT_R0_PCR), +// CONSTANT(KGDT_STACK16), +// CONSTANT(KGDT_CODE16), + CONSTANT(KGDT_TSS), + CONSTANT(KGDT_R3_TEB), + CONSTANT(KGDT_DF_TSS), + CONSTANT(KGDT_NMI_TSS), + CONSTANT(KGDT_LDT), + + CONSTANT(NPX_STATE_NOT_LOADED), + CONSTANT(NPX_STATE_LOADED), +// CONSTANT(NPX_MASK_LAZY), + +/* + HEADER("VDM constants"), + CONSTANT(VDM_INDEX_Invalid), + CONSTANT(VDM_INDEX_0F), + CONSTANT(VDM_INDEX_ESPrefix), + CONSTANT(VDM_INDEX_CSPrefix), + CONSTANT(VDM_INDEX_SSPrefix), + CONSTANT(VDM_INDEX_DSPrefix), + CONSTANT(VDM_INDEX_FSPrefix), + CONSTANT(VDM_INDEX_GSPrefix), + CONSTANT(VDM_INDEX_OPER32Prefix), + CONSTANT(VDM_INDEX_ADDR32Prefix), + CONSTANT(VDM_INDEX_INSB), + CONSTANT(VDM_INDEX_INSW), + CONSTANT(VDM_INDEX_OUTSB), + CONSTANT(VDM_INDEX_OUTSW), + CONSTANT(VDM_INDEX_PUSHF), + CONSTANT(VDM_INDEX_POPF), + CONSTANT(VDM_INDEX_INTnn), + CONSTANT(VDM_INDEX_INTO), + CONSTANT(VDM_INDEX_IRET), + CONSTANT(VDM_INDEX_NPX), + CONSTANT(VDM_INDEX_INBimm), + CONSTANT(VDM_INDEX_INWimm), + CONSTANT(VDM_INDEX_OUTBimm), + CONSTANT(VDM_INDEX_OUTWimm), + CONSTANT(VDM_INDEX_INB), + CONSTANT(VDM_INDEX_INW), + CONSTANT(VDM_INDEX_OUTB), + CONSTANT(VDM_INDEX_OUTW), + CONSTANT(VDM_INDEX_LOCKPrefix), + CONSTANT(VDM_INDEX_REPNEPrefix), + CONSTANT(VDM_INDEX_REPPrefix), + CONSTANT(VDM_INDEX_CLI), + CONSTANT(VDM_INDEX_STI), + CONSTANT(VDM_INDEX_HLT), + CONSTANT(MAX_VDM_INDEX), +*/ + CONSTANT(PF_XMMI_INSTRUCTIONS_AVAILABLE), + CONSTANT(EFLAG_SELECT), +// CONSTANT(IPI_FREEZE), +// CONSTANT(XSAVE_PRESENT), + +#elif defined(_M_AMD64) + + HEADER("EFLAGS"), + CONSTANT(EFLAGS_TF_MASK), + CONSTANT(EFLAGS_TF_SHIFT), + CONSTANT(EFLAGS_IF_MASK), + CONSTANT(EFLAGS_IF_SHIFT), + CONSTANT(EFLAGS_ID_MASK), + + HEADER("Hypervisor Enlightenment Definitions"), + CONSTANT(HV_MMU_USE_HYPERCALL_FOR_ADDRESS_SWITCH), + CONSTANT(HV_MMU_USE_HYPERCALL_FOR_LOCAL_FLUSH), + CONSTANT(HV_MMU_USE_HYPERCALL_FOR_REMOTE_FLUSH), + CONSTANT(HV_X64_MSR_APIC_EOI), + CONSTANT(HV_APIC_ENLIGHTENED), + CONSTANT(HV_KE_USE_HYPERCALL_FOR_LONG_SPIN_WAIT), + CONSTANT(HV_VIRTUAL_APIC_NO_EOI_REQUIRED_V), + CONSTANT(HvApicFlags), + + HEADER("KDGT selectors"), + CONSTANT(KGDT64_NULL), + CONSTANT(KGDT64_R0_CODE), + CONSTANT(KGDT64_R0_DATA), + CONSTANT(KGDT64_R3_CMCODE), + CONSTANT(KGDT64_R3_DATA), + CONSTANT(KGDT64_R3_CODE), + CONSTANT(KGDT64_SYS_TSS), + CONSTANT(KGDT64_R3_CMTEB), + + HEADER("Machine Specific Register Numbers"), + CONSTANT(MSR_EFER), + CONSTANT(MSR_STAR), + CONSTANT(MSR_LSTAR), + CONSTANT(MSR_CSTAR), + CONSTANT(MSR_SYSCALL_MASK), + CONSTANT(MSR_FS_BASE), + CONSTANT(MSR_GS_BASE), + CONSTANT(MSR_GS_SWAP), + CONSTANT(MSR_MCG_STATUS), + CONSTANT(MSR_AMD_ACCESS), + + HEADER("Flags for MSR_EFER"), + CONSTANT(MSR_LMA), + CONSTANT(MSR_LME), + CONSTANT(MSR_SCE), + CONSTANT(MSR_NXE), + CONSTANT(MSR_PAT), + CONSTANT(MSR_DEGUG_CTL), + CONSTANT(MSR_LAST_BRANCH_FROM), + CONSTANT(MSR_LAST_BRANCH_TO), + CONSTANT(MSR_LAST_EXCEPTION_FROM), + CONSTANT(MSR_LAST_EXCEPTION_TO), + + HEADER("Flags for MSR_DEGUG_CTL"), + CONSTANT(MSR_DEBUG_CTL_LBR), + CONSTANT(MSR_DEBUG_CRL_BTF), + +#endif + +#if 0 + HEADER("Fatal exception codes"), + CONSTANT(EXCEPTION_DIVIDED_BY_ZERO), + CONSTANT(EXCEPTION_DEBUG), + CONSTANT(EXCEPTION_NMI), + CONSTANT(EXCEPTION_INT3), + CONSTANT(EXCEPTION_BOUND_CHECK), + CONSTANT(EXCEPTION_INVALID_OPCODE), + CONSTANT(EXCEPTION_NPX_NOT_AVAILABLE), + CONSTANT(EXCEPTION_DOUBLE_FAULT), + CONSTANT(EXCEPTION_NPX_OVERRUN), + CONSTANT(EXCEPTION_INVALID_TSS), + CONSTANT(EXCEPTION_SEGMENT_NOT_PRESENT), + CONSTANT(EXCEPTION_STACK_FAULT), + CONSTANT(EXCEPTION_GP_FAULT), + CONSTANT(EXCEPTION_RESERVED_TRAP), + CONSTANT(EXCEPTION_NPX_ERROR), + CONSTANT(EXCEPTION_ALIGNMENT_CHECK), +#endif + + +/* STRUCTURE OFFSETS *********************************************************/ + + HEADER("KAFFINITY_EX"), +// OFFSET(AfBitmap, KAFFINITY_EX, Bitmap), + + HEADER("Aligned Affinity"), +// OFFSET(AfsCpuSet, ???, CpuSet), + + HEADER("KAPC"), + OFFSET(ApType, KAPC, Type), + OFFSET(ApSize, KAPC, Size), + OFFSET(ApThread, KAPC, Thread), + OFFSET(ApApcListEntry, KAPC, ApcListEntry), + OFFSET(ApKernelRoutine, KAPC, KernelRoutine), + OFFSET(ApRundownRoutine, KAPC, RundownRoutine), + OFFSET(ApNormalRoutine, KAPC, NormalRoutine), + OFFSET(ApNormalContext, KAPC, NormalContext), + OFFSET(ApSystemArgument1, KAPC, SystemArgument1), + OFFSET(ApSystemArgument2, KAPC, SystemArgument2), + OFFSET(ApApcStateIndex, KAPC, ApcStateIndex), + OFFSET(ApApcMode, KAPC, ApcMode), + OFFSET(ApInserted, KAPC, Inserted), + SIZE(ApcObjectLength, KAPC), + + HEADER("KAPC_STATE"), + OFFSET(AsApcListHead, KAPC_STATE, ApcListHead), + OFFSET(AsProcess, KAPC_STATE, Process), + OFFSET(AsKernelApcInProgress, KAPC_STATE, KernelApcInProgress), + OFFSET(AsKernelApcPending, KAPC_STATE, KernelApcPending), + OFFSET(AsUserApcPending, KAPC_STATE, UserApcPending), + + HEADER("CLIENT_ID"), + OFFSET(CidUniqueProcess, CLIENT_ID, UniqueProcess), + OFFSET(CidUniqueThread, CLIENT_ID, UniqueThread), + + HEADER("RTL_CRITICAL_SECTION"), + OFFSET(CsDebugInfo, RTL_CRITICAL_SECTION, DebugInfo), + OFFSET(CsLockCount, RTL_CRITICAL_SECTION, LockCount), + OFFSET(CsRecursionCount, RTL_CRITICAL_SECTION, RecursionCount), + OFFSET(CsOwningThread, RTL_CRITICAL_SECTION, OwningThread), + OFFSET(CsLockSemaphore, RTL_CRITICAL_SECTION, LockSemaphore), + OFFSET(CsSpinCount, RTL_CRITICAL_SECTION, SpinCount), + + HEADER("RTL_CRITICAL_SECTION_DEBUG"), + OFFSET(CsType, RTL_CRITICAL_SECTION_DEBUG, Type), + OFFSET(CsCreatorBackTraceIndex, RTL_CRITICAL_SECTION_DEBUG, CreatorBackTraceIndex), + OFFSET(CsCriticalSection, RTL_CRITICAL_SECTION_DEBUG, CriticalSection), + OFFSET(CsProcessLocksList, RTL_CRITICAL_SECTION_DEBUG, ProcessLocksList), + OFFSET(CsEntryCount, RTL_CRITICAL_SECTION_DEBUG, EntryCount), + OFFSET(CsContentionCount, RTL_CRITICAL_SECTION_DEBUG, ContentionCount), + + HEADER("KDEVICE_QUEUE_ENTRY"), + OFFSET(DeDeviceListEntry, KDEVICE_QUEUE_ENTRY, DeviceListEntry), + OFFSET(DeSortKey, KDEVICE_QUEUE_ENTRY, SortKey), + OFFSET(DeInserted, KDEVICE_QUEUE_ENTRY, Inserted), + SIZE(DeviceQueueEntryLength, KDEVICE_QUEUE_ENTRY), + + HEADER("KDPC"), + OFFSET(DpType, KDPC, Type), + OFFSET(DpImportance, KDPC, Importance), + OFFSET(DpNumber, KDPC, Number), + OFFSET(DpDpcListEntry, KDPC, DpcListEntry), + OFFSET(DpDeferredRoutine, KDPC, DeferredRoutine), + OFFSET(DpDeferredContext, KDPC, DeferredContext), + OFFSET(DpSystemArgument1, KDPC, SystemArgument1), + OFFSET(DpSystemArgument2, KDPC, SystemArgument2), + OFFSET(DpDpcData, KDPC, DpcData), + SIZE(DpcObjectLength, KDPC), + + HEADER("KDEVICE_QUEUE"), + OFFSET(DvType, KDEVICE_QUEUE, Type), + OFFSET(DvSize, KDEVICE_QUEUE, Size), + OFFSET(DvDeviceListHead, KDEVICE_QUEUE, DeviceListHead), + OFFSET(DvSpinLock, KDEVICE_QUEUE, Lock), + OFFSET(DvBusy, KDEVICE_QUEUE, Busy), + SIZE(DeviceQueueObjectLength, KDEVICE_QUEUE), + + HEADER("EXCEPTION_RECORD"), + OFFSET(ErExceptionCode, EXCEPTION_RECORD, ExceptionCode), + OFFSET(ErExceptionFlags, EXCEPTION_RECORD, ExceptionFlags), + OFFSET(ErExceptionRecord, EXCEPTION_RECORD, ExceptionRecord), + OFFSET(ErExceptionAddress, EXCEPTION_RECORD, ExceptionAddress), + OFFSET(ErNumberParameters, EXCEPTION_RECORD, NumberParameters), + OFFSET(ErExceptionInformation, EXCEPTION_RECORD, ExceptionInformation), + SIZE(ExceptionRecordLength, EXCEPTION_RECORD), + SIZE(EXCEPTION_RECORD_LENGTH, EXCEPTION_RECORD), + + HEADER("EPROCESS"), + OFFSET(EpDebugPort, EPROCESS, DebugPort), + OFFSET(EpVdmObjects, EPROCESS, VdmObjects), + SIZE(ExecutiveProcessObjectLength, EPROCESS), + + HEADER("KEVENT"), + OFFSET(EvType, KEVENT, Header.Type), + OFFSET(EvSize, KEVENT, Header.Size), + OFFSET(EvSignalState, KEVENT, Header.SignalState), + OFFSET(EvWaitListHead, KEVENT, Header.WaitListHead), + SIZE(EventObjectLength, KEVENT), + + HEADER("FAST_MUTEX"), + OFFSET(FmCount, FAST_MUTEX, Count), + OFFSET(FmOwner, FAST_MUTEX, Owner), + OFFSET(FmContention, FAST_MUTEX, Contention), +// OFFSET(FmGate, FAST_MUTEX, Gate), + OFFSET(FmOldIrql, FAST_MUTEX, OldIrql), + + HEADER("KINTERRUPT"), + OFFSET(InType, KINTERRUPT, Type), + OFFSET(InSize, KINTERRUPT, Size), + OFFSET(InInterruptListEntry, KINTERRUPT, InterruptListEntry), + OFFSET(InServiceRoutine, KINTERRUPT, ServiceRoutine), + OFFSET(InServiceContext, KINTERRUPT, ServiceContext), + OFFSET(InSpinLock, KINTERRUPT, SpinLock), + OFFSET(InTickCount, KINTERRUPT, TickCount), + OFFSET(InActualLock, KINTERRUPT, ActualLock), + OFFSET(InDispatchAddress, KINTERRUPT, DispatchAddress), + OFFSET(InVector, KINTERRUPT, Vector), + OFFSET(InIrql, KINTERRUPT, Irql), + OFFSET(InSynchronizeIrql, KINTERRUPT, SynchronizeIrql), + OFFSET(InFloatingSave, KINTERRUPT, FloatingSave), + OFFSET(InConnected, KINTERRUPT, Connected), + OFFSET(InNumber, KINTERRUPT, Number), + OFFSET(InShareVector, KINTERRUPT, ShareVector), + OFFSET(InMode, KINTERRUPT, Mode), + OFFSET(InServiceCount, KINTERRUPT, ServiceCount), + OFFSET(InDispatchCount, KINTERRUPT, DispatchCount), +// OFFSET(InTrapFrame, KINTERRUPT, TrapFrame), + OFFSET(InDispatchCode, KINTERRUPT, DispatchCode), + SIZE(InterruptObjectLength, KINTERRUPT), + + HEADER("IO_STATUS_BLOCK"), + OFFSET(IoStatus, IO_STATUS_BLOCK, Status), + OFFSET(IoPointer, IO_STATUS_BLOCK, Pointer), + OFFSET(IoInformation, IO_STATUS_BLOCK, Information), + +#ifdef _M_IX86 +// Kernel Stack Control Structure Offset (relative to initial stack pointer) Definitions +// RELOFFSET(KcPreviousBase, KERNEL_STACK_CONTROL, PreviousBase, ???), +// RELOFFSET(KcPreviousLimit, KERNEL_STACK_CONTROL, PreviousBase, ???), +// RELOFFSET(KcPreviousKernel, KERNEL_STACK_CONTROL, PreviousBase, ???), +// RELOFFSET(KcPreviousInitial, KERNEL_STACK_CONTROL, PreviousBase, ???), +#else + HEADER("KERNEL_STACK_CONTROL"), +// OFFSET(KcPreviousBase, KERNEL_STACK_CONTROL, PreviousBase), +// OFFSET(KcPreviousLimit, KERNEL_STACK_CONTROL, PreviousLimit), +// OFFSET(KcPreviousKernel, KERNEL_STACK_CONTROL, PreviousKernel), +// OFFSET(KcPreviousInitial, KERNEL_STACK_CONTROL, PreviousInitial), +// SIZE(KERNEL_STACK_CONTROL_LENGTH, KERNEL_STACK_CONTROL), +#endif + + HEADER("KNODE"), +// OFFSET(KnRight, KNODE, Right), +// OFFSET(KnLeft, KNODE, Left), + OFFSET(KnPfnDereferenceSListHead, KNODE, PfnDereferenceSListHead), + OFFSET(KnProcessorMask, KNODE, ProcessorMask), + OFFSET(KnColor, KNODE, Color), + OFFSET(KnSeed, KNODE, Seed), + OFFSET(KnNodeNumber, KNODE, NodeNumber), + OFFSET(KnFlags, KNODE, Flags), + OFFSET(knMmShiftedColor, KNODE, MmShiftedColor), + OFFSET(KnFreeCount, KNODE, FreeCount), + OFFSET(KnPfnDeferredList, KNODE, PfnDeferredList), + SIZE(KNODE_SIZE, KNODE), + + HEADER("KSPIN_LOCK_QUEUE"), + OFFSET(LqNext, KSPIN_LOCK_QUEUE, Next), + OFFSET(LqLock, KSPIN_LOCK_QUEUE, Lock), + + HEADER("KLOCK_QUEUE_HANDLE"), + OFFSET(LqhNext, KLOCK_QUEUE_HANDLE, LockQueue.Next), + OFFSET(LqhLock, KLOCK_QUEUE_HANDLE, LockQueue.Lock), + OFFSET(LqhOldIrql, KLOCK_QUEUE_HANDLE, OldIrql), + SIZE(LOCK_QUEUE_HEADER_SIZE, KLOCK_QUEUE_HANDLE), + + HEADER("LARGE_INTEGER"), + OFFSET(LiLowPart, LARGE_INTEGER, LowPart), + OFFSET(LiHighPart, LARGE_INTEGER, HighPart), +#if 0 + HEADER("LOADER_PARAMETER_BLOCK (rel. to LoadOrderListHead)"), + RELOFFSET(LpbLoadOrderListHead, LOADER_PARAMETER_BLOCK, LoadOrderListHead, LoadOrderListHead), + RELOFFSET(LpbMemoryDescriptorListHead, LOADER_PARAMETER_BLOCK, MemoryDescriptorListHead, LoadOrderListHead), + RELOFFSET(LpbKernelStack, LOADER_PARAMETER_BLOCK, KernelStack, LoadOrderListHead), + RELOFFSET(LpbPrcb, LOADER_PARAMETER_BLOCK, Prcb, LoadOrderListHead), + RELOFFSET(LpbProcess, LOADER_PARAMETER_BLOCK, Process, LoadOrderListHead), + RELOFFSET(LpbThread, LOADER_PARAMETER_BLOCK, Thread, LoadOrderListHead), + RELOFFSET(LpbI386, LOADER_PARAMETER_BLOCK, u.I386, LoadOrderListHead), + RELOFFSET(LpbRegistryLength, LOADER_PARAMETER_BLOCK, RegistryLength, LoadOrderListHead), + RELOFFSET(LpbRegistryBase, LOADER_PARAMETER_BLOCK, RegistryBase, LoadOrderListHead), + RELOFFSET(LpbConfigurationRoot, LOADER_PARAMETER_BLOCK, ConfigurationRoot, LoadOrderListHead), + RELOFFSET(LpbArcBootDeviceName, LOADER_PARAMETER_BLOCK, ArcBootDeviceName, LoadOrderListHead), + RELOFFSET(LpbArcHalDeviceName, LOADER_PARAMETER_BLOCK, ArcHalDeviceName, LoadOrderListHead), + RELOFFSET(LpbLoadOptions, LOADER_PARAMETER_BLOCK, LoadOptions, LoadOrderListHead), + RELOFFSET(LpbExtension, LOADER_PARAMETER_BLOCK, Extension, LoadOrderListHead), +#endif + + HEADER("LIST_ENTRY"), + OFFSET(LsFlink, LIST_ENTRY, Flink), + OFFSET(LsBlink, LIST_ENTRY, Blink), + + HEADER("PEB"), + OFFSET(PeKernelCallbackTable, PEB, KernelCallbackTable), + SIZE(ProcessEnvironmentBlockLength, PEB), + + HEADER("KPROFILE"), + OFFSET(PfType, KPROFILE, Type), + OFFSET(PfSize, KPROFILE, Size), + OFFSET(PfProfileListEntry, KPROFILE, ProfileListEntry), + OFFSET(PfProcess, KPROFILE, Process), + OFFSET(PfRangeBase, KPROFILE, RangeBase), + OFFSET(PfRangeLimit, KPROFILE, RangeLimit), + OFFSET(PfBucketShift, KPROFILE, BucketShift), + OFFSET(PfBuffer, KPROFILE, Buffer), + OFFSET(PfSegment, KPROFILE, Segment), + OFFSET(PfAffinity, KPROFILE, Affinity), + OFFSET(PfSource, KPROFILE, Source), + OFFSET(PfStarted, KPROFILE, Started), + SIZE(ProfileObjectLength, KPROFILE), + + HEADER("PORT_MESSAGE"), + OFFSET(PmLength, PORT_MESSAGE, u1.Length), + OFFSET(PmZeroInit, PORT_MESSAGE, u2.ZeroInit), + OFFSET(PmClientId, PORT_MESSAGE, ClientId), + OFFSET(PmProcess, PORT_MESSAGE, ClientId.UniqueProcess), + OFFSET(PmThread, PORT_MESSAGE, ClientId.UniqueThread), + OFFSET(PmMessageId, PORT_MESSAGE, MessageId), + OFFSET(PmClientViewSize, PORT_MESSAGE, ClientViewSize), + SIZE(PortMessageLength, PORT_MESSAGE), + + HEADER("KPROCESS"), + OFFSET(PrType, KPROCESS, Header.Type), + OFFSET(PrSize, KPROCESS, Header.Size), + OFFSET(PrSignalState, KPROCESS, Header.SignalState), + OFFSET(PrProfileListHead, KPROCESS, ProfileListHead), + OFFSET(PrDirectoryTableBase, KPROCESS, DirectoryTableBase), +#ifdef _M_IX86 + OFFSET(PrLdtDescriptor, KPROCESS, LdtDescriptor), +#endif + OFFSET(PrIopmOffset, KPROCESS, IopmOffset), +#ifdef _M_IX86 + OFFSET(PrInt21Descriptor, KPROCESS, Int21Descriptor), + OFFSET(PrVdmTrapcHandler, KPROCESS, VdmTrapcHandler), +// OFFSET(PrVdmObjects, KPROCESS, VdmObjects), + OFFSET(PrFlags, KPROCESS, Flags), +#endif +// OFFSET(PrInstrumentationCallback, KPROCESS, InstrumentationCallback), + OFFSET(PrActiveProcessors, KPROCESS, ActiveProcessors), + OFFSET(PrKernelTime, KPROCESS, KernelTime), + OFFSET(PrUserTime, KPROCESS, UserTime), + OFFSET(PrReadyListHead, KPROCESS, ReadyListHead), + OFFSET(PrSwapListEntry, KPROCESS, SwapListEntry), + OFFSET(PrThreadListHead, KPROCESS, ThreadListHead), + OFFSET(PrProcessLock, KPROCESS, ProcessLock), + OFFSET(PrAffinity, KPROCESS, Affinity), + OFFSET(PrProcessFlags, KPROCESS, ProcessFlags), + OFFSET(PrBasePriority, KPROCESS, BasePriority), + OFFSET(PrQuantumReset, KPROCESS, QuantumReset), + OFFSET(PrState, KPROCESS, State), + OFFSET(PrStackCount, KPROCESS, StackCount), +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + OFFSET(PrCycleTime, KPROCESS, CycleTime), +#endif + SIZE(KernelProcessObjectLength, KPROCESS), + + HEADER("KQUEUE"), + OFFSET(QuType, KQUEUE, Header.Type), + OFFSET(QuSize, KQUEUE, Header.Size), + OFFSET(QuSignalState, KQUEUE, Header.SignalState), + OFFSET(QuEntryListHead, KQUEUE, EntryListHead), + OFFSET(QuCurrentCount, KQUEUE, CurrentCount), + OFFSET(QuMaximumCount, KQUEUE, MaximumCount), + OFFSET(QuThreadListHead, KQUEUE, ThreadListHead), + SIZE(QueueObjectLength, KQUEUE), + + HEADER("STRING"), + OFFSET(StrLength, STRING, Length), + OFFSET(StrMaximumLength, STRING, MaximumLength), + OFFSET(StrBuffer, STRING, Buffer), + + HEADER("TEB"), + OFFSET(TeCmTeb, TEB, NtTib), +#ifdef _M_IX86 + OFFSET(TeExceptionList, TEB, NtTib.ExceptionList), +#endif + OFFSET(TeStackBase, TEB, NtTib.StackBase), + OFFSET(TeStackLimit, TEB, NtTib.StackLimit), + OFFSET(TeFiberData, TEB, NtTib.FiberData), + OFFSET(TeSelf, TEB, NtTib.Self), + OFFSET(TeEnvironmentPointer, TEB, EnvironmentPointer), + OFFSET(TeClientId, TEB, ClientId), + OFFSET(TeActiveRpcHandle, TEB, ActiveRpcHandle), + OFFSET(TeThreadLocalStoragePointer, TEB, ThreadLocalStoragePointer), + OFFSET(TeCountOfOwnedCriticalSections, TEB, CountOfOwnedCriticalSections), + OFFSET(TePeb, TEB, ProcessEnvironmentBlock), + OFFSET(TeCsrClientThread, TEB, CsrClientThread), + OFFSET(TeWOW32Reserved, TEB, WOW32Reserved), +// OFFSET(TeSoftFpcr, TEB, SoftFpcr), + OFFSET(TeExceptionCode, TEB, ExceptionCode), + OFFSET(TeActivationContextStackPointer, TEB, ActivationContextStackPointer), + OFFSET(TeGdiClientPID, TEB, GdiClientPID), + OFFSET(TeGdiClientTID, TEB, GdiClientTID), + OFFSET(TeGdiThreadLocalInfo, TEB, GdiThreadLocalInfo), + OFFSET(TeglDispatchTable, TEB, glDispatchTable), + OFFSET(TeglReserved1, TEB, glReserved1), + OFFSET(TeglReserved2, TEB, glReserved2), + OFFSET(TeglSectionInfo, TEB, glSectionInfo), + OFFSET(TeglSection, TEB, glSection), + OFFSET(TeglTable, TEB, glTable), + OFFSET(TeglCurrentRC, TEB, glCurrentRC), + OFFSET(TeglContext, TEB, glContext), + OFFSET(TeDeallocationStack, TEB, DeallocationStack), + OFFSET(TeTlsSlots, TEB, TlsSlots), + OFFSET(TeTlsExpansionSlots, TEB, TlsExpansionSlots), + OFFSET(TeLastErrorValue, TEB, LastErrorValue), + OFFSET(TeVdm, TEB, Vdm), + OFFSET(TeInstrumentation, TEB, Instrumentation), + OFFSET(TeGdiBatchCount, TEB, GdiBatchCount), + OFFSET(TeGuaranteedStackBytes, TEB, GuaranteedStackBytes), + OFFSET(TeFlsData, TEB, FlsData), +// OFFSET(TeProcessRundown, TEB, ProcessRundown), + SIZE(ThreadEnvironmentBlockLength, TEB), + + HEADER("TIME_FIELDS"), + OFFSET(TfSecond, TIME_FIELDS, Second), + OFFSET(TfMinute, TIME_FIELDS, Minute), + OFFSET(TfHour, TIME_FIELDS, Hour), + OFFSET(TfWeekday, TIME_FIELDS, Weekday), + OFFSET(TfDay, TIME_FIELDS, Day), + OFFSET(TfMonth, TIME_FIELDS, Month), + OFFSET(TfYear, TIME_FIELDS, Year), + OFFSET(TfMilliseconds, TIME_FIELDS, Milliseconds), + + HEADER("KTHREAD"), + OFFSET(ThType, KTHREAD, DispatcherHeader.Type), +// OFFSET(ThNpxIrql, KTHREAD, NpxIrql), + OFFSET(ThSize, KTHREAD, DispatcherHeader.Size), + OFFSET(ThLock, KTHREAD, DispatcherHeader.Lock), + OFFSET(ThDebugActive, KTHREAD, DispatcherHeader.DebugActive), +// OFFSET(ThThreadControlFlags, KTHREAD, DispatcherHeader.ThreadControlFlags), + OFFSET(ThSignalState, KTHREAD, DispatcherHeader.SignalState), +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + OFFSET(ThCycleTime, KTHREAD, CycleTime), + OFFSET(ThHighCycleTime, KTHREAD, HighCycleTime), +#endif + OFFSET(ThInitialStack, KTHREAD, InitialStack), + OFFSET(ThStackLimit, KTHREAD, StackLimit), + OFFSET(ThKernelStack, KTHREAD, KernelStack), + OFFSET(ThThreadLock, KTHREAD, ThreadLock), +// OFFSET(ThRunning, KTHREAD, Running), + OFFSET(ThAlerted, KTHREAD, Alerted), +// OFFSET(ThMiscFlags, KTHREAD, MiscFlags), + OFFSET(ThApcState, KTHREAD, ApcState), + OFFSET(ThPriority, KTHREAD, Priority), + OFFSET(ThSwapBusy, KTHREAD, SwapBusy), + OFFSET(ThNextProcessor, KTHREAD, NextProcessor), + OFFSET(ThDeferredProcessor, KTHREAD, DeferredProcessor), + OFFSET(ThApcQueueLock, KTHREAD, ApcQueueLock), + OFFSET(ThContextSwitches, KTHREAD, ContextSwitches), + OFFSET(ThState, KTHREAD, State), + OFFSET(ThNpxState, KTHREAD, NpxState), + OFFSET(ThWaitIrql, KTHREAD, WaitIrql), + OFFSET(ThWaitMode, KTHREAD, WaitMode), + OFFSET(ThWaitStatus, KTHREAD, WaitStatus), + OFFSET(ThWaitBlockList, KTHREAD, WaitBlockList), + OFFSET(ThGateObject, KTHREAD, GateObject), + OFFSET(ThWaitListEntry, KTHREAD, WaitListEntry), + OFFSET(ThSwapListEntry, KTHREAD, SwapListEntry), + OFFSET(ThQueue, KTHREAD, Queue), + OFFSET(ThWaitTime, KTHREAD, WaitTime), + OFFSET(ThCombinedApcDisable, KTHREAD, CombinedApcDisable), + OFFSET(ThKernelApcDisable, KTHREAD, KernelApcDisable), + OFFSET(ThSpecialApcDisable, KTHREAD, SpecialApcDisable), + OFFSET(ThTeb, KTHREAD, Teb), + OFFSET(ThTimer, KTHREAD, Timer), + OFFSET(ThThreadFlags, KTHREAD, ThreadFlags), + OFFSET(ThServiceTable, KTHREAD, ServiceTable), + OFFSET(ThWaitBlock, KTHREAD, WaitBlock), + OFFSET(ThResourceIndex, KTHREAD, ResourceIndex), + OFFSET(ThQueueListEntry, KTHREAD, QueueListEntry), + OFFSET(ThTrapFrame, KTHREAD, TrapFrame), +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + OFFSET(ThFirstArgument, KTHREAD, FirstArgument), +#endif + OFFSET(ThCallbackStack, KTHREAD, CallbackStack), +// OFFSET(ThCallbackDepth, KTHREAD, CallbackDepth), + OFFSET(ThApcStateIndex, KTHREAD, ApcStateIndex), + OFFSET(ThIdealProcessor, KTHREAD, IdealProcessor), + OFFSET(ThBasePriority, KTHREAD, BasePriority), + OFFSET(ThPriorityDecrement, KTHREAD, PriorityDecrement), + OFFSET(ThAdjustReason, KTHREAD, AdjustReason), + OFFSET(ThAdjustIncrement, KTHREAD, AdjustIncrement), + OFFSET(ThPreviousMode, KTHREAD, PreviousMode), + OFFSET(ThSaturation, KTHREAD, Saturation), +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + OFFSET(ThSystemCallNumber, KTHREAD, SystemCallNumber), +#endif + OFFSET(ThFreezeCount, KTHREAD, FreezeCount), + OFFSET(ThUserAffinity, KTHREAD, UserAffinity), + OFFSET(ThProcess, KTHREAD, Process), + OFFSET(ThAffinity, KTHREAD, Affinity), + OFFSET(ThUserIdealProcessor, KTHREAD, UserIdealProcessor), + OFFSET(ThApcStatePointer, KTHREAD, ApcStatePointer), + OFFSET(ThSavedApcState, KTHREAD, SavedApcState), + OFFSET(ThWaitReason, KTHREAD, WaitReason), + OFFSET(ThSuspendCount, KTHREAD, SuspendCount), +// OFFSET(ThCodePatchInProgress, KTHREAD, CodePatchInProgress), + OFFSET(ThWin32Thread, KTHREAD, Win32Thread), + OFFSET(ThStackBase, KTHREAD, StackBase), + OFFSET(ThSuspendApc, KTHREAD, SuspendApc), + OFFSET(ThPowerState, KTHREAD, PowerState), + OFFSET(ThKernelTime, KTHREAD, KernelTime), + OFFSET(ThLegoData, KTHREAD, LegoData), + OFFSET(ThLargeStack, KTHREAD, LargeStack), + OFFSET(ThUserTime, KTHREAD, UserTime), + OFFSET(ThSuspendSemaphore, KTHREAD, SuspendSemaphore), + OFFSET(ThSListFaultCount, KTHREAD, SListFaultCount), + OFFSET(ThThreadListEntry, KTHREAD, ThreadListEntry), + OFFSET(ThMutantListHead, KTHREAD, MutantListHead), + OFFSET(ThSListFaultAddress, KTHREAD, SListFaultAddress), + SIZE(KernelThreadObjectLength, KTHREAD), + SIZE(ExecutiveThreadObjectLength, ETHREAD), + + HEADER("KTIMER"), + OFFSET(TiType, KTIMER, Header.Type), + OFFSET(TiSize, KTIMER, Header.Size), + OFFSET(TiInserted, KTIMER, Header.Inserted), + OFFSET(TiSignalState, KTIMER, Header.SignalState), + OFFSET(TiDueTime, KTIMER, DueTime), + OFFSET(TiTimerListEntry, KTIMER, TimerListEntry), + OFFSET(TiDpc, KTIMER, Dpc), + OFFSET(TiPeriod, KTIMER, Period), + SIZE(TimerObjectLength, KTIMER), + + HEADER("TIME"), +// OFFSET(TmLowTime, TIME, LowTime), +// OFFSET(TmHighTime, TIME, HighTime), + +#if 0 + HEADER("SYSTEM_CONTEXT_SWITCH_INFORMATION (relative to FindAny)"), + RELOFFSET(TwFindAny, SYSTEM_CONTEXT_SWITCH_INFORMATION, FindAny, FindAny), + RELOFFSET(TwFindIdeal, SYSTEM_CONTEXT_SWITCH_INFORMATION, FindIdeal, FindAny), + RELOFFSET(TwFindLast, SYSTEM_CONTEXT_SWITCH_INFORMATION, FindLast, FindAny), + RELOFFSET(TwIdleAny, SYSTEM_CONTEXT_SWITCH_INFORMATION, IdleAny, FindAny), + RELOFFSET(TwIdleCurrent, SYSTEM_CONTEXT_SWITCH_INFORMATION, IdleCurrent, FindAny), + RELOFFSET(TwIdleIdeal, SYSTEM_CONTEXT_SWITCH_INFORMATION, IdleIdeal, FindAny), + RELOFFSET(TwIdleLast, SYSTEM_CONTEXT_SWITCH_INFORMATION, IdleLast, FindAny), + RELOFFSET(TwPreemptAny, SYSTEM_CONTEXT_SWITCH_INFORMATION, PreemptAny, FindAny), + RELOFFSET(TwPreemptCurrent, SYSTEM_CONTEXT_SWITCH_INFORMATION, PreemptCurrent, FindAny), + RELOFFSET(TwPreemptLast, SYSTEM_CONTEXT_SWITCH_INFORMATION, PreemptLast, FindAny), + RELOFFSET(TwSwitchToIdle, SYSTEM_CONTEXT_SWITCH_INFORMATION, SwitchToIdle, FindAny), +#endif + + HEADER("KUSER_SHARED_DATA"), + OFFSET(UsTickCountMultiplier, KUSER_SHARED_DATA, TickCountMultiplier), + OFFSET(UsInterruptTime, KUSER_SHARED_DATA, InterruptTime), + OFFSET(UsSystemTime, KUSER_SHARED_DATA, SystemTime), + OFFSET(UsTimeZoneBias, KUSER_SHARED_DATA, TimeZoneBias), + OFFSET(UsImageNumberLow, KUSER_SHARED_DATA, ImageNumberLow), + OFFSET(UsImageNumberHigh, KUSER_SHARED_DATA, ImageNumberHigh), + OFFSET(UsNtSystemRoot, KUSER_SHARED_DATA, NtSystemRoot), + OFFSET(UsMaxStackTraceDepth, KUSER_SHARED_DATA, MaxStackTraceDepth), + OFFSET(UsCryptoExponent, KUSER_SHARED_DATA, CryptoExponent), + OFFSET(UsTimeZoneId, KUSER_SHARED_DATA, TimeZoneId), + OFFSET(UsLargePageMinimum, KUSER_SHARED_DATA, LargePageMinimum), + OFFSET(UsReserved2, KUSER_SHARED_DATA, Reserved2), + OFFSET(UsNtProductType, KUSER_SHARED_DATA, NtProductType), + OFFSET(UsProductTypeIsValid, KUSER_SHARED_DATA, ProductTypeIsValid), + OFFSET(UsNtMajorVersion, KUSER_SHARED_DATA, NtMajorVersion), + OFFSET(UsNtMinorVersion, KUSER_SHARED_DATA, NtMinorVersion), + OFFSET(UsProcessorFeatures, KUSER_SHARED_DATA, ProcessorFeatures), + OFFSET(UsReserved1, KUSER_SHARED_DATA, Reserved1), + OFFSET(UsReserved3, KUSER_SHARED_DATA, Reserved3), + OFFSET(UsTimeSlip, KUSER_SHARED_DATA, TimeSlip), + OFFSET(UsAlternativeArchitecture, KUSER_SHARED_DATA, AlternativeArchitecture), + OFFSET(UsSystemExpirationDate, KUSER_SHARED_DATA, SystemExpirationDate), + OFFSET(UsSuiteMask, KUSER_SHARED_DATA, SuiteMask), + OFFSET(UsKdDebuggerEnabled, KUSER_SHARED_DATA, KdDebuggerEnabled), + OFFSET(UsActiveConsoleId, KUSER_SHARED_DATA, ActiveConsoleId), + OFFSET(UsDismountCount, KUSER_SHARED_DATA, DismountCount), + OFFSET(UsComPlusPackage, KUSER_SHARED_DATA, ComPlusPackage), + OFFSET(UsLastSystemRITEventTickCount, KUSER_SHARED_DATA, LastSystemRITEventTickCount), + OFFSET(UsNumberOfPhysicalPages, KUSER_SHARED_DATA, NumberOfPhysicalPages), + OFFSET(UsSafeBootMode, KUSER_SHARED_DATA, SafeBootMode), +// OFFSET(UsTscQpcData, KUSER_SHARED_DATA, TscQpcData), + OFFSET(UsTestRetInstruction, KUSER_SHARED_DATA, TestRetInstruction), + OFFSET(UsSystemCall, KUSER_SHARED_DATA, SystemCall), + OFFSET(UsSystemCallReturn, KUSER_SHARED_DATA, SystemCallReturn), + OFFSET(UsSystemCallPad, KUSER_SHARED_DATA, SystemCallPad), + OFFSET(UsTickCount, KUSER_SHARED_DATA, TickCount), + OFFSET(UsTickCountQuad, KUSER_SHARED_DATA, TickCountQuad), + OFFSET(UsWow64SharedInformation, KUSER_SHARED_DATA, Wow64SharedInformation), + + HEADER("KWAIT_BLOCK"), + OFFSET(WbWaitListEntry, KWAIT_BLOCK, WaitListEntry), + OFFSET(WbThread, KWAIT_BLOCK, Thread), + OFFSET(WbObject, KWAIT_BLOCK, Object), + OFFSET(WbNextWaitBlock, KWAIT_BLOCK, NextWaitBlock), + OFFSET(WbWaitKey, KWAIT_BLOCK, WaitKey), + OFFSET(WbWaitType, KWAIT_BLOCK, WaitType), + +#if defined(_M_IX86) + + HEADER("CONTEXT"), + OFFSET(CsContextFlags, CONTEXT, ContextFlags), + OFFSET(CsDr0, CONTEXT, Dr0), + OFFSET(CsDr1, CONTEXT, Dr1), + OFFSET(CsDr2, CONTEXT, Dr2), + OFFSET(CsDr3, CONTEXT, Dr3), + OFFSET(CsDr6, CONTEXT, Dr6), + OFFSET(CsDr7, CONTEXT, Dr7), + OFFSET(CsFloatSave, CONTEXT, FloatSave), + OFFSET(CsSegGs, CONTEXT, SegGs), + OFFSET(CsSegFs, CONTEXT, SegFs), + OFFSET(CsSegEs, CONTEXT, SegEs), + OFFSET(CsSegDs, CONTEXT, SegDs), + OFFSET(CsEdi, CONTEXT, Edi), + OFFSET(CsEsi, CONTEXT, Esi), + OFFSET(CsEbx, CONTEXT, Ebx), + OFFSET(CsEdx, CONTEXT, Edx), + OFFSET(CsEcx, CONTEXT, Ecx), + OFFSET(CsEax, CONTEXT, Eax), + OFFSET(CsEbp, CONTEXT, Ebp), + OFFSET(CsEip, CONTEXT, Eip), + OFFSET(CsSegCs, CONTEXT, SegCs), + OFFSET(CsEflags, CONTEXT, EFlags), + OFFSET(CsEsp, CONTEXT, Esp), + OFFSET(CsSegSs, CONTEXT, SegSs), + OFFSET(CsExtendedRegisters, CONTEXT, ExtendedRegisters), + SIZE(ContextFrameLength, CONTEXT), + SIZE(CONTEXT_LENGTH, CONTEXT), + + HEADER("KGDTENTRY"), + OFFSET(KgdtBaseLow, KGDTENTRY, BaseLow), + OFFSET(KgdtBaseMid, KGDTENTRY, HighWord.Bytes.BaseMid), + OFFSET(KgdtBaseHi, KGDTENTRY, HighWord.Bytes.BaseHi), + OFFSET(KgdtLimitHi, KGDTENTRY, HighWord.Bytes.Flags2), + OFFSET(KgdtLimitLow, KGDTENTRY, LimitLow), + + HEADER("KTRAP_FRAME"), + OFFSET(TsExceptionList, KTRAP_FRAME, ExceptionList), + OFFSET(TsPreviousPreviousMode, KTRAP_FRAME, PreviousPreviousMode), + OFFSET(TsSegGs, KTRAP_FRAME, SegGs), + OFFSET(TsSegFs, KTRAP_FRAME, SegFs), + OFFSET(TsSegEs, KTRAP_FRAME, SegEs), + OFFSET(TsSegDs, KTRAP_FRAME, SegDs), + OFFSET(TsEdi, KTRAP_FRAME, Edi), + OFFSET(TsEsi, KTRAP_FRAME, Esi), + OFFSET(TsEbp, KTRAP_FRAME, Ebp), + OFFSET(TsEbx, KTRAP_FRAME, Ebx), + OFFSET(TsEdx, KTRAP_FRAME, Edx), + OFFSET(TsEcx, KTRAP_FRAME, Ecx), + OFFSET(TsEax, KTRAP_FRAME, Eax), + OFFSET(TsErrCode, KTRAP_FRAME, ErrCode), + OFFSET(TsEip, KTRAP_FRAME, Eip), + OFFSET(TsSegCs, KTRAP_FRAME, SegCs), + OFFSET(TsEflags, KTRAP_FRAME, EFlags), + OFFSET(TsHardwareEsp, KTRAP_FRAME, HardwareEsp), + OFFSET(TsHardwareSegSs, KTRAP_FRAME, HardwareSegSs), + OFFSET(TsTempSegCs, KTRAP_FRAME, TempSegCs), +// OFFSET(TsLogging, KTRAP_FRAME, Logging), + OFFSET(TsTempEsp, KTRAP_FRAME, TempEsp), + OFFSET(TsDbgEbp, KTRAP_FRAME, DbgEbp), + OFFSET(TsDbgEip, KTRAP_FRAME, DbgEip), + OFFSET(TsDbgArgMark, KTRAP_FRAME, DbgArgMark), + OFFSET(TsDbgArgPointer, KTRAP_FRAME, DbgArgPointer), + OFFSET(TsDr0, KTRAP_FRAME, Dr0), + OFFSET(TsDr1, KTRAP_FRAME, Dr1), + OFFSET(TsDr2, KTRAP_FRAME, Dr2), + OFFSET(TsDr3, KTRAP_FRAME, Dr3), + OFFSET(TsDr6, KTRAP_FRAME, Dr6), + OFFSET(TsDr7, KTRAP_FRAME, Dr7), + OFFSET(TsV86Es, KTRAP_FRAME, V86Es), + OFFSET(TsV86Ds, KTRAP_FRAME, V86Ds), + OFFSET(TsV86Fs, KTRAP_FRAME, V86Fs), + OFFSET(TsV86Gs, KTRAP_FRAME, V86Gs), + SIZE(KTRAP_FRAME_LENGTH, KTRAP_FRAME), + CONSTANT(KTRAP_FRAME_ALIGN), + CONSTANT(FRAME_EDITED), + + HEADER("KTSS"), + OFFSET(TssEsp0, KTSS, Esp0), + OFFSET(TssCR3, KTSS, CR3), + OFFSET(TssEip, KTSS, Eip), + OFFSET(TssEFlags, KTSS, EFlags), + OFFSET(TssEax, KTSS, Eax), + OFFSET(TssEbx, KTSS, Ebx), + OFFSET(TssEcx, KTSS, Ecx), + OFFSET(TssEdx, KTSS, Edx), + OFFSET(TssEsp, KTSS, Esp), + OFFSET(TssEbp, KTSS, Ebp), + OFFSET(TssEsi, KTSS, Esi), + OFFSET(TssEdi, KTSS, Edi), + OFFSET(TssEs, KTSS, Es), + OFFSET(TssCs, KTSS, Cs), + OFFSET(TssSs, KTSS, Ss), + OFFSET(TssDs, KTSS, Ds), + OFFSET(TssFs, KTSS, Fs), + OFFSET(TssGs, KTSS, Gs), + OFFSET(TssLDT, KTSS, LDT), + OFFSET(TssIoMapBase, KTSS, IoMapBase), + OFFSET(TssIoMaps, KTSS, IoMaps), + SIZE(TssLength, KTSS), + +#elif defined(_M_AMD64) + + HEADER("Argument Home Address"), + OFFSET(P1Home, CONTEXT, P1Home), + OFFSET(P2Home, CONTEXT, P1Home), + OFFSET(P3Home, CONTEXT, P1Home), + OFFSET(P4Home, CONTEXT, P1Home), + + HEADER("CONTEXT"), + OFFSET(CxP1Home, CONTEXT, P1Home), + OFFSET(CxP2Home, CONTEXT, P2Home), + OFFSET(CxP3Home, CONTEXT, P3Home), + OFFSET(CxP4Home, CONTEXT, P4Home), + OFFSET(CxP5Home, CONTEXT, P5Home), + OFFSET(CxP6Home, CONTEXT, P6Home), + OFFSET(CxContextFlags, CONTEXT, ContextFlags), + OFFSET(CxMxCsr, CONTEXT, MxCsr), + OFFSET(CxSegCs, CONTEXT, SegCs), + OFFSET(CxSegDs, CONTEXT, SegDs), + OFFSET(CxSegEs, CONTEXT, SegEs), + OFFSET(CxSegFs, CONTEXT, SegFs), + OFFSET(CxSegGs, CONTEXT, SegGs), + OFFSET(CxSegSs, CONTEXT, SegSs), + OFFSET(CxEFlags, CONTEXT, EFlags), + OFFSET(CxDr0, CONTEXT, Dr0), + OFFSET(CxDr1, CONTEXT, Dr1), + OFFSET(CxDr2, CONTEXT, Dr2), + OFFSET(CxDr3, CONTEXT, Dr3), + OFFSET(CxDr6, CONTEXT, Dr6), + OFFSET(CxDr7, CONTEXT, Dr7), + OFFSET(CxRax, CONTEXT, Rax), + OFFSET(CxRcx, CONTEXT, Rcx), + OFFSET(CxRdx, CONTEXT, Rdx), + OFFSET(CxRbx, CONTEXT, Rbx), + OFFSET(CxRsp, CONTEXT, Rsp), + OFFSET(CxRbp, CONTEXT, Rbp), + OFFSET(CxRsi, CONTEXT, Rsi), + OFFSET(CxRdi, CONTEXT, Rdi), + OFFSET(CxR8, CONTEXT, R8), + OFFSET(CxR9, CONTEXT, R9), + OFFSET(CxR10, CONTEXT, R10), + OFFSET(CxR11, CONTEXT, R11), + OFFSET(CxR12, CONTEXT, R12), + OFFSET(CxR13, CONTEXT, R13), + OFFSET(CxR14, CONTEXT, R14), + OFFSET(CxR15, CONTEXT, R15), + OFFSET(CxRip, CONTEXT, Rip), + OFFSET(CxFltSave, CONTEXT, FltSave), + OFFSET(CxXmm0, CONTEXT, Xmm0), + OFFSET(CxXmm1, CONTEXT, Xmm1), + OFFSET(CxXmm2, CONTEXT, Xmm2), + OFFSET(CxXmm3, CONTEXT, Xmm3), + OFFSET(CxXmm4, CONTEXT, Xmm4), + OFFSET(CxXmm5, CONTEXT, Xmm5), + OFFSET(CxXmm6, CONTEXT, Xmm6), + OFFSET(CxXmm7, CONTEXT, Xmm7), + OFFSET(CxXmm8, CONTEXT, Xmm8), + OFFSET(CxXmm9, CONTEXT, Xmm9), + OFFSET(CxXmm10, CONTEXT, Xmm10), + OFFSET(CxXmm11, CONTEXT, Xmm11), + OFFSET(CxXmm12, CONTEXT, Xmm12), + OFFSET(CxXmm13, CONTEXT, Xmm13), + OFFSET(CxXmm14, CONTEXT, Xmm14), + OFFSET(CxXmm15, CONTEXT, Xmm15), + OFFSET(CxDebugControl, CONTEXT, DebugControl), + OFFSET(CxLastBranchToRip, CONTEXT, LastBranchToRip), + OFFSET(CxLastBranchFromRip, CONTEXT, LastBranchFromRip), + OFFSET(CxLastExceptionToRip, CONTEXT, LastExceptionToRip), + OFFSET(CxLastExceptionFromRip, CONTEXT, LastExceptionFromRip), + OFFSET(CxVectorControl, CONTEXT, VectorControl), + OFFSET(CxVectorRegister, CONTEXT, VectorRegister), + SIZE(CONTEXT_FRAME_LENGTH, CONTEXT), + + HEADER("DISPATCHER_CONTEXT"), + OFFSET(DcControlPc, TYPE, ControlPc), + OFFSET(DcImageBase, TYPE, ImageBase), + OFFSET(DcFunctionEntry, TYPE, FunctionEntry), + OFFSET(DcEstablisherFrame, TYPE, EstablisherFrame), + OFFSET(DcTargetIp, TYPE, TargetIp), + OFFSET(DcContextRecord, TYPE, ContextRecord), + OFFSET(DcLanguageHandler, TYPE, LanguageHandler), + OFFSET(DcHandlerData, TYPE, HandlerData), + OFFSET(DcHistoryTable, TYPE, HistoryTable), + OFFSET(DcScopeIndex, TYPE, ScopeIndex), + + HEADER("KEXCEPTION_FRAME"), + OFFSET(ExP1Home, KEXCEPTION_FRAME, P1Home), + OFFSET(ExP2Home, KEXCEPTION_FRAME, P2Home), + OFFSET(ExP3Home, KEXCEPTION_FRAME, P3Home), + OFFSET(ExP4Home, KEXCEPTION_FRAME, P4Home), + OFFSET(ExP5, KEXCEPTION_FRAME, P5), + OFFSET(ExXmm6, KEXCEPTION_FRAME, Xmm6), + OFFSET(ExXmm7, KEXCEPTION_FRAME, Xmm7), + OFFSET(ExXmm8, KEXCEPTION_FRAME, Xmm8), + OFFSET(ExXmm9, KEXCEPTION_FRAME, Xmm9), + OFFSET(ExXmm10, KEXCEPTION_FRAME, Xmm10), + OFFSET(ExXmm11, KEXCEPTION_FRAME, Xmm11), + OFFSET(ExXmm12, KEXCEPTION_FRAME, Xmm12), + OFFSET(ExXmm13, KEXCEPTION_FRAME, Xmm13), + OFFSET(ExXmm14, KEXCEPTION_FRAME, Xmm14), + OFFSET(ExXmm15, KEXCEPTION_FRAME, Xmm15), + OFFSET(ExMxCsr, KEXCEPTION_FRAME, MxCsr), + OFFSET(ExRbp, KEXCEPTION_FRAME, Rbp), + OFFSET(ExRbx, KEXCEPTION_FRAME, Rbx), + OFFSET(ExRdi, KEXCEPTION_FRAME, Rdi), + OFFSET(ExRsi, KEXCEPTION_FRAME, Rsi), + OFFSET(ExR12, KEXCEPTION_FRAME, R12), + OFFSET(ExR13, KEXCEPTION_FRAME, R13), + OFFSET(ExR14, KEXCEPTION_FRAME, R14), + OFFSET(ExR15, KEXCEPTION_FRAME, R15), + OFFSET(ExReturn, KEXCEPTION_FRAME, Return), + OFFSET(CuInitialStack, KEXCEPTION_FRAME, InitialStack), + OFFSET(CuTrapFrame, KEXCEPTION_FRAME, TrapFrame), + OFFSET(CuCallbackStack, KEXCEPTION_FRAME, CallbackStack), + OFFSET(CuOutputBuffer, KEXCEPTION_FRAME, OutputBuffer), + OFFSET(CuOutputLength, KEXCEPTION_FRAME, OutputLength), + SIZE(KEXCEPTION_FRAME_LENGTH, KEXCEPTION_FRAME), + + HEADER("JUMP_BUFFER"), + OFFSET(JbFrame, JUMP_BUFFER, Frame), + OFFSET(JbRbx, JUMP_BUFFER, Rbx), + OFFSET(JbRsp, JUMP_BUFFER, Rsp), + OFFSET(JbRbp, JUMP_BUFFER, Rbp), + OFFSET(JbRsi, JUMP_BUFFER, Rsi), + OFFSET(JbRdi, JUMP_BUFFER, Rdi), + OFFSET(JbR12, JUMP_BUFFER, R12), + OFFSET(JbR13, JUMP_BUFFER, R13), + OFFSET(JbR14, JUMP_BUFFER, R14), + OFFSET(JbR15, JUMP_BUFFER, R15), + OFFSET(JbRip, JUMP_BUFFER, Rip), + OFFSET(JbMxCsr, JUMP_BUFFER, MxCsr), + OFFSET(JbFpCsr, JUMP_BUFFER, FpCsr), + OFFSET(JbXmm6, JUMP_BUFFER, Xmm6), + OFFSET(JbXmm7, JUMP_BUFFER, Xmm7), + OFFSET(JbXmm8, JUMP_BUFFER, Xmm8), + OFFSET(JbXmm9, JUMP_BUFFER, Xmm9), + OFFSET(JbXmm10, JUMP_BUFFER, Xmm10), + OFFSET(JbXmm11, JUMP_BUFFER, Xmm11), + OFFSET(JbXmm12, JUMP_BUFFER, Xmm12), + OFFSET(JbXmm13, JUMP_BUFFER, Xmm13), + OFFSET(JbXmm14, JUMP_BUFFER, Xmm14), + OFFSET(JbXmm15, JUMP_BUFFER, Xmm15), + + HEADER("KGDT64"), + OFFSET(KgdtBaseLow, KGDT64, BaseLow), + OFFSET(KgdtBaseMiddle, KGDT64, BaseMiddle), + OFFSET(KgdtBaseHigh, KGDT64, BaseHigh), + OFFSET(KgdtBaseUpper, KGDT64, BaseUpper), + OFFSET(KgdtLimitHigh, KGDT64, LimitHigh), + OFFSET(KgdtLimitLow, KGDT64, LimitLow), + CONSTANT(KGDT_LIMIT_ENCODE_MASK), + + HEADER("KPRCB"), + OFFSET(PbMxCsr, KPRCB, MxCsr), + OFFSET(PbNumber, KPRCB, Number), + OFFSET(PbInterruptRequest, KPRCB, InterruptRequest), + OFFSET(PbIdleHalt, KPRCB, IdleHalt), + OFFSET(PbCurrentThread, KPRCB, CurrentThread), + OFFSET(PbNextThread, KPRCB, NextThread), + OFFSET(PbIdleThread, KPRCB, IdleThread), + OFFSET(PbNestingLevel, KPRCB, NestingLevel), + OFFSET(PbRspBase, KPRCB, RspBase), + OFFSET(PbPrcbLock, KPRCB, PrcbLock), + OFFSET(PbSetMember, KPRCB, SetMember), + OFFSET(PbProcessorState, KPRCB, ProcessorState), + OFFSET(PbCpuType, KPRCB, CpuType), + OFFSET(PbCpuID, KPRCB, CpuID), + OFFSET(PbCpuStep, KPRCB, CpuStep), + OFFSET(PbHalReserved, KPRCB, HalReserved), + OFFSET(PbMinorVersion, KPRCB, MinorVersion), + OFFSET(PbMajorVersion, KPRCB, MajorVersion), + OFFSET(PbBuildType, KPRCB, BuildType), + OFFSET(PbCpuVendor, KPRCB, CpuVendor), + OFFSET(PbCoresPerPhysicalProcessor, KPRCB, CoresPerPhysicalProcessor), + OFFSET(PbLogicalProcessorsPerCore, KPRCB, LogicalProcessorsPerCore), + OFFSET(PbApicMask, KPRCB, ApicMask), + OFFSET(PbCFlushSize, KPRCB, CFlushSize), + OFFSET(PbAcpiReserved, KPRCB, AcpiReserved), + OFFSET(PbInitialApicId, KPRCB, InitialApicId), + OFFSET(PbStride, KPRCB, Stride), + OFFSET(PbLockQueue, KPRCB, LockQueue), + OFFSET(PbPPLookasideList, KPRCB, PPLookasideList), + OFFSET(PbPPNPagedLookasideList, KPRCB, PPNPagedLookasideList), + OFFSET(PbPPPagedLookasideList, KPRCB, PPPagedLookasideList), + OFFSET(PbPacketBarrier, KPRCB, PacketBarrier), + OFFSET(PbDeferredReadyListHead, KPRCB, DeferredReadyListHead), + OFFSET(PbLookasideIrpFloat, KPRCB, LookasideIrpFloat), + OFFSET(PbSystemCalls, KPRCB, SystemCalls), + OFFSET(PbReadOperationCount, KPRCB, ReadOperationCount), + OFFSET(PbWriteOperationCount, KPRCB, WriteOperationCount), + OFFSET(PbOtherOperationCount, KPRCB, OtherOperationCount), + OFFSET(PbReadTransferCount, KPRCB, ReadTransferCount), + OFFSET(PbWriteTransferCount, KPRCB, WriteTransferCount), + OFFSET(PbOtherTransferCount, KPRCB, OtherTransferCount), + OFFSET(PbContextSwitches, KPRCB, ContextSwitches), + OFFSET(PbTargetSet, KPRCB, TargetSet), + OFFSET(PbIpiFrozen, KPRCB, IpiFrozen), + OFFSET(PbRequestMailbox, KPRCB, RequestMailbox), + OFFSET(PbSenderSummary, KPRCB, SenderSummary), + OFFSET(PbDpcListHead, KPRCB, DpcListHead), + OFFSET(PbDpcLock, KPRCB, DpcLock), + OFFSET(PbDpcQueueDepth, KPRCB, DpcQueueDepth), + OFFSET(PbDpcCount, KPRCB, DpcCount), + OFFSET(PbDpcStack, KPRCB, DpcStack), + OFFSET(PbMaximumDpcQueueDepth, KPRCB, MaximumDpcQueueDepth), + OFFSET(PbDpcRequestRate, KPRCB, DpcRequestRate), + OFFSET(PbMinimumDpcRate, KPRCB, MinimumDpcRate), + OFFSET(PbDpcInterruptRequested, KPRCB, DpcInterruptRequested), + OFFSET(PbDpcThreadRequested, KPRCB, DpcThreadRequested), + OFFSET(PbDpcRoutineActive, KPRCB, DpcRoutineActive), + OFFSET(PbDpcThreadActive, KPRCB, DpcThreadActive), + OFFSET(PbTimerHand, KPRCB, TimerHand), + OFFSET(PbTimerRequest, KPRCB, TimerRequest), + OFFSET(PbTickOffset, KPRCB, TickOffset), + OFFSET(PbMasterOffset, KPRCB, MasterOffset), + OFFSET(PbDpcLastCount, KPRCB, DpcLastCount), + OFFSET(PbQuantumEnd, KPRCB, QuantumEnd), + OFFSET(PbDpcSetEventRequest, KPRCB, DpcSetEventRequest), + OFFSET(PbIdleSchedule, KPRCB, IdleSchedule), + OFFSET(PbReadySummary, KPRCB, ReadySummary), + OFFSET(PbDispatcherReadyListHead, KPRCB, DispatcherReadyListHead), + OFFSET(PbInterruptCount, KPRCB, InterruptCount), + OFFSET(PbKernelTime, KPRCB, KernelTime), + OFFSET(PbUserTime, KPRCB, UserTime), + OFFSET(PbDpcTime, KPRCB, DpcTime), + OFFSET(PbInterruptTime, KPRCB, InterruptTime), + OFFSET(PbAdjustDpcThreshold, KPRCB, AdjustDpcThreshold), + OFFSET(PbSkipTick, KPRCB, SkipTick), + OFFSET(PbPollSlot, KPRCB, PollSlot), + OFFSET(PbParentNode, KPRCB, ParentNode), + OFFSET(PbMultiThreadProcessorSet, KPRCB, MultiThreadProcessorSet), + OFFSET(PbMultiThreadSetMaster, KPRCB, MultiThreadSetMaster), + OFFSET(PbStartCycles, KPRCB, StartCycles), + OFFSET(PbPageColor, KPRCB, PageColor), + OFFSET(PbNodeColor, KPRCB, NodeColor), + OFFSET(PbNodeShiftedColor, KPRCB,NodeShiftedColor), + OFFSET(PbSecondaryColorMask, KPRCB, SecondaryColorMask), + OFFSET(PbSleeping, KPRCB, Sleeping), + OFFSET(PbCycleTime, KPRCB, CycleTime), + OFFSET(PbFastReadNoWait, KPRCB, FastReadNoWait), + OFFSET(PbFastReadWait, KPRCB, FastReadWait), + OFFSET(PbFastReadNotPossible, KPRCB, FastReadNotPossible), + OFFSET(PbCopyReadNoWait, KPRCB, CopyReadNoWait), + OFFSET(PbCopyReadWait, KPRCB, CopyReadWait), + OFFSET(PbCopyReadNoWaitMiss, KPRCB, CopyReadNoWaitMiss), + OFFSET(PbAlignmentFixupCount, KPRCB, AlignmentFixupCount), + OFFSET(PbExceptionDispatchCount, KPRCB, ExceptionDispatchCount), + OFFSET(PbVendorString, KPRCB, VendorString), + OFFSET(PbPowerState, KPRCB, PowerState), + SIZE(ProcessorBlockLength, KPRCB), + + HEADER("KPCR"), + OFFSET(PcGdt, KPCR, Gdt), + OFFSET(PcTss, KPCR, Tss), + OFFSET(PcUserRsp, KPCR, UserRsp), + OFFSET(PcSelf, KPCR, Self), + OFFSET(PcCurrentPrcb, KPCR, CurrentPrcb), + OFFSET(PcLockArray, KPCR, LockArray), + OFFSET(PcTeb, KPCR, Teb), + OFFSET(PcIdt, KPCR, Idt), + OFFSET(PcIrql, KPCR, Irql), + OFFSET(PcStallScaleFactor, KPCR, StallScaleFactor), + OFFSET(PcHalReserved, KPCR, HalReserved), + OFFSET(PcPrcb, KPCR, Prcb), + OFFSET(PcMxCsr, KPCR, MxCsr), + OFFSET(PcNumber, KPCR, Number), + OFFSET(PcInterruptRequest, KPCR, InterruptRequest), + OFFSET(PcIdleHalt, KPCR, IdleHalt), + OFFSET(PcCurrentThread, KPCR, CurrentThread), + OFFSET(PcNextThread, KPCR, NextThread), + OFFSET(PcIdleThread, KPCR, IdleThread), + OFFSET(PcIpiFrozen, KPCR, IpiFrozen), + OFFSET(PcNestingLevel, KPCR, NestingLevel), + OFFSET(PcRspBase, KPCR, RspBase), + OFFSET(PcPrcbLock, KPCR, PrcbLock), + OFFSET(PcSetMember, KPCR, SetMember), + OFFSET(PcCr0, KPCR, Cr0), + OFFSET(PcCr2, KPCR, Cr2), + OFFSET(PcCr3, KPCR, Cr3), + OFFSET(PcCr4, KPCR, Cr4), + OFFSET(PcKernelDr0, KPCR, KernelDr0), + OFFSET(PcKernelDr1, KPCR, KernelDr1), + OFFSET(PcKernelDr2, KPCR, KernelDr2), + OFFSET(PcKernelDr3, KPCR, KernelDr3), + OFFSET(PcKernelDr7, KPCR, KernelDr7), + OFFSET(PcGdtrLimit, KPCR, GdtrLimit), + OFFSET(PcGdtrBase, KPCR, GdtrBase), + OFFSET(PcIdtrLimit, KPCR, IdtrLimit), + OFFSET(PcIdtrBase, KPCR, IdtrBase), + OFFSET(PcTr, KPCR, Tr), + OFFSET(PcLdtr, KPCR, Ldtr), + OFFSET(PcDebugControl, KPCR, DebugControl), + OFFSET(PcLastBranchToRip, KPCR, LastBranchToRip), + OFFSET(PcLastBranchFromRip, KPCR, LastBranchFromRip), + OFFSET(PcLastExceptionToRip, KPCR, LastExceptionToRip), + OFFSET(PcLastExceptionFromRip, KPCR, LastExceptionFromRip), + OFFSET(PcCr8, KPCR, Cr8), + OFFSET(PcCpuType, KPCR, CpuType), + OFFSET(PcCpuID, KPCR, CpuID), + OFFSET(PcCpuStep, KPCR, CpuStep), + OFFSET(PcCpuVendor, KPCR, CpuVendor), + OFFSET(PcVirtualApicAssist, KPCR, VirtualApicAssist), + OFFSET(PcCFlushSize, KPCR, CFlushSize), + OFFSET(PcDeferredReadyListHead, KPCR, DeferredReadyListHead), + OFFSET(PcSystemCalls, KPCR, SystemCalls), + OFFSET(PcDpcRoutineActive, KPCR, DpcRoutineActive), + OFFSET(PcInterruptCount, KPCR, InterruptCount), + OFFSET(PcDebuggerSavedIRQL, KPCR, DebuggerSavedIRQL), + OFFSET(PcTickOffset, KPCR, TickOffset), + OFFSET(PcMasterOffset, KPCR, MasterOffset), + OFFSET(PcSkipTick, KPCR, SkipTick), + OFFSET(PcStartCycles, KPCR, StartCycles), + SIZE(ProcessorControlRegisterLength, KPCR), + + HEADER("KPROCESSOR_STATE"), + OFFSET(PsSpecialRegisters, KPROCESSOR_STATE, SpecialRegisters), + OFFSET(PsCr0, KPROCESSOR_STATE, Cr0), + OFFSET(PsCr2, KPROCESSOR_STATE, Cr2), + OFFSET(PsCr3, KPROCESSOR_STATE, Cr3), + OFFSET(PsCr4, KPROCESSOR_STATE, Cr4), + OFFSET(PsKernelDr0, KPROCESSOR_STATE, KernelDr0), + OFFSET(PsKernelDr1, KPROCESSOR_STATE, KernelDr1), + OFFSET(PsKernelDr2, KPROCESSOR_STATE, KernelDr2), + OFFSET(PsKernelDr3, KPROCESSOR_STATE, KernelDr3), + OFFSET(PsKernelDr6, KPROCESSOR_STATE, KernelDr6), + OFFSET(PsKernelDr7, KPROCESSOR_STATE, KernelDr7), + OFFSET(PsGdtr, KPROCESSOR_STATE, Gdtr), + OFFSET(PsIdtr, KPROCESSOR_STATE, Idtr), + OFFSET(PsTr, KPROCESSOR_STATE, Tr), + OFFSET(PsLdtr, KPROCESSOR_STATE, Ldtr), + OFFSET(PsMxCsr, KPROCESSOR_STATE, MxCsr), + OFFSET(PsContextFrame, KPROCESSOR_STATE, ContextFrame), + OFFSET(PsDebugControl, KPROCESSOR_STATE, DebugControl), + OFFSET(PsLastBranchToRip, KPROCESSOR_STATE, LastBranchToRip), + OFFSET(PsLastBranchFromRip, KPROCESSOR_STATE, LastBranchFromRip), + OFFSET(PsLastExceptionToRip, KPROCESSOR_STATE, LastExceptionToRip), + OFFSET(PsLastExceptionFromRip, KPROCESSOR_STATE, LastExceptionFromRip), + OFFSET(PsCr8, KPROCESSOR_STATE, Cr8), + SIZE(ProcessorStateLength, KPROCESSOR_STATE), + + HEADER("KSTART_FRAME"), + OFFSET(SfP1Home, KSTART_FRAME, P1Home), + OFFSET(SfP2Home, KSTART_FRAME, P2Home), + OFFSET(SfP3Home, KSTART_FRAME, P3Home), + OFFSET(SfP4Home, KSTART_FRAME, P4Home), + OFFSET(SfReturn, KSTART_FRAME, Return), + SIZE(KSTART_FRAME_LENGTH, KSTART_FRAME), + + HEADER("KSPECIAL_REGISTERS"), + OFFSET(SrKernelDr0, KSPECIAL_REGISTERS, KernelDr0), + OFFSET(SrKernelDr1, KSPECIAL_REGISTERS, KernelDr1), + OFFSET(SrKernelDr2, KSPECIAL_REGISTERS, KernelDr2), + OFFSET(SrKernelDr3, KSPECIAL_REGISTERS, KernelDr3), + OFFSET(SrKernelDr6, KSPECIAL_REGISTERS, KernelDr6), + OFFSET(SrKernelDr7, KSPECIAL_REGISTERS, KernelDr7), + OFFSET(SrGdtr, KSPECIAL_REGISTERS, Gdtr), + OFFSET(SrIdtr, KSPECIAL_REGISTERS, Idtr), + OFFSET(SrTr, KSPECIAL_REGISTERS, Tr), + OFFSET(SrMxCsr, KSPECIAL_REGISTERS, MxCsr), + OFFSET(SrMsrGsBase, KSPECIAL_REGISTERS, MsrGsBase), + OFFSET(SrMsrGsSwap, KSPECIAL_REGISTERS, MsrGsSwap), + OFFSET(SrMsrStar, KSPECIAL_REGISTERS, MsrStar), + OFFSET(SrMsrLStar, KSPECIAL_REGISTERS, MsrLStar), + OFFSET(SrMsrCStar, KSPECIAL_REGISTERS, MsrCStar), + OFFSET(SrMsrSyscallMask, KSPECIAL_REGISTERS, MsrSyscallMask), + + HEADER("KSYSTEM_TIME"), + OFFSET(StLowTime, KSYSTEM_TIME, LowTime), + OFFSET(StHigh1Time, KSYSTEM_TIME, High1Time), + OFFSET(StHigh2Time, KSYSTEM_TIME, High2Time), + + HEADER("KSWITCH_FRAME"), + OFFSET(SwP5Home, KSWITCH_FRAME, P5Home), + OFFSET(SwApcBypass, KSWITCH_FRAME, ApcBypass), + OFFSET(SwRbp, KSWITCH_FRAME, Rbp), + OFFSET(SwReturn, KSWITCH_FRAME, Return), + SIZE(SwitchFrameLength, KSWITCH_FRAME), + SIZE(KSWITCH_FRAME_LENGTH, KSWITCH_FRAME), + + HEADER("KTRAP_FRAME"), + OFFSET(TrP1Home, KTRAP_FRAME, P1Home), + OFFSET(TrP2Home, KTRAP_FRAME, P2Home), + OFFSET(TrP3Home, KTRAP_FRAME, P3Home), + OFFSET(TrP4Home, KTRAP_FRAME, P4Home), + OFFSET(TrP5, KTRAP_FRAME, P5), + OFFSET(TrPreviousMode, KTRAP_FRAME, PreviousMode), + OFFSET(TrPreviousIrql, KTRAP_FRAME, PreviousIrql), + OFFSET(TrFaultIndicator, KTRAP_FRAME, FaultIndicator), + OFFSET(TrExceptionActive, KTRAP_FRAME, ExceptionActive), + OFFSET(TrMxCsr, KTRAP_FRAME, MxCsr), + OFFSET(TrRax, KTRAP_FRAME, Rax), + OFFSET(TrRcx, KTRAP_FRAME, Rcx), + OFFSET(TrRdx, KTRAP_FRAME, Rdx), + OFFSET(TrR8, KTRAP_FRAME, R8), + OFFSET(TrR9, KTRAP_FRAME, R9), + OFFSET(TrR10, KTRAP_FRAME, R10), + OFFSET(TrR11, KTRAP_FRAME, R11), + OFFSET(TrGsBase, KTRAP_FRAME, GsBase), + OFFSET(TrGsSwap, KTRAP_FRAME,GsSwap), + OFFSET(TrXmm0, KTRAP_FRAME, Xmm0), + OFFSET(TrXmm1, KTRAP_FRAME, Xmm1), + OFFSET(TrXmm2, KTRAP_FRAME, Xmm2), + OFFSET(TrXmm3, KTRAP_FRAME, Xmm3), + OFFSET(TrXmm4, KTRAP_FRAME, Xmm4), + OFFSET(TrXmm5, KTRAP_FRAME, Xmm5), + OFFSET(TrFaultAddress, KTRAP_FRAME, FaultAddress), + OFFSET(TrTimeStampCKCL, KTRAP_FRAME, TimeStampCKCL), + OFFSET(TrDr0, KTRAP_FRAME, Dr0), + OFFSET(TrDr1, KTRAP_FRAME, Dr1), + OFFSET(TrDr2, KTRAP_FRAME, Dr2), + OFFSET(TrDr3, KTRAP_FRAME, Dr3), + OFFSET(TrDr6, KTRAP_FRAME, Dr6), + OFFSET(TrDr7, KTRAP_FRAME, Dr7), + OFFSET(TrDebugControl, KTRAP_FRAME, DebugControl), + OFFSET(TrLastBranchToRip, KTRAP_FRAME, LastBranchToRip), + OFFSET(TrLastBranchFromRip, KTRAP_FRAME, LastBranchFromRip), + OFFSET(TrLastExceptionToRip, KTRAP_FRAME, LastExceptionToRip), + OFFSET(TrLastExceptionFromRip, KTRAP_FRAME, LastExceptionFromRip), + OFFSET(TrLastBranchControl, KTRAP_FRAME, LastBranchControl), + OFFSET(TrLastBranchMSR, KTRAP_FRAME, LastBranchMSR), + OFFSET(TrSegDs, KTRAP_FRAME, SegDs), + OFFSET(TrSegEs, KTRAP_FRAME, SegEs), + OFFSET(TrSegFs, KTRAP_FRAME, SegFs), + OFFSET(TrSegGs, KTRAP_FRAME, SegGs), + OFFSET(TrTrapFrame, KTRAP_FRAME, TrapFrame), + OFFSET(TrRbx, KTRAP_FRAME, Rbx), + OFFSET(TrRdi, KTRAP_FRAME, Rdi), + OFFSET(TrRsi, KTRAP_FRAME, Rsi), + OFFSET(TrRbp, KTRAP_FRAME, Rbp), + OFFSET(TrErrorCode, KTRAP_FRAME, ErrorCode), + OFFSET(TrTimeStampKlog, KTRAP_FRAME, TimeStampKlog), + OFFSET(TrRip, KTRAP_FRAME, Rip), + OFFSET(TrSegCs, KTRAP_FRAME, SegCs), + OFFSET(TrLogging, KTRAP_FRAME, Logging), + OFFSET(TrEFlags, KTRAP_FRAME, EFlags), + OFFSET(TrRsp, KTRAP_FRAME, Rsp), + OFFSET(TrSegSs, KTRAP_FRAME, SegSs), + OFFSET(TrCodePatchCycle, KTRAP_FRAME, CodePatchCycle), + SIZE(KTRAP_FRAME_LENGTH, KTRAP_FRAME), + + HEADER("KTIMER_TABLE"), + OFFSET(TtEntry, KTIMER_TABLE, TimerEntries), + OFFSET(TtTime, KTIMER_TABLE, Time), + SIZE(TIMER_ENTRY_SIZE, KTIMER_ENTRY), + SIZE(TIMER_TABLE_SIZE, KTIMER_TABLE), + SIZE(KTIMER_TABLE_SIZE, KTIMER_TABLE), + + HEADER("KTSS"), + OFFSET(TssRsp0, TYPE, Rsp0), + OFFSET(TssRsp1, TYPE, Rsp1), + OFFSET(TssRsp2, TYPE, Rsp2), + OFFSET(TssPanicStack, TYPE, PanicStack), + OFFSET(TssMcaStack, TYPE, McaStack), + OFFSET(TssNmiStack, TYPE, NmiStack), + OFFSET(TssIoMapBase, TYPE, IoMapBase), + SIZE(TssLength, TYPE), + +#endif + + /* End of list */ + {TYPE_END, "", 0} +}; + +void DummyEntry() +{ + +} + Propchange: branches/cmake-bringup/include/asm/genincdata.c ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 1 month

[tkreuzer] 49560: [GENINC] Add geninc tool, that creates assembly definitions.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 11 13:35:57 2010 New Revision: 49560 URL: http://svn.reactos.org/svn/reactos?rev=49560&view=rev Log: [GENINC] Add geninc tool, that creates assembly definitions. Added: branches/cmake-bringup/tools/geninc/CMakeLists.txt (with props) Modified: branches/cmake-bringup/tools/CMakeLists.txt branches/cmake-bringup/tools/geninc/geninc.c Modified: branches/cmake-bringup/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.… ============================================================================== --- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Thu Nov 11 13:35:57 2010 @@ -7,6 +7,7 @@ add_subdirectory(cabman) add_subdirectory(cdmake) add_subdirectory(gendib) +add_subdirectory(geninc) add_subdirectory(mkhive) add_subdirectory(nci) add_subdirectory(spec2pdef) Added: branches/cmake-bringup/tools/geninc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/geninc/CMak… ============================================================================== --- branches/cmake-bringup/tools/geninc/CMakeLists.txt (added) +++ branches/cmake-bringup/tools/geninc/CMakeLists.txt [iso-8859-1] Thu Nov 11 13:35:57 2010 @@ -1,0 +1,2 @@ + +add_executable(geninc geninc.c) Propchange: branches/cmake-bringup/tools/geninc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/tools/geninc/geninc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/geninc/geni… ============================================================================== --- branches/cmake-bringup/tools/geninc/geninc.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/geninc/geninc.c [iso-8859-1] Thu Nov 11 13:35:57 2010 @@ -4,8 +4,205 @@ #include <stdlib.h> #include <string.h> - +#ifdef _WIN32 +#define PRIx64 "I64x" +#else +#define PRIx64 "llx" +#endif + +typedef struct +{ + char Type; + char Name[55]; + unsigned __int64 Value; +} ASMGENDATA; + +#define TYPE_END 0 +#define TYPE_RAW 1 +#define TYPE_CONSTANT 2 +#define TYPE_HEADER 3 int main(int argc, char* argv[]) { + FILE *input, *output; + ASMGENDATA data; + int i, result = -1; + int ms_format = 0; + char header[20]; + unsigned __int32 e_lfanew, signature; + unsigned __int16 Machine, NumberOfSections, SizeOfOptionalHeader; + typedef struct + { + char Name[8]; + unsigned __int32 VirtualSize; + unsigned __int32 VirtualAddress; + unsigned __int32 RawSize; + unsigned __int32 RawAddress; + unsigned __int32 RelocAddress; + unsigned __int32 LineNumbers; + unsigned __int16 RelocationsNumber; + unsigned __int16 LineNumbersNumber; + unsigned __int32 Characteristics; + } SECTION; + SECTION section; + + if (argc >= 4 && stricmp(argv[3], "-ms") == 0) ms_format = 1; + + /* Open the input file */ + input = fopen(argv[1], "rb"); + if (!input) + { + fprintf(stderr, "Could not open input file '%s'\n", argv[1]); + return -1; + } + + /* Open the output file */ + output = fopen(argv[2], "w"); + if (!output) + { + fprintf(stderr, "Could not open output file '%s'\n", argv[2]); + return -1; + } + + /* Read the DOS header */ + if (fread(&header, 1, 2, input) != 2) + { + fprintf(stderr, "Error reading header.\n"); + goto quit; + } + + if (header[0] != 0x4d || header[1] != 0x5a) + { + fprintf(stderr, "Not a PE file.\n"); + goto quit; + } + + fseek(input, 0x3C, SEEK_SET); + if (fread(&e_lfanew, 1, 4, input) != 4) + { + fprintf(stderr, "Could not read e_lfanew.\n"); + goto quit; + } + + fseek(input, e_lfanew, SEEK_SET); + if (fread(&signature, 1, 4, input) != 4) + { + fprintf(stderr, "Could not read signature.\n"); + goto quit; + } + + /* Verify the PE signature */ + if (signature != 0x4550) + { + fprintf(stderr, "Invalid signature: 0x%lx.\n", signature); + goto quit; + } + + /* Read Machine */ + fseek(input, e_lfanew + 4, SEEK_SET); + if (fread(&Machine, 1, 2, input) != 2) + { + fprintf(stderr, "Could not read ExportDirectoryRVA.\n"); + goto quit; + } + + if (Machine != 0x14c) + { + fprintf(stderr, "Invalid Machine: 0x%x.\n", Machine); + goto quit; + } + + /* Read NumberOfSections */ + if (fread(&NumberOfSections, 1, 2, input) != 2) + { + fprintf(stderr, "Could not read NumberOfSections.\n"); + goto quit; + } + + fseek(input, e_lfanew + 0x14, SEEK_SET); + if (fread(&SizeOfOptionalHeader, 1, 2, input) != 2) + { + fprintf(stderr, "Could not read SizeOfOptionalHeader.\n"); + goto quit; + } + + /* Read the section table */ + fseek(input, e_lfanew + 0x18 + SizeOfOptionalHeader, SEEK_SET); + + /* Search for the .asmdef section */ + for (i = 0; i < NumberOfSections; i++) + { + if (fread(&section, 1, sizeof(SECTION), input) != sizeof(SECTION)) + { + fprintf(stderr, "Could not read section.\n"); + goto quit; + } + + if (strcmp(section.Name, ".asmdef") == 0) + { + break; + } + } + + if (i == NumberOfSections) + { + fprintf(stderr, "Could not find section.\n"); + goto quit; + } + + /* Read the section table */ + fseek(input, section.RawAddress, SEEK_SET); + + while (1) + { + /* Read one entry */ + if (fread(&data, 1, sizeof(data), input) != sizeof(data)) + { + fprintf(stderr, "Error reading input file.\n"); + goto quit; + } + + switch(data.Type) + { + case TYPE_END: + break; + + case TYPE_RAW: + fprintf(output, "%s\n", data.Name); + continue; + + case TYPE_CONSTANT: + if (ms_format) + { + fprintf(output, "%s equ %"PRIx64"h\n", data.Name, data.Value); + } + else + { + fprintf(output, "%s = 0x%"PRIx64"\n", data.Name, data.Value); + } + continue; + + case TYPE_HEADER: + if (ms_format) + { + fprintf(output, "\n; %s\n", data.Name); + } + else + { + fprintf(output, "\n/* %s */\n", data.Name); + } + continue; + } + + break; + } + + result = 0; + +quit: + /* Close files */ + fclose(input); + fclose(output); + + return result; }

14 years, 1 month

[sir_richard] 49559: [NTOS]: Start using colored pages. This will help performance on real systems significantly as cache is now taken into account by the memory manager. Also radically changes the...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Thu Nov 11 13:15:40 2010 New Revision: 49559 URL: http://svn.reactos.org/svn/reactos?rev=49559&view=rev Log: [NTOS]: Start using colored pages. This will help performance on real systems significantly as cache is now taken into account by the memory manager. Also radically changes the way page allocations are given out and creates a less uniform physical memory layout. The fact this now works means that the PFN lists are finally now sane. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Thu Nov 11 13:15:40 2010 @@ -356,18 +356,15 @@ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(MmAvailablePages != 0); ASSERT(Color < MmSecondaryColors); -#if 0 + /* Check the colored free list */ PageIndex = MmFreePagesByColor[FreePageList][Color].Flink; - DPRINT1("Found free page: %lx\n", PageIndex); if (PageIndex == LIST_HEAD) { /* Check the colored zero list */ PageIndex = MmFreePagesByColor[ZeroedPageList][Color].Flink; - DPRINT1("Found zero page: %lx\n", PageIndex); if (PageIndex == LIST_HEAD) { -#endif /* Check the free list */ ASSERT_LIST_INVARIANT(&MmFreePageListHead); PageIndex = MmFreePageListHead.Flink; @@ -385,10 +382,9 @@ ASSERT(MmZeroedPageListHead.Total == 0); } } -#if 0 } } -#endif + /* Remove the page from its list */ PageIndex = MiRemovePageByColor(PageIndex, Color); @@ -419,11 +415,9 @@ ASSERT(Color < MmSecondaryColors); /* Check the colored zero list */ -#if 0 PageIndex = MmFreePagesByColor[ZeroedPageList][Color].Flink; if (PageIndex == LIST_HEAD) { -#endif /* Check the zero list */ ASSERT_LIST_INVARIANT(&MmZeroedPageListHead); PageIndex = MmZeroedPageListHead.Flink; @@ -433,12 +427,11 @@ /* This means there's no zero pages, we have to look for free ones */ ASSERT(MmZeroedPageListHead.Total == 0); Zero = TRUE; -#if 0 + /* Check the colored free list */ PageIndex = MmFreePagesByColor[FreePageList][Color].Flink; if (PageIndex == LIST_HEAD) { -#endif /* Check the free list */ ASSERT_LIST_INVARIANT(&MmFreePageListHead); PageIndex = MmFreePageListHead.Flink; @@ -449,13 +442,9 @@ /* FIXME: Should check the standby list */ ASSERT(MmZeroedPageListHead.Total == 0); } -#if 0 } -#endif } -#if 0 - } -#endif + } /* Sanity checks */ Pfn1 = MI_PFN_ELEMENT(PageIndex);

14 years, 1 month

[sir_richard] 49558: [NTOS]: Use MI_PFN_ELEMENT in this code, as the extra checks done by MiGetPfnEntry are irrelevant and slow things down. [NTOS]: Remove some old ReactOS hacks before we had MMRO...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Thu Nov 11 13:13:05 2010 New Revision: 49558 URL: http://svn.reactos.org/svn/reactos?rev=49558&view=rev Log: [NTOS]: Use MI_PFN_ELEMENT in this code, as the extra checks done by MiGetPfnEntry are irrelevant and slow things down. [NTOS]: Remove some old ReactOS hacks before we had MMROSPFNDATA. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Thu Nov 11 13:13:05 2010 @@ -113,7 +113,7 @@ if (OldFlink != LIST_HEAD) { /* It is not, so set the backlink of the actual entry, to our backlink */ - MiGetPfnEntry(OldFlink)->u2.Blink = OldBlink; + MI_PFN_ELEMENT(OldFlink)->u2.Blink = OldBlink; } else { @@ -125,7 +125,7 @@ if (OldBlink != LIST_HEAD) { /* It is not, so set the backlink of the actual entry, to our backlink */ - MiGetPfnEntry(OldBlink)->u1.Flink = OldFlink; + MI_PFN_ELEMENT(OldBlink)->u1.Flink = OldFlink; } else { @@ -149,7 +149,7 @@ if (ColorTable->Flink != LIST_HEAD) { /* And make the previous link point to the head now */ - MiGetPfnEntry(ColorTable->Flink)->u4.PteFrame = COLORED_LIST_HEAD; + MI_PFN_ELEMENT(ColorTable->Flink)->u4.PteFrame = COLORED_LIST_HEAD; } else { @@ -163,14 +163,14 @@ ASSERT(Entry->u4.PteFrame != COLORED_LIST_HEAD); /* Make the back link point to whoever the next page is */ - Pfn1 = MiGetPfnEntry(Entry->u4.PteFrame); + Pfn1 = MI_PFN_ELEMENT(Entry->u4.PteFrame); Pfn1->OriginalPte.u.Long = Entry->OriginalPte.u.Long; /* Check if this page was pointing to the head */ if (Entry->OriginalPte.u.Long != LIST_HEAD) { /* Make the back link point to the head */ - Pfn1 = MiGetPfnEntry(Entry->OriginalPte.u.Long); + Pfn1 = MI_PFN_ELEMENT(Entry->OriginalPte.u.Long); Pfn1->u4.PteFrame = Entry->u4.PteFrame; } else @@ -235,7 +235,7 @@ ASSERT(Color < MmSecondaryColors); /* Get the PFN entry */ - Pfn1 = MiGetPfnEntry(PageIndex); + Pfn1 = MI_PFN_ELEMENT(PageIndex); ASSERT(Pfn1->u3.e1.RemovalRequested == 0); ASSERT(Pfn1->u3.e1.Rom == 0); @@ -260,7 +260,7 @@ if (OldFlink != LIST_HEAD) { /* It is not, so set the backlink of the actual entry, to our backlink */ - MiGetPfnEntry(OldFlink)->u2.Blink = OldBlink; + MI_PFN_ELEMENT(OldFlink)->u2.Blink = OldBlink; } else { @@ -272,7 +272,7 @@ if (OldBlink != LIST_HEAD) { /* It is not, so set the backlink of the actual entry, to our backlink */ - MiGetPfnEntry(OldBlink)->u1.Flink = OldFlink; + MI_PFN_ELEMENT(OldBlink)->u1.Flink = OldFlink; } else { @@ -306,7 +306,7 @@ else { /* The list is empty, so we are the first page */ - MiGetPfnEntry(ColorTable->Flink)->u4.PteFrame = COLORED_LIST_HEAD; + MI_PFN_ELEMENT(ColorTable->Flink)->u4.PteFrame = COLORED_LIST_HEAD; } /* One less page */ @@ -393,7 +393,7 @@ PageIndex = MiRemovePageByColor(PageIndex, Color); /* Sanity checks */ - Pfn1 = MiGetPfnEntry(PageIndex); + Pfn1 = MI_PFN_ELEMENT(PageIndex); ASSERT((Pfn1->u3.e1.PageLocation == FreePageList) || (Pfn1->u3.e1.PageLocation == ZeroedPageList)); ASSERT(Pfn1->u3.e2.ReferenceCount == 0); @@ -458,13 +458,13 @@ #endif /* Sanity checks */ - Pfn1 = MiGetPfnEntry(PageIndex); + Pfn1 = MI_PFN_ELEMENT(PageIndex); ASSERT((Pfn1->u3.e1.PageLocation == FreePageList) || (Pfn1->u3.e1.PageLocation == ZeroedPageList)); /* Remove the page from its list */ PageIndex = MiRemovePageByColor(PageIndex, Color); - ASSERT(Pfn1 == MiGetPfnEntry(PageIndex)); + ASSERT(Pfn1 == MI_PFN_ELEMENT(PageIndex)); /* Zero it, if needed */ if (Zero) MiZeroPhysicalPage(PageIndex); @@ -497,7 +497,7 @@ (PageFrameIndex >= MmLowestPhysicalPage)); /* Get the PFN entry */ - Pfn1 = MiGetPfnEntry(PageFrameIndex); + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); /* Sanity checks that a right kind of page is being inserted here */ ASSERT(Pfn1->u4.MustBeCached == 0); @@ -516,7 +516,7 @@ if (LastPage != LIST_HEAD) { /* Link us with the previous page, so we're at the end now */ - MiGetPfnEntry(LastPage)->u1.Flink = PageFrameIndex; + MI_PFN_ELEMENT(LastPage)->u1.Flink = PageFrameIndex; } else { @@ -571,19 +571,15 @@ /* Get the previous page */ Blink = (PMMPFN)ColorTable->Blink; - /* Make it link to us */ + /* Make it link to us, and link back to it */ + Blink->OriginalPte.u.Long = PageFrameIndex; Pfn1->u4.PteFrame = MiGetPfnEntryIndex(Blink); - - /* If there is an original pte, it should be an old link, NOT a ReactOS RMAP */ - ASSERT(Blink->u4.AweAllocation == FALSE); - Blink->OriginalPte.u.Long = PageFrameIndex; } /* Now initialize our own list pointers */ ColorTable->Blink = Pfn1; - /* If there is an original pte, it should be an old link, NOT a ReactOS RMAP */ - ASSERT(Pfn1->u4.AweAllocation == FALSE); + /* This page is now the last */ Pfn1->OriginalPte.u.Long = LIST_HEAD; /* And increase the count in the colored list */ @@ -627,7 +623,7 @@ (PageFrameIndex >= MmLowestPhysicalPage)); /* Page should be unused */ - Pfn1 = MiGetPfnEntry(PageFrameIndex); + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); ASSERT(Pfn1->u3.e2.ReferenceCount == 0); ASSERT(Pfn1->u3.e1.Rom != 1); @@ -651,7 +647,7 @@ if (Flink != LIST_HEAD) { /* It wasn't, so update the backlink of the previous head page */ - Pfn2 = MiGetPfnEntry(Flink); + Pfn2 = MI_PFN_ELEMENT(Flink); Pfn2->u2.Blink = PageFrameIndex; } else @@ -691,9 +687,6 @@ /* Get the old head */ Flink = ColorHead->Flink; - /* If there is an original pte, it should be an old link, NOT a ReactOS RMAP */ - ASSERT(Pfn1->u4.AweAllocation == FALSE); - /* Make this page point back to the list, and point forwards to the old head */ Pfn1->OriginalPte.u.Long = Flink; Pfn1->u4.PteFrame = COLORED_LIST_HEAD; @@ -705,7 +698,7 @@ if (Flink != LIST_HEAD) { /* No, so make the old head point to this page */ - Pfn2 = MiGetPfnEntry(Flink); + Pfn2 = MI_PFN_ELEMENT(Flink); Pfn2->u4.PteFrame = PageFrameIndex; } else @@ -737,7 +730,7 @@ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); /* Setup the PTE */ - Pfn1 = MiGetPfnEntry(PageFrameIndex); + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); Pfn1->PteAddress = PointerPte; /* Check if this PFN is part of a valid address space */ @@ -788,7 +781,7 @@ Pfn1->u4.PteFrame = PageFrameIndex; /* Increase its share count so we don't get rid of it */ - Pfn1 = MiGetPfnEntry(PageFrameIndex); + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); Pfn1->u2.ShareCount++; } @@ -842,8 +835,8 @@ IN PFN_NUMBER PageFrameIndex) { ASSERT(PageFrameIndex > 0); - ASSERT(MiGetPfnEntry(PageFrameIndex) != NULL); - ASSERT(Pfn1 == MiGetPfnEntry(PageFrameIndex)); + ASSERT(MI_PFN_ELEMENT(PageFrameIndex) != NULL); + ASSERT(Pfn1 == MI_PFN_ELEMENT(PageFrameIndex)); ASSERT(MI_IS_ROS_PFN(Pfn1) == FALSE); /* Page must be in-use */ @@ -880,13 +873,7 @@ /* Clear the last reference */ Pfn1->u3.e2.ReferenceCount = 0; - - /* - * OriginalPte is used by AweReferenceCount in ReactOS, but either - * ways we shouldn't be seeing RMAP entries at this point - */ ASSERT(Pfn1->OriginalPte.u.Soft.Prototype == 0); - ASSERT(Pfn1->u4.AweAllocation == FALSE); /* Mark the page temporarily as valid, we're going to make it free soon */ Pfn1->u3.e1.PageLocation = ActiveAndValid; @@ -912,7 +899,7 @@ /* Sanity checks on the page */ ASSERT(PageFrameIndex < MmHighestPhysicalPage); - ASSERT(Pfn1 == MiGetPfnEntry(PageFrameIndex)); + ASSERT(Pfn1 == MI_PFN_ELEMENT(PageFrameIndex)); ASSERT(Pfn1->u3.e2.ReferenceCount != 0); /* Dereference the page, bail out if it's still alive */ @@ -954,7 +941,7 @@ PMMPFN Pfn1; /* Setup the PTE */ - Pfn1 = MiGetPfnEntry(PageFrameIndex); + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); Pfn1->PteAddress = PointerPte; /* Make this a software PTE */ @@ -975,7 +962,7 @@ Pfn1->u4.PteFrame = PteFrame; /* Increase its share count so we don't get rid of it */ - Pfn1 = MiGetPfnEntry(PteFrame); + Pfn1 = MI_PFN_ELEMENT(PteFrame); Pfn1->u2.ShareCount++; } }

14 years, 1 month

← Newer
1
...
29
30
31
32
33
34
35
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2010