Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[jgardou] 48066: SVN wins again... What's that? Revert everything that's not related to 48064 of 48065.
by jgardou＠svn.reactos.org 15 Jul '10

15 Jul '10

Author: jgardou Date: Thu Jul 15 19:29:45 2010 New Revision: 48066 URL: http://svn.reactos.org/svn/reactos?rev=48066&view=rev Log: SVN wins again... What's that? Revert everything that's not related to 48064 of 48065. Modified: trunk/reactos/include/reactos/winsock/msafd.h (props changed) trunk/reactos/include/reactos/winsock/msafdlib.h (props changed) trunk/reactos/include/reactos/winsock/mswinsock.h (props changed) trunk/reactos/include/reactos/winsock/rnr20lib.h (props changed) trunk/reactos/include/reactos/winsock/wsmobile.h (props changed) trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Propchange: trunk/reactos/include/reactos/winsock/msafd.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 19:29:45 2010 @@ -1,3 +1,2 @@ -/branches/reactos-yarotows/include/reactos/winsock/msafd.h:48064 /branches/ros-amd64-bringup/reactos/include/reactos/winsock/msafd.h: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 /trunk/reactos/include/reactos/winsock/msafd.h:44354-45543 Propchange: trunk/reactos/include/reactos/winsock/msafdlib.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 19:29:45 2010 @@ -1,3 +1,2 @@ -/branches/reactos-yarotows/include/reactos/winsock/msafdlib.h:48064 /branches/ros-amd64-bringup/reactos/include/reactos/winsock/msafdlib.h: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 /trunk/reactos/include/reactos/winsock/msafdlib.h:44354-45543 Propchange: trunk/reactos/include/reactos/winsock/mswinsock.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 19:29:45 2010 @@ -1,3 +1,2 @@ -/branches/reactos-yarotows/include/reactos/winsock/mswinsock.h:48064 /branches/ros-amd64-bringup/reactos/include/reactos/winsock/mswinsock.h: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 /trunk/reactos/include/reactos/winsock/mswinsock.h:44354-45543 Propchange: trunk/reactos/include/reactos/winsock/rnr20lib.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 19:29:45 2010 @@ -1,3 +1,2 @@ -/branches/reactos-yarotows/include/reactos/winsock/rnr20lib.h:48064 /branches/ros-amd64-bringup/reactos/include/reactos/winsock/rnr20lib.h: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 /trunk/reactos/include/reactos/winsock/rnr20lib.h:44354-45543 Propchange: trunk/reactos/include/reactos/winsock/wsmobile.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 19:29:45 2010 @@ -1,3 +1,2 @@ -/branches/reactos-yarotows/include/reactos/winsock/wsmobile.h:48064 /branches/ros-amd64-bringup/reactos/include/reactos/winsock/wsmobile.h: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 /trunk/reactos/include/reactos/winsock/wsmobile.h:44354-45543 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Thu Jul 15 19:29:45 2010 @@ -1390,7 +1390,7 @@ IconSize.cy, SRCCOPY, 0, - bAlpha ? 0 : hdcMask, + hdcMask, 0, hdcImage ? 0 : IconSize.cy); }

1 0

[jgardou] 48065: Merge 48064 from yarotows This had nothing to do in yarotows in the first place
by jgardou＠svn.reactos.org 15 Jul '10

15 Jul '10

Author: jgardou Date: Thu Jul 15 19:19:48 2010 New Revision: 48065 URL: http://svn.reactos.org/svn/reactos?rev=48065&view=rev Log: Merge 48064 from yarotows This had nothing to do in yarotows in the first place Modified: trunk/reactos/ (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp trunk/reactos/include/reactos/winsock/msafd.h (props changed) trunk/reactos/include/reactos/winsock/msafdlib.h (props changed) trunk/reactos/include/reactos/winsock/mswinsock.h (props changed) trunk/reactos/include/reactos/winsock/rnr20lib.h (props changed) trunk/reactos/include/reactos/winsock/wsmobile.h (props changed) trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 19:19:48 2010 @@ -1,4 +1,4 @@ /branches/header-work:45691-47721 -/branches/reactos-yarotows:46372,46848,46966,47800,48026 +/branches/reactos-yarotows:46372,46848,46966,47800,48026,48064 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,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,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882 Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] Thu Jul 15 19:19:48 2010 @@ -354,7 +354,7 @@ STDMETHOD_(BOOLEAN, GetAcquiredTagRange)(THIS_ IN PVOID * FirstTag, - IN PVOID * LastTag); + IN PVOID * LastTag) PURE; }; Propchange: trunk/reactos/include/reactos/winsock/msafd.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 19:19:48 2010 @@ -1,2 +1,3 @@ +/branches/reactos-yarotows/include/reactos/winsock/msafd.h:48064 /branches/ros-amd64-bringup/reactos/include/reactos/winsock/msafd.h: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 /trunk/reactos/include/reactos/winsock/msafd.h:44354-45543 Propchange: trunk/reactos/include/reactos/winsock/msafdlib.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 19:19:48 2010 @@ -1,2 +1,3 @@ +/branches/reactos-yarotows/include/reactos/winsock/msafdlib.h:48064 /branches/ros-amd64-bringup/reactos/include/reactos/winsock/msafdlib.h: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 /trunk/reactos/include/reactos/winsock/msafdlib.h:44354-45543 Propchange: trunk/reactos/include/reactos/winsock/mswinsock.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 19:19:48 2010 @@ -1,2 +1,3 @@ +/branches/reactos-yarotows/include/reactos/winsock/mswinsock.h:48064 /branches/ros-amd64-bringup/reactos/include/reactos/winsock/mswinsock.h: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 /trunk/reactos/include/reactos/winsock/mswinsock.h:44354-45543 Propchange: trunk/reactos/include/reactos/winsock/rnr20lib.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 19:19:48 2010 @@ -1,2 +1,3 @@ +/branches/reactos-yarotows/include/reactos/winsock/rnr20lib.h:48064 /branches/ros-amd64-bringup/reactos/include/reactos/winsock/rnr20lib.h: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 /trunk/reactos/include/reactos/winsock/rnr20lib.h:44354-45543 Propchange: trunk/reactos/include/reactos/winsock/wsmobile.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 19:19:48 2010 @@ -1,2 +1,3 @@ +/branches/reactos-yarotows/include/reactos/winsock/wsmobile.h:48064 /branches/ros-amd64-bringup/reactos/include/reactos/winsock/wsmobile.h: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 /trunk/reactos/include/reactos/winsock/wsmobile.h:44354-45543 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Thu Jul 15 19:19:48 2010 @@ -1390,7 +1390,7 @@ IconSize.cy, SRCCOPY, 0, - hdcMask, + bAlpha ? 0 : hdcMask, 0, hdcImage ? 0 : IconSize.cy); }

1 0

[jgardou] 48064: [PORTCLS] - Fix IIrpQueue declaration
by jgardou＠svn.reactos.org 15 Jul '10

15 Jul '10

Author: jgardou Date: Thu Jul 15 19:13:12 2010 New Revision: 48064 URL: http://svn.reactos.org/svn/reactos?rev=48064&view=rev Log: [PORTCLS] - Fix IIrpQueue declaration Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/interfaces.hpp Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… ============================================================================== --- branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] (original) +++ branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] Thu Jul 15 19:13:12 2010 @@ -354,7 +354,7 @@ STDMETHOD_(BOOLEAN, GetAcquiredTagRange)(THIS_ IN PVOID * FirstTag, - IN PVOID * LastTag); + IN PVOID * LastTag) PURE; };

1 0

[tkreuzer] 48063: [NTOSKRNL] Fix some amd64 KGDT constant names
by tkreuzer＠svn.reactos.org 15 Jul '10

15 Jul '10

Author: tkreuzer Date: Thu Jul 15 11:24:17 2010 New Revision: 48063 URL: http://svn.reactos.org/svn/reactos?rev=48063&view=rev Log: [NTOSKRNL] Fix some amd64 KGDT constant names Modified: trunk/reactos/ntoskrnl/kd64/kddata.c Modified: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Thu Jul 15 11:24:17 2010 @@ -526,14 +526,14 @@ // // AMD64 GDT/LDT/TSS constants // - KGDT_64_R0_CODE, - KGDT_64_DATA, - KGDT_64_DATA, - KGDT_64_R3_CODE, - KGDT_64_DATA, - KGDT_64_DATA, - 0, - KGDT_TSS, + KGDT64_R0_CODE, + KGDT64_R3_DATA, + KGDT64_R3_DATA, + KGDT64_R3_CODE, + KGDT64_R3_DATA, + KGDT64_R3_DATA, + 0, + KGDT64_SYS_TSS, 0, 0, #else

1 0

[tkreuzer] 48062: [NTOSKNL] #undef IoAllocateAdapterChannel before implementing it
by tkreuzer＠svn.reactos.org 15 Jul '10

15 Jul '10

Author: tkreuzer Date: Thu Jul 15 11:20:22 2010 New Revision: 48062 URL: http://svn.reactos.org/svn/reactos?rev=48062&view=rev Log: [NTOSKNL] #undef IoAllocateAdapterChannel before implementing it Modified: trunk/reactos/ntoskrnl/io/iomgr/adapter.c Modified: trunk/reactos/ntoskrnl/io/iomgr/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/adapter.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/adapter.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/adapter.c [iso-8859-1] Thu Jul 15 11:20:22 2010 @@ -21,6 +21,7 @@ /* FUNCTIONS *****************************************************************/ +#undef IoAllocateAdapterChannel /* * @implemented */

1 0

[ilardig] 48061: [shellapi.h] Fix build copy pasta spotted by encoded
by ilardig＠svn.reactos.org 15 Jul '10

15 Jul '10

Author: ilardig Date: Thu Jul 15 07:16:08 2010 New Revision: 48061 URL: http://svn.reactos.org/svn/reactos?rev=48061&view=rev Log: [shellapi.h] Fix build copy pasta spotted by encoded Modified: trunk/reactos/include/psdk/shellapi.h Modified: trunk/reactos/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shellapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/shellapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shellapi.h [iso-8859-1] Thu Jul 15 07:16:08 2010 @@ -446,7 +446,7 @@ #endif #if !defined(_WIN64) -#include <pshpack1.h> +#include <poppack.h> #endif #ifdef _MSC_VER

1 0

[tkreuzer] 48060: [NTOSKRNL] Fix ExInitializeRundownProtectionCacheAware parameter (ULONG -> SIZE_T)
by tkreuzer＠svn.reactos.org 15 Jul '10

15 Jul '10

Author: tkreuzer Date: Thu Jul 15 01:34:50 2010 New Revision: 48060 URL: http://svn.reactos.org/svn/reactos?rev=48060&view=rev Log: [NTOSKRNL] Fix ExInitializeRundownProtectionCacheAware parameter (ULONG -> SIZE_T) Modified: trunk/reactos/ntoskrnl/ex/rundown.c Modified: trunk/reactos/ntoskrnl/ex/rundown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/rundown.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/rundown.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/rundown.c [iso-8859-1] Thu Jul 15 01:34:50 2010 @@ -491,7 +491,7 @@ VOID NTAPI ExInitializeRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware, - IN ULONG Count) + IN SIZE_T Count) { DBG_UNREFERENCED_PARAMETER(RunRefCacheAware); DBG_UNREFERENCED_PARAMETER(Count);

1 0

[tkreuzer] 48059: [NTOSKRNL] - Define PD_COUNT, PDE_COUNT, PTE_COUNT for amd64, we should probably use PTE_PER_PAGE... instead - Fix incompatible declaration of MmResidentAvailablePages - Prevent duplicate definitions
by tkreuzer＠svn.reactos.org 15 Jul '10

15 Jul '10

Author: tkreuzer Date: Thu Jul 15 01:10:18 2010 New Revision: 48059 URL: http://svn.reactos.org/svn/reactos?rev=48059&view=rev Log: [NTOSKRNL] - Define PD_COUNT, PDE_COUNT, PTE_COUNT for amd64, we should probably use PTE_PER_PAGE... instead - Fix incompatible declaration of MmResidentAvailablePages - Prevent duplicate definitions Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Thu Jul 15 01:10:18 2010 @@ -17,7 +17,7 @@ extern ULONG MmLowestPhysicalPage; extern ULONG MmHighestPhysicalPage; extern ULONG MmAvailablePages; -extern ULONG MmResidentAvailablePages; +extern PFN_NUMBER MmResidentAvailablePages; extern PVOID MmPagedPoolBase; extern ULONG MmPagedPoolSize; Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Thu Jul 15 01:10:18 2010 @@ -5,6 +5,8 @@ * PURPOSE: ARM Memory Manager Header * PROGRAMMERS: ReactOS Portable Systems Group */ + +#ifndef _M_AMD64 #define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255*1024*1024) >> PAGE_SHIFT) #define MI_MIN_PAGES_FOR_SYSPTE_TUNING ((19*1024*1024) >> PAGE_SHIFT) @@ -37,6 +39,8 @@ #define MM_HIGHEST_VAD_ADDRESS \ (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) + +#endif /* !_M_AMD64 */ /* Make the code cleaner with some definitions for size multiples */ #define _1KB (1024) @@ -58,7 +62,9 @@ #define PDE_COUNT 4096 #define PTE_COUNT 256 #else -#error Define these please! +#define PD_COUNT PPE_PER_PAGE +#define PDE_COUNT PDE_PER_PAGE +#define PTE_COUNT PTE_PER_PAGE #endif #ifdef _M_IX86

1 0

[tkreuzer] 48058: [NTOSKRNL] Remove the old amd64 compilation hack
by tkreuzer＠svn.reactos.org 15 Jul '10

15 Jul '10

Author: tkreuzer Date: Thu Jul 15 00:42:26 2010 New Revision: 48058 URL: http://svn.reactos.org/svn/reactos?rev=48058&view=rev Log: [NTOSKRNL] Remove the old amd64 compilation hack Modified: trunk/reactos/ntoskrnl/include/internal/amd64/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Thu Jul 15 00:42:26 2010 @@ -316,9 +316,6 @@ #endif /* __ASM__ */ -#undef KeGetCurrentThread -#define _KeGetCurrentThread KeGetCurrentThread - // HACK extern NTKERNELAPI volatile KSYSTEM_TIME KeTickCount;

1 0

[tkreuzer] 48057: [NTOSKRNL] Apply a workaround for WDK headers
by tkreuzer＠svn.reactos.org 15 Jul '10

15 Jul '10

Author: tkreuzer Date: Thu Jul 15 00:24:38 2010 New Revision: 48057 URL: http://svn.reactos.org/svn/reactos?rev=48057&view=rev Log: [NTOSKRNL] Apply a workaround for WDK headers Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Thu Jul 15 00:24:38 2010 @@ -11,6 +11,12 @@ /* ARM Bringup Hack */ #ifdef _M_ARM #define DbgPrint DbgPrintEarly +#endif + +/* WDK hacks */ +#ifdef _M_AMD64 +#define IoAllocateAdapterChannel _IoAllocateAdapterChannel +#define KeGetCurrentThread _KeGetCurrentThread #endif /* Version Data */

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2010