Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 47904: - Merge 47605.
by fireball＠svn.reactos.org 29 Jun '10

29 Jun '10

Author: fireball Date: Tue Jun 29 10:08:23 2010 New Revision: 47904 URL: http://svn.reactos.org/svn/reactos?rev=47904&view=rev Log: - Merge 47605. Modified: branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/dll/directx/d3d8/d3d8.spec (props changed) branches/arwinss/reactos/dll/directx/dsound_new/ (props changed) branches/arwinss/reactos/dll/directx/dsound_new/classfactory.c (props changed) branches/arwinss/reactos/dll/directx/dsound_new/dsound.spec (props changed) branches/arwinss/reactos/dll/directx/dsound_new/regsvr.c (props changed) branches/arwinss/reactos/dll/shellext/devcpux/devcpux.spec (props changed) branches/arwinss/reactos/dll/shellext/slayer/slayer.spec (props changed) branches/arwinss/reactos/dll/win32/gdi32/ (props changed) branches/arwinss/reactos/dll/win32/kernel32/ (props changed) branches/arwinss/reactos/dll/win32/kernel32/kernel32.pspec (props changed) branches/arwinss/reactos/dll/win32/user32/ (props changed) branches/arwinss/reactos/dll/win32/winex11.drv/ (props changed) branches/arwinss/reactos/include/ndk/amd64/ (props changed) branches/arwinss/reactos/include/ndk/amd64/asmmacro.S (props changed) branches/arwinss/reactos/include/psdk/ (props changed) branches/arwinss/reactos/lib/sdk/crt/time/ (props changed) branches/arwinss/reactos/ntoskrnl/config/cmkcbncb.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/ (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/request.h (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/user.h (props changed) branches/arwinss/reactos/subsystems/win32/win32k/wine/ (props changed) branches/arwinss/reactos/tools/rsym/log2lines.c (props changed) branches/arwinss/reactos/tools/rsym/log2lines.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym.c (props changed) branches/arwinss/reactos/tools/rsym/rsym.h (props changed) branches/arwinss/reactos/tools/rsym/rsym.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed) Propchange: branches/arwinss/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /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 -/trunk/reactos:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /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 -/trunk/reactos/dll/directx/d3d8/d3d8.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/directx/d3d8/d3d8.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/dll/directx/dsound_new/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound_new: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 -/trunk/reactos/dll/directx/dsound_new:43669-44421,45011,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/directx/dsound_new:43669-44421,45011,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/dll/directx/dsound_new/classfactory.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /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/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 -/trunk/reactos/dll/directx/dsound_new/classfactory.c:43925-44999,45011,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/directx/dsound_new/classfactory.c:43925-44999,45011,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/dll/directx/dsound_new/dsound.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /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 -/trunk/reactos/dll/directx/dsound_new/dsound.spec:43925-44999,45011,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/directx/dsound_new/dsound.spec:43925-44999,45011,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/dll/directx/dsound_new/regsvr.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /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 -/trunk/reactos/dll/directx/dsound_new/regsvr.c:43925-44999,45011,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/directx/dsound_new/regsvr.c:43925-44999,45011,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/dll/shellext/devcpux/devcpux.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /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 -/trunk/reactos/dll/shellext/devcpux/devcpux.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/shellext/devcpux/devcpux.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /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 -/trunk/reactos/dll/shellext/slayer/slayer.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/shellext/slayer/slayer.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/dll/win32/gdi32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/gdi32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/win32/gdi32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/win32/gdi32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 /vendor/wine/dlls/gdi32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46696,46915,47274,47321,47585,47798,47861 Propchange: branches/arwinss/reactos/dll/win32/kernel32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/win32/kernel32: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/dll/win32/kernel32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,46959 +/trunk/reactos/dll/win32/kernel32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,46959,47605 Propchange: branches/arwinss/reactos/dll/win32/kernel32/kernel32.pspec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec: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,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/dll/win32/kernel32/kernel32.pspec:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,46959 +/trunk/reactos/dll/win32/kernel32/kernel32.pspec:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,46959,47605 Propchange: branches/arwinss/reactos/dll/win32/user32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/user32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/win32/user32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/win32/user32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 /vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46696,46915,47274,47321,47585,47798,47861 Propchange: branches/arwinss/reactos/dll/win32/winex11.drv/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/winex11.drv:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/win32/winex11.drv:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/dll/win32/winex11.drv:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 /vendor/wine/dlls/winex11.drv/current:43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46915,47274,47321,47798,47861 Propchange: branches/arwinss/reactos/include/ndk/amd64/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /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 -/trunk/reactos/include/ndk/amd64:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/include/ndk/amd64:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/include/ndk/amd64/asmmacro.S ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /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 -/trunk/reactos/include/ndk/amd64/asmmacro.S:43669-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/include/ndk/amd64/asmmacro.S:43669-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/include/psdk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/psdk: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,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/include/psdk:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/include/psdk:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/lib/sdk/crt/time/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,4 +1,4 @@ /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_new:42414 -/trunk/reactos/lib/sdk/crt/time:42678-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/lib/sdk/crt/time:42678-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 /trunk/reactos/lib/sdk/crt/time_new:39350-42241,42401-42678 Modified: branches/arwinss/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/config… ============================================================================== --- branches/arwinss/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] (original) +++ branches/arwinss/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] Tue Jun 29 10:08:23 2010 @@ -234,7 +234,9 @@ if (Found) { /* Reference it */ + ASSERT(Ncb->RefCount != 0xFFFF); Ncb->RefCount++; + break; } } @@ -320,6 +322,7 @@ CmpAcquireNcbLockExclusiveByKey(ConvKey); /* Decrease the reference count */ + ASSERT(Ncb->RefCount >= 1); if (!(--Ncb->RefCount)) { /* Find the NCB in the table */ @@ -579,7 +582,7 @@ NewRefCount = OldRefCount - 1; /* Check if we still have references */ - if( (NewRefCount & 0xFFFF) > 0) + if ((NewRefCount & 0xFFFF) > 0) { /* Do the dereference */ if (InterlockedCompareExchange((PLONG)&Kcb->RefCount, Propchange: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/desktopbg.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,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include: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,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/subsystems/win32/win32k/include:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/subsystems/win32/win32k/include:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 /vendor/wine/server/current:45044,47274,47321,47798 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/request.h:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/subsystems/win32/win32k/include/request.h:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/subsystems/win32/win32k/include/request.h:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 /vendor/wine/server/current/request.h:43136,43398,43708,45044,47274,47321,47798 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/user.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/user.h:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/subsystems/win32/win32k/include/user.h:42000-43126,43669-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/subsystems/win32/win32k/include/user.h:42000-43126,43669-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 /vendor/wine/server/current/user.h:43708,45044,47274,47321,47798 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/wine/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/wine:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/subsystems/win32/win32k/wine:42000-43126,43669-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/subsystems/win32/win32k/wine:42000-43126,43669-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 /vendor/wine/server/current:43708,44715,45044,45206,45646,45910,46314,46696,47274,47321,47798 Propchange: branches/arwinss/reactos/tools/rsym/log2lines.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.c: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 -/trunk/reactos/tools/rsym/log2lines.c:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/tools/rsym/log2lines.c:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/tools/rsym/log2lines.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.mak: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 -/trunk/reactos/tools/rsym/log2lines.mak:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/tools/rsym/log2lines.mak:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /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 -/trunk/reactos/tools/rsym/rsym.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/tools/rsym/rsym.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /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 -/trunk/reactos/tools/rsym/rsym.h:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/tools/rsym/rsym.h:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /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 -/trunk/reactos/tools/rsym/rsym.mak:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/tools/rsym/rsym.mak:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605 Propchange: branches/arwinss/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 29 10:08:23 2010 @@ -1,2 +1,2 @@ /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 -/trunk/reactos/tools/rsym/rsym_common.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 +/trunk/reactos/tools/rsym/rsym_common.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605

1 0

[fireball] 47903: - Sync up to Wine-1.2-rc5.
by fireball＠svn.reactos.org 29 Jun '10

29 Jun '10

Author: fireball Date: Tue Jun 29 09:14:16 2010 New Revision: 47903 URL: http://svn.reactos.org/svn/reactos?rev=47903&view=rev Log: - Sync up to Wine-1.2-rc5. Modified: branches/arwinss/reactos/dll/win32/gdi32/ (props changed) branches/arwinss/reactos/dll/win32/gdi32/dc.c branches/arwinss/reactos/dll/win32/gdi32/font.c branches/arwinss/reactos/dll/win32/gdi32/gdi32.spec branches/arwinss/reactos/dll/win32/user32/ (props changed) branches/arwinss/reactos/dll/win32/user32/cursoricon.c branches/arwinss/reactos/dll/win32/user32/dde_server.c branches/arwinss/reactos/dll/win32/user32/msgbox.c branches/arwinss/reactos/dll/win32/user32/resources/oic_bang.svg branches/arwinss/reactos/dll/win32/user32/resources/oic_hand.svg branches/arwinss/reactos/dll/win32/user32/resources/oic_note.svg branches/arwinss/reactos/dll/win32/user32/resources/oic_ques.svg branches/arwinss/reactos/dll/win32/user32/resources/oic_sample.svg branches/arwinss/reactos/dll/win32/user32/resources/user32_Ru.rc branches/arwinss/reactos/dll/win32/user32/sysparams.c branches/arwinss/reactos/dll/win32/user32/win.c branches/arwinss/reactos/dll/win32/winex11.drv/ (props changed) branches/arwinss/reactos/dll/win32/winex11.drv/event.c branches/arwinss/reactos/dll/win32/winex11.drv/init.c branches/arwinss/reactos/dll/win32/winex11.drv/xim.c branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/dll/win32/gdi32/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/dde_server.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/msgbox.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/resources/oic_bang.svg URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/resources/oic_hand.svg URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/resources/oic_note.svg URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/resources/oic_ques.svg URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/resources/oic_sample.svg URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/resources/user32_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/win.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/event.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/xim.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex…

1 0

[dreimer] 47902: Update Thunderbird and FireFox in rapps.
by dreimer＠svn.reactos.org 29 Jun '10

29 Jun '10

Author: dreimer Date: Tue Jun 29 06:31:00 2010 New Revision: 47902 URL: http://svn.reactos.org/svn/reactos?rev=47902&view=rev Log: Update Thunderbird and FireFox in rapps. Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] Tue Jun 29 06:31:00 2010 @@ -2,47 +2,47 @@ [Section] Name = Mozilla Firefox 3.6 -Version = 3.6.3 +Version = 3.6.6 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. -Size = 8.0M +Size = 8.2M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/en… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/en… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. -Size = 7.8M +Size = 8.0M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/de… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/de… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. -Size = 7.8M +Size = 8.0M URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/es… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/es… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. -Size = 7.8M +Size = 8.0M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/nb… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/nb… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. -Size = 8.6M +Size = 8.9M URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/pl… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/pl… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². -Size = 8.2M +Size = 8.4M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/ru… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/ru… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². -Size = 8.2M +Size = 8.4M URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/uk… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/uk… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Tue Jun 29 06:31:00 2010 @@ -2,41 +2,41 @@ [Section] Name = Mozilla Thunderbird -Version = 3.0.5 +Version = 3.1 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. -Size = 8.6M +Size = 9.0M Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. -Size = 8.5M +Size = 8.9M URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. -Size = 8.4M +Size = 8.8M URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. -Size = 9.3M +Size = 9.7M URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². -Size = 8.8M +Size = 9.2M URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². -Size = 8.8M +Size = 9.2M URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/…

1 0

[tkreuzer] 47901: [WS2_32_NEW] Fix WSAAccept parameter (DWORD -> DWORD_PTR)
by tkreuzer＠svn.reactos.org 28 Jun '10

28 Jun '10

Author: tkreuzer Date: Mon Jun 28 21:36:28 2010 New Revision: 47901 URL: http://svn.reactos.org/svn/reactos?rev=47901&view=rev Log: [WS2_32_NEW] Fix WSAAccept parameter (DWORD -> DWORD_PTR) Modified: trunk/reactos/dll/win32/ws2_32_new/src/socklife.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/socklife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/socklife.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/socklife.c [iso-8859-1] Mon Jun 28 21:36:28 2010 @@ -293,7 +293,7 @@ OUT LPSOCKADDR addr, IN OUT LPINT addrlen, IN LPCONDITIONPROC lpfnCondition, - IN DWORD dwCallbackData) + IN DWORD_PTR dwCallbackData) { PWSPROCESS Process; PWSTHREAD Thread;

1 0

[tkreuzer] 47900: [WINMM] Fix a number of 64bit issues, add some comments where the code is not 64 bit safe. This module should be synced with wine, but this still causes a problem with Flash videos on FF2 (likely another timer problem)
by tkreuzer＠svn.reactos.org 28 Jun '10

28 Jun '10

Author: tkreuzer Date: Mon Jun 28 20:58:30 2010 New Revision: 47900 URL: http://svn.reactos.org/svn/reactos?rev=47900&view=rev Log: [WINMM] Fix a number of 64bit issues, add some comments where the code is not 64 bit safe. This module should be synced with wine, but this still causes a problem with Flash videos on FF2 (likely another timer problem) Modified: trunk/reactos/ (props changed) trunk/reactos/dll/win32/winmm/driver.c trunk/reactos/dll/win32/winmm/mci.c trunk/reactos/dll/win32/winmm/midimap/midimap.c trunk/reactos/dll/win32/winmm/mmio.c trunk/reactos/dll/win32/winmm/winmm.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 28 20:58:30 2010 @@ -1,4 +1,4 @@ /branches/header-work:45691-47721 /branches/reactos-yarotows:46848,46966,47800 /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,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,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882 +/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/dll/win32/winmm/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/driver.c?r… ============================================================================== --- trunk/reactos/dll/win32/winmm/driver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/driver.c [iso-8859-1] Mon Jun 28 20:58:30 2010 @@ -467,7 +467,7 @@ return 0; the_end: - if (lpDrv) TRACE("=> %08lx\n", (DWORD)lpDrv); + if (lpDrv) TRACE("=> %p\n", lpDrv); return (HDRVR)lpDrv; } Modified: trunk/reactos/dll/win32/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mci.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] Mon Jun 28 20:58:30 2010 @@ -975,7 +975,7 @@ /************************************************************************** * MCI_GetDWord [internal] */ -static BOOL MCI_GetDWord(LPDWORD data, LPWSTR* ptr) +static BOOL MCI_GetDWord(DWORD_PTR *data, LPWSTR* ptr) { DWORD val; LPWSTR ret; @@ -1028,7 +1028,7 @@ /************************************************************************** * MCI_ParseOptArgs [internal] */ -static DWORD MCI_ParseOptArgs(LPDWORD data, int _offset, LPCWSTR lpCmd, +static DWORD MCI_ParseOptArgs(DWORD_PTR *data, int _offset, LPCWSTR lpCmd, LPWSTR args, LPDWORD dwFlags) { int len, offset; @@ -1151,7 +1151,7 @@ * MCI_HandleReturnValues [internal] */ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD retType, - LPDWORD data, LPWSTR lpstrRet, UINT uRetLen) + DWORD_PTR *data, LPWSTR lpstrRet, UINT uRetLen) { static const WCHAR wszLd [] = {'%','l','d',0}; static const WCHAR wszLd4 [] = {'%','l','d',' ','%','l','d',' ','%','l','d',' ','%','l','d',0}; @@ -1229,7 +1229,7 @@ LPWINE_MCIDRIVER wmd = 0; DWORD dwFlags = 0, dwRet = 0; int offset = 0; - DWORD data[MCI_DATA_SIZE]; + DWORD_PTR data[MCI_DATA_SIZE]; DWORD retType; LPCWSTR lpCmd = 0; LPWSTR devAlias = NULL; @@ -1282,15 +1282,15 @@ tmp = devType; devType = dev; dev = tmp; dwFlags |= MCI_OPEN_TYPE; - data[2] = (DWORD)devType; + data[2] = (DWORD_PTR)devType; devType = str_dup_upper(devType); dwFlags |= MCI_OPEN_ELEMENT; - data[3] = (DWORD)dev; + data[3] = (DWORD_PTR)dev; } else if (DRIVER_GetLibName(dev, wszMci, buf, sizeof(buf))) { /* this is the name of a mci driver's type */ tmp = strchrW(dev, ' '); if (tmp) *tmp = '\0'; - data[2] = (DWORD)dev; + data[2] = (DWORD_PTR)dev; devType = str_dup_upper(dev); if (tmp) *tmp = ' '; dwFlags |= MCI_OPEN_TYPE; @@ -1309,7 +1309,7 @@ devType = str_dup_upper(buf); } dwFlags |= MCI_OPEN_ELEMENT; - data[3] = (DWORD)dev; + data[3] = (DWORD_PTR)dev; } if ((devAlias = strstrW(args, wszSAliasS))) { WCHAR* tmp2; @@ -1319,7 +1319,7 @@ tmp2 = HeapAlloc(GetProcessHeap(), 0, (tmp - devAlias + 1) * sizeof(WCHAR) ); memcpy( tmp2, devAlias, (tmp - devAlias) * sizeof(WCHAR) ); tmp2[tmp - devAlias] = 0; - data[4] = (DWORD)tmp2; + data[4] = (DWORD_PTR)tmp2; /* should be done in regular options parsing */ /* dwFlags |= MCI_OPEN_ALIAS; */ } else if (dev == 0) { @@ -1378,7 +1378,7 @@ switch (retType = MCI_GetReturnType(lpCmd)) { case 0: offset = 1; break; case MCI_INTEGER: offset = 2; break; - case MCI_STRING: data[1] = (DWORD)lpstrRet; data[2] = uRetLen; offset = 3; break; + case MCI_STRING: data[1] = (DWORD_PTR)lpstrRet; data[2] = uRetLen; offset = 3; break; case MCI_RECT: offset = 5; break; default: ERR("oops\n"); } @@ -1391,7 +1391,7 @@ /* set up call back */ if (dwFlags & MCI_NOTIFY) { - data[0] = (DWORD)hwndCallback; + data[0] = (DWORD_PTR)hwndCallback; } /* FIXME: the command should get it's own notification window set up and @@ -1676,7 +1676,7 @@ TRACE("(%04x, %08X, %p)\n", wDevID, dwParam, lpParms); - if (wDevID == (UINT16)MCI_ALL_DEVICE_ID) { + if (wDevID == MCI_ALL_DEVICE_ID) { /* FIXME: shall I notify once after all is done, or for * each of the open drivers ? if the latest, which notif * to return when only one fails ? Modified: trunk/reactos/dll/win32/winmm/midimap/midimap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/midimap/mi… ============================================================================== --- trunk/reactos/dll/win32/winmm/midimap/midimap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/midimap/midimap.c [iso-8859-1] Mon Jun 28 20:58:30 2010 @@ -260,7 +260,7 @@ return ret; } -static DWORD modOpen(LPDWORD lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) +static DWORD modOpen(DWORD_PTR *lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) { MIDIMAPDATA* mom = HeapAlloc(GetProcessHeap(), 0, sizeof(MIDIMAPDATA)); @@ -270,7 +270,7 @@ if (MIDIMAP_LoadSettings(mom)) { - *lpdwUser = (DWORD)mom; + *lpdwUser = (DWORD_PTR)mom; mom->self = mom; return MMSYSERR_NOERROR; @@ -306,7 +306,7 @@ return ret; } -static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) +static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwParam2) { WORD chn; DWORD ret = MMSYSERR_NOERROR; @@ -330,7 +330,7 @@ return ret; } -static DWORD modData(MIDIMAPDATA* mom, DWORD dwParam) +static DWORD modData(MIDIMAPDATA* mom, DWORD_PTR dwParam) { BYTE lb = LOBYTE(LOWORD(dwParam)); WORD chn = lb & 0x0F; @@ -393,7 +393,7 @@ return ret; } -static DWORD modPrepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) +static DWORD modPrepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwParam2) { if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; if (lpMidiHdr->dwFlags & (MHDR_ISSTRM|MHDR_PREPARED)) @@ -403,7 +403,7 @@ return MMSYSERR_NOERROR; } -static DWORD modUnprepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) +static DWORD modUnprepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwParam2) { if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; if ((lpMidiHdr->dwFlags & MHDR_ISSTRM) || !(lpMidiHdr->dwFlags & MHDR_PREPARED)) @@ -413,7 +413,7 @@ return MMSYSERR_NOERROR; } -static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiCaps, DWORD size) +static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiCaps, DWORD_PTR size) { static const WCHAR name[] = {'W','i','n','e',' ','m','i','d','i',' ','m','a','p','p','e','r',0}; lpMidiCaps->wMid = 0x00FF; @@ -451,8 +451,8 @@ /************************************************************************** * modMessage (MIDIMAP.@) */ -DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) +DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) { TRACE("(%u, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); @@ -492,7 +492,7 @@ /************************************************************************** * MIDIMAP_drvOpen [internal] */ -static DWORD MIDIMAP_drvOpen(LPSTR str) +static LRESULT MIDIMAP_drvOpen(LPSTR str) { MIDIOUTCAPSW moc; unsigned dev, i; @@ -527,7 +527,7 @@ /************************************************************************** * MIDIMAP_drvClose [internal] */ -static DWORD MIDIMAP_drvClose(DWORD dwDevID) +static LRESULT MIDIMAP_drvClose(DWORD_PTR dwDevID) { if (midiOutPorts) { @@ -541,8 +541,8 @@ /************************************************************************** * DriverProc (MIDIMAP.@) */ -LONG CALLBACK MIDIMAP_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, - DWORD dwParam1, DWORD dwParam2) +LRESULT CALLBACK MIDIMAP_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, + LPARAM dwParam1, LPARAM dwParam2) { /* EPP TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n", */ /* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */ Modified: trunk/reactos/dll/win32/winmm/mmio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mmio.c?rev… ============================================================================== --- trunk/reactos/dll/win32/winmm/mmio.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/mmio.c [iso-8859-1] Mon Jun 28 20:58:30 2010 @@ -665,8 +665,8 @@ refmminfo->wErrorRet = send_message(wm->ioProc, &wm->info, MMIOM_OPEN, (LPARAM)szFileName, 0, FALSE); - /* grab file size, when possible */ - wm->dwFileSize = GetFileSize((HANDLE)wm->info.adwInfo[0], NULL); + /* grab file size, when possible (FIXME: not 64 bit safe) */ + wm->dwFileSize = GetFileSize((HANDLE)(ULONG_PTR)wm->info.adwInfo[0], NULL); if (refmminfo->wErrorRet == 0) return wm->info.hmmio; Modified: trunk/reactos/dll/win32/winmm/winmm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.c?re… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm.c [iso-8859-1] Mon Jun 28 20:58:30 2010 @@ -760,7 +760,7 @@ TRACE("(%04X, %p) !\n", uDeviceID, lpdwVolume); - if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_AUX, TRUE)) == NULL) + if ((wmld = MMDRV_Get(UlongToHandle(uDeviceID), MMDRV_AUX, TRUE)) == NULL) return MMSYSERR_INVALHANDLE; return MMDRV_Message(wmld, AUXDM_GETVOLUME, (DWORD_PTR)lpdwVolume, 0L); } @@ -774,7 +774,7 @@ TRACE("(%04X, %u) !\n", uDeviceID, dwVolume); - if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_AUX, TRUE)) == NULL) + if ((wmld = MMDRV_Get(UlongToHandle(uDeviceID), MMDRV_AUX, TRUE)) == NULL) return MMSYSERR_INVALHANDLE; return MMDRV_Message(wmld, AUXDM_SETVOLUME, dwVolume, 0L); } @@ -786,7 +786,7 @@ { LPWINE_MLD wmld; - if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_AUX, TRUE)) == NULL) + if ((wmld = MMDRV_Get(UlongToHandle(uDeviceID), MMDRV_AUX, TRUE)) == NULL) return MMSYSERR_INVALHANDLE; return MMDRV_Message(wmld, uMessage, dw1, dw2); @@ -929,7 +929,7 @@ /************************************************************************** * midiOutOpen [WINMM.@] */ -UINT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceID, +MMRESULT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags) { HMIDIOUT hMidiOut; @@ -1220,7 +1220,7 @@ /************************************************************************** * midiInOpen [WINMM.@] */ -UINT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, +MMRESULT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags) { HANDLE hMidiIn; @@ -1466,7 +1466,7 @@ return FALSE; } - *lpMidiStrm = (WINE_MIDIStream*)lpwm->mod.rgIds.dwStreamID; + *lpMidiStrm = (WINE_MIDIStream*)(ULONG_PTR)lpwm->mod.rgIds.dwStreamID; // FIXME: not 64 bit safe return *lpMidiStrm != NULL; } @@ -1581,7 +1581,8 @@ #endif if (((LPMIDIEVENT)lpData)->dwStreamID != 0 && ((LPMIDIEVENT)lpData)->dwStreamID != 0xFFFFFFFF && - ((LPMIDIEVENT)lpData)->dwStreamID != (DWORD)lpMidiStrm) { + /* FIXME: not 64 bit safe */ + ((LPMIDIEVENT)lpData)->dwStreamID != (DWORD_PTR)lpMidiStrm) { FIXME("Dropping bad %s lpMidiHdr (streamID=%08x)\n", (lpMidiHdr->dwFlags & MHDR_ISSTRM) ? "stream" : "regular", ((LPMIDIEVENT)lpData)->dwStreamID); @@ -1800,7 +1801,7 @@ lpMidiStrm->dwTimeDiv = 480; /* 480 is 120 quarter notes per minute *//* FIXME ??*/ lpMidiStrm->dwPositionMS = 0; - mosm.dwStreamID = (DWORD)lpMidiStrm; + mosm.dwStreamID = (DWORD_PTR)lpMidiStrm; // FIXME: not 64 bit safe /* FIXME: the correct value is not allocated yet for MAPPER */ mosm.wDeviceID = *lpuDeviceID; lpwm = MIDI_OutAlloc(&hMidiOut, &dwCallback, &dwInstance, &fdwOpen, 1, &mosm);

1 0

[cgutman] 47899: [DHCPCSVC] - Discover adapters synchronously again until a bug (possibly a race condition) is fixed - DHCP failure in certain situations is fixed now
by cgutman＠svn.reactos.org 28 Jun '10

28 Jun '10

Author: cgutman Date: Mon Jun 28 18:50:19 2010 New Revision: 47899 URL: http://svn.reactos.org/svn/reactos?rev=47899&view=rev Log: [DHCPCSVC] - Discover adapters synchronously again until a bug (possibly a race condition) is fixed - DHCP failure in certain situations is fixed now Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/ad… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] Mon Jun 28 18:50:19 2010 @@ -365,13 +365,14 @@ } HANDLE StartAdapterDiscovery(VOID) { - HANDLE ThreadHandle, EventHandle; + HANDLE /* ThreadHandle, */ EventHandle; EventHandle = CreateEvent(NULL, FALSE, FALSE, NULL); +#if 0 ThreadHandle = CreateThread(NULL, 0, AdapterDiscoveryThread, @@ -383,6 +384,9 @@ return NULL; CloseHandle(ThreadHandle); +#else + AdapterDiscoveryThread((LPVOID)EventHandle); +#endif return EventHandle; }

1 0

[evb] 47898: Implement Root Bus FDO AddDevice codes, get boot config, connect to HAL or ACPI config handlers (PciQueryForPciBusInterface, PciGetConfigHandlers), read BUS FDO hack flag, get _HPP HotPlug PCI ACPI data and initialize arbiter support. PciGetHotPlugParameters work but no PCI HotPlug support on my machines, so cannot test ACPI data, that part stub now Add PciFdoDispatchTable, PciFdoDispatchPnpTable, PciFdoDispatchPowerTable but all stub to PciIrpNotSupported however set correct IRP Di
by evb＠svn.reactos.org 28 Jun '10

28 Jun '10

Author: evb Date: Mon Jun 28 17:30:35 2010 New Revision: 47898 URL: http://svn.reactos.org/svn/reactos?rev=47898&view=rev Log: Implement Root Bus FDO AddDevice codes, get boot config, connect to HAL or ACPI config handlers (PciQueryForPciBusInterface, PciGetConfigHandlers), read BUS FDO hack flag, get _HPP HotPlug PCI ACPI data and initialize arbiter support. PciGetHotPlugParameters work but no PCI HotPlug support on my machines, so cannot test ACPI data, that part stub now Add PciFdoDispatchTable, PciFdoDispatchPnpTable, PciFdoDispatchPowerTable but all stub to PciIrpNotSupported however set correct IRP Dispatch Style for the IRPS Arbiter support in PciInitializeARbiters done, but PciInterfaces array is NULL (stub) at moment Add PCI_SIGNATURE, PCI_STATE, PCI_DISAPTCH_STYLE type, add PciInitializeState to begin the state support Add structure for PCI_FDO_EXTENSION, PCI_SECONDARY_EXTENSION, PCI_INTERFACE, PCI_ARBITER_INSTANCE, PCI_DISPATCH_TABLE PCI utility functions added: PciFindParentPciFdoExtension, PciInsertEntryAtTail, PciInsertEntryAtHead, PcipLinkSecondaryExtension, PciGetDeviceProperty, PciSendIoctl Need sir_richard to add arbiter.h header to define ARBITER_INSTANCE for finish support This 1000 more codes done now~ Modified: trunk/reactos/drivers/bus/pcix/arb/arb_comn.c trunk/reactos/drivers/bus/pcix/dispatch.c trunk/reactos/drivers/bus/pcix/fdo.c trunk/reactos/drivers/bus/pcix/intrface/intrface.c trunk/reactos/drivers/bus/pcix/pci.h trunk/reactos/drivers/bus/pcix/pci/config.c trunk/reactos/drivers/bus/pcix/pci/state.c trunk/reactos/drivers/bus/pcix/utils.c Modified: trunk/reactos/drivers/bus/pcix/arb/arb_comn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/arb/arb_c… ============================================================================== --- trunk/reactos/drivers/bus/pcix/arb/arb_comn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/arb/arb_comn.c [iso-8859-1] Mon Jun 28 17:30:35 2010 @@ -14,6 +14,111 @@ /* GLOBALS ********************************************************************/ +PCHAR PciArbiterNames[] = +{ + "I/O Port", + "Memory", + "Interrupt", + "Bus Number" +}; + /* FUNCTIONS ******************************************************************/ +VOID +NTAPI +PciArbiterDestructor(IN PPCI_ARBITER_INSTANCE Arbiter) +{ + /* This function is not yet implemented */ + UNIMPLEMENTED; + while (TRUE); +} + +NTSTATUS +NTAPI +PciInitializeArbiters(IN PPCI_FDO_EXTENSION FdoExtension) +{ + PPCI_INTERFACE CurrentInterface, *Interfaces; + PPCI_ARBITER_INSTANCE ArbiterInterface; + NTSTATUS Status; + PCI_SIGNATURE ArbiterType; + ASSERT_FDO(FdoExtension); + + /* Loop all the arbiters */ + for (ArbiterType = PciArb_Io; ArbiterType <= PciArb_Memory; ArbiterType++) + { + /* Check if this is the extension for the Root PCI Bus */ + if (!PCI_IS_ROOT_FDO(FdoExtension)) + { +#if 0 // at next sync when PDO add + /* Get the PDO extension */ + PdoExtension = FdoExtension->PhysicalDeviceObject->DeviceExtension; + ASSERT_PDO(PdoExtension); + + /* Skip this bus if it does subtractive decode */ + if (PdoExtension->Substractive) + { + DPRINT1("PCI Not creating arbiters for subtractive bus %d\n", + PdoExtension->Substractive); + continue; + } +#endif + } + + /* Query all the registered arbiter interfaces */ + Interfaces = PciInterfaces; + while (*Interfaces) + { + /* Find the one that matches the arbiter currently being setup */ + CurrentInterface = *Interfaces; + if (CurrentInterface->Signature == ArbiterType) break; + Interfaces++; + } + + /* Check if the required arbiter was not found in the list */ + if (!*Interfaces) + { + /* Skip this arbiter and try the next one */ + DPRINT1("PCI - FDO ext 0x%08x no %s arbiter.\n", + FdoExtension, + PciArbiterNames[ArbiterType - PciArb_Io]); + continue; + } + + /* An arbiter was found, allocate an instance for it */ + Status = STATUS_INSUFFICIENT_RESOURCES; + ArbiterInterface = ExAllocatePoolWithTag(PagedPool, + sizeof(PCI_ARBITER_INSTANCE), + PCI_POOL_TAG); + if (!ArbiterInterface) break; + + /* Setup the instance */ + ArbiterInterface->BusFdoExtension = FdoExtension; + ArbiterInterface->Interface = CurrentInterface; + swprintf(ArbiterInterface->InstanceName, + L"PCI %S (b=%02x)", + PciArbiterNames[ArbiterType - PciArb_Io], + FdoExtension->BaseBus); + + /* Call the interface initializer for it */ + Status = CurrentInterface->Initializer(ArbiterInterface); + if (!NT_SUCCESS(Status)) break; + + /* Link it with this FDO */ + PcipLinkSecondaryExtension(&FdoExtension->SecondaryExtension, + &FdoExtension->SecondaryExtLock, + &ArbiterInterface->Header, + ArbiterType, + PciArbiterDestructor); + + /* This arbiter is now initialized, move to the next one */ + DPRINT1("PCI - FDO ext 0x%08x %S arbiter initialized (context 0x%08x).\n", + FdoExtension, + "ARBITER HEADER MISSING", //ArbiterInterface->CommonInstance.Name, + ArbiterInterface); + Status = STATUS_SUCCESS; + } + + /* Return to caller */ + return Status; +} /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/dispatch.… ============================================================================== --- trunk/reactos/drivers/bus/pcix/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/dispatch.c [iso-8859-1] Mon Jun 28 17:30:35 2010 @@ -27,4 +27,16 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +PciIrpNotSupported(IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension) +{ + /* Not supported */ + DPRINT1("WARNING: PCI received unsupported IRP!\n"); + DbgBreakPoint(); + return STATUS_NOT_SUPPORTED; +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/fdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] Mon Jun 28 17:30:35 2010 @@ -14,17 +14,306 @@ /* GLOBALS ********************************************************************/ +SINGLE_LIST_ENTRY PciFdoExtensionListHead; +BOOLEAN PciBreakOnDefault; + +PCI_MN_DISPATCH_TABLE PciFdoDispatchPowerTable[] = +{ + {IRP_DISPATCH, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported} +}; + +PCI_MN_DISPATCH_TABLE PciFdoDispatchPnpTable[] = +{ + {IRP_UPWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DISPATCH, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DISPATCH, PciIrpNotSupported}, + {IRP_UPWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_UPWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported} +}; + +PCI_MJ_DISPATCH_TABLE PciFdoDispatchTable = +{ + IRP_MN_QUERY_LEGACY_BUS_INFORMATION, + PciFdoDispatchPnpTable, + IRP_MN_QUERY_POWER, + PciFdoDispatchPowerTable, + IRP_DOWNWARD, + PciIrpNotSupported, + IRP_DOWNWARD, + PciIrpNotSupported +}; + /* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +PciGetHotPlugParameters(IN PPCI_FDO_EXTENSION FdoExtension) +{ + ACPI_EVAL_INPUT_BUFFER InputBuffer; + PACPI_EVAL_OUTPUT_BUFFER OutputBuffer; + ULONG Length; + NTSTATUS Status; + PAGED_CODE(); + + /* We should receive 4 parameters, per the HPP specification */ + Length = sizeof(ACPI_EVAL_OUTPUT_BUFFER) + 4 * sizeof(ACPI_METHOD_ARGUMENT); + + /* Allocate the buffer to hold the parameters */ + OutputBuffer = ExAllocatePoolWithTag(PagedPool, Length, PCI_POOL_TAG); + if (!OutputBuffer) return; + + /* Initialize the output and input buffers. The method is _HPP */ + RtlZeroMemory(OutputBuffer, Length); + *(PULONG)InputBuffer.MethodName = 'PPH_'; + InputBuffer.Signature = ACPI_EVAL_INPUT_BUFFER_SIGNATURE; + do + { + /* Send the IOCTL to the ACPI driver */ + Status = PciSendIoctl(FdoExtension->PhysicalDeviceObject, + IOCTL_ACPI_EVAL_METHOD, + &InputBuffer, + sizeof(InputBuffer), + OutputBuffer, + Length); + if (!NT_SUCCESS(Status)) + { + /* The method failed, check if we can salvage data from parent */ + if (!PCI_IS_ROOT_FDO(FdoExtension)) + { + /* Copy the root bus' hot plug parameters */ + FdoExtension->HotPlugParameters = FdoExtension->ParentFdoExtension->HotPlugParameters; + } + + /* Nothing more to do on this path */ + break; + } + + /* ACPI sent back some data. 4 parameters are expected in the output */ + if (OutputBuffer->Count != 4) break; + + /* HotPlug PCI Support not yet implemented */ + UNIMPLEMENTED; + while (TRUE); + } while (FALSE); + + /* Free the buffer and return */ + ExFreePoolWithTag(OutputBuffer, 0); +} + +VOID +NTAPI +PciInitializeFdoExtensionCommonFields(PPCI_FDO_EXTENSION FdoExtension, + IN PDEVICE_OBJECT DeviceObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + /* Initialize the extension */ + RtlZeroMemory(FdoExtension, sizeof(PCI_FDO_EXTENSION)); + + /* Setup the common fields */ + FdoExtension->PhysicalDeviceObject = PhysicalDeviceObject; + FdoExtension->FunctionalDeviceObject = DeviceObject; + FdoExtension->ExtensionType = PciFdoExtensionType; + FdoExtension->PowerState.CurrentSystemState = PowerSystemWorking; + FdoExtension->PowerState.CurrentDeviceState = PowerDeviceD0; + FdoExtension->IrpDispatchTable = &PciFdoDispatchTable; + + /* Initialize the extension locks */ + KeInitializeEvent(&FdoExtension->SecondaryExtLock, SynchronizationEvent, TRUE); + KeInitializeEvent(&FdoExtension->ChildListLock, SynchronizationEvent, TRUE); + + /* Initialize the default state */ + PciInitializeState(FdoExtension); +} NTSTATUS NTAPI PciAddDevice(IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject) { - /* This function is not yet implemented */ - UNIMPLEMENTED; - while (TRUE); - return STATUS_SUCCESS; + PCM_RESOURCE_LIST Descriptor; + PDEVICE_OBJECT AttachedTo; + PPCI_FDO_EXTENSION FdoExtension; + PPCI_FDO_EXTENSION ParentExtension; + PDEVICE_OBJECT DeviceObject; + UCHAR Buffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(ULONG)]; + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo = (PKEY_VALUE_PARTIAL_INFORMATION)Buffer; + NTSTATUS Status; + HANDLE KeyHandle; + UNICODE_STRING ValueName; + ULONG ResultLength; + PAGED_CODE(); + DPRINT1("PCI - AddDevice (a new bus). PDO: %p (Driver: %wZ)\n", + PhysicalDeviceObject, &PhysicalDeviceObject->DriverObject->DriverName); + + /* Zero out variables so failure path knows what to do */ + AttachedTo = NULL; + do + { + /* Check if there's already a device extension for this bus */ + ParentExtension = PciFindParentPciFdoExtension(PhysicalDeviceObject, + &PciGlobalLock); + if (ParentExtension) + { + /* More than one PCI bus, this is not expected yet */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Create the FDO for the bus */ + Status = IoCreateDevice(DriverObject, + sizeof(PCI_FDO_EXTENSION), + NULL, + FILE_DEVICE_BUS_EXTENDER, + 0, + 0, + &DeviceObject); + if (!NT_SUCCESS(Status)) break; + + /* Initialize the extension for the FDO */ + FdoExtension = DeviceObject->DeviceExtension; + PciInitializeFdoExtensionCommonFields(DeviceObject->DeviceExtension, + DeviceObject, + PhysicalDeviceObject); + + /* Attach to the root PDO */ + Status = STATUS_NO_SUCH_DEVICE; + AttachedTo = IoAttachDeviceToDeviceStack(DeviceObject, + PhysicalDeviceObject); + ASSERT(AttachedTo != NULL); + if (!AttachedTo) break; + FdoExtension->AttachedDeviceObject = AttachedTo; + if (ParentExtension) + { + /* More than one PCI bus, this is not expected yet */ + UNIMPLEMENTED; + while (TRUE); + } + else + { + /* Query the boot configuration */ + Status = PciGetDeviceProperty(PhysicalDeviceObject, + DevicePropertyBootConfiguration, + (PVOID*)&Descriptor); + if (!NT_SUCCESS(Status)) + { + /* No configuration has been set */ + Descriptor = NULL; + } + else + { + /* Root PDO in ReactOS does not assign boot resources */ + UNIMPLEMENTED; + while (TRUE); + } + + if (Descriptor) + { + /* Root PDO in ReactOS does not assign boot resources */ + UNIMPLEMENTED; + while (TRUE); + } + else + { + /* Default configuration isn't the normal path on Windows */ + if (PciBreakOnDefault) + { + /* If a second bus is found and there's still no data, crash */ + KeBugCheckEx(PCI_BUS_DRIVER_INTERNAL, + 0xDEAD0010u, + (ULONG_PTR)DeviceObject, + 0, + 0); + } + + /* Warn that a default configuration will be used, and set bus 0 */ + DPRINT1("PCI Will use default configuration.\n"); + PciBreakOnDefault = TRUE; + FdoExtension->BaseBus = 0; + } + + /* This is the root bus */ + FdoExtension->BusRootFdoExtension = FdoExtension; + } + + /* Get the HAL or ACPI Bus Handler Callbacks for Configuration Access */ + Status = PciGetConfigHandlers(FdoExtension); + if (!NT_SUCCESS(Status)) break; + + /* Initialize all the supported PCI arbiters */ + Status = PciInitializeArbiters(FdoExtension); + if (!NT_SUCCESS(Status)) break; + + /* This is a real FDO, insert it into the list */ + FdoExtension->Fake = FALSE; + PciInsertEntryAtTail(&PciFdoExtensionListHead, + FdoExtension, + &PciGlobalLock); + + /* Open the device registry key so that we can query the errata flags */ + IoOpenDeviceRegistryKey(DeviceObject, + PLUGPLAY_REGKEY_DEVICE, + KEY_ALL_ACCESS, + &KeyHandle), + + /* Open the value that contains errata flags for this bus instance */ + RtlInitUnicodeString(&ValueName, L"HackFlags"); + Status = ZwQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformation, + ValueInfo, + sizeof(Buffer), + &ResultLength); + ZwClose(KeyHandle); + if (NT_SUCCESS(Status)) + { + /* Make sure the data is of expected type and size */ + if ((ValueInfo->Type == REG_DWORD) && + (ValueInfo->DataLength == sizeof(ULONG))) + { + /* Read the flags for this bus */ + FdoExtension->BusHackFlags = *(PULONG)&ValueInfo->Data; + } + } + + /* Query ACPI for PCI HotPlug Support */ + PciGetHotPlugParameters(FdoExtension); + + /* The Bus FDO is now initialized */ + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + DPRINT1("PCI Root FDO Added: %p %p\n", DeviceObject, FdoExtension); + return STATUS_SUCCESS; + } while (FALSE); + + /* This is the failure path */ + ASSERT(!NT_SUCCESS(Status)); + if (AttachedTo) IoDetachDevice(AttachedTo); + if (DeviceObject) IoDeleteDevice(DeviceObject); + return Status; } /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/intrface/intrface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/intrface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/intrface.c [iso-8859-1] Mon Jun 28 17:30:35 2010 @@ -14,6 +14,11 @@ /* GLOBALS ********************************************************************/ +PPCI_INTERFACE PciInterfaces[] = +{ + NULL +}; + /* FUNCTIONS ******************************************************************/ /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci.h?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] Mon Jun 28 17:30:35 2010 @@ -17,11 +17,23 @@ #include "halfuncs.h" #include "rtlfuncs.h" #include "vffuncs.h" +#include "bugcodes.h" // // Tag used in all pool allocations (Pci Bus) // #define PCI_POOL_TAG 'BicP' + +// +// Checks if the specified FDO is the FDO for the Root PCI Bus +// +#define PCI_IS_ROOT_FDO(x) ((x)->BusRootFdoExtension == x) + +// +// Assertions to make sure we are dealing with the right kind of extension +// +#define ASSERT_FDO(x) ASSERT((x)->ExtensionType == PciFdoExtensionType); +#define ASSERT_PDO(x) ASSERT((x)->ExtensionType == PciPdoExtensionType); // // PCI Hack Entry Name Lengths @@ -32,10 +44,62 @@ #define PCI_HACK_ENTRY_FULL_SIZE sizeof(L"VVVVddddssssIIIIRR") // 36 // -// PCI Hack Entry Information +// PCI Hack Entry Flags // #define PCI_HACK_HAS_REVISION_INFO 0x01 #define PCI_HACK_HAS_SUBSYSTEM_INFO 0x02 + +// +// Device Extension, Interface, Translator and Arbiter Signatures +// +typedef enum _PCI_SIGNATURE +{ + PciPdoExtensionType = '0Pci', + PciFdoExtensionType = '1Pci', + PciArb_Io = '2Pci', + PciArb_Memory = '3Pci', + PciArb_Interrupt = '4Pci', + PciArb_BusNumber = '5Pci', + PciTrans_Interrupt = '6Pci', + PciInterface_BusHandler = '7Pci', + PciInterface_IntRouteHandler = '8Pci', + PciInterface_PciCb = '9Pci', + PciInterface_LegacyDeviceDetection = ':Pci', + PciInterface_PmeHandler = ';Pci', + PciInterface_DevicePresent = '<Pci', + PciInterface_NativeIde = '=Pci', + PciInterface_AgpTarget = '>Pci', + PciInterface_Location = '?Pci' +} PCI_SIGNATURE, *PPCI_SIGNATURE; + +// +// Device Extension Logic States +// +typedef enum _PCI_STATE +{ + PciNotStarted, + PciStarted, + PciDeleted, + PciStopped, + PciSurpriseRemoved, + PciSynchronizedOperation, + PciMaxObjectState +} PCI_STATE; + +// +// IRP Dispatch Logic Style +// +typedef enum _PCI_DISPATCH_STYLE +{ + IRP_COMPLETE, + IRP_DOWNWARD, + IRP_UPWARD, + IRP_DISPATCH, +} PCI_DISPATCH_STYLE; + +// +// PCI Hack Entry Information +// typedef struct _PCI_HACK_ENTRY { USHORT VendorID; @@ -48,6 +112,165 @@ } PCI_HACK_ENTRY, *PPCI_HACK_ENTRY; // +// Power State Information for Device Extension +// +typedef struct _PCI_POWER_STATE +{ + SYSTEM_POWER_STATE CurrentSystemState; + DEVICE_POWER_STATE CurrentDeviceState; + SYSTEM_POWER_STATE SystemWakeLevel; + DEVICE_POWER_STATE DeviceWakeLevel; + DEVICE_POWER_STATE SystemStateMapping[7]; + PIRP WaitWakeIrp; + PVOID SavedCancelRoutine; + LONG Paging; + LONG Hibernate; + LONG CrashDump; +} PCI_POWER_STATE, *PPCI_POWER_STATE; + +// +// Internal PCI Lock Structure +// +typedef struct _PCI_LOCK +{ + LONG Atom; + BOOLEAN OldIrql; +} PCI_LOCK, *PPCI_LOCK; + +// +// Device Extension for a Bus FDO +// +typedef struct _PCI_FDO_EXTENSION +{ + SINGLE_LIST_ENTRY List; + ULONG ExtensionType; + struct _PCI_MJ_DISPATCH_TABLE *IrpDispatchTable; + BOOLEAN DeviceState; + BOOLEAN TentativeNextState; + KEVENT SecondaryExtLock; + PDEVICE_OBJECT PhysicalDeviceObject; + PDEVICE_OBJECT FunctionalDeviceObject; + PDEVICE_OBJECT AttachedDeviceObject; + KEVENT ChildListLock; + struct _PCI_PDO_EXTENSION *ChildPdoList; + struct _PCI_FDO_EXTENSION *BusRootFdoExtension; + struct _PCI_FDO_EXTENSION *ParentFdoExtension; + struct _PCI_PDO_EXTENSION *ChildBridgePdoList; + PPCI_BUS_INTERFACE_STANDARD PciBusInterface; + BOOLEAN MaxSubordinateBus; + BUS_HANDLER *BusHandler; + BOOLEAN BaseBus; + BOOLEAN Fake; + BOOLEAN ChildDelete; + BOOLEAN Scanned; + BOOLEAN ArbitersInitialized; + BOOLEAN BrokenVideoHackApplied; + BOOLEAN Hibernated; + PCI_POWER_STATE PowerState; + SINGLE_LIST_ENTRY SecondaryExtension; + LONG ChildWaitWakeCount; + PPCI_COMMON_CONFIG PreservedConfig; + PCI_LOCK Lock; + struct + { + BOOLEAN Acquired; + BOOLEAN CacheLineSize; + BOOLEAN LatencyTimer; + BOOLEAN EnablePERR; + BOOLEAN EnableSERR; + } HotPlugParameters; + LONG BusHackFlags; +} PCI_FDO_EXTENSION, *PPCI_FDO_EXTENSION; + +// +// IRP Dispatch Function Type +// +typedef NTSTATUS (NTAPI *PCI_DISPATCH_FUNCTION)( + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension +); + +// +// IRP Dispatch Minor Table +// +typedef struct _PCI_MN_DISPATCH_TABLE +{ + PCI_DISPATCH_STYLE DispatchStyle; + PCI_DISPATCH_FUNCTION DispatchFunction; +} PCI_MN_DISPATCH_TABLE, *PPCI_MN_DISPATCH_TABLE; + +// +// IRP Dispatch Major Table +// +typedef struct _PCI_MJ_DISPATCH_TABLE +{ + ULONG PnpIrpMaximumMinorFunction; + PPCI_MN_DISPATCH_TABLE PnpIrpDispatchTable; + ULONG PowerIrpMaximumMinorFunction; + PPCI_MN_DISPATCH_TABLE PowerIrpDispatchTable; + PCI_DISPATCH_STYLE SystemControlIrpDispatchStyle; + PCI_DISPATCH_FUNCTION SystemControlIrpDispatchFunction; + PCI_DISPATCH_STYLE OtherIrpDispatchStyle; + PCI_DISPATCH_FUNCTION OtherIrpDispatchFunction; +} PCI_MJ_DISPATCH_TABLE, *PPCI_MJ_DISPATCH_TABLE; + +// +// Generic PCI Interface Constructor and Initializer +// +struct _PCI_INTERFACE; +typedef NTSTATUS (NTAPI *PCI_INTERFACE_CONSTRUCTOR)( + IN PPCI_FDO_EXTENSION DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface +); + +typedef NTSTATUS (NTAPI *PCI_INTERFACE_INITIALIZER)( + IN PVOID Instance +); + +// +// Generic PCI Interface (Interface, Translator, Arbiter) +// +typedef struct _PCI_INTERFACE +{ + LPGUID InterfaceType; + USHORT MinSize; + USHORT MinVersion; + USHORT MaxVersion; + USHORT Flags; + LONG ReferenceCount; + PCI_SIGNATURE Signature; + PCI_INTERFACE_CONSTRUCTOR Constructor; + PCI_INTERFACE_INITIALIZER Initializer; +} PCI_INTERFACE, *PPCI_INTERFACE; + +// +// Generic Secondary Extension Instance Header (Interface, Translator, Arbiter) +// +typedef struct PCI_SECONDARY_EXTENSION +{ + SINGLE_LIST_ENTRY List; + PCI_SIGNATURE ExtensionType; + PVOID Destructor; +} PCI_SECONDARY_EXTENSION, *PPCI_SECONDARY_EXTENSION; + +// +// PCI Arbiter Instance +// +typedef struct PCI_ARBITER_INSTANCE +{ + PCI_SECONDARY_EXTENSION Header; + PPCI_INTERFACE Interface; + PPCI_FDO_EXTENSION BusFdoExtension; + WCHAR InstanceName[24]; + //ARBITER_INSTANCE CommonInstance; FIXME: Need Arbiter Headers +} PCI_ARBITER_INSTANCE, *PPCI_ARBITER_INSTANCE; + +// // IRP Dispatch Routines // NTSTATUS @@ -55,6 +278,14 @@ PciDispatchIrp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp +); + +NTSTATUS +NTAPI +PciIrpNotSupported( + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension ); // @@ -136,4 +367,82 @@ OUT PULONG OutputLength ); +PPCI_FDO_EXTENSION +NTAPI +PciFindParentPciFdoExtension( + IN PDEVICE_OBJECT DeviceObject, + IN PKEVENT Lock +); + +VOID +NTAPI +PciInsertEntryAtTail( + IN PSINGLE_LIST_ENTRY ListHead, + IN PPCI_FDO_EXTENSION DeviceExtension, + IN PKEVENT Lock +); + +NTSTATUS +NTAPI +PciGetDeviceProperty( + IN PDEVICE_OBJECT DeviceObject, + IN DEVICE_REGISTRY_PROPERTY DeviceProperty, + OUT PVOID *OutputBuffer +); + +NTSTATUS +NTAPI +PciSendIoctl( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG IoControlCode, + IN PVOID InputBuffer, + IN ULONG InputBufferLength, + IN PVOID OutputBuffer, + IN ULONG OutputBufferLength +); + +VOID +NTAPI +PcipLinkSecondaryExtension( + IN PSINGLE_LIST_ENTRY List, + IN PVOID Lock, + IN PPCI_SECONDARY_EXTENSION SecondaryExtension, + IN PCI_SIGNATURE ExtensionType, + IN PVOID Destructor +); + +// +// Configuration Routines +// +NTSTATUS +NTAPI +PciGetConfigHandlers( + IN PPCI_FDO_EXTENSION FdoExtension +); + +// +// State Machine Logic Transition Routines +// +VOID +NTAPI +PciInitializeState( + IN PPCI_FDO_EXTENSION DeviceExtension +); + +// +// Arbiter Support +// +NTSTATUS +NTAPI +PciInitializeArbiters( + IN PPCI_FDO_EXTENSION FdoExtension +); + +// +// External Resources +// +extern SINGLE_LIST_ENTRY PciFdoExtensionListHead; +extern KEVENT PciGlobalLock; +extern PPCI_INTERFACE PciInterfaces[]; + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/pci/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/confi… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] Mon Jun 28 17:30:35 2010 @@ -14,6 +14,154 @@ /* GLOBALS ********************************************************************/ +BOOLEAN PciAssignBusNumbers; + /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +PciQueryForPciBusInterface(IN PPCI_FDO_EXTENSION FdoExtension) +{ + PDEVICE_OBJECT AttachedDevice; + IO_STATUS_BLOCK IoStatusBlock; + KEVENT Event; + NTSTATUS Status; + PIRP Irp; + PIO_STACK_LOCATION IoStackLocation; + PPCI_BUS_INTERFACE_STANDARD PciInterface; + PAGED_CODE(); + ASSERT(PCI_IS_ROOT_FDO(FdoExtension)); + + /* Allocate space for the inteface */ + PciInterface = ExAllocatePoolWithTag(NonPagedPool, + sizeof(PCI_BUS_INTERFACE_STANDARD), + PCI_POOL_TAG); + if (!PciInterface) return STATUS_INSUFFICIENT_RESOURCES; + + /* Get the device the PDO is attached to, should be the Root (ACPI) */ + AttachedDevice = IoGetAttachedDeviceReference(FdoExtension->PhysicalDeviceObject); + + /* Build an IRP for this request */ + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, + AttachedDevice, + NULL, + 0, + NULL, + &Event, + &IoStatusBlock); + if (Irp) + { + /* Initialize the default PnP response */ + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Information = 0; + + /* Make it a Query Interface IRP */ + IoStackLocation = IoGetNextIrpStackLocation(Irp); + ASSERT(IoStackLocation->MajorFunction == IRP_MJ_PNP); + IoStackLocation->MinorFunction = IRP_MN_QUERY_INTERFACE; + IoStackLocation->Parameters.QueryInterface.InterfaceType = &GUID_PCI_BUS_INTERFACE_STANDARD; + IoStackLocation->Parameters.QueryInterface.Size = sizeof(GUID_PCI_BUS_INTERFACE_STANDARD); + IoStackLocation->Parameters.QueryInterface.Version = PCI_BUS_INTERFACE_STANDARD_VERSION; + IoStackLocation->Parameters.QueryInterface.Interface = (PINTERFACE)PciInterface; + IoStackLocation->Parameters.QueryInterface.InterfaceSpecificData = NULL; + + /* Send it to the root PDO */ + Status = IoCallDriver(AttachedDevice, Irp); + if (Status == STATUS_PENDING) + { + /* Wait for completion */ + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = Irp->IoStatus.Status; + } + + /* Check if an interface was returned */ + if (!NT_SUCCESS(Status)) + { + /* No interface was returned by the root PDO */ + FdoExtension->PciBusInterface = NULL; + ExFreePoolWithTag(PciInterface, 0); + } + else + { + /* An interface was returned, save it */ + FdoExtension->PciBusInterface = PciInterface; + } + + /* Dereference the device object because we took a reference earlier */ + ObfDereferenceObject(AttachedDevice); + } + else + { + /* Failure path, dereference the device object and set failure code */ + if (AttachedDevice) ObfDereferenceObject(AttachedDevice); + ExFreePoolWithTag(PciInterface, 0); + Status = STATUS_INSUFFICIENT_RESOURCES; + } + + /* Return status code to caller */ + return Status; +} + +NTSTATUS +NTAPI +PciGetConfigHandlers(IN PPCI_FDO_EXTENSION FdoExtension) +{ + PBUS_HANDLER BusHandler; + NTSTATUS Status; + ASSERT(FdoExtension->BusHandler == NULL); + + /* Check if this is the FDO for the root bus */ + if (PCI_IS_ROOT_FDO(FdoExtension)) + { + /* Query the PCI Bus Interface that ACPI exposes */ + ASSERT(FdoExtension->PciBusInterface == NULL); + Status = PciQueryForPciBusInterface(FdoExtension); + if (!NT_SUCCESS(Status)) + { + /* No ACPI, so Bus Numbers should be maintained by BIOS */ + ASSERT(!PciAssignBusNumbers); + } + else + { + /* ACPI detected, PCI Bus Driver will reconfigure bus numbers*/ + PciAssignBusNumbers = TRUE; + } + } + else + { + /* Check if the root bus already has the interface set up */ + if (FdoExtension->BusRootFdoExtension->PciBusInterface) + { + /* Nothing for this FDO to do */ + return STATUS_SUCCESS; + } + + /* Fail into case below so we can query the HAL interface */ + Status = STATUS_NOT_SUPPORTED; + } + + /* If the ACPI PCI Bus Interface couldn't be obtained, try the HAL */ + if (!NT_SUCCESS(Status)) + { + /* Bus number assignment should be static */ + ASSERT(Status == STATUS_NOT_SUPPORTED); + ASSERT(!PciAssignBusNumbers); + + /* Call the HAL to obtain the bus handler for PCI */ + BusHandler = HalReferenceHandlerForBus(PCIBus, FdoExtension->BaseBus); + FdoExtension->BusHandler = BusHandler; + + /* Fail if the HAL does not have a PCI Bus Handler for this bus */ + if (!BusHandler) return STATUS_INVALID_DEVICE_REQUEST; + } + + /* Appropriate interface was obtained */ + return STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/pci/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/state… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/state.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/state.c [iso-8859-1] Mon Jun 28 17:30:35 2010 @@ -16,4 +16,13 @@ /* FUNCTIONS ******************************************************************/ +VOID +NTAPI +PciInitializeState(IN PPCI_FDO_EXTENSION DeviceExtension) +{ + /* Set the initial state */ + DeviceExtension->DeviceState = PciNotStarted; + DeviceExtension->TentativeNextState = PciNotStarted; +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/utils.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] Mon Jun 28 17:30:35 2010 @@ -333,4 +333,226 @@ return Status; } +PPCI_FDO_EXTENSION +NTAPI +PciFindParentPciFdoExtension(IN PDEVICE_OBJECT DeviceObject, + IN PKEVENT Lock) +{ + PPCI_FDO_EXTENSION FoundExtension; + + /* Assume we'll find nothing */ + FoundExtension = NULL; + + /* Check if a lock was specified */ + if (Lock) + { + /* Wait for the lock to be released */ + KeEnterCriticalRegion(); + KeWaitForSingleObject(Lock, Executive, KernelMode, FALSE, NULL); + } + + /* Now search for the extension */ + if (PciFdoExtensionListHead.Next) + { + /* This case should not be hit yet */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Check if we had acquired a lock previously */ + if (Lock) + { + /* Release it */ + KeSetEvent(Lock, IO_NO_INCREMENT, FALSE); + KeLeaveCriticalRegion(); + } + + /* Return which extension was found, if any */ + return FoundExtension; +} + +VOID +NTAPI +PciInsertEntryAtTail(IN PSINGLE_LIST_ENTRY ListHead, + IN PPCI_FDO_EXTENSION DeviceExtension, + IN PKEVENT Lock) +{ + PSINGLE_LIST_ENTRY NextEntry; + PAGED_CODE(); + + /* Check if a lock was specified */ + if (Lock) + { + /* Wait for the lock to be released */ + KeEnterCriticalRegion(); + KeWaitForSingleObject(Lock, Executive, KernelMode, FALSE, NULL); + } + + /* Loop the list until we get to the end, then insert this entry there */ + for (NextEntry = ListHead; NextEntry->Next; NextEntry = NextEntry->Next); + NextEntry->Next = &DeviceExtension->List; + + /* Check if we had acquired a lock previously */ + if (Lock) + { + /* Release it */ + KeSetEvent(Lock, IO_NO_INCREMENT, FALSE); + KeLeaveCriticalRegion(); + } +} + +VOID +NTAPI +PciInsertEntryAtHead(IN PSINGLE_LIST_ENTRY ListHead, + IN PSINGLE_LIST_ENTRY Entry, + IN PKEVENT Lock) +{ + PAGED_CODE(); + + /* Check if a lock was specified */ + if (Lock) + { + /* Wait for the lock to be released */ + KeEnterCriticalRegion(); + KeWaitForSingleObject(Lock, Executive, KernelMode, FALSE, NULL); + } + + /* Make the entry point to the current head and make the head point to it */ + Entry->Next = ListHead->Next; + ListHead->Next = Entry; + + /* Check if we had acquired a lock previously */ + if (Lock) + { + /* Release it */ + KeSetEvent(Lock, IO_NO_INCREMENT, FALSE); + KeLeaveCriticalRegion(); + } +} + +VOID +NTAPI +PcipLinkSecondaryExtension(IN PSINGLE_LIST_ENTRY List, + IN PVOID Lock, + IN PPCI_SECONDARY_EXTENSION SecondaryExtension, + IN PCI_SIGNATURE ExtensionType, + IN PVOID Destructor) +{ + PAGED_CODE(); + + /* Setup the extension data, and insert it into the primary's list */ + SecondaryExtension->ExtensionType = ExtensionType; + SecondaryExtension->Destructor = Destructor; + PciInsertEntryAtHead(List, &SecondaryExtension->List, Lock); +} + +NTSTATUS +NTAPI +PciGetDeviceProperty(IN PDEVICE_OBJECT DeviceObject, + IN DEVICE_REGISTRY_PROPERTY DeviceProperty, + OUT PVOID *OutputBuffer) +{ + NTSTATUS Status; + ULONG BufferLength, ResultLength; + PVOID Buffer; + do + { + /* Query the requested property size */ + Status = IoGetDeviceProperty(DeviceObject, + DeviceProperty, + 0, + NULL, + &BufferLength); + if (Status != STATUS_BUFFER_TOO_SMALL) + { + /* Call should've failed with buffer too small! */ + DPRINT1("PCI - Unexpected status from GetDeviceProperty, saw %08X, expected %08X.\n", + Status, + STATUS_BUFFER_TOO_SMALL); + *OutputBuffer = NULL; + ASSERTMSG(FALSE, "PCI Successfully did the impossible!"); + break; + } + + /* Allocate the required buffer */ + Buffer = ExAllocatePoolWithTag(PagedPool, BufferLength, 'BicP'); + if (!Buffer) + { + /* No memory, fail the request */ + DPRINT1("PCI - Failed to allocate DeviceProperty buffer (%d bytes).\n", BufferLength); + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + /* Do the actual property query call */ + Status = IoGetDeviceProperty(DeviceObject, + DeviceProperty, + BufferLength, + Buffer, + &ResultLength); + if (!NT_SUCCESS(Status)) break; + + /* Return the buffer to the caller */ + ASSERT(BufferLength == ResultLength); + *OutputBuffer = Buffer; + return STATUS_SUCCESS; + } while (FALSE); + + /* Failure path */ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +PciSendIoctl(IN PDEVICE_OBJECT DeviceObject, + IN ULONG IoControlCode, + IN PVOID InputBuffer, + IN ULONG InputBufferLength, + IN PVOID OutputBuffer, + IN ULONG OutputBufferLength) +{ + PIRP Irp; + NTSTATUS Status; + KEVENT Event; + IO_STATUS_BLOCK IoStatusBlock; + PDEVICE_OBJECT AttachedDevice; + PAGED_CODE(); + + /* Initialize the pending IRP event */ + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + + /* Get a reference to the root PDO (ACPI) */ + AttachedDevice = IoGetAttachedDeviceReference(DeviceObject); + if (!AttachedDevice) return STATUS_INVALID_PARAMETER; + + /* Build the requested IOCTL IRP */ + Irp = IoBuildDeviceIoControlRequest(IoControlCode, + AttachedDevice, + InputBuffer, + InputBufferLength, + OutputBuffer, + OutputBufferLength, + 0, + &Event, + &IoStatusBlock); + if (!Irp) return STATUS_INSUFFICIENT_RESOURCES; + + /* Send the IOCTL to the driver */ + Status = IoCallDriver(AttachedDevice, Irp); + if (Status == STATUS_PENDING) + { + /* Wait for a response */ + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = Irp->IoStatus.Status; + } + + /* Take away the reference we took and return the result to the caller */ + ObDereferenceObject(AttachedDevice); + return Status; +} + /* EOF */

1 0

[evb] 47897: Missing PCI_BUS_DRIVER_INTERNAL added to bugcodes. Thx for sir_richard to show me how to add.
by evb＠svn.reactos.org 28 Jun '10

28 Jun '10

Author: evb Date: Mon Jun 28 17:21:16 2010 New Revision: 47897 URL: http://svn.reactos.org/svn/reactos?rev=47897&view=rev Log: Missing PCI_BUS_DRIVER_INTERNAL added to bugcodes. Thx for sir_richard to show me how to add. Modified: trunk/reactos/include/reactos/mc/bugcodes.mc Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Mon Jun 28 17:21:16 2010 @@ -1189,6 +1189,14 @@ INTERNAL_POWER_ERROR . +MessageId=0xA1 +Severity=Success +Facility=System +SymbolicName=PCI_BUS_DRIVER_INTERNAL +Language=English +Inconsistency detected in the PCI Bus driver's internal structures. +. + MessageId=0xA5 Severity=Success Facility=System

1 0

[spetreolle] 47896: Fix midiOutOpen and midiInOpen prototypes.
by spetreolle＠svn.reactos.org 28 Jun '10

28 Jun '10

Author: spetreolle Date: Mon Jun 28 16:59:17 2010 New Revision: 47896 URL: http://svn.reactos.org/svn/reactos?rev=47896&view=rev Log: Fix midiOutOpen and midiInOpen prototypes. Modified: trunk/reactos/include/psdk/mmsystem.h Modified: trunk/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmsystem.h?re… ============================================================================== --- trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] Mon Jun 28 16:59:17 2010 @@ -1780,7 +1780,7 @@ MMRESULT WINAPI midiOutSetVolume(HMIDIOUT,DWORD); MMRESULT WINAPI midiOutGetErrorTextA(MMRESULT,LPSTR,UINT); MMRESULT WINAPI midiOutGetErrorTextW(MMRESULT,LPWSTR,UINT); -MMRESULT WINAPI midiOutOpen(LPHMIDIOUT,UINT_PTR,DWORD_PTR,DWORD_PTR,DWORD); +MMRESULT WINAPI midiOutOpen(LPHMIDIOUT,UINT,DWORD_PTR,DWORD_PTR,DWORD); MMRESULT WINAPI midiOutClose(HMIDIOUT); MMRESULT WINAPI midiOutPrepareHeader(HMIDIOUT,LPMIDIHDR,UINT); MMRESULT WINAPI midiOutUnprepareHeader(HMIDIOUT,LPMIDIHDR,UINT); @@ -1802,7 +1802,7 @@ MMRESULT WINAPI midiInGetDevCapsW(UINT_PTR,LPMIDIINCAPSW,UINT); MMRESULT WINAPI midiInGetErrorTextA(MMRESULT,LPSTR,UINT); MMRESULT WINAPI midiInGetErrorTextW(MMRESULT,LPWSTR,UINT); -MMRESULT WINAPI midiInOpen(LPHMIDIIN,UINT_PTR,DWORD_PTR,DWORD_PTR,DWORD); +MMRESULT WINAPI midiInOpen(LPHMIDIIN,UINT,DWORD_PTR,DWORD_PTR,DWORD); MMRESULT WINAPI midiInClose(HMIDIIN); MMRESULT WINAPI midiInPrepareHeader(HMIDIIN,LPMIDIHDR,UINT); MMRESULT WINAPI midiInUnprepareHeader(HMIDIIN,LPMIDIHDR,UINT);

1 0

[evb] 47894: Begin implement full PCI Bus Driver. code by me comments by sir_richard to avoid Engrish DriverEntry full 100% implemented, ACPI WatchDog detect, PCI IRQ Routing detect, PCI errata/hackflag detect (PciGetDebugPorts not support, need PCI Debug Device to test) Native (S)ATA, PCI BIOS Resource Lock, System Errata/Hackflag also is detect HAL Hoooking enabled, callbacks stub Stub PnP Interfaces: PciAddDevice, PciDriverUnload, PciDispatchIrp PCI utility routines: PciUnicodeStringStrStr, P
by evb＠svn.reactos.org 28 Jun '10

28 Jun '10

Author: evb Date: Mon Jun 28 05:23:31 2010 New Revision: 47894 URL: http://svn.reactos.org/svn/reactos?rev=47894&view=rev Log: Begin implement full PCI Bus Driver. code by me comments by sir_richard to avoid Engrish DriverEntry full 100% implemented, ACPI WatchDog detect, PCI IRQ Routing detect, PCI errata/hackflag detect (PciGetDebugPorts not support, need PCI Debug Device to test) Native (S)ATA, PCI BIOS Resource Lock, System Errata/Hackflag also is detect HAL Hoooking enabled, callbacks stub Stub PnP Interfaces: PciAddDevice, PciDriverUnload, PciDispatchIrp PCI utility routines: PciUnicodeStringStrStr, PciStringToUSHORT, PciIsSuiteVersion, PciIsDatacenter, PciOpenKey, PciGetRegistryValue, PciBuildDefaultExclusionList done PCI Verifier Support for future: PciVerifierInit/PciVerifierProfileChangeCallback (stub) Thank you for much patience~ This 1200 first codes, have 12000 codes more to come!~~ Modified: trunk/reactos/drivers/bus/pcix/dispatch.c trunk/reactos/drivers/bus/pcix/fdo.c trunk/reactos/drivers/bus/pcix/hookhal.c trunk/reactos/drivers/bus/pcix/init.c trunk/reactos/drivers/bus/pcix/pci.h trunk/reactos/drivers/bus/pcix/pcivrify.c trunk/reactos/drivers/bus/pcix/utils.c Modified: trunk/reactos/drivers/bus/pcix/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/dispatch.… ============================================================================== --- trunk/reactos/drivers/bus/pcix/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/dispatch.c [iso-8859-1] Mon Jun 28 05:23:31 2010 @@ -16,4 +16,15 @@ /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +PciDispatchIrp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + /* This function is not yet implemented */ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/fdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] Mon Jun 28 05:23:31 2010 @@ -16,4 +16,15 @@ /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +PciAddDevice(IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + /* This function is not yet implemented */ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/hookhal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/hookhal.c… ============================================================================== --- trunk/reactos/drivers/bus/pcix/hookhal.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/hookhal.c [iso-8859-1] Mon Jun 28 05:23:31 2010 @@ -14,6 +14,55 @@ /* GLOBALS ********************************************************************/ +pHalTranslateBusAddress PcipSavedTranslateBusAddress; +pHalAssignSlotResources PcipSavedAssignSlotResources; + /* FUNCTIONS ******************************************************************/ +BOOLEAN +NTAPI +PciTranslateBusAddress(IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber, + IN PHYSICAL_ADDRESS BusAddress, + OUT PULONG AddressSpace, + OUT PPHYSICAL_ADDRESS TranslatedAddress) +{ + /* This function is not yet implemented */ + UNIMPLEMENTED; + while (TRUE); + return FALSE; +} + +NTSTATUS +NTAPI +PciAssignSlotResources(IN PUNICODE_STRING RegistryPath, + IN PUNICODE_STRING DriverClassName OPTIONAL, + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT DeviceObject, + IN INTERFACE_TYPE BusType, + IN ULONG BusNumber, + IN ULONG SlotNumber, + IN OUT PCM_RESOURCE_LIST *AllocatedResources) +{ + /* This function is not yet implemented */ + UNIMPLEMENTED; + while (TRUE); + return STATUS_NOT_SUPPORTED; +} + +VOID +NTAPI +PciHookHal(VOID) +{ + /* Save the old HAL routines */ + ASSERT(PcipSavedAssignSlotResources == NULL); + ASSERT(PcipSavedTranslateBusAddress == NULL); + PcipSavedAssignSlotResources = HalPciAssignSlotResources; + PcipSavedTranslateBusAddress = HalPciTranslateBusAddress; + + /* Take over the HAL's Bus Handler functions */ + HalPciAssignSlotResources = PciAssignSlotResources; + HalPciTranslateBusAddress = PciTranslateBusAddress; +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/init.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/init.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/init.c [iso-8859-1] Mon Jun 28 05:23:31 2010 @@ -14,17 +14,843 @@ /* GLOBALS ********************************************************************/ +BOOLEAN PciRunningDatacenter; +PDRIVER_OBJECT PciDriverObject; +KEVENT PciGlobalLock; +KEVENT PciBusLock; +KEVENT PciLegacyDescriptionLock; +BOOLEAN PciLockDeviceResources; +BOOLEAN PciEnableNativeModeATA; +ULONG PciSystemWideHackFlags; +PPCI_IRQ_ROUTING_TABLE PciIrqRoutingTable; +PWATCHDOG_TABLE WdTable; +PPCI_HACK_ENTRY PciHackTable; + /* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +PciAcpiFindRsdt(OUT PACPI_BIOS_MULTI_NODE *AcpiMultiNode) +{ + BOOLEAN Result; + NTSTATUS Status; + HANDLE KeyHandle, SubKey; + ULONG NumberOfBytes, i, Length; + PKEY_FULL_INFORMATION FullInfo; + PKEY_VALUE_BASIC_INFORMATION KeyInfo; + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; + PACPI_BIOS_MULTI_NODE NodeData; + UNICODE_STRING ValueName; + struct + { + CM_FULL_RESOURCE_DESCRIPTOR Descriptor; + ACPI_BIOS_MULTI_NODE Node; + } *Package; + + /* So we know what to free at the end of the body */ + ValueInfo = NULL; + KeyInfo = NULL; + KeyHandle = NULL; + FullInfo = NULL; + Package = NULL; + do + { + /* Open the ACPI BIOS key */ + Result = PciOpenKey(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\" + L"System\\MultiFunctionAdapter", + NULL, + KEY_QUERY_VALUE, + &KeyHandle, + &Status); + if (!Result) break; + + /* Query how much space should be allocated for the key information */ + Status = ZwQueryKey(KeyHandle, + KeyFullInformation, + NULL, + sizeof(ULONG), + &NumberOfBytes); + if (Status != STATUS_BUFFER_TOO_SMALL) break; + + /* Allocate the space required */ + Status = STATUS_INSUFFICIENT_RESOURCES; + FullInfo = ExAllocatePoolWithTag(PagedPool, NumberOfBytes, PCI_POOL_TAG); + if ( !FullInfo ) break; + + /* Now query the key information that's needed */ + Status = ZwQueryKey(KeyHandle, + KeyFullInformation, + FullInfo, + NumberOfBytes, + &NumberOfBytes); + if (!NT_SUCCESS(Status)) break; + + /* Allocate enough space to hold the value information plus the name */ + Status = STATUS_INSUFFICIENT_RESOURCES; + Length = FullInfo->MaxNameLen + 26; + KeyInfo = ExAllocatePoolWithTag(PagedPool, Length, PCI_POOL_TAG); + if ( !KeyInfo ) break; + + /* Allocate the value information and name we expect to find */ + ValueInfo = ExAllocatePoolWithTag(PagedPool, + sizeof(KEY_VALUE_PARTIAL_INFORMATION) + + sizeof(L"ACPI BIOS"), + PCI_POOL_TAG); + if (!ValueInfo) break; + + /* Query each sub-key */ + Status = ZwEnumerateKey(KeyHandle, + 0, + KeyValueBasicInformation, + KeyInfo, + Length, + &NumberOfBytes); + for (i = 0; Status != STATUS_NO_MORE_ENTRIES; i++) + { + /* Null-terminate the keyname, because the kernel does not */ + KeyInfo->Name[KeyInfo->NameLength / sizeof(WCHAR)] = UNICODE_NULL; + + /* Open this subkey */ + Result = PciOpenKey(KeyInfo->Name, + KeyHandle, + KEY_QUERY_VALUE, + &SubKey, + &Status); + if (Result) + { + /* Query the identifier value for this subkey */ + RtlInitUnicodeString(&ValueName, L"Identifier"); + Status = ZwQueryValueKey(SubKey, + &ValueName, + KeyValuePartialInformation, + ValueInfo, + sizeof(KEY_VALUE_PARTIAL_INFORMATION) + + sizeof(L"ACPI BIOS"), + &NumberOfBytes); + if (NT_SUCCESS(Status)) + { + /* Check if this is the PCI BIOS subkey */ + if (!wcsncmp((PWCHAR)ValueInfo->Data, + L"ACPI BIOS", + ValueInfo->DataLength)) + { + /* It is, proceed to query the PCI IRQ routing table */ + Status = PciGetRegistryValue(L"Configuration Data", + KeyInfo->Name, + KeyHandle, + REG_FULL_RESOURCE_DESCRIPTOR, + (PVOID*)&Package, + &NumberOfBytes); + ZwClose(SubKey); + break; + } + } + + /* Close the subkey and try the next one */ + ZwClose(SubKey); + } + } + + /* Check if we got here because the routing table was found */ + if (!NT_SUCCESS(Status)) + { + /* This should only fail if we're out of entries */ + ASSERT(Status == STATUS_NO_MORE_ENTRIES); + break; + } + + /* Check if a descriptor was found */ + if (!Package) break; + + /* The configuration data is a resource list, and the BIOS node follows */ + NodeData = &Package->Node; + + /* How many E820 memory entries are there? */ + Length = sizeof(ACPI_BIOS_MULTI_NODE) + + (NodeData->Count - 1) * sizeof(ACPI_E820_ENTRY); + + /* Allocate the buffer needed to copy the information */ + Status = STATUS_INSUFFICIENT_RESOURCES; + *AcpiMultiNode = ExAllocatePoolWithTag(NonPagedPool, Length, PCI_POOL_TAG); + if (!*AcpiMultiNode) break; + + /* Copy the data */ + RtlCopyMemory(*AcpiMultiNode, NodeData, Length); + } while (FALSE); + + /* Close any opened keys, free temporary allocations, and return status */ + if (Package) ExFreePoolWithTag(Package, 0); + if (ValueInfo) ExFreePoolWithTag(ValueInfo, 0); + if (KeyInfo) ExFreePoolWithTag(KeyInfo, 0); + if (FullInfo) ExFreePoolWithTag(FullInfo, 0); + if (KeyHandle) ZwClose(KeyHandle); + return Status; +} + +PVOID +NTAPI +PciGetAcpiTable(IN ULONG TableCode) +{ + PDESCRIPTION_HEADER Header; + PACPI_BIOS_MULTI_NODE AcpiMultiNode; + PRSDT Rsdt; + PXSDT Xsdt; + ULONG EntryCount, TableLength, Offset, CurrentEntry; + PVOID TableBuffer, MappedAddress; + PHYSICAL_ADDRESS PhysicalAddress; + NTSTATUS Status; + + /* Try to find the RSDT or XSDT */ + Status = PciAcpiFindRsdt(&AcpiMultiNode); + if (NT_SUCCESS(Status)) + { + /* No ACPI on the machine */ + DPRINT1("AcpiFindRsdt() Failed!\n"); + return NULL; + } + + /* Map the RSDT with the minimum size allowed */ + MappedAddress = MmMapIoSpace(AcpiMultiNode->RsdtAddress, + sizeof(DESCRIPTION_HEADER), + MmNonCached); + Header = MappedAddress; + if (!Header) return NULL; + + /* Check how big the table really is and get rid of the temporary header */ + TableLength = Header->Length; + MmUnmapIoSpace(Header, sizeof(DESCRIPTION_HEADER)); + Header = NULL; + + /* Map its true size */ + MappedAddress = MmMapIoSpace(AcpiMultiNode->RsdtAddress, + TableLength, + MmNonCached); + Rsdt = MappedAddress; + Xsdt = MappedAddress; + ExFreePoolWithTag(AcpiMultiNode, 0); + if (!Rsdt) return NULL; + + /* Validate the table's signature */ + DPRINT1("ACPI RSDT/XSDT at 0x%p\n", Rsdt); + if ((Rsdt->Header.Signature != RSDT_SIGNATURE) && + (Rsdt->Header.Signature != XSDT_SIGNATURE)) + { + /* Very bad: crash */ + HalDisplayString("RSDT table contains invalid signature\n"); + MmUnmapIoSpace(Rsdt, TableLength); + return NULL; + } + + /* Smallest RSDT/XSDT is one without table entries */ + Offset = FIELD_OFFSET(RSDT, Tables); + if (Rsdt->Header.Signature == XSDT_SIGNATURE) + { + /* Figure out total size of table and the offset */ + TableLength = Xsdt->Header.Length; + if (TableLength < Offset) Offset = Xsdt->Header.Length; + + /* The entries are each 64-bits, so count them */ + EntryCount = (TableLength - Offset) / sizeof(PHYSICAL_ADDRESS); + } + else + { + /* Figure out total size of table and the offset */ + TableLength = Rsdt->Header.Length; + if (TableLength < Offset) Offset = Rsdt->Header.Length; + + /* The entries are each 32-bits, so count them */ + EntryCount = (TableLength - Offset) / sizeof(ULONG); + } + + /* Start at the beginning of the array and loop it */ + for (CurrentEntry = 0; CurrentEntry < EntryCount; CurrentEntry++) + { + /* Are we using the XSDT? */ + if (Rsdt->Header.Signature != XSDT_SIGNATURE) + { + /* Read the 32-bit physical address */ + PhysicalAddress.LowPart = Rsdt->Tables[CurrentEntry]; + } + else + { + /* Read the 64-bit physical address */ + PhysicalAddress = Xsdt->Tables[CurrentEntry]; + } + + /* Map this table */ + Header = MmMapIoSpace(PhysicalAddress, + sizeof(DESCRIPTION_HEADER), + MmNonCached); + if (!Header) break; + + /* Check if this is the table that's being asked for */ + if (Header->Signature == TableCode) + { + /* Allocate a buffer for it */ + TableBuffer = ExAllocatePoolWithTag(PagedPool, + Header->Length, + PCI_POOL_TAG); + if (!TableBuffer) break; + + /* Copy the table into the buffer */ + RtlCopyMemory(TableBuffer, Header, Header->Length); + } + + /* Done with this table, keep going */ + MmUnmapIoSpace(Header, sizeof(DESCRIPTION_HEADER)); + } + + if (Header) MmUnmapIoSpace(Header, sizeof(DESCRIPTION_HEADER)); + return NULL; +} + +NTSTATUS +NTAPI +PciGetIrqRoutingTableFromRegistry(OUT PPCI_IRQ_ROUTING_TABLE *PciRoutingTable) +{ + BOOLEAN Result; + NTSTATUS Status; + HANDLE KeyHandle, SubKey; + ULONG NumberOfBytes, i, Length; + PKEY_FULL_INFORMATION FullInfo; + PKEY_VALUE_BASIC_INFORMATION KeyInfo; + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; + UNICODE_STRING ValueName; + struct + { + CM_FULL_RESOURCE_DESCRIPTOR Descriptor; + PCI_IRQ_ROUTING_TABLE Table; + } *Package; + + /* So we know what to free at the end of the body */ + Package = NULL; + ValueInfo = NULL; + KeyInfo = NULL; + KeyHandle = NULL; + FullInfo = NULL; + do + { + /* Open the BIOS key */ + Result = PciOpenKey(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\" + L"System\\MultiFunctionAdapter", + NULL, + KEY_QUERY_VALUE, + &KeyHandle, + &Status); + if (!Result) break; + + /* Query how much space should be allocated for the key information */ + Status = ZwQueryKey(KeyHandle, + KeyFullInformation, + NULL, + sizeof(ULONG), + &NumberOfBytes); + if (Status != STATUS_BUFFER_TOO_SMALL) break; + + /* Allocate the space required */ + Status = STATUS_INSUFFICIENT_RESOURCES; + FullInfo = ExAllocatePoolWithTag(PagedPool, NumberOfBytes, PCI_POOL_TAG); + if ( !FullInfo ) break; + + /* Now query the key information that's needed */ + Status = ZwQueryKey(KeyHandle, + KeyFullInformation, + FullInfo, + NumberOfBytes, + &NumberOfBytes); + if (!NT_SUCCESS(Status)) break; + + /* Allocate enough space to hold the value information plus the name */ + Status = STATUS_INSUFFICIENT_RESOURCES; + Length = FullInfo->MaxNameLen + 26; + KeyInfo = ExAllocatePoolWithTag(PagedPool, Length, PCI_POOL_TAG); + if ( !KeyInfo ) break; + + /* Allocate the value information and name we expect to find */ + ValueInfo = ExAllocatePoolWithTag(PagedPool, + sizeof(KEY_VALUE_PARTIAL_INFORMATION) + + sizeof(L"PCI BIOS"), + PCI_POOL_TAG); + if ( !ValueInfo ) break; + + /* Query each sub-key */ + Status = ZwEnumerateKey(KeyHandle, + 0, + KeyValueBasicInformation, + KeyInfo, + Length, + &NumberOfBytes); + for (i = 0; Status != STATUS_NO_MORE_ENTRIES; i++) + { + /* Null-terminate the keyname, because the kernel does not */ + KeyInfo->Name[KeyInfo->NameLength / sizeof(WCHAR)] = UNICODE_NULL; + + /* Open this subkey */ + Result = PciOpenKey(KeyInfo->Name, + KeyHandle, + KEY_QUERY_VALUE, + &SubKey, + &Status); + if (Result) + { + /* Query the identifier value for this subkey */ + RtlInitUnicodeString(&ValueName, L"Identifier"); + Status = ZwQueryValueKey(SubKey, + &ValueName, + KeyValuePartialInformation, + ValueInfo, + sizeof(KEY_VALUE_PARTIAL_INFORMATION) + + sizeof(L"PCI BIOS"), + &NumberOfBytes); + if (NT_SUCCESS(Status)) + { + /* Check if this is the PCI BIOS subkey */ + if (!wcsncmp((PWCHAR)ValueInfo->Data, + L"PCI BIOS", + ValueInfo->DataLength)) + { + /* It is, proceed to query the PCI IRQ routing table */ + Status = PciGetRegistryValue(L"Configuration Data", + L"RealModeIrqRoutingTable" + L"\\0", + SubKey, + REG_FULL_RESOURCE_DESCRIPTOR, + (PVOID*)&Package, + &NumberOfBytes); + ZwClose(SubKey); + break; + } + } + + /* Close the subkey and try the next one */ + ZwClose(SubKey); + } + } + + /* Check if we got here because the routing table was found */ + if (!NT_SUCCESS(Status)) break; + + /* Check if a descriptor was found */ + if (!Package) break; + + /* Make sure the buffer is large enough to hold the table */ + if ((NumberOfBytes < sizeof(*Package)) || + (Package->Table.TableSize > + (NumberOfBytes - sizeof(CM_FULL_RESOURCE_DESCRIPTOR)))) + { + /* Invalid package size */ + Status = STATUS_UNSUCCESSFUL; + break; + } + + /* Allocate space for the table */ + Status = STATUS_INSUFFICIENT_RESOURCES; + *PciRoutingTable = ExAllocatePoolWithTag(PagedPool, + NumberOfBytes, + PCI_POOL_TAG); + if (!*PciRoutingTable) break; + + /* Copy the registry data */ + RtlCopyMemory(*PciRoutingTable, + &Package->Table, + NumberOfBytes - sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); + Status = STATUS_SUCCESS; + } while (FALSE); + + /* Close any opened keys, free temporary allocations, and return status */ + if (Package) ExFreePoolWithTag(Package, 0); + if (ValueInfo) ExFreePoolWithTag(ValueInfo, 0); + if (KeyInfo) ExFreePoolWithTag(KeyInfo, 0); + if (FullInfo) ExFreePoolWithTag(FullInfo, 0); + if (KeyHandle) ZwClose(KeyHandle); + return Status; +} + +NTSTATUS +NTAPI +PciBuildHackTable(IN HANDLE KeyHandle) +{ + PKEY_FULL_INFORMATION FullInfo; + ULONG i, HackCount; + PKEY_VALUE_FULL_INFORMATION ValueInfo; + PPCI_HACK_ENTRY Entry; + NTSTATUS Status; + ULONG NameLength, ResultLength; + ULONGLONG HackFlags; + + /* So we know what to free at the end of the body */ + FullInfo = NULL; + ValueInfo = NULL; + do + { + /* Query the size required for full key information */ + Status = ZwQueryKey(KeyHandle, + KeyFullInformation, + NULL, + 0, + &ResultLength); + if (Status != STATUS_BUFFER_TOO_SMALL) break; + + /* Allocate the space required to hold the full key information */ + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(ResultLength > 0); + FullInfo = ExAllocatePoolWithTag(PagedPool, ResultLength, PCI_POOL_TAG); + if (!FullInfo) break; + + /* Go ahead and query the key information */ + Status = ZwQueryKey(KeyHandle, + KeyFullInformation, + FullInfo, + ResultLength, + &ResultLength); + if (!NT_SUCCESS(Status)) break; + + /* The only piece of information that's needed is the count of values */ + HackCount = FullInfo->Values; + + /* Free the structure now */ + ExFreePoolWithTag(FullInfo, 0); + FullInfo = NULL; + + /* Allocate the hack table, now that the number of entries is known */ + Status = STATUS_INSUFFICIENT_RESOURCES; + ResultLength = sizeof(PCI_HACK_ENTRY) * HackCount; + PciHackTable = ExAllocatePoolWithTag(NonPagedPool, + ResultLength + + sizeof(PCI_HACK_ENTRY), + PCI_POOL_TAG); + if (!PciHackTable) break; + + /* Allocate the space needed to hold the full value information */ + ValueInfo = ExAllocatePoolWithTag(NonPagedPool, + sizeof(KEY_VALUE_FULL_INFORMATION) + + PCI_HACK_ENTRY_FULL_SIZE, + PCI_POOL_TAG); + if (!PciHackTable) break; + + /* Loop each value in the registry */ + Entry = &PciHackTable[0]; + for (i = 0; i < HackCount; i++) + { + /* Get the entry for this value */ + Entry = &PciHackTable[i]; + + /* Query the value in the key */ + Status = ZwEnumerateValueKey(KeyHandle, + i, + KeyValueFullInformation, + ValueInfo, + sizeof(KEY_VALUE_FULL_INFORMATION) + + PCI_HACK_ENTRY_FULL_SIZE, + &ResultLength); + if (!NT_SUCCESS(Status)) + { + /* Check why the call failed */ + if ((Status != STATUS_BUFFER_OVERFLOW) && + (Status != STATUS_BUFFER_TOO_SMALL)) + { + /* The call failed due to an unknown error, bail out */ + break; + } + + /* The data seems to mismatch, try the next key in the list */ + continue; + } + + /* Check if the value data matches what's expected */ + if ((ValueInfo->Type != REG_BINARY) || + (ValueInfo->DataLength != sizeof(ULONGLONG))) + { + /* It doesn't, try the next key in the list */ + continue; + } + + /* Read the actual hack flags */ + HackFlags = *(PULONGLONG)((ULONG_PTR)ValueInfo + + ValueInfo->DataOffset); + + /* Check what kind of errata entry this is, based on the name */ + NameLength = ValueInfo->NameLength; + if ((NameLength != PCI_HACK_ENTRY_SIZE) && + (NameLength != PCI_HACK_ENTRY_REV_SIZE) && + (NameLength != PCI_HACK_ENTRY_SUBSYS_SIZE) && + (NameLength != PCI_HACK_ENTRY_FULL_SIZE)) + { + DPRINT1("Skipping hack entry with invalid length name\n"); + } + + /* Initialize the entry */ + RtlZeroMemory(Entry, sizeof(PCI_HACK_ENTRY)); + + /* Get the vendor and device data */ + if (!(PciStringToUSHORT(ValueInfo->Name, &Entry->VendorID)) || + !(PciStringToUSHORT(&ValueInfo->Name[4], &Entry->DeviceID))) + { + /* This failed, try the next entry */ + continue; + } + + /* Check if the entry contains subsystem information */ + if ((NameLength == PCI_HACK_ENTRY_SUBSYS_SIZE) || + (NameLength == PCI_HACK_ENTRY_FULL_SIZE)) + { + /* Get the data */ + if (!(PciStringToUSHORT(&ValueInfo->Name[8], + &Entry->SubVendorID)) || + !(PciStringToUSHORT(&ValueInfo->Name[12], + &Entry->SubSystemID))) + { + /* This failed, try the next entry */ + continue; + } + + /* Save the fact this entry has finer controls */ + Entry->Flags |= PCI_HACK_HAS_SUBSYSTEM_INFO; + } + + /* Check if the entry contains revision information */ + if ((NameLength == PCI_HACK_ENTRY_REV_SIZE) || + (NameLength == PCI_HACK_ENTRY_FULL_SIZE)) + { + /* Get the data */ + if (!PciStringToUSHORT(&ValueInfo->Name[16], + &Entry->RevisionID)) + { + /* This failed, try the next entry */ + continue; + } + + /* Save the fact this entry has finer controls */ + Entry->Flags |= PCI_HACK_HAS_REVISION_INFO; + } + + /* Only the last entry should have this set */ + ASSERT(Entry->VendorID != PCI_INVALID_VENDORID); + + /* Save the actual hack flags */ + Entry->HackFlags = HackFlags; + + /* Print out for the debugger's sake */ + DPRINT1("Adding Hack entry for Vendor:0x%04x Device:0x%04x ", + Entry->VendorID, Entry->DeviceID); + if (Entry->Flags & PCI_HACK_HAS_SUBSYSTEM_INFO) + DPRINT1("SybSys:0x%04x SubVendor:0x%04x ", + Entry->SubSystemID, Entry->SubVendorID); + if (Entry->Flags & PCI_HACK_HAS_REVISION_INFO) + DPRINT1("Revision:0x%02x", Entry->RevisionID); + DPRINT1(" = 0x%I64x\n", Entry->HackFlags); + } + + /* Bail out in case of failure */ + if (!NT_SUCCESS(Status)) break; + + /* Terminate the table with an invalid entry */ + ASSERT(Entry < (PciHackTable + HackCount + 1)); + Entry->VendorID = PCI_INVALID_VENDORID; + + /* Success path, free the temporary registry data */ + ExFreePoolWithTag(ValueInfo, 0); + return STATUS_SUCCESS; + } while (TRUE); + + /* Failure path, free temporary allocations and return failure code */ + ASSERT(!NT_SUCCESS(Status)); + if (FullInfo) ExFreePool(FullInfo); + if (ValueInfo) ExFreePool(ValueInfo); + if (PciHackTable) ExFreePool(PciHackTable); + return Status; +} + +NTSTATUS +NTAPI +PciGetDebugPorts(IN HANDLE DebugKey) +{ + /* This function is not yet implemented */ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} + +VOID +NTAPI +PciDriverUnload(IN PDRIVER_OBJECT DriverObject) +{ + /* This function is not yet implemented */ + DPRINT1("PCI: Unload\n"); + UNIMPLEMENTED; + while (TRUE); +} NTSTATUS NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { + HANDLE KeyHandle, ParametersKey, DebugKey, ControlSetKey; + BOOLEAN Result; + OBJECT_ATTRIBUTES ObjectAttributes; + ULONG ResultLength; + PULONG Value; + PWCHAR StartOptions; + UNICODE_STRING OptionString, PciLockString; + NTSTATUS Status; DPRINT1("PCI: DriverEntry!\n"); - - /* FIXME: TODO */ - return STATUS_NOT_SUPPORTED; + do + { + /* Remember our object so we can get it to it later */ + PciDriverObject = DriverObject; + + /* Setup the IRP dispatcher */ + DriverObject->MajorFunction[IRP_MJ_POWER] = PciDispatchIrp; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = PciDispatchIrp; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = PciDispatchIrp; + DriverObject->MajorFunction[IRP_MJ_PNP] = PciDispatchIrp; + DriverObject->DriverUnload = PciDriverUnload; + + /* This is how we'll detect a new PCI bus */ + DriverObject->DriverExtension->AddDevice = PciAddDevice; + + /* Open the PCI key */ + InitializeObjectAttributes(&ObjectAttributes, + RegistryPath, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(&KeyHandle, KEY_QUERY_VALUE, &ObjectAttributes); + if (!NT_SUCCESS(Status)) break; + + /* Open the Parameters subkey */ + Result = PciOpenKey(L"Parameters", + KeyHandle, + KEY_QUERY_VALUE, + &ParametersKey, + &Status); + if (!Result) break; + + /* Build the list of all known PCI erratas */ + Status = PciBuildHackTable(ParametersKey); + if (!NT_SUCCESS(Status)) break; + + /* Open the debug key, if it exists */ + Result = PciOpenKey(L"Debug", + KeyHandle, + KEY_QUERY_VALUE, + &DebugKey, + &Status); + if (Result) + { + /* There are PCI debug devices, go discover them */ + Status = PciGetDebugPorts(DebugKey); + if (!NT_SUCCESS(Status)) break; + } + + /* Initialize the synchronization locks */ + KeInitializeEvent(&PciGlobalLock, SynchronizationEvent, TRUE); + KeInitializeEvent(&PciBusLock, SynchronizationEvent, TRUE); + KeInitializeEvent(&PciLegacyDescriptionLock, SynchronizationEvent, TRUE); + + /* Open the control set key */ + Status = PciOpenKey(L"\\Registry\\Machine\\System\\CurrentControlSet", + NULL, + KEY_QUERY_VALUE, + &ControlSetKey, + &Status); + if (!NT_SUCCESS(Status)) break; + + /* Read the command line */ + Status = PciGetRegistryValue(L"SystemStartOptions", + L"Control", + ControlSetKey, + REG_SZ, + (PVOID*)&StartOptions, + &ResultLength); + if (NT_SUCCESS(Status)) + { + /* Initialize the command-line as a string */ + OptionString.Buffer = StartOptions; + OptionString.MaximumLength = OptionString.Length = ResultLength; + + /* Check if the command-line has the PCILOCK argument */ + RtlInitUnicodeString(&PciLockString, L"PCILOCK"); + if (PciUnicodeStringStrStr(&OptionString, &PciLockString, TRUE)) + { + /* The PCI Bus driver will keep the BIOS-assigned resources */ + PciLockDeviceResources = TRUE; + } + + /* This data isn't needed anymore */ + ExFreePoolWithTag(StartOptions, 0); + } + + /* The PCILOCK feature can also be enabled per-system in the registry */ + Status = PciGetRegistryValue(L"PCILock", + L"Control\\BiosInfo\\PCI", + ControlSetKey, + REG_DWORD, + (PVOID*)&Value, + &ResultLength); + if (NT_SUCCESS(Status)) + { + /* Read the value it's been set to. This overrides /PCILOCK */ + if (ResultLength == sizeof(ULONG)) PciLockDeviceResources = *Value; + ExFreePoolWithTag(Value, 0); + } + + /* The system can have global PCI erratas in the registry */ + Status = PciGetRegistryValue(L"HackFlags", + L"Control\\PnP\\PCI", + ControlSetKey, + REG_DWORD, + (PVOID*)&Value, + &ResultLength); + if (NT_SUCCESS(Status)) + { + /* Read them in */ + if (ResultLength == sizeof(ULONG)) PciSystemWideHackFlags = *Value; + ExFreePoolWithTag(Value, 0); + } + + /* Check if the system should allow native ATA support */ + Status = PciGetRegistryValue(L"EnableNativeModeATA", + L"Control\\PnP\\PCI", + ControlSetKey, + REG_DWORD, + (PVOID*)&Value, + &ResultLength); + if (NT_SUCCESS(Status)) + { + /* This key is typically set by drivers, but users can force it */ + if (ResultLength == sizeof(ULONG)) PciEnableNativeModeATA = *Value; + ExFreePoolWithTag(Value, 0); + } + + /* Build the range lists for all the excluded resource areas */ + Status = PciBuildDefaultExclusionLists(); + if (!NT_SUCCESS(Status)) break; + + /* Read the PCI IRQ Routing Table that the loader put in the registry */ + PciGetIrqRoutingTableFromRegistry(&PciIrqRoutingTable); + + /* Take over the HAL's default PCI Bus Handler routines */ + PciHookHal(); + + /* Initialize verification of PCI BIOS and devices, if requested */ + PciVerifierInit(DriverObject); + + /* Check if this is a Datacenter SKU, which impacts IRQ alignment */ + PciRunningDatacenter = PciIsDatacenter(); + if (PciRunningDatacenter) DPRINT1("PCI running on datacenter build\n"); + + /* Check if the system has an ACPI Hardware Watchdog Timer */ + WdTable = PciGetAcpiTable(WDRT_SIGNATURE); + } while (FALSE); + + /* Close all opened keys, return driver status to PnP Manager */ + if (KeyHandle) ZwClose(KeyHandle); + if (ControlSetKey) ZwClose(ControlSetKey); + if (ParametersKey) ZwClose(ParametersKey); + if (DebugKey) ZwClose(DebugKey); + return Status; } /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci.h?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] Mon Jun 28 05:23:31 2010 @@ -6,6 +6,134 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -#include <ntddk.h> +#include <initguid.h> +#include <ntifs.h> +#include <ntagp.h> +#include <wdmguid.h> +#include <wchar.h> +#include <acpiioct.h> +#include <drivers/pci/pci.h> +#include <drivers/acpi/acpi.h> +#include "halfuncs.h" +#include "rtlfuncs.h" +#include "vffuncs.h" + +// +// Tag used in all pool allocations (Pci Bus) +// +#define PCI_POOL_TAG 'BicP' + +// +// PCI Hack Entry Name Lengths +// +#define PCI_HACK_ENTRY_SIZE sizeof(L"VVVVdddd") // 16 +#define PCI_HACK_ENTRY_REV_SIZE sizeof(L"VVVVddddRR") // 20 +#define PCI_HACK_ENTRY_SUBSYS_SIZE sizeof(L"VVVVddddssssIIII") // 32 +#define PCI_HACK_ENTRY_FULL_SIZE sizeof(L"VVVVddddssssIIIIRR") // 36 + +// +// PCI Hack Entry Information +// +#define PCI_HACK_HAS_REVISION_INFO 0x01 +#define PCI_HACK_HAS_SUBSYSTEM_INFO 0x02 +typedef struct _PCI_HACK_ENTRY +{ + USHORT VendorID; + USHORT DeviceID; + USHORT SubVendorID; + USHORT SubSystemID; + ULONGLONG HackFlags; + USHORT RevisionID; + UCHAR Flags; +} PCI_HACK_ENTRY, *PPCI_HACK_ENTRY; + +// +// IRP Dispatch Routines +// +NTSTATUS +NTAPI +PciDispatchIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp +); + +// +// Bus FDO Routines +// +NTSTATUS +NTAPI +PciAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject +); + +// +// HAL Callback/Hook Routines +// +VOID +NTAPI +PciHookHal( + VOID +); + +// +// PCI Verifier Routines +// +VOID +NTAPI +PciVerifierInit( + IN PDRIVER_OBJECT DriverObject +); + +// +// Utility Routines +// +BOOLEAN +NTAPI +PciStringToUSHORT( + IN PWCHAR String, + OUT PUSHORT Value +); + +BOOLEAN +NTAPI +PciIsDatacenter( + VOID +); + +NTSTATUS +NTAPI +PciBuildDefaultExclusionLists( + VOID +); + +BOOLEAN +NTAPI +PciUnicodeStringStrStr( + IN PUNICODE_STRING InputString, + IN PCUNICODE_STRING EqualString, + IN BOOLEAN CaseInSensitive +); + +BOOLEAN +NTAPI +PciOpenKey( + IN PWCHAR KeyName, + IN HANDLE RootKey, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE KeyHandle, + OUT PNTSTATUS KeyStatus +); + +NTSTATUS +NTAPI +PciGetRegistryValue( + IN PWCHAR ValueName, + IN PWCHAR KeyName, + IN HANDLE RootHandle, + IN ULONG Type, + OUT PVOID *OutputBuffer, + OUT PULONG OutputLength +); /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/pcivrify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pcivrify.… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pcivrify.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pcivrify.c [iso-8859-1] Mon Jun 28 05:23:31 2010 @@ -14,6 +14,41 @@ /* GLOBALS ********************************************************************/ +BOOLEAN PciVerifierRegistered; +PVOID PciVerifierNotificationHandle; + /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +PciVerifierProfileChangeCallback(IN PVOID NotificationStructure, + IN PVOID Context) +{ + /* This function is not yet implemented */ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} + +VOID +NTAPI +PciVerifierInit(IN PDRIVER_OBJECT DriverObject) +{ + NTSTATUS Status; + + /* Check if the kernel driver verifier is enabled */ + if (VfIsVerificationEnabled(VFOBJTYPE_SYSTEM_BIOS, NULL)) + { + /* Register a notification for changes, to keep track of the PCI tree */ + Status = IoRegisterPlugPlayNotification(EventCategoryHardwareProfileChange, + 0, + NULL, + DriverObject, + PciVerifierProfileChangeCallback, + NULL, + &PciVerifierNotificationHandle); + if (NT_SUCCESS(Status)) PciVerifierRegistered = TRUE; + } +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/utils.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] Mon Jun 28 05:23:31 2010 @@ -14,6 +14,323 @@ /* GLOBALS ********************************************************************/ +RTL_RANGE_LIST PciIsaBitExclusionList; +RTL_RANGE_LIST PciVgaAndIsaBitExclusionList; + /* FUNCTIONS ******************************************************************/ +BOOLEAN +NTAPI +PciUnicodeStringStrStr(IN PUNICODE_STRING InputString, + IN PCUNICODE_STRING EqualString, + IN BOOLEAN CaseInSensitive) +{ + UNICODE_STRING PartialString; + LONG EqualChars, TotalChars; + + /* Build a partial string with the smaller substring */ + PartialString.Length = EqualString->Length; + PartialString.MaximumLength = InputString->MaximumLength;; + PartialString.Buffer = InputString->Buffer; + + /* Check how many characters that need comparing */ + EqualChars = 0; + TotalChars = (InputString->Length - EqualString->Length) / sizeof(WCHAR); + + /* If the substring is bigger, just fail immediately */ + if (TotalChars < 0) return FALSE; + + /* Keep checking each character */ + while (!RtlEqualUnicodeString(EqualString, &PartialString, CaseInSensitive)) + { + /* Continue checking until all the required characters are equal */ + PartialString.Buffer++; + PartialString.MaximumLength -= sizeof(WCHAR); + if (++EqualChars > TotalChars) return FALSE; + } + + /* The string is equal */ + return TRUE; +} + +BOOLEAN +NTAPI +PciStringToUSHORT(IN PWCHAR String, + OUT PUSHORT Value) +{ + USHORT Short; + ULONG Low, High, Length; + WCHAR Char; + + /* Initialize everything to zero */ + Short = 0; + Length = 0; + while (TRUE) + { + /* Get the character and set the high byte based on the previous one */ + Char = *String++; + High = 16 * Short; + + /* Check for numbers */ + if ( Char >= '0' && Char <= '9' ) + { + /* Convert them to a byte */ + Low = Char - '0'; + } + else if ( Char >= 'A' && Char <= 'F' ) + { + /* Convert upper-case hex letters into a byte */ + Low = Char - '7'; + } + else if ( Char >= 'a' && Char <= 'f' ) + { + /* Convert lower-case hex letters into a byte */ + Low = Char - 'W'; + } + else + { + /* Invalid string, fail the conversion */ + return FALSE; + } + + /* Combine the high and low byte */ + Short = High | Low; + + /* If 4 letters have been reached, the 16-bit integer should exist */ + if (++Length >= 4) + { + /* Return it to the caller */ + *Value = Short; + return TRUE; + } + } +} + +BOOLEAN +NTAPI +PciIsSuiteVersion(IN USHORT SuiteMask) +{ + ULONGLONG Mask = 0; + RTL_OSVERSIONINFOEXW VersionInfo; + + /* Initialize the version information */ + RtlZeroMemory(&VersionInfo, sizeof(RTL_OSVERSIONINFOEXW)); + VersionInfo.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); + VersionInfo.wSuiteMask = SuiteMask; + + /* Set the comparison mask and return if the passed suite mask matches */ + VER_SET_CONDITION(Mask, VER_SUITENAME, VER_AND); + return NT_SUCCESS(RtlVerifyVersionInfo(&VersionInfo, VER_SUITENAME, Mask)); +} + +BOOLEAN +NTAPI +PciIsDatacenter(VOID) +{ + BOOLEAN Result; + PVOID Value; + ULONG ResultLength; + NTSTATUS Status; + + /* Assume this isn't Datacenter */ + Result = FALSE; + + /* First, try opening the setup key */ + Status = PciGetRegistryValue(L"", + L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Services\\setupdd", + 0, + REG_BINARY, + &Value, + &ResultLength); + if (!NT_SUCCESS(Status)) + { + /* This is not an in-progress Setup boot, so query the suite version */ + Result = PciIsSuiteVersion(VER_SUITE_DATACENTER); + } + else + { + /* This scenario shouldn't happen yet, since SetupDD isn't used */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Return if this is Datacenter or not */ + return Result; +} + +BOOLEAN +NTAPI +PciOpenKey(IN PWCHAR KeyName, + IN HANDLE RootKey, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE KeyHandle, + OUT PNTSTATUS KeyStatus) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyString; + PAGED_CODE(); + + /* Initialize the object attributes */ + RtlInitUnicodeString(&KeyString, KeyName); + InitializeObjectAttributes(&ObjectAttributes, + &KeyString, + OBJ_CASE_INSENSITIVE, + RootKey, + NULL); + + /* Open the key, returning a boolean, and the status, if requested */ + Status = ZwOpenKey(KeyHandle, DesiredAccess, &ObjectAttributes); + if (KeyStatus) *KeyStatus = Status; + return NT_SUCCESS(Status); +} + +NTSTATUS +NTAPI +PciGetRegistryValue(IN PWCHAR ValueName, + IN PWCHAR KeyName, + IN HANDLE RootHandle, + IN ULONG Type, + OUT PVOID *OutputBuffer, + OUT PULONG OutputLength) +{ + NTSTATUS Status; + PKEY_VALUE_PARTIAL_INFORMATION PartialInfo; + ULONG NeededLength, ActualLength; + UNICODE_STRING ValueString; + HANDLE KeyHandle; + BOOLEAN Result; + + /* So we know what to free at the end of the body */ + PartialInfo = NULL; + KeyHandle = NULL; + do + { + /* Open the key by name, rooted off the handle passed */ + Result = PciOpenKey(KeyName, + RootHandle, + KEY_QUERY_VALUE, + &KeyHandle, + &Status); + if (!Result) break; + + /* Query for the size that's needed for the value that was passed in */ + RtlInitUnicodeString(&ValueString, ValueName); + Status = ZwQueryValueKey(KeyHandle, + &ValueString, + KeyValuePartialInformation, + NULL, + 0, + &NeededLength); + ASSERT(!NT_SUCCESS(Status)); + if (Status != STATUS_BUFFER_TOO_SMALL) break; + + /* Allocate an appropriate buffer for the size that was returned */ + ASSERT(NeededLength != 0); + Status = STATUS_INSUFFICIENT_RESOURCES; + PartialInfo = ExAllocatePoolWithTag(PagedPool, + NeededLength, + PCI_POOL_TAG); + if (!PartialInfo) break; + + /* Query the actual value information now that the size is known */ + Status = ZwQueryValueKey(KeyHandle, + &ValueString, + KeyValuePartialInformation, + PartialInfo, + NeededLength, + &ActualLength); + if (!NT_SUCCESS(Status)) break; + + /* Make sure it's of the type that the caller expects */ + Status = STATUS_INVALID_PARAMETER; + if (PartialInfo->Type != Type) break; + + /* Subtract the registry-specific header, to get the data size */ + ASSERT(NeededLength == ActualLength); + NeededLength -= sizeof(KEY_VALUE_PARTIAL_INFORMATION); + + /* Allocate a buffer to hold the data and return it to the caller */ + Status = STATUS_INSUFFICIENT_RESOURCES; + *OutputBuffer = ExAllocatePoolWithTag(PagedPool, + NeededLength, + PCI_POOL_TAG); + if (!*OutputBuffer) break; + + /* Copy the data into the buffer and return its length to the caller */ + RtlCopyMemory(*OutputBuffer, PartialInfo->Data, NeededLength); + if (OutputLength) *OutputLength = NeededLength; + } while (0); + + /* Close any opened keys and free temporary allocations */ + if (KeyHandle) ZwClose(KeyHandle); + if (PartialInfo) ExFreePoolWithTag(PartialInfo, 0); + return Status; +} + +NTSTATUS +NTAPI +PciBuildDefaultExclusionLists(VOID) +{ + ULONG Start; + NTSTATUS Status; + ASSERT(PciIsaBitExclusionList.Count == 0); + ASSERT(PciVgaAndIsaBitExclusionList.Count == 0); + + /* Initialize the range lists */ + RtlInitializeRangeList(&PciIsaBitExclusionList); + RtlInitializeRangeList(&PciVgaAndIsaBitExclusionList); + + /* Loop x86 I/O ranges */ + for (Start = 0x100; Start <= 0xFEFF; Start += 0x400) + { + /* Add the ISA I/O ranges */ + Status = RtlAddRange(&PciIsaBitExclusionList, + Start, + Start + 0x2FF, + 0, + RTL_RANGE_LIST_ADD_IF_CONFLICT, + NULL, + NULL); + if (!NT_SUCCESS(Status)) break; + + /* Add the ISA I/O ranges */ + Status = RtlAddRange(&PciVgaAndIsaBitExclusionList, + Start, + Start + 0x2AF, + 0, + RTL_RANGE_LIST_ADD_IF_CONFLICT, + NULL, + NULL); + if (!NT_SUCCESS(Status)) break; + + /* Add the VGA I/O range for Monochrome Video */ + Status = RtlAddRange(&PciVgaAndIsaBitExclusionList, + Start + 0x2BC, + Start + 0x2BF, + 0, + RTL_RANGE_LIST_ADD_IF_CONFLICT, + NULL, + NULL); + if (!NT_SUCCESS(Status)) break; + + /* Add the VGA I/O range for certain CGA adapters */ + Status = RtlAddRange(&PciVgaAndIsaBitExclusionList, + Start + 0x2E0, + Start + 0x2FF, + 0, + RTL_RANGE_LIST_ADD_IF_CONFLICT, + NULL, + NULL); + if (!NT_SUCCESS(Status)) break; + + /* Success, ranges added done */ + return STATUS_SUCCESS; + }; + + RtlFreeRangeList(&PciIsaBitExclusionList); + RtlFreeRangeList(&PciVgaAndIsaBitExclusionList); + return Status; +} + /* EOF */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs