[tkreuzer] 46434: Merge from amd64-branch: 44501 (tkreuzer) [NDK] - Add CLIENT_ID32/64 - Create explicit 32/64 bit versions of PEB, GDI_TEB_BATCH and TEB, using macros. - Fix some member names. 44503 (tkreuzer) [CMD] Fix a teb member name 44504 (tkreuzer) [NTSOKRNL] Fix a teb member name 44506 (tkreuzer) [NDK] fix a typo in the TEB definition 44511 (tkreuzer) [NDK] - Add Wx86ThreadState - Add WinXP version of ACTIVATION_CONTEXT_STACK - rtltypes doesn't depend on pstypes, but the opposite way aro
Author: tkreuzer Date: Thu Mar 25 13:22:59 2010 New Revision: 46434
URL: http://svn.reactos.org/svn/reactos?rev=46434&view=rev Log: Merge from amd64-branch:
44501 (tkreuzer) [NDK] - Add CLIENT_ID32/64 - Create explicit 32/64 bit versions of PEB, GDI_TEB_BATCH and TEB, using macros. - Fix some member names.
44503 (tkreuzer) [CMD] Fix a teb member name
44504 (tkreuzer) [NTSOKRNL] Fix a teb member name
44506 (tkreuzer) [NDK] fix a typo in the TEB definition
44511 (tkreuzer) [NDK] - Add Wx86ThreadState - Add WinXP version of ACTIVATION_CONTEXT_STACK - rtltypes doesn't depend on pstypes, but the opposite way around now
44512 (tkreuzer) [NDK] Fix some dependencies
44521 (tkreuzer) [NTDKK] - Don't use PEB::FastPeb(Un)LockRoutine, these members are deprecated since Windows 2003, use RtlEnter/LeaveCriticalSection instead.
44523 (tkreuzer) [NTDLL] Fix usage of PEB::KernelCallbacktable. It's a PVOID.
44524 (tkreuzer) NDK] - Add missing TEB member for Vista
44525 (tkreuzer) [NDK] Fix a TEB array size.
44526 (tkreuzer) [USER32] More fix of TEB::KernelCallbackTable usage
Added: trunk/reactos/include/ndk/peb_teb.h - copied, changed from r44501, branches/ros-amd64-bringup/reactos/include/ndk/peb_teb.h Modified: trunk/reactos/ (props changed) trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/dll/directx/bdaplgin/classfactory.cpp (props changed) trunk/reactos/dll/directx/d3d8/d3d8.spec (props changed) trunk/reactos/dll/directx/dsound_new/classfactory.c (props changed) trunk/reactos/dll/directx/dsound_new/dsound.spec (props changed) trunk/reactos/dll/directx/dsound_new/dsound_convert.c (props changed) trunk/reactos/dll/directx/dsound_new/regsvr.c (props changed) trunk/reactos/dll/ntdll/dbg/dbgui.c trunk/reactos/dll/ntdll/dispatch/dispatch.c trunk/reactos/dll/ntdll/ldr/startup.c trunk/reactos/dll/ntdll/ldr/utils.c trunk/reactos/dll/ntdll/rtl/libsupp.c trunk/reactos/dll/shellext/devcpux/devcpux.spec (props changed) trunk/reactos/dll/shellext/slayer/slayer.spec (props changed) trunk/reactos/dll/win32/kernel32/thread/fiber.c trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/include/ndk/amd64/ (props changed) trunk/reactos/include/ndk/amd64/asmmacro.S (props changed) trunk/reactos/include/ndk/pstypes.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/include/ndk/umtypes.h trunk/reactos/lib/sdk/crt/time/ (props changed) trunk/reactos/ntoskrnl/dbgk/dbgkutil.c trunk/reactos/ntoskrnl/kdbg/ (props changed) trunk/reactos/ntoskrnl/ke/i386/usercall.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/rtl/libsupp.c trunk/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) trunk/reactos/tools/rsym/rsym.c (props changed) trunk/reactos/tools/rsym/rsym.h (props changed) trunk/reactos/tools/rsym/rsym.mak (props changed) trunk/reactos/tools/rsym/rsym_common.c (props changed)
Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 13:22:59 2010 @@ -1,3 +1,3 @@ /branches/header-work:45691-46153 /branches/ros-amd64-bringup:36852 -/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772,46394 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,46394
Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=46... ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Thu Mar 25 13:22:59 2010 @@ -244,7 +244,7 @@ return TRUE; }
- return IMAGE_SUBSYSTEM_WINDOWS_CUI == ProcessPeb.ImageSubSystem; + return IMAGE_SUBSYSTEM_WINDOWS_CUI == ProcessPeb.ImageSubsystem; }
Propchange: trunk/reactos/dll/directx/bdaplgin/classfactory.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 13:22:59 2010 @@ -1,3 +1,3 @@ /branches/header-work/dll/directx/bdaplgin/classfactory.cpp:45691-46153 -/branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/classfactory.cpp:34741,34870,36969,40927,41070,41500,44339,46394 +/branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/classfactory.cpp:34741,34870,36969,40927,41070,41500,44339,44501,44503-44504,44506,44511-44512,44521,44523-44526,46394 /branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/classfactory.cpp:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601
Propchange: trunk/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 13:22:59 2010 @@ -1,2 +1,2 @@ /branches/header-work/dll/directx/d3d8/d3d8.spec:45691-46153 -/branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38148-38151,38264-38265,38268,38355,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772,46394 +/branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38148-38151,38264-38265,38268,38355,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,46394
Propchange: trunk/reactos/dll/directx/dsound_new/classfactory.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 13:22:59 2010 @@ -1,3 +1,3 @@ /branches/header-work/dll/directx/dsound_new/classfactory.c:45691-46153 -/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/classfactory.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36502-36503,36505,36898,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40927,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41070,41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857,43860,43905,43907,43969,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772,46394 +/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/classfactory.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36502-36503,36505,36898,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40927,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41070,41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857,43860,43905,43907,43969,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,46394 /branches/ros-amd64-bringup/reactos/dll/win32/netshell/classfactory.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682
Propchange: trunk/reactos/dll/directx/dsound_new/dsound.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 13:22:59 2010 @@ -1,3 +1,3 @@ /branches/header-work/dll/directx/dsound_new/dsound.spec:45691-46153 /branches/ros-amd64-bringup/reactos/dll/directx/dsound/dsound.spec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36502-36503,36505,36898,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40927,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41070,41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857,43860,43905,43907,43969,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772,46394 +/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36502-36503,36505,36898,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40927,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41070,41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857,43860,43905,43907,43969,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,46394
Propchange: trunk/reactos/dll/directx/dsound_new/dsound_convert.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 13:22:59 2010 @@ -1,3 +1,3 @@ /branches/header-work/dll/directx/dsound_new/dsound_convert.c:45691-46153 /branches/ros-amd64-bringup/reactos/dll/directx/dsound/dsound_convert.c:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound_convert.c:34741,34870,36969,40927,41070,41500,44339,46394 +/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound_convert.c:34741,34870,36969,40927,41070,41500,44339,44501,44503-44504,44506,44511-44512,44521,44523-44526,46394
Propchange: trunk/reactos/dll/directx/dsound_new/regsvr.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 13:22:59 2010 @@ -1,3 +1,3 @@ /branches/header-work/dll/directx/dsound_new/regsvr.c:45691-46153 /branches/ros-amd64-bringup/reactos/dll/directx/dsound/regsvr.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/regsvr.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36502-36503,36505,36898,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40927,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41070,41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857,43860,43905,43907,43969,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772,46394 +/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/regsvr.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36502-36503,36505,36898,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40927,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41070,41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857,43860,43905,43907,43969,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,46394
Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dbg/dbgui.c?rev=4... ============================================================================== --- trunk/reactos/dll/ntdll/dbg/dbgui.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dbg/dbgui.c [iso-8859-1] Thu Mar 25 13:22:59 2010 @@ -259,7 +259,7 @@ /* Save the image name from the TIB */ DebugEvent->u.LoadDll.lpImageName = ((PTEB)ThreadBasicInfo.TebBaseAddress)-> - Tib.ArbitraryUserPointer; + NtTib.ArbitraryUserPointer; } else {
Modified: trunk/reactos/dll/ntdll/dispatch/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/dispatch... ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dispatch/dispatch.c [iso-8859-1] Thu Mar 25 13:22:59 2010 @@ -79,8 +79,8 @@ ULONG ArgumentLength) { /* Return with the result of the callback function */ + USER_CALL *KernelCallbackTable = NtCurrentPeb()->KernelCallbackTable; ZwCallbackReturn(NULL, 0, - ((USER_CALL)(NtCurrentPeb()->KernelCallbackTable[Index])) - (Argument, ArgumentLength)); + KernelCallbackTable[Index](Argument, ArgumentLength)); }
Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?rev... ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Thu Mar 25 13:22:59 2010 @@ -343,8 +343,6 @@ /* initalize peb lock support */ RtlInitializeCriticalSection(&PebLock); Peb->FastPebLock = &PebLock; - Peb->FastPebLockRoutine = (PPEBLOCKROUTINE)RtlEnterCriticalSection; - Peb->FastPebUnlockRoutine = (PPEBLOCKROUTINE)RtlLeaveCriticalSection;
/* initialize tls bitmaps */ RtlInitializeBitMap(&TlsBitMap, Peb->TlsBitmapBits, TLS_MINIMUM_AVAILABLE);
Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=4... ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Thu Mar 25 13:22:59 2010 @@ -2299,8 +2299,8 @@ /* Map the dll into the process */ ViewSize = 0; ImageBase = 0; - ArbitraryUserPointer = NtCurrentTeb()->Tib.ArbitraryUserPointer; - NtCurrentTeb()->Tib.ArbitraryUserPointer = FullDosName.Buffer; + ArbitraryUserPointer = NtCurrentTeb()->NtTib.ArbitraryUserPointer; + NtCurrentTeb()->NtTib.ArbitraryUserPointer = FullDosName.Buffer; Status = NtMapViewOfSection(SectionHandle, NtCurrentProcess(), &ImageBase, @@ -2311,7 +2311,7 @@ ViewShare, 0, PAGE_READONLY); - NtCurrentTeb()->Tib.ArbitraryUserPointer = ArbitraryUserPointer; + NtCurrentTeb()->NtTib.ArbitraryUserPointer = ArbitraryUserPointer; if (!NT_SUCCESS(Status)) { DPRINT1("map view of section failed (Status 0x%08lx)\n", Status);
Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?rev... ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Thu Mar 25 13:22:59 2010 @@ -83,7 +83,7 @@ RtlAcquirePebLock(VOID) { PPEB Peb = NtCurrentPeb (); - Peb->FastPebLockRoutine (Peb->FastPebLock); + RtlEnterCriticalSection(Peb->FastPebLock); }
/* @@ -93,7 +93,7 @@ RtlReleasePebLock(VOID) { PPEB Peb = NtCurrentPeb (); - Peb->FastPebUnlockRoutine (Peb->FastPebLock); + RtlLeaveCriticalSection(Peb->FastPebLock); }
/* @@ -201,10 +201,23 @@ IN ULONG_PTR *StackEnd) { /* FIXME: Verify */ - *StackBegin = (ULONG_PTR)NtCurrentTeb()->Tib.StackLimit; - *StackEnd = (ULONG_PTR)NtCurrentTeb()->Tib.StackBase; + *StackBegin = (ULONG_PTR)NtCurrentTeb()->NtTib.StackLimit; + *StackEnd = (ULONG_PTR)NtCurrentTeb()->NtTib.StackBase; return TRUE; } + +#ifdef _AMD64_ +VOID +NTAPI +RtlpGetStackLimits( + OUT PULONG_PTR LowLimit, + OUT PULONG_PTR HighLimit) +{ + *LowLimit = (ULONG_PTR)NtCurrentTeb()->NtTib.StackLimit; + *HighLimit = (ULONG_PTR)NtCurrentTeb()->NtTib.StackBase; + return; +} +#endif
BOOLEAN NTAPI
Propchange: trunk/reactos/dll/shellext/devcpux/devcpux.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 13:22:59 2010 @@ -1,2 +1,2 @@ /branches/header-work/dll/shellext/devcpux/devcpux.spec:45691-46153 -/branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772,46394 +/branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,46394
Propchange: trunk/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 13:22:59 2010 @@ -1,2 +1,2 @@ /branches/header-work/dll/shellext/slayer/slayer.spec:45691-46153 -/branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772,46394 +/branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,46394
Modified: trunk/reactos/dll/win32/kernel32/thread/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/f... ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/fiber.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/fiber.c [iso-8859-1] Thu Mar 25 13:22:59 2010 @@ -47,9 +47,9 @@ pTeb->HasFiberData = FALSE;
/* free the fiber */ - if (pTeb->Tib.FiberData != NULL) - { - RtlFreeHeap(GetProcessHeap(), 0, pTeb->Tib.FiberData); + if(pTeb->NtTib.FiberData != NULL) + { + RtlFreeHeap(GetProcessHeap(), 0, pTeb->NtTib.FiberData); }
/* success */ @@ -69,7 +69,7 @@ DPRINT1("Converting Thread to Fiber\n");
/* the current thread is already a fiber */ - if(pTeb->HasFiberData && pTeb->Tib.FiberData) return pTeb->Tib.FiberData; + if(pTeb->HasFiberData && pTeb->NtTib.FiberData) return pTeb->NtTib.FiberData;
/* allocate the fiber */ pfCurFiber = (PFIBER)RtlAllocateHeap(GetProcessHeap(), @@ -85,9 +85,9 @@
/* copy some contextual data from the thread to the fiber */ pfCurFiber->Parameter = lpParameter; - pfCurFiber->ExceptionList = pTeb->Tib.ExceptionList; - pfCurFiber->StackBase = pTeb->Tib.StackBase; - pfCurFiber->StackLimit = pTeb->Tib.StackLimit; + pfCurFiber->ExceptionList = pTeb->NtTib.ExceptionList; + pfCurFiber->StackBase = pTeb->NtTib.StackBase; + pfCurFiber->StackLimit = pTeb->NtTib.StackLimit; pfCurFiber->DeallocationStack = pTeb->DeallocationStack; pfCurFiber->FlsData = pTeb->FlsData; pfCurFiber->GuaranteedStackBytes = pTeb->GuaranteedStackBytes; @@ -101,7 +101,7 @@ }
/* associate the fiber to the current thread */ - pTeb->Tib.FiberData = pfCurFiber; + pTeb->NtTib.FiberData = pfCurFiber; pTeb->HasFiberData = TRUE;
/* success */ @@ -227,7 +227,7 @@ RtlFreeHeap(GetProcessHeap(), 0, lpFiber);
/* the fiber is deleting itself: let the system deallocate the stack */ - if(NtCurrentTeb()->Tib.FiberData == lpFiber) ExitThread(1); + if(NtCurrentTeb()->NtTib.FiberData == lpFiber) ExitThread(1);
/* deallocate the stack */ NtFreeVirtualMemory(NtCurrentProcess(),
Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllma... ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Thu Mar 25 13:22:59 2010 @@ -217,23 +217,25 @@ Init(VOID) { USERCONNECT UserCon; + PVOID *KernelCallbackTable;
/* Set up the kernel callbacks. */ - NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_WINDOWPROC] = + KernelCallbackTable = NtCurrentPeb()->KernelCallbackTable; + KernelCallbackTable[USER32_CALLBACK_WINDOWPROC] = (PVOID)User32CallWindowProcFromKernel; - NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_SENDASYNCPROC] = + KernelCallbackTable[USER32_CALLBACK_SENDASYNCPROC] = (PVOID)User32CallSendAsyncProcForKernel; - NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_LOADSYSMENUTEMPLATE] = + KernelCallbackTable[USER32_CALLBACK_LOADSYSMENUTEMPLATE] = (PVOID)User32LoadSysMenuTemplateForKernel; - NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_LOADDEFAULTCURSORS] = + KernelCallbackTable[USER32_CALLBACK_LOADDEFAULTCURSORS] = (PVOID)User32SetupDefaultCursors; - NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_HOOKPROC] = + KernelCallbackTable[USER32_CALLBACK_HOOKPROC] = (PVOID)User32CallHookProcFromKernel; - NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_EVENTPROC] = + KernelCallbackTable[USER32_CALLBACK_EVENTPROC] = (PVOID)User32CallEventProcFromKernel; - NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_LOADMENU] = + KernelCallbackTable[USER32_CALLBACK_LOADMENU] = (PVOID)User32CallLoadMenuFromKernel; - NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_CLIENTTHREADSTARTUP] = + KernelCallbackTable[USER32_CALLBACK_CLIENTTHREADSTARTUP] = (PVOID)User32CallClientThreadSetupFromKernel;
NtUserProcessConnect( NtCurrentProcess(),
Propchange: trunk/reactos/include/ndk/amd64/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 13:22:59 2010 @@ -1,2 +1,2 @@ /branches/header-work/include/ndk/amd64:45691-46153 -/branches/ros-amd64-bringup/reactos/include/ndk/amd64:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34925,34965,34967,34970,35323-35324,35347-35348,35361,35436,35509,35588,35655,35683,35739,35762,35777,35781,35805,35823,35827,35952,35966,36011-36012,36172,36360,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37990,38013-38014,38092,38100,38149-38150,38264,38355,39335,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41070-41071,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338-44339,44389,44391,44426,44460,44491,44499-44500,44510,44530,44540,44601,44623,44631,44772,46394 +/branches/ros-amd64-bringup/reactos/include/ndk/amd64:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34925,34965,34967,34970,35323-35324,35347-35348,35361,35436,35509,35588,35655,35683,35739,35762,35777,35781,35805,35823,35827,35952,35966,36011-36012,36172,36360,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37990,38013-38014,38092,38100,38149-38150,38264,38355,39335,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41070-41071,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338-44339,44389,44391,44426,44460,44491,44499-44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44623,44631,44772,46394
Propchange: trunk/reactos/include/ndk/amd64/asmmacro.S ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 13:22:59 2010 @@ -1,2 +1,2 @@ /branches/header-work/include/ndk/amd64/asmmacro.S:45691-46153 -/branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37475,37536,37820-37821,37868-37869,37990,38013-38014,38092,38100,38149-38150,38264,38355,39335,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41070-41071,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338-44339,44389,44391,44426,44460,44491,44499-44500,44510,44530,44540,44601,44623,44631,44772,46394 +/branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37475,37536,37820-37821,37868-37869,37990,38013-38014,38092,38100,38149-38150,38264,38355,39335,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41070-41071,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338-44339,44389,44391,44426,44460,44491,44499-44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44623,44631,44772,46394
Copied: trunk/reactos/include/ndk/peb_teb.h (from r44501, branches/ros-amd64-bringup/reactos/include/ndk/peb_teb.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/peb_teb.h?p2=tr... ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/peb_teb.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/peb_teb.h [iso-8859-1] Thu Mar 25 13:22:59 2010 @@ -165,7 +165,9 @@ C_ASSERT(FIELD_OFFSET(STRUCT(PEB), ImageProcessAffinityMask) == 0x138); C_ASSERT(FIELD_OFFSET(STRUCT(PEB), PostProcessInitRoutine) == 0x230); C_ASSERT(FIELD_OFFSET(STRUCT(PEB), SessionId) == 0x2C0); +#if (NTDDI_VERSION >= NTDDI_WS03) C_ASSERT(FIELD_OFFSET(STRUCT(PEB), FlsHighIndex) == 0x350); +#endif #else C_ASSERT(FIELD_OFFSET(STRUCT(PEB), Mutant) == 0x04); C_ASSERT(FIELD_OFFSET(STRUCT(PEB), Ldr) == 0x0C); @@ -178,7 +180,9 @@ C_ASSERT(FIELD_OFFSET(STRUCT(PEB), ImageProcessAffinityMask) == 0x0C0); C_ASSERT(FIELD_OFFSET(STRUCT(PEB), PostProcessInitRoutine) == 0x14C); C_ASSERT(FIELD_OFFSET(STRUCT(PEB), SessionId) == 0x1D4); +#if (NTDDI_VERSION >= NTDDI_WS03) C_ASSERT(FIELD_OFFSET(STRUCT(PEB), FlsHighIndex) == 0x22C); +#endif #endif
// @@ -215,7 +219,7 @@ LONG ExceptionCode; #if (NTDDI_VERSION >= NTDDI_LONGHORN) PTR(struct _ACTIVATION_CONTEXT_STACK*) ActivationContextStackPointer; - UCHAR SpareBytes1[0x30 - 3 * sizeof(PTR(PVOID)]; + UCHAR SpareBytes1[0x30 - 3 * sizeof(PTR(PVOID))]; ULONG TxFsContext; #elif (NTDDI_VERSION >= NTDDI_WS03) PTR(struct _ACTIVATION_CONTEXT_STACK*) ActivationContextStackPointer; @@ -254,10 +258,11 @@ ULONG HardErrorsAreDisabled; #endif #if (NTDDI_VERSION >= NTDDI_LONGHORN) - PTR(PVOID) Instrumentation[9]; + PTR(PVOID) Instrumentation[13 - sizeof(GUID)/sizeof(PTR(PVOID))]; GUID ActivityId; PTR(PVOID) SubProcessTag; PTR(PVOID) EtwLocalData; + PTR(PVOID) EtwTraceData; #elif (NTDDI_VERSION >= NTDDI_WS03) PTR(PVOID) Instrumentation[14]; PTR(PVOID) SubProcessTag; @@ -360,7 +365,6 @@ C_ASSERT(FIELD_OFFSET(STRUCT(TEB), LastStatusValue) == 0x1250); C_ASSERT(FIELD_OFFSET(STRUCT(TEB), Vdm) == 0x1690); C_ASSERT(FIELD_OFFSET(STRUCT(TEB), HardErrorMode) == 0x16B0); -C_ASSERT(FIELD_OFFSET(STRUCT(TEB), SubProcessTag) == 0x1728); C_ASSERT(FIELD_OFFSET(STRUCT(TEB), GdiBatchCount) == 0x1740); C_ASSERT(FIELD_OFFSET(STRUCT(TEB), IdealProcessor) == 0x1747); C_ASSERT(FIELD_OFFSET(STRUCT(TEB), WaitingOnLoaderLock) == 0x1760); @@ -373,8 +377,6 @@ C_ASSERT(FIELD_OFFSET(STRUCT(TEB), GdiTebBatch) == 0x1D4); C_ASSERT(FIELD_OFFSET(STRUCT(TEB), LastStatusValue) == 0xBF4); C_ASSERT(FIELD_OFFSET(STRUCT(TEB), Vdm) == 0xF18); -C_ASSERT(FIELD_OFFSET(STRUCT(TEB), HardErrorMode) == 0xF28); -C_ASSERT(FIELD_OFFSET(STRUCT(TEB), SubProcessTag) == 0xF64); C_ASSERT(FIELD_OFFSET(STRUCT(TEB), GdiBatchCount) == 0xF70); C_ASSERT(FIELD_OFFSET(STRUCT(TEB), TlsExpansionSlots) == 0xF94); C_ASSERT(FIELD_OFFSET(STRUCT(TEB), ActiveFrame) == 0xFB0);
Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=4... ============================================================================== --- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Thu Mar 25 13:22:59 2010 @@ -26,6 +26,7 @@ #include <ldrtypes.h> #include <mmtypes.h> #include <obtypes.h> +#include <rtltypes.h> #ifndef NTOS_MODE_USER #include <extypes.h> #include <setypes.h> @@ -617,133 +618,6 @@ } INITIAL_PEB, *PINITIAL_PEB;
// -// Process Environment Block (PEB) -// -typedef struct _PEB -{ - BOOLEAN InheritedAddressSpace; - BOOLEAN ReadImageFileExecOptions; - BOOLEAN BeingDebugged; -#if (NTDDI_VERSION >= NTDDI_WS03) - struct - { - BOOLEAN ImageUsesLargePages:1; - #if (NTDDI_VERSION >= NTDDI_LONGHORN) - BOOLEAN IsProtectedProcess:1; - BOOLEAN IsLegacyProcess:1; - BOOLEAN SpareBits:5; - #else - BOOLEAN SpareBits:7; - #endif - }; -#else - BOOLEAN SpareBool; -#endif - HANDLE Mutant; - PVOID ImageBaseAddress; - PPEB_LDR_DATA Ldr; - struct _RTL_USER_PROCESS_PARAMETERS *ProcessParameters; - PVOID SubSystemData; - PVOID ProcessHeap; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - struct _RTL_CRITICAL_SECTION *FastPebLock; - PVOID AltThunkSListPtr; - PVOID IFEOKey; - ULONG Spare; - union - { - PVOID* KernelCallbackTable; - PVOID UserSharedInfoPtr; - }; - ULONG SystemReserved[1]; - ULONG SpareUlong; -#else - PVOID FastPebLock; - PPEBLOCKROUTINE FastPebLockRoutine; - PPEBLOCKROUTINE FastPebUnlockRoutine; - ULONG EnvironmentUpdateCount; - PVOID* KernelCallbackTable; - PVOID EventLogSection; - PVOID EventLog; -#endif - PPEB_FREE_BLOCK FreeList; - ULONG TlsExpansionCounter; - PVOID TlsBitmap; - ULONG TlsBitmapBits[0x2]; - PVOID ReadOnlySharedMemoryBase; - PVOID ReadOnlySharedMemoryHeap; - PVOID* ReadOnlyStaticServerData; - PVOID AnsiCodePageData; - PVOID OemCodePageData; - PVOID UnicodeCaseTableData; - ULONG NumberOfProcessors; - ULONG NtGlobalFlag; - LARGE_INTEGER CriticalSectionTimeout; - ULONG HeapSegmentReserve; - ULONG HeapSegmentCommit; - ULONG HeapDeCommitTotalFreeThreshold; - ULONG HeapDeCommitFreeBlockThreshold; - ULONG NumberOfHeaps; - ULONG MaximumNumberOfHeaps; - PVOID* ProcessHeaps; - PVOID GdiSharedHandleTable; - PVOID ProcessStarterHelper; - ULONG GdiDCAttributeList; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - struct _RTL_CRITICAL_SECTION *LoaderLock; -#else - PVOID LoaderLock; -#endif - ULONG OSMajorVersion; - ULONG OSMinorVersion; - USHORT OSBuildNumber; - USHORT OSCSDVersion; - ULONG OSPlatformId; - ULONG ImageSubSystem; - ULONG ImageSubSystemMajorVersion; - ULONG ImageSubSystemMinorVersion; - ULONG ImageProcessAffinityMask; - ULONG GdiHandleBuffer[0x22]; - PPOST_PROCESS_INIT_ROUTINE PostProcessInitRoutine; - struct _RTL_BITMAP *TlsExpansionBitmap; - ULONG TlsExpansionBitmapBits[0x20]; - ULONG SessionId; -#if (NTDDI_VERSION >= NTDDI_WINXP) - ULARGE_INTEGER AppCompatFlags; - ULARGE_INTEGER AppCompatFlagsUser; - PVOID pShimData; - PVOID AppCompatInfo; - UNICODE_STRING CSDVersion; - struct _ACTIVATION_CONTEXT_DATA *ActivationContextData; - struct _ASSEMBLY_STORAGE_MAP *ProcessAssemblyStorageMap; - struct _ACTIVATION_CONTEXT_DATA *SystemDefaultActivationContextData; - struct _ASSEMBLY_STORAGE_MAP *SystemAssemblyStorageMap; - ULONG MinimumStackCommit; -#endif -#if (NTDDI_VERSION >= NTDDI_WS03) - PVOID *FlsCallback; - LIST_ENTRY FlsListHead; - struct _RTL_BITMAP *FlsBitmap; - ULONG FlsBitmapBits[4]; - ULONG FlsHighIndex; -#endif -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - PVOID WerRegistrationData; - PVOID WerShipAssertPtr; -#endif -} PEB, *PPEB; - -// -// GDI Batch Descriptor -// -typedef struct _GDI_TEB_BATCH -{ - ULONG Offset; - HANDLE HDC; - ULONG Buffer[0x136]; -} GDI_TEB_BATCH, *PGDI_TEB_BATCH; - -// // Initial TEB // typedef struct _INITIAL_TEB @@ -771,146 +645,50 @@ PTEB_ACTIVE_FRAME_CONTEXT Context; } TEB_ACTIVE_FRAME, *PTEB_ACTIVE_FRAME;
-// +typedef struct _CLIENT_ID32 +{ + ULONG UniqueProcess; + ULONG UniqueThread; +} CLIENT_ID32, *PCLIENT_ID32; + +typedef struct _CLIENT_ID64 +{ + ULONG64 UniqueProcess; + ULONG64 UniqueThread; +} CLIENT_ID64, *PCLIENT_ID64; + +#if (NTDDI_VERSION < NTDDI_WS03) +typedef struct _Wx86ThreadState +{ + PULONG CallBx86Eip; + PVOID DeallocationCpu; + BOOLEAN UseKnownWx86Dll; + CHAR OleStubInvoked; +} Wx86ThreadState, *PWx86ThreadState; +#endif + + +// +// Process Environment Block (PEB) // Thread Environment Block (TEB) // -typedef struct _TEB -{ - NT_TIB Tib; - PVOID EnvironmentPointer; - CLIENT_ID ClientId; - PVOID ActiveRpcHandle; - PVOID ThreadLocalStoragePointer; - struct _PEB *ProcessEnvironmentBlock; - ULONG LastErrorValue; - ULONG CountOfOwnedCriticalSections; - PVOID CsrClientThread; - struct _W32THREAD* Win32ThreadInfo; - ULONG User32Reserved[0x1A]; - ULONG UserReserved[5]; - PVOID WOW32Reserved; - LCID CurrentLocale; - ULONG FpSoftwareStatusRegister; - PVOID SystemReserved1[0x36]; - LONG ExceptionCode; - struct _ACTIVATION_CONTEXT_STACK *ActivationContextStackPointer; +#include "peb_teb.h" + #ifdef _WIN64 - UCHAR SpareBytes1[24]; -#else - UCHAR SpareBytes1[0x24]; -#endif - ULONG TxFsContext; - GDI_TEB_BATCH GdiTebBatch; - CLIENT_ID RealClientId; - PVOID GdiCachedProcessHandle; - ULONG GdiClientPID; - ULONG GdiClientTID; - PVOID GdiThreadLocalInfo; - SIZE_T Win32ClientInfo[62]; - PVOID glDispatchTable[0xE9]; - SIZE_T glReserved1[0x1D]; - PVOID glReserved2; - PVOID glSectionInfo; - PVOID glSection; - PVOID glTable; - PVOID glCurrentRC; - PVOID glContext; - NTSTATUS LastStatusValue; - UNICODE_STRING StaticUnicodeString; - WCHAR StaticUnicodeBuffer[0x105]; - PVOID DeallocationStack; - PVOID TlsSlots[0x40]; - LIST_ENTRY TlsLinks; - PVOID Vdm; - PVOID ReservedForNtRpc; - PVOID DbgSsReserved[0x2]; - ULONG HardErrorDisabled; -#ifdef _WIN64 - PVOID Instrumentation[11]; -#else - PVOID Instrumentation[9]; -#endif - GUID ActivityId; - PVOID SubProcessTag; - PVOID EtwTraceData; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - PVOID EtwLocalData; -#endif - PVOID WinSockData; - ULONG GdiBatchCount; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - BOOLEAN SpareBool0; - BOOLEAN SpareBool1; - BOOLEAN SpareBool2; -#else - BOOLEAN InDbgPrint; - BOOLEAN FreeStackOnTermination; - BOOLEAN HasFiberData; -#endif - UCHAR IdealProcessor; - ULONG GuaranteedStackBytes; - PVOID ReservedForPerf; - PVOID ReservedForOle; - ULONG WaitingOnLoaderLock; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - PVOID SavedPriorityState; -#else - ULONG SparePointer1; -#endif - ULONG SoftPatchPtr1; - ULONG SoftPatchPtr2; - PVOID *TlsExpansionSlots; - ULONG ImpersonationLocale; - ULONG IsImpersonating; - PVOID NlsCache; - PVOID pShimData; - ULONG HeapVirualAffinity; - PVOID CurrentTransactionHandle; - PTEB_ACTIVE_FRAME ActiveFrame; -#if (NTDDI_VERSION >= NTDDI_WS03) - PVOID FlsData; -#endif -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - PVOID PreferredLangauges; - PVOID UserPrefLanguages; - PVOID MergedPrefLanguages; - ULONG MuiImpersonation; - union - { - struct - { - USHORT SpareCrossTebFlags:16; - }; - USHORT CrossTebFlags; - }; - union - { - struct - { - USHORT DbgSafeThunkCall:1; - USHORT DbgInDebugPrint:1; - USHORT DbgHasFiberData:1; - USHORT DbgSkipThreadAttach:1; - USHORT DbgWerInShipAssertCode:1; - USHORT DbgIssuedInitialBp:1; - USHORT DbgClonedThread:1; - USHORT SpareSameTebBits:9; - }; - USHORT SameTebFlags; - }; - PVOID TxnScopeEntercallback; - PVOID TxnScopeExitCAllback; - PVOID TxnScopeContext; - ULONG LockCount; - ULONG ProcessRundown; - ULONGLONG LastSwitchTime; - ULONGLONG TotalSwitchOutTime; - LARGE_INTEGER WaitReasonBitMap; -#else - UCHAR SafeThunkCall; - UCHAR BooleanSpare[3]; -#endif -} TEB, *PTEB; +// +// Explicit 32 bit PEB/TEB +// +#define EXPLICIT_32BIT +#include "peb_teb.h" +#undef EXPLICIT_32BIT + +// +// Explicit 64 bit PEB/TEB +// +#define EXPLICIT_64BIT +#include "peb_teb.h" +#undef EXPLICIT_64BIT +#endif
#ifdef NTOS_MODE_USER
Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev=... ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Thu Mar 25 13:22:59 2010 @@ -25,6 +25,7 @@ #include <umtypes.h> #include <ntnls.h> #include <rtltypes.h> +#include <pstypes.h> #include <extypes.h> #include "in6addr.h" #include "inaddr.h"
Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev=... ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Thu Mar 25 13:22:59 2010 @@ -23,7 +23,8 @@ // Dependencies // #include <umtypes.h> -#include <pstypes.h> +#include <mmtypes.h> +#include <ldrtypes.h>
// // Maximum Atom Length @@ -760,6 +761,7 @@ } RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED, *PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED;
+#if (NTDDI_VERSION >= NTDDI_WS03) typedef struct _ACTIVATION_CONTEXT_STACK { PRTL_ACTIVATION_CONTEXT_STACK_FRAME ActiveFrame; @@ -769,6 +771,15 @@ ULONG StackId; } ACTIVATION_CONTEXT_STACK, *PACTIVATION_CONTEXT_STACK; +#else +typedef struct _ACTIVATION_CONTEXT_STACK +{ + ULONG Flags; + ULONG NextCookieSequenceNumber; + PVOID ActiveFrame; + LIST_ENTRY FrameListCache; +} ACTIVATION_CONTEXT_STACK, *PACTIVATION_CONTEXT_STACK; +#endif
#endif
Modified: trunk/reactos/include/ndk/umtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/umtypes.h?rev=4... ============================================================================== --- trunk/reactos/include/ndk/umtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/umtypes.h [iso-8859-1] Thu Mar 25 13:22:59 2010 @@ -151,6 +151,8 @@ CONST CHAR *Buffer; } CSTRING, *PCSTRING;
+#endif + typedef struct _STRING32 { USHORT Length; USHORT MaximumLength; @@ -167,7 +169,6 @@ UNICODE_STRING64, *PUNICODE_STRING64, ANSI_STRING64, *PANSI_STRING64;
-#endif
typedef struct _OBJECT_ATTRIBUTES {
Propchange: trunk/reactos/lib/sdk/crt/time/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 13:22:59 2010 @@ -1,4 +1,4 @@ /branches/header-work/lib/sdk/crt/time:45691-46153 -/branches/ros-amd64-bringup/reactos/lib/sdk/crt/time:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39335,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772,46394 +/branches/ros-amd64-bringup/reactos/lib/sdk/crt/time:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39335,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,46394 /branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new:42414 /trunk/reactos/lib/sdk/crt/time_new:39350-42241
Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkutil.c?re... ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkutil.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkutil.c [iso-8859-1] Thu Mar 25 13:22:59 2010 @@ -243,10 +243,10 @@ wcsncpy(Teb->StaticUnicodeBuffer, L"ntdll.dll", sizeof(Teb->StaticUnicodeBuffer) / sizeof(WCHAR)); - Teb->Tib.ArbitraryUserPointer = Teb->StaticUnicodeBuffer; + Teb->NtTib.ArbitraryUserPointer = Teb->StaticUnicodeBuffer;
/* Return it in the debug event as well */ - LoadDll->NamePointer = &Teb->Tib.ArbitraryUserPointer; + LoadDll->NamePointer = &Teb->NtTib.ArbitraryUserPointer; }
/* Get a handle */
Propchange: trunk/reactos/ntoskrnl/kdbg/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 13:22:59 2010 @@ -1,2 +1,2 @@ /branches/header-work/ntoskrnl/kdbg:45691-46153 -/branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,34969,34986,35323-35324,35347-35348,35361,35436,35444,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,35968,35970-35971,36011-36013,36172,36332,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37433-37435,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38099-38100,38148-38151,38264-38265,38268,38355,39151,39160,39333,39335,39345,39522,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772,46394 +/branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,34969,34986,35323-35324,35347-35348,35361,35436,35444,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,35968,35970-35971,36011-36013,36172,36332,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37433-37435,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38099-38100,38148-38151,38264-38265,38268,38355,39151,39160,39333,39335,39345,39522,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,46394
Modified: trunk/reactos/ntoskrnl/ke/i386/usercall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall.c... ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/usercall.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/usercall.c [iso-8859-1] Thu Mar 25 13:22:59 2010 @@ -169,7 +169,7 @@
/* Save the exception list */ Teb = KeGetCurrentThread()->Teb; - ExceptionList = Teb->Tib.ExceptionList; + ExceptionList = Teb->NtTib.ExceptionList;
/* Jump to user mode */ *UserEsp = NewStack; @@ -177,7 +177,7 @@ if (CallbackStatus != STATUS_CALLBACK_POP_STACK) { /* Only restore the exception list if we didn't crash in ring 3 */ - Teb->Tib.ExceptionList = ExceptionList; + Teb->NtTib.ExceptionList = ExceptionList; CallbackStatus = STATUS_SUCCESS; } else
Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c?... ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Thu Mar 25 13:22:59 2010 @@ -517,9 +517,9 @@ // // Write subsystem data // - Peb->ImageSubSystem = NtHeaders->OptionalHeader.Subsystem; - Peb->ImageSubSystemMajorVersion = NtHeaders->OptionalHeader.MajorSubsystemVersion; - Peb->ImageSubSystemMinorVersion = NtHeaders->OptionalHeader.MinorSubsystemVersion; + Peb->ImageSubsystem = NtHeaders->OptionalHeader.Subsystem; + Peb->ImageSubsystemMajorVersion = NtHeaders->OptionalHeader.MajorSubsystemVersion; + Peb->ImageSubsystemMinorVersion = NtHeaders->OptionalHeader.MinorSubsystemVersion;
// // Check for version data @@ -635,13 +635,13 @@ // // Set TIB Data // - Teb->Tib.ExceptionList = EXCEPTION_CHAIN_END; - Teb->Tib.Self = (PNT_TIB)Teb; + Teb->NtTib.ExceptionList = EXCEPTION_CHAIN_END; + Teb->NtTib.Self = (PNT_TIB)Teb;
// // Identify this as an OS/2 V3.0 ("Cruiser") TIB // - Teb->Tib.Version = 30 << 8; + Teb->NtTib.Version = 30 << 8;
// // Set TEB Data @@ -660,8 +660,8 @@ // // Use initial TEB values // - Teb->Tib.StackBase = InitialTeb->StackBase; - Teb->Tib.StackLimit = InitialTeb->StackLimit; + Teb->NtTib.StackBase = InitialTeb->StackBase; + Teb->NtTib.StackLimit = InitialTeb->StackLimit; Teb->DeallocationStack = InitialTeb->AllocatedStackBase; } else @@ -669,8 +669,8 @@ // // Use grandparent TEB values // - Teb->Tib.StackBase = InitialTeb->PreviousStackBase; - Teb->Tib.StackLimit = InitialTeb->PreviousStackLimit; + Teb->NtTib.StackBase = InitialTeb->PreviousStackBase; + Teb->NtTib.StackLimit = InitialTeb->PreviousStackLimit; }
//
Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev=... ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Thu Mar 25 13:22:59 2010 @@ -340,8 +340,8 @@ }
/* Get the stack limits */ - StackBegin = (ULONG_PTR)Teb->Tib.StackLimit; - StackEnd = (ULONG_PTR)Teb->Tib.StackBase; + StackBegin = (ULONG_PTR)Teb->NtTib.StackLimit; + StackEnd = (ULONG_PTR)Teb->NtTib.StackBase; #ifdef _M_IX86 Stack = TrapFrame->Ebp; #elif defined(_M_PPC)
Propchange: trunk/reactos/subsystems/win32/win32k/include/engobjects.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 13:22:59 2010 @@ -1,2 +1,2 @@ /branches/header-work/subsystems/win32/win32k/include/engobjects.h:45691-46153 -/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39335,39639,40095,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772,46394 +/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39335,39639,40095,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,46394
Propchange: trunk/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 13:22:59 2010 @@ -1,2 +1,2 @@ /branches/header-work/tools/rsym/rsym.c:45691-46153 -/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37291,37302,37305,37320,37329,37462,37895,38092,38100,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39335,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772,46394 +/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37291,37302,37305,37320,37329,37462,37895,38092,38100,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39335,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,46394
Propchange: trunk/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 13:22:59 2010 @@ -1,2 +1,2 @@ /branches/header-work/tools/rsym/rsym.h:45691-46153 -/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37291,37302,37305,37320,37329,37462,37895,38092,38100,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39335,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772,46394 +/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37291,37302,37305,37320,37329,37462,37895,38092,38100,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39335,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,46394
Propchange: trunk/reactos/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 13:22:59 2010 @@ -1,2 +1,2 @@ /branches/header-work/tools/rsym/rsym.mak:45691-46153 -/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37291,37302,37305,37320,37329,37462,37895,38092,38100,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39335,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772,46394 +/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37291,37302,37305,37320,37329,37462,37895,38092,38100,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39335,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,46394
Propchange: trunk/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 13:22:59 2010 @@ -1,2 +1,2 @@ /branches/header-work/tools/rsym/rsym_common.c:45691-46153 -/branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37291,37302,37305,37320,37329,37462,37895,38092,38100,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39335,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772,46394 +/branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37291,37302,37305,37320,37329,37462,37895,38092,38100,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39335,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,46394
-
tkreuzer＠svn.reactos.org