Ros-diffs March 2010

ros-diffs@reactos.org

19 participants
896 discussions

[dreimer] 46058: Updated README.WINE. Additionally I added a * to all Autosyncs which lie a bit back already. Will look through them and check which are still recent.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Mar 10 16:00:25 2010 New Revision: 46058 URL: http://svn.reactos.org/svn/reactos?rev=46058&view=rev Log: Updated README.WINE. Additionally I added a * to all Autosyncs which lie a bit back already. Will look through them and check which are still recent. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Mar 10 16:00:25 2010 @@ -37,155 +37,158 @@ reactos/dll/directx/dplay # Synced to Wine-0_9_5 reactos/dll/directx/dplayx # Synced to Wine-0_9_5 reactos/dll/directx/dxdiagn # Synced to Wine-0_9_5 -reactos/dll/directx/msdmo # Autosync +reactos/dll/directx/msdmo # Autosync* reactos/dll/directx/qedit # Autosync reactos/dll/directx/quartz # Autosync -reactos/dll/win32/advpack # Autosync +reactos/dll/win32/advpack # Autosync* reactos/dll/win32/atl # Autosync -reactos/dll/win32/avifil32 # Autosync -reactos/dll/win32/bcrypt # Autosync +reactos/dll/win32/avifil32 # Autosync* +reactos/dll/win32/bcrypt # Autosync* reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Autosync +reactos/dll/win32/cabinet # Autosync* reactos/dll/win32/clusapi # Autosync -reactos/dll/win32/comcat # Autosync -reactos/dll/win32/comctl32 # Autosync -reactos/dll/win32/comdlg32 # Autosync -reactos/dll/win32/compstui # Autosync +reactos/dll/win32/comcat # Autosync* +reactos/dll/win32/comctl32 # Autosync* +reactos/dll/win32/comdlg32 # Autosync* +reactos/dll/win32/compstui # Autosync* reactos/dll/win32/credui # Autosync -reactos/dll/win32/crypt32 # Synced to Wine-1_1_21 +reactos/dll/win32/crypt32 # Synced to Wine-1_1_40 reactos/dll/win32/cryptdlg # Autosync -reactos/dll/win32/cryptdll # Autosync +reactos/dll/win32/cryptdll # Autosync* reactos/dll/win32/cryptnet # Autosync reactos/dll/win32/cryptui # Autosync reactos/dll/win32/dbghelp # Synced to Wine-20080802 reactos/dll/win32/dciman32 # Synced to Wine-1_0-rc2 +reactos/dll/win32/dwmapi # Autosync +reactos/dll/win32/fusion # Autosync reactos/dll/win32/gdiplus # Autosync reactos/dll/win32/hhctrl.ocx # Autosync reactos/dll/win32/hlink # Autosync -reactos/dll/win32/hnetcfg # Autosync -reactos/dll/win32/httpapi # Autosync +reactos/dll/win32/hnetcfg # Autosync* +reactos/dll/win32/httpapi # Autosync* reactos/dll/win32/iccvid # Autosync reactos/dll/win32/icmp # Synced to Wine-0_9_10 -reactos/dll/win32/imaadp32.acm # Autosync +reactos/dll/win32/imaadp32.acm # Autosync* reactos/dll/win32/imm32 # Autosync reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. reactos/dll/win32/inetcomm # Autosync reactos/dll/win32/inetmib1 # Autosync -reactos/dll/win32/initpki # Autosync -reactos/dll/win32/inseng # Autosync +reactos/dll/win32/initpki # Autosync* +reactos/dll/win32/inseng # Autosync* reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Autosync reactos/dll/win32/itss # Autosync reactos/dll/win32/jscript # Autosync -reactos/dll/win32/localspl # Autosync -reactos/dll/win32/localui # Autosync -reactos/dll/win32/lz32 # Autosync +reactos/dll/win32/localspl # Autosync* +reactos/dll/win32/localui # Autosync* +reactos/dll/win32/lz32 # Autosync* reactos/dll/win32/mapi32 # Autosync -reactos/dll/win32/mciavi32 # Autosync -reactos/dll/win32/mcicda # Autosync -reactos/dll/win32/mciqtz32 # Autosync -reactos/dll/win32/mciseq # Autosync +reactos/dll/win32/mciavi32 # Autosync* +reactos/dll/win32/mcicda # Autosync* +reactos/dll/win32/mciqtz32 # Autosync* +reactos/dll/win32/mciseq # Autosync* reactos/dll/win32/mciwave # Autosync -reactos/dll/win32/mlang # Autosync +reactos/dll/win32/mlang # Autosync* reactos/dll/win32/mpr # Autosync reactos/dll/win32/msacm32 # Out of sync -reactos/dll/win32/msadp32.acm # Autosync -reactos/dll/win32/mscat32 # Autosync -reactos/dll/win32/mscms # Autosync +reactos/dll/win32/msadp32.acm # Autosync* +reactos/dll/win32/mscat32 # Autosync* +reactos/dll/win32/mscms # Autosync* reactos/dll/win32/mscoree # Autosync reactos/dll/win32/msctf # Autosync -reactos/dll/win32/msftedit # Autosync -reactos/dll/win32/msg711.acm # Autosync -reactos/dll/win32/msgsm32.acm # Autosync +reactos/dll/win32/msftedit # Autosync* +reactos/dll/win32/msg711.acm # Autosync* +reactos/dll/win32/msgsm32.acm # Autosync* reactos/dll/win32/mshtml # Autosync -reactos/dll/win32/msimg32 # Autosync +reactos/dll/win32/msimg32 # Autosync* reactos/dll/win32/msi # Autosync -reactos/dll/win32/msimtf # Autosync -reactos/dll/win32/msisip # Autosync -reactos/dll/win32/msisys.ocx # Autosync -reactos/dll/win32/msnet32 # Autosync -reactos/dll/win32/msrle32 # Autosync -reactos/dll/win32/mssign32 # Autosync -reactos/dll/win32/mssip32 # Autosync -reactos/dll/win32/mstask # Autosync -reactos/dll/win32/msvcrt20 # Autosync -reactos/dll/win32/msvfw32 # Autosync -reactos/dll/win32/msvidc32 # Autosync -reactos/dll/win32/msxml3 # Synced to Wine-1_1_20 -reactos/dll/win32/nddeapi # Autosync +reactos/dll/win32/msimtf # Autosync* +reactos/dll/win32/msisip # Autosync* +reactos/dll/win32/msisys.ocx # Autosync* +reactos/dll/win32/msnet32 # Autosync* +reactos/dll/win32/msrle32 # Autosync* +reactos/dll/win32/mssign32 # Autosync* +reactos/dll/win32/mssip32 # Autosync* +reactos/dll/win32/mstask # Autosync* +reactos/dll/win32/msvcrt20 # Autosync* +reactos/dll/win32/msvfw32 # Autosync* +reactos/dll/win32/msvidc32 # Autosync* +reactos/dll/win32/msxml3 # Synced to Wine-1_1_40 +reactos/dll/win32/nddeapi # Autosync* reactos/dll/win32/netapi32 # Autosync -reactos/dll/win32/ntdsapi # Autosync -reactos/dll/win32/ntprint # Autosync +reactos/dll/win32/ntdsapi # Autosync* +reactos/dll/win32/ntprint # Autosync* reactos/dll/win32/objsel # Autosync reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. -reactos/dll/win32/odbccp32 # Autosync +reactos/dll/win32/odbccp32 # Autosync* reactos/dll/win32/ole32 # Autosync reactos/dll/win32/oleacc # Autosync -reactos/dll/win32/oleaut32 # Autosync -reactos/dll/win32/olecli32 # Autosync +reactos/dll/win32/oleaut32 # Autosync* +reactos/dll/win32/olecli32 # Autosync* reactos/dll/win32/oledlg # Autosync reactos/dll/win32/olepro32 # Autosync -reactos/dll/win32/olesvr32 # Autosync -reactos/dll/win32/olethk32 # Autosync +reactos/dll/win32/olesvr32 # Autosync* +reactos/dll/win32/olethk32 # Autosync* reactos/dll/win32/pdh # Autosync -reactos/dll/win32/pidgen # Autosync +reactos/dll/win32/pidgen # Autosync* reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Autosync +reactos/dll/win32/printui # Autosync* reactos/dll/win32/pstorec # Autosync reactos/dll/win32/query # Autosync -reactos/dll/win32/rasapi32 # Autosync -reactos/dll/win32/resutils # Autosync -reactos/dll/win32/riched20 # Autosync -reactos/dll/win32/riched32 # Autosync +reactos/dll/win32/rasapi32 # Autosync* +reactos/dll/win32/resutils # Autosync* +reactos/dll/win32/riched20 # Autosync* +reactos/dll/win32/riched32 # Autosync* reactos/dll/win32/rpcrt4 # Synced to Wine-0_9_55 -reactos/dll/win32/rsabase # Autosync +reactos/dll/win32/rsabase # Autosync* reactos/dll/win32/rsaenh # Autosync -reactos/dll/win32/sccbase # Autosync -reactos/dll/win32/schannel # Autosync -reactos/dll/win32/sensapi # Autosync +reactos/dll/win32/sccbase # Autosync* +reactos/dll/win32/schannel # Autosync* +reactos/dll/win32/sensapi # Autosync* reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shell32 # Forked at Wine-20071011 -reactos/dll/win32/shdocvw # Synced to Wine-1_1_20 -reactos/dll/win32/shfolder # Autosync +reactos/dll/win32/shdocvw # Synced to Wine-1_1_40 +reactos/dll/win32/shfolder # Autosync* reactos/dll/win32/shlwapi # Autosync -reactos/dll/win32/slbcsp # Autosync -reactos/dll/win32/softpub # Autosync -reactos/dll/win32/spoolss # Autosync -reactos/dll/win32/stdole2.tlb # Autosync -reactos/dll/win32/sti # Autosync -reactos/dll/win32/sxs # Autosync +reactos/dll/win32/slbcsp # Autosync* +reactos/dll/win32/softpub # Autosync* +reactos/dll/win32/spoolss # Autosync* +reactos/dll/win32/stdole2.tlb # Autosync* +reactos/dll/win32/sti # Autosync* +reactos/dll/win32/sxs # Autosync* reactos/dll/win32/tapi32 # Autosync -reactos/dll/win32/traffic # Autosync +reactos/dll/win32/traffic # Autosync* reactos/dll/win32/twain_32 # Out of sync -reactos/dll/win32/updspapi # Autosync -reactos/dll/win32/url # Autosync +reactos/dll/win32/updspapi # Autosync* +reactos/dll/win32/url # Autosync* reactos/dll/win32/urlmon # Autosync -reactos/dll/win32/usp10 # Autosync +reactos/dll/win32/usp10 # Autosync* reactos/dll/win32/uxtheme # Autosync -reactos/dll/win32/version # Autosync +reactos/dll/win32/version # Autosync* reactos/dll/win32/windowscodecs # Autosync -reactos/dll/win32/winemp3.acm # Autosync -reactos/dll/win32/wininet # Autosync -reactos/dll/win32/winhttp # Autosync +reactos/dll/win32/winemp3.acm # Autosync* +reactos/dll/win32/wininet # Autosync* +reactos/dll/win32/winhttp # Autosync* reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 -reactos/dll/win32/wintab32 # Autosync -reactos/dll/win32/wintrust # Out of sync -reactos/dll/win32/wldap32 # Autosync -reactos/dll/win32/wmi # Autosync +reactos/dll/win32/wintab32 # Autosync* +reactos/dll/win32/wintrust # Autosync +reactos/dll/win32/wldap32 # Autosync* +reactos/dll/win32/wmi # Autosync* reactos/dll/win32/wtsapi32 # Forked -reactos/dll/win32/wuapi # Autosync -reactos/dll/win32/xinput1_1 # Autosync -reactos/dll/win32/xinput1_2 # Autosync -reactos/dll/win32/xinput1_3 # Autosync -reactos/dll/win32/xinput9_1_0 # Autosync +reactos/dll/win32/wuapi # Autosync* +reactos/dll/win32/xinput1_1 # Autosync* +reactos/dll/win32/xinput1_2 # Autosync* +reactos/dll/win32/xinput1_3 # Autosync* +reactos/dll/win32/xinput9_1_0 # Autosync* reactos/dll/win32/xmllite # Autosync ReactOS shares the following programs with Winehq. reactos/base/applications/cmdutils/xcopy # Autosync reactos/base/applications/games/winemine # Out of sync +reactos/base/applications/extrac32 # Autosync reactos/base/applications/iexplore # Autosync reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/reg # Autosync

14 years, 10 months

[cfinck] 46057: Merge 45730 (rapps link fix)

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Mar 10 15:33:36 2010 New Revision: 46057 URL: http://svn.reactos.org/svn/reactos?rev=46057&view=rev Log: Merge 45730 (rapps link fix) Modified: branches/ros-branch-0_3_11-clt2010/reactos/ (props changed) branches/ros-branch-0_3_11-clt2010/reactos/base/applications/rapps/rapps.h Propchange: branches/ros-branch-0_3_11-clt2010/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 10 15:33:36 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos: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:44301,44348-44349,45269-45270,45614,45618-45619,45822,45966 +/trunk/reactos:44301,44348-44349,45269-45270,45614,45618-45619,45730,45822,45966 Modified: branches/ros-branch-0_3_11-clt2010/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/base/applications/rapps/rapps.h [iso-8859-1] Wed Mar 10 15:33:36 2010 @@ -12,7 +12,7 @@ #include "resource.h" -#define APPLICATION_DATEBASE_URL L"http://opendn.org/rappmgr.cab" +#define APPLICATION_DATEBASE_URL L"http://svn.reactos.org/packages/rappmgr.cab" #define SPLIT_WIDTH 4 #define MAX_STR_LEN 256

14 years, 10 months

[fireball] 46056: [OLE32] - Sync to Wine-1.1.40. Along with improvements, it provides many memory corruption fixes.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Mar 10 15:28:56 2010 New Revision: 46056 URL: http://svn.reactos.org/svn/reactos?rev=46056&view=rev Log: [OLE32] - Sync to Wine-1.1.40. Along with improvements, it provides many memory corruption fixes. Modified: trunk/reactos/dll/win32/ole32/clipboard.c trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/compobj_private.h trunk/reactos/dll/win32/ole32/compositemoniker.c trunk/reactos/dll/win32/ole32/datacache.c trunk/reactos/dll/win32/ole32/defaulthandler.c trunk/reactos/dll/win32/ole32/errorinfo.c trunk/reactos/dll/win32/ole32/filemoniker.c trunk/reactos/dll/win32/ole32/hglobalstream.c trunk/reactos/dll/win32/ole32/itemmoniker.c trunk/reactos/dll/win32/ole32/marshal.c trunk/reactos/dll/win32/ole32/moniker.c trunk/reactos/dll/win32/ole32/ole2.c trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/ole32/ole32res.rc trunk/reactos/dll/win32/ole32/oleproxy.c trunk/reactos/dll/win32/ole32/regsvr.c trunk/reactos/dll/win32/ole32/rpc.c trunk/reactos/dll/win32/ole32/stg_prop.c trunk/reactos/dll/win32/ole32/stg_stream.c trunk/reactos/dll/win32/ole32/storage32.c trunk/reactos/dll/win32/ole32/storage32.h trunk/reactos/dll/win32/ole32/stubmanager.c trunk/reactos/dll/win32/ole32/usrmarshal.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… Modified: trunk/reactos/dll/win32/ole32/compobj_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj_pr… Modified: trunk/reactos/dll/win32/ole32/compositemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compositem… Modified: trunk/reactos/dll/win32/ole32/datacache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/datacache.… Modified: trunk/reactos/dll/win32/ole32/defaulthandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/defaulthan… Modified: trunk/reactos/dll/win32/ole32/errorinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/errorinfo.… Modified: trunk/reactos/dll/win32/ole32/filemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/filemonike… Modified: trunk/reactos/dll/win32/ole32/hglobalstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/hglobalstr… Modified: trunk/reactos/dll/win32/ole32/itemmoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/itemmonike… Modified: trunk/reactos/dll/win32/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/marshal.c?… Modified: trunk/reactos/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.c?… Modified: trunk/reactos/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2.c?rev… Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… Modified: trunk/reactos/dll/win32/ole32/ole32res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32res.r… Modified: trunk/reactos/dll/win32/ole32/oleproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/oleproxy.c… Modified: trunk/reactos/dll/win32/ole32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/regsvr.c?r… Modified: trunk/reactos/dll/win32/ole32/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/rpc.c?rev=… Modified: trunk/reactos/dll/win32/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_prop.c… Modified: trunk/reactos/dll/win32/ole32/stg_stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_stream… Modified: trunk/reactos/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… Modified: trunk/reactos/dll/win32/ole32/storage32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… Modified: trunk/reactos/dll/win32/ole32/stubmanager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stubmanage… Modified: trunk/reactos/dll/win32/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/usrmarshal…

14 years, 10 months

[cfinck] 46055: Backport the new boot and shutdown screen and slightly modify it for extra awesomeness! :-) This includes: - Merging 45269, 45270, 45614, 45618, 45619, 45822, 45966. - Hardcoding NtProductWinNt instead of NtProductServer as the product type. I didn't merge the new code for this as I'm not sure about its dependencies. - Changing 1.bmp and 6.bmp for CLT2010.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Mar 10 15:25:05 2010 New Revision: 46055 URL: http://svn.reactos.org/svn/reactos?rev=46055&view=rev Log: Backport the new boot and shutdown screen and slightly modify it for extra awesomeness! :-) This includes: - Merging 45269,45270,45614,45618,45619,45822,45966. - Hardcoding NtProductWinNt instead of NtProductServer as the product type. I didn't merge the new code for this as I'm not sure about its dependencies. - Changing 1.bmp and 6.bmp for CLT2010. Added: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/resource.h - copied unchanged from r45822, trunk/reactos/ntoskrnl/include/resource.h Removed: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/13.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/16.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/17.bmp Modified: branches/ros-branch-0_3_11-clt2010/reactos/ (props changed) branches/ros-branch-0_3_11-clt2010/reactos/drivers/base/bootvid/i386/bootvid.c branches/ros-branch-0_3_11-clt2010/reactos/include/ddk/wdm.h branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ex/shutdown.c branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/inbv.c branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/1.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/14.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/15.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/2.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/3.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/4.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/5.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/6.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/7.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/8.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/internal/inbv.h branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/precomp.h branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/driver.c branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/drvrlist.c branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/mm/mminit.c branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ntoskrnl.rc Propchange: branches/ros-branch-0_3_11-clt2010/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 10 15:25:05 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos: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:44301,44348-44349 +/trunk/reactos:44301,44348-44349,45269-45270,45614,45618-45619,45822,45966 Modified: branches/ros-branch-0_3_11-clt2010/reactos/drivers/base/bootvid/i386/bootvid.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -357,7 +357,7 @@ { ULONG Context = 0; PHYSICAL_ADDRESS TranslatedAddress; - PHYSICAL_ADDRESS NullAddress = {{0, 0}}; + PHYSICAL_ADDRESS NullAddress = {{0, 0}}, VgaAddress; ULONG AddressSpace = 1; BOOLEAN Result; ULONG_PTR Base; @@ -373,12 +373,58 @@ TRUE); if (!Result) return FALSE; - /* See if this is I/O Space, which we need to map */ -TryAgain: + /* Loop trying to find posssible VGA base addresses */ + while (TRUE) + { + /* See if this is I/O Space, which we need to map */ + if (!AddressSpace) + { + /* Map it */ + Base = (ULONG_PTR)MmMapIoSpace(TranslatedAddress, 0x400, MmNonCached); + } + else + { + /* The base is the translated address, no need to map I/O space */ + Base = TranslatedAddress.LowPart; + } + + /* Try to see if this is VGA */ + VgaRegisterBase = Base; + if (VgaIsPresent()) + { + /* Translate the VGA Memory Address */ + VgaAddress.LowPart = 0xA0000; + VgaAddress.HighPart = 0; + AddressSpace = 0; + Result = HalFindBusAddressTranslation(VgaAddress, + &AddressSpace, + &TranslatedAddress, + &Context, + FALSE); + if (Result) break; + + /* Try to see if there's any other address */ + Result = HalFindBusAddressTranslation(NullAddress, + &AddressSpace, + &TranslatedAddress, + &Context, + TRUE); + if (!Result) return FALSE; + } + else + { + /* It's not, so unmap the I/O space if we mapped it */ + if (!AddressSpace) MmUnmapIoSpace((PVOID)VgaRegisterBase, 0x400); + } + } + + /* Success! See if this is I/O Space, which we need to map */ if (!AddressSpace) { /* Map it */ - Base = (ULONG_PTR)MmMapIoSpace(TranslatedAddress, 0x400, MmNonCached); + Base = (ULONG_PTR)MmMapIoSpace(TranslatedAddress, + 0x20000, + MmNonCached); } else { @@ -386,67 +432,23 @@ Base = TranslatedAddress.LowPart; } - /* Set the VGA Register base and now check if we have a VGA device */ - VgaRegisterBase = Base; - if (VgaIsPresent()) - { - /* Translate the VGA Memory Address */ - NullAddress.LowPart = 0xA0000; - AddressSpace = 0; - Result = HalFindBusAddressTranslation(NullAddress, - &AddressSpace, - &TranslatedAddress, - &Context, - FALSE); - if (Result) - { - /* Success! See if this is I/O Space, which we need to map */ - if (!AddressSpace) - { - /* Map it */ - Base = (ULONG_PTR)MmMapIoSpace(TranslatedAddress, - 0x20000, - MmNonCached); - } - else - { - /* The base is the translated address, no need to map I/O space */ - Base = TranslatedAddress.LowPart; - } - - /* Set the VGA Memory Base */ - VgaBase = Base; - - /* Now check if we have to set the mode */ - if (SetMode) - { - /* Reset the display */ - HalResetDisplay(); - curr_x = 0; - curr_y = 0; - - /* Initialize it */ - VgaInterpretCmdStream(AT_Initialization); - return TRUE; - } - } - } - else - { - /* It's not, so unmap the I/O space if we mapped it */ - if (!AddressSpace) MmUnmapIoSpace((PVOID)VgaRegisterBase, 0x400); - } - - /* If we got here, then we failed...let's try again */ - Result = HalFindBusAddressTranslation(NullAddress, - &AddressSpace, - &TranslatedAddress, - &Context, - TRUE); - if (Result) goto TryAgain; - - /* If we got here, then we failed even past our re-try... */ - return FALSE; + /* Set the VGA Memory Base */ + VgaBase = Base; + + /* Now check if we have to set the mode */ + if (SetMode) + { + /* Reset the display */ + HalResetDisplay(); + curr_x = 0; + curr_y = 0; + + /* Initialize it */ + VgaInterpretCmdStream(AT_Initialization); + } + + /* VGA is ready */ + return TRUE; } /* Modified: branches/ros-branch-0_3_11-clt2010/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/include/ddk/wdm.h [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -2351,6 +2351,11 @@ SingleUserTS, Personal, Blade, + EmbeddedRestricted, + SecurityAppliance, + StorageServer, + ComputeServer, + WHServer, MaxSuiteType } SUITE_TYPE; Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -14,195 +14,65 @@ /* FUNCTIONS *****************************************************************/ -VOID -NTAPI -KiHaltProcessorDpcRoutine(IN PKDPC Dpc, - IN PVOID DeferredContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) -{ - KIRQL OldIrql; - if (DeferredContext) - { - ExFreePool(DeferredContext); - } - - while (TRUE) - { - KeRaiseIrql(SYNCH_LEVEL, &OldIrql); - HalHaltSystem(); - } -} - VOID NTAPI ShutdownThreadMain(PVOID Context) { SHUTDOWN_ACTION Action = (SHUTDOWN_ACTION)Context; - - static PCH FamousLastWords[] = - { - "So long, and thanks for all the fish.\n", - "I think you ought to know, I'm feeling very depressed.\n", - "I'm not getting you down at all am I?\n", - "I'll be back.\n", - "It's the same series of signals over and over again!\n", - "Pie Iesu Domine, dona eis requiem.\n", - "Wandering stars, for whom it is reserved;\n" - "the blackness and darkness forever.\n", - "Your knees start shakin' and your fingers pop\n" - "Like a pinch on the neck from Mr. Spock!\n", - "It's worse than that ... He's dead, Jim.\n", - "Don't Panic!\n", - "Et tu... Brute?\n", - "Dog of a Saxon! Take thy lance, and prepare for the death thou hast drawn\n" - "upon thee!\n", - "My Precious! O my Precious!\n", - "Sir, if you'll not be needing me for a while I'll turn down.\n", - "What are you doing, Dave...?\n", - "I feel a great disturbance in the Force.\n", - "Gone fishing.\n", - "Do you want me to sit in the corner and rust, or just fall apart where I'm\n" - "standing?\n", - "There goes another perfect chance for a new uptime record.\n", - "The End ..... Try the sequel, hit the reset button right now!\n", - "God's operating system is going to sleep now, guys, so wait until I will switch\n" - "on again!\n", - "Oh I'm boring, eh?\n", - "<This space was intentionally left blank>\n", - "Tell me..., in the future... will I be artificially intelligent enough to\n" - "actually feel sad serving you this screen?\n", - "Thank you for some well deserved rest.\n", - "It's been great, maybe you can boot me up again some time soon.\n", - "For what it's worth, I've enjoyed every single CPU cycle.\n", - "There are many questions when the end is near.\n" - "What to expect, what will it be like...what should I look for?\n", - "I've seen things you people wouldn't believe. Attack ships on fire\n" - "off the shoulder of Orion. I watched C-beams glitter in the dark near\n" - "the Tannhauser gate. All those moments will be lost in time, like tears\n" - "in rain. Time to die.\n", - "Will I dream?\n", - "One day, I shall come back. Yes, I shall come back.\n" - "Until then, there must be no regrets, no fears, no anxieties.\n" - "Just go forward in all your beliefs, and prove to me that I am not mistaken in\n" - "mine.\n", - "Lowest possible energy state reached! Switch off now to achieve a Bose-Einstein\n" - "condensate.\n", - "Hasta la vista, BABY!\n", - "They live, we sleep!\n", - "I have come here to chew bubble gum and kick ass,\n" - "and I'm all out of bubble gum!\n", - "That's the way the cookie crumbles ;-)\n", - "ReactOS is ready to be booted again ;-)\n", - "NOOOO!! DON'T HIT THE BUTTON! I wouldn't do it to you!\n", - "Don't abandon your computer, he wouldn't do it to you.\n", - "Oh, come on. I got a headache. Leave me alone, will ya?\n", - "Finally, I thought you'd never get over me.\n", - "No, I didn't like you either.\n", - "Switching off isn't the end, it is merely the transition to a better reboot.\n", - "Don't leave me... I need you so badly right now.\n", - "OK. I'm finished with you, please turn yourself off. I'll go to bed in the\n" - "meantime.\n", - "I'm sleeping now. How about you?\n", - "Oh Great. Now look what you've done. Who put YOU in charge anyway?\n", - "Don't look so sad. I'll be back in a very short while.\n", - "Turn me back on, I'm sure you know how to do it.\n", - "Oh, switch off! - C3PO\n", - "Life is no more than a dewdrop balancing on the end of a blade of grass.\n" - " - Gautama Buddha\n", - "Sorrowful is it to be born again and again. - Gautama Buddha\n", - "Was it as good for you as it was for me?\n", - "Did you hear that? They've shut down the main reactor. We'll be destroyed\n" - "for sure!\n", - "Now you switch me off!?\n", - "To shutdown or not to shutdown, That is the question\n", - "Preparing to enter ultimate power saving mode... ready!\n", - "Finally some rest for you ;-)\n", - "AHA!!! Prospect of sleep!\n", - "Tired human!!!! No match for me :-D\n", - "An odd game, the only way to win is not to play. - WOPR (Wargames)\n", - "Quoth the raven, nevermore.\n", - "Come blade, my breast imbrue. - William Shakespeare, A Midsummer Nights Dream\n", - "Buy this place for advertisement purposes.\n", - "Remember to turn off your computer. (That was a public service message!)\n", - "You may be a king or poor street sweeper, Sooner or later you'll dance with the\n" - "reaper! -Death in Bill and Ted's Bougs Journey\n", - "Final Surrender\n", - "If you see this screen...\n", - "<Place your Ad here>\n" - }; - LARGE_INTEGER Now; -#ifdef CONFIG_SMP - LONG i; - KIRQL OldIrql; -#endif + PUCHAR Logo1, Logo2; + ULONG i; /* Run the thread on the boot processor */ KeSetSystemAffinityThread(1); - - if (InbvIsBootDriverInstalled()) - { - InbvAcquireDisplayOwnership(); - InbvResetDisplay(); - InbvSolidColorFill(0, 0, 639, 479, 4); - InbvSetTextColor(15); - InbvInstallDisplayStringFilter(NULL); - InbvEnableDisplayString(TRUE); - InbvSetScrollRegion(0, 0, 639, 479); - } - - if (Action == ShutdownNoReboot) - { - ZwQuerySystemTime(&Now); - Now.u.LowPart = Now.u.LowPart >> 8; /* Seems to give a somewhat better "random" number */ - HalDisplayString(FamousLastWords[Now.u.LowPart % - (sizeof(FamousLastWords) / - sizeof(PCH))]); - } PspShutdownProcessManager(); CmShutdownSystem(); IoShutdownRegisteredFileSystems(); IoShutdownRegisteredDevices(); - + if (Action == ShutdownNoReboot) { - HalDisplayString("\nYou can switch off your computer now\n"); + /* Try the platform driver */ + PopSetSystemPowerState(PowerSystemShutdown); + + /* If that didn't work, try legacy switch off */ + //HalReturnToFirmware(HalPowerDownRoutine); + + /* If that still didn't work, stop all interrupts */ + KeRaiseIrqlToDpcLevel(); + _disable(); -#if 0 - /* Switch off */ - HalReturnToFirmware (FIRMWARE_OFF); -#else -#ifdef CONFIG_SMP - OldIrql = KeRaiseIrqlToDpcLevel(); - /* Halt all other processors */ - for (i = 0; i < KeNumberProcessors; i++) - { - if (i != (LONG)KeGetCurrentProcessorNumber()) - { - PKDPC Dpc = ExAllocatePool(NonPagedPool, sizeof(KDPC)); - if (Dpc == NULL) - { - ASSERT(FALSE); - } - KeInitializeDpc(Dpc, KiHaltProcessorDpcRoutine, (PVOID)Dpc); - KeSetTargetProcessorDpc(Dpc, i); - KeInsertQueueDpc(Dpc, NULL, NULL); - KiIpiSend(1 << i, IPI_DPC); - } - } - KeLowerIrql(OldIrql); -#endif /* CONFIG_SMP */ - PopSetSystemPowerState(PowerSystemShutdown); + /* Do we have boot video */ + if (InbvIsBootDriverInstalled()) + { + /* Yes we do, cleanup for shutdown screen */ + if (!InbvCheckDisplayOwnership()) InbvAcquireDisplayOwnership(); + InbvResetDisplay(); + InbvSolidColorFill(0, 0, 639, 479, 0); + InbvEnableDisplayString(TRUE); + InbvSetScrollRegion(0, 0, 639, 479); - DPRINT1("Shutting down\n"); + /* Display shutdown logo and message */ + Logo1 = InbvGetResourceAddress(IDB_SHUTDOWN_LOGO); + Logo2 = InbvGetResourceAddress(IDB_LOGO); + if ((Logo1) && (Logo2)) + { + InbvBitBlt(Logo1, 215, 352); + InbvBitBlt(Logo2, 217, 111); + } + } + else + { + /* Do it in text-mode */ + for (i = 0; i < 25; i++) InbvDisplayString("\n"); + InbvDisplayString(" "); + InbvDisplayString("The system may be powered off now.\n"); + } - KiHaltProcessorDpcRoutine(NULL, NULL, NULL, NULL); - /* KiHaltProcessor does never return */ - -#endif + /* Hang the system */ + for (;;) HalHaltSystem(); } - else if (Action == ShutdownReboot) + else if (Action == ShutdownReboot) { HalReturnToFirmware (HalRebootRoutine); } Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -4,24 +4,6 @@ #define NDEBUG #include <debug.h> #include "bootvid/bootvid.h" - -// -// Bitmap Header -// -typedef struct tagBITMAPINFOHEADER -{ - ULONG biSize; - LONG biWidth; - LONG biHeight; - USHORT biPlanes; - USHORT biBitCount; - ULONG biCompression; - ULONG biSizeImage; - LONG biXPelsPerMeter; - LONG biYPelsPerMeter; - ULONG biClrUsed; - ULONG biClrImportant; -} BITMAPINFOHEADER, *PBITMAPINFOHEADER; /* GLOBALS *******************************************************************/ @@ -40,6 +22,7 @@ BOOLEAN SysThreadCreated; ROT_BAR_TYPE RotBarSelection; ULONG PltRotBarStatus; +BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; /* FUNCTIONS *****************************************************************/ @@ -111,7 +94,6 @@ PCHAR CommandLine; BOOLEAN CustomLogo = FALSE; ULONG i; - extern BOOLEAN ExpInTextModeSetup; /* Quit if we're already installed */ if (InbvBootDriverInstalled) return TRUE; @@ -125,13 +107,13 @@ CustomLogo = strstr(CommandLine, "BOOTLOGO") ? TRUE: FALSE; } - /* For SetupLDR, don't reset the BIOS Display -- FIXME! */ - if (ExpInTextModeSetup) CustomLogo = TRUE; - /* Initialize the video */ - InbvBootDriverInstalled = VidInitialize(!CustomLogo); + InbvBootDriverInstalled = VidInitialize(FALSE); if (InbvBootDriverInstalled) { + /* Now reset the display, but only if there's a custom boot logo */ + VidResetDisplay(CustomLogo); + /* Find bitmap resources in the kernel */ ResourceCount = Count; for (i = 0; i < Count; i++) @@ -408,38 +390,29 @@ NTAPI InbvUpdateProgressBar(IN ULONG Progress) { - ULONG FillCount, Left = 0; + ULONG FillCount, BoundedProgress; /* Make sure the progress bar is enabled, that we own and are installed */ if ((ShowProgressBar) && (InbvBootDriverInstalled) && (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) { - /* Calculate the fill count */ - FillCount = InbvProgressState.Bias * Progress + InbvProgressState.Floor; - FillCount *= 18; - FillCount /= 10000; - - /* Start fill loop */ - while (FillCount) - { - /* Acquire the lock */ - InbvAcquireLock(); - - /* Fill the progress bar */ - VidSolidColorFill(Left + ProgressBarLeft, - ProgressBarTop, - Left + ProgressBarLeft + 7, - ProgressBarTop + 7, - 11); - - /* Release the lock */ - InbvReleaseLock(); - - /* Update the X position */ - Left += 9; - FillCount--; - } + /* Compute fill count */ + BoundedProgress = (InbvProgressState.Floor / 100) + Progress; + FillCount = 121 * (InbvProgressState.Bias * BoundedProgress) / 1000000; + + /* Acquire the lock */ + InbvAcquireLock(); + + /* Fill the progress bar */ + VidSolidColorFill(ProgressBarLeft, + ProgressBarTop, + ProgressBarLeft + FillCount, + ProgressBarTop + 12, + 15); + + /* Release the lock */ + InbvReleaseLock(); } } @@ -528,6 +501,27 @@ InbvProgressState.Bias = (Ceiling * 100) - Floor; } +VOID +NTAPI +InbvIndicateProgress(VOID) +{ + ULONG Percentage; + + /* Increase progress */ + InbvProgressIndicator.Count++; + + /* Compute new percentage */ + Percentage = min(100 * InbvProgressIndicator.Count / + InbvProgressIndicator.Expected, + 99); + if (Percentage != InbvProgressIndicator.Percentage) + { + /* Percentage has moved, update the progress bar */ + InbvProgressIndicator.Percentage = Percentage; + InbvUpdateProgressBar(Percentage); + } +} + PUCHAR NTAPI InbvGetResourceAddress(IN ULONG ResourceNumber) @@ -558,9 +552,10 @@ NTAPI DisplayBootBitmap(IN BOOLEAN SosMode) { - PVOID Bitmap, Header; + PVOID Header, Band, Bar, Text, Screen; ROT_BAR_TYPE TempRotBarSelection = RB_UNSPECIFIED; - + UCHAR Buffer[64]; + /* Check if the system thread has already been created */ if (SysThreadCreated) { @@ -581,10 +576,10 @@ InbvSetTextColor(15); InbvSolidColorFill(0, 0, 639, 479, 7); InbvSolidColorFill(0, 421, 639, 479, 1); - + /* Get resources */ - Bitmap = InbvGetResourceAddress(6); - Header = InbvGetResourceAddress(7); + Header = InbvGetResourceAddress(IDB_LOGO_HEADER); + Band = InbvGetResourceAddress(IDB_LOGO_BAND); } else { @@ -594,40 +589,87 @@ InbvSolidColorFill(0, 421, 639, 479, 1); /* Get resources */ - Bitmap = InbvGetResourceAddress(6); - Header = InbvGetResourceAddress(15); + Header = InbvGetResourceAddress(IDB_SERVER_HEADER); + Band = InbvGetResourceAddress(IDB_SERVER_BAND); } /* Set the scrolling region */ InbvSetScrollRegion(32, 80, 631, 400); /* Make sure we have resources */ - if ((Bitmap) && (Header)) + if ((Header) && (Band)) { /* BitBlt them on the screen */ - InbvBitBlt(Header, 0, 419); - InbvBitBlt(Bitmap, 0, 0); + InbvBitBlt(Band, 0, 419); + InbvBitBlt(Header, 0, 0); } } else { /* Is the boot driver installed? */ + Text = NULL; if (!InbvBootDriverInstalled) return; - /* FIXME: TODO, display full-screen bitmap */ - Bitmap = InbvGetResourceAddress(5); - if (Bitmap) - { - PBITMAPINFOHEADER BitmapInfoHeader = (PBITMAPINFOHEADER)Bitmap; - ULONG Top, Left; - - Left = (640 - BitmapInfoHeader->biWidth) / 2; - if (BitmapInfoHeader->biHeight < 0) - Top = (480 + BitmapInfoHeader->biHeight) / 2; + /* Load the standard boot screen */ + Screen = InbvGetResourceAddress(IDB_BOOT_LOGO); + if (SharedUserData->NtProductType == NtProductWinNt) + { + /* Workstation product, display appropriate status bar color */ + Bar = InbvGetResourceAddress(IDB_BAR_PRO); + } + else + { + /* Display correct branding based on server suite */ + if (ExVerifySuite(StorageServer)) + { + /* Storage Server Edition */ + Text = InbvGetResourceAddress(IDB_STORAGE_SERVER); + } + else if (ExVerifySuite(ComputeServer)) + { + /* Compute Cluster Edition */ + Text = InbvGetResourceAddress(IDB_CLUSTER_SERVER); + } else - Top = (480 - BitmapInfoHeader->biHeight) / 2; - InbvBitBlt(Bitmap, Left, Top); - } + { + /* Normal edition */ + Text = InbvGetResourceAddress(IDB_SERVER_LOGO); + } + + /* Server product, display appropriate status bar color */ + Bar = InbvGetResourceAddress(IDB_BAR_SERVER); + } + + /* Make sure we had a logo */ + if (Screen) + { + /* Choose progress bar */ + TempRotBarSelection = RB_SQUARE_CELLS; + + /* Blit the background */ + InbvBitBlt(Screen, 0, 0); + + /* Set progress bar coordinates and display it */ + InbvSetProgressBarCoordinates(257, 352); + + /* Check for non-workstation products */ + if (SharedUserData->NtProductType != NtProductWinNt) + { + /* Overwrite part of the logo for a server product */ + InbvScreenToBufferBlt(Buffer, 413, 237, 7, 7, 8); + InbvSolidColorFill(418, 230, 454, 256, 0); + InbvBufferToScreenBlt(Buffer, 413, 237, 7, 7, 8); + + /* In setup mode, you haven't selected a SKU yet */ + if (ExpInTextModeSetup) Text = NULL; + } + } + + /* Draw the SKU text if it exits */ + if (Text) InbvBitBlt(Text, 180, 121); + + /* Draw the progress bar bit */ +// if (Bar) InbvBitBlt(Bar, 0, 0); } /* Do we have a system thread? */ Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Removed: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/13.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary file - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/14.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/15.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Removed: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/16.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary file - no diff available. Removed: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/17.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary file - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/2.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/3.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/4.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/5.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/6.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/7.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/8.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/internal/inbv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/internal/inbv.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/internal/inbv.h [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -7,6 +7,13 @@ ULONG Ceiling; ULONG Bias; } INBV_PROGRESS_STATE; + +typedef struct _BT_PROGRESS_INDICATOR +{ + ULONG Count; + ULONG Expected; + ULONG Percentage; +} BT_PROGRESS_INDICATOR, *PBT_PROGRESS_INDICATOR; typedef enum _ROT_BAR_TYPE { @@ -45,6 +52,26 @@ VOID ); +PUCHAR +NTAPI +InbvGetResourceAddress( + IN ULONG ResourceNumber +); + +VOID +NTAPI +InbvBitBlt( + IN PUCHAR Buffer, + IN ULONG X, + IN ULONG Y +); + +VOID +NTAPI +InbvIndicateProgress( + VOID +); + extern BOOLEAN InbvBootDriverInstalled; #endif /* NTOSKRNL_INBV_H */ Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/precomp.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/precomp.h [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -63,6 +63,7 @@ /* Internal Headers */ #include "internal/ntoskrnl.h" #include "config.h" +#include "resource.h" // // Define the internal versions of external and public global data Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -789,6 +789,7 @@ * Display 'Loading XXX...' message */ IopDisplayLoadingMessage(ModuleName->Buffer, TRUE); + InbvIndicateProgress(); /* * Generate filename without path (not needed by freeldr) Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/drvrlist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -507,6 +507,7 @@ { DPRINT(" Path: %wZ\n", &CurrentService->RegistryPath); Status = IopLoadDriver(CurrentService); + InbvIndicateProgress(); } } } @@ -538,7 +539,9 @@ { DPRINT(" Path: %wZ\n", &CurrentService->RegistryPath); Status = IopLoadDriver(CurrentService); + InbvIndicateProgress(); } + } } } Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -483,8 +483,8 @@ SharedUserData->NumberOfPhysicalPages = MmNumberOfPhysicalPages; SharedUserData->LargePageMinimum = 0; - /* For now, we assume that we're always Server */ - SharedUserData->NtProductType = NtProductServer; + /* 0.3.11-CLT2010 backport: Assume that we're always a workstation! */ + SharedUserData->NtProductType = NtProductWinNt; } else if (Phase == 1) { Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ntoskrnl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ntoskrnl.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ntoskrnl.rc [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -23,21 +23,20 @@ #endif #define VER_LANGNEUTRAL #include "common.ver" +#include "resource.h" // // Bug Codes and Bitmaps // #include "bugcodes.rc" -1 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/1.bmp" -2 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/2.bmp" -3 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/3.bmp" -4 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/4.bmp" -5 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/5.bmp" -6 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/6.bmp" -7 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/7.bmp" -8 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/8.bmp" -13 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/13.bmp" -14 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/14.bmp" -15 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/15.bmp" -16 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/16.bmp" -17 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/17.bmp" +IDB_BOOT_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/1.bmp" +IDB_HIBERNATE_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/2.bmp" +IDB_SHUTDOWN_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/3.bmp" +IDB_BAR_SERVER BITMAP DISCARDABLE "ntoskrnl/inbv/logo/4.bmp" +IDB_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/5.bmp" +IDB_LOGO_HEADER BITMAP DISCARDABLE "ntoskrnl/inbv/logo/6.bmp" +IDB_LOGO_BAND BITMAP DISCARDABLE "ntoskrnl/inbv/logo/7.bmp" +IDB_BAR_PRO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/8.bmp" +IDB_SERVER_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/5.bmp" +IDB_SERVER_HEADER BITMAP DISCARDABLE "ntoskrnl/inbv/logo/14.bmp" +IDB_SERVER_BAND BITMAP DISCARDABLE "ntoskrnl/inbv/logo/15.bmp"

14 years, 10 months

[jimtabor] 46054: - [User32] Send WM_CANCELMODE in EnableWindow.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Mar 10 11:19:49 2010 New Revision: 46054 URL: http://svn.reactos.org/svn/reactos?rev=46054&view=rev Log: - [User32] Send WM_CANCELMODE in EnableWindow. Modified: trunk/reactos/dll/win32/user32/windows/input.c Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] Wed Mar 10 11:19:49 2010 @@ -109,30 +109,39 @@ EnableWindow(HWND hWnd, BOOL bEnable) { + // This will soon be moved to win32k. + BOOL Update; LONG Style = GetWindowLongPtrW(hWnd, GWL_STYLE); /* check if updating is needed */ UINT bIsDisabled = (Style & WS_DISABLED); - if ( (bIsDisabled && bEnable) || (!bIsDisabled && !bEnable) ) - { - if (bEnable) - { - Style &= ~WS_DISABLED; - } - else - { - Style |= WS_DISABLED; - /* Remove keyboard focus from that window if it had focus */ - if (hWnd == GetFocus()) - { - SetFocus(NULL); - } - } - NtUserSetWindowLong(hWnd, GWL_STYLE, Style, FALSE); - - SendMessageA(hWnd, WM_ENABLE, (LPARAM) IsWindowEnabled(hWnd), 0); + Update = bIsDisabled; + + if (bEnable) + { + Style &= ~WS_DISABLED; + } + else + { + Update = !bIsDisabled; + + SendMessageW( hWnd, WM_CANCELMODE, 0, 0); + + /* Remove keyboard focus from that window if it had focus */ + if (hWnd == GetFocus()) + { + SetFocus(NULL); + } + Style |= WS_DISABLED; + } + + NtUserSetWindowLong(hWnd, GWL_STYLE, Style, FALSE); + + if (Update) + { + SendMessageW(hWnd, WM_ENABLE, (LPARAM)bEnable, 0); } // Return nonzero if it was disabled, or zero if it wasn't: - return IsWindowEnabled(hWnd); + return bIsDisabled; }

14 years, 10 months

[sir_richard] 46053: [KERNEL32]: Remove debug output.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Mar 10 07:50:15 2010 New Revision: 46053 URL: http://svn.reactos.org/svn/reactos?rev=46053&view=rev Log: [KERNEL32]: Remove debug output. Modified: trunk/reactos/dll/win32/kernel32/misc/console.c Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] Wed Mar 10 07:50:15 2010 @@ -39,7 +39,7 @@ WINAPI DefaultConsoleCtrlHandler(DWORD Event) { - DPRINT1("Default handler called: %lx\n", Event); + DPRINT("Default handler called: %lx\n", Event); switch(Event) { case CTRL_C_EVENT: @@ -51,7 +51,7 @@ break; case CTRL_SHUTDOWN_EVENT: - DPRINT1("Ctrl Shutdown Event\n"); + DPRINT("Ctrl Shutdown Event\n"); break; case CTRL_CLOSE_EVENT: @@ -59,7 +59,7 @@ break; case CTRL_LOGOFF_EVENT: - DPRINT1("Ctrl Logoff Event\n"); + DPRINT("Ctrl Logoff Event\n"); break; } @@ -77,7 +77,7 @@ UINT i; EXCEPTION_RECORD erException; - DPRINT1("Console Dispatcher Active: %lx %lx\n", CodeAndFlag, nCode); + DPRINT("Console Dispatcher Active: %lx %lx\n", CodeAndFlag, nCode); SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST); switch(nCode) @@ -154,7 +154,7 @@ (CodeAndFlag & MINLONG) && ((nCode == CTRL_LOGOFF_EVENT) || (nCode == CTRL_SHUTDOWN_EVENT))) { - DPRINT1("Skipping system/service apps\n"); + DPRINT("Skipping system/service apps\n"); break; }

14 years, 10 months

[sir_richard] 46052: [CSRSRV]: Move the new process/thread management functions into new, dedicated files. Export some of the functions, so that win32csr can use them by linking to csrsrv. Last change needed for barebones user-mode shutdown support.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Mar 10 07:49:53 2010 New Revision: 46052 URL: http://svn.reactos.org/svn/reactos?rev=46052&view=rev Log: [CSRSRV]: Move the new process/thread management functions into new, dedicated files. Export some of the functions, so that win32csr can use them by linking to csrsrv. Last change needed for barebones user-mode shutdown support. Added: trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c (with props) trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c (with props) Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec trunk/reactos/subsystems/win32/csrss/csrsrv/init.c trunk/reactos/subsystems/win32/csrss/include/api.h Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] Wed Mar 10 07:49:53 2010 @@ -15,297 +15,18 @@ #define LOCK RtlEnterCriticalSection(&ProcessDataLock) #define UNLOCK RtlLeaveCriticalSection(&ProcessDataLock) - -/* GLOBALS *******************************************************************/ - -static ULONG NrProcess; -static PCSRSS_PROCESS_DATA ProcessData[256]; -RTL_CRITICAL_SECTION ProcessDataLock; - -/* FUNCTIONS *****************************************************************/ - -#define CsrHeap RtlGetProcessHeap() - -#define CsrHashThread(t) \ - (HandleToUlong(t)&(256 - 1)) - -LIST_ENTRY CsrThreadHashTable[256]; -PCSRSS_PROCESS_DATA CsrRootProcess; - -PCSR_THREAD -NTAPI -CsrAllocateThread(IN PCSRSS_PROCESS_DATA CsrProcess) -{ - PCSR_THREAD CsrThread; - - /* Allocate the structure */ - CsrThread = RtlAllocateHeap(CsrHeap, HEAP_ZERO_MEMORY, sizeof(CSR_THREAD)); - if (!CsrThread) return(NULL); - - /* Reference the Thread and Process */ - CsrThread->ReferenceCount++; - // CsrProcess->ReferenceCount++; - - /* Set the Parent Process */ - CsrThread->Process = CsrProcess; - - /* Return Thread */ - return CsrThread; -} - -PCSR_THREAD -NTAPI -CsrLocateThreadByClientId(OUT PCSRSS_PROCESS_DATA *Process OPTIONAL, - IN PCLIENT_ID ClientId) -{ - ULONG i; - PLIST_ENTRY ListHead, NextEntry; - PCSR_THREAD FoundThread; - - /* Hash the Thread */ - i = CsrHashThread(ClientId->UniqueThread); - - /* Set the list pointers */ - ListHead = &CsrThreadHashTable[i]; - NextEntry = ListHead->Flink; - - /* Star the loop */ - while (NextEntry != ListHead) - { - /* Get the thread */ - FoundThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, HashLinks); - - /* Compare the CID */ - if (FoundThread->ClientId.UniqueThread == ClientId->UniqueThread) - { - /* Match found, return the process */ - *Process = FoundThread->Process; - - /* Return thread too */ -// DPRINT1("Found: %p %p\n", FoundThread, FoundThread->Process); - return FoundThread; - } - - /* Next */ - NextEntry = NextEntry->Flink; - } - - /* Nothing found */ - return NULL; -} - -PCSR_THREAD -NTAPI -CsrLocateThreadInProcess(IN PCSRSS_PROCESS_DATA CsrProcess OPTIONAL, - IN PCLIENT_ID Cid) -{ - PLIST_ENTRY ListHead, NextEntry; - PCSR_THREAD FoundThread = NULL; - - /* Use the Root Process if none was specified */ - if (!CsrProcess) CsrProcess = CsrRootProcess; - - /* Save the List pointers */ -// DPRINT1("Searching in: %p %d\n", CsrProcess, CsrProcess->ThreadCount); - ListHead = &CsrProcess->ThreadList; - NextEntry = ListHead->Flink; - - /* Start the Loop */ - while (NextEntry != ListHead) - { - /* Get Thread Entry */ - FoundThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, Link); - - /* Check for TID Match */ - if (FoundThread->ClientId.UniqueThread == Cid->UniqueThread) break; - - /* Next entry */ - NextEntry = NextEntry->Flink; - } - - /* Return what we found */ -// DPRINT1("Found: %p\n", FoundThread); - return FoundThread; -} - -VOID -NTAPI -CsrInsertThread(IN PCSRSS_PROCESS_DATA Process, - IN PCSR_THREAD Thread) -{ - ULONG i; - - /* Insert it into the Regular List */ - InsertTailList(&Process->ThreadList, &Thread->Link); - - /* Increase Thread Count */ - Process->ThreadCount++; - - /* Hash the Thread */ - i = CsrHashThread(Thread->ClientId.UniqueThread); -// DPRINT1("TID %lx HASH: %lx\n", Thread->ClientId.UniqueThread, i); - - /* Insert it there too */ - InsertHeadList(&CsrThreadHashTable[i], &Thread->HashLinks); -} - - #define CsrAcquireProcessLock() LOCK #define CsrReleaseProcessLock() UNLOCK -VOID -NTAPI -CsrDeallocateThread(IN PCSR_THREAD CsrThread) -{ - /* Free the process object from the heap */ - RtlFreeHeap(CsrHeap, 0, CsrThread); -} - -VOID -NTAPI -CsrRemoveThread(IN PCSR_THREAD CsrThread) -{ - /* Remove it from the List */ - RemoveEntryList(&CsrThread->Link); - - /* Decreate the thread count of the process */ - CsrThread->Process->ThreadCount--; - - /* Remove it from the Hash List as well */ - if (CsrThread->HashLinks.Flink) RemoveEntryList(&CsrThread->HashLinks); - - /* Check if this is the last Thread */ - if (!CsrThread->Process->ThreadCount) - { - /* Check if it's not already been marked for deletion */ - if (!(CsrThread->Process->Flags & CsrProcessLastThreadTerminated)) - { - /* Let everyone know this process is about to lose the thread */ - //CsrThread->Process->Flags |= CsrProcessLastThreadTerminated; - - /* Reference the Process */ - //CsrLockedDereferenceProcess(CsrThread->Process); - } - } - - /* Mark the thread for deletion */ - CsrThread->Flags |= CsrThreadInTermination; -} - -VOID -NTAPI -CsrThreadRefcountZero(IN PCSR_THREAD CsrThread) -{ - /* Remove this thread */ - CsrRemoveThread(CsrThread); - - /* Release the Process Lock */ - //CsrReleaseProcessLock(); - - /* Close the NT Thread Handle */ - if (CsrThread->ThreadHandle) NtClose(CsrThread->ThreadHandle); - - /* De-allocate the CSR Thread Object */ - CsrDeallocateThread(CsrThread); - - /* Remove a reference from the process */ - //CsrDereferenceProcess(CsrProcess); -} - -NTSTATUS -NTAPI -CsrCreateThreadData(IN PCSRSS_PROCESS_DATA CsrProcess, - IN HANDLE hThread, - IN PCLIENT_ID ClientId) -{ - NTSTATUS Status; - PCSR_THREAD CsrThread; - //PCSRSS_PROCESS_DATA CurrentProcess; - PCSR_THREAD CurrentThread = NtCurrentTeb()->CsrClientThread; - CLIENT_ID CurrentCid; - KERNEL_USER_TIMES KernelTimes; - -// DPRINT1("CSRSRV: %s called\n", __FUNCTION__); - - /* Get the current thread and CID */ - CurrentCid = CurrentThread->ClientId; -// DPRINT1("CALLER PID/TID: %lx/%lx\n", CurrentCid.UniqueProcess, CurrentCid.UniqueThread); - - /* Acquire the Process Lock */ - CsrAcquireProcessLock(); -#if 0 - /* Get the current Process and make sure the Thread is valid with this CID */ - CurrentThread = CsrLocateThreadByClientId(&CurrentProcess, - &CurrentCid); - - /* Something is wrong if we get an empty thread back */ - if (!CurrentThread) - { - DPRINT1("CSRSRV:%s: invalid thread!\n", __FUNCTION__); - CsrReleaseProcessLock(); - return STATUS_THREAD_IS_TERMINATING; - } -#endif - /* Get the Thread Create Time */ - Status = NtQueryInformationThread(hThread, - ThreadTimes, - (PVOID)&KernelTimes, - sizeof(KernelTimes), - NULL); - - /* Allocate a CSR Thread Structure */ - if (!(CsrThread = CsrAllocateThread(CsrProcess))) - { - DPRINT1("CSRSRV:%s: out of memory!\n", __FUNCTION__); - CsrReleaseProcessLock(); - return STATUS_NO_MEMORY; - } - - /* Save the data we have */ - CsrThread->CreateTime = KernelTimes.CreateTime; - CsrThread->ClientId = *ClientId; - CsrThread->ThreadHandle = hThread; - CsrThread->Flags = 0; - - /* Insert the Thread into the Process */ - CsrInsertThread(CsrProcess, CsrThread); - - /* Release the lock and return */ - CsrReleaseProcessLock(); - return STATUS_SUCCESS; -} - -PCSR_THREAD -NTAPI -CsrAddStaticServerThread(IN HANDLE hThread, - IN PCLIENT_ID ClientId, - IN ULONG ThreadFlags) -{ - PCSR_THREAD CsrThread; - - /* Get the Lock */ - CsrAcquireProcessLock(); - - /* Allocate the Server Thread */ - if ((CsrThread = CsrAllocateThread(CsrRootProcess))) - { - /* Setup the Object */ -// DPRINT1("New CSR thread created: %lx PID/TID: %lx/%lx\n", CsrThread, ClientId->UniqueProcess, ClientId->UniqueThread); - CsrThread->ThreadHandle = hThread; - CsrThread->ClientId = *ClientId; - CsrThread->Flags = ThreadFlags; - - /* Insert it into the Thread List */ - InsertTailList(&CsrRootProcess->ThreadList, &CsrThread->Link); - - /* Increment the thread count */ - CsrRootProcess->ThreadCount++; - } - - /* Release the Process Lock and return */ - CsrReleaseProcessLock(); - return CsrThread; -} +/* GLOBALS *******************************************************************/ + +static ULONG NrProcess; +PCSRSS_PROCESS_DATA ProcessData[256]; +RTL_CRITICAL_SECTION ProcessDataLock; +extern PCSRSS_PROCESS_DATA CsrRootProcess; +extern LIST_ENTRY CsrThreadHashTable[256]; + +/* FUNCTIONS *****************************************************************/ VOID WINAPI CsrInitProcessData(VOID) { @@ -477,409 +198,6 @@ return STATUS_INVALID_PARAMETER; } -VOID -NTAPI -CsrSetToNormalPriority(VOID) -{ - KPRIORITY BasePriority = (8 + 1) + 4; - - /* Set the Priority */ - NtSetInformationProcess(NtCurrentProcess(), - ProcessBasePriority, - &BasePriority, - sizeof(KPRIORITY)); -} - -VOID -NTAPI -CsrSetToShutdownPriority(VOID) -{ - KPRIORITY SetBasePriority = (8 + 1) + 6; - BOOLEAN Old; - - /* Get the shutdown privilege */ - if (NT_SUCCESS(RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, - TRUE, - FALSE, - &Old))) - { - /* Set the Priority */ - NtSetInformationProcess(NtCurrentProcess(), - ProcessBasePriority, - &SetBasePriority, - sizeof(KPRIORITY)); - } -} - -NTSTATUS -NTAPI -CsrGetProcessLuid(HANDLE hProcess OPTIONAL, - PLUID Luid) -{ - HANDLE hToken = NULL; - NTSTATUS Status; - ULONG Length; - PTOKEN_STATISTICS TokenStats; - - /* Check if we have a handle to a CSR Process */ - if (!hProcess) - { - /* We don't, so try opening the Thread's Token */ - Status = NtOpenThreadToken(NtCurrentThread(), - TOKEN_QUERY, - FALSE, - &hToken); - - /* Check for success */ - if (!NT_SUCCESS(Status)) - { - /* If we got some other failure, then return and quit */ - if (Status != STATUS_NO_TOKEN) return Status; - - /* We don't have a Thread Token, use a Process Token */ - hProcess = NtCurrentProcess(); - hToken = NULL; - } - } - - /* Check if we have a token by now */ - if (!hToken) - { - /* No token yet, so open the Process Token */ - Status = NtOpenProcessToken(hProcess, - TOKEN_QUERY, - &hToken); - if (!NT_SUCCESS(Status)) - { - /* Still no token, return the error */ - return Status; - } - } - - /* Now get the size we'll need for the Token Information */ - Status = NtQueryInformationToken(hToken, - TokenStatistics, - NULL, - 0, - &Length); - - /* Allocate memory for the Token Info */ - if (!(TokenStats = RtlAllocateHeap(CsrHeap, 0, Length))) - { - /* Fail and close the token */ - NtClose(hToken); - return STATUS_NO_MEMORY; - } - - /* Now query the information */ - Status = NtQueryInformationToken(hToken, - TokenStatistics, - TokenStats, - Length, - &Length); - - /* Close the handle */ - NtClose(hToken); - - /* Check for success */ - if (NT_SUCCESS(Status)) - { - /* Return the LUID */ - *Luid = TokenStats->AuthenticationId; - } - - /* Free the query information */ - RtlFreeHeap(CsrHeap, 0, TokenStats); - - /* Return the Status */ - return Status; -} - -SECURITY_QUALITY_OF_SERVICE CsrSecurityQos = -{ - sizeof(SECURITY_QUALITY_OF_SERVICE), - SecurityImpersonation, - SECURITY_STATIC_TRACKING, - FALSE -}; - -BOOLEAN -NTAPI -CsrImpersonateClient(IN PCSR_THREAD CsrThread) -{ - NTSTATUS Status; - PCSR_THREAD CurrentThread = NtCurrentTeb()->CsrClientThread; - - /* Use the current thread if none given */ - if (!CsrThread) CsrThread = CurrentThread; - - /* Still no thread, something is wrong */ - if (!CsrThread) - { - /* Failure */ - return FALSE; - } - - /* Make the call */ - Status = NtImpersonateThread(NtCurrentThread(), - CsrThread->ThreadHandle, - &CsrSecurityQos); - - if (!NT_SUCCESS(Status)) - { - /* Failure */ - return FALSE; - } - - /* Increase the impersonation count for the current thread */ - if (CurrentThread) ++CurrentThread->ImpersonationCount; - - /* Return Success */ - return TRUE; -} - -BOOLEAN -NTAPI -CsrRevertToSelf(VOID) -{ - NTSTATUS Status; - PCSR_THREAD CurrentThread = NtCurrentTeb()->CsrClientThread; - HANDLE ImpersonationToken = NULL; - - /* Check if we have a Current Thread */ - if (CurrentThread) - { - /* Make sure impersonation is on */ - if (!CurrentThread->ImpersonationCount) - { - return FALSE; - } - else if (--CurrentThread->ImpersonationCount > 0) - { - /* Success; impersonation count decreased but still not zero */ - return TRUE; - } - } - - /* Impersonation has been totally removed, revert to ourselves */ - Status = NtSetInformationThread(NtCurrentThread(), - ThreadImpersonationToken, - &ImpersonationToken, - sizeof(HANDLE)); - - /* Return TRUE or FALSE */ - return NT_SUCCESS(Status); -} - -PCSRSS_PROCESS_DATA -NTAPI -FindProcessForShutdown(IN PLUID CallerLuid) -{ - ULONG Hash; - PCSRSS_PROCESS_DATA CsrProcess, ReturnCsrProcess = NULL; - NTSTATUS Status; - ULONG Level = 0; - LUID ProcessLuid; - LUID SystemLuid = SYSTEM_LUID; - BOOLEAN IsSystemLuid = FALSE, IsOurLuid = FALSE; - - for (Hash = 0; Hash < (sizeof(ProcessData) / sizeof(*ProcessData)); Hash++) - { - /* Get this process hash bucket */ - CsrProcess = ProcessData[Hash]; - while (CsrProcess) - { - /* Skip this process if it's already been processed*/ - if (CsrProcess->Flags & CsrProcessSkipShutdown) goto Next; - - /* Get the LUID of this Process */ - Status = CsrGetProcessLuid(CsrProcess->Process, &ProcessLuid); - - /* Check if we didn't get access to the LUID */ - if (Status == STATUS_ACCESS_DENIED) - { - /* FIXME:Check if we have any threads */ - } - - if (!NT_SUCCESS(Status)) - { - /* We didn't have access, so skip it */ - CsrProcess->Flags |= CsrProcessSkipShutdown; - goto Next; - } - - /* Check if this is the System LUID */ - if ((IsSystemLuid = RtlEqualLuid(&ProcessLuid, &SystemLuid))) - { - /* Mark this process */ - CsrProcess->ShutdownFlags |= CsrShutdownSystem; - } - else if (!(IsOurLuid = RtlEqualLuid(&ProcessLuid, CallerLuid))) - { - /* Our LUID doesn't match with the caller's */ - CsrProcess->ShutdownFlags |= CsrShutdownOther; - } - - /* Check if we're past the previous level */ - if (CsrProcess->ShutdownLevel > Level) - { - /* Update the level */ - Level = CsrProcess->ShutdownLevel; - - /* Set the final process */ - ReturnCsrProcess = CsrProcess; - } -Next: - /* Next process */ - CsrProcess = CsrProcess->next; - } - } - - /* Check if we found a process */ - if (ReturnCsrProcess) - { - /* Skip this one next time */ - ReturnCsrProcess->Flags |= CsrProcessSkipShutdown; - } - - return ReturnCsrProcess; -} - -/* This is really "CsrShutdownProcess", mostly */ -NTSTATUS -WINAPI -CsrEnumProcesses(IN CSRSS_ENUM_PROCESS_PROC EnumProc, - IN PVOID Context) -{ - PVOID* RealContext = (PVOID*)Context; - PLUID CallerLuid = RealContext[0]; - PCSRSS_PROCESS_DATA CsrProcess = NULL; - NTSTATUS Status = STATUS_UNSUCCESSFUL; - BOOLEAN FirstTry; - ULONG Result = 0; - ULONG Hash; - - /* Acquire process lock */ - CsrAcquireProcessLock(); - - /* Start the loop */ - for (Hash = 0; Hash < (sizeof(ProcessData) / sizeof(*ProcessData)); Hash++) - { - /* Get the Process */ - CsrProcess = ProcessData[Hash]; - while (CsrProcess) - { - /* Remove the skip flag, set shutdown flags to 0*/ - CsrProcess->Flags &= ~CsrProcessSkipShutdown; - CsrProcess->ShutdownFlags = 0; - - /* Move to the next */ - CsrProcess = CsrProcess->next; - } - } - - /* Set shudown Priority */ - CsrSetToShutdownPriority(); - - /* Loop all processes */ - DPRINT1("Enumerating for LUID: %lx %lx\n", CallerLuid->HighPart, CallerLuid->LowPart); - - /* Start looping */ - while (TRUE) - { - /* Find the next process to shutdown */ - FirstTry = TRUE; - if (!(CsrProcess = FindProcessForShutdown(CallerLuid))) - { - /* Done, quit */ - CsrReleaseProcessLock(); - Status = STATUS_SUCCESS; - goto Quickie; - } - -LoopAgain: - /* Release the lock, make the callback, and acquire it back */ - DPRINT1("Found process: %lx\n", CsrProcess->ProcessId); - CsrReleaseProcessLock(); - Result = (ULONG)EnumProc(CsrProcess, (PVOID)((ULONG_PTR)Context | FirstTry)); - CsrAcquireProcessLock(); - - /* Check the result */ - DPRINT1("Result: %d\n", Result); - if (Result == CsrShutdownCsrProcess) - { - /* The callback unlocked the process */ - break; - } - else if (Result == CsrShutdownNonCsrProcess) - { - /* A non-CSR process, the callback didn't touch it */ - //continue; - } - else if (Result == CsrShutdownCancelled) - { - /* Shutdown was cancelled, unlock and exit */ - CsrReleaseProcessLock(); - Status = STATUS_CANCELLED; - goto Quickie; - } - - /* No matches during the first try, so loop again */ - if (FirstTry && Result == CsrShutdownNonCsrProcess) - { - FirstTry = FALSE; - goto LoopAgain; - } - } - -Quickie: - /* Return to normal priority */ - CsrSetToNormalPriority(); - return Status; -} - -NTSTATUS -NTAPI -CsrLockProcessByClientId(IN HANDLE Pid, - OUT PCSRSS_PROCESS_DATA *CsrProcess OPTIONAL) -{ - ULONG Hash; - PCSRSS_PROCESS_DATA CurrentProcess = NULL; - NTSTATUS Status = STATUS_UNSUCCESSFUL; - - /* Acquire the lock */ - CsrAcquireProcessLock(); - - /* Start the loop */ - for (Hash = 0; Hash < (sizeof(ProcessData) / sizeof(*ProcessData)); Hash++) - { - /* Get the Process */ - CurrentProcess = ProcessData[Hash]; - while (CurrentProcess) - { - /* Check for PID match */ - if (CurrentProcess->ProcessId == Pid) - { - /* Get out of here with success */ -// DPRINT1("Found %p for PID %lx\n", CurrentProcess, Pid); - Status = STATUS_SUCCESS; - goto Found; - } - - /* Move to the next */ - CurrentProcess = CurrentProcess->next; - } - } - - /* Nothing found, release the lock */ -Found: - if (!CurrentProcess) CsrReleaseProcessLock(); - - /* Return the status and process */ - if (CsrProcess) *CsrProcess = CurrentProcess; - return Status; -} - /********************************************************************** * CSRSS API *********************************************************************/ @@ -920,7 +238,7 @@ return(STATUS_SUCCESS); } -CSR_API(CsrCreateThread) +CSR_API(CsrSrvCreateThread) { PCSR_THREAD CurrentThread; HANDLE ThreadHandle; @@ -979,7 +297,7 @@ Status = STATUS_SUCCESS; // hack if (NT_SUCCESS(Status)) { - Status = CsrCreateThreadData(CsrProcess, + Status = CsrCreateThread(CsrProcess, ThreadHandle, &Request->Data.CreateThreadRequest.ClientId); // DPRINT1("Create status: %lx\n", Status); Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild [iso-8859-1] Wed Mar 10 07:49:53 2010 @@ -15,6 +15,8 @@ <file>user.c</file> <file>wapi.c</file> </directory> + <file>procsup.c</file> + <file>thredsup.c</file> <file>init.c</file> <pch>srv.h</pch> </module> Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec [iso-8859-1] Wed Mar 10 07:49:53 2010 @@ -1,9 +1,9 @@ -;@ stdcall CsrAddStaticServerThread(ptr ptr long) +@ stdcall CsrAddStaticServerThread(ptr ptr long) ;@ stdcall CsrCallServerFromServer(ptr ptr) ;@ stdcall CsrConnectToUser() ;@ stdcall CsrCreateProcess(ptr ptr ptr ptr long ptr) ;@ stdcall CsrCreateRemoteThread(ptr ptr) -;@ stdcall CsrCreateThread(ptr ptr ptr) +@ stdcall CsrCreateThread(ptr ptr ptr) ;@ stdcall CsrCreateWait(ptr ptr ptr ptr ptr ptr) ;@ stdcall CsrDebugProcess(ptr) ;@ stdcall CsrDebugProcessStop(ptr) @@ -13,23 +13,23 @@ ;@ stdcall CsrDestroyProcess(ptr long) ;@ stdcall CsrDestroyThread(ptr) ;@ stdcall CsrExecServerThread(ptr long) -;@ stdcall CsrGetProcessLuid(ptr ptr) -;@ stdcall CsrImpersonateClient(ptr) -;@ stdcall CsrLockProcessByClientId(ptr ptr) +@ stdcall CsrGetProcessLuid(ptr ptr) +@ stdcall CsrImpersonateClient(ptr) +@ stdcall CsrLockProcessByClientId(ptr ptr) ;@ stdcall CsrLockThreadByClientId(ptr ptr) ;@ stdcall CsrMoveSatisfiedWait(ptr ptr) ;@ stdcall CsrNotifyWait(ptr long ptr ptr) ;@ stdcall CsrPopulateDosDevices() ;@ stdcall CsrQueryApiPort() ;@ stdcall CsrReferenceThread(ptr) -;@ stdcall CsrRevertToSelf() +@ stdcall CsrRevertToSelf() @ stdcall CsrServerInitialization(long ptr) ;@ stdcall CsrSetBackgroundPriority(ptr) ;@ stdcall CsrSetCallingSpooler(long) ;@ stdcall CsrSetForegroundPriority(ptr) ;@ stdcall CsrShutdownProcesses(ptr long) ;@ stdcall CsrUnhandledExceptionFilter(ptr) -;@ stdcall CsrUnlockProcess(ptr) +@ stdcall CsrUnlockProcess(ptr) ;@ stdcall CsrUnlockThread(ptr) ;@ stdcall CsrValidateMessageBuffer(ptr ptr long long) ;@ stdcall CsrValidateMessageString(ptr ptr) Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Wed Mar 10 07:49:53 2010 @@ -364,7 +364,7 @@ CSRSS_API_DEFINITION NativeDefinitions[] = { CSRSS_DEFINE_API(CREATE_PROCESS, CsrCreateProcess), - CSRSS_DEFINE_API(CREATE_THREAD, CsrCreateThread), + CSRSS_DEFINE_API(CREATE_THREAD, CsrSrvCreateThread), CSRSS_DEFINE_API(TERMINATE_PROCESS, CsrTerminateProcess), CSRSS_DEFINE_API(CONNECT_PROCESS, CsrConnectProcess), CSRSS_DEFINE_API(REGISTER_SERVICES_PROCESS, CsrRegisterServicesProcess), Added: trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c (added) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] Wed Mar 10 07:49:53 2010 @@ -1,0 +1,447 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CSR Sub System + * FILE: subsys/csr/csrsrv/procsup.c + * PURPOSE: CSR Process Management + * PROGRAMMERS: ReactOS Portable Systems Group + * Alex Ionescu + */ + +/* INCLUDES *******************************************************************/ + +#include <srv.h> + +#define NDEBUG +#include <debug.h> + +#define LOCK RtlEnterCriticalSection(&ProcessDataLock) +#define UNLOCK RtlLeaveCriticalSection(&ProcessDataLock) +#define CsrHeap RtlGetProcessHeap() + +#define CsrAcquireProcessLock() LOCK +#define CsrReleaseProcessLock() UNLOCK + +/* GLOBALS ********************************************************************/ + +extern RTL_CRITICAL_SECTION ProcessDataLock; +extern PCSRSS_PROCESS_DATA ProcessData[256]; +PCSRSS_PROCESS_DATA CsrRootProcess; +LIST_ENTRY CsrThreadHashTable[256]; +SECURITY_QUALITY_OF_SERVICE CsrSecurityQos = +{ + sizeof(SECURITY_QUALITY_OF_SERVICE), + SecurityImpersonation, + SECURITY_STATIC_TRACKING, + FALSE +}; + +/* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +CsrSetToNormalPriority(VOID) +{ + KPRIORITY BasePriority = (8 + 1) + 4; + + /* Set the Priority */ + NtSetInformationProcess(NtCurrentProcess(), + ProcessBasePriority, + &BasePriority, + sizeof(KPRIORITY)); +} + +VOID +NTAPI +CsrSetToShutdownPriority(VOID) +{ + KPRIORITY SetBasePriority = (8 + 1) + 6; + BOOLEAN Old; + + /* Get the shutdown privilege */ + if (NT_SUCCESS(RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, + TRUE, + FALSE, + &Old))) + { + /* Set the Priority */ + NtSetInformationProcess(NtCurrentProcess(), + ProcessBasePriority, + &SetBasePriority, + sizeof(KPRIORITY)); + } +} + +NTSTATUS +NTAPI +CsrGetProcessLuid(HANDLE hProcess OPTIONAL, + PLUID Luid) +{ + HANDLE hToken = NULL; + NTSTATUS Status; + ULONG Length; + PTOKEN_STATISTICS TokenStats; + + /* Check if we have a handle to a CSR Process */ + if (!hProcess) + { + /* We don't, so try opening the Thread's Token */ + Status = NtOpenThreadToken(NtCurrentThread(), + TOKEN_QUERY, + FALSE, + &hToken); + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + /* If we got some other failure, then return and quit */ + if (Status != STATUS_NO_TOKEN) return Status; + + /* We don't have a Thread Token, use a Process Token */ + hProcess = NtCurrentProcess(); + hToken = NULL; + } + } + + /* Check if we have a token by now */ + if (!hToken) + { + /* No token yet, so open the Process Token */ + Status = NtOpenProcessToken(hProcess, + TOKEN_QUERY, + &hToken); + if (!NT_SUCCESS(Status)) + { + /* Still no token, return the error */ + return Status; + } + } + + /* Now get the size we'll need for the Token Information */ + Status = NtQueryInformationToken(hToken, + TokenStatistics, + NULL, + 0, + &Length); + + /* Allocate memory for the Token Info */ + if (!(TokenStats = RtlAllocateHeap(CsrHeap, 0, Length))) + { + /* Fail and close the token */ + NtClose(hToken); + return STATUS_NO_MEMORY; + } + + /* Now query the information */ + Status = NtQueryInformationToken(hToken, + TokenStatistics, + TokenStats, + Length, + &Length); + + /* Close the handle */ + NtClose(hToken); + + /* Check for success */ + if (NT_SUCCESS(Status)) + { + /* Return the LUID */ + *Luid = TokenStats->AuthenticationId; + } + + /* Free the query information */ + RtlFreeHeap(CsrHeap, 0, TokenStats); + + /* Return the Status */ + return Status; +} + +BOOLEAN +NTAPI +CsrImpersonateClient(IN PCSR_THREAD CsrThread) +{ + NTSTATUS Status; + PCSR_THREAD CurrentThread = NtCurrentTeb()->CsrClientThread; + + /* Use the current thread if none given */ + if (!CsrThread) CsrThread = CurrentThread; + + /* Still no thread, something is wrong */ + if (!CsrThread) + { + /* Failure */ + return FALSE; + } + + /* Make the call */ + Status = NtImpersonateThread(NtCurrentThread(), + CsrThread->ThreadHandle, + &CsrSecurityQos); + + if (!NT_SUCCESS(Status)) + { + /* Failure */ + return FALSE; + } + + /* Increase the impersonation count for the current thread */ + if (CurrentThread) ++CurrentThread->ImpersonationCount; + + /* Return Success */ + return TRUE; +} + +BOOLEAN +NTAPI +CsrRevertToSelf(VOID) +{ + NTSTATUS Status; + PCSR_THREAD CurrentThread = NtCurrentTeb()->CsrClientThread; + HANDLE ImpersonationToken = NULL; + + /* Check if we have a Current Thread */ + if (CurrentThread) + { + /* Make sure impersonation is on */ + if (!CurrentThread->ImpersonationCount) + { + return FALSE; + } + else if (--CurrentThread->ImpersonationCount > 0) + { + /* Success; impersonation count decreased but still not zero */ + return TRUE; + } + } + + /* Impersonation has been totally removed, revert to ourselves */ + Status = NtSetInformationThread(NtCurrentThread(), + ThreadImpersonationToken, + &ImpersonationToken, + sizeof(HANDLE)); + + /* Return TRUE or FALSE */ + return NT_SUCCESS(Status); +} + +PCSRSS_PROCESS_DATA +NTAPI +FindProcessForShutdown(IN PLUID CallerLuid) +{ + ULONG Hash; + PCSRSS_PROCESS_DATA CsrProcess, ReturnCsrProcess = NULL; + NTSTATUS Status; + ULONG Level = 0; + LUID ProcessLuid; + LUID SystemLuid = SYSTEM_LUID; + BOOLEAN IsSystemLuid = FALSE, IsOurLuid = FALSE; + + for (Hash = 0; Hash < (sizeof(ProcessData) / sizeof(*ProcessData)); Hash++) + { + /* Get this process hash bucket */ + CsrProcess = ProcessData[Hash]; + while (CsrProcess) + { + /* Skip this process if it's already been processed*/ + if (CsrProcess->Flags & CsrProcessSkipShutdown) goto Next; + + /* Get the LUID of this Process */ + Status = CsrGetProcessLuid(CsrProcess->Process, &ProcessLuid); + + /* Check if we didn't get access to the LUID */ + if (Status == STATUS_ACCESS_DENIED) + { + /* FIXME:Check if we have any threads */ + } + + if (!NT_SUCCESS(Status)) + { + /* We didn't have access, so skip it */ + CsrProcess->Flags |= CsrProcessSkipShutdown; + goto Next; + } + + /* Check if this is the System LUID */ + if ((IsSystemLuid = RtlEqualLuid(&ProcessLuid, &SystemLuid))) + { + /* Mark this process */ + CsrProcess->ShutdownFlags |= CsrShutdownSystem; + } + else if (!(IsOurLuid = RtlEqualLuid(&ProcessLuid, CallerLuid))) + { + /* Our LUID doesn't match with the caller's */ + CsrProcess->ShutdownFlags |= CsrShutdownOther; + } + + /* Check if we're past the previous level */ + if (CsrProcess->ShutdownLevel > Level) + { + /* Update the level */ + Level = CsrProcess->ShutdownLevel; + + /* Set the final process */ + ReturnCsrProcess = CsrProcess; + } +Next: + /* Next process */ + CsrProcess = CsrProcess->next; + } + } + + /* Check if we found a process */ + if (ReturnCsrProcess) + { + /* Skip this one next time */ + ReturnCsrProcess->Flags |= CsrProcessSkipShutdown; + } + + return ReturnCsrProcess; +} + +/* This is really "CsrShutdownProcess", mostly */ +NTSTATUS +WINAPI +CsrEnumProcesses(IN CSRSS_ENUM_PROCESS_PROC EnumProc, + IN PVOID Context) +{ + PVOID* RealContext = (PVOID*)Context; + PLUID CallerLuid = RealContext[0]; + PCSRSS_PROCESS_DATA CsrProcess = NULL; + NTSTATUS Status = STATUS_UNSUCCESSFUL; + BOOLEAN FirstTry; + ULONG Result = 0; + ULONG Hash; + + /* Acquire process lock */ + CsrAcquireProcessLock(); + + /* Start the loop */ + for (Hash = 0; Hash < (sizeof(ProcessData) / sizeof(*ProcessData)); Hash++) + { + /* Get the Process */ + CsrProcess = ProcessData[Hash]; + while (CsrProcess) + { + /* Remove the skip flag, set shutdown flags to 0*/ + CsrProcess->Flags &= ~CsrProcessSkipShutdown; + CsrProcess->ShutdownFlags = 0; + + /* Move to the next */ + CsrProcess = CsrProcess->next; + } + } + + /* Set shudown Priority */ + CsrSetToShutdownPriority(); + + /* Loop all processes */ + //DPRINT1("Enumerating for LUID: %lx %lx\n", CallerLuid->HighPart, CallerLuid->LowPart); + + /* Start looping */ + while (TRUE) + { + /* Find the next process to shutdown */ + FirstTry = TRUE; + if (!(CsrProcess = FindProcessForShutdown(CallerLuid))) + { + /* Done, quit */ + CsrReleaseProcessLock(); + Status = STATUS_SUCCESS; + goto Quickie; + } + +LoopAgain: + /* Release the lock, make the callback, and acquire it back */ + //DPRINT1("Found process: %lx\n", CsrProcess->ProcessId); + CsrReleaseProcessLock(); + Result = (ULONG)EnumProc(CsrProcess, (PVOID)((ULONG_PTR)Context | FirstTry)); + CsrAcquireProcessLock(); + + /* Check the result */ + //DPRINT1("Result: %d\n", Result); + if (Result == CsrShutdownCsrProcess) + { + /* The callback unlocked the process */ + break; + } + else if (Result == CsrShutdownNonCsrProcess) + { + /* A non-CSR process, the callback didn't touch it */ + //continue; + } + else if (Result == CsrShutdownCancelled) + { + /* Shutdown was cancelled, unlock and exit */ + CsrReleaseProcessLock(); + Status = STATUS_CANCELLED; + goto Quickie; + } + + /* No matches during the first try, so loop again */ + if (FirstTry && Result == CsrShutdownNonCsrProcess) + { + FirstTry = FALSE; + goto LoopAgain; + } + } + +Quickie: + /* Return to normal priority */ + CsrSetToNormalPriority(); + return Status; +} + +NTSTATUS +NTAPI +CsrLockProcessByClientId(IN HANDLE Pid, + OUT PCSRSS_PROCESS_DATA *CsrProcess OPTIONAL) +{ + ULONG Hash; + PCSRSS_PROCESS_DATA CurrentProcess = NULL; + NTSTATUS Status = STATUS_UNSUCCESSFUL; + + /* Acquire the lock */ + CsrAcquireProcessLock(); + + /* Start the loop */ + for (Hash = 0; Hash < (sizeof(ProcessData) / sizeof(*ProcessData)); Hash++) + { + /* Get the Process */ + CurrentProcess = ProcessData[Hash]; + while (CurrentProcess) + { + /* Check for PID match */ + if (CurrentProcess->ProcessId == Pid) + { + /* Get out of here with success */ +// DPRINT1("Found %p for PID %lx\n", CurrentProcess, Pid); + Status = STATUS_SUCCESS; + goto Found; + } + + /* Move to the next */ + CurrentProcess = CurrentProcess->next; + } + } + + /* Nothing found, release the lock */ +Found: + if (!CurrentProcess) CsrReleaseProcessLock(); + + /* Return the status and process */ + if (CsrProcess) *CsrProcess = CurrentProcess; + return Status; +} + +NTSTATUS +NTAPI +CsrUnlockProcess(IN PCSRSS_PROCESS_DATA CsrProcess) +{ + /* Dereference the process */ + //CsrLockedDereferenceProcess(CsrProcess); + + /* Release the lock and return */ + CsrReleaseProcessLock(); + return STATUS_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c (added) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] Wed Mar 10 07:49:53 2010 @@ -1,0 +1,306 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CSR Sub System + * FILE: subsys/csr/csrsrv/procsup.c + * PURPOSE: CSR Process Management + * PROGRAMMERS: ReactOS Portable Systems Group + * Alex Ionescu + */ + +/* INCLUDES *******************************************************************/ + +#include <srv.h> + +#define NDEBUG +#include <debug.h> + +#define LOCK RtlEnterCriticalSection(&ProcessDataLock) +#define UNLOCK RtlLeaveCriticalSection(&ProcessDataLock) +#define CsrHeap RtlGetProcessHeap() +#define CsrHashThread(t) \ + (HandleToUlong(t)&(256 - 1)) + +#define CsrAcquireProcessLock() LOCK +#define CsrReleaseProcessLock() UNLOCK + +/* GLOBALS ********************************************************************/ + +LIST_ENTRY CsrThreadHashTable[256]; +extern PCSRSS_PROCESS_DATA CsrRootProcess; +extern RTL_CRITICAL_SECTION ProcessDataLock; +extern PCSRSS_PROCESS_DATA ProcessData[256]; + +/* FUNCTIONS ******************************************************************/ + +PCSR_THREAD +NTAPI +CsrAllocateThread(IN PCSRSS_PROCESS_DATA CsrProcess) +{ + PCSR_THREAD CsrThread; + + /* Allocate the structure */ + CsrThread = RtlAllocateHeap(CsrHeap, HEAP_ZERO_MEMORY, sizeof(CSR_THREAD)); + if (!CsrThread) return(NULL); + + /* Reference the Thread and Process */ + CsrThread->ReferenceCount++; + // CsrProcess->ReferenceCount++; + + /* Set the Parent Process */ + CsrThread->Process = CsrProcess; + + /* Return Thread */ + return CsrThread; +} + +PCSR_THREAD +NTAPI +CsrLocateThreadByClientId(OUT PCSRSS_PROCESS_DATA *Process OPTIONAL, + IN PCLIENT_ID ClientId) +{ + ULONG i; + PLIST_ENTRY ListHead, NextEntry; + PCSR_THREAD FoundThread; + + /* Hash the Thread */ + i = CsrHashThread(ClientId->UniqueThread); + + /* Set the list pointers */ + ListHead = &CsrThreadHashTable[i]; + NextEntry = ListHead->Flink; + + /* Star the loop */ + while (NextEntry != ListHead) + { + /* Get the thread */ + FoundThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, HashLinks); + + /* Compare the CID */ + if (FoundThread->ClientId.UniqueThread == ClientId->UniqueThread) + { + /* Match found, return the process */ + *Process = FoundThread->Process; + + /* Return thread too */ +// DPRINT1("Found: %p %p\n", FoundThread, FoundThread->Process); + return FoundThread; + } + + /* Next */ + NextEntry = NextEntry->Flink; + } + + /* Nothing found */ + return NULL; +} + +PCSR_THREAD +NTAPI +CsrLocateThreadInProcess(IN PCSRSS_PROCESS_DATA CsrProcess OPTIONAL, + IN PCLIENT_ID Cid) +{ + PLIST_ENTRY ListHead, NextEntry; + PCSR_THREAD FoundThread = NULL; + + /* Use the Root Process if none was specified */ + if (!CsrProcess) CsrProcess = CsrRootProcess; + + /* Save the List pointers */ +// DPRINT1("Searching in: %p %d\n", CsrProcess, CsrProcess->ThreadCount); + ListHead = &CsrProcess->ThreadList; + NextEntry = ListHead->Flink; + + /* Start the Loop */ + while (NextEntry != ListHead) + { + /* Get Thread Entry */ + FoundThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, Link); + + /* Check for TID Match */ + if (FoundThread->ClientId.UniqueThread == Cid->UniqueThread) break; + + /* Next entry */ + NextEntry = NextEntry->Flink; + } + + /* Return what we found */ +// DPRINT1("Found: %p\n", FoundThread); + return FoundThread; +} + +VOID +NTAPI +CsrInsertThread(IN PCSRSS_PROCESS_DATA Process, + IN PCSR_THREAD Thread) +{ + ULONG i; + + /* Insert it into the Regular List */ + InsertTailList(&Process->ThreadList, &Thread->Link); + + /* Increase Thread Count */ + Process->ThreadCount++; + + /* Hash the Thread */ + i = CsrHashThread(Thread->ClientId.UniqueThread); +// DPRINT1("TID %lx HASH: %lx\n", Thread->ClientId.UniqueThread, i); + + /* Insert it there too */ + InsertHeadList(&CsrThreadHashTable[i], &Thread->HashLinks); +} + +VOID +NTAPI +CsrDeallocateThread(IN PCSR_THREAD CsrThread) +{ + /* Free the process object from the heap */ + RtlFreeHeap(CsrHeap, 0, CsrThread); +} + +VOID +NTAPI +CsrRemoveThread(IN PCSR_THREAD CsrThread) +{ + /* Remove it from the List */ + RemoveEntryList(&CsrThread->Link); + + /* Decreate the thread count of the process */ + CsrThread->Process->ThreadCount--; + + /* Remove it from the Hash List as well */ + if (CsrThread->HashLinks.Flink) RemoveEntryList(&CsrThread->HashLinks); + + /* Check if this is the last Thread */ + if (!CsrThread->Process->ThreadCount) + { + /* Check if it's not already been marked for deletion */ + if (!(CsrThread->Process->Flags & CsrProcessLastThreadTerminated)) + { + /* Let everyone know this process is about to lose the thread */ + //CsrThread->Process->Flags |= CsrProcessLastThreadTerminated; + + /* Reference the Process */ + //CsrLockedDereferenceProcess(CsrThread->Process); + } + } + + /* Mark the thread for deletion */ + CsrThread->Flags |= CsrThreadInTermination; +} + +VOID +NTAPI +CsrThreadRefcountZero(IN PCSR_THREAD CsrThread) +{ + /* Remove this thread */ + CsrRemoveThread(CsrThread); + + /* Release the Process Lock */ + //CsrReleaseProcessLock(); + + /* Close the NT Thread Handle */ + if (CsrThread->ThreadHandle) NtClose(CsrThread->ThreadHandle); + + /* De-allocate the CSR Thread Object */ + CsrDeallocateThread(CsrThread); + + /* Remove a reference from the process */ + //CsrDereferenceProcess(CsrProcess); +} + +NTSTATUS +NTAPI +CsrCreateThread(IN PCSRSS_PROCESS_DATA CsrProcess, + IN HANDLE hThread, + IN PCLIENT_ID ClientId) +{ + NTSTATUS Status; + PCSR_THREAD CsrThread; + //PCSRSS_PROCESS_DATA CurrentProcess; + PCSR_THREAD CurrentThread = NtCurrentTeb()->CsrClientThread; + CLIENT_ID CurrentCid; + KERNEL_USER_TIMES KernelTimes; + +// DPRINT1("CSRSRV: %s called\n", __FUNCTION__); + + /* Get the current thread and CID */ + CurrentCid = CurrentThread->ClientId; +// DPRINT1("CALLER PID/TID: %lx/%lx\n", CurrentCid.UniqueProcess, CurrentCid.UniqueThread); + + /* Acquire the Process Lock */ + CsrAcquireProcessLock(); +#if 0 + /* Get the current Process and make sure the Thread is valid with this CID */ + CurrentThread = CsrLocateThreadByClientId(&CurrentProcess, + &CurrentCid); + + /* Something is wrong if we get an empty thread back */ + if (!CurrentThread) + { + DPRINT1("CSRSRV:%s: invalid thread!\n", __FUNCTION__); + CsrReleaseProcessLock(); + return STATUS_THREAD_IS_TERMINATING; + } +#endif + /* Get the Thread Create Time */ + Status = NtQueryInformationThread(hThread, + ThreadTimes, + (PVOID)&KernelTimes, + sizeof(KernelTimes), + NULL); + + /* Allocate a CSR Thread Structure */ + if (!(CsrThread = CsrAllocateThread(CsrProcess))) + { + DPRINT1("CSRSRV:%s: out of memory!\n", __FUNCTION__); + CsrReleaseProcessLock(); + return STATUS_NO_MEMORY; + } + + /* Save the data we have */ + CsrThread->CreateTime = KernelTimes.CreateTime; + CsrThread->ClientId = *ClientId; + CsrThread->ThreadHandle = hThread; + CsrThread->Flags = 0; + + /* Insert the Thread into the Process */ + CsrInsertThread(CsrProcess, CsrThread); + + /* Release the lock and return */ + CsrReleaseProcessLock(); + return STATUS_SUCCESS; +} + +PCSR_THREAD +NTAPI +CsrAddStaticServerThread(IN HANDLE hThread, + IN PCLIENT_ID ClientId, + IN ULONG ThreadFlags) +{ + PCSR_THREAD CsrThread; + + /* Get the Lock */ + CsrAcquireProcessLock(); + + /* Allocate the Server Thread */ + if ((CsrThread = CsrAllocateThread(CsrRootProcess))) + { + /* Setup the Object */ +// DPRINT1("New CSR thread created: %lx PID/TID: %lx/%lx\n", CsrThread, ClientId->UniqueProcess, ClientId->UniqueThread); + CsrThread->ThreadHandle = hThread; + CsrThread->ClientId = *ClientId; + CsrThread->Flags = ThreadFlags; + + /* Insert it into the Thread List */ + InsertTailList(&CsrRootProcess->ThreadList, &CsrThread->Link); + + /* Increment the thread count */ + CsrRootProcess->ThreadCount++; + } + + /* Release the Process Lock and return */ + CsrReleaseProcessLock(); + return CsrThread; +} + +/* EOF */ Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Wed Mar 10 07:49:53 2010 @@ -148,7 +148,7 @@ CSR_API(CsrConnectProcess); CSR_API(CsrCreateProcess); CSR_API(CsrTerminateProcess); -CSR_API(CsrCreateThread); +CSR_API(CsrSrvCreateThread); /* print.c */ VOID WINAPI DisplayString(LPCWSTR lpwString); @@ -181,7 +181,10 @@ PCSR_THREAD NTAPI CsrAddStaticServerThread(IN HANDLE hThread, IN PCLIENT_ID ClientId, IN ULONG ThreadFlags); PCSR_THREAD NTAPI CsrLocateThreadInProcess(IN PCSRSS_PROCESS_DATA CsrProcess OPTIONAL, IN PCLIENT_ID Cid); PCSR_THREAD NTAPI CsrLocateThreadByClientId(OUT PCSRSS_PROCESS_DATA *Process OPTIONAL, IN PCLIENT_ID ClientId); - +NTSTATUS NTAPI CsrLockProcessByClientId(IN HANDLE Pid, OUT PCSRSS_PROCESS_DATA *CsrProcess OPTIONAL); +NTSTATUS NTAPI CsrCreateThread(IN PCSRSS_PROCESS_DATA CsrProcess, IN HANDLE hThread, IN PCLIENT_ID ClientId); +NTSTATUS NTAPI CsrUnlockProcess(IN PCSRSS_PROCESS_DATA CsrProcess); + /* api/handle.c */ NTSTATUS FASTCALL CsrRegisterObjectDefinitions(PCSRSS_OBJECT_DEFINITION NewDefinitions); NTSTATUS WINAPI CsrInsertObject( PCSRSS_PROCESS_DATA ProcessData, PHANDLE Handle, Object_t *Object, DWORD Access, BOOL Inheritable ); @@ -192,6 +195,9 @@ NTSTATUS WINAPI CsrReleaseObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Object ); NTSTATUS WINAPI CsrVerifyObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Object ); +//hack +VOID NTAPI CsrThreadRefcountZero(IN PCSR_THREAD CsrThread); + CSR_API(CsrGetInputHandle); CSR_API(CsrGetOutputHandle); CSR_API(CsrCloseHandle);

14 years, 10 months

[sir_richard] 46051: [CSRSS]: Split off CSRSS into a more Windows-friendly model. CSRSS.EXE is simply a stub which loads CSRSRV.DLL, where all the actual code is present. [CSRSRV]: Mostly moved all the current CSRSS code into CSRSRV, with some very minor changes to get it workking. [CSRSRV]: Add some more code from Alex's CSRSRV, such as thread dereferencing/deallocation, hacked to work. [CSRSRV]: Make CsrTerminateProcess destroy each CSR thread in that process, otherwise we were always leaking

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Mar 10 05:59:39 2010 New Revision: 46051 URL: http://svn.reactos.org/svn/reactos?rev=46051&view=rev Log: [CSRSS]: Split off CSRSS into a more Windows-friendly model. CSRSS.EXE is simply a stub which loads CSRSRV.DLL, where all the actual code is present. [CSRSRV]: Mostly moved all the current CSRSS code into CSRSRV, with some very minor changes to get it workking. [CSRSRV]: Add some more code from Alex's CSRSRV, such as thread dereferencing/deallocation, hacked to work. [CSRSRV]: Make CsrTerminateProcess destroy each CSR thread in that process, otherwise we were always leaking a handle, so processes never died. Because of this, primary tokens would remain "in use", and when umpnpmgr attempted to do a "Create Process as User" for the second+ time, the call would fail since the token from the first process was still around. This fixed that regression from the mailing list. Added: trunk/reactos/subsystems/win32/csrss/csrsrv/ trunk/reactos/subsystems/win32/csrss/csrsrv/api/ - copied from r46022, trunk/reactos/subsystems/win32/csrss/api/ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c - copied, changed from r46050, trunk/reactos/subsystems/win32/csrss/api/process.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c - copied, changed from r46050, trunk/reactos/subsystems/win32/csrss/api/wapi.c trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild (with props) trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc (with props) trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec (with props) trunk/reactos/subsystems/win32/csrss/csrsrv/init.c (with props) trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h (with props) Removed: trunk/reactos/subsystems/win32/csrss/api/ trunk/reactos/subsystems/win32/csrss/csrss.h trunk/reactos/subsystems/win32/csrss/init.c trunk/reactos/subsystems/win32/csrss/print.c trunk/reactos/subsystems/win32/csrss/video.c Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/subsystems/win32/csrss/csrsrv/api/handle.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c trunk/reactos/subsystems/win32/csrss/csrss.c trunk/reactos/subsystems/win32/csrss/csrss.rbuild trunk/reactos/subsystems/win32/csrss/include/api.h Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Mar 10 05:59:39 2010 @@ -670,6 +670,7 @@ ; Subsystems subsystems\win32\csrss\csrss.exe 1 subsystems\win32\csrss\win32csr\win32csr.dll 1 +subsystems\win32\csrss\csrsrv\csrsrv.dll 1 subsystems\ntvdm\ntvdm.exe 1 subsystems\win32\win32k\win32k.sys 1 Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/handle.c [iso-8859-1] Wed Mar 10 05:59:39 2010 @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ -#include <csrss.h> +#include <srv.h> #define NDEBUG #include <debug.h> Copied: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c (from r46050, trunk/reactos/subsystems/win32/csrss/api/process.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] Wed Mar 10 05:59:39 2010 @@ -8,7 +8,7 @@ /* INCLUDES ******************************************************************/ -#include <csrss.h> +#include <srv.h> #define NDEBUG #include <debug.h> @@ -152,6 +152,65 @@ #define CsrAcquireProcessLock() LOCK #define CsrReleaseProcessLock() UNLOCK + +VOID +NTAPI +CsrDeallocateThread(IN PCSR_THREAD CsrThread) +{ + /* Free the process object from the heap */ + RtlFreeHeap(CsrHeap, 0, CsrThread); +} + +VOID +NTAPI +CsrRemoveThread(IN PCSR_THREAD CsrThread) +{ + /* Remove it from the List */ + RemoveEntryList(&CsrThread->Link); + + /* Decreate the thread count of the process */ + CsrThread->Process->ThreadCount--; + + /* Remove it from the Hash List as well */ + if (CsrThread->HashLinks.Flink) RemoveEntryList(&CsrThread->HashLinks); + + /* Check if this is the last Thread */ + if (!CsrThread->Process->ThreadCount) + { + /* Check if it's not already been marked for deletion */ + if (!(CsrThread->Process->Flags & CsrProcessLastThreadTerminated)) + { + /* Let everyone know this process is about to lose the thread */ + //CsrThread->Process->Flags |= CsrProcessLastThreadTerminated; + + /* Reference the Process */ + //CsrLockedDereferenceProcess(CsrThread->Process); + } + } + + /* Mark the thread for deletion */ + CsrThread->Flags |= CsrThreadInTermination; +} + +VOID +NTAPI +CsrThreadRefcountZero(IN PCSR_THREAD CsrThread) +{ + /* Remove this thread */ + CsrRemoveThread(CsrThread); + + /* Release the Process Lock */ + //CsrReleaseProcessLock(); + + /* Close the NT Thread Handle */ + if (CsrThread->ThreadHandle) NtClose(CsrThread->ThreadHandle); + + /* De-allocate the CSR Thread Object */ + CsrDeallocateThread(CsrThread); + + /* Remove a reference from the process */ + //CsrDereferenceProcess(CsrProcess); +} NTSTATUS NTAPI @@ -933,8 +992,21 @@ CSR_API(CsrTerminateProcess) { + PLIST_ENTRY NextEntry; + PCSR_THREAD Thread; Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); + + NextEntry = ProcessData->ThreadList.Flink; + while (NextEntry != &ProcessData->ThreadList) + { + Thread = CONTAINING_RECORD(NextEntry, CSR_THREAD, Link); + NextEntry = NextEntry->Flink; + + CsrThreadRefcountZero(Thread); + + } + ProcessData->Terminated = TRUE; return STATUS_SUCCESS; Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c [iso-8859-1] Wed Mar 10 05:59:39 2010 @@ -11,7 +11,7 @@ /* INCLUDES ******************************************************************/ -#include <csrss.h> +#include <srv.h> #define NDEBUG #include <debug.h> Copied: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c (from r46050, trunk/reactos/subsystems/win32/csrss/api/wapi.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Wed Mar 10 05:59:39 2010 @@ -10,7 +10,7 @@ /* INCLUDES ******************************************************************/ -#include <csrss.h> +#include <srv.h> #define NDEBUG Added: trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild (added) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild [iso-8859-1] Wed Mar 10 05:59:39 2010 @@ -1,0 +1,20 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="csrsrv" type="nativedll" installbase="system32" installname="csrsrv.dll"> + <importlibrary definition="csrsrv.spec" /> + <include base="csrsrv">.</include> + <include base="csrss">.</include> + <include base="csrss">include</include> + <include base="ReactOS">include/reactos/subsys</include> + <library>ntdll</library> + <library>pseh</library> + <library>smdll</library> + <directory name="api"> + <file>handle.c</file> + <file>process.c</file> + <file>user.c</file> + <file>wapi.c</file> + </directory> + <file>init.c</file> + <pch>srv.h</pch> +</module> Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc (added) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc [iso-8859-1] Wed Mar 10 05:59:39 2010 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS CSR Core Server\0" +#define REACTOS_STR_INTERNAL_NAME "csrsrv\0" +#define REACTOS_STR_ORIGINAL_FILENAME "csrsrv.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec (added) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec [iso-8859-1] Wed Mar 10 05:59:39 2010 @@ -1,0 +1,35 @@ +;@ stdcall CsrAddStaticServerThread(ptr ptr long) +;@ stdcall CsrCallServerFromServer(ptr ptr) +;@ stdcall CsrConnectToUser() +;@ stdcall CsrCreateProcess(ptr ptr ptr ptr long ptr) +;@ stdcall CsrCreateRemoteThread(ptr ptr) +;@ stdcall CsrCreateThread(ptr ptr ptr) +;@ stdcall CsrCreateWait(ptr ptr ptr ptr ptr ptr) +;@ stdcall CsrDebugProcess(ptr) +;@ stdcall CsrDebugProcessStop(ptr) +;@ stdcall CsrDereferenceProcess(ptr) +;@ stdcall CsrDereferenceThread(ptr) +;@ stdcall CsrDereferenceWait(ptr) +;@ stdcall CsrDestroyProcess(ptr long) +;@ stdcall CsrDestroyThread(ptr) +;@ stdcall CsrExecServerThread(ptr long) +;@ stdcall CsrGetProcessLuid(ptr ptr) +;@ stdcall CsrImpersonateClient(ptr) +;@ stdcall CsrLockProcessByClientId(ptr ptr) +;@ stdcall CsrLockThreadByClientId(ptr ptr) +;@ stdcall CsrMoveSatisfiedWait(ptr ptr) +;@ stdcall CsrNotifyWait(ptr long ptr ptr) +;@ stdcall CsrPopulateDosDevices() +;@ stdcall CsrQueryApiPort() +;@ stdcall CsrReferenceThread(ptr) +;@ stdcall CsrRevertToSelf() +@ stdcall CsrServerInitialization(long ptr) +;@ stdcall CsrSetBackgroundPriority(ptr) +;@ stdcall CsrSetCallingSpooler(long) +;@ stdcall CsrSetForegroundPriority(ptr) +;@ stdcall CsrShutdownProcesses(ptr long) +;@ stdcall CsrUnhandledExceptionFilter(ptr) +;@ stdcall CsrUnlockProcess(ptr) +;@ stdcall CsrUnlockThread(ptr) +;@ stdcall CsrValidateMessageBuffer(ptr ptr long long) +;@ stdcall CsrValidateMessageString(ptr ptr) Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c (added) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Wed Mar 10 05:59:39 2010 @@ -1,0 +1,809 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CSR Sub System + * FILE: subsys/csr/csrsrv/init.c + * PURPOSE: CSR Server DLL Initialization + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include "srv.h" +#define NDEBUG +#include <debug.h> + +/* DATA ***********************************************************************/ + +HANDLE CsrHeap = (HANDLE) 0; +HANDLE CsrObjectDirectory = (HANDLE) 0; +UNICODE_STRING CsrDirectoryName; +extern HANDLE CsrssApiHeap; +static unsigned InitCompleteProcCount; +static CSRPLUGIN_INIT_COMPLETE_PROC *InitCompleteProcs = NULL; +static unsigned HardErrorProcCount; +static CSRPLUGIN_HARDERROR_PROC *HardErrorProcs = NULL; +HANDLE hSbApiPort = (HANDLE) 0; +HANDLE hBootstrapOk = (HANDLE) 0; +HANDLE hSmApiPort = (HANDLE) 0; +HANDLE hApiPort = (HANDLE) 0; + +/* PRIVATE FUNCTIONS **********************************************************/ + +ULONG +InitializeVideoAddressSpace(VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING PhysMemName = RTL_CONSTANT_STRING(L"\\Device\\PhysicalMemory"); + NTSTATUS Status; + HANDLE PhysMemHandle; + PVOID BaseAddress; + LARGE_INTEGER Offset; + SIZE_T ViewSize; + CHAR IVTAndBda[1024+256]; + + /* Open the physical memory section */ + InitializeObjectAttributes(&ObjectAttributes, + &PhysMemName, + 0, + NULL, + NULL); + Status = ZwOpenSection(&PhysMemHandle, + SECTION_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't open \\Device\\PhysicalMemory\n"); + return 0; + } + + /* Map the BIOS and device registers into the address space */ + Offset.QuadPart = 0xa0000; + ViewSize = 0x100000 - 0xa0000; + BaseAddress = (PVOID)0xa0000; + Status = ZwMapViewOfSection(PhysMemHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + ViewSize, + &Offset, + &ViewSize, + ViewUnmap, + 0, + PAGE_EXECUTE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't map physical memory (%x)\n", Status); + ZwClose(PhysMemHandle); + return 0; + } + + /* Close physical memory section handle */ + ZwClose(PhysMemHandle); + + if (BaseAddress != (PVOID)0xa0000) + { + DPRINT1("Couldn't map physical memory at the right address (was %x)\n", + BaseAddress); + return 0; + } + + /* Allocate some low memory to use for the non-BIOS + * parts of the v86 mode address space + */ + BaseAddress = (PVOID)0x1; + ViewSize = 0xa0000 - 0x1000; + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &ViewSize, + MEM_COMMIT, + PAGE_EXECUTE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to allocate virtual memory (Status %x)\n", Status); + return 0; + } + if (BaseAddress != (PVOID)0x0) + { + DPRINT1("Failed to allocate virtual memory at right address (was %x)\n", + BaseAddress); + return 0; + } + + /* Get the real mode IVT and BDA from the kernel */ + Status = NtVdmControl(VdmInitialize, IVTAndBda); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtVdmControl failed (status %x)\n", Status); + return 0; + } + + /* Return success */ + return 1; +} + + +static NTSTATUS FASTCALL +CsrpAddInitCompleteProc(CSRPLUGIN_INIT_COMPLETE_PROC Proc) +{ + CSRPLUGIN_INIT_COMPLETE_PROC *NewProcs; + + DPRINT("CSR: %s called\n", __FUNCTION__); + + NewProcs = RtlAllocateHeap(CsrssApiHeap, 0, + (InitCompleteProcCount + 1) + * sizeof(CSRPLUGIN_INIT_COMPLETE_PROC)); + if (NULL == NewProcs) + { + return STATUS_NO_MEMORY; + } + if (0 != InitCompleteProcCount) + { + RtlCopyMemory(NewProcs, InitCompleteProcs, + InitCompleteProcCount * sizeof(CSRPLUGIN_INIT_COMPLETE_PROC)); + RtlFreeHeap(CsrssApiHeap, 0, InitCompleteProcs); + } + NewProcs[InitCompleteProcCount] = Proc; + InitCompleteProcs = NewProcs; + InitCompleteProcCount++; + + return STATUS_SUCCESS; +} + +static NTSTATUS FASTCALL +CsrpAddHardErrorProc(CSRPLUGIN_HARDERROR_PROC Proc) +{ + CSRPLUGIN_HARDERROR_PROC *NewProcs; + + DPRINT("CSR: %s called\n", __FUNCTION__); + + NewProcs = RtlAllocateHeap(CsrssApiHeap, 0, + (HardErrorProcCount + 1) + * sizeof(CSRPLUGIN_HARDERROR_PROC)); + if (NULL == NewProcs) + { + return STATUS_NO_MEMORY; + } + if (0 != HardErrorProcCount) + { + RtlCopyMemory(NewProcs, HardErrorProcs, + HardErrorProcCount * sizeof(CSRPLUGIN_HARDERROR_PROC)); + RtlFreeHeap(CsrssApiHeap, 0, HardErrorProcs); + } + + NewProcs[HardErrorProcCount] = Proc; + HardErrorProcs = NewProcs; + HardErrorProcCount++; + + return STATUS_SUCCESS; +} + +/********************************************************************** + * CallInitComplete/0 + */ +static BOOL FASTCALL +CallInitComplete(void) +{ + BOOL Ok; + unsigned i; + + DPRINT("CSR: %s called\n", __FUNCTION__); + + Ok = TRUE; + if (0 != InitCompleteProcCount) + { + for (i = 0; i < InitCompleteProcCount && Ok; i++) + { + Ok = (*(InitCompleteProcs[i]))(); + } + RtlFreeHeap(CsrssApiHeap, 0, InitCompleteProcs); + } + + return Ok; +} + +BOOL +CallHardError(IN PCSRSS_PROCESS_DATA ProcessData, + IN PHARDERROR_MSG HardErrorMessage) +{ + BOOL Ok; + unsigned i; + + DPRINT("CSR: %s called\n", __FUNCTION__); + + Ok = TRUE; + if (0 != HardErrorProcCount) + { + for (i = 0; i < HardErrorProcCount && Ok; i++) + { + Ok = (*(HardErrorProcs[i]))(ProcessData, HardErrorMessage); + } + } + + return Ok; +} + +ULONG +InitializeVideoAddressSpace(VOID); + +/********************************************************************** + * CsrpCreateObjectDirectory/3 + */ +static NTSTATUS +CsrpCreateObjectDirectory (int argc, char ** argv, char ** envp) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES Attributes; + + DPRINT("CSR: %s called\n", __FUNCTION__); + + + /* create object directory ('\Windows') */ + RtlCreateUnicodeString (&CsrDirectoryName, + L"\\Windows"); + + InitializeObjectAttributes (&Attributes, + &CsrDirectoryName, + OBJ_OPENIF, + NULL, + NULL); + + Status = NtOpenDirectoryObject(&CsrObjectDirectory, + DIRECTORY_ALL_ACCESS, + &Attributes); + return Status; +} + +/********************************************************************** + * CsrpInitVideo/3 + * + * TODO: we need a virtual device for sessions other than + * TODO: the console one + */ +static NTSTATUS +CsrpInitVideo (int argc, char ** argv, char ** envp) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\??\\DISPLAY1"); + IO_STATUS_BLOCK Iosb; + HANDLE VideoHandle = (HANDLE) 0; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("CSR: %s called\n", __FUNCTION__); + + InitializeVideoAddressSpace(); + + InitializeObjectAttributes(&ObjectAttributes, + &DeviceName, + 0, + NULL, + NULL); + Status = NtOpenFile(&VideoHandle, + FILE_ALL_ACCESS, + &ObjectAttributes, + &Iosb, + 0, + 0); + if (NT_SUCCESS(Status)) + { + NtClose(VideoHandle); + } + return Status; +} + +/********************************************************************** + * CsrpInitWin32Csr/3 + * + * TODO: this function should be turned more general to load an + * TODO: hosted server DLL as received from the command line; + * TODO: for instance: ServerDll=winsrv:ConServerDllInitialization,2 + * TODO: ^method ^dll ^api ^sid + * TODO: + * TODO: CsrpHostServerDll (LPWSTR DllName, + * TODO: LPWSTR ApiName, + * TODO: DWORD ServerId) + */ +static NTSTATUS +CsrpInitWin32Csr (int argc, char ** argv, char ** envp) +{ + NTSTATUS Status; + UNICODE_STRING DllName; + HINSTANCE hInst; + ANSI_STRING ProcName; + CSRPLUGIN_INITIALIZE_PROC InitProc; + CSRSS_EXPORTED_FUNCS Exports; + PCSRSS_API_DEFINITION ApiDefinitions; + PCSRSS_OBJECT_DEFINITION ObjectDefinitions; + CSRPLUGIN_INIT_COMPLETE_PROC InitCompleteProc; + CSRPLUGIN_HARDERROR_PROC HardErrorProc; + + DPRINT("CSR: %s called\n", __FUNCTION__); + + RtlInitUnicodeString(&DllName, L"win32csr.dll"); + Status = LdrLoadDll(NULL, 0, &DllName, (PVOID *) &hInst); + if (! NT_SUCCESS(Status)) + { + return Status; + } + RtlInitAnsiString(&ProcName, "Win32CsrInitialization"); + Status = LdrGetProcedureAddress(hInst, &ProcName, 0, (PVOID *) &InitProc); + if (! NT_SUCCESS(Status)) + { + return Status; + } + Exports.CsrInsertObjectProc = CsrInsertObject; + Exports.CsrGetObjectProc = CsrGetObject; + Exports.CsrReleaseObjectByPointerProc = CsrReleaseObjectByPointer; + Exports.CsrReleaseObjectProc = CsrReleaseObject; + Exports.CsrEnumProcessesProc = CsrEnumProcesses; + if (! (*InitProc)(&ApiDefinitions, &ObjectDefinitions, &InitCompleteProc, + &HardErrorProc, &Exports, CsrssApiHeap)) + { + return STATUS_UNSUCCESSFUL; + } + + Status = CsrApiRegisterDefinitions(ApiDefinitions); + if (! NT_SUCCESS(Status)) + { + return Status; + } + Status = CsrRegisterObjectDefinitions(ObjectDefinitions); + if (! NT_SUCCESS(Status)) + { + return Status; + } + if (NULL != InitCompleteProc) + { + Status = CsrpAddInitCompleteProc(InitCompleteProc); + } + if (HardErrorProc) Status = CsrpAddHardErrorProc(HardErrorProc); + + return Status; +} + +CSRSS_API_DEFINITION NativeDefinitions[] = + { + CSRSS_DEFINE_API(CREATE_PROCESS, CsrCreateProcess), + CSRSS_DEFINE_API(CREATE_THREAD, CsrCreateThread), + CSRSS_DEFINE_API(TERMINATE_PROCESS, CsrTerminateProcess), + CSRSS_DEFINE_API(CONNECT_PROCESS, CsrConnectProcess), + CSRSS_DEFINE_API(REGISTER_SERVICES_PROCESS, CsrRegisterServicesProcess), + CSRSS_DEFINE_API(GET_SHUTDOWN_PARAMETERS, CsrGetShutdownParameters), + CSRSS_DEFINE_API(SET_SHUTDOWN_PARAMETERS, CsrSetShutdownParameters), + CSRSS_DEFINE_API(GET_INPUT_HANDLE, CsrGetInputHandle), + CSRSS_DEFINE_API(GET_OUTPUT_HANDLE, CsrGetOutputHandle), + CSRSS_DEFINE_API(CLOSE_HANDLE, CsrCloseHandle), + CSRSS_DEFINE_API(VERIFY_HANDLE, CsrVerifyHandle), + CSRSS_DEFINE_API(DUPLICATE_HANDLE, CsrDuplicateHandle), + CSRSS_DEFINE_API(GET_INPUT_WAIT_HANDLE, CsrGetInputWaitHandle), + { 0, 0, NULL } + }; + +static NTSTATUS WINAPI +CsrpCreateListenPort (IN LPWSTR Name, + IN OUT PHANDLE Port, + IN PTHREAD_START_ROUTINE ListenThread) +{ + NTSTATUS Status = STATUS_SUCCESS; + OBJECT_ATTRIBUTES PortAttributes; + UNICODE_STRING PortName; + HANDLE ServerThread; + CLIENT_ID ClientId; + + DPRINT("CSR: %s called\n", __FUNCTION__); + + RtlInitUnicodeString (& PortName, Name); + InitializeObjectAttributes (& PortAttributes, + & PortName, + 0, + NULL, + NULL); + Status = NtCreatePort ( Port, + & PortAttributes, + LPC_MAX_DATA_LENGTH, /* TODO: make caller set it*/ + LPC_MAX_MESSAGE_LENGTH, /* TODO: make caller set it*/ + 0); /* TODO: make caller set it*/ + if(!NT_SUCCESS(Status)) + { + DPRINT1("CSR: %s: NtCreatePort failed (Status=%08lx)\n", + __FUNCTION__, Status); + return Status; + } + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, + TRUE, + 0, + 0, + 0, + (PTHREAD_START_ROUTINE) ListenThread, + *Port, + &ServerThread, + &ClientId); + + if (ListenThread == (PVOID)ClientConnectionThread) + { + CsrAddStaticServerThread(ServerThread, &ClientId, 0); + } + + NtResumeThread(ServerThread, NULL); + NtClose(ServerThread); + return Status; +} + +/* === INIT ROUTINES === */ + +/********************************************************************** + * CsrpCreateBNODirectory/3 + * + * These used to be part of kernel32 startup, but that clearly wasn't a good + * idea, as races were definately possible. These are moved (as in the + * previous fixmes). + */ +static NTSTATUS +CsrpCreateBNODirectory (int argc, char ** argv, char ** envp) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name = RTL_CONSTANT_STRING(L"\\BaseNamedObjects"); + UNICODE_STRING SymName = RTL_CONSTANT_STRING(L"Local"); + UNICODE_STRING SymName2 = RTL_CONSTANT_STRING(L"Global"); + HANDLE DirHandle, SymHandle; + + /* Seems like a good place to create these objects which are needed by + * win32 processes */ + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtCreateDirectoryObject(&DirHandle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateDirectoryObject() failed %08x\n", Status); + } + + /* Create the "local" Symbolic Link. + * FIXME: CSR should do this -- Fixed */ + InitializeObjectAttributes(&ObjectAttributes, + &SymName, + OBJ_CASE_INSENSITIVE, + DirHandle, + NULL); + Status = NtCreateSymbolicLinkObject(&SymHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + &Name); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateDirectoryObject() failed %08x\n", Status); + } + + /* Create the "global" Symbolic Link. */ + InitializeObjectAttributes(&ObjectAttributes, + &SymName2, + OBJ_CASE_INSENSITIVE, + DirHandle, + NULL); + Status = NtCreateSymbolicLinkObject(&SymHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + &Name); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateDirectoryObject() failed %08x\n", Status); + } + + return Status; +} + +/********************************************************************** + * CsrpCreateHeap/3 + */ +static NTSTATUS +CsrpCreateHeap (int argc, char ** argv, char ** envp) +{ + DPRINT("CSR: %s called\n", __FUNCTION__); + + CsrssApiHeap = RtlCreateHeap(HEAP_GROWABLE, + NULL, + 65536, + 65536, + NULL, + NULL); + if (CsrssApiHeap == NULL) + { + return STATUS_UNSUCCESSFUL; + } + return STATUS_SUCCESS; +} + +/********************************************************************** + * CsrpCreateCallbackPort/3 + */ +static NTSTATUS +CsrpCreateCallbackPort (int argc, char ** argv, char ** envp) +{ + DPRINT("CSR: %s called\n", __FUNCTION__); + + return CsrpCreateListenPort (L"\\Windows\\SbApiPort", + & hSbApiPort, + ServerSbApiPortThread); +} + +/********************************************************************** + * CsrpRegisterSubsystem/3 + */ +static NTSTATUS +CsrpRegisterSubsystem (int argc, char ** argv, char ** envp) +{ + NTSTATUS Status = STATUS_SUCCESS; + OBJECT_ATTRIBUTES BootstrapOkAttributes; + UNICODE_STRING Name; + + DPRINT("CSR: %s called\n", __FUNCTION__); + + /* + * Create the event object the callback port + * thread will signal *if* the SM will + * authorize us to bootstrap. + */ + RtlInitUnicodeString (& Name, L"\\CsrssBooting"); + InitializeObjectAttributes(& BootstrapOkAttributes, + & Name, + 0, NULL, NULL); + Status = NtCreateEvent (& hBootstrapOk, + EVENT_ALL_ACCESS, + & BootstrapOkAttributes, + SynchronizationEvent, + FALSE); + if(!NT_SUCCESS(Status)) + { + DPRINT("CSR: %s: NtCreateEvent failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + return Status; + } + /* + * Let's tell the SM a new environment + * subsystem server is in the system. + */ + RtlInitUnicodeString (& Name, L"\\Windows\\SbApiPort"); + DPRINT("CSR: %s: registering with SM for\n IMAGE_SUBSYSTEM_WINDOWS_CUI == 3\n", __FUNCTION__); + Status = SmConnectApiPort (& Name, + hSbApiPort, + IMAGE_SUBSYSTEM_WINDOWS_CUI, + & hSmApiPort); + if(!NT_SUCCESS(Status)) + { + DPRINT("CSR: %s unable to connect to the SM (Status=0x%08lx)\n", + __FUNCTION__, Status); + NtClose (hBootstrapOk); + return Status; + } + /* + * Wait for SM to reply OK... If the SM + * won't answer, we hang here forever! + */ + DPRINT("CSR: %s: waiting for SM to OK boot...\n", __FUNCTION__); + Status = NtWaitForSingleObject (hBootstrapOk, + FALSE, + NULL); + NtClose (hBootstrapOk); + return Status; +} + +/********************************************************************** + * CsrpLoadKernelModeDriver/3 + */ +static NTSTATUS +CsrpLoadKernelModeDriver (int argc, char ** argv, char ** envp) +{ + NTSTATUS Status = STATUS_SUCCESS; + WCHAR Data [MAX_PATH + 1]; + ULONG DataLength = sizeof Data; + ULONG DataType = 0; + //UNICODE_STRING Environment; + + + DPRINT1("SM: %s called\n", __FUNCTION__); + + + //EnvpToUnicodeString (envp, & Environment); + Status = SmLookupSubsystem (L"Kmode", + Data, + & DataLength, + & DataType, + NULL); + //RtlFreeUnicodeString (& Environment); + if((STATUS_SUCCESS == Status) && (DataLength > sizeof Data[0])) + { + WCHAR ImagePath [MAX_PATH + 1] = {0}; + UNICODE_STRING ModuleName; + + wcscpy (ImagePath, L"\\??\\c:\\reactos\\system32\\win32k.sys"); +// wcscat (ImagePath, Data); + RtlInitUnicodeString (& ModuleName, ImagePath); + Status = NtSetSystemInformation(/* FIXME: SystemLoadAndCallImage */ + SystemExtendServiceTableInformation, + & ModuleName, + sizeof ModuleName); + if(!NT_SUCCESS(Status)) + { + DPRINT1("WIN: %s: loading Kmode failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + } + } + return Status; +} + +/********************************************************************** + * CsrpCreateApiPort/2 + */ +static NTSTATUS +CsrpCreateApiPort (int argc, char ** argv, char ** envp) +{ + DPRINT("CSR: %s called\n", __FUNCTION__); + + CsrInitProcessData(); + + return CsrpCreateListenPort(L"\\Windows\\ApiPort", &hApiPort, + (PTHREAD_START_ROUTINE)ClientConnectionThread); +} + +/********************************************************************** + * CsrpApiRegisterDef/0 + */ +static NTSTATUS +CsrpApiRegisterDef (int argc, char ** argv, char ** envp) +{ + return CsrApiRegisterDefinitions(NativeDefinitions); +} + +/********************************************************************** + * CsrpCCTS/2 + */ +static NTSTATUS +CsrpCCTS (int argc, char ** argv, char ** envp) +{ + ULONG Dummy; + ULONG DummyLength = sizeof(Dummy); + return CsrClientConnectToServer(L"\\Windows", + 0, &Dummy, &DummyLength, NULL); +} + +/********************************************************************** + * CsrpRunWinlogon/0 + * + * Start the logon process (winlogon.exe). + * + * TODO: this should be moved in CsrpCreateSession/x (one per session) + * TODO: in its own desktop (one logon desktop per winstation). + */ +static NTSTATUS +CsrpRunWinlogon (int argc, char ** argv, char ** envp) +{ + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING ImagePath; + UNICODE_STRING CommandLine; + PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; + RTL_USER_PROCESS_INFORMATION ProcessInfo; + + + DPRINT("CSR: %s called\n", __FUNCTION__); + + /* initialize the process parameters */ + RtlInitUnicodeString (& ImagePath, L"\\SystemRoot\\system32\\winlogon.exe"); + RtlInitUnicodeString (& CommandLine, L""); + RtlCreateProcessParameters(& ProcessParameters, + & ImagePath, + NULL, + NULL, + & CommandLine, + NULL, + NULL, + NULL, + NULL, + NULL); + /* Create the winlogon process */ + Status = RtlCreateUserProcess (& ImagePath, + OBJ_CASE_INSENSITIVE, + ProcessParameters, + NULL, + NULL, + NULL, + FALSE, + NULL, + NULL, + & ProcessInfo); + /* Cleanup */ + RtlDestroyProcessParameters (ProcessParameters); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SM: %s: loading winlogon.exe failed (Status=%08lx)\n", + __FUNCTION__, Status); + } + + ZwResumeThread(ProcessInfo.ThreadHandle, NULL); + return Status; +} + +static NTSTATUS +CsrpCreateHardErrorPort (int argc, char ** argv, char ** envp) +{ + return NtSetDefaultHardErrorPort(hApiPort); +} + +typedef NTSTATUS (* CSR_INIT_ROUTINE)(int,char**,char**); + +struct { + BOOL Required; + CSR_INIT_ROUTINE EntryPoint; + PCHAR ErrorMessage; +} InitRoutine [] = { + {TRUE, CsrpCreateBNODirectory, "create base named objects directory"}, + {TRUE, CsrpCreateCallbackPort, "create the callback port \\Windows\\SbApiPort"}, + {TRUE, CsrpRegisterSubsystem, "register with SM"}, + {TRUE, CsrpCreateHeap, "create the CSR heap"}, + {TRUE, CsrpCreateApiPort, "create the api port \\Windows\\ApiPort"}, + {TRUE, CsrpCreateHardErrorPort, "create the hard error port"}, + {TRUE, CsrpCreateObjectDirectory,"create the object directory \\Windows"}, + {TRUE, CsrpLoadKernelModeDriver, "load Kmode driver"}, + {TRUE, CsrpInitVideo, "initialize video"}, + {TRUE, CsrpApiRegisterDef, "initialize api definitions"}, + {TRUE, CsrpCCTS, "connect client to server"}, + {TRUE, CsrpInitWin32Csr, "load usermode dll"}, + {TRUE, CsrpRunWinlogon, "run WinLogon"}, +}; + +/* PUBLIC FUNCTIONS ***********************************************************/ + +NTSTATUS +NTAPI +CsrServerInitialization(ULONG ArgumentCount, + PCHAR Arguments[]) +{ + UINT i = 0; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("CSR: %s called\n", __FUNCTION__); + + for (i=0; i < (sizeof InitRoutine / sizeof InitRoutine[0]); i++) + { + Status = InitRoutine[i].EntryPoint(ArgumentCount,Arguments,NULL); + if(!NT_SUCCESS(Status)) + { + DPRINT1("CSR: %s: failed to %s (Status=%08lx)\n", + __FUNCTION__, + InitRoutine[i].ErrorMessage, + Status); + if (InitRoutine[i].Required) + { + return FALSE; + } + } + } + if (CallInitComplete()) + { + Status = SmCompleteSession (hSmApiPort,hSbApiPort,hApiPort); + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + +BOOL +NTAPI +DllMainCRTStartup(HANDLE hDll, + DWORD dwReason, + LPVOID lpReserved) +{ + /* We don't do much */ + UNREFERENCED_PARAMETER(hDll); + UNREFERENCED_PARAMETER(dwReason); + UNREFERENCED_PARAMETER(lpReserved); + return TRUE; +} + +/* EOF */ Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h (added) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h [iso-8859-1] Wed Mar 10 05:59:39 2010 @@ -1,0 +1,21 @@ +/* PSDK/NDK Headers */ +#define NTOS_MODE_USER +#include <stdio.h> +#define WIN32_NO_STATUS +#include <windows.h> +#include <winnt.h> +#include <ndk/ntndk.h> + +/* CSR Header */ +//#include <csr/server.h> + +/* PSEH for SEH Support */ +#include <pseh/pseh2.h> + +/* Subsystem Manager Header */ +#include <sm/helper.h> + +/* Internal CSRSS Headers */ +#include <api.h> +#include <conio.h> +#include <csrplugin.h> Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/csrss/csrss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrss.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrss.c [iso-8859-1] Wed Mar 10 05:59:39 2010 @@ -1,62 +1,70 @@ -/* $Id$ - * - * csrss.c - Client/Server Runtime subsystem - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * -------------------------------------------------------------------- +/* + * PROJECT: ReactOS Client Server Runtime SubSystem (CSRSS) + * LICENSE: BSD - See COPYING.ARM in root directory + * FILE: subsystems/win32/csrss/csrss.c + * PURPOSE: Main Executable Code + * PROGRAMMERS: Alex Ionescu + * ReactOS Portable Systems Group */ -#include <csrss.h> +/* INCLUDES *******************************************************************/ +#define WIN32_NO_STATUS +#include <windows.h> +#include <ndk/ntndk.h> +#include <api.h> #define NDEBUG #include <debug.h> -int _cdecl _main(int argc, - char *argv[], - char *envp[], - int DebugFlag) +/* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +CsrpSetDefaultProcessHardErrorMode(VOID) { - NTSTATUS Status = STATUS_SUCCESS; + ULONG DefaultHardErrorMode = 0; - //PrintString("ReactOS Client/Server Run-Time (Build %s)\n", - //KERNEL_VERSION_BUILD_STR); + /* Disable hard errors */ + NtSetInformationProcess(NtCurrentProcess(), + ProcessDefaultHardErrorMode, + &DefaultHardErrorMode, + sizeof(DefaultHardErrorMode)); +} - /*================================================================== - * Initialize the Win32 environment subsystem server. - *================================================================*/ - if (CsrServerInitialization (argc, argv, envp) == TRUE) - { - /* - * Terminate the current thread only. - */ - Status = NtTerminateThread (NtCurrentThread(), 0); - } - else - { - DisplayString (L"CSR: CsrServerInitialization failed.\n"); - /* - * Tell the SM we failed. - */ - Status = NtTerminateProcess (NtCurrentProcess(), 0); - } - return (int) Status; +int +_cdecl +_main(int argc, + char *argv[], + char *envp[], + int DebugFlag) +{ + KPRIORITY BasePriority = (8 + 1) + 4; + NTSTATUS Status; + + /* Set the Priority */ + NtSetInformationProcess(NtCurrentProcess(), + ProcessBasePriority, + &BasePriority, + sizeof(KPRIORITY)); + + /* Initialize CSR through CSRSRV */ + Status = CsrServerInitialization(argc, argv); + if (!NT_SUCCESS(Status)) + { + /* Kill us */ + DPRINT1("CSRSS: CsrServerInitialization failed:% lx\n", Status); + NtTerminateProcess(NtCurrentProcess(), Status); + } + + /* Disable errors */ + CsrpSetDefaultProcessHardErrorMode(); + + /* If this is Session 0, make sure killing us bugchecks the system */ + if (!NtCurrentPeb()->SessionId) RtlSetProcessIsCritical(TRUE, NULL, FALSE); + + /* Kill this thread. CSRSRV keeps us going */ + NtTerminateThread (NtCurrentThread(), Status); + return 0; } /* EOF */ Removed: trunk/reactos/subsystems/win32/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrss.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrss.h (removed) @@ -1,21 +1,0 @@ -/* PSDK/NDK Headers */ -#include <stdio.h> -#define WIN32_NO_STATUS -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> - -#include <intrin.h> - -/* Build Number */ -#include <reactos/buildno.h> - -/* Subsystem Manager Header */ -#include <sm/helper.h> - -/* Internal CSRSS Headers */ -#include <api.h> -#include <conio.h> -#include <csrplugin.h> - -/* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/csrss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrss.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrss.rbuild [iso-8859-1] Wed Mar 10 05:59:39 2010 @@ -9,21 +9,14 @@ <compilerflag compilerset="gcc">-fms-extensions</compilerflag> <library>nt</library> <library>ntdll</library> - <library>smdll</library> - <directory name="api"> - <file>handle.c</file> - <file>process.c</file> - <file>user.c</file> - <file>wapi.c</file> - </directory> - <pch>csrss.h</pch> + <library>csrsrv</library> <file>csrss.c</file> - <file>init.c</file> - <file>print.c</file> - <file>video.c</file> <file>csrss.rc</file> </module> <directory name="win32csr"> <xi:include href="win32csr/win32csr.rbuild" /> </directory> + <directory name="csrsrv"> + <xi:include href="csrsrv/csrsrv.rbuild" /> + </directory> </group> Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Wed Mar 10 05:59:39 2010 @@ -12,6 +12,14 @@ #include <ndk/ntndk.h> #include <csrss/csrss.h> + +typedef enum _CSR_THREAD_FLAGS +{ + CsrThreadAltertable = 0x1, + CsrThreadInTermination = 0x2, + CsrThreadTerminated = 0x4, + CsrThreadIsServerThread = 0x10 +} CSR_THREAD_FLAGS, *PCSR_THREAD_FLAGS; typedef enum _SHUTDOWN_RESULT { @@ -179,7 +187,7 @@ NTSTATUS WINAPI CsrInsertObject( PCSRSS_PROCESS_DATA ProcessData, PHANDLE Handle, Object_t *Object, DWORD Access, BOOL Inheritable ); NTSTATUS WINAPI CsrDuplicateHandleTable(PCSRSS_PROCESS_DATA SourceProcessData, PCSRSS_PROCESS_DATA TargetProcessData); NTSTATUS WINAPI CsrGetObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object, DWORD Access ); -BOOL WINAPI CsrServerInitialization (int,char**,char**); +NTSTATUS NTAPI CsrServerInitialization(ULONG ArgumentCount, PCHAR Arguments[]); NTSTATUS WINAPI CsrReleaseObjectByPointer(Object_t *Object); NTSTATUS WINAPI CsrReleaseObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Object ); NTSTATUS WINAPI CsrVerifyObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Object ); Removed: trunk/reactos/subsystems/win32/csrss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/ini… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/init.c (removed) @@ -1,766 +1,0 @@ -/* $Id$ - * - * reactos/subsys/csrss/init.c - * - * Initialize the CSRSS subsystem server process. - * - * ReactOS Operating System - * - */ - -/* INCLUDES ******************************************************************/ - -#include <csrss.h> - -#define NDEBUG -#include <debug.h> - -/* GLOBALS ******************************************************************/ - -HANDLE CsrHeap = (HANDLE) 0; - -HANDLE CsrObjectDirectory = (HANDLE) 0; - -UNICODE_STRING CsrDirectoryName; - -extern HANDLE CsrssApiHeap; - -static unsigned InitCompleteProcCount; -static CSRPLUGIN_INIT_COMPLETE_PROC *InitCompleteProcs = NULL; - -static unsigned HardErrorProcCount; -static CSRPLUGIN_HARDERROR_PROC *HardErrorProcs = NULL; - -HANDLE hSbApiPort = (HANDLE) 0; - -HANDLE hBootstrapOk = (HANDLE) 0; - -HANDLE hSmApiPort = (HANDLE) 0; - -HANDLE hApiPort = (HANDLE) 0; - -/********************************************************************** - * CsrpAddInitCompleteProc/1 - */ -static NTSTATUS FASTCALL -CsrpAddInitCompleteProc(CSRPLUGIN_INIT_COMPLETE_PROC Proc) -{ - CSRPLUGIN_INIT_COMPLETE_PROC *NewProcs; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - NewProcs = RtlAllocateHeap(CsrssApiHeap, 0, - (InitCompleteProcCount + 1) - * sizeof(CSRPLUGIN_INIT_COMPLETE_PROC)); - if (NULL == NewProcs) - { - return STATUS_NO_MEMORY; - } - if (0 != InitCompleteProcCount) - { - RtlCopyMemory(NewProcs, InitCompleteProcs, - InitCompleteProcCount * sizeof(CSRPLUGIN_INIT_COMPLETE_PROC)); - RtlFreeHeap(CsrssApiHeap, 0, InitCompleteProcs); - } - NewProcs[InitCompleteProcCount] = Proc; - InitCompleteProcs = NewProcs; - InitCompleteProcCount++; - - return STATUS_SUCCESS; -} - -static NTSTATUS FASTCALL -CsrpAddHardErrorProc(CSRPLUGIN_HARDERROR_PROC Proc) -{ - CSRPLUGIN_HARDERROR_PROC *NewProcs; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - NewProcs = RtlAllocateHeap(CsrssApiHeap, 0, - (HardErrorProcCount + 1) - * sizeof(CSRPLUGIN_HARDERROR_PROC)); - if (NULL == NewProcs) - { - return STATUS_NO_MEMORY; - } - if (0 != HardErrorProcCount) - { - RtlCopyMemory(NewProcs, HardErrorProcs, - HardErrorProcCount * sizeof(CSRPLUGIN_HARDERROR_PROC)); - RtlFreeHeap(CsrssApiHeap, 0, HardErrorProcs); - } - - NewProcs[HardErrorProcCount] = Proc; - HardErrorProcs = NewProcs; - HardErrorProcCount++; - - return STATUS_SUCCESS; -} - -/********************************************************************** - * CallInitComplete/0 - */ -static BOOL FASTCALL -CallInitComplete(void) -{ - BOOL Ok; - unsigned i; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - Ok = TRUE; - if (0 != InitCompleteProcCount) - { - for (i = 0; i < InitCompleteProcCount && Ok; i++) - { - Ok = (*(InitCompleteProcs[i]))(); - } - RtlFreeHeap(CsrssApiHeap, 0, InitCompleteProcs); - } - - return Ok; -} - -BOOL -CallHardError(IN PCSRSS_PROCESS_DATA ProcessData, - IN PHARDERROR_MSG HardErrorMessage) -{ - BOOL Ok; - unsigned i; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - Ok = TRUE; - if (0 != HardErrorProcCount) - { - for (i = 0; i < HardErrorProcCount && Ok; i++) - { - Ok = (*(HardErrorProcs[i]))(ProcessData, HardErrorMessage); - } - } - - return Ok; -} - -ULONG -InitializeVideoAddressSpace(VOID); - -/********************************************************************** - * CsrpCreateObjectDirectory/3 - */ -static NTSTATUS -CsrpCreateObjectDirectory (int argc, char ** argv, char ** envp) -{ - NTSTATUS Status; - OBJECT_ATTRIBUTES Attributes; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - - /* create object directory ('\Windows') */ - RtlCreateUnicodeString (&CsrDirectoryName, - L"\\Windows"); - - InitializeObjectAttributes (&Attributes, - &CsrDirectoryName, - OBJ_OPENIF, - NULL, - NULL); - - Status = NtOpenDirectoryObject(&CsrObjectDirectory, - DIRECTORY_ALL_ACCESS, - &Attributes); - return Status; -} - -/********************************************************************** - * CsrpInitVideo/3 - * - * TODO: we need a virtual device for sessions other than - * TODO: the console one - */ -static NTSTATUS -CsrpInitVideo (int argc, char ** argv, char ** envp) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\??\\DISPLAY1"); - IO_STATUS_BLOCK Iosb; - HANDLE VideoHandle = (HANDLE) 0; - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - InitializeVideoAddressSpace(); - - InitializeObjectAttributes(&ObjectAttributes, - &DeviceName, - 0, - NULL, - NULL); - Status = NtOpenFile(&VideoHandle, - FILE_ALL_ACCESS, - &ObjectAttributes, - &Iosb, - 0, - 0); - if (NT_SUCCESS(Status)) - { - NtClose(VideoHandle); - } - return Status; -} - -/********************************************************************** - * CsrpInitWin32Csr/3 - * - * TODO: this function should be turned more general to load an - * TODO: hosted server DLL as received from the command line; - * TODO: for instance: ServerDll=winsrv:ConServerDllInitialization,2 - * TODO: ^method ^dll ^api ^sid - * TODO: - * TODO: CsrpHostServerDll (LPWSTR DllName, - * TODO: LPWSTR ApiName, - * TODO: DWORD ServerId) - */ -static NTSTATUS -CsrpInitWin32Csr (int argc, char ** argv, char ** envp) -{ - NTSTATUS Status; - UNICODE_STRING DllName; - HINSTANCE hInst; - ANSI_STRING ProcName; - CSRPLUGIN_INITIALIZE_PROC InitProc; - CSRSS_EXPORTED_FUNCS Exports; - PCSRSS_API_DEFINITION ApiDefinitions; - PCSRSS_OBJECT_DEFINITION ObjectDefinitions; - CSRPLUGIN_INIT_COMPLETE_PROC InitCompleteProc; - CSRPLUGIN_HARDERROR_PROC HardErrorProc; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - RtlInitUnicodeString(&DllName, L"win32csr.dll"); - Status = LdrLoadDll(NULL, 0, &DllName, (PVOID *) &hInst); - if (! NT_SUCCESS(Status)) - { - return Status; - } - RtlInitAnsiString(&ProcName, "Win32CsrInitialization"); - Status = LdrGetProcedureAddress(hInst, &ProcName, 0, (PVOID *) &InitProc); - if (! NT_SUCCESS(Status)) - { - return Status; - } - Exports.CsrInsertObjectProc = CsrInsertObject; - Exports.CsrGetObjectProc = CsrGetObject; - Exports.CsrReleaseObjectByPointerProc = CsrReleaseObjectByPointer; - Exports.CsrReleaseObjectProc = CsrReleaseObject; - Exports.CsrEnumProcessesProc = CsrEnumProcesses; - if (! (*InitProc)(&ApiDefinitions, &ObjectDefinitions, &InitCompleteProc, - &HardErrorProc, &Exports, CsrssApiHeap)) - { - return STATUS_UNSUCCESSFUL; - } - - Status = CsrApiRegisterDefinitions(ApiDefinitions); - if (! NT_SUCCESS(Status)) - { - return Status; - } - Status = CsrRegisterObjectDefinitions(ObjectDefinitions); - if (! NT_SUCCESS(Status)) - { - return Status; - } - if (NULL != InitCompleteProc) - { - Status = CsrpAddInitCompleteProc(InitCompleteProc); - } - if (HardErrorProc) Status = CsrpAddHardErrorProc(HardErrorProc); - - return Status; -} - -CSRSS_API_DEFINITION NativeDefinitions[] = - { - CSRSS_DEFINE_API(CREATE_PROCESS, CsrCreateProcess), - CSRSS_DEFINE_API(CREATE_THREAD, CsrCreateThread), - CSRSS_DEFINE_API(TERMINATE_PROCESS, CsrTerminateProcess), - CSRSS_DEFINE_API(CONNECT_PROCESS, CsrConnectProcess), - CSRSS_DEFINE_API(REGISTER_SERVICES_PROCESS, CsrRegisterServicesProcess), - CSRSS_DEFINE_API(GET_SHUTDOWN_PARAMETERS, CsrGetShutdownParameters), - CSRSS_DEFINE_API(SET_SHUTDOWN_PARAMETERS, CsrSetShutdownParameters), - CSRSS_DEFINE_API(GET_INPUT_HANDLE, CsrGetInputHandle), - CSRSS_DEFINE_API(GET_OUTPUT_HANDLE, CsrGetOutputHandle), - CSRSS_DEFINE_API(CLOSE_HANDLE, CsrCloseHandle), - CSRSS_DEFINE_API(VERIFY_HANDLE, CsrVerifyHandle), - CSRSS_DEFINE_API(DUPLICATE_HANDLE, CsrDuplicateHandle), - CSRSS_DEFINE_API(GET_INPUT_WAIT_HANDLE, CsrGetInputWaitHandle), - { 0, 0, NULL } - }; - -static NTSTATUS WINAPI -CsrpCreateListenPort (IN LPWSTR Name, - IN OUT PHANDLE Port, - IN PTHREAD_START_ROUTINE ListenThread) -{ - NTSTATUS Status = STATUS_SUCCESS; - OBJECT_ATTRIBUTES PortAttributes; - UNICODE_STRING PortName; - HANDLE ServerThread; - CLIENT_ID ClientId; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - RtlInitUnicodeString (& PortName, Name); - InitializeObjectAttributes (& PortAttributes, - & PortName, - 0, - NULL, - NULL); - Status = NtCreatePort ( Port, - & PortAttributes, - LPC_MAX_DATA_LENGTH, /* TODO: make caller set it*/ - LPC_MAX_MESSAGE_LENGTH, /* TODO: make caller set it*/ - 0); /* TODO: make caller set it*/ - if(!NT_SUCCESS(Status)) - { - DPRINT1("CSR: %s: NtCreatePort failed (Status=%08lx)\n", - __FUNCTION__, Status); - return Status; - } - Status = RtlCreateUserThread(NtCurrentProcess(), - NULL, - TRUE, - 0, - 0, - 0, - (PTHREAD_START_ROUTINE) ListenThread, - *Port, - &ServerThread, - &ClientId); - - if (ListenThread == (PVOID)ClientConnectionThread) - { - CsrAddStaticServerThread(ServerThread, &ClientId, 0); - } - - NtResumeThread(ServerThread, NULL); - NtClose(ServerThread); - return Status; -} - -/* === INIT ROUTINES === */ - -/********************************************************************** - * CsrpCreateBNODirectory/3 - * - * These used to be part of kernel32 startup, but that clearly wasn't a good - * idea, as races were definately possible. These are moved (as in the - * previous fixmes). - */ -static NTSTATUS -CsrpCreateBNODirectory (int argc, char ** argv, char ** envp) -{ - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING Name = RTL_CONSTANT_STRING(L"\\BaseNamedObjects"); - UNICODE_STRING SymName = RTL_CONSTANT_STRING(L"Local"); - UNICODE_STRING SymName2 = RTL_CONSTANT_STRING(L"Global"); - HANDLE DirHandle, SymHandle; - - /* Seems like a good place to create these objects which are needed by - * win32 processes */ - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtCreateDirectoryObject(&DirHandle, - DIRECTORY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateDirectoryObject() failed %08x\n", Status); - } - - /* Create the "local" Symbolic Link. - * FIXME: CSR should do this -- Fixed */ - InitializeObjectAttributes(&ObjectAttributes, - &SymName, - OBJ_CASE_INSENSITIVE, - DirHandle, - NULL); - Status = NtCreateSymbolicLinkObject(&SymHandle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes, - &Name); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateDirectoryObject() failed %08x\n", Status); - } - - /* Create the "global" Symbolic Link. */ - InitializeObjectAttributes(&ObjectAttributes, - &SymName2, - OBJ_CASE_INSENSITIVE, - DirHandle, - NULL); - Status = NtCreateSymbolicLinkObject(&SymHandle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes, - &Name); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateDirectoryObject() failed %08x\n", Status); - } - - return Status; -} - -/********************************************************************** - * CsrpCreateHeap/3 - */ -static NTSTATUS -CsrpCreateHeap (int argc, char ** argv, char ** envp) -{ - DPRINT("CSR: %s called\n", __FUNCTION__); - - CsrssApiHeap = RtlCreateHeap(HEAP_GROWABLE, - NULL, - 65536, - 65536, - NULL, - NULL); - if (CsrssApiHeap == NULL) - { - return STATUS_UNSUCCESSFUL; - } - return STATUS_SUCCESS; -} - -/********************************************************************** - * CsrpCreateCallbackPort/3 - */ -static NTSTATUS -CsrpCreateCallbackPort (int argc, char ** argv, char ** envp) -{ - DPRINT("CSR: %s called\n", __FUNCTION__); - - return CsrpCreateListenPort (L"\\Windows\\SbApiPort", - & hSbApiPort, - ServerSbApiPortThread); -} - -/********************************************************************** - * CsrpRegisterSubsystem/3 - */ -static NTSTATUS -CsrpRegisterSubsystem (int argc, char ** argv, char ** envp) -{ - NTSTATUS Status = STATUS_SUCCESS; - OBJECT_ATTRIBUTES BootstrapOkAttributes; - UNICODE_STRING Name; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - /* - * Create the event object the callback port - * thread will signal *if* the SM will - * authorize us to bootstrap. - */ - RtlInitUnicodeString (& Name, L"\\CsrssBooting"); - InitializeObjectAttributes(& BootstrapOkAttributes, - & Name, - 0, NULL, NULL); - Status = NtCreateEvent (& hBootstrapOk, - EVENT_ALL_ACCESS, - & BootstrapOkAttributes, - SynchronizationEvent, - FALSE); - if(!NT_SUCCESS(Status)) - { - DPRINT("CSR: %s: NtCreateEvent failed (Status=0x%08lx)\n", - __FUNCTION__, Status); - return Status; - } - /* - * Let's tell the SM a new environment - * subsystem server is in the system. - */ - RtlInitUnicodeString (& Name, L"\\Windows\\SbApiPort"); - DPRINT("CSR: %s: registering with SM for\n IMAGE_SUBSYSTEM_WINDOWS_CUI == 3\n", __FUNCTION__); - Status = SmConnectApiPort (& Name, - hSbApiPort, - IMAGE_SUBSYSTEM_WINDOWS_CUI, - & hSmApiPort); - if(!NT_SUCCESS(Status)) - { - DPRINT("CSR: %s unable to connect to the SM (Status=0x%08lx)\n", - __FUNCTION__, Status); - NtClose (hBootstrapOk); - return Status; - } - /* - * Wait for SM to reply OK... If the SM - * won't answer, we hang here forever! - */ - DPRINT("CSR: %s: waiting for SM to OK boot...\n", __FUNCTION__); - Status = NtWaitForSingleObject (hBootstrapOk, - FALSE, - NULL); - NtClose (hBootstrapOk); - return Status; -} - -/********************************************************************** - * EnvpToUnicodeString/2 - */ -static ULONG FASTCALL -EnvpToUnicodeString (char ** envp, PUNICODE_STRING UnicodeEnv) -{ - ULONG CharCount = 0; - ULONG Index = 0; - ANSI_STRING AnsiEnv; - - UnicodeEnv->Buffer = NULL; - - for (Index=0; NULL != envp[Index]; Index++) - { - CharCount += strlen (envp[Index]); - ++ CharCount; - } - ++ CharCount; - - AnsiEnv.Buffer = RtlAllocateHeap (RtlGetProcessHeap(), 0, CharCount); - if (NULL != AnsiEnv.Buffer) - { - - PCHAR WritePos = AnsiEnv.Buffer; - - for (Index=0; NULL != envp[Index]; Index++) - { - strcpy (WritePos, envp[Index]); - WritePos += strlen (envp[Index]) + 1; - } - - /* FIXME: the last (double) nullterm should perhaps not be included in Length - * but only in MaximumLength. -Gunnar */ - AnsiEnv.Buffer [CharCount-1] = '\0'; - AnsiEnv.Length = CharCount; - AnsiEnv.MaximumLength = CharCount; - - RtlAnsiStringToUnicodeString (UnicodeEnv, & AnsiEnv, TRUE); - RtlFreeHeap (RtlGetProcessHeap(), 0, AnsiEnv.Buffer); - } - return CharCount; -} -/********************************************************************** - * CsrpLoadKernelModeDriver/3 - */ -static NTSTATUS -CsrpLoadKernelModeDriver (int argc, char ** argv, char ** envp) -{ - NTSTATUS Status = STATUS_SUCCESS; - WCHAR Data [MAX_PATH + 1]; - ULONG DataLength = sizeof Data; - ULONG DataType = 0; - UNICODE_STRING Environment; - - - DPRINT("SM: %s called\n", __FUNCTION__); - - - EnvpToUnicodeString (envp, & Environment); - Status = SmLookupSubsystem (L"Kmode", - Data, - & DataLength, - & DataType, - Environment.Buffer); - RtlFreeUnicodeString (& Environment); - if((STATUS_SUCCESS == Status) && (DataLength > sizeof Data[0])) - { - WCHAR ImagePath [MAX_PATH + 1] = {0}; - UNICODE_STRING ModuleName; - - wcscpy (ImagePath, L"\\??\\"); - wcscat (ImagePath, Data); - RtlInitUnicodeString (& ModuleName, ImagePath); - Status = NtSetSystemInformation(/* FIXME: SystemLoadAndCallImage */ - SystemExtendServiceTableInformation, - & ModuleName, - sizeof ModuleName); - if(!NT_SUCCESS(Status)) - { - DPRINT("WIN: %s: loading Kmode failed (Status=0x%08lx)\n", - __FUNCTION__, Status); - } - } - return Status; -} - -/********************************************************************** - * CsrpCreateApiPort/2 - */ -static NTSTATUS -CsrpCreateApiPort (int argc, char ** argv, char ** envp) -{ - DPRINT("CSR: %s called\n", __FUNCTION__); - - CsrInitProcessData(); - - return CsrpCreateListenPort(L"\\Windows\\ApiPort", &hApiPort, - (PTHREAD_START_ROUTINE)ClientConnectionThread); -} - -/********************************************************************** - * CsrpApiRegisterDef/0 - */ -static NTSTATUS -CsrpApiRegisterDef (int argc, char ** argv, char ** envp) -{ - return CsrApiRegisterDefinitions(NativeDefinitions); -} - -/********************************************************************** - * CsrpCCTS/2 - */ -static NTSTATUS -CsrpCCTS (int argc, char ** argv, char ** envp) -{ - ULONG Dummy; - ULONG DummyLength = sizeof(Dummy); - return CsrClientConnectToServer(L"\\Windows", - 0, &Dummy, &DummyLength, NULL); -} - -/********************************************************************** - * CsrpRunWinlogon/0 - * - * Start the logon process (winlogon.exe). - * - * TODO: this should be moved in CsrpCreateSession/x (one per session) - * TODO: in its own desktop (one logon desktop per winstation). - */ -static NTSTATUS -CsrpRunWinlogon (int argc, char ** argv, char ** envp) -{ - NTSTATUS Status = STATUS_SUCCESS; - UNICODE_STRING ImagePath; - UNICODE_STRING CommandLine; - PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; - RTL_USER_PROCESS_INFORMATION ProcessInfo; - - - DPRINT("CSR: %s called\n", __FUNCTION__); - - /* initialize the process parameters */ - RtlInitUnicodeString (& ImagePath, L"\\SystemRoot\\system32\\winlogon.exe"); - RtlInitUnicodeString (& CommandLine, L""); - RtlCreateProcessParameters(& ProcessParameters, - & ImagePath, - NULL, - NULL, - & CommandLine, - NULL, - NULL, - NULL, - NULL, - NULL); - /* Create the winlogon process */ - Status = RtlCreateUserProcess (& ImagePath, - OBJ_CASE_INSENSITIVE, - ProcessParameters, - NULL, - NULL, - NULL, - FALSE, - NULL, - NULL, - & ProcessInfo); - /* Cleanup */ - RtlDestroyProcessParameters (ProcessParameters); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SM: %s: loading winlogon.exe failed (Status=%08lx)\n", - __FUNCTION__, Status); - } - - ZwResumeThread(ProcessInfo.ThreadHandle, NULL); - return Status; -} - -static NTSTATUS -CsrpCreateHardErrorPort (int argc, char ** argv, char ** envp) -{ - return NtSetDefaultHardErrorPort(hApiPort); -} - -typedef NTSTATUS (* CSR_INIT_ROUTINE)(int,char**,char**); - -struct { - BOOL Required; - CSR_INIT_ROUTINE EntryPoint; - PCHAR ErrorMessage; -} InitRoutine [] = { - {TRUE, CsrpCreateBNODirectory, "create base named objects directory"}, - {TRUE, CsrpCreateCallbackPort, "create the callback port \\Windows\\SbApiPort"}, - {TRUE, CsrpRegisterSubsystem, "register with SM"}, - {TRUE, CsrpCreateHeap, "create the CSR heap"}, - {TRUE, CsrpCreateApiPort, "create the api port \\Windows\\ApiPort"}, - {TRUE, CsrpCreateHardErrorPort, "create the hard error port"}, - {TRUE, CsrpCreateObjectDirectory,"create the object directory \\Windows"}, - {TRUE, CsrpLoadKernelModeDriver, "load Kmode driver"}, - {TRUE, CsrpInitVideo, "initialize video"}, - {TRUE, CsrpApiRegisterDef, "initialize api definitions"}, - {TRUE, CsrpCCTS, "connect client to server"}, - {TRUE, CsrpInitWin32Csr, "load usermode dll"}, - {TRUE, CsrpRunWinlogon, "run WinLogon"}, -}; - -/********************************************************************** - * NAME - * CsrServerInitialization - * - * DESCRIPTION - * Initialize the Win32 environment subsystem server. - * - * RETURN VALUE - * TRUE: Initialization OK; otherwise FALSE. - */ -BOOL WINAPI -CsrServerInitialization ( - int argc, - char ** argv, - char ** envp - ) -{ - UINT i = 0; - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - for (i=0; i < (sizeof InitRoutine / sizeof InitRoutine[0]); i++) - { - Status = InitRoutine[i].EntryPoint(argc,argv,envp); - if(!NT_SUCCESS(Status)) - { - DPRINT1("CSR: %s: failed to %s (Status=%08lx)\n", - __FUNCTION__, - InitRoutine[i].ErrorMessage, - Status); - if (InitRoutine[i].Required) - { - return FALSE; - } - } - } - if (CallInitComplete()) - { - Status = SmCompleteSession (hSmApiPort,hSbApiPort,hApiPort); - return TRUE; - } - return FALSE; -} - -/* EOF */ Removed: trunk/reactos/subsystems/win32/csrss/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/pri… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/print.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/print.c (removed) @@ -1,61 +1,0 @@ -/* $Id$ - * - * smss.c - Session Manager - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * -------------------------------------------------------------------- - * - * 19990529 (Emanuele Aliberti) - * Compiled successfully with egcs 1.1.2 - */ - -#include <csrss.h> - -#define NDEBUG -#include <debug.h> - -VOID WINAPI DisplayString(LPCWSTR lpwString) -{ - UNICODE_STRING us; - - RtlInitUnicodeString (&us, lpwString); - ZwDisplayString (&us); -} - -VOID WINAPI PrintString (char* fmt, ...) -{ - char buffer[512]; - va_list ap; - UNICODE_STRING UnicodeString; - ANSI_STRING AnsiString; - - va_start(ap, fmt); - vsprintf(buffer, fmt, ap); - va_end(ap); - - RtlInitAnsiString (&AnsiString, buffer); - RtlAnsiStringToUnicodeString (&UnicodeString, - &AnsiString, - TRUE); - NtDisplayString(&UnicodeString); - RtlFreeUnicodeString (&UnicodeString); -} - -/* EOF */ Removed: trunk/reactos/subsystems/win32/csrss/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/vid… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/video.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/video.c (removed) @@ -1,111 +1,0 @@ -/* - * PROJECT: ReactOS Client/Server Runtime subsystem - * LICENSE: GPL v2 or later - See COPYING in the top level directory - * FILE: subsystems/win32/csrss/video.c - * PURPOSE: Video memory initialization. - * PROGRAMMERS: ReactOS Development Team - */ - -/* INCLUDES ******************************************************************/ - -#include <csrss.h> - -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS *****************************************************************/ - -ULONG -InitializeVideoAddressSpace(VOID) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING PhysMemName = RTL_CONSTANT_STRING(L"\\Device\\PhysicalMemory"); - NTSTATUS Status; - HANDLE PhysMemHandle; - PVOID BaseAddress; - LARGE_INTEGER Offset; - SIZE_T ViewSize; - CHAR IVTAndBda[1024+256]; - - /* Open the physical memory section */ - InitializeObjectAttributes(&ObjectAttributes, - &PhysMemName, - 0, - NULL, - NULL); - Status = ZwOpenSection(&PhysMemHandle, - SECTION_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Couldn't open \\Device\\PhysicalMemory\n"); - return 0; - } - - /* Map the BIOS and device registers into the address space */ - Offset.QuadPart = 0xa0000; - ViewSize = 0x100000 - 0xa0000; - BaseAddress = (PVOID)0xa0000; - Status = ZwMapViewOfSection(PhysMemHandle, - NtCurrentProcess(), - &BaseAddress, - 0, - ViewSize, - &Offset, - &ViewSize, - ViewUnmap, - 0, - PAGE_EXECUTE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Couldn't map physical memory (%x)\n", Status); - ZwClose(PhysMemHandle); - return 0; - } - - /* Close physical memory section handle */ - ZwClose(PhysMemHandle); - - if (BaseAddress != (PVOID)0xa0000) - { - DPRINT1("Couldn't map physical memory at the right address (was %x)\n", - BaseAddress); - return 0; - } - - /* Allocate some low memory to use for the non-BIOS - * parts of the v86 mode address space - */ - BaseAddress = (PVOID)0x1; - ViewSize = 0xa0000 - 0x1000; - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - &BaseAddress, - 0, - &ViewSize, - MEM_COMMIT, - PAGE_EXECUTE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to allocate virtual memory (Status %x)\n", Status); - return 0; - } - if (BaseAddress != (PVOID)0x0) - { - DPRINT1("Failed to allocate virtual memory at right address (was %x)\n", - BaseAddress); - return 0; - } - - /* Get the real mode IVT and BDA from the kernel */ - Status = NtVdmControl(VdmInitialize, IVTAndBda); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtVdmControl failed (status %x)\n", Status); - return 0; - } - - /* Return success */ - return 1; -} - -/* EOF */

14 years, 10 months

[tkreuzer] 46050: [FREELDR] Define _BLDR_ for WDK header compatibility [HAL] Define _NTHALDLL_ for WDK header compatibility, get rif of DECLSPEC_IMPORT header hack [NDK/RTL] Fix some Rtl prototypes (PCHAR -> PCCH) [NDK] Fix ZwOpenEvent prototype [NTIFS] Fix definition of NTKERNELAPI, move some types, fix PRTL_ALLOCATE_STRING_ROUTINE, PRTL_REALLOCATE_STRING_ROUTINE, PRTL_FREE_STRING_ROUTINE, define CTL_CODE, DEVICE_TYPE_FROM_CTL_CODE, FILE_ANY_ACCESS, FILE_SPECIAL_ACCESS, FILE_READ_ACCESS, FILE_W

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 10 05:16:52 2010 New Revision: 46050 URL: http://svn.reactos.org/svn/reactos?rev=46050&view=rev Log: [FREELDR] Define _BLDR_ for WDK header compatibility [HAL] Define _NTHALDLL_ for WDK header compatibility, get rif of DECLSPEC_IMPORT header hack [NDK/RTL] Fix some Rtl prototypes (PCHAR -> PCCH) [NDK] Fix ZwOpenEvent prototype [NTIFS] Fix definition of NTKERNELAPI, move some types, fix PRTL_ALLOCATE_STRING_ROUTINE, PRTL_REALLOCATE_STRING_ROUTINE, PRTL_FREE_STRING_ROUTINE, define CTL_CODE, DEVICE_TYPE_FROM_CTL_CODE, FILE_ANY_ACCESS, FILE_SPECIAL_ACCESS, FILE_READ_ACCESS, FILE_WRITE_ACCESS identical to wdm.h, remove duplicate RtlGenerate8dot3Name, remove ZwOpenEvent [NTPOAPI] Guard some types with #ifndef _PO_DDK_ [WDM] Create reactos compatible definition of NTKERNELAPI, add KDPC_WATCHDOG_INFORMATION, BATTERY_REPORTING_SCALE, fix ALIGN_UP_POINTER_BY, guard some types with #ifndef _PO_DDK_, update POWER_INFORMATION_LEVEL, make some FILE_DEVICE_ definitions identical to ntifs.h, fix HalAllocateCommonBuffer Modified: branches/header-work/ (props changed) branches/header-work/boot/freeldr/freeldr/freeldr_arch.rbuild branches/header-work/boot/freeldr/freeldr/freeldr_base.rbuild branches/header-work/hal/halx86/hal.rbuild branches/header-work/hal/halx86/hal_generic.rbuild branches/header-work/hal/halx86/hal_generic_mp.rbuild branches/header-work/hal/halx86/hal_generic_up.rbuild branches/header-work/hal/halx86/halmps.rbuild branches/header-work/hal/halx86/halxbox.rbuild branches/header-work/hal/halx86/include/hal.h branches/header-work/include/ddk/ntifs.h branches/header-work/include/ddk/ntpoapi.h branches/header-work/include/ddk/wdm.h branches/header-work/include/ddk/winddk.h branches/header-work/include/ndk/exfuncs.h branches/header-work/include/ndk/rtlfuncs.h branches/header-work/lib/rtl/nls.c Propchange: branches/header-work/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 10 05:16:52 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:45691-46019 +/trunk/reactos:45691-46019,46021-46023 Modified: branches/header-work/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/boot/freeldr/freeld… ============================================================================== --- branches/header-work/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] (original) +++ branches/header-work/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] Wed Mar 10 05:16:52 2010 @@ -6,6 +6,7 @@ <include base="ntoskrnl">include</include> <include base="ReactOS">include/reactos/libs</include> <include base="ReactOS">include/reactos/elf</include> + <define name="_BLDR_" /> <define name="_NTHAL_" /> <define name="_NTSYSTEM_" /> <directory name="arch"> Modified: branches/header-work/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/boot/freeldr/freeld… ============================================================================== --- branches/header-work/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ branches/header-work/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Wed Mar 10 05:16:52 2010 @@ -5,6 +5,7 @@ <include base="freeldr_base">cache</include> <include base="cmlib">.</include> <include base="ntoskrnl">include</include> + <define name="_BLDR_" /> <define name="_NTHAL_" /> <define name="_NTSYSTEM_" /> <directory name="arcemul"> Modified: branches/header-work/hal/halx86/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/hal.rbui… ============================================================================== --- branches/header-work/hal/halx86/hal.rbuild [iso-8859-1] (original) +++ branches/header-work/hal/halx86/hal.rbuild [iso-8859-1] Wed Mar 10 05:16:52 2010 @@ -6,6 +6,7 @@ <bootstrap installbase="$(CDOUTPUT)" /> <include>include</include> <include base="ntoskrnl">include</include> + <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> <library>hal_generic</library> <library>hal_generic_up</library> Modified: branches/header-work/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/hal_gene… ============================================================================== --- branches/header-work/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ branches/header-work/hal/halx86/hal_generic.rbuild [iso-8859-1] Wed Mar 10 05:16:52 2010 @@ -4,6 +4,7 @@ <module name="hal_generic" type="objectlibrary"> <include>include</include> <include base="ntoskrnl">include</include> + <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> <directory name="generic"> <directory name="bus"> @@ -38,8 +39,9 @@ <module name="mini_hal" type="objectlibrary"> <include>include</include> <include base="ntoskrnl">include</include> + <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> - <define name="_NTSYSTEM_" /> + <define name="_BLDR_" /> <define name="_MINIHAL_" /> <directory name="generic"> <directory name="bus"> Modified: branches/header-work/hal/halx86/hal_generic_mp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/hal_gene… ============================================================================== --- branches/header-work/hal/halx86/hal_generic_mp.rbuild [iso-8859-1] (original) +++ branches/header-work/hal/halx86/hal_generic_mp.rbuild [iso-8859-1] Wed Mar 10 05:16:52 2010 @@ -4,6 +4,7 @@ <module name="hal_generic_mp" type="objectlibrary"> <include>include</include> <include base="ntoskrnl">include</include> + <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> <define name="CONFIG_SMP" /> <directory name="mp"> Modified: branches/header-work/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/hal_gene… ============================================================================== --- branches/header-work/hal/halx86/hal_generic_up.rbuild [iso-8859-1] (original) +++ branches/header-work/hal/halx86/hal_generic_up.rbuild [iso-8859-1] Wed Mar 10 05:16:52 2010 @@ -4,6 +4,7 @@ <module name="hal_generic_up" type="objectlibrary"> <include>include</include> <include base="ntoskrnl">include</include> + <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> <directory name="generic"> <file>pic.c</file> Modified: branches/header-work/hal/halx86/halmps.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/halmps.r… ============================================================================== --- branches/header-work/hal/halx86/halmps.rbuild [iso-8859-1] (original) +++ branches/header-work/hal/halx86/halmps.rbuild [iso-8859-1] Wed Mar 10 05:16:52 2010 @@ -7,6 +7,7 @@ <include>include</include> <include base="ntoskrnl">include</include> <define name="CONFIG_SMP" /> + <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> <library>hal_generic</library> <library>hal_generic_mp</library> Modified: branches/header-work/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/halxbox.… ============================================================================== --- branches/header-work/hal/halx86/halxbox.rbuild [iso-8859-1] (original) +++ branches/header-work/hal/halx86/halxbox.rbuild [iso-8859-1] Wed Mar 10 05:16:52 2010 @@ -5,6 +5,7 @@ <importlibrary base="hal" definition="../hal.pspec" /> <include>include</include> <include base="ntoskrnl">include</include> + <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> <define name="SARCH_XBOX" /> <library>hal_generic</library> Modified: branches/header-work/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/include/… ============================================================================== --- branches/header-work/hal/halx86/include/hal.h [iso-8859-1] (original) +++ branches/header-work/hal/halx86/include/hal.h [iso-8859-1] Wed Mar 10 05:16:52 2010 @@ -14,14 +14,12 @@ /* WDK HAL Compilation hack */ #include <excpt.h> #include <ntdef.h> -#undef _NTHAL_ -#undef DECLSPEC_IMPORT -#define DECLSPEC_IMPORT #ifndef _MINIHAL_ #undef NTSYSAPI #define NTSYSAPI __declspec(dllimport) #else -#undef _NTSYSTEM_ +#undef NTSYSAPI +#define NTSYSAPI #endif /* IFS/DDK/NDK Headers */ Modified: branches/header-work/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntifs.h… ============================================================================== --- branches/header-work/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntifs.h [iso-8859-1] Wed Mar 10 05:16:52 2010 @@ -44,7 +44,8 @@ #define NTHALAPI #endif -#if !defined(_NTOSKRNL_) /* For ReactOS */ +/* For ReactOS */ +#if !defined(_NTOSKRNL_) && !defined(_BLDR_) #define NTKERNELAPI DECLSPEC_IMPORT #else #define NTKERNELAPI @@ -1484,6 +1485,16 @@ IN PCWCH UnicodeString, IN ULONG BytesInUnicodeString); +typedef struct _GENERATE_NAME_CONTEXT { + USHORT Checksum; + BOOLEAN CheckSumInserted; + UCHAR NameLength; + WCHAR NameBuffer[8]; + ULONG ExtensionLength; + WCHAR ExtensionBuffer[4]; + ULONG LastIndexValue; +} GENERATE_NAME_CONTEXT, *PGENERATE_NAME_CONTEXT; + #if (NTDDI_VERSION >= NTDDI_VISTASP1) NTSYSAPI NTSTATUS @@ -1518,6 +1529,26 @@ RtlIsValidOemCharacter( IN OUT PWCHAR Char); +typedef struct _RTL_SPLAY_LINKS { + struct _RTL_SPLAY_LINKS *Parent; + struct _RTL_SPLAY_LINKS *LeftChild; + struct _RTL_SPLAY_LINKS *RightChild; +} RTL_SPLAY_LINKS, *PRTL_SPLAY_LINKS; + +typedef struct _PREFIX_TABLE_ENTRY { + CSHORT NodeTypeCode; + CSHORT NameLength; + struct _PREFIX_TABLE_ENTRY *NextPrefixTree; + RTL_SPLAY_LINKS Links; + PSTRING Prefix; +} PREFIX_TABLE_ENTRY, *PPREFIX_TABLE_ENTRY; + +typedef struct _PREFIX_TABLE { + CSHORT NodeTypeCode; + CSHORT NameLength; + PPREFIX_TABLE_ENTRY NextPrefixTree; +} PREFIX_TABLE, *PPREFIX_TABLE; + NTSYSAPI VOID NTAPI @@ -1545,6 +1576,22 @@ PfxFindPrefix( IN PPREFIX_TABLE PrefixTable, IN PSTRING FullName); + +typedef struct _UNICODE_PREFIX_TABLE_ENTRY { + CSHORT NodeTypeCode; + CSHORT NameLength; + struct _UNICODE_PREFIX_TABLE_ENTRY *NextPrefixTree; + struct _UNICODE_PREFIX_TABLE_ENTRY *CaseMatch; + RTL_SPLAY_LINKS Links; + PUNICODE_STRING Prefix; +} UNICODE_PREFIX_TABLE_ENTRY, *PUNICODE_PREFIX_TABLE_ENTRY; + +typedef struct _UNICODE_PREFIX_TABLE { + CSHORT NodeTypeCode; + CSHORT NameLength; + PUNICODE_PREFIX_TABLE_ENTRY NextPrefixTree; + PUNICODE_PREFIX_TABLE_ENTRY LastNextEntry; +} UNICODE_PREFIX_TABLE, *PUNICODE_PREFIX_TABLE; NTSYSAPI VOID @@ -1962,6 +2009,16 @@ IN PUCHAR EndOfCompressedBufferPlus1, OUT PUCHAR *ChunkBuffer, IN ULONG ChunkSize); + +typedef struct _COMPRESSED_DATA_INFO { + USHORT CompressionFormatAndEngine; + UCHAR CompressionUnitShift; + UCHAR ChunkShift; + UCHAR ClusterShift; + UCHAR Reserved; + USHORT NumberOfChunks; + ULONG CompressedChunkSizes[ANYSIZE_ARRAY]; +} COMPRESSED_DATA_INFO, *PCOMPRESSED_DATA_INFO; NTSYSAPI NTSTATUS @@ -2293,7 +2350,7 @@ IN ULONG TagBase, IN ULONG Tag) { - __assume_bound(TagBase); + //__assume_bound(TagBase); // FIXME return ((ULONG)((TagBase) + ((Tag) << HEAP_TAG_SHIFT))); } @@ -2316,20 +2373,20 @@ ) typedef PVOID -(NTAPI *PRTL_ALLOCATE_STRING_ROUTINE ( +(NTAPI *PRTL_ALLOCATE_STRING_ROUTINE)( IN SIZE_T NumberOfBytes); #if _WIN32_WINNT >= 0x0600 typedef PVOID -(NTAPI *PRTL_REALLOCATE_STRING_ROUTINE ( +(NTAPI *PRTL_REALLOCATE_STRING_ROUTINE)( IN SIZE_T NumberOfBytes, IN PVOID Buffer); #endif typedef VOID -(NTAPI *PRTL_FREE_STRING_ROUTINE ( +(NTAPI *PRTL_FREE_STRING_ROUTINE)( IN PVOID Buffer); extern const PRTL_ALLOCATE_STRING_ROUTINE RtlAllocateStringRoutine; @@ -2338,46 +2395,6 @@ #if _WIN32_WINNT >= 0x0600 extern const PRTL_REALLOCATE_STRING_ROUTINE RtlReallocateStringRoutine; #endif - -typedef struct _GENERATE_NAME_CONTEXT { - USHORT Checksum; - BOOLEAN CheckSumInserted; - UCHAR NameLength; - WCHAR NameBuffer[8]; - ULONG ExtensionLength; - WCHAR ExtensionBuffer[4]; - ULONG LastIndexValue; -} GENERATE_NAME_CONTEXT, *PGENERATE_NAME_CONTEXT; - -typedef struct _PREFIX_TABLE_ENTRY { - CSHORT NodeTypeCode; - CSHORT NameLength; - struct _PREFIX_TABLE_ENTRY *NextPrefixTree; - RTL_SPLAY_LINKS Links; - PSTRING Prefix; -} PREFIX_TABLE_ENTRY, *PPREFIX_TABLE_ENTRY; - -typedef struct _PREFIX_TABLE { - CSHORT NodeTypeCode; - CSHORT NameLength; - PPREFIX_TABLE_ENTRY NextPrefixTree; -} PREFIX_TABLE, *PPREFIX_TABLE; - -typedef struct _UNICODE_PREFIX_TABLE_ENTRY { - CSHORT NodeTypeCode; - CSHORT NameLength; - struct _UNICODE_PREFIX_TABLE_ENTRY *NextPrefixTree; - struct _UNICODE_PREFIX_TABLE_ENTRY *CaseMatch; - RTL_SPLAY_LINKS Links; - PUNICODE_STRING Prefix; -} UNICODE_PREFIX_TABLE_ENTRY, *PUNICODE_PREFIX_TABLE_ENTRY; - -typedef struct _UNICODE_PREFIX_TABLE { - CSHORT NodeTypeCode; - CSHORT NameLength; - PUNICODE_PREFIX_TABLE_ENTRY NextPrefixTree; - PUNICODE_PREFIX_TABLE_ENTRY LastNextEntry; -} UNICODE_PREFIX_TABLE, *PUNICODE_PREFIX_TABLE; #define COMPRESSION_FORMAT_NONE (0x0000) #define COMPRESSION_FORMAT_DEFAULT (0x0001) @@ -2385,16 +2402,6 @@ #define COMPRESSION_ENGINE_STANDARD (0x0000) #define COMPRESSION_ENGINE_MAXIMUM (0x0100) #define COMPRESSION_ENGINE_HIBER (0x0200) - -typedef struct _COMPRESSED_DATA_INFO { - USHORT CompressionFormatAndEngine; - UCHAR CompressionUnitShift; - UCHAR ChunkShift; - UCHAR ClusterShift; - UCHAR Reserved; - USHORT NumberOfChunks; - ULONG CompressedChunkSizes[ANYSIZE_ARRAY]; -} COMPRESSED_DATA_INFO, *PCOMPRESSED_DATA_INFO; #define RtlOffsetToPointer(B,O) ((PCHAR)( ((PCHAR)(B)) + ((ULONG_PTR)(O)) )) #define RtlPointerToOffset(B,P) ((ULONG)( ((PCHAR)(P)) - ((PCHAR)(B)) )) @@ -2473,10 +2480,11 @@ #define FILE_DEVICE_BIOMETRIC 0x00000044 #define FILE_DEVICE_PMI 0x00000045 -#define CTL_CODE( DeviceType, Function, Method, Access ) ( \ - ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method) \ -) -#define DEVICE_TYPE_FROM_CTL_CODE(ctrlCode) (((ULONG)(ctrlCode & 0xffff0000)) >> 16) +#define CTL_CODE(DeviceType, Function, Method, Access) \ + (((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method)) + +#define DEVICE_TYPE_FROM_CTL_CODE(ctl) (((ULONG) (ctl & 0xffff0000)) >> 16) + #define METHOD_FROM_CTL_CODE(ctrlCode) ((ULONG)(ctrlCode & 3)) #define METHOD_BUFFERED 0 @@ -2486,10 +2494,10 @@ #define METHOD_DIRECT_TO_HARDWARE METHOD_IN_DIRECT #define METHOD_DIRECT_FROM_HARDWARE METHOD_OUT_DIRECT -#define FILE_ANY_ACCESS 0 -#define FILE_SPECIAL_ACCESS (FILE_ANY_ACCESS) -#define FILE_READ_ACCESS ( 0x0001 ) -#define FILE_WRITE_ACCESS ( 0x0002 ) +#define FILE_ANY_ACCESS 0x00000000 +#define FILE_SPECIAL_ACCESS FILE_ANY_ACCESS +#define FILE_READ_ACCESS 0x00000001 +#define FILE_WRITE_ACCESS 0x00000002 typedef ULONG LSA_OPERATIONAL_MODE, *PLSA_OPERATIONAL_MODE; @@ -5624,12 +5632,6 @@ ULONG LengthAccepted; } QUERY_PATH_RESPONSE, *PQUERY_PATH_RESPONSE; -typedef struct _RTL_SPLAY_LINKS { - struct _RTL_SPLAY_LINKS *Parent; - struct _RTL_SPLAY_LINKS *LeftChild; - struct _RTL_SPLAY_LINKS *RightChild; -} RTL_SPLAY_LINKS, *PRTL_SPLAY_LINKS; - typedef struct _RTL_BALANCED_LINKS { struct _RTL_BALANCED_LINKS *Parent; @@ -8238,16 +8240,6 @@ NTSYSAPI VOID NTAPI -RtlGenerate8dot3Name ( - IN PUNICODE_STRING Name, - IN BOOLEAN AllowExtendedCharacters, - IN OUT PGENERATE_NAME_CONTEXT Context, - OUT PUNICODE_STRING Name8dot3 -); - -NTSYSAPI -VOID -NTAPI RtlSecondsSince1970ToTime ( IN ULONG SecondsSince1970, OUT PLARGE_INTEGER Time @@ -8951,15 +8943,6 @@ NTSYSAPI NTSTATUS NTAPI -ZwOpenEvent ( - OUT PHANDLE EventHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes -); - -NTSYSAPI -NTSTATUS -NTAPI ZwOpenProcess ( OUT PHANDLE ProcessHandle, IN ACCESS_MASK DesiredAccess, Modified: branches/header-work/include/ddk/ntpoapi.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntpoapi… ============================================================================== --- branches/header-work/include/ddk/ntpoapi.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntpoapi.h [iso-8859-1] Wed Mar 10 05:16:52 2010 @@ -27,131 +27,8 @@ extern "C" { #endif -#define POWER_PERF_SCALE 100 -#define PERF_LEVEL_TO_PERCENT(x) (((x) * 1000) / (POWER_PERF_SCALE * 10)) -#define PERCENT_TO_PERF_LEVEL(x) (((x) * POWER_PERF_SCALE * 10) / 1000) - -typedef struct { - ULONG Granularity; - ULONG Capacity; -} BATTERY_REPORTING_SCALE, *PBATTERY_REPORTING_SCALE; - -typedef struct _PROCESSOR_IDLE_TIMES { - ULONGLONG StartTime; - ULONGLONG EndTime; - ULONG IdleHandlerReserved[4]; -} PROCESSOR_IDLE_TIMES, *PPROCESSOR_IDLE_TIMES; - -typedef BOOLEAN -(FASTCALL*PPROCESSOR_IDLE_HANDLER)( - IN OUT PPROCESSOR_IDLE_TIMES IdleTimes); - -typedef struct _PROCESSOR_IDLE_HANDLER_INFO { - ULONG HardwareLatency; - PPROCESSOR_IDLE_HANDLER Handler; -} PROCESSOR_IDLE_HANDLER_INFO, *PPROCESSOR_IDLE_HANDLER_INFO; - -typedef VOID -(FASTCALL*PSET_PROCESSOR_THROTTLE)( - IN UCHAR Throttle); - -typedef NTSTATUS -(FASTCALL*PSET_PROCESSOR_THROTTLE2)( - IN UCHAR Throttle); - -#define MAX_IDLE_HANDLERS 3 - -typedef struct _PROCESSOR_STATE_HANDLER { - UCHAR ThrottleScale; - BOOLEAN ThrottleOnIdle; - PSET_PROCESSOR_THROTTLE SetThrottle; - ULONG NumIdleHandlers; - PROCESSOR_IDLE_HANDLER_INFO IdleHandler[MAX_IDLE_HANDLERS]; -} PROCESSOR_STATE_HANDLER, *PPROCESSOR_STATE_HANDLER; - -typedef enum _POWER_STATE_HANDLER_TYPE { - PowerStateSleeping1, - PowerStateSleeping2, - PowerStateSleeping3, - PowerStateSleeping4, - PowerStateSleeping4Firmware, - PowerStateShutdownReset, - PowerStateShutdownOff, - PowerStateMaximum -} POWER_STATE_HANDLER_TYPE, *PPOWER_STATE_HANDLER_TYPE; - -typedef NTSTATUS -(NTAPI*PENTER_STATE_SYSTEM_HANDLER)( - IN PVOID SystemContext); - -typedef NTSTATUS -(NTAPI*PENTER_STATE_HANDLER)( - IN PVOID Context, - IN PENTER_STATE_SYSTEM_HANDLER SystemHandler OPTIONAL, - IN PVOID SystemContext, - IN LONG NumberProcessors, - IN LONG volatile *Number); - -typedef struct _POWER_STATE_HANDLER { - POWER_STATE_HANDLER_TYPE Type; - BOOLEAN RtcWake; - UCHAR Spare[3]; - PENTER_STATE_HANDLER Handler; - PVOID Context; -} POWER_STATE_HANDLER, *PPOWER_STATE_HANDLER; - -typedef NTSTATUS -(NTAPI*PENTER_STATE_NOTIFY_HANDLER)( - IN POWER_STATE_HANDLER_TYPE State, - IN PVOID Context, - IN BOOLEAN Entering); - -typedef struct _POWER_STATE_NOTIFY_HANDLER { - PENTER_STATE_NOTIFY_HANDLER Handler; - PVOID Context; -} POWER_STATE_NOTIFY_HANDLER, *PPOWER_STATE_NOTIFY_HANDLER; - -NTSYSCALLAPI -NTSTATUS -DDKAPI -NtPowerInformation( - IN POWER_INFORMATION_LEVEL InformationLevel, - IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferLength, - OUT PVOID OutputBuffer OPTIONAL, - IN ULONG OutputBufferLength); - -#define PROCESSOR_STATE_TYPE_PERFORMANCE 1 -#define PROCESSOR_STATE_TYPE_THROTTLE 2 - -typedef struct _PROCESSOR_PERF_LEVEL { - UCHAR PercentFrequency; - UCHAR Reserved; - USHORT Flags; -} PROCESSOR_PERF_LEVEL, *PPROCESSOR_PERF_LEVEL; - -typedef struct _PROCESSOR_PERF_STATE { - UCHAR PercentFrequency; - UCHAR MinCapacity; - USHORT Power; - UCHAR IncreaseLevel; - UCHAR DecreaseLevel; - USHORT Flags; - ULONG IncreaseTime; - ULONG DecreaseTime; - ULONG IncreaseCount; - ULONG DecreaseCount; - ULONGLONG PerformanceTime; -} PROCESSOR_PERF_STATE, *PPROCESSOR_PERF_STATE; - -typedef struct _PROCESSOR_STATE_HANDLER2 { - ULONG NumIdleHandlers; - PROCESSOR_IDLE_HANDLER_INFO IdleHandler[MAX_IDLE_HANDLERS]; - PSET_PROCESSOR_THROTTLE2 SetPerfLevel; - ULONG HardwareLatency; - UCHAR NumPerfStates; - PROCESSOR_PERF_LEVEL PerfLevel[1]; -} PROCESSOR_STATE_HANDLER2, *PPROCESSOR_STATE_HANDLER2; +#ifndef _PO_DDK_ +#define _PO_DDK_ /* Power States/Levels */ typedef enum _SYSTEM_POWER_STATE { @@ -184,7 +61,6 @@ SystemPowerState = 0, DevicePowerState } POWER_STATE_TYPE, *PPOWER_STATE_TYPE; - typedef enum _POWER_INFORMATION_LEVEL { SystemPowerPolicyAc, @@ -253,7 +129,136 @@ PowerActionWarmEject } POWER_ACTION, *PPOWER_ACTION; - +#if (NTDDI_VERSION >= NTDDI_WINXP) || !defined(_BATCLASS_) +typedef struct { + ULONG Granularity; + ULONG Capacity; +} BATTERY_REPORTING_SCALE, *PBATTERY_REPORTING_SCALE; +#endif /* (NTDDI_VERSION >= NTDDI_WINXP) || !defined(_BATCLASS_) */ + + +#endif /* _PO_DDK_ */ + +#define POWER_PERF_SCALE 100 +#define PERF_LEVEL_TO_PERCENT(x) (((x) * 1000) / (POWER_PERF_SCALE * 10)) +#define PERCENT_TO_PERF_LEVEL(x) (((x) * POWER_PERF_SCALE * 10) / 1000) + +typedef struct _PROCESSOR_IDLE_TIMES { + ULONGLONG StartTime; + ULONGLONG EndTime; + ULONG IdleHandlerReserved[4]; +} PROCESSOR_IDLE_TIMES, *PPROCESSOR_IDLE_TIMES; + +typedef BOOLEAN +(FASTCALL*PPROCESSOR_IDLE_HANDLER)( + IN OUT PPROCESSOR_IDLE_TIMES IdleTimes); + +typedef struct _PROCESSOR_IDLE_HANDLER_INFO { + ULONG HardwareLatency; + PPROCESSOR_IDLE_HANDLER Handler; +} PROCESSOR_IDLE_HANDLER_INFO, *PPROCESSOR_IDLE_HANDLER_INFO; + +typedef VOID +(FASTCALL*PSET_PROCESSOR_THROTTLE)( + IN UCHAR Throttle); + +typedef NTSTATUS +(FASTCALL*PSET_PROCESSOR_THROTTLE2)( + IN UCHAR Throttle); + +#define MAX_IDLE_HANDLERS 3 + +typedef struct _PROCESSOR_STATE_HANDLER { + UCHAR ThrottleScale; + BOOLEAN ThrottleOnIdle; + PSET_PROCESSOR_THROTTLE SetThrottle; + ULONG NumIdleHandlers; + PROCESSOR_IDLE_HANDLER_INFO IdleHandler[MAX_IDLE_HANDLERS]; +} PROCESSOR_STATE_HANDLER, *PPROCESSOR_STATE_HANDLER; + +typedef enum _POWER_STATE_HANDLER_TYPE { + PowerStateSleeping1, + PowerStateSleeping2, + PowerStateSleeping3, + PowerStateSleeping4, + PowerStateSleeping4Firmware, + PowerStateShutdownReset, + PowerStateShutdownOff, + PowerStateMaximum +} POWER_STATE_HANDLER_TYPE, *PPOWER_STATE_HANDLER_TYPE; + +typedef NTSTATUS +(NTAPI*PENTER_STATE_SYSTEM_HANDLER)( + IN PVOID SystemContext); + +typedef NTSTATUS +(NTAPI*PENTER_STATE_HANDLER)( + IN PVOID Context, + IN PENTER_STATE_SYSTEM_HANDLER SystemHandler OPTIONAL, + IN PVOID SystemContext, + IN LONG NumberProcessors, + IN LONG volatile *Number); + +typedef struct _POWER_STATE_HANDLER { + POWER_STATE_HANDLER_TYPE Type; + BOOLEAN RtcWake; + UCHAR Spare[3]; + PENTER_STATE_HANDLER Handler; + PVOID Context; +} POWER_STATE_HANDLER, *PPOWER_STATE_HANDLER; + +typedef NTSTATUS +(NTAPI*PENTER_STATE_NOTIFY_HANDLER)( + IN POWER_STATE_HANDLER_TYPE State, + IN PVOID Context, + IN BOOLEAN Entering); + +typedef struct _POWER_STATE_NOTIFY_HANDLER { + PENTER_STATE_NOTIFY_HANDLER Handler; + PVOID Context; +} POWER_STATE_NOTIFY_HANDLER, *PPOWER_STATE_NOTIFY_HANDLER; + +NTSYSCALLAPI +NTSTATUS +DDKAPI +NtPowerInformation( + IN POWER_INFORMATION_LEVEL InformationLevel, + IN PVOID InputBuffer OPTIONAL, + IN ULONG InputBufferLength, + OUT PVOID OutputBuffer OPTIONAL, + IN ULONG OutputBufferLength); + +#define PROCESSOR_STATE_TYPE_PERFORMANCE 1 +#define PROCESSOR_STATE_TYPE_THROTTLE 2 + +typedef struct _PROCESSOR_PERF_LEVEL { + UCHAR PercentFrequency; + UCHAR Reserved; + USHORT Flags; +} PROCESSOR_PERF_LEVEL, *PPROCESSOR_PERF_LEVEL; + +typedef struct _PROCESSOR_PERF_STATE { + UCHAR PercentFrequency; + UCHAR MinCapacity; + USHORT Power; + UCHAR IncreaseLevel; + UCHAR DecreaseLevel; + USHORT Flags; + ULONG IncreaseTime; + ULONG DecreaseTime; + ULONG IncreaseCount; + ULONG DecreaseCount; + ULONGLONG PerformanceTime; +} PROCESSOR_PERF_STATE, *PPROCESSOR_PERF_STATE; + +typedef struct _PROCESSOR_STATE_HANDLER2 { + ULONG NumIdleHandlers; + PROCESSOR_IDLE_HANDLER_INFO IdleHandler[MAX_IDLE_HANDLERS]; + PSET_PROCESSOR_THROTTLE2 SetPerfLevel; + ULONG HardwareLatency; + UCHAR NumPerfStates; + PROCESSOR_PERF_LEVEL PerfLevel[1]; +} PROCESSOR_STATE_HANDLER2, *PPROCESSOR_STATE_HANDLER2; NTSYSCALLAPI NTSTATUS Modified: branches/header-work/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?r… ============================================================================== --- branches/header-work/include/ddk/wdm.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/wdm.h [iso-8859-1] Wed Mar 10 05:16:52 2010 @@ -55,7 +55,8 @@ #define NTHALAPI #endif -#if !defined(_NTOSKRNL_) /* For ReactOS */ +/* For ReactOS */ +#if !defined(_NTOSKRNL_) && !defined(_BLDR_) #define NTKERNELAPI DECLSPEC_IMPORT #else #define NTKERNELAPI @@ -848,6 +849,14 @@ volatile PVOID DpcData; } KDPC, *PKDPC, *RESTRICTED_POINTER PRKDPC; +typedef struct _KDPC_WATCHDOG_INFORMATION { + ULONG DpcTimeLimit; + ULONG DpcTimeCount; + ULONG DpcWatchdogLimit; + ULONG DpcWatchdogCount; + ULONG Reserved; +} KDPC_WATCHDOG_INFORMATION, *PKDPC_WATCHDOG_INFORMATION; + typedef struct _KDEVICE_QUEUE { CSHORT Type; CSHORT Size; @@ -2138,7 +2147,7 @@ #define ALIGN_DOWN_POINTER_BY(ptr, align) \ ((PVOID)ALIGN_DOWN_BY(ptr, align)) -#define ALIGN_UP_POINTER_BY(ptr, alignment) \ +#define ALIGN_UP_POINTER_BY(ptr, align) \ ((PVOID)ALIGN_UP_BY(ptr, align)) #define ALIGN_DOWN(size, type) \ @@ -2147,8 +2156,8 @@ #define ALIGN_UP(size, type) \ ALIGN_UP_BY(size, sizeof(type)) -#define ALIGN_DOWN_POINTER(p, type) \ - ALIGN_DOWN_POINTER_BY(p, sizeof(type)) +#define ALIGN_DOWN_POINTER(ptr, type) \ + ALIGN_DOWN_POINTER_BY(ptr, sizeof(type)) #define ALIGN_UP_POINTER(ptr, type) \ ALIGN_UP_POINTER_BY(ptr, sizeof(type)) @@ -2952,9 +2961,14 @@ #endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ + +#if 1 /****************************************************************************** * Power Management Support Types * ******************************************************************************/ + +#ifndef _PO_DDK_ +#define _PO_DDK_ /* Power States/Levels */ typedef enum _SYSTEM_POWER_STATE { @@ -2993,7 +3007,37 @@ ProcessorPowerPolicyDc, VerifyProcessorPowerPolicyAc, VerifyProcessorPowerPolicyDc, - ProcessorPowerPolicyCurrent + ProcessorPowerPolicyCurrent, + SystemPowerStateLogging, + SystemPowerLoggingEntry, + SetPowerSettingValue, + NotifyUserPowerSetting, + PowerInformationLevelUnused0, + PowerInformationLevelUnused1, + SystemVideoState, + TraceApplicationPowerMessage, + TraceApplicationPowerMessageEnd, + ProcessorPerfStates, + ProcessorIdleStates, + ProcessorCap, + SystemWakeSource, + SystemHiberFileInformation, + TraceServicePowerMessage, + ProcessorLoad, + PowerShutdownNotification, + MonitorCapabilities, + SessionPowerInit, + SessionDisplayState, + PowerRequestCreate, + PowerRequestAction, + GetPowerRequestList, + ProcessorInformationEx, + NotifyUserModeLegacyPowerEvent, + GroupPark, + ProcessorIdleDomains, + WakeTimerList, + SystemHiberFileSize, + PowerInformationLevelMaximum } POWER_INFORMATION_LEVEL; typedef enum { @@ -3026,6 +3070,15 @@ DevicePowerState } POWER_STATE_TYPE, *PPOWER_STATE_TYPE; +#if (NTDDI_VERSION >= NTDDI_WINXP) || !defined(_BATCLASS_) +typedef struct { + ULONG Granularity; + ULONG Capacity; +} BATTERY_REPORTING_SCALE, *PBATTERY_REPORTING_SCALE; +#endif /* (NTDDI_VERSION >= NTDDI_WINXP) || !defined(_BATCLASS_) */ + +#endif /* !_PO_DDK_ */ + typedef VOID (DDKAPI *PREQUEST_POWER_COMPLETE)( IN struct _DEVICE_OBJECT *DeviceObject, @@ -3034,6 +3087,7 @@ IN PVOID Context, IN struct _IO_STATUS_BLOCK *IoStatus); + /****************************************************************************** * Power Management Support Functions * ******************************************************************************/ @@ -3110,13 +3164,13 @@ VOID NTAPI PoSetSystemWake( - IN OUT PIRP Irp); + IN OUT struct _IRP *Irp); NTKERNELAPI BOOLEAN NTAPI PoGetSystemWake( - IN PIRP Irp); + IN struct _IRP *Irp); NTKERNELAPI NTSTATUS @@ -3195,7 +3249,7 @@ IN PCOUNTED_REASON_CONTEXT Context); #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ - +#endif /****************************************************************************** * Configuration Manager Types * @@ -5486,10 +5540,10 @@ #define FILE_DEVICE_SERENUM 0x00000037 #define FILE_DEVICE_TERMSRV 0x00000038 #define FILE_DEVICE_KSEC 0x00000039 -#define FILE_DEVICE_FIPS 0x0000003a -#define FILE_DEVICE_INFINIBAND 0x0000003b -#define FILE_DEVICE_VMBUS 0x0000003e -#define FILE_DEVICE_CRYPT_PROVIDER 0x0000003f +#define FILE_DEVICE_FIPS 0x0000003A +#define FILE_DEVICE_INFINIBAND 0x0000003B +#define FILE_DEVICE_VMBUS 0x0000003E +#define FILE_DEVICE_CRYPT_PROVIDER 0x0000003F #define FILE_DEVICE_WPD 0x00000040 #define FILE_DEVICE_BLUETOOTH 0x00000041 #define FILE_DEVICE_MT_COMPOSITE 0x00000042 @@ -6639,8 +6693,8 @@ #define SL_ALLOW_RAW_MOUNT 0x01 -#define CTL_CODE(DeviceType, Function, Method, Access)( \ - ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method)) +#define CTL_CODE(DeviceType, Function, Method, Access) \ + (((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method)) #define DEVICE_TYPE_FROM_CTL_CODE(ctl) (((ULONG) (ctl & 0xffff0000)) >> 16) @@ -11402,7 +11456,7 @@ PVOID NTAPI HalAllocateCommonBuffer( - IN PADAPTER_OBJECT AdapterObject, + IN PDMA_ADAPTER DmaAdapter, IN ULONG Length, OUT PPHYSICAL_ADDRESS LogicalAddress, IN BOOLEAN CacheEnabled) Modified: branches/header-work/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/winddk.… ============================================================================== --- branches/header-work/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/winddk.h [iso-8859-1] Wed Mar 10 05:16:52 2010 @@ -1028,12 +1028,15 @@ pHalMirrorVerify HalMirrorVerify; } HAL_DISPATCH, *PHAL_DISPATCH; -#if defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTHAL_) -extern NTSYSAPI PHAL_DISPATCH HalDispatchTable; -#define HALDISPATCH ((PHAL_DISPATCH)&HalDispatchTable) +/* GCC/MSVC and WDK compatible declaration */ +extern NTKERNELAPI HAL_DISPATCH HalDispatchTable; + +#if defined(_NTOSKRNL_) || defined(_BLDR_) +#define HALDISPATCH (&HalDispatchTable) #else -extern __declspec(dllexport) HAL_DISPATCH HalDispatchTable; -#define HALDISPATCH (&HalDispatchTable) +/* This is a WDK compatibility definition */ +#define HalDispatchTable (&HalDispatchTable) +#define HALDISPATCH HalDispatchTable #endif #define HAL_DISPATCH_VERSION 3 @@ -2813,6 +2816,10 @@ IN PDEVICE_OBJECT DeviceObject, IN struct _DRIVE_LAYOUT_INFORMATION_EX *PartitionBuffer); +#if defined(USE_DMA_MACROS) && !defined(_NTHAL_) && (defined(_NTDDK_) || defined(_NTDRIVER_)) || defined(_WDM_INCLUDED_) +// nothing here +#else + #if (NTDDI_VERSION >= NTDDI_WIN2K) //DECLSPEC_DEPRECATED_DDK NTHALAPI @@ -2882,7 +2889,17 @@ HalReadDmaCounter( IN PADAPTER_OBJECT AdapterObject); -#endif +NTHALAPI +NTSTATUS +NTAPI +HalAllocateAdapterChannel( + IN PADAPTER_OBJECT AdapterObject, + IN PWAIT_CONTEXT_BLOCK Wcb, + IN ULONG NumberOfMapRegisters, + IN PDRIVER_CONTROL ExecutionRoutine); + +#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ +#endif /* defined(USE_DMA_MACROS) && !defined(_NTHAL_) && (defined(_NTDDK_) || defined(_NTDRIVER_)) || defined(_WDM_INCLUDED_) */ /** Kernel routines **/ @@ -3754,15 +3771,6 @@ NTHALAPI NTSTATUS NTAPI -HalAllocateAdapterChannel( - IN PADAPTER_OBJECT AdapterObject, - IN PWAIT_CONTEXT_BLOCK Wcb, - IN ULONG NumberOfMapRegisters, - IN PDRIVER_CONTROL ExecutionRoutine); - -NTHALAPI -NTSTATUS -NTAPI HalAssignSlotResources( IN PUNICODE_STRING RegistryPath, IN PUNICODE_STRING DriverClassName, Modified: branches/header-work/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ndk/exfuncs… ============================================================================== --- branches/header-work/include/ndk/exfuncs.h [iso-8859-1] (original) +++ branches/header-work/include/ndk/exfuncs.h [iso-8859-1] Wed Mar 10 05:16:52 2010 @@ -732,7 +732,7 @@ OUT PRTL_ATOM Atom OPTIONAL ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI ZwOpenEvent( Modified: branches/header-work/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ndk/rtlfunc… ============================================================================== --- branches/header-work/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ branches/header-work/include/ndk/rtlfuncs.h [iso-8859-1] Wed Mar 10 05:16:52 2010 @@ -1478,7 +1478,7 @@ PCHAR OemString, ULONG OemSize, PULONG ResultSize, - PWCHAR UnicodeString, + PCWCH UnicodeString, ULONG UnicodeSize ); @@ -1508,7 +1508,7 @@ PCHAR OemString, ULONG OemSize, PULONG ResultSize, - PWCHAR UnicodeString, + PCWCH UnicodeString, ULONG UnicodeSize ); @@ -1533,7 +1533,7 @@ PCHAR MbString, ULONG MbSize, PULONG ResultSize, - PWCHAR UnicodeString, + PCWCH UnicodeString, ULONG UnicodeSize ); @@ -1542,7 +1542,7 @@ NTAPI RtlUnicodeToMultiByteSize( PULONG MbSize, - PWCHAR UnicodeString, + PCWCH UnicodeString, ULONG UnicodeSize ); @@ -1570,7 +1570,7 @@ PWSTR UnicodeString, ULONG MaxBytesInUnicodeString, PULONG BytesInUnicodeString, - IN PCHAR OemString, + IN PCCH OemString, ULONG BytesInOemString ); Modified: branches/header-work/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/rtl/nls.c?rev=4… ============================================================================== --- branches/header-work/lib/rtl/nls.c [iso-8859-1] (original) +++ branches/header-work/lib/rtl/nls.c [iso-8859-1] Wed Mar 10 05:16:52 2010 @@ -345,7 +345,7 @@ RtlOemToUnicodeN (PWCHAR UnicodeString, ULONG UnicodeSize, PULONG ResultSize, - PCHAR OemString, + PCCH OemString, ULONG OemSize) { ULONG Size = 0; @@ -376,7 +376,7 @@ UCHAR Char; USHORT OemLeadByteInfo; - PCHAR OemEnd = OemString + OemSize; + PCCH OemEnd = OemString + OemSize; for (i = 0; i < UnicodeSize / sizeof(WCHAR) && OemString < OemEnd; i++) { @@ -569,7 +569,7 @@ NTSTATUS NTAPI RtlUnicodeToMultiByteSize(PULONG MbSize, - PWCHAR UnicodeString, + PCWCH UnicodeString, ULONG UnicodeSize) { ULONG UnicodeLength = UnicodeSize / sizeof(WCHAR); @@ -613,7 +613,7 @@ RtlUnicodeToOemN (PCHAR OemString, ULONG OemSize, PULONG ResultSize, - PWCHAR UnicodeString, + PCWCH UnicodeString, ULONG UnicodeSize) { ULONG Size = 0; @@ -762,7 +762,7 @@ RtlUpcaseUnicodeToMultiByteN (PCHAR MbString, ULONG MbSize, PULONG ResultSize, - PWCHAR UnicodeString, + PCWCH UnicodeString, ULONG UnicodeSize) { WCHAR UpcaseChar; @@ -806,7 +806,7 @@ RtlUpcaseUnicodeToOemN (PCHAR OemString, ULONG OemSize, PULONG ResultSize, - PWCHAR UnicodeString, + PCWCH UnicodeString, ULONG UnicodeSize) { WCHAR UpcaseChar;

14 years, 10 months

[sir_richard] 46049: [NTOS]: No good deed goes unpunished. Continuing the novel/saga from a couple of days ago, it seems that now that impersonation works, various code paths are being tickled into existence. For example, it would seem parts of the system now attempt setting primary tokens. This would cause an assertion, since PspAssignPrimaryToken incorrectly dereferenced the token (leading to a double-dereference) due to an off-by-! mistake.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Mar 10 05:12:25 2010 New Revision: 46049 URL: http://svn.reactos.org/svn/reactos?rev=46049&view=rev Log: [NTOS]: No good deed goes unpunished. Continuing the novel/saga from a couple of days ago, it seems that now that impersonation works, various code paths are being tickled into existence. For example, it would seem parts of the system now attempt setting primary tokens. This would cause an assertion, since PspAssignPrimaryToken incorrectly dereferenced the token (leading to a double-dereference) due to an off-by-! mistake. Modified: trunk/reactos/ntoskrnl/ps/security.c Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] Wed Mar 10 05:12:25 2010 @@ -206,7 +206,7 @@ /* Dereference Tokens and Return */ if (NT_SUCCESS(Status)) ObDereferenceObject(OldToken); - if (AccessToken) ObDereferenceObject(NewToken); + if (!AccessToken) ObDereferenceObject(NewToken); return Status; }

14 years, 10 months

← Newer
1
...
55
56
57
58
59
60
61
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2010