[tkreuzer] 46418: Merge from amd64-branch: 36898 (sserapion) - Fix 64bit advapi32 build. 35655 (sserapion) Misc WIN64 fixes. Implement InitializeCriticalSectionEx 43836 (sserapion) Fix avicap32 build. 44510 (tkreuzer) [IPHLPAPI] Don't redefine _WIN32_WINNT to 0x500. When using the NDK we need at least 0x503 when compiling for 64 bit (XP64 is 502) 39335 (tkreuzer) [IPHLPAPI] Fix prototype of RtlAllocateHeap 38092 (sserapion) [RPCRT4] Fix 64bit-warnings. 44499 (sserapion) [SYSSETUP] Eliminate warn

Author: tkreuzer
Date: Thu Mar 25 02:06:20 2010
New Revision: 46418

URL: http://svn.reactos.org/svn/reactos?rev=46418&view=rev
Log:
Merge from amd64-branch:

36898 (sserapion)
- Fix 64bit advapi32 build.

35655 (sserapion)
Misc WIN64 fixes.
Implement InitializeCriticalSectionEx

43836 (sserapion)
Fix avicap32 build.

44510 (tkreuzer)
[IPHLPAPI]
Don't redefine _WIN32_WINNT to 0x500. When using the NDK we need at least 0x503 when
compiling for 64 bit (XP64 is 502)

39335 (tkreuzer)
[IPHLPAPI]
Fix prototype of RtlAllocateHeap

38092 (sserapion)
[RPCRT4]
Fix 64bit-warnings.

44499 (sserapion)
[SYSSETUP]
Eliminate warning.

38100 (sserapion)
[ADVAPI32]
ULONG -> ULONG_PTR

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/dll/win32/advapi32/reg/reg.c
    trunk/reactos/dll/win32/advapi32/sec/misc.c
    trunk/reactos/dll/win32/avicap32/avicap32.c
    trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h
    trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c
    trunk/reactos/dll/win32/kernel32/misc/dllmain.c
    trunk/reactos/dll/win32/kernel32/misc/toolhelp.c
    trunk/reactos/dll/win32/kernel32/synch/critical.c
    trunk/reactos/dll/win32/rpcrt4/rpc_transport.c
    trunk/reactos/dll/win32/shell32/autocomplete.c
    trunk/reactos/dll/win32/syssetup/install.c
    trunk/reactos/dll/win32/user32/include/dde_private.h
    trunk/reactos/dll/win32/user32/include/user32.h
    trunk/reactos/dll/win32/user32/windows/draw.c
    trunk/reactos/dll/win32/ws2_32/misc/stubs.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 02:06:20 2010
@@ -1,2 +1,3 @@
 /branches/header-work:45691-46153
-/branches/ros-amd64-bringup/reactos: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:36852
+/branches/ros-amd64-bringup/reactos:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,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,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,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44499,44510,44530,44540,44601

Propchange: trunk/reactos/dll/directx/d3d8/d3d8.spec
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 02:06:20 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,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36930,36936,36992,38148-38151,38264-38265,38268,38355,39333,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,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/d3d8/d3d8.spec:34780-34782,34908-34909,34965,35655,35683,35762,35777,35805,35827,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,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44499,44510,44530,44540,44601

Propchange: trunk/reactos/dll/directx/dsound_new/classfactory.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 02:06:20 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,34908-34909,34965,35683,35762,35777,35805,35827,36172,36502-36503,36505,36936,36992,38149-38150,38264,38355,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,43838-43840,43857,43860,43905,43907,43969,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/classfactory.c:34780-34782,34908-34909,34965,35655,35683,35762,35777,35805,35827,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,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44499,44510,44530,44540,44601

/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 02:06:20 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,34908-34909,34965,35683,35762,35777,35805,35827,36172,36502-36503,36505,36936,36992,38149-38150,38264,38355,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,43838-43840,43857,43860,43905,43907,43969,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.spec:34780-34782,34908-34909,34965,35655,35683,35762,35777,35805,35827,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,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44499,44510,44530,44540,44601

Propchange: trunk/reactos/dll/directx/dsound_new/regsvr.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 02:06:20 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,34908-34909,34965,35683,35762,35777,35805,35827,36172,36502-36503,36505,36936,36992,38149-38150,38264,38355,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,43838-43840,43857,43860,43905,43907,43969,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/regsvr.c:34780-34782,34908-34909,34965,35655,35683,35762,35777,35805,35827,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,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44499,44510,44530,44540,44601

Propchange: trunk/reactos/dll/shellext/devcpux/devcpux.spec
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 02:06:20 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,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39333,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,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/shellext/devcpux/devcpux.spec:34780-34782,34908-34909,34965,35655,35683,35762,35777,35805,35827,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,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44499,44510,44530,44540,44601

Propchange: trunk/reactos/dll/shellext/slayer/slayer.spec
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 02:06:20 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,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39333,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,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/shellext/slayer/slayer.spec:34780-34782,34908-34909,34965,35655,35683,35762,35777,35805,35827,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,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44499,44510,44530,44540,44601

Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Thu Mar 25 02:06:20 2010
@@ -42,9 +42,9 @@
         NtClose(Handle);                                                       \
     }
 #define IsPredefKey(HKey)                                                      \
-    (((ULONG)(HKey) & 0xF0000000) == 0x80000000)
+    (((ULONG_PTR)(HKey) & 0xF0000000) == 0x80000000)
 #define GetPredefKeyIndex(HKey)                                                \
-    ((ULONG)(HKey) & 0x0FFFFFFF)
+    ((ULONG_PTR)(HKey) & 0x0FFFFFFF)
 
 static NTSTATUS OpenClassesRootKey(PHANDLE KeyHandle);
 static NTSTATUS OpenLocalMachineKey (PHANDLE KeyHandle);

Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Thu Mar 25 02:06:20 2010
@@ -289,7 +289,7 @@
 {
     DWORD ErrorCode;
 
-    if (InterlockedCompareExchangePointer(&NtMarta,
+    if (InterlockedCompareExchangePointer((PVOID)&NtMarta,
                                           NULL,
                                           NULL) == NULL)
     {
@@ -300,7 +300,7 @@
         if (ErrorCode == ERROR_SUCCESS)
         {
             /* try change the NtMarta pointer */
-            if (InterlockedCompareExchangePointer(&NtMarta,
+            if (InterlockedCompareExchangePointer((PVOID)&NtMarta,
                                                   &NtMartaStatic,
                                                   NULL) != NULL)
             {
@@ -329,7 +329,7 @@
 VOID
 UnloadNtMarta(VOID)
 {
-    if (InterlockedExchangePointer(&NtMarta,
+    if (InterlockedExchangePointer((PVOID)&NtMarta,
                                    NULL) != NULL)
     {
         FreeLibrary(NtMartaStatic.hDllInstance);

Modified: trunk/reactos/dll/win32/avicap32/avicap32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avicap32/avicap3…
==============================================================================
--- trunk/reactos/dll/win32/avicap32/avicap32.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avicap32/avicap32.c [iso-8859-1] Thu Mar 25 02:06:20 2010
@@ -86,7 +86,7 @@
                            nWidth,
                            nHeight,
                            hWnd,
-                           (HMENU)nID,
+                           ULongToHandle(nID),
                            hInstance,
                            NULL);
 }

Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap…
==============================================================================
--- trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] Thu Mar 25 02:06:20
2010
@@ -19,8 +19,6 @@
 # include <resolv.h>
 #endif
 
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x500
 #define WIN32_NO_STATUS
 #include <winsock2.h>
 #include <ws2tcpip.h>

Modified: trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/resinfo…
==============================================================================
--- trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] Thu Mar 25 02:06:20
2010
@@ -58,7 +58,7 @@
 RtlAllocateHeap (
 	HANDLE	Heap,
 	ULONG	Flags,
-	ULONG	Size
+	SIZE_T	Size
 	);
 
 NTSYSAPI

Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/dl…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] Thu Mar 25 02:06:20 2010
@@ -402,6 +402,12 @@
     return TRUE;
 }
 
+#undef InterlockedIncrement
+#undef InterlockedDecrement
+#undef InterlockedExchange
+#undef InterlockedExchangeAdd
+#undef InterlockedCompareExchange
+
 LONG
 WINAPI
 InterlockedIncrement(IN OUT LONG volatile *lpAddend)

Modified: trunk/reactos/dll/win32/kernel32/misc/toolhelp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/to…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/misc/toolhelp.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/misc/toolhelp.c [iso-8859-1] Thu Mar 25 02:06:20
2010
@@ -400,11 +400,11 @@
 
       ProcessListEntry->dwSize = sizeof(PROCESSENTRY32W);
       ProcessListEntry->cntUsage = 0; /* no longer used */
-      ProcessListEntry->th32ProcessID = (ULONG)ProcessInfo->UniqueProcessId;
+      ProcessListEntry->th32ProcessID = (ULONG_PTR)ProcessInfo->UniqueProcessId;
       ProcessListEntry->th32DefaultHeapID = 0; /* no longer used */
       ProcessListEntry->th32ModuleID = 0; /* no longer used */
       ProcessListEntry->cntThreads = ProcessInfo->NumberOfThreads;
-      ProcessListEntry->th32ParentProcessID =
(ULONG)ProcessInfo->InheritedFromUniqueProcessId;
+      ProcessListEntry->th32ParentProcessID =
(ULONG_PTR)ProcessInfo->InheritedFromUniqueProcessId;
       ProcessListEntry->pcPriClassBase = ProcessInfo->BasePriority;
       ProcessListEntry->dwFlags = 0; /* no longer used */
       if(ProcessInfo->ImageName.Buffer != NULL)
@@ -447,8 +447,8 @@
       {
         ThreadListEntry->dwSize = sizeof(THREADENTRY32);
         ThreadListEntry->cntUsage = 0; /* no longer used */
-        ThreadListEntry->th32ThreadID = (ULONG)ThreadInfo->ClientId.UniqueThread;
-        ThreadListEntry->th32OwnerProcessID =
(ULONG)ThreadInfo->ClientId.UniqueProcess;
+        ThreadListEntry->th32ThreadID =
(ULONG_PTR)ThreadInfo->ClientId.UniqueThread;
+        ThreadListEntry->th32OwnerProcessID =
(ULONG_PTR)ThreadInfo->ClientId.UniqueProcess;
         ThreadListEntry->tpBasePri = ThreadInfo->BasePriority;
         ThreadListEntry->tpDeltaPri = 0; /* no longer used */
         ThreadListEntry->dwFlags = 0; /* no longer used */

Modified: trunk/reactos/dll/win32/kernel32/synch/critical.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/c…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/synch/critical.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/synch/critical.c [iso-8859-1] Thu Mar 25 02:06:20
2010
@@ -55,4 +55,30 @@
     return TRUE;
 }
 
+/*
+ * @implemented
+ */
+BOOL WINAPI InitializeCriticalSectionEx(OUT LPCRITICAL_SECTION lpCriticalSection,
+                                       IN DWORD dwSpinCount,
+                                       IN DWORD flags )
+{
+    NTSTATUS Status;
+
+    /* FIXME: Flags ignored */
+
+    /* Initialize the critical section */
+    Status = RtlInitializeCriticalSectionAndSpinCount(
+        (PRTL_CRITICAL_SECTION)lpCriticalSection,
+        dwSpinCount);
+    if (!NT_SUCCESS(Status))
+    {
+        /* Set failure code */
+        SetLastErrorByStatus(Status);
+        return FALSE;
+    }
+
+    /* Success */
+    return TRUE;
+}
+
 /* EOF */

Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans…
==============================================================================
--- trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] Thu Mar 25 02:06:20 2010
@@ -762,7 +762,7 @@
 {
   RpcConnection common;
   int sock;
-  int cancel_fds[2];
+  SOCKET cancel_fds[2];
 } RpcConnection_tcp;
 
 static RpcConnection *rpcrt4_conn_tcp_alloc(void)
@@ -814,7 +814,7 @@
 
   for (ai_cur = ai; ai_cur; ai_cur = ai_cur->ai_next)
   {
-    int val;
+    char val;
 
     if (TRACE_ON(rpc))
     {
@@ -1091,7 +1091,7 @@
 static void rpcrt4_conn_tcp_cancel_call(RpcConnection *Connection)
 {
     RpcConnection_tcp *tcpc = (RpcConnection_tcp *) Connection;
-    char dummy = 1;
+    SOCKET dummy = 1;
 
     TRACE("%p\n", Connection);
 
@@ -1271,7 +1271,7 @@
     RpcServerProtseq_sock *ps = HeapAlloc(GetProcessHeap(), 0, sizeof(*ps));
     if (ps)
     {
-        int fds[2];
+        SOCKET fds[2];
         if (!socketpair(PF_UNIX, SOCK_DGRAM, 0, fds))
         {
             fcntl(fds[0], F_SETFL, O_NONBLOCK);

Modified: trunk/reactos/dll/win32/shell32/autocomplete.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/autocomp…
==============================================================================
--- trunk/reactos/dll/win32/shell32/autocomplete.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/autocomplete.c [iso-8859-1] Thu Mar 25 02:06:20 2010
@@ -214,7 +214,7 @@
     static const WCHAR lbName[] =
{'L','i','s','t','B','o','x',0};
 
     TRACE("(%p)->(0x%08lx, %p, %s, %s)\n",
-	  This, (long)hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath),
debugstr_w(pwszQuickComplete));
+	  This, hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete));
 
     if (This->options & ACO_AUTOSUGGEST) TRACE(" ACO_AUTOSUGGEST\n");
     if (This->options & ACO_AUTOAPPEND) TRACE(" ACO_AUTOAPPEND\n");

Modified: trunk/reactos/dll/win32/syssetup/install.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Thu Mar 25 02:06:20 2010
@@ -511,7 +511,7 @@
 }
 
 
-static BOOL CALLBACK
+static INT_PTR CALLBACK
 StatusMessageWindowProc(
     IN HWND hwndDlg,
     IN UINT uMsg,

Modified: trunk/reactos/dll/win32/user32/include/dde_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/include/dde_private.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/include/dde_private.h [iso-8859-1] Thu Mar 25 02:06:20
2010
@@ -208,7 +208,7 @@
 extern	WDML_CONV*	WDML_FindConv(WDML_INSTANCE* pInstance, WDML_SIDE side,
 				      HSZ hszService, HSZ hszTopic);
 extern  BOOL		WDML_PostAck(WDML_CONV* pConv, WDML_SIDE side, WORD appRetCode,
-				     BOOL fBusy, BOOL fAck, UINT pmt, LPARAM lParam, UINT oldMsg);
+				     BOOL fBusy, BOOL fAck, UINT_PTR pmt, LPARAM lParam, UINT oldMsg);
 extern	void		WDML_AddLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side,
 				     UINT wType, HSZ hszItem, UINT wFmt);
 extern	WDML_LINK*	WDML_FindLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side,

Modified: trunk/reactos/dll/win32/user32/include/user32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u…
==============================================================================
--- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Thu Mar 25 02:06:20 2010
@@ -153,7 +153,7 @@
         /* NOTE: This is slow as it requires a call to win32k. This should only be
                  neccessary if a thread wants to access an object on a different
                  desktop */
-        return NtUserGetDesktopMapping(Ptr);
+        return (PVOID)NtUserGetDesktopMapping(Ptr);
     }
 }
 

Modified: trunk/reactos/dll/win32/user32/windows/draw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Thu Mar 25 02:06:20 2010
@@ -1574,7 +1574,7 @@
 
     if (hbr <= (HBRUSH)(COLOR_MENUBAR + 1))
     {
-        hbr = GetSysColorBrush((int)hbr - 1);
+        hbr = GetSysColorBrush(PtrToUlong(hbr) - 1);
     }
     if ((prevhbr = SelectObject(hDC, hbr)) == NULL)
     {

Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/stub…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Thu Mar 25 02:06:20 2010
@@ -30,7 +30,7 @@
         return SOCKET_ERROR;
     }
 
-    if (!ReferenceProviderByHandle((HANDLE)s, &Provider))
+    if (!ReferenceProviderByHandle((HANDLE)(ULONG_PTR)(s), &Provider))
     {
         WSASetLastError(WSAENOTSOCK);
         return SOCKET_ERROR;

Propchange: trunk/reactos/include/ndk/amd64/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 02:06:20 2010
@@ -1,2 +1,2 @@
 /branches/header-work/include/ndk/amd64:45691-46153
-/branches/ros-amd64-bringup/reactos/include/ndk/amd64:34780-34782,34908-34909,34925,34965,34967,34970,35323-35324,35347-35348,35361,35436,35509,35588,35683,35739,35762,35777,35805,35823,35827,35952,35966,36172,36360,36445,36502-36503,36505,36899,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37990,38013-38014,38149-38150,38264,38355,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,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338,44389,44391,44426,44460,44491,44500,44530,44540,44601,44623,44631
+/branches/ros-amd64-bringup/reactos/include/ndk/amd64:34780-34782,34908-34909,34925,34965,34967,34970,35323-35324,35347-35348,35361,35436,35509,35588,35655,35683,35739,35762,35777,35805,35823,35827,35952,35966,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,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

Propchange: trunk/reactos/include/ndk/amd64/asmmacro.S
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 02:06:20 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,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37475,37536,37820-37821,37868-37869,37990,38013-38014,38149-38150,38264,38355,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,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338,44389,44391,44426,44460,44491,44500,44530,44540,44601,44623,44631
+/branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S:34780-34782,34908-34909,34965,35655,35683,35762,35777,35805,35827,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,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

Propchange: trunk/reactos/lib/sdk/crt/time/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 02:06:20 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,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,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,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/lib/sdk/crt/time:34780-34782,34908-34909,34965,35655,35683,35762,35777,35805,35827,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,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44499,44510,44530,44540,44601
 /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 02:06:20 2010
@@ -1,2 +1,2 @@
 /branches/header-work/ntoskrnl/kdbg:45691-46153
-/branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,34969,34986,35323-35324,35347-35348,35361,35436,35444,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,35968,35970-35971,36013,36172,36332,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37433-37435,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38099,38148-38151,38264-38265,38268,38355,39151,39160,39333,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,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/ntoskrnl/kdbg:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,34969,34986,35323-35324,35347-35348,35361,35436,35444,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,35968,35970-35971,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,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44499,44510,44530,44540,44601

Propchange: trunk/reactos/subsystems/win32/win32k/include/engobjects.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 02:06:20 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,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,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,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/subsystems/win32/win32k/include/engobjects.h:34780-34782,34908-34909,34965,35655,35683,35762,35777,35805,35827,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,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44499,44510,44530,44540,44601

Propchange: trunk/reactos/tools/rsym/rsym.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 02:06:20 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,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,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,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/tools/rsym/rsym.c:34780-34782,34908-34909,34965,35655,35683,35762,35777,35805,35827,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,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44499,44510,44530,44540,44601

Propchange: trunk/reactos/tools/rsym/rsym.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 02:06:20 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,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,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,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/tools/rsym/rsym.h:34780-34782,34908-34909,34965,35655,35683,35762,35777,35805,35827,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,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44499,44510,44530,44540,44601

Propchange: trunk/reactos/tools/rsym/rsym.mak
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 02:06:20 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,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,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,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/tools/rsym/rsym.mak:34780-34782,34908-34909,34965,35655,35683,35762,35777,35805,35827,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,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44499,44510,44530,44540,44601

Propchange: trunk/reactos/tools/rsym/rsym_common.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 02:06:20 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,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,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,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/tools/rsym/rsym_common.c:34780-34782,34908-34909,34965,35655,35683,35762,35777,35805,35827,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,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44499,44510,44530,44540,44601