Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[chorns] 20166: reactos.com -> reactos.org

by chorns＠svn.reactos.com

reactos.com -> reactos.org Modified: trunk/irc/TechBot/TechBot/App.config _____ Modified: trunk/irc/TechBot/TechBot/App.config --- trunk/irc/TechBot/TechBot/App.config 2005-12-14 18:13:05 UTC (rev 20165) +++ trunk/irc/TechBot/TechBot/App.config 2005-12-14 18:55:57 UTC (rev 20166) @@ -11,7 +11,7 @@ <add key="WinerrorXml" value="C:\IRC\TechBot\winerror.xml" /> <add key="HresultXml" value="C:\IRC\TechBot\hresult.xml" /> <add key="WmXml" value="C:\IRC\TechBot\wm.xml" /> - <add key="SvnCommand" value="svn co svn://svn.reactos.com/trunk/reactos" /> + <add key="SvnCommand" value="svn co svn://svn.reactos.org/trunk/reactos" /> <add key="BugUrl" value="www.reactos.org/bugzilla/show_bug.cgi?id={0}" /> </appSettings> </configuration>

18 years, 9 months

[navaraf] 20165: Implement "!bug <number>" command.

by navaraf＠svn.reactos.com

Implement "!bug <number>" command. Modified: trunk/irc/TechBot/TechBot/App.config Modified: trunk/irc/TechBot/TechBot/ServiceThread.cs Modified: trunk/irc/TechBot/TechBot.Console/App.config Modified: trunk/irc/TechBot/TechBot.Console/Main.cs Added: trunk/irc/TechBot/TechBot.Library/BugCommand.cs Modified: trunk/irc/TechBot/TechBot.Library/IrcService.cs Modified: trunk/irc/TechBot/TechBot.Library/TechBot.Library.prjx Modified: trunk/irc/TechBot/TechBot.Library/TechBotService.cs _____ Modified: trunk/irc/TechBot/TechBot/App.config --- trunk/irc/TechBot/TechBot/App.config 2005-12-14 17:34:00 UTC (rev 20164) +++ trunk/irc/TechBot/TechBot/App.config 2005-12-14 18:13:05 UTC (rev 20165) @@ -12,5 +12,6 @@ <add key="HresultXml" value="C:\IRC\TechBot\hresult.xml" /> <add key="WmXml" value="C:\IRC\TechBot\wm.xml" /> <add key="SvnCommand" value="svn co svn://svn.reactos.com/trunk/reactos" /> + <add key="BugUrl" value="www.reactos.org/bugzilla/show_bug.cgi?id={0}" /> </appSettings> </configuration> _____ Modified: trunk/irc/TechBot/TechBot/ServiceThread.cs --- trunk/irc/TechBot/TechBot/ServiceThread.cs 2005-12-14 17:34:00 UTC (rev 20164) +++ trunk/irc/TechBot/TechBot/ServiceThread.cs 2005-12-14 18:13:05 UTC (rev 20165) @@ -18,6 +18,7 @@ private string WmXml; private string WinerrorXml; private string SvnCommand; + private string BugUrl; private EventLog eventLog; public ServiceThread(EventLog eventLog) @@ -38,6 +39,7 @@ WmXml = ConfigurationSettings.AppSettings["WmXml"]; WinerrorXml = ConfigurationSettings.AppSettings["WinerrorXml"]; SvnCommand = ConfigurationSettings.AppSettings["SvnCommand"]; + BugUrl = ConfigurationSettings.AppSettings["BugUrl"]; } public void Run() @@ -55,7 +57,8 @@ WinerrorXml, HresultXml, WmXml, - SvnCommand); + SvnCommand, + BugUrl); ircService.Run(); } _____ Modified: trunk/irc/TechBot/TechBot.Console/App.config --- trunk/irc/TechBot/TechBot.Console/App.config 2005-12-14 17:34:00 UTC (rev 20164) +++ trunk/irc/TechBot/TechBot.Console/App.config 2005-12-14 18:13:05 UTC (rev 20165) @@ -12,5 +12,6 @@ <add key="HresultXml" value="C:\IRC\TechBot\hresult.xml" /> <add key="WmXml" value="C:\IRC\TechBot\wm.xml" /> <add key="SvnCommand" value="svn co svn://svn.reactos.com/trunk/reactos" /> + <add key="BugUrl" value="www.reactos.org/bugzilla/show_bug.cgi?id={0}" /> </appSettings> </configuration> _____ Modified: trunk/irc/TechBot/TechBot.Console/Main.cs --- trunk/irc/TechBot/TechBot.Console/Main.cs 2005-12-14 17:34:00 UTC (rev 20164) +++ trunk/irc/TechBot/TechBot.Console/Main.cs 2005-12-14 18:13:05 UTC (rev 20165) @@ -158,6 +158,18 @@ } } + private static string BugUrl + { + get + { + string optionName = "BugUrl"; + string s = ConfigurationSettings.AppSettings[optionName]; + VerifyRequiredOption(optionName, + s); + return s; + } + } + private static void RunIrcService() { IrcService ircService = new IrcService(IRCServerHostName, @@ -170,7 +182,8 @@ WinerrorXml, HresultXml, WmXml, - SvnCommand); + SvnCommand, + BugUrl); ircService.Run(); } @@ -190,7 +203,8 @@ WinerrorXml, HresultXml, WmXml, - SvnCommand); + SvnCommand, + BugUrl); service.Run(); while (true) { _____ Added: trunk/irc/TechBot/TechBot.Library/BugCommand.cs --- trunk/irc/TechBot/TechBot.Library/BugCommand.cs 2005-12-14 17:34:00 UTC (rev 20164) +++ trunk/irc/TechBot/TechBot.Library/BugCommand.cs 2005-12-14 18:13:05 UTC (rev 20165) @@ -0,0 +1,54 @@ +using System; + +namespace TechBot.Library +{ + public class BugCommand : BaseCommand, ICommand + { + private IServiceOutput serviceOutput; + private string bugUrl; + + public BugCommand(IServiceOutput serviceOutput, + string bugUrl) + { + this.serviceOutput = serviceOutput; + this.bugUrl = bugUrl; + } + + public bool CanHandle(string commandName) + { + return CanHandle(commandName, + new string[] { "bug" }); + } + + public void Handle(MessageContext context, + string commandName, + string parameters) + { + string bugText = parameters; + if (bugText.Equals(String.Empty)) + { + serviceOutput.WriteLine(context, + "Please provide a valid bug number."); + return; + } + + NumberParser np = new NumberParser(); + long bug = np.Parse(bugText); + if (np.Error) + { + serviceOutput.WriteLine(context, + String.Format("{0} is not a valid bug number.", + bugText)); + return; + } + + serviceOutput.WriteLine(context, + String.Format(bugUrl, bug)); + } + + public string Help() + { + return "!bug <number>"; + } + } +} _____ Modified: trunk/irc/TechBot/TechBot.Library/IrcService.cs --- trunk/irc/TechBot/TechBot.Library/IrcService.cs 2005-12-14 17:34:00 UTC (rev 20164) +++ trunk/irc/TechBot/TechBot.Library/IrcService.cs 2005-12-14 18:13:05 UTC (rev 20165) @@ -18,6 +18,7 @@ private string hresultXml; private string wmXml; private string svnCommand; + private string bugUrl; private IrcClient client; private ArrayList channels = new ArrayList(); /* IrcChannel */ private TechBotService service; @@ -33,7 +34,8 @@ string winerrorXml, string hresultXml, string wmXml, - string svnCommand) + string svnCommand, + string bugUrl) { this.hostname = hostname; this.port = port; @@ -46,6 +48,7 @@ this.hresultXml = hresultXml; this.wmXml = wmXml; this.svnCommand = svnCommand; + this.bugUrl = bugUrl; } public void Run() @@ -57,7 +60,8 @@ winerrorXml, hresultXml, wmXml, - svnCommand); + svnCommand, + bugUrl); service.Run(); client = new IrcClient(); _____ Modified: trunk/irc/TechBot/TechBot.Library/TechBot.Library.prjx --- trunk/irc/TechBot/TechBot.Library/TechBot.Library.prjx 2005-12-14 17:34:00 UTC (rev 20164) +++ trunk/irc/TechBot/TechBot.Library/TechBot.Library.prjx 2005-12-14 18:13:05 UTC (rev 20165) @@ -13,6 +13,7 @@ <File name=".\HresultCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> <File name=".\WinerrorCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> <File name=".\SvnCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> + <File name=".\BugCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> <File name=".\WmCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> <File name=".\MessageContext.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> </Contents> _____ Modified: trunk/irc/TechBot/TechBot.Library/TechBotService.cs --- trunk/irc/TechBot/TechBot.Library/TechBotService.cs 2005-12-14 17:34:00 UTC (rev 20164) +++ trunk/irc/TechBot/TechBot.Library/TechBotService.cs 2005-12-14 18:13:05 UTC (rev 20165) @@ -17,6 +17,7 @@ private string hresultXml; private string wmXml; private string svnCommand; + private string bugUrl; private ArrayList commands = new ArrayList(); public TechBotService(IServiceOutput serviceOutput, @@ -26,7 +27,8 @@ string winerrorXml, string hresultXml, string wmXml, - string svnCommand) + string svnCommand, + string bugUrl) { this.serviceOutput = serviceOutput; this.chmPath = chmPath; @@ -36,6 +38,7 @@ this.hresultXml = hresultXml; this.wmXml = wmXml; this.svnCommand = svnCommand; + this.bugUrl = bugUrl; } public void Run() @@ -55,6 +58,8 @@ wmXml)); commands.Add(new SvnCommand(serviceOutput, svnCommand)); + commands.Add(new BugCommand(serviceOutput, + bugUrl)); } public void InjectMessage(MessageContext context,

18 years, 9 months

[navaraf] 20164: - Add support for "!wm <value>" and "!wm <name>" commands.

by navaraf＠svn.reactos.com

- Add support for "!wm <value>" and "!wm <name>" commands. - Update the #develop project file. - Add list of window message values. Thanks to Royce3. Added: trunk/irc/TechBot/Resources/wm.xml Modified: trunk/irc/TechBot/TechBot/App.config Modified: trunk/irc/TechBot/TechBot/ServiceThread.cs Modified: trunk/irc/TechBot/TechBot.Console/App.config Modified: trunk/irc/TechBot/TechBot.Console/Main.cs Modified: trunk/irc/TechBot/TechBot.Library/IrcService.cs Modified: trunk/irc/TechBot/TechBot.Library/TechBot.Library.prjx Modified: trunk/irc/TechBot/TechBot.Library/TechBotService.cs Added: trunk/irc/TechBot/TechBot.Library/WmCommand.cs _____ Added: trunk/irc/TechBot/Resources/wm.xml --- trunk/irc/TechBot/Resources/wm.xml 2005-12-14 12:41:38 UTC (rev 20163) +++ trunk/irc/TechBot/Resources/wm.xml 2005-12-14 17:34:00 UTC (rev 20164) @@ -0,0 +1,321 @@ +<?xml version="1.0" ?> +<WindowMessageList> + <WindowMessage text="WM_APP" value="32768" /> + <WindowMessage text="WM_ACTIVATE" value="6" /> + <WindowMessage text="WM_ACTIVATEAPP" value="28" /> + <WindowMessage text="WM_AFXFIRST" value="864" /> + <WindowMessage text="WM_AFXLAST" value="895" /> + <WindowMessage text="WM_ASKCBFORMATNAME" value="780" /> + <WindowMessage text="WM_CANCELJOURNAL" value="75" /> + <WindowMessage text="WM_CANCELMODE" value="31" /> + <WindowMessage text="WM_CAPTURECHANGED" value="533" /> + <WindowMessage text="WM_CHANGECBCHAIN" value="781" /> + <WindowMessage text="WM_CHANGEUISTATE" value="295" /> + <WindowMessage text="WM_UPDATEUISTATE" value="296" /> + <WindowMessage text="WM_QUERYUISTATE" value="297" /> + <WindowMessage text="WM_CHAR" value="258" /> + <WindowMessage text="WM_CHARTOITEM" value="47" /> + <WindowMessage text="WM_CHILDACTIVATE" value="34" /> + <WindowMessage text="WM_CLEAR" value="771" /> + <WindowMessage text="WM_CLOSE" value="16" /> + <WindowMessage text="WM_COMMAND" value="273" /> + <WindowMessage text="WM_COMMNOTIFY" value="68" /> + <WindowMessage text="WM_COMPACTING" value="65" /> + <WindowMessage text="WM_COMPAREITEM" value="57" /> + <WindowMessage text="WM_CONTEXTMENU" value="123" /> + <WindowMessage text="WM_COPY" value="769" /> + <WindowMessage text="WM_COPYDATA" value="74" /> + <WindowMessage text="WM_CREATE" value="1" /> + <WindowMessage text="WM_CTLCOLORBTN" value="309" /> + <WindowMessage text="WM_CTLCOLORDLG" value="310" /> + <WindowMessage text="WM_CTLCOLOREDIT" value="307" /> + <WindowMessage text="WM_CTLCOLORLISTBOX" value="308" /> + <WindowMessage text="WM_CTLCOLORMSGBOX" value="306" /> + <WindowMessage text="WM_CTLCOLORSCROLLBAR" value="311" /> + <WindowMessage text="WM_CTLCOLORSTATIC" value="312" /> + <WindowMessage text="WM_CUT" value="768" /> + <WindowMessage text="WM_DEADCHAR" value="259" /> + <WindowMessage text="WM_DELETEITEM" value="45" /> + <WindowMessage text="WM_DESTROY" value="2" /> + <WindowMessage text="WM_DESTROYCLIPBOARD" value="775" /> + <WindowMessage text="WM_DEVICECHANGE" value="537" /> + <WindowMessage text="WM_DEVMODECHANGE" value="27" /> + <WindowMessage text="WM_DISPLAYCHANGE" value="126" /> + <WindowMessage text="WM_DRAWCLIPBOARD" value="776" /> + <WindowMessage text="WM_DRAWITEM" value="43" /> + <WindowMessage text="WM_DROPFILES" value="563" /> + <WindowMessage text="WM_ENABLE" value="10" /> + <WindowMessage text="WM_ENDSESSION" value="22" /> + <WindowMessage text="WM_ENTERIDLE" value="289" /> + <WindowMessage text="WM_ENTERMENULOOP" value="529" /> + <WindowMessage text="WM_ENTERSIZEMOVE" value="561" /> + <WindowMessage text="WM_ERASEBKGND" value="20" /> + <WindowMessage text="WM_EXITMENULOOP" value="530" /> + <WindowMessage text="WM_EXITSIZEMOVE" value="562" /> + <WindowMessage text="WM_FONTCHANGE" value="29" /> + <WindowMessage text="WM_GETDLGCODE" value="135" /> + <WindowMessage text="WM_GETFONT" value="49" /> + <WindowMessage text="WM_GETHOTKEY" value="51" /> + <WindowMessage text="WM_GETICON" value="127" /> + <WindowMessage text="WM_GETMINMAXINFO" value="36" /> + <WindowMessage text="WM_GETTEXT" value="13" /> + <WindowMessage text="WM_GETTEXTLENGTH" value="14" /> + <WindowMessage text="WM_HANDHELDFIRST" value="856" /> + <WindowMessage text="WM_HANDHELDLAST" value="863" /> + <WindowMessage text="WM_HELP" value="83" /> + <WindowMessage text="WM_HOTKEY" value="786" /> + <WindowMessage text="WM_HSCROLL" value="276" /> + <WindowMessage text="WM_HSCROLLCLIPBOARD" value="782" /> + <WindowMessage text="WM_ICONERASEBKGND" value="39" /> + <WindowMessage text="WM_INITDIALOG" value="272" /> + <WindowMessage text="WM_INITMENU" value="278" /> + <WindowMessage text="WM_INITMENUPOPUP" value="279" /> + <WindowMessage text="WM_INPUTLANGCHANGE" value="81" /> + <WindowMessage text="WM_INPUTLANGCHANGEREQUEST" value="80" /> + <WindowMessage text="WM_KEYDOWN" value="256" /> + <WindowMessage text="WM_KEYUP" value="257" /> + <WindowMessage text="WM_KILLFOCUS" value="8" /> + <WindowMessage text="WM_MDIACTIVATE" value="546" /> + <WindowMessage text="WM_MDICASCADE" value="551" /> + <WindowMessage text="WM_MDICREATE" value="544" /> + <WindowMessage text="WM_MDIDESTROY" value="545" /> + <WindowMessage text="WM_MDIGETACTIVE" value="553" /> + <WindowMessage text="WM_MDIICONARRANGE" value="552" /> + <WindowMessage text="WM_MDIMAXIMIZE" value="549" /> + <WindowMessage text="WM_MDINEXT" value="548" /> + <WindowMessage text="WM_MDIREFRESHMENU" value="564" /> + <WindowMessage text="WM_MDIRESTORE" value="547" /> + <WindowMessage text="WM_MDISETMENU" value="560" /> + <WindowMessage text="WM_MDITILE" value="550" /> + <WindowMessage text="WM_MEASUREITEM" value="44" /> + <WindowMessage text="WM_MENURBUTTONUP" value="290" /> + <WindowMessage text="WM_MENUCHAR" value="288" /> + <WindowMessage text="WM_MENUSELECT" value="287" /> + <WindowMessage text="WM_NEXTMENU" value="531" /> + <WindowMessage text="WM_MOVE" value="3" /> + <WindowMessage text="WM_MOVING" value="534" /> + <WindowMessage text="WM_NCACTIVATE" value="134" /> + <WindowMessage text="WM_NCCALCSIZE" value="131" /> + <WindowMessage text="WM_NCCREATE" value="129" /> + <WindowMessage text="WM_NCDESTROY" value="130" /> + <WindowMessage text="WM_NCHITTEST" value="132" /> + <WindowMessage text="WM_NCLBUTTONDBLCLK" value="163" /> + <WindowMessage text="WM_NCLBUTTONDOWN" value="161" /> + <WindowMessage text="WM_NCLBUTTONUP" value="162" /> + <WindowMessage text="WM_NCMBUTTONDBLCLK" value="169" /> + <WindowMessage text="WM_NCMBUTTONDOWN" value="167" /> + <WindowMessage text="WM_NCMBUTTONUP" value="168" /> + <WindowMessage text="WM_NCXBUTTONDOWN" value="171" /> + <WindowMessage text="WM_NCXBUTTONUP" value="172" /> + <WindowMessage text="WM_NCXBUTTONDBLCLK" value="173" /> + <WindowMessage text="WM_NCMOUSEMOVE" value="160" /> + <WindowMessage text="WM_NCMOUSEHOVER" value="0x02A0" /> + <WindowMessage text="WM_NCMOUSELEAVE" value="0x02A2" /> + <WindowMessage text="WM_NCPAINT" value="133" /> + <WindowMessage text="WM_NCRBUTTONDBLCLK" value="166" /> + <WindowMessage text="WM_NCRBUTTONDOWN" value="164" /> + <WindowMessage text="WM_NCRBUTTONUP" value="165" /> + <WindowMessage text="WM_NEXTDLGCTL" value="40" /> + <WindowMessage text="WM_NEXTMENU" value="531" /> + <WindowMessage text="WM_NOTIFY" value="78" /> + <WindowMessage text="WM_NOTIFYFORMAT" value="85" /> + <WindowMessage text="WM_NULL" value="0" /> + <WindowMessage text="WM_PAINT" value="15" /> + <WindowMessage text="WM_PAINTCLIPBOARD" value="777" /> + <WindowMessage text="WM_PAINTICON" value="38" /> + <WindowMessage text="WM_PALETTECHANGED" value="785" /> + <WindowMessage text="WM_PALETTEISCHANGING" value="784" /> + <WindowMessage text="WM_PARENTNOTIFY" value="528" /> + <WindowMessage text="WM_PASTE" value="770" /> + <WindowMessage text="WM_PENWINFIRST" value="896" /> + <WindowMessage text="WM_PENWINLAST" value="911" /> + <WindowMessage text="WM_POWER" value="72" /> + <WindowMessage text="WM_POWERBROADCAST" value="536" /> + <WindowMessage text="WM_PRINT" value="791" /> + <WindowMessage text="WM_PRINTCLIENT" value="792" /> + <WindowMessage text="WM_QUERYDRAGICON" value="55" /> + <WindowMessage text="WM_QUERYENDSESSION" value="17" /> + <WindowMessage text="WM_QUERYNEWPALETTE" value="783" /> + <WindowMessage text="WM_QUERYOPEN" value="19" /> + <WindowMessage text="WM_QUEUESYNC" value="35" /> + <WindowMessage text="WM_QUIT" value="18" /> + <WindowMessage text="WM_RENDERALLFORMATS" value="774" /> + <WindowMessage text="WM_RENDERFORMAT" value="773" /> + <WindowMessage text="WM_SETCURSOR" value="32" /> + <WindowMessage text="WM_SETFOCUS" value="7" /> + <WindowMessage text="WM_SETFONT" value="48" /> + <WindowMessage text="WM_SETHOTKEY" value="50" /> + <WindowMessage text="WM_SETICON" value="128" /> + <WindowMessage text="WM_SETREDRAW" value="11" /> + <WindowMessage text="WM_SETTEXT" value="12" /> + <WindowMessage text="WM_SETTINGCHANGE" value="26" /> + <WindowMessage text="WM_SHOWWINDOW" value="24" /> + <WindowMessage text="WM_SIZE" value="5" /> + <WindowMessage text="WM_SIZECLIPBOARD" value="779" /> + <WindowMessage text="WM_SIZING" value="532" /> + <WindowMessage text="WM_SPOOLERSTATUS" value="42" /> + <WindowMessage text="WM_STYLECHANGED" value="125" /> + <WindowMessage text="WM_STYLECHANGING" value="124" /> + <WindowMessage text="WM_SYSCHAR" value="262" /> + <WindowMessage text="WM_SYSCOLORCHANGE" value="21" /> + <WindowMessage text="WM_SYSCOMMAND" value="274" /> + <WindowMessage text="WM_SYSDEADCHAR" value="263" /> + <WindowMessage text="WM_SYSKEYDOWN" value="260" /> + <WindowMessage text="WM_SYSKEYUP" value="261" /> + <WindowMessage text="WM_TCARD" value="82" /> + <WindowMessage text="WM_TIMECHANGE" value="30" /> + <WindowMessage text="WM_TIMER" value="275" /> + <WindowMessage text="WM_SYSTIMER" value="280" /> + <WindowMessage text="WM_UNDO" value="772" /> + <WindowMessage text="WM_USER" value="1024" /> + <WindowMessage text="WM_USERCHANGED" value="84" /> + <WindowMessage text="WM_VKEYTOITEM" value="46" /> + <WindowMessage text="WM_VSCROLL" value="277" /> + <WindowMessage text="WM_VSCROLLCLIPBOARD" value="778" /> + <WindowMessage text="WM_WINDOWPOSCHANGED" value="71" /> + <WindowMessage text="WM_WINDOWPOSCHANGING" value="70" /> + <WindowMessage text="WM_WININICHANGE" value="26" /> + <WindowMessage text="WM_KEYFIRST" value="256" /> + <WindowMessage text="WM_KEYLAST" value="264" /> + <WindowMessage text="WM_SYNCPAINT" value="136" /> + <WindowMessage text="WM_MOUSEACTIVATE" value="33" /> + <WindowMessage text="WM_MOUSEMOVE" value="512" /> + <WindowMessage text="WM_LBUTTONDOWN" value="513" /> + <WindowMessage text="WM_LBUTTONUP" value="514" /> + <WindowMessage text="WM_LBUTTONDBLCLK" value="515" /> + <WindowMessage text="WM_RBUTTONDOWN" value="516" /> + <WindowMessage text="WM_RBUTTONUP" value="517" /> + <WindowMessage text="WM_RBUTTONDBLCLK" value="518" /> + <WindowMessage text="WM_MBUTTONDOWN" value="519" /> + <WindowMessage text="WM_MBUTTONUP" value="520" /> + <WindowMessage text="WM_MBUTTONDBLCLK" value="521" /> + <WindowMessage text="WM_MOUSEWHEEL" value="522" /> + <WindowMessage text="WM_MOUSEFIRST" value="512" /> + <WindowMessage text="WM_XBUTTONDOWN" value="523" /> + <WindowMessage text="WM_XBUTTONUP" value="524" /> + <WindowMessage text="WM_XBUTTONDBLCLK" value="525" /> + <WindowMessage text="WM_MOUSELAST" value="525" /> + <WindowMessage text="WM_MOUSEHOVER" value="0x2A1" /> + <WindowMessage text="WM_MOUSELEAVE" value="0x2A3" /> + <WindowMessage text="WM_THEMECHANGED" value="794" /> + <WindowMessage text="BM_CLICK" value="245" /> + <WindowMessage text="BM_GETCHECK" value="240" /> + <WindowMessage text="BM_GETIMAGE" value="246" /> + <WindowMessage text="BM_GETSTATE" value="242" /> + <WindowMessage text="BM_SETCHECK" value="241" /> + <WindowMessage text="BM_SETIMAGE" value="247" /> + <WindowMessage text="BM_SETSTATE" value="243" /> + <WindowMessage text="BM_SETSTYLE" value="244" /> + <WindowMessage text="CB_ADDSTRING" value="323" /> + <WindowMessage text="CB_DELETESTRING" value="324" /> + <WindowMessage text="CB_DIR" value="325" /> + <WindowMessage text="CB_FINDSTRING" value="332" /> + <WindowMessage text="CB_FINDSTRINGEXACT" value="344" /> + <WindowMessage text="CB_GETCOMBOBOXINFO" value="356" /> + <WindowMessage text="CB_GETCOUNT" value="326" /> + <WindowMessage text="CB_GETCURSEL" value="327" /> + <WindowMessage text="CB_GETDROPPEDCONTROLRECT" value="338" /> + <WindowMessage text="CB_GETDROPPEDSTATE" value="343" /> + <WindowMessage text="CB_GETDROPPEDWIDTH" value="351" /> + <WindowMessage text="CB_GETEDITSEL" value="320" /> + <WindowMessage text="CB_GETEXTENDEDUI" value="342" /> + <WindowMessage text="CB_GETHORIZONTALEXTENT" value="349" /> + <WindowMessage text="CB_GETITEMDATA" value="336" /> + <WindowMessage text="CB_GETITEMHEIGHT" value="340" /> + <WindowMessage text="CB_GETLBTEXT" value="328" /> + <WindowMessage text="CB_GETLBTEXTLEN" value="329" /> + <WindowMessage text="CB_GETLOCALE" value="346" /> + <WindowMessage text="CB_GETTOPINDEX" value="347" /> + <WindowMessage text="CB_INITSTORAGE" value="353" /> + <WindowMessage text="CB_INSERTSTRING" value="330" /> + <WindowMessage text="CB_LIMITTEXT" value="321" /> + <WindowMessage text="CB_RESETCONTENT" value="331" /> + <WindowMessage text="CB_SELECTSTRING" value="333" /> + <WindowMessage text="CB_SETCURSEL" value="334" /> + <WindowMessage text="CB_SETDROPPEDWIDTH" value="352" /> + <WindowMessage text="CB_SETEDITSEL" value="322" /> + <WindowMessage text="CB_SETEXTENDEDUI" value="341" /> + <WindowMessage text="CB_SETHORIZONTALEXTENT" value="350" /> + <WindowMessage text="CB_SETITEMDATA" value="337" /> + <WindowMessage text="CB_SETITEMHEIGHT" value="339" /> + <WindowMessage text="CB_SETLOCALE" value="345" /> + <WindowMessage text="CB_SETTOPINDEX" value="348" /> + <WindowMessage text="CB_SHOWDROPDOWN" value="335" /> + <WindowMessage text="EM_CANUNDO" value="198" /> + <WindowMessage text="EM_CHARFROMPOS" value="215" /> + <WindowMessage text="EM_EMPTYUNDOBUFFER" value="205" /> + <WindowMessage text="EM_FMTLINES" value="200" /> + <WindowMessage text="EM_GETFIRSTVISIBLELINE" value="206" /> + <WindowMessage text="EM_GETHANDLE" value="189" /> + <WindowMessage text="EM_GETLIMITTEXT" value="213" /> + <WindowMessage text="EM_GETLINE" value="196" /> + <WindowMessage text="EM_GETLINECOUNT" value="186" /> + <WindowMessage text="EM_GETMARGINS" value="212" /> + <WindowMessage text="EM_GETMODIFY" value="184" /> + <WindowMessage text="EM_GETPASSWORDCHAR" value="210" /> + <WindowMessage text="EM_GETRECT" value="178" /> + <WindowMessage text="EM_GETSEL" value="176" /> + <WindowMessage text="EM_GETTHUMB" value="190" /> + <WindowMessage text="EM_GETWORDBREAKPROC" value="209" /> + <WindowMessage text="EM_LIMITTEXT" value="197" /> + <WindowMessage text="EM_LINEFROMCHAR" value="201" /> + <WindowMessage text="EM_LINEINDEX" value="187" /> + <WindowMessage text="EM_LINELENGTH" value="193" /> + <WindowMessage text="EM_LINESCROLL" value="182" /> + <WindowMessage text="EM_POSFROMCHAR" value="214" /> + <WindowMessage text="EM_REPLACESEL" value="194" /> + <WindowMessage text="EM_SCROLL" value="181" /> + <WindowMessage text="EM_SCROLLCARET" value="183" /> + <WindowMessage text="EM_SETHANDLE" value="188" /> + <WindowMessage text="EM_SETLIMITTEXT" value="197" /> + <WindowMessage text="EM_SETMARGINS" value="211" /> + <WindowMessage text="EM_SETMODIFY" value="185" /> + <WindowMessage text="EM_SETPASSWORDCHAR" value="204" /> + <WindowMessage text="EM_SETREADONLY" value="207" /> + <WindowMessage text="EM_SETRECT" value="179" /> + <WindowMessage text="EM_SETRECTNP" value="180" /> + <WindowMessage text="EM_SETSEL" value="177" /> + <WindowMessage text="EM_SETTABSTOPS" value="203" /> + <WindowMessage text="EM_SETWORDBREAKPROC" value="208" /> + <WindowMessage text="EM_UNDO" value="199" /> + <WindowMessage text="LB_ADDFILE" value="406" /> + <WindowMessage text="LB_ADDSTRING" value="384" /> + <WindowMessage text="LB_DELETESTRING" value="386" /> + <WindowMessage text="LB_DIR" value="397" /> + <WindowMessage text="LB_FINDSTRING" value="399" /> + <WindowMessage text="LB_FINDSTRINGEXACT" value="418" /> + <WindowMessage text="LB_GETANCHORINDEX" value="413" /> + <WindowMessage text="LB_GETCARETINDEX" value="415" /> + <WindowMessage text="LB_GETCOUNT" value="395" /> + <WindowMessage text="LB_GETCURSEL" value="392" /> + <WindowMessage text="LB_GETHORIZONTALEXTENT" value="403" /> + <WindowMessage text="LB_GETITEMDATA" value="409" /> + <WindowMessage text="LB_GETITEMHEIGHT" value="417" /> + <WindowMessage text="LB_GETITEMRECT" value="408" /> + <WindowMessage text="LB_GETLOCALE" value="422" /> + <WindowMessage text="LB_GETSEL" value="391" /> + <WindowMessage text="LB_GETSELCOUNT" value="400" /> + <WindowMessage text="LB_GETSELITEMS" value="401" /> + <WindowMessage text="LB_GETTEXT" value="393" /> + <WindowMessage text="LB_GETTEXTLEN" value="394" /> + <WindowMessage text="LB_GETTOPINDEX" value="398" /> + <WindowMessage text="LB_INITSTORAGE" value="424" /> + <WindowMessage text="LB_INSERTSTRING" value="385" /> + <WindowMessage text="LB_ITEMFROMPOINT" value="425" /> + <WindowMessage text="LB_RESETCONTENT" value="388" /> + <WindowMessage text="LB_SELECTSTRING" value="396" /> + <WindowMessage text="LB_SELITEMRANGE" value="411" /> + <WindowMessage text="LB_SELITEMRANGEEX" value="387" /> + <WindowMessage text="LB_SETANCHORINDEX" value="412" /> + <WindowMessage text="LB_SETCARETINDEX" value="414" /> + <WindowMessage text="LB_SETCOLUMNWIDTH" value="405" /> + <WindowMessage text="LB_SETCOUNT" value="423" /> + <WindowMessage text="LB_SETCURSEL" value="390" /> + <WindowMessage text="LB_SETHORIZONTALEXTENT" value="404" /> + <WindowMessage text="LB_SETITEMDATA" value="410" /> + <WindowMessage text="LB_SETITEMHEIGHT" value="416" /> + <WindowMessage text="LB_SETLOCALE" value="421" /> + <WindowMessage text="LB_SETSEL" value="389" /> + <WindowMessage text="LB_SETTABSTOPS" value="402" /> + <WindowMessage text="LB_SETTOPINDEX" value="407" /> +</WindowMessageList> _____ Modified: trunk/irc/TechBot/TechBot/App.config --- trunk/irc/TechBot/TechBot/App.config 2005-12-14 12:41:38 UTC (rev 20163) +++ trunk/irc/TechBot/TechBot/App.config 2005-12-14 17:34:00 UTC (rev 20164) @@ -10,6 +10,7 @@ <add key="NtstatusXml" value="C:\IRC\TechBot\ntstatus.xml" /> <add key="WinerrorXml" value="C:\IRC\TechBot\winerror.xml" /> <add key="HresultXml" value="C:\IRC\TechBot\hresult.xml" /> + <add key="WmXml" value="C:\IRC\TechBot\wm.xml" /> <add key="SvnCommand" value="svn co svn://svn.reactos.com/trunk/reactos" /> </appSettings> </configuration> _____ Modified: trunk/irc/TechBot/TechBot/ServiceThread.cs --- trunk/irc/TechBot/TechBot/ServiceThread.cs 2005-12-14 12:41:38 UTC (rev 20163) +++ trunk/irc/TechBot/TechBot/ServiceThread.cs 2005-12-14 17:34:00 UTC (rev 20164) @@ -15,6 +15,7 @@ private string MainChm; private string NtstatusXml; private string HresultXml; + private string WmXml; private string WinerrorXml; private string SvnCommand; private EventLog eventLog; @@ -34,6 +35,7 @@ MainChm = ConfigurationSettings.AppSettings["MainChm"]; NtstatusXml = ConfigurationSettings.AppSettings["NtstatusXml"]; HresultXml = ConfigurationSettings.AppSettings["HresultXml"]; + WmXml = ConfigurationSettings.AppSettings["WmXml"]; WinerrorXml = ConfigurationSettings.AppSettings["WinerrorXml"]; SvnCommand = ConfigurationSettings.AppSettings["SvnCommand"]; } @@ -52,6 +54,7 @@ NtstatusXml, WinerrorXml, HresultXml, + WmXml, SvnCommand); ircService.Run(); } _____ Modified: trunk/irc/TechBot/TechBot.Console/App.config --- trunk/irc/TechBot/TechBot.Console/App.config 2005-12-14 12:41:38 UTC (rev 20163) +++ trunk/irc/TechBot/TechBot.Console/App.config 2005-12-14 17:34:00 UTC (rev 20164) @@ -10,6 +10,7 @@ <add key="NtstatusXml" value="C:\IRC\TechBot\ntstatus.xml" /> <add key="WinerrorXml" value="C:\IRC\TechBot\winerror.xml" /> <add key="HresultXml" value="C:\IRC\TechBot\hresult.xml" /> + <add key="WmXml" value="C:\IRC\TechBot\wm.xml" /> <add key="SvnCommand" value="svn co svn://svn.reactos.com/trunk/reactos" /> </appSettings> </configuration> _____ Modified: trunk/irc/TechBot/TechBot.Console/Main.cs --- trunk/irc/TechBot/TechBot.Console/Main.cs 2005-12-14 12:41:38 UTC (rev 20163) +++ trunk/irc/TechBot/TechBot.Console/Main.cs 2005-12-14 17:34:00 UTC (rev 20164) @@ -134,6 +134,18 @@ } } + private static string WmXml + { + get + { + string optionName = "WmXml"; + string s = ConfigurationSettings.AppSettings[optionName]; + VerifyRequiredOption(optionName, + s); + return s; + } + } + private static string SvnCommand { get @@ -157,6 +169,7 @@ NtstatusXml, WinerrorXml, HresultXml, + WmXml, SvnCommand); ircService.Run(); } @@ -176,6 +189,7 @@ NtstatusXml, WinerrorXml, HresultXml, + WmXml, SvnCommand); service.Run(); while (true) _____ Modified: trunk/irc/TechBot/TechBot.Library/IrcService.cs --- trunk/irc/TechBot/TechBot.Library/IrcService.cs 2005-12-14 12:41:38 UTC (rev 20163) +++ trunk/irc/TechBot/TechBot.Library/IrcService.cs 2005-12-14 17:34:00 UTC (rev 20164) @@ -16,6 +16,7 @@ private string ntstatusXml; private string winerrorXml; private string hresultXml; + private string wmXml; private string svnCommand; private IrcClient client; private ArrayList channels = new ArrayList(); /* IrcChannel */ @@ -31,18 +32,20 @@ string ntstatusXml, string winerrorXml, string hresultXml, + string wmXml, string svnCommand) { this.hostname = hostname; this.port = port; this.channelnames = channelnames; - this.botname = botname; - this.chmPath = chmPath; - this.mainChm = mainChm; - this.ntstatusXml = ntstatusXml; - this.winerrorXml = winerrorXml; - this.hresultXml = hresultXml; - this.svnCommand = svnCommand; + this.botname = botname; + this.chmPath = chmPath; + this.mainChm = mainChm; + this.ntstatusXml = ntstatusXml; + this.winerrorXml = winerrorXml; + this.hresultXml = hresultXml; + this.wmXml = wmXml; + this.svnCommand = svnCommand; } public void Run() @@ -53,6 +56,7 @@ ntstatusXml, winerrorXml, hresultXml, + wmXml, svnCommand); service.Run(); _____ Modified: trunk/irc/TechBot/TechBot.Library/TechBot.Library.prjx --- trunk/irc/TechBot/TechBot.Library/TechBot.Library.prjx 2005-12-14 12:41:38 UTC (rev 20163) +++ trunk/irc/TechBot/TechBot.Library/TechBot.Library.prjx 2005-12-14 17:34:00 UTC (rev 20164) @@ -13,6 +13,8 @@ <File name=".\HresultCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> <File name=".\WinerrorCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> <File name=".\SvnCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> + <File name=".\WmCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> + <File name=".\MessageContext.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> </Contents> <References> <Reference type="Project" refto="CHMLibrary" localcopy="True" /> _____ Modified: trunk/irc/TechBot/TechBot.Library/TechBotService.cs --- trunk/irc/TechBot/TechBot.Library/TechBotService.cs 2005-12-14 12:41:38 UTC (rev 20163) +++ trunk/irc/TechBot/TechBot.Library/TechBotService.cs 2005-12-14 17:34:00 UTC (rev 20164) @@ -15,16 +15,18 @@ private string ntstatusXml; private string winerrorXml; private string hresultXml; + private string wmXml; private string svnCommand; private ArrayList commands = new ArrayList(); public TechBotService(IServiceOutput serviceOutput, string chmPath, - string mainChm, - string ntstatusXml, - string winerrorXml, - string hresultXml, - string svnCommand) + string mainChm, + string ntstatusXml, + string winerrorXml, + string hresultXml, + string wmXml, + string svnCommand) { this.serviceOutput = serviceOutput; this.chmPath = chmPath; @@ -32,6 +34,7 @@ this.ntstatusXml = ntstatusXml; this.winerrorXml = winerrorXml; this.hresultXml = hresultXml; + this.wmXml = wmXml; this.svnCommand = svnCommand; } @@ -48,6 +51,8 @@ winerrorXml)); commands.Add(new HresultCommand(serviceOutput, hresultXml)); + commands.Add(new WmCommand(serviceOutput, + wmXml)); commands.Add(new SvnCommand(serviceOutput, svnCommand)); } _____ Added: trunk/irc/TechBot/TechBot.Library/WmCommand.cs --- trunk/irc/TechBot/TechBot.Library/WmCommand.cs 2005-12-14 12:41:38 UTC (rev 20163) +++ trunk/irc/TechBot/TechBot.Library/WmCommand.cs 2005-12-14 17:34:00 UTC (rev 20164) @@ -0,0 +1,104 @@ +using System; +using System.Xml; + +namespace TechBot.Library +{ + public class WmCommand : BaseCommand, ICommand + { + private IServiceOutput serviceOutput; + private string wmXml; + private XmlDocument wmXmlDocument; + + public WmCommand(IServiceOutput serviceOutput, + string wmXml) + { + this.serviceOutput = serviceOutput; + this.wmXml = wmXml; + wmXmlDocument = new XmlDocument(); + wmXmlDocument.Load(wmXml); + } + + public bool CanHandle(string commandName) + { + return CanHandle(commandName, + new string[] { "wm" }); + } + + public void Handle(MessageContext context, + string commandName, + string parameters) + { + string wmText = parameters; + if (wmText.Equals(String.Empty)) + { + serviceOutput.WriteLine(context, + "Please provide a valid window message value or name."); + return; + } + + NumberParser np = new NumberParser(); + long wm = np.Parse(wmText); + string output; + if (np.Error) + { + // Assume "!wm <name>" form. + output = GetWmNumber(wmText); + } + else + { + output = GetWmDescription(wm); + } + + if (output != null) + { + serviceOutput.WriteLine(context, + String.Format("{0} is {1}.", + wmText, + output)); + } + else + { + serviceOutput.WriteLine(context, + String.Format("I don't know about window message {0}.", + wmText)); + } + } + + public string Help() + { + return "!wm <value> or !wm <name>"; + } + + private string GetWmDescription(long wm) + { + XmlElement root = wmXmlDocument.DocumentElement; + XmlNode node = root.SelectSingleNode(String.Format("WindowMessage[@value='{0}']", + wm)); + if (node != null) + { + XmlAttribute text = node.Attributes["text"]; + if (text == null) + throw new Exception("Node has no text attribute."); + return text.Value; + } + else + return null; + } + + private string GetWmNumber(string wmName) + { + XmlElement root = wmXmlDocument.DocumentElement; + XmlNode node = root.SelectSingleNode(String.Format("WindowMessage[@text='{0}']", + wmName)); + if (node != null) + { + XmlAttribute value = node.Attributes["value"]; + if (value == null) + throw new Exception("Node has no value attribute."); + return value.Value; + } + else + return null; + } + } +}

18 years, 9 months

[turner] 20163: Remove my changes to pagefile creation because they cause a hang for some people.

by turner＠svn.reactos.com

Remove my changes to pagefile creation because they cause a hang for some people. Modified: trunk/reactos/subsys/smss/initpage.c _____ Modified: trunk/reactos/subsys/smss/initpage.c --- trunk/reactos/subsys/smss/initpage.c 2005-12-14 10:28:30 UTC (rev 20162) +++ trunk/reactos/subsys/smss/initpage.c 2005-12-14 12:41:38 UTC (rev 20163) @@ -28,163 +28,66 @@ #define NDEBUG #include <debug.h> -#define GIGABYTE (1024 * 1024 * 1024) /* One Gigabyte */ - static NTSTATUS STDCALL SmpPagingFilesQueryRoutine(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) { - UNICODE_STRING FileName; - LARGE_INTEGER InitialSize; - LARGE_INTEGER MaximumSize; - NTSTATUS Status = STATUS_SUCCESS; - LPWSTR p; - WCHAR RootDriveLetter[5]; + UNICODE_STRING FileName; + LARGE_INTEGER InitialSize; + LARGE_INTEGER MaximumSize; + NTSTATUS Status; + LPWSTR p; + DPRINT("ValueName '%S' Type %lu Length %lu\n", ValueName, ValueType, ValueLength); + DPRINT("ValueData '%S'\n", (PWSTR)ValueData); - DPRINT("ValueName '%S' Type %lu Length %lu\n", ValueName, ValueType, ValueLength); - DPRINT("ValueData '%S'\n", (PWSTR)ValueData); + if (ValueType != REG_SZ) + { + return(STATUS_SUCCESS); + } - if (ValueType != REG_SZ) - { - return STATUS_INVALID_PARAMETER_2; - } - - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)ValueData, - &FileName, - NULL, - NULL)) - { - return STATUS_OBJECT_PATH_NOT_FOUND; - } - /* + /* * Format: "<path>[ <initial_size>[ <maximum_size>]]" */ - if ((p = wcschr(ValueData, ' ')) != NULL) - { + if ((p = wcschr(ValueData, ' ')) != NULL) + { *p = L'\0'; InitialSize.QuadPart = wcstoul(p + 1, &p, 0) * 256 * 4096; if (*p == ' ') - { - MaximumSize.QuadPart = wcstoul(p + 1, NULL, 0) * 256 * 4096; - } + { + MaximumSize.QuadPart = wcstoul(p + 1, NULL, 0) * 256 * 4096; + } else - MaximumSize = InitialSize; - } + MaximumSize = InitialSize; + } + else + { + InitialSize.QuadPart = 50 * 4096; + MaximumSize.QuadPart = 80 * 4096; + } - /* If there is only a file name or if initial and max are both 0 - the system will pick the sizes. 10% and 20% for initial and max - respectivly. There is a max of 1 gig before it doesnt make it - bigger. */ - if((InitialSize.QuadPart == 0 && MaximumSize.QuadPart == 0) || p == NULL) - { - FILE_FS_SIZE_INFORMATION FileFsSize; - IO_STATUS_BLOCK IoStatusBlock; - HANDLE hFile; - UNICODE_STRING NtPathU; - LARGE_INTEGER FreeBytes; - OBJECT_ATTRIBUTES ObjectAttributes; + if (!RtlDosPathNameToNtPathName_U ((LPWSTR)ValueData, + &FileName, + NULL, + NULL)) + { + return (STATUS_SUCCESS); + } - DPRINT("System managed pagefile...\n"); - /* Make sure the path that is given for the file actually has the drive in it. - At this point if there is not file name, no sizes will be set therefore no page - file will be created */ - if (wcslen(((PWSTR)ValueData)) > 2 && - ((PWSTR)ValueData)[1] == L':' && - ((PWSTR)ValueData)[2] == L'\\') - { - /* copy the drive letter, the colon and the slash, - tack a null on the end */ - p = ((PWSTR)ValueData); - wcsncpy(RootDriveLetter,p,3); - wcscat(RootDriveLetter,L"\0"); - DPRINT("At least X:\\...%S\n",RootDriveLetter); + DPRINT("SMSS: Created paging file %wZ with size %dKB\n", + &FileName, InitialSize.QuadPart / 1024); + Status = NtCreatePagingFile(&FileName, + &InitialSize, + &MaximumSize, + 0); - if (!RtlDosPathNameToNtPathName_U((LPWSTR)RootDriveLetter, - &NtPathU, - NULL, - NULL)) - { - DPRINT("Invalid path\n"); - return STATUS_OBJECT_PATH_NOT_FOUND; - } + RtlFreeUnicodeString(&FileName); - InitializeObjectAttributes(&ObjectAttributes, - &NtPathU, - FILE_READ_ATTRIBUTES, - NULL, - NULL); - - /* Get a handle to the root to find the free space on the drive */ - Status = NtCreateFile (&hFile, - FILE_GENERIC_READ, - &ObjectAttributes, - &IoStatusBlock, - NULL, - 0, - FILE_SHARE_READ, - FILE_OPEN, - 0, - NULL, - 0); - - RtlFreeUnicodeString(&NtPathU); - - if (!NT_SUCCESS(Status)) - { - DPRINT ("Invalid handle\n"); - return Status; - } - - Status = NtQueryVolumeInformationFile(hFile, - &IoStatusBlock, - &FileFsSize, - sizeof(FILE_FS_SIZE_INFORMATION), - FileFsSizeInformation); - - FreeBytes.QuadPart = FileFsSize.BytesPerSector * - FileFsSize.SectorsPerAllocationUnit * - FileFsSize.AvailableAllocationUnits.QuadPart; - - DPRINT ("Free:%d\n",FreeBytes.QuadPart); - - /* Set by percentage */ - InitialSize.QuadPart = FreeBytes.QuadPart / 10; - MaximumSize.QuadPart = FreeBytes.QuadPart / 5; - - /* The page file is more then a gig, size it down */ - if (InitialSize.QuadPart > GIGABYTE) - { - InitialSize.QuadPart = GIGABYTE; - MaximumSize.QuadPart = GIGABYTE; - } - - ZwClose(hFile); - } - else - { - /* No page file will be created, - but we return succes because that - is what the setting wants */ - return (STATUS_SUCCESS); - } - } - - DPRINT("SMSS: Created paging file %wZ with size %dKB\n", - &FileName, InitialSize.QuadPart / 1024); - - Status = NtCreatePagingFile(&FileName, - &InitialSize, - &MaximumSize, - 0); - - RtlFreeUnicodeString(&FileName); - - return Status; + return(STATUS_SUCCESS); }

18 years, 9 months

[gedmurphy] 20162: merge Art's tcpip changes to the branch

by gedmurphy＠svn.reactos.com

merge Art's tcpip changes to the branch Added: branches/ros-branch-0_2_9/reactos/drivers/lib/chew/ Added: branches/ros-branch-0_2_9/reactos/drivers/lib/chew/chew.xml Added: branches/ros-branch-0_2_9/reactos/drivers/lib/chew/workqueue.c Modified: branches/ros-branch-0_2_9/reactos/drivers/lib/directory.xml Modified: branches/ros-branch-0_2_9/reactos/drivers/lib/ip/transport/tcp/tcp.c Modified: branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/datalink/lan.c Modified: branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/include/precomp.h Modified: branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/include/tcp.h Modified: branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/tcpip/dispatch.c Modified: branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/tcpip/main.c Modified: branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/tcpip.xml Added: branches/ros-branch-0_2_9/reactos/include/chew/ Added: branches/ros-branch-0_2_9/reactos/include/chew/chew.h _____ Added: branches/ros-branch-0_2_9/reactos/drivers/lib/chew/chew.xml --- branches/ros-branch-0_2_9/reactos/drivers/lib/chew/chew.xml 2005-12-14 09:26:52 UTC (rev 20161) +++ branches/ros-branch-0_2_9/reactos/drivers/lib/chew/chew.xml 2005-12-14 10:28:30 UTC (rev 20162) @@ -0,0 +1,7 @@ +<module name="chew" type="staticlibrary"> + <define name="__USE_W32API" /> + <define name="_NTOSKRNL_" /> + <include base="chew">include</include> + <include base="reactos">w32api/include/ddk</include> + <file>workqueue.c</file> +</module> \ No newline at end of file _____ Added: branches/ros-branch-0_2_9/reactos/drivers/lib/chew/workqueue.c --- branches/ros-branch-0_2_9/reactos/drivers/lib/chew/workqueue.c 2005-12-14 09:26:52 UTC (rev 20161) +++ branches/ros-branch-0_2_9/reactos/drivers/lib/chew/workqueue.c 2005-12-14 10:28:30 UTC (rev 20162) @@ -0,0 +1,106 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/lib/chew/workqueue.c + * PURPOSE: Common Highlevel Executive Worker + * + * PROGRAMMERS: arty (ayerkes(a)speakeasy.net) + */ +#include <ntddk.h> +#include <chew/chew.h> + +#define NDEBUG + +#define FOURCC(w,x,y,z) (((w) << 24) | ((x) << 16) | ((y) << 8) | (z)) + +PDEVICE_OBJECT WorkQueueDevice; +LIST_ENTRY WorkQueue; +KSPIN_LOCK WorkQueueLock; + +typedef struct _WORK_ITEM { + LIST_ENTRY Entry; + PIO_WORKITEM WorkItem; + VOID (*Worker)( PVOID Data ); + CHAR UserSpace[1]; +} WORK_ITEM, *PWORK_ITEM; + +VOID ChewInit( PDEVICE_OBJECT DeviceObject ) { + WorkQueueDevice = DeviceObject; + InitializeListHead( &WorkQueue ); + KeInitializeSpinLock( &WorkQueueLock ); +} + +VOID ChewShutdown() { + KIRQL OldIrql; + PLIST_ENTRY Entry; + PWORK_ITEM WorkItem; + + KeAcquireSpinLock( &WorkQueueLock, &OldIrql ); + + while( !IsListEmpty( &WorkQueue ) ) { + Entry = RemoveHeadList( &WorkQueue ); + WorkItem = CONTAINING_RECORD( Entry, WORK_ITEM, Entry ); + IoFreeWorkItem( WorkItem->WorkItem ); + ExFreePool( WorkItem ); + } + + KeReleaseSpinLock( &WorkQueueLock, OldIrql ); +} + +VOID STDCALL ChewWorkItem( PDEVICE_OBJECT DeviceObject, PVOID ChewItem ) { + PWORK_ITEM WorkItem = ChewItem; + + RemoveEntryList( &WorkItem->Entry ); + + if( WorkItem->Worker ) + WorkItem->Worker( WorkItem->UserSpace ); + + IoFreeWorkItem( WorkItem->WorkItem ); + ExFreePool( WorkItem ); +} + +BOOLEAN ChewCreate +( PVOID *ItemPtr, UINT Bytes, VOID (*Worker)( PVOID ), PVOID UserSpace ) { + PWORK_ITEM Item; + + if( KeGetCurrentIrql() == PASSIVE_LEVEL ) { + if( ItemPtr ) + *ItemPtr = NULL; + Worker(UserSpace); + return TRUE; + } else { + Item = ExAllocatePoolWithTag + ( NonPagedPool, + sizeof( WORK_ITEM ) + Bytes - 1, + FOURCC('C','H','E','W') ); + + if( Item ) { + Item->WorkItem = IoAllocateWorkItem( WorkQueueDevice ); + if( !Item->WorkItem ) { + ExFreePool( Item ); + return FALSE; + } + Item->Worker = Worker; + if( Bytes && UserSpace ) + RtlCopyMemory( Item->UserSpace, UserSpace, Bytes ); + + ExInterlockedInsertTailList + ( &WorkQueue, &Item->Entry, &WorkQueueLock ); + IoQueueWorkItem + ( Item->WorkItem, ChewWorkItem, CriticalWorkQueue, Item ); + + if( ItemPtr ) + *ItemPtr = Item; + + return TRUE; + } else { + return FALSE; + } + } +} + +VOID ChewRemove( PVOID Item ) { + PWORK_ITEM WorkItem = Item; + IoFreeWorkItem( WorkItem->WorkItem ); + ExFreePool( WorkItem ); +} _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/lib/directory.xml --- branches/ros-branch-0_2_9/reactos/drivers/lib/directory.xml 2005-12-14 09:26:52 UTC (rev 20161) +++ branches/ros-branch-0_2_9/reactos/drivers/lib/directory.xml 2005-12-14 10:28:30 UTC (rev 20162) @@ -10,3 +10,6 @@ <directory name="oskittcp"> <xi:include href="oskittcp/oskittcp.xml" /> </directory> +<directory name="chew"> + <xi:include href="chew/chew.xml" /> +</directory> \ No newline at end of file _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/lib/ip/transport/tcp/tcp.c --- branches/ros-branch-0_2_9/reactos/drivers/lib/ip/transport/tcp/tcp.c 2005-12-14 09:26:52 UTC (rev 20161) +++ branches/ros-branch-0_2_9/reactos/drivers/lib/ip/transport/tcp/tcp.c 2005-12-14 10:28:30 UTC (rev 20162) @@ -647,4 +647,34 @@ return STATUS_SUCCESS; } +VOID TCPRemoveIRP( PCONNECTION_ENDPOINT Endpoint, PIRP Irp ) { + PLIST_ENTRY Entry; + PLIST_ENTRY ListHead[4]; + KIRQL OldIrql; + PTDI_BUCKET Bucket; + UINT i = 0; + + ListHead[0] = &Endpoint->ReceiveRequest; + ListHead[1] = &Endpoint->ConnectRequest; + ListHead[2] = &Endpoint->ListenRequest; + ListHead[3] = 0; + + TcpipAcquireSpinLock( &Endpoint->Lock, &OldIrql ); + + for( i = 0; ListHead[i]; i++ ) { + for( Entry = ListHead[i]->Flink; + Entry != ListHead[i]; + Entry = Entry->Flink ) { + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + + if( Bucket->Request.RequestContext == Irp ) { + RemoveEntryList( &Bucket->Entry ); + break; + } + } + } + + TcpipReleaseSpinLock( &Endpoint->Lock, OldIrql ); +} + /* EOF */ _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/datalink/lan.c --- branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/datalink/lan.c 2005-12-14 09:26:52 UTC (rev 20161) +++ branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/datalink/lan.c 2005-12-14 10:28:30 UTC (rev 20162) @@ -51,11 +51,6 @@ LIST_ENTRY AdapterListHead; KSPIN_LOCK AdapterListLock; -/* Work around being called back into afd at Dpc level */ -KSPIN_LOCK LanWorkLock; -LIST_ENTRY LanWorkList; -WORK_QUEUE_ITEM LanWorkItem; - /* Double complete protection */ KSPIN_LOCK LanSendCompleteLock; LIST_ENTRY LanSendCompleteList; @@ -289,10 +284,9 @@ } } -VOID STDCALL LanReceiveWorker( PVOID Context ) { +VOID LanReceiveWorker( PVOID Context ) { UINT PacketType; - PLIST_ENTRY ListEntry; - PLAN_WQ_ITEM WorkItem; + PLAN_WQ_ITEM WorkItem = (PLAN_WQ_ITEM)Context; PNDIS_PACKET Packet; PLAN_ADAPTER Adapter; UINT BytesTransferred; @@ -301,60 +295,49 @@ TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); - while( (ListEntry = - ExInterlockedRemoveHeadList( &LanWorkList, &LanWorkLock )) ) { - WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); - - TI_DbgPrint(DEBUG_DATALINK, ("WorkItem: %x\n", WorkItem)); - - Packet = WorkItem->Packet; - Adapter = WorkItem->Adapter; - BytesTransferred = WorkItem->BytesTransferred; - - ExFreePool( WorkItem ); - - IPPacket.NdisPacket = Packet; - - NdisGetFirstBufferFromPacket(Packet, - &NdisBuffer, - &IPPacket.Header, - &IPPacket.ContigSize, - &IPPacket.TotalSize); - - IPPacket.ContigSize = IPPacket.TotalSize = BytesTransferred; - /* Determine which upper layer protocol that should receive - this packet and pass it to the correct receive handler */ - - TI_DbgPrint(MID_TRACE, - ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n", - IPPacket.ContigSize, IPPacket.TotalSize, - BytesTransferred)); - - PacketType = PC(IPPacket.NdisPacket)->PacketType; - IPPacket.Position = 0; - - TI_DbgPrint - (DEBUG_DATALINK, - ("Ether Type = %x ContigSize = %d Total = %d\n", - PacketType, IPPacket.ContigSize, IPPacket.TotalSize)); - - switch (PacketType) { - case ETYPE_IPv4: - case ETYPE_IPv6: - TI_DbgPrint(MID_TRACE,("Received IP Packet\n")); - IPReceive(Adapter->Context, &IPPacket); - break; - case ETYPE_ARP: - TI_DbgPrint(MID_TRACE,("Received ARP Packet\n")); - ARPReceive(Adapter->Context, &IPPacket); - default: - break; - } - - FreeNdisPacket( Packet ); + Packet = WorkItem->Packet; + Adapter = WorkItem->Adapter; + BytesTransferred = WorkItem->BytesTransferred; + + IPPacket.NdisPacket = Packet; + + NdisGetFirstBufferFromPacket(Packet, + &NdisBuffer, + &IPPacket.Header, + &IPPacket.ContigSize, + &IPPacket.TotalSize); + + IPPacket.ContigSize = IPPacket.TotalSize = BytesTransferred; + /* Determine which upper layer protocol that should receive + this packet and pass it to the correct receive handler */ + + TI_DbgPrint(MID_TRACE, + ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n", + IPPacket.ContigSize, IPPacket.TotalSize, + BytesTransferred)); + + PacketType = PC(IPPacket.NdisPacket)->PacketType; + IPPacket.Position = 0; + + TI_DbgPrint + (DEBUG_DATALINK, + ("Ether Type = %x ContigSize = %d Total = %d\n", + PacketType, IPPacket.ContigSize, IPPacket.TotalSize)); + + switch (PacketType) { + case ETYPE_IPv4: + case ETYPE_IPv6: + TI_DbgPrint(MID_TRACE,("Received IP Packet\n")); + IPReceive(Adapter->Context, &IPPacket); + break; + case ETYPE_ARP: + TI_DbgPrint(MID_TRACE,("Received ARP Packet\n")); + ARPReceive(Adapter->Context, &IPPacket); + default: + break; } - TI_DbgPrint(DEBUG_DATALINK, ("Leaving\n")); - LanReceiveWorkerBusy = FALSE; + + FreeNdisPacket( Packet ); } VOID LanSubmitReceiveWork( @@ -362,34 +345,19 @@ PNDIS_PACKET Packet, NDIS_STATUS Status, UINT BytesTransferred) { - PLAN_WQ_ITEM WQItem; + LAN_WQ_ITEM WQItem; PLAN_ADAPTER Adapter = (PLAN_ADAPTER)BindingContext; - KIRQL OldIrql; + PVOID LanWorkItem; TI_DbgPrint(DEBUG_DATALINK,("called\n")); - TcpipAcquireSpinLock( &LanWorkLock, &OldIrql ); + WQItem.Packet = Packet; + WQItem.Adapter = Adapter; + WQItem.BytesTransferred = BytesTransferred; - WQItem = ExAllocatePool( NonPagedPool, sizeof(LAN_WQ_ITEM) ); - if( !WQItem ) { - TcpipReleaseSpinLock( &LanWorkLock, OldIrql ); - return; - } - - WQItem->Packet = Packet; - WQItem->Adapter = Adapter; - WQItem->BytesTransferred = BytesTransferred; - InsertTailList( &LanWorkList, &WQItem->ListEntry ); - if( !LanReceiveWorkerBusy ) { - LanReceiveWorkerBusy = TRUE; - ExQueueWorkItem( &LanWorkItem, CriticalWorkQueue ); - TI_DbgPrint(DEBUG_DATALINK, - ("Work item inserted %x %x\n", &LanWorkItem, WQItem)); - } else { - TI_DbgPrint(DEBUG_DATALINK, - ("LAN WORKER BUSY %x %x\n", &LanWorkItem, WQItem)); - } - TcpipReleaseSpinLock( &LanWorkLock, OldIrql ); + if( !ChewCreate + ( &LanWorkItem, sizeof(LAN_WQ_ITEM), LanReceiveWorker, &WQItem ) ) + ASSERT(0); } VOID STDCALL ProtocolTransferDataComplete( @@ -452,7 +420,6 @@ PNDIS_PACKET NdisPacket; PLAN_ADAPTER Adapter = (PLAN_ADAPTER)BindingContext; PETH_HEADER EHeader = (PETH_HEADER)HeaderBuffer; - KIRQL OldIrql; TI_DbgPrint(DEBUG_DATALINK, ("Called. (packetsize %d)\n",PacketSize)); @@ -490,12 +457,9 @@ TI_DbgPrint(DEBUG_DATALINK, ("Adapter: %x (MTU %d)\n", Adapter, Adapter->MTU)); - TcpipAcquireSpinLock( &LanWorkLock, &OldIrql ); - NdisStatus = AllocatePacketWithBuffer( &NdisPacket, NULL, PacketSize + HeaderBufferSize ); if( NdisStatus != NDIS_STATUS_SUCCESS ) { - TcpipReleaseSpinLock( &LanWorkLock, OldIrql ); return NDIS_STATUS_NOT_ACCEPTED; } @@ -534,7 +498,6 @@ BytesTransferred = 0; } } - TcpipReleaseSpinLock( &LanWorkLock, OldIrql ); TI_DbgPrint(DEBUG_DATALINK, ("Calling complete\n")); if (NdisStatus != NDIS_STATUS_PENDING) @@ -1369,10 +1332,8 @@ } VOID LANStartup() { - InitializeListHead( &LanWorkList ); InitializeListHead( &LanSendCompleteList ); KeInitializeSpinLock( &LanSendCompleteLock ); - ExInitializeWorkItem( &LanWorkItem, LanReceiveWorker, NULL ); } VOID LANShutdown() { @@ -1380,15 +1341,6 @@ PLAN_WQ_ITEM WorkItem; PLIST_ENTRY ListEntry; - TcpipAcquireSpinLock( &LanWorkLock, &OldIrql ); - while( !IsListEmpty( &LanWorkList ) ) { - ListEntry = RemoveHeadList( &LanWorkList ); - WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); - FreeNdisPacket( WorkItem->Packet ); - ExFreePool( WorkItem ); - } - TcpipReleaseSpinLock( &LanWorkLock, OldIrql ); - KeAcquireSpinLock( &LanSendCompleteLock, &OldIrql ); while( !IsListEmpty( &LanSendCompleteList ) ) { ListEntry = RemoveHeadList( &LanSendCompleteList ); _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/include/precomp.h --- branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/include/precomp.h 2005-12-14 09:26:52 UTC (rev 20161) +++ branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/include/precomp.h 2005-12-14 10:28:30 UTC (rev 20162) @@ -36,4 +36,4 @@ #include <ports.h> #include <ipifcons.h> #include <ndk/ntndk.h> - +#include <chew/chew.h> _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/include/tcp.h --- branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/include/tcp.h 2005-12-14 09:26:52 UTC (rev 20161) +++ branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/include/tcp.h 2005-12-14 10:28:30 UTC (rev 20162) @@ -176,4 +176,6 @@ NTSTATUS TCPShutdown( VOID); +VOID TCPRemoveIRP( PCONNECTION_ENDPOINT Connection, PIRP Irp ); + #endif /* __TCP_H */ _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/tcpip/dispatch.c --- branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-12-14 09:26:52 UTC (rev 20161) +++ branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-12-14 10:28:30 UTC (rev 20162) @@ -135,7 +135,31 @@ TI_DbgPrint(DEBUG_IRP, ("Done Completing IRP\n")); } +typedef struct _DISCONNECT_TYPE { + UINT Type; + PVOID Context; + PIRP Irp; + PFILE_OBJECT FileObject; +} DISCONNECT_TYPE, *PDISCONNECT_TYPE; +VOID DispDoDisconnect( PVOID Data ) { + PDISCONNECT_TYPE DisType = (PDISCONNECT_TYPE)Data; + + TI_DbgPrint(DEBUG_IRP, ("PostCancel: DoDisconnect\n")); + TCPDisconnect + ( DisType->Context, + DisType->Type, + NULL, + NULL, + DispDataRequestComplete, + DisType->Irp ); + TI_DbgPrint(DEBUG_IRP, ("PostCancel: DoDisconnect done\n")); + + DispDataRequestComplete(DisType->Irp, STATUS_CANCELLED, 0); + + DispCancelComplete(DisType->FileObject); +} + VOID DDKAPI DispCancelRequest( PDEVICE_OBJECT Device, PIRP Irp) @@ -150,6 +174,8 @@ PTRANSPORT_CONTEXT TranContext; PFILE_OBJECT FileObject; UCHAR MinorFunction; + DISCONNECT_TYPE DisType; + PVOID WorkItem; /*NTSTATUS Status = STATUS_SUCCESS;*/ TI_DbgPrint(DEBUG_IRP, ("Called.\n")); @@ -161,6 +187,8 @@ TI_DbgPrint(DEBUG_IRP, ("IRP at (0x%X) MinorFunction (0x%X) IrpSp (0x%X).\n", Irp, MinorFunction, IrpSp)); + Irp->IoStatus.Status = STATUS_PENDING; + #ifdef DBG if (!Irp->Cancel) TI_DbgPrint(MIN_TRACE, ("Irp->Cancel is FALSE, should be TRUE.\n")); @@ -169,26 +197,22 @@ /* Try canceling the request */ switch(MinorFunction) { case TDI_SEND: - TCPDisconnect - ( TranContext->Handle.ConnectionContext, - TDI_DISCONNECT_RELEASE, - NULL, - NULL, - DispDataRequestComplete, - Irp ); - break; + case TDI_RECEIVE: + DisType.Type = TDI_DISCONNECT_RELEASE | + ((MinorFunction == TDI_RECEIVE) ? TDI_DISCONNECT_ABORT : 0); + DisType.Context = TranContext->Handle.ConnectionContext; + DisType.Irp = Irp; + DisType.FileObject = FileObject; + + TCPRemoveIRP( TranContext->Handle.ConnectionContext, Irp ); - case TDI_RECEIVE: - TCPDisconnect - ( TranContext->Handle.ConnectionContext, - TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE, - NULL, - NULL, - DispDataRequestComplete, - Irp ); + if( !ChewCreate( &WorkItem, sizeof(DISCONNECT_TYPE), + DispDoDisconnect, &DisType ) ) + ASSERT(0); break; case TDI_SEND_DATAGRAM: + Irp->IoStatus.Status = STATUS_CANCELLED; if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { TI_DbgPrint(MIN_TRACE, ("TDI_SEND_DATAGRAM, but no address file.\n")); break; @@ -198,6 +222,7 @@ break; case TDI_RECEIVE_DATAGRAM: + Irp->IoStatus.Status = STATUS_CANCELLED; if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { TI_DbgPrint(MIN_TRACE, ("TDI_RECEIVE_DATAGRAM, but no address file.\n")); break; @@ -211,10 +236,11 @@ break; } + if( Irp->IoStatus.Status == STATUS_PENDING ) + IoMarkIrpPending(Irp); + IoReleaseCancelSpinLock(Irp->CancelIrql); - DispCancelComplete(FileObject); - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/tcpip/main.c --- branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/tcpip/main.c 2005-12-14 09:26:52 UTC (rev 20161) +++ branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/tcpip/main.c 2005-12-14 10:28:30 UTC (rev 20162) @@ -619,6 +619,8 @@ } TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); #endif + ChewShutdown(); + /* Cancel timer */ KeCancelTimer(&IPTimer); @@ -734,6 +736,8 @@ return Status; } + ChewInit( IPDeviceObject ); + /* Create RawIP device object */ Status = IoCreateDevice(DriverObject, 0, &strRawDeviceName, FILE_DEVICE_NETWORK, 0, FALSE, &RawIPDeviceObject); _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/tcpip.xml --- branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/tcpip.xml 2005-12-14 09:26:52 UTC (rev 20161) +++ branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/tcpip.xml 2005-12-14 10:28:30 UTC (rev 20162) @@ -9,6 +9,7 @@ <library>oskittcp</library> <library>ndis</library> <library>pseh</library> + <library>chew</library> <library>ntoskrnl</library> <library>hal</library> <directory name="include"> _____ Added: branches/ros-branch-0_2_9/reactos/include/chew/chew.h --- branches/ros-branch-0_2_9/reactos/include/chew/chew.h 2005-12-14 09:26:52 UTC (rev 20161) +++ branches/ros-branch-0_2_9/reactos/include/chew/chew.h 2005-12-14 10:28:30 UTC (rev 20162) @@ -0,0 +1,40 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: include/chew/chew.h + * PURPOSE: Common Highlevel Executive Worker + * + * PROGRAMMERS: arty (ayerkes(a)speakeasy.net) + */ + +#ifndef _REACTOS_CHEW_H +#define _REACTOS_CHEW_H + +/** + * Initialize CHEW, given a device object (since IoAllocateWorkItem relies on + * it). + */ +VOID ChewInit( PDEVICE_OBJECT DeviceObject ); +/** + * Shutdown CHEW, including removing remaining work items. + */ +VOID ChewShutdown(); +/** + * Create a work item, or perform the work, based on IRQL. + * At passive level, Worker is called directly on UserSpace. + * At greater than passive level, a work item is created with Bytes + * context area and data copied from UserSpace. + * If a work item is created, Item contains the address and the function + * returns true. + * If the work is performed immediately, Item contains NULL and the + * function returns true. + * Else, the function returns false and Item is undefined. + */ +BOOLEAN ChewCreate +( PVOID *Item, UINT Bytes, VOID (*Worker)(PVOID), PVOID UserSpace ); +/** + * Remove a work item, given the pointer returned to Item in ChewCreate. + */ +VOID ChewRemove( PVOID Item ); + +#endif/*_REACTOS_CHEW_H*/

18 years, 9 months

[greatlrd] 20161: update translation hu from talley

by greatlrd＠svn.reactos.com

update translation hu from talley Modified: trunk/reactos/lib/syssetup/syssetup_Hu.rc _____ Modified: trunk/reactos/lib/syssetup/syssetup_Hu.rc --- trunk/reactos/lib/syssetup/syssetup_Hu.rc 2005-12-14 09:23:58 UTC (rev 20160) +++ trunk/reactos/lib/syssetup/syssetup_Hu.rc 2005-12-14 09:26:52 UTC (rev 20161) @@ -196,6 +196,7 @@ BEGIN IDS_CMT_WINEFILE "Winefile indÝtßsa" IDS_CMT_IBROWSER "iBrowser indÝtßsa" + IDS_CMT_GETFIREFOX "Firefox let÷ltÚse/telepÝtÚse" END STRINGTABLE

18 years, 9 months

[greatlrd] 20160: update translation hu from talley

by greatlrd＠svn.reactos.com

update translation hu from talley Added: trunk/reactos/apps/utils/getfirefox/Hu.rc Modified: trunk/reactos/apps/utils/getfirefox/getfirefox.rc _____ Added: trunk/reactos/apps/utils/getfirefox/Hu.rc --- trunk/reactos/apps/utils/getfirefox/Hu.rc 2005-12-14 08:33:43 UTC (rev 20159) +++ trunk/reactos/apps/utils/getfirefox/Hu.rc 2005-12-14 09:23:58 UTC (rev 20160) @@ -0,0 +1,45 @@ +/* + * PROJECT: ReactOS utilities + * LICENSE: GPL - See COPYING in the top level directory + * FILE: apps/utils/getfirefox/En.rc + * PURPOSE: English resources + * COPYRIGHT: Copyright 2004 Mike McCormack for CodeWeavers + * Copyright 2005 Ge van Geldorp (gvg(a)reactos.org) + * Copyright 2005 Robert Horvath (talley(a)cubeclub.hu) - Hungarian translation + */ +/* + * Based on Wine dlls/shdocvw/En.rc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL + +IDD_GETFIREFOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "A Firefox let÷ltÚse" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10, 200,12 + LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + CHECKBOX "A \"Szerezd meg a Firefoxot\" elvßtolÝtßsa a Start Men³b§l befejezÚs utßn", IDC_REMOVE, + 10, 44, 200, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "MÚgse", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +BEGIN + IDS_START_MENU_NAME "Szerezd meg Firefoxot" +END _____ Modified: trunk/reactos/apps/utils/getfirefox/getfirefox.rc --- trunk/reactos/apps/utils/getfirefox/getfirefox.rc 2005-12-14 08:33:43 UTC (rev 20159) +++ trunk/reactos/apps/utils/getfirefox/getfirefox.rc 2005-12-14 09:23:58 UTC (rev 20160) @@ -24,3 +24,4 @@ #include "En.rc" #include "De.rc" +#include "Hu.rc" \ No newline at end of file

18 years, 9 months

[hpoussin] 20159: Move static keyword to the right place

by hpoussin＠svn.reactos.com

Move static keyword to the right place Modified: trunk/reactos/lib/setupapi/queue.c _____ Modified: trunk/reactos/lib/setupapi/queue.c --- trunk/reactos/lib/setupapi/queue.c 2005-12-14 03:30:22 UTC (rev 20158) +++ trunk/reactos/lib/setupapi/queue.c 2005-12-14 08:33:43 UTC (rev 20159) @@ -933,7 +933,7 @@ return ret; } -BOOL static do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style) +static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style) { BOOL rc = FALSE; BOOL docopy = TRUE;

18 years, 9 months

[amunger] 20158: Include main .rc file in format.xml, so that strings will actually print.

by amunger＠svn.reactos.com

Include main .rc file in format.xml, so that strings will actually print. Disabled Ja.rc due to Unterminated Line Ending error, needs attention. This makes format.exe 100% more useful, but still does not format. Modified: trunk/reactos/subsys/system/format/format.rc Modified: trunk/reactos/subsys/system/format/format.xml _____ Modified: trunk/reactos/subsys/system/format/format.rc --- trunk/reactos/subsys/system/format/format.rc 2005-12-14 01:59:19 UTC (rev 20157) +++ trunk/reactos/subsys/system/format/format.rc 2005-12-14 03:30:22 UTC (rev 20158) @@ -7,6 +7,4 @@ #include "En.rc" #include "De.rc" -#include "Ja.rc" #include "Hu.rc" - _____ Modified: trunk/reactos/subsys/system/format/format.xml --- trunk/reactos/subsys/system/format/format.xml 2005-12-14 01:59:19 UTC (rev 20157) +++ trunk/reactos/subsys/system/format/format.xml 2005-12-14 03:30:22 UTC (rev 20158) @@ -4,5 +4,6 @@ <library>ntdll</library> <library>kernel32</library> <library>fmifs</library> + <file>format.rc</file> <file>format.c</file> </module>

18 years, 9 months

[turner] 20157: Implement system handling of page file creation sizes. Thanks to arty and insulanus for helping me along the way.

by turner＠svn.reactos.com

Implement system handling of page file creation sizes. Thanks to arty and insulanus for helping me along the way. Modified: trunk/reactos/subsys/smss/initpage.c _____ Modified: trunk/reactos/subsys/smss/initpage.c --- trunk/reactos/subsys/smss/initpage.c 2005-12-13 23:10:34 UTC (rev 20156) +++ trunk/reactos/subsys/smss/initpage.c 2005-12-14 01:59:19 UTC (rev 20157) @@ -28,66 +28,163 @@ #define NDEBUG #include <debug.h> +#define GIGABYTE (1024 * 1024 * 1024) /* One Gigabyte */ + static NTSTATUS STDCALL SmpPagingFilesQueryRoutine(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) { - UNICODE_STRING FileName; - LARGE_INTEGER InitialSize; - LARGE_INTEGER MaximumSize; - NTSTATUS Status; - LPWSTR p; + UNICODE_STRING FileName; + LARGE_INTEGER InitialSize; + LARGE_INTEGER MaximumSize; + NTSTATUS Status = STATUS_SUCCESS; + LPWSTR p; + WCHAR RootDriveLetter[5]; - DPRINT("ValueName '%S' Type %lu Length %lu\n", ValueName, ValueType, ValueLength); - DPRINT("ValueData '%S'\n", (PWSTR)ValueData); - if (ValueType != REG_SZ) - { - return(STATUS_SUCCESS); - } + DPRINT("ValueName '%S' Type %lu Length %lu\n", ValueName, ValueType, ValueLength); + DPRINT("ValueData '%S'\n", (PWSTR)ValueData); - /* + if (ValueType != REG_SZ) + { + return STATUS_INVALID_PARAMETER_2; + } + + if (!RtlDosPathNameToNtPathName_U ((LPWSTR)ValueData, + &FileName, + NULL, + NULL)) + { + return STATUS_OBJECT_PATH_NOT_FOUND; + } + /* * Format: "<path>[ <initial_size>[ <maximum_size>]]" */ - if ((p = wcschr(ValueData, ' ')) != NULL) - { + if ((p = wcschr(ValueData, ' ')) != NULL) + { *p = L'\0'; InitialSize.QuadPart = wcstoul(p + 1, &p, 0) * 256 * 4096; if (*p == ' ') - { - MaximumSize.QuadPart = wcstoul(p + 1, NULL, 0) * 256 * 4096; - } + { + MaximumSize.QuadPart = wcstoul(p + 1, NULL, 0) * 256 * 4096; + } else - MaximumSize = InitialSize; - } - else - { - InitialSize.QuadPart = 50 * 4096; - MaximumSize.QuadPart = 80 * 4096; - } + MaximumSize = InitialSize; + } - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)ValueData, - &FileName, - NULL, - NULL)) - { - return (STATUS_SUCCESS); - } + /* If there is only a file name or if initial and max are both 0 + the system will pick the sizes. 10% and 20% for initial and max + respectivly. There is a max of 1 gig before it doesnt make it + bigger. */ + if((InitialSize.QuadPart == 0 && MaximumSize.QuadPart == 0) || p == NULL) + { + FILE_FS_SIZE_INFORMATION FileFsSize; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE hFile; + UNICODE_STRING NtPathU; + LARGE_INTEGER FreeBytes; + OBJECT_ATTRIBUTES ObjectAttributes; - DPRINT("SMSS: Created paging file %wZ with size %dKB\n", - &FileName, InitialSize.QuadPart / 1024); - Status = NtCreatePagingFile(&FileName, - &InitialSize, - &MaximumSize, - 0); + DPRINT("System managed pagefile...\n"); + /* Make sure the path that is given for the file actually has the drive in it. + At this point if there is not file name, no sizes will be set therefore no page + file will be created */ + if (wcslen(((PWSTR)ValueData)) > 2 && + ((PWSTR)ValueData)[1] == L':' && + ((PWSTR)ValueData)[2] == L'\\') + { + /* copy the drive letter, the colon and the slash, + tack a null on the end */ + p = ((PWSTR)ValueData); + wcsncpy(RootDriveLetter,p,3); + wcscat(RootDriveLetter,L"\0"); + DPRINT("At least X:\\...%S\n",RootDriveLetter); - RtlFreeUnicodeString(&FileName); + if (!RtlDosPathNameToNtPathName_U((LPWSTR)RootDriveLetter, + &NtPathU, + NULL, + NULL)) + { + DPRINT("Invalid path\n"); + return STATUS_OBJECT_PATH_NOT_FOUND; + } - return(STATUS_SUCCESS); + InitializeObjectAttributes(&ObjectAttributes, + &NtPathU, + FILE_READ_ATTRIBUTES, + NULL, + NULL); + + /* Get a handle to the root to find the free space on the drive */ + Status = NtCreateFile (&hFile, + FILE_GENERIC_READ, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + FILE_SHARE_READ, + FILE_OPEN, + 0, + NULL, + 0); + + RtlFreeUnicodeString(&NtPathU); + + if (!NT_SUCCESS(Status)) + { + DPRINT ("Invalid handle\n"); + return Status; + } + + Status = NtQueryVolumeInformationFile(hFile, + &IoStatusBlock, + &FileFsSize, + sizeof(FILE_FS_SIZE_INFORMATION), + FileFsSizeInformation); + + FreeBytes.QuadPart = FileFsSize.BytesPerSector * + FileFsSize.SectorsPerAllocationUnit * + FileFsSize.AvailableAllocationUnits.QuadPart; + + DPRINT ("Free:%d\n",FreeBytes.QuadPart); + + /* Set by percentage */ + InitialSize.QuadPart = FreeBytes.QuadPart / 10; + MaximumSize.QuadPart = FreeBytes.QuadPart / 5; + + /* The page file is more then a gig, size it down */ + if (InitialSize.QuadPart > GIGABYTE) + { + InitialSize.QuadPart = GIGABYTE; + MaximumSize.QuadPart = GIGABYTE; + } + + ZwClose(hFile); + } + else + { + /* No page file will be created, + but we return succes because that + is what the setting wants */ + return (STATUS_SUCCESS); + } + } + + DPRINT("SMSS: Created paging file %wZ with size %dKB\n", + &FileName, InitialSize.QuadPart / 1024); + + Status = NtCreatePagingFile(&FileName, + &InitialSize, + &MaximumSize, + 0); + + RtlFreeUnicodeString(&FileName); + + return Status; }

18 years, 9 months

← Newer
1
...
31
32
33
34
35
36
37
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005