25 Mar
2010
25 Mar
'10
3:50 a.m.
Author: tkreuzer
Date: Thu Mar 25 04:50:46 2010
New Revision: 46424
URL: http://svn.reactos.org/svn/reactos?rev=46424&view=rev
Log:
Merge from amd64-branch:
36380 (tkreuzer)
[SCSIPORT]
Implement some functions that are forwarded to HAL on x86 build, but not on x64. Modify
spec file (use preprocessor macro).
36397 (tkreuzer)
[SCSIPORT]
rename .spec to .pspec
36949 (sginsberg)
- Fix NTFS FSD compilation
36951 (sginsgerb)
[NE2000]
- Fix ne2000 compilation (treat pointer size as ULONG_PTR, correct function prototypes)
36958 (sginsberg)
[ISAPNP]
- Fix isapnp compilation for 64-bit
36961 (sginsberg)
[SERIAL]
- Make serial build for 64 bit -- explicitly cast first parameter to
InterlockedCompareExchangePointer
to PVOID
36964 (sginsberg)
- Fix DXG 64-bit compilation
36972 (sserapion)
[VGA]
- When doing pointer arithmetic, ULONG_PTR is your friend
37234 (tkreuzer)
[SCSIPORT]
Fix scsiport, by using pspec again.
40927 (tkreuzer)
[BMFD]
HGLYPH is an ULONG. Use offset to glyph entry as HGLYPH instead of the pointer to fix
64bit build.
41070 (tkreuzer)
[TCPIP]
fix a pointer to ULONG cast
41500 (tkreuzer)
[NDIS]
Pass ULONG* to MiniQueryInformation for the number of written bytes instead of ULONG_PTR*
41502 (tkreuzer)
[WDMAUD]
Make DeviceIndex a ULONG_PTR
44339 (sserapion)
[NDIS]
Fix ndis build.
Added:
trunk/reactos/drivers/storage/scsiport/scsiport.pspec
- copied unchanged from r36397,
branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.pspec
trunk/reactos/drivers/storage/scsiport/stubs.c
- copied unchanged from r36380,
branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/stubs.c
Removed:
trunk/reactos/drivers/storage/scsiport/scsiport.spec
Modified:
trunk/reactos/ (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/regsvr.c (props changed)
trunk/reactos/dll/shellext/devcpux/devcpux.spec (props changed)
trunk/reactos/dll/shellext/slayer/slayer.spec (props changed)
trunk/reactos/drivers/bus/isapnp/isapnp.c
trunk/reactos/drivers/directx/dxg/ddhmg.c
trunk/reactos/drivers/filesystems/ntfs/attrib.c
trunk/reactos/drivers/network/dd/ne2000/include/ne2000.h
trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c
trunk/reactos/drivers/serial/serial/devctrl.c
trunk/reactos/drivers/storage/scsiport/scsiport.rbuild
trunk/reactos/drivers/video/displays/vga/main/enable.c
trunk/reactos/include/ndk/amd64/ (props changed)
trunk/reactos/include/ndk/amd64/asmmacro.S (props changed)
trunk/reactos/lib/sdk/crt/time/ (props changed)
trunk/reactos/ntoskrnl/kdbg/ (props changed)
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 04:50:46 2010
@@ -1,3 +1,3 @@
/branches/header-work:45691-46153
/branches/ros-amd64-bringup:36852
-/branches/ros-amd64-bringup/reactos:34711-34712,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,36388-36389,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,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,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,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
+/branches/ros-amd64-bringup/reactos:34711-34712,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,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,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,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
Propchange: trunk/reactos/dll/directx/d3d8/d3d8.spec
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 04:50:46 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:34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36445,36502-36503,36505,36898-36899,36930,36936,36992,38092,38100,38148-38151,38264-38265,38268,38355,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
+/branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec: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,36972,36992,38092,38100,38148-38151,38264-38265,38268,38355,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
Propchange: trunk/reactos/dll/directx/dsound_new/classfactory.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 04:50:46 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:34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36502-36503,36505,36898,36936,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
+/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/classfactory.c: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,36972,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
/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 04:50:46 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:34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36502-36503,36505,36898,36936,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
+/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound.spec: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,36972,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
Propchange: trunk/reactos/dll/directx/dsound_new/regsvr.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 04:50:46 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:34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36502-36503,36505,36898,36936,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
+/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/regsvr.c: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,36972,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
Propchange: trunk/reactos/dll/shellext/devcpux/devcpux.spec
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 04:50:46 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:34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36445,36502-36503,36505,36898-36899,36936,36992,38092,38100,38149-38150,38264,38268,38355,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
+/branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec: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,36972,36992,38092,38100,38149-38150,38264,38268,38355,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
Propchange: trunk/reactos/dll/shellext/slayer/slayer.spec
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 04:50:46 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:34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36445,36502-36503,36505,36898-36899,36936,36992,38092,38100,38149-38150,38264,38268,38355,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
+/branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec: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,36972,36992,38092,38100,38149-38150,38264,38268,38355,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/isapnp.…
==============================================================================
--- trunk/reactos/drivers/bus/isapnp/isapnp.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/isapnp/isapnp.c [iso-8859-1] Thu Mar 25 04:50:46 2010
@@ -153,7 +153,7 @@
}
#endif
-static __inline VOID SetReadDataPort(ULONG Port)
+static __inline VOID SetReadDataPort(ULONG_PTR Port)
{
IsaPnPReadPort = (PUCHAR)Port;
WriteUchar(0x00, (UCHAR) (Port >> 2));
@@ -214,13 +214,13 @@
#define READ_DATA_PORT_STEP 32 /* Minimum is 4 */
-static ULONG FindNextReadPort(VOID)
-{
- ULONG Port;
-
-
-
- Port = (ULONG)IsaPnPReadPort;
+static ULONG_PTR FindNextReadPort(VOID)
+{
+ ULONG_PTR Port;
+
+
+
+ Port = (ULONG_PTR)IsaPnPReadPort;
while (TRUE) {
@@ -260,7 +260,7 @@
static BOOLEAN IsolateReadDataPortSelect(VOID)
{
- ULONG Port;
+ ULONG_PTR Port;
SendWait();
SendKey();
@@ -333,7 +333,7 @@
KeStallExecutionProcessor(250);
iteration++;
SendWake(0x00);
- SetReadDataPort((ULONG)IsaPnPReadPort);
+ SetReadDataPort((ULONG_PTR)IsaPnPReadPort);
KeStallExecutionProcessor(1000);
WriteAddress(0x01);
KeStallExecutionProcessor(1000);
@@ -1304,7 +1304,7 @@
do {
Status = BuildResourceList(LogicalDevice, p, Priority);
if (NT_SUCCESS(Status)) {
- p = (PIO_RESOURCE_LIST)((ULONG)p + SingleListSize);
+ p = (PIO_RESOURCE_LIST)((ULONG_PTR)p + SingleListSize);
Priority++;
}
} while (Status != STATUS_NOT_FOUND);
@@ -1476,7 +1476,7 @@
CurrentEntry = CurrentEntry->Flink;
}
- Irp->IoStatus.Information = (ULONG)Relations;
+ Irp->IoStatus.Information = (ULONG_PTR)Relations;
return Status;
}
Modified: trunk/reactos/drivers/directx/dxg/ddhmg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/ddhmg.…
==============================================================================
--- trunk/reactos/drivers/directx/dxg/ddhmg.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/directx/dxg/ddhmg.c [iso-8859-1] Thu Mar 25 04:50:46 2010
@@ -24,7 +24,7 @@
FASTCALL
VerifyObjectOwner(PDD_ENTRY pEntry)
{
- DWORD Pid = (DWORD) PsGetCurrentProcessId() & 0xFFFFFFFC;
+ DWORD Pid = (DWORD)(DWORD_PTR)PsGetCurrentProcessId() & 0xFFFFFFFC;
DWORD check = pEntry->ObjectOwner.ulObj & 0xFFFFFFFE;
return ( (check == Pid) || (!check));
}
@@ -145,7 +145,7 @@
DdHmgLock(HANDLE DdHandle, UCHAR ObjectType, BOOLEAN LockOwned)
{
- DWORD Index = (DWORD)DdHandle & 0x1FFFFF;
+ DWORD Index = (DWORD)(DWORD_PTR)DdHandle & 0x1FFFFF;
PDD_ENTRY pEntry = NULL;
PVOID Object = NULL;
Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/a…
==============================================================================
--- trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Thu Mar 25 04:50:46 2010
@@ -88,7 +88,7 @@
*lcn = 0;
- for (run = (PUCHAR)((ULONG)NresAttr + NresAttr->RunArrayOffset);
+ for (run = (PUCHAR)((ULONG_PTR)NresAttr + NresAttr->RunArrayOffset);
*run != 0; run += RunLength(run))
{
*lcn += RunLCN(run);
@@ -248,7 +248,7 @@
{
Name.Length = Attribute->NameLength * sizeof(WCHAR);
Name.MaximumLength = Name.Length;
- Name.Buffer = (PWCHAR)((ULONG)Attribute + Attribute->NameOffset);
+ Name.Buffer = (PWCHAR)((ULONG_PTR)Attribute + Attribute->NameOffset);
DbgPrint("'%wZ' ", &Name);
}
Modified: trunk/reactos/drivers/network/dd/ne2000/include/ne2000.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/…
==============================================================================
--- trunk/reactos/drivers/network/dd/ne2000/include/ne2000.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/dd/ne2000/include/ne2000.h [iso-8859-1] Thu Mar 25
04:50:46 2010
@@ -80,7 +80,7 @@
NDIS_MINIPORT_INTERRUPT Interrupt;
/* I/O base address and interrupt number of adapter */
- ULONG IoBaseAddress;
+ ULONG_PTR IoBaseAddress;
ULONG InterruptLevel;
ULONG InterruptVector;
BOOLEAN InterruptShared;
@@ -222,24 +222,24 @@
VOID NICReadDataAlign(
PNIC_ADAPTER Adapter,
PUSHORT Target,
- ULONG Source,
+ ULONG_PTR Source,
USHORT Length);
VOID NICWriteDataAlign(
PNIC_ADAPTER Adapter,
- ULONG Target,
+ ULONG_PTR Target,
PUSHORT Source,
USHORT Length);
VOID NICReadData(
PNIC_ADAPTER Adapter,
PUCHAR Target,
- ULONG Source,
+ ULONG_PTR Source,
USHORT Length);
VOID NICWriteData(
PNIC_ADAPTER Adapter,
- ULONG Target,
+ ULONG_PTR Target,
PUCHAR Source,
USHORT Length);
Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/…
==============================================================================
--- trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] Thu Mar 25 04:50:46
2010
@@ -11,10 +11,10 @@
#include <debug.h>
/* Null-terminated array of ports to probe. This is "semi-risky" (Don Becker).
*/
-ULONG ProbeAddressList[] = { 0x280, 0x300, 0x320, 0x340, 0x360, 0x380, 0 };
+ULONG_PTR ProbeAddressList[] = { 0x280, 0x300, 0x320, 0x340, 0x360, 0x380, 0 };
static BOOLEAN ProbeAddressForNIC(
- ULONG address)
+ ULONG_PTR address)
/*
* FUNCTION: Probes an address for a NIC
* ARGUMENTS:
@@ -129,7 +129,7 @@
* Start at 1KB and test for every 1KB up to 64KB
*/
{
- ULONG Base;
+ ULONG_PTR Base;
NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
Modified: trunk/reactos/drivers/serial/serial/devctrl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/devc…
==============================================================================
--- trunk/reactos/drivers/serial/serial/devctrl.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/serial/serial/devctrl.c [iso-8859-1] Thu Mar 25 04:50:46 2010
@@ -802,7 +802,7 @@
* as pending, it might be possible to complete the
* Irp before pending it, leading to a crash! */
WaitingIrp = InterlockedCompareExchangePointer(
- &DeviceExtension->WaitOnMaskIrp,
+ (PVOID)&DeviceExtension->WaitOnMaskIrp,
Irp,
NULL);
Modified: trunk/reactos/drivers/storage/scsiport/scsiport.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s…
==============================================================================
--- trunk/reactos/drivers/storage/scsiport/scsiport.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/scsiport/scsiport.rbuild [iso-8859-1] Thu Mar 25
04:50:46 2010
@@ -3,10 +3,11 @@
<module name="scsiport" type="kernelmodedriver"
installbase="system32/drivers" installname="scsiport.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<define name="_SCSIPORT_" />
- <importlibrary definition="scsiport.spec" />
+ <importlibrary definition="scsiport.pspec" />
<include base="scsiport">.</include>
<library>ntoskrnl</library>
<library>hal</library>
<file>scsiport.c</file>
+ <file>stubs.c</file>
<file>scsiport.rc</file>
</module>
Removed: trunk/reactos/drivers/storage/scsiport/scsiport.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s…
==============================================================================
--- trunk/reactos/drivers/storage/scsiport/scsiport.spec [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/scsiport/scsiport.spec (removed)
@@ -1,45 +1,0 @@
-@ cdecl ScsiDebugPrint()
-@ stdcall ScsiPortCompleteRequest(ptr long long long long)
-@ stdcall ScsiPortConvertPhysicalAddressToUlong(long long)
-@ stdcall ScsiPortConvertUlongToPhysicalAddress(long)
NTOSKRNL.RtlConvertUlongToLargeInteger
-@ stdcall ScsiPortFlushDma(ptr)
-@ stdcall ScsiPortFreeDeviceBase(ptr ptr)
-@ stdcall ScsiPortGetBusData(ptr long long long ptr long)
-@ stdcall ScsiPortGetDeviceBase(ptr long long long long long long)
-@ stdcall ScsiPortGetLogicalUnit(ptr long long long)
-@ stdcall ScsiPortGetPhysicalAddress(ptr ptr ptr long)
-@ stdcall ScsiPortGetSrb(ptr long long long long)
-@ stdcall ScsiPortGetUncachedExtension(ptr ptr long)
-@ stdcall ScsiPortGetVirtualAddress(ptr long long)
-@ stdcall ScsiPortInitialize(ptr ptr ptr ptr)
-@ stdcall ScsiPortIoMapTransfer(ptr ptr long long)
-@ stdcall ScsiPortLogError(ptr ptr long long long long long)
-@ stdcall ScsiPortMoveMemory(ptr ptr long)
-@ cdecl ScsiPortNotification()
-@ stdcall ScsiPortReadPortBufferUchar(ptr ptr long) HAL.READ_PORT_BUFFER_UCHAR
-@ stdcall ScsiPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT
-@ stdcall ScsiPortReadPortBufferUlong(ptr ptr long) HAL.READ_PORT_BUFFER_ULONG
-@ stdcall ScsiPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR
-@ stdcall ScsiPortReadPortUshort(ptr) HAL.READ_PORT_USHORT
-@ stdcall ScsiPortReadPortUlong(ptr) HAL.READ_PORT_ULONG
-@ stdcall ScsiPortReadRegisterBufferUchar(ptr ptr long)
NTOSKRNL.READ_REGISTER_BUFFER_UCHAR
-@ stdcall ScsiPortReadRegisterBufferUshort(ptr ptr long)
NTOSKRNL.READ_REGISTER_BUFFER_USHORT
-@ stdcall ScsiPortReadRegisterBufferUlong(ptr ptr long)
NTOSKRNL.READ_REGISTER_BUFFER_ULONG
-@ stdcall ScsiPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR
-@ stdcall ScsiPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT
-@ stdcall ScsiPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG
-@ stdcall ScsiPortSetBusDataByOffset(ptr long long long ptr long long)
-@ stdcall ScsiPortStallExecution(long) HAL.KeStallExecutionProcessor
-@ stdcall ScsiPortValidateRange(ptr long long long long long long)
-@ stdcall ScsiPortWritePortBufferUchar(ptr ptr long) HAL.WRITE_PORT_BUFFER_UCHAR
-@ stdcall ScsiPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT
-@ stdcall ScsiPortWritePortBufferUlong(ptr ptr long) HAL.WRITE_PORT_BUFFER_ULONG
-@ stdcall ScsiPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR
-@ stdcall ScsiPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT
-@ stdcall ScsiPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG
-@ stdcall ScsiPortWriteRegisterBufferUchar(ptr ptr long)
NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR
-@ stdcall ScsiPortWriteRegisterBufferUshort(ptr ptr long)
NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT
-@ stdcall ScsiPortWriteRegisterBufferUlong(ptr ptr long)
NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG
-@ stdcall ScsiPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR
-@ stdcall ScsiPortWriteRegisterUshort(ptr long) NTOSKRNL.WRITE_REGISTER_USHORT
-@ stdcall ScsiPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG
Modified: trunk/reactos/drivers/video/displays/vga/main/enable.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga…
==============================================================================
--- trunk/reactos/drivers/video/displays/vga/main/enable.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/displays/vga/main/enable.c [iso-8859-1] Thu Mar 25
04:50:46 2010
@@ -574,7 +574,7 @@
/* next DEVMODE entry */
OutputModes--;
- DM = (PDEVMODEW) ( ((ULONG)DM) + sizeof(DEVMODEW) + DRIVER_EXTRA_SIZE);
+ DM = (PDEVMODEW) ( ((ULONG_PTR)DM) + sizeof(DEVMODEW) +
DRIVER_EXTRA_SIZE);
OutputSize += (sizeof(DEVMODEW) + DRIVER_EXTRA_SIZE);
}
Propchange: trunk/reactos/include/ndk/amd64/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 04:50:46 2010
@@ -1,2 +1,2 @@
/branches/header-work/include/ndk/amd64:45691-46153
-/branches/ros-amd64-bringup/reactos/include/ndk/amd64: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,36445,36502-36503,36505,36898-36899,36936,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,40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41071,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44491,44499-44500,44510,44530,44540,44601,44623,44631,44772
+/branches/ros-amd64-bringup/reactos/include/ndk/amd64: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,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,40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41071,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44491,44499-44500,44510,44530,44540,44601,44623,44631,44772
Propchange: trunk/reactos/include/ndk/amd64/asmmacro.S
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 04:50:46 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:34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36445,36502-36503,36505,36898-36899,36936,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,40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41071,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44491,44499-44500,44510,44530,44540,44601,44623,44631,44772
+/branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S: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,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,40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41071,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44491,44499-44500,44510,44530,44540,44601,44623,44631,44772
Propchange: trunk/reactos/lib/sdk/crt/time/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 04:50:46 2010
@@ -1,4 +1,4 @@
/branches/header-work/lib/sdk/crt/time:45691-46153
-/branches/ros-amd64-bringup/reactos/lib/sdk/crt/time:34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36445,36502-36503,36505,36898-36899,36936,36992,38092,38100,38149-38150,38264,38268,38355,39335,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
+/branches/ros-amd64-bringup/reactos/lib/sdk/crt/time: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,36972,36992,38092,38100,38149-38150,38264,38268,38355,39335,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
/branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new:42414
/trunk/reactos/lib/sdk/crt/time_new:39350-42241
Propchange: trunk/reactos/ntoskrnl/kdbg/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 04:50:46 2010
@@ -1,2 +1,2 @@
/branches/header-work/ntoskrnl/kdbg:45691-46153
-/branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg:34711-34712,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,36388-36389,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,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,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,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
+/branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg:34711-34712,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,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,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,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
Propchange: trunk/reactos/subsystems/win32/win32k/include/engobjects.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 04:50:46 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:34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36445,36502-36503,36505,36898-36899,36936,36992,38092,38100,38149-38150,38264,38268,38355,39335,39639,40095,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
+/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h: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,36972,36992,38092,38100,38149-38150,38264,38268,38355,39335,39639,40095,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
Propchange: trunk/reactos/tools/rsym/rsym.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 04:50:46 2010
@@ -1,2 +1,2 @@
/branches/header-work/tools/rsym/rsym.c:45691-46153
-/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36445,36502-36503,36505,36898-36899,36936,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,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
+/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c: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,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,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
Propchange: trunk/reactos/tools/rsym/rsym.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 04:50:46 2010
@@ -1,2 +1,2 @@
/branches/header-work/tools/rsym/rsym.h:45691-46153
-/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36445,36502-36503,36505,36898-36899,36936,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,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
+/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h: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,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,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
Propchange: trunk/reactos/tools/rsym/rsym.mak
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 04:50:46 2010
@@ -1,2 +1,2 @@
/branches/header-work/tools/rsym/rsym.mak:45691-46153
-/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36445,36502-36503,36505,36898-36899,36936,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,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
+/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak: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,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,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
Propchange: trunk/reactos/tools/rsym/rsym_common.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 04:50:46 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:34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36445,36502-36503,36505,36898-36899,36936,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,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772
+/branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c: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,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,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,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,44389,44391,44426,44460,44499,44510,44530,44540,44601,44772