Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jmorlan] 35248: - Fix the way the start command parses its arguments. Previously, the arguments were split up using split() and then the parts intended for the program were recombined, but this is wrong because it cannot preserve quotes. Changed cmd_start to do tokenization itself instead. - Implement "title", /Ddirectory, /MIN, /MAX, and /WAIT options. - Remove 'first' variable which only ever contained the name of "start" itself - all the places where it was used appear to be mistakes; replac
by jmorlan＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: jmorlan Date: Sat Aug 9 16:51:34 2008 New Revision: 35248 URL: http://svn.reactos.org/svn/reactos?rev=35248&view=rev Log: - Fix the way the start command parses its arguments. Previously, the arguments were split up using split() and then the parts intended for the program were recombined, but this is wrong because it cannot preserve quotes. Changed cmd_start to do tokenization itself instead. - Implement "title", /Ddirectory, /MIN, /MAX, and /WAIT options. - Remove 'first' variable which only ever contained the name of "start" itself - all the places where it was used appear to be mistakes; replaced with 'rest'. - Fix crash that happened when attempting to start a file with no extension. Modified: trunk/reactos/base/shell/cmd/start.c Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/start.c [iso-8859-1] Sat Aug 9 16:51:34 2008 @@ -15,13 +15,42 @@ #ifdef INCLUDE_CMD_START +/* Find the end of an option, and turn it into a nul-terminated string + * in place. (It's moved back one character, to make room for the nul) */ +static TCHAR *GetParameter(TCHAR **pPointer) +{ + BOOL bInQuote = FALSE; + TCHAR *start = *pPointer; + TCHAR *p; + for (p = start; *p; p++) + { + if (!bInQuote && (*p == _T('/') || _istspace(*p))) + break; + bInQuote ^= (*p == _T('"')); + p[-1] = *p; + } + p[-1] = _T('\0'); + *pPointer = p; + return start - 1; +} + +static void StripQuotes(TCHAR *in) +{ + TCHAR *out = in; + for (; *in; in++) + { + if (*in != _T('"')) + *out++ = *in; + } + *out = _T('\0'); +} INT cmd_start (LPTSTR First, LPTSTR Rest) { TCHAR szFullName[CMDLINE_LENGTH]; - TCHAR first[CMDLINE_LENGTH]; TCHAR *rest = NULL; TCHAR *param = NULL; + TCHAR *dot; TCHAR RestWithoutArgs[CMDLINE_LENGTH]; INT size; LPTSTR comspec; @@ -31,62 +60,83 @@ TCHAR szFullCmdLine [CMDLINE_LENGTH]; PROCESS_INFORMATION prci; STARTUPINFO stui; - LPTSTR *arg; - INT argc = 0; INT i = 0; DWORD Priority = 0; - - RestWithoutArgs[0] = _T('\0'); - _tcscpy(first,First); - arg = split (Rest, &argc, FALSE); - - - for (i = 0; i < argc; i++) - { - if (!_tcsncmp (arg[i], _T("/?"), 2)) - { - freep(arg); - ConOutResPaging(TRUE,STRING_START_HELP1); - return 0; - } - else if(!_tcsicmp(arg[i], _T("/LOW"))) - { - Priority = IDLE_PRIORITY_CLASS; - } - else if(!_tcsicmp(arg[i], _T("/NORMAL"))) - { - Priority = NORMAL_PRIORITY_CLASS; - } - else if(!_tcsicmp(arg[i], _T("/HIGH"))) - { - Priority = HIGH_PRIORITY_CLASS; - } - else if(!_tcsicmp(arg[i], _T("/REALTIME"))) - { - Priority = REALTIME_PRIORITY_CLASS; - } - else if(!_tcsicmp(arg[i], _T("/ABOVENORMAL"))) - { - Priority = ABOVE_NORMAL_PRIORITY_CLASS; - } - else if(!_tcsicmp(arg[i], _T("/BELOWNORMAL"))) - { - Priority = BELOW_NORMAL_PRIORITY_CLASS; + LPTSTR lpTitle = NULL; + LPTSTR lpDirectory = NULL; + WORD wShowWindow = SW_SHOWNORMAL; + + while (1) + { + if (_istspace(*Rest)) + { + Rest++; + } + else if (*Rest == _T('"') && !lpTitle) + { + lpTitle = GetParameter(&Rest); + StripQuotes(lpTitle); + } + else if (*Rest == L'/') + { + LPTSTR option; + Rest++; + option = GetParameter(&Rest); + if (*option == _T('?')) + { + ConOutResPaging(TRUE,STRING_START_HELP1); + return 0; + } + else if (_totupper(*option) == _T('D')) + { + lpDirectory = option + 1; + StripQuotes(lpDirectory); + } + else if (!_tcsicmp(option, _T("MIN"))) + { + wShowWindow = SW_MINIMIZE; + } + else if (!_tcsicmp(option, _T("MAX"))) + { + wShowWindow = SW_MAXIMIZE; + } + else if (!_tcsicmp(option, _T("LOW"))) + { + Priority = IDLE_PRIORITY_CLASS; + } + else if (!_tcsicmp(option, _T("NORMAL"))) + { + Priority = NORMAL_PRIORITY_CLASS; + } + else if (!_tcsicmp(option, _T("HIGH"))) + { + Priority = HIGH_PRIORITY_CLASS; + } + else if (!_tcsicmp(option, _T("REALTIME"))) + { + Priority = REALTIME_PRIORITY_CLASS; + } + else if (!_tcsicmp(option, _T("ABOVENORMAL"))) + { + Priority = ABOVE_NORMAL_PRIORITY_CLASS; + } + else if (!_tcsicmp(option, _T("BELOWNORMAL"))) + { + Priority = BELOW_NORMAL_PRIORITY_CLASS; + } + else if (!_tcsicmp(option, _T("WAIT"))) + { + bWait = TRUE; + } } else { - if(RestWithoutArgs[0] != _T('\0')) - { - _tcscat(RestWithoutArgs,_T(" ")); - } - _tcscat(RestWithoutArgs,arg[i]); - } - } - - - - - freep (arg); + /* It's not an option - must be the beginning of + * the actual command. Leave the loop. */ + break; + } + } + _tcscpy(RestWithoutArgs, Rest); /* get comspec */ comspec = cmd_alloc ( MAX_PATH * sizeof(TCHAR)); @@ -197,15 +247,15 @@ /* check for a drive change */ - if (!_tcscmp (first + 1, _T(":")) && _istalpha (*first)) + if (!_tcscmp (rest + 1, _T(":")) && _istalpha (*rest)) { TCHAR szPath[CMDLINE_LENGTH]; _tcscpy (szPath, _T("A:")); - szPath[0] = _totupper (*first); + szPath[0] = _totupper (*rest); SetCurrentDirectory (szPath); GetCurrentDirectory (CMDLINE_LENGTH, szPath); - if (szPath[0] != (TCHAR)_totupper (*first)) + if (szPath[0] != (TCHAR)_totupper (*rest)) ConErrResPuts (STRING_FREE_ERROR1); if (rest != NULL) @@ -237,8 +287,8 @@ /* check if this is a .BAT or .CMD file */ - if (!_tcsicmp (_tcsrchr (szFullName, _T('.')), _T(".bat")) || - !_tcsicmp (_tcsrchr (szFullName, _T('.')), _T(".cmd"))) + dot = _tcsrchr (szFullName, _T('.')); + if (dot && (!_tcsicmp (dot, _T(".bat")) || !_tcsicmp (dot, _T(".cmd")))) { bBat = TRUE; memset(szFullCmdLine,0,CMDLINE_LENGTH * sizeof(TCHAR)); @@ -260,7 +310,7 @@ /* build command line for CreateProcess() */ if (bBat == FALSE) { - _tcscpy (szFullCmdLine, first); + _tcscpy (szFullCmdLine, rest); if( param != NULL ) { @@ -273,17 +323,18 @@ memset (&stui, 0, sizeof (STARTUPINFO)); stui.cb = sizeof (STARTUPINFO); stui.dwFlags = STARTF_USESHOWWINDOW; - stui.wShowWindow = SW_SHOWDEFAULT; + stui.lpTitle = lpTitle; + stui.wShowWindow = wShowWindow; if (bBat == TRUE) { bCreate = CreateProcess (NULL, szFullCmdLine, NULL, NULL, FALSE, - CREATE_NEW_CONSOLE | Priority, NULL, NULL, &stui, &prci); + CREATE_NEW_CONSOLE | Priority, NULL, lpDirectory, &stui, &prci); } else { bCreate = CreateProcess (szFullName, szFullCmdLine, NULL, NULL, FALSE, - CREATE_NEW_CONSOLE | Priority, NULL, NULL, &stui, &prci); + CREATE_NEW_CONSOLE | Priority, NULL, lpDirectory, &stui, &prci); } if (bCreate)

1 0

[hpoussin] 35247: Fix prototype
by hpoussin＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: hpoussin Date: Sat Aug 9 15:14:29 2008 New Revision: 35247 URL: http://svn.reactos.org/svn/reactos?rev=35247&view=rev Log: Fix prototype Modified: trunk/reactos/ntoskrnl/ex/fastinterlck.c Modified: trunk/reactos/ntoskrnl/ex/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fastinterlck.c… ============================================================================== --- trunk/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] Sat Aug 9 15:14:29 2008 @@ -75,6 +75,7 @@ FASTCALL ExInterlockedPushEntrySList(IN PSLIST_HEADER ListHead, IN PSLIST_ENTRY ListEntry) + IN PKSPIN_LOCK Lock) { return InterlockedPushEntrySList(ListHead, ListEntry); }

1 0

[cgutman] 35246: - Fix another memory leak
by cgutman＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: cgutman Date: Sat Aug 9 14:03:37 2008 New Revision: 35246 URL: http://svn.reactos.org/svn/reactos?rev=35246&view=rev Log: - Fix another memory leak Modified: branches/aicom-network-fixes/drivers/network/afd/afd/select.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] Sat Aug 9 14:03:37 2008 @@ -85,6 +85,7 @@ PollReq->Handles[i].Status)); } UnlockHandles( AFD_HANDLES(PollReq), PollReq->HandleCount ); + if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); AFD_DbgPrint(MID_TRACE,("Completing\n")); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); AFD_DbgPrint(MID_TRACE,("Done\n"));

1 0

[cwittich] 35245: add help
by cwittich＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: cwittich Date: Sat Aug 9 13:40:43 2008 New Revision: 35245 URL: http://svn.reactos.org/svn/reactos?rev=35245&view=rev Log: add help Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] Sat Aug 9 13:40:43 2008 @@ -63,6 +63,9 @@ this.RunStatus = new System.Windows.Forms.ToolStripStatusLabel(); this.contextMenuTabStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); + this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.infoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); @@ -100,7 +103,8 @@ this.fileToolStripMenuItem, this.editToolStripMenuItem, this.debugToolStripMenuItem, - this.windowToolStripMenuItem}); + this.windowToolStripMenuItem, + this.toolStripMenuItem2}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Size = new System.Drawing.Size(529, 24); @@ -354,14 +358,36 @@ this.contextMenuTabStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.closeToolStripMenuItem}); this.contextMenuTabStrip.Name = "contextMenuTabStrip"; - this.contextMenuTabStrip.Size = new System.Drawing.Size(153, 48); + this.contextMenuTabStrip.Size = new System.Drawing.Size(104, 26); // // closeToolStripMenuItem // this.closeToolStripMenuItem.Name = "closeToolStripMenuItem"; - this.closeToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.closeToolStripMenuItem.Size = new System.Drawing.Size(103, 22); this.closeToolStripMenuItem.Text = "&Close"; this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.helpToolStripMenuItem, + this.infoToolStripMenuItem}); + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(24, 20); + this.toolStripMenuItem2.Text = "&?"; + // + // helpToolStripMenuItem + // + this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; + this.helpToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.helpToolStripMenuItem.Text = "&Help"; + this.helpToolStripMenuItem.Click += new System.EventHandler(this.helpToolStripMenuItem_Click); + // + // infoToolStripMenuItem + // + this.infoToolStripMenuItem.Name = "infoToolStripMenuItem"; + this.infoToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.infoToolStripMenuItem.Text = "&About"; // // MainWindow // @@ -425,6 +451,9 @@ private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; private System.Windows.Forms.ContextMenuStrip contextMenuTabStrip; private System.Windows.Forms.ToolStripMenuItem closeToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; + private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem infoToolStripMenuItem; } } Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Sat Aug 9 13:40:43 2008 @@ -273,7 +273,10 @@ OpenFileDialog fileDialog = new OpenFileDialog(); fileDialog.Filter = "Sourcefiles (*.c;*.cpp)|*.c;*.cpp"; if (fileDialog.ShowDialog() == DialogResult.OK) - OpenSourceFile(fileDialog.FileName); + { + OpenSourceFile(fileDialog.FileName); + WorkTabs.SelectTab(WorkTabs.TabCount - 1); + } } private void WorkTabs_MouseClick(object sender, MouseEventArgs e) @@ -311,6 +314,13 @@ SelectTabFromPosition(mMousePosition); closeCurrentTabToolStripMenuItem_Click(this, null); } + + private void helpToolStripMenuItem_Click(object sender, EventArgs e) + { + ReactOSWeb Help = new ReactOSWeb("Help", "http://www.reactos.org/wiki/index.php/Debugging"); + AddTab(Help); + WorkTabs.SelectTab(WorkTabs.TabCount - 1); + } } Modified: trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ReactOSWeb… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs [iso-8859-1] Sat Aug 9 13:40:43 2008 @@ -16,13 +16,20 @@ { InitializeComponent(); this.Tag = "Web"; - BrowserView.CanGoBackChanged += BrowserView_CanGoBackChanged; BrowserView.CanGoForwardChanged += BrowserView_CanGoForwardChanged; - BrowserView.GoHome(); } - + + public ReactOSWeb(string Title, string URL) + { + InitializeComponent(); + this.Tag = Title; + BrowserView.CanGoBackChanged += BrowserView_CanGoBackChanged; + BrowserView.CanGoForwardChanged += BrowserView_CanGoForwardChanged; + BrowserView.Navigate(URL); + } + private void BrowserView_Navigating(object sender, WebBrowserNavigatingEventArgs e) { AddressInput.Text = e.Url.ToString();

1 0

[cwittich] 35244: -fix bugzilla input field
by cwittich＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: cwittich Date: Sat Aug 9 13:29:43 2008 New Revision: 35244 URL: http://svn.reactos.org/svn/reactos?rev=35244&view=rev Log: -fix bugzilla input field Modified: trunk/tools/reactosdbg/RosDBG/ReactOSWeb.Designer.cs trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs trunk/tools/reactosdbg/RosDBG/ReactOSWeb.resx Modified: trunk/tools/reactosdbg/RosDBG/ReactOSWeb.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ReactOSWeb… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/ReactOSWeb.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/ReactOSWeb.Designer.cs [iso-8859-1] Sat Aug 9 13:29:43 2008 @@ -40,7 +40,7 @@ this.navPaste = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); - this.toolStripTextBox1 = new System.Windows.Forms.ToolStripTextBox(); + this.BugzillaInput = new System.Windows.Forms.ToolStripTextBox(); this.BrowserView = new System.Windows.Forms.WebBrowser(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -80,13 +80,12 @@ this.navPaste, this.toolStripSeparator1, this.toolStripLabel1, - this.toolStripTextBox1}); + this.BugzillaInput}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(443, 25); this.toolStrip1.TabIndex = 0; this.toolStrip1.Text = "toolStrip1"; - this.toolStrip1.KeyUp += new System.Windows.Forms.KeyEventHandler(this.toolStrip1_KeyUp); // // navBack // @@ -96,7 +95,7 @@ this.navBack.ImageTransparentColor = System.Drawing.Color.Magenta; this.navBack.Name = "navBack"; this.navBack.Size = new System.Drawing.Size(23, 22); - this.navBack.Text = "toolStripButton3"; + this.navBack.ToolTipText = "Back"; this.navBack.Click += new System.EventHandler(this.navBack_Click); // // navForward @@ -108,6 +107,7 @@ this.navForward.Name = "navForward"; this.navForward.Size = new System.Drawing.Size(23, 22); this.navForward.Text = "toolStripButton2"; + this.navForward.ToolTipText = "Forward"; this.navForward.Click += new System.EventHandler(this.navForward_Click); // // navReload @@ -118,6 +118,7 @@ this.navReload.Name = "navReload"; this.navReload.Size = new System.Drawing.Size(23, 22); this.navReload.Text = "toolStripButton1"; + this.navReload.ToolTipText = "Reload"; this.navReload.Click += new System.EventHandler(this.navReload_Click); // // navHome @@ -128,6 +129,7 @@ this.navHome.Name = "navHome"; this.navHome.Size = new System.Drawing.Size(23, 22); this.navHome.Text = "toolStripButton6"; + this.navHome.ToolTipText = "Home"; this.navHome.Click += new System.EventHandler(this.navHome_Click); // // AddressInput @@ -152,6 +154,7 @@ this.navPaste.Name = "navPaste"; this.navPaste.Size = new System.Drawing.Size(23, 22); this.navPaste.Text = "toolStripButton4"; + this.navPaste.ToolTipText = "Paste"; this.navPaste.Click += new System.EventHandler(this.navPaste_Click); // // toolStripSeparator1 @@ -165,10 +168,11 @@ this.toolStripLabel1.Size = new System.Drawing.Size(48, 22); this.toolStripLabel1.Text = "Bugzilla"; // - // toolStripTextBox1 - // - this.toolStripTextBox1.Name = "toolStripTextBox1"; - this.toolStripTextBox1.Size = new System.Drawing.Size(50, 23); + // BugzillaInput + // + this.BugzillaInput.Name = "BugzillaInput"; + this.BugzillaInput.Size = new System.Drawing.Size(50, 23); + this.BugzillaInput.KeyUp += new System.Windows.Forms.KeyEventHandler(this.BugzillaInput_KeyUp); // // BrowserView // @@ -209,7 +213,7 @@ private System.Windows.Forms.ToolStripButton navPaste; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripLabel toolStripLabel1; - private System.Windows.Forms.ToolStripTextBox toolStripTextBox1; + private System.Windows.Forms.ToolStripTextBox BugzillaInput; private System.Windows.Forms.ToolStripButton navReload; private System.Windows.Forms.ToolStripButton navHome; } Modified: trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ReactOSWeb… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs [iso-8859-1] Sat Aug 9 13:29:43 2008 @@ -70,10 +70,10 @@ BrowserView.Navigate(((ToolStripComboBox)sender).Text); } - private void toolStrip1_KeyUp(object sender, KeyEventArgs e) + private void BugzillaInput_KeyUp(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Return) - BrowserView.Navigate("http://www.reactos.org/bugzilla/show_bug.cgi?id=" + ((TextBox)sender).Text); + BrowserView.Navigate("http://www.reactos.org/bugzilla/show_bug.cgi?id=" + ((ToolStripTextBox)sender).Text); } } Modified: trunk/tools/reactosdbg/RosDBG/ReactOSWeb.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ReactOSWeb… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/ReactOSWeb.resx [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/ReactOSWeb.resx [iso-8859-1] Sat Aug 9 13:29:43 2008 @@ -163,11 +163,11 @@ ilVz5aKfOi2r/pxK7X/y3yxp0x2Yop71X/4XzPv2P6bv43+3itv/bXOPHzFPPqCJYUjFkm8TKhZ/+++c f/q/atDcdzAFtQtf/A9rvfffOfvmJ4vsC/+Nk/b9143e1INhQNXSjxdypr//b5q8/79u5Pq5MAW5k+78 t887neNUemmabd65/3ox2/7rhi09j2FA4/xPn9Onvv1vnLD3v0HMDiuQgrS0M6xJHVfAARbWesc6uOke - 2AAFr9mfMQwoBRqQNvXdf7PU/XADkBVlzXxnkzblzX/DuF3YDahY8PFC6pS3/+1zT/+3Sj8yE92GmmW/ + 2AB5r9mfMQwoARqQNvXdf7PU/XADkBVlzXxnkzblzX/DuF3YDahY8PFC6pS3/+1zT/+3Sj8yE92GmmW/ 52VM+/BfP2bHf52QJRcwXJA99WVffO/T/15VN/77Vtx8mzrxxZw8oK3lC7/ZNKz+O798+ff3wc33/+uG r/qvFbZiIoYBEU23tQNrrx71KLvy37f2zv+43uf/M6e9+5838+P/nFmf/oM060Vv/q8ZuuS0RthaHaxp wbX4gq9d9rGjxvG7/+vGbAVjUKDpxWwBhvxyoOZFp/XClgbjzT6Gsbs0dcLW9GkGzL2o5DflCwhrBc6+ - pBu6ZJJ6yErdwZf3AFRBDhnH2f/eAAAAAElFTkSuQmCC + pBu6ZJJ6yErdwZf3AE5bDhbd82e3AAAAAElFTkSuQmCC </value> </data> <data name="navHome.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

1 0

[fireball] 35243: - MmAdjustWorkingSetSize has 4 parameters, not 3.
by fireball＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: fireball Date: Sat Aug 9 12:55:35 2008 New Revision: 35243 URL: http://svn.reactos.org/svn/reactos?rev=35243&view=rev Log: - MmAdjustWorkingSetSize has 4 parameters, not 3. Modified: trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/ntoskrnl_i386.def Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=35243… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] Sat Aug 9 12:55:35 2008 @@ -356,7 +356,8 @@ ULONG NTAPI MmAdjustWorkingSetSize (ULONG Unknown0, ULONG Unknown1, - ULONG Unknown2) + ULONG Unknown2, + ULONG Unknown3) { UNIMPLEMENTED; return (0); Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.def… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Sat Aug 9 12:55:35 2008 @@ -720,7 +720,7 @@ Mm64BitPhysicalAddress DATA MmAddPhysicalMemory@8 MmAddVerifierThunks@8 -MmAdjustWorkingSetSize@12 +MmAdjustWorkingSetSize@16 MmAdvanceMdl@8 MmAllocateContiguousMemory@12 MmAllocateContiguousMemorySpecifyCache@32

1 0

[gedmurphy] 35242: - Don't use LoadIcon, it's broken as it incorrectly calls LoadImage - This fixes the ugly treeview icons - *note, cursor/icon loading code needs revising
by gedmurphy＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: gedmurphy Date: Sat Aug 9 11:40:43 2008 New Revision: 35242 URL: http://svn.reactos.org/svn/reactos?rev=35242&view=rev Log: - Don't use LoadIcon, it's broken as it incorrectly calls LoadImage - This fixes the ugly treeview icons - *note, cursor/icon loading code needs revising Modified: trunk/reactos/base/applications/regedit/treeview.c Modified: trunk/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] Sat Aug 9 11:40:43 2008 @@ -24,14 +24,12 @@ /* Image_Open, Image_Closed, and Image_Root - integer variables for indexes of the images. */ /* CX_ICON and CY_ICON - width and height of an icon. */ /* NUM_ICON - number of icons to add to the image list. */ -int Image_Open; -int Image_Closed; -int Image_Root; +static int Image_Open = 0; +static int Image_Closed = 0; +static int Image_Root = 0; static LPTSTR pathBuffer; -#define CX_ICON 16 -#define CY_ICON 16 #define NUM_ICONS 3 static BOOL get_item_path(HWND hwndTV, HTREEITEM hItem, HKEY* phKey, LPTSTR* pKeyPath, int* pPathLen, int* pMaxLen) @@ -415,24 +413,57 @@ HICON hico; /* handle to icon */ /* Create the image list. */ - if ((himl = ImageList_Create(CX_ICON, CY_ICON, - ILC_MASK|ILC_COLOR32, 0, NUM_ICONS)) == NULL) + if ((himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + ILC_MASK | ILC_COLOR32, + 0, + NUM_ICONS)) == NULL) + { return FALSE; + } /* Add the open file, closed file, and document bitmaps. */ - hico = LoadIcon(hInst, MAKEINTRESOURCE(IDI_OPEN_FILE)); - Image_Open = ImageList_AddIcon(himl, hico); - - hico = LoadIcon(hInst, MAKEINTRESOURCE(IDI_CLOSED_FILE)); - Image_Closed = ImageList_AddIcon(himl, hico); - - hico = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ROOT)); - Image_Root = ImageList_AddIcon(himl, hico); + hico = LoadImage(hInst, + MAKEINTRESOURCE(IDI_OPEN_FILE), + IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + 0); + if (hico) + { + Image_Open = ImageList_AddIcon(himl, hico); + DestroyIcon(hico); + } + + hico = LoadImage(hInst, + MAKEINTRESOURCE(IDI_CLOSED_FILE), + IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + 0); + if (hico) + { + Image_Closed = ImageList_AddIcon(himl, hico); + DestroyIcon(hico); + } + + hico = LoadImage(hInst, + MAKEINTRESOURCE(IDI_ROOT), + IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + 0); + if (hico) + { + Image_Root = ImageList_AddIcon(himl, hico); + DestroyIcon(hico); + } /* Fail if not all of the images were added. */ if (ImageList_GetImageCount(himl) < NUM_ICONS) { - return FALSE; + ImageList_Destroy(himl); + return FALSE; } /* Associate the image list with the tree view control. */

1 0

[dchapyshev] 35241: - Update Russian translation
by dchapyshev＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: dchapyshev Date: Sat Aug 9 11:16:49 2008 New Revision: 35241 URL: http://svn.reactos.org/svn/reactos?rev=35241&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc trunk/reactos/base/shell/explorer/explorer-ru.rc trunk/reactos/base/system/expand/lang/ru-RU.rc trunk/reactos/dll/shellext/deskadp/lang/ru-RU.rc Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] Sat Aug 9 11:16:49 2008 @@ -18,15 +18,15 @@ MENUITEM "", -1, MFT_SEPARATOR POPUP "&Ïðîãðàììû", IDM_PROGRAMS BEGIN - MENUITEM "(Ïóñòî)", -1, MFT_STRING, MFS_GRAYED + MENUITEM "(ïóñòî)", -1, MFT_STRING, MFS_GRAYED END POPUP "&Èçáðàííîå", IDM_FAVORITES BEGIN - MENUITEM "(Ïóñòî)", -1, MFT_STRING, MFS_GRAYED + MENUITEM "(ïóñòî)", -1, MFT_STRING, MFS_GRAYED END POPUP "&Äîêóìåíòû", IDM_DOCUMENTS BEGIN - MENUITEM "(Ïóñòî)", -1, MFT_STRING, MFS_GRAYED + MENUITEM "(ïóñòî)", -1, MFT_STRING, MFS_GRAYED END POPUP "&Íàñòðîéêè", IDM_SETTINGS BEGIN Modified: trunk/reactos/base/shell/explorer/explorer-ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-ru.rc [iso-8859-1] Sat Aug 9 11:16:49 2008 @@ -57,13 +57,13 @@ END POPUP "&Èíñòðóìåíòû" BEGIN - MENUITEM "&Íàñòðîéêà", ID_TOOLS_OPTIONS + MENUITEM "&Ïàðàìåòðû", ID_TOOLS_OPTIONS END POPUP "Ïî&ìîùü" BEGIN MENUITEM "&×àñòûå âîïðîñû ïî Ïðîâîäíèêó...", ID_EXPLORER_FAQ - MENUITEM "Î &Ïðîâîäíèêå", ID_ABOUT_EXPLORER - MENUITEM "Î &ReactOS", ID_ABOUT_WINDOWS + MENUITEM "Î &ïðîãðàììå...", ID_ABOUT_EXPLORER + MENUITEM "Î &ReactOS...", ID_ABOUT_WINDOWS END END @@ -71,10 +71,10 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Íàñòðîéêè...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Ïàðàìåòðû...", ID_DESKTOPBAR_SETTINGS MENUITEM "&Äèñïåò÷åð çàäà÷", ID_TASKMGR MENUITEM SEPARATOR - MENUITEM "&Î Ïðîâîäíèêå", ID_ABOUT_EXPLORER + MENUITEM "&Î ïðîãðàììå...", ID_ABOUT_EXPLORER END END @@ -96,7 +96,7 @@ MENUITEM "&Íàñòðîéêà óâåäîìëåíèé...", ID_CONFIG_NOTIFYAREA MENUITEM "Íàñòðîéêà äàòû/&âðåìåíè", ID_CONFIG_TIME MENUITEM SEPARATOR - MENUITEM "&Î Ïðîâîäíèêå", ID_ABOUT_EXPLORER + MENUITEM "&Î ïðîãðàììå...", ID_ABOUT_EXPLORER END END @@ -120,13 +120,13 @@ END POPUP "&Èíñòðóìåíòû" BEGIN - MENUITEM "&Îïöèè", ID_TOOLS_OPTIONS + MENUITEM "&Ïàðàìåòðû", ID_TOOLS_OPTIONS END POPUP "&Ñïðàâêà" BEGIN MENUITEM "&×àñòûå âîïðîñû ïî Ïðîâîäíèêó...", ID_EXPLORER_FAQ - MENUITEM "Î &Ïðîâîäíèêå", ID_ABOUT_EXPLORER - MENUITEM "Î &ReactOS", ID_ABOUT_WINDOWS + MENUITEM "Î &Ïðîâîäíèêå...", ID_ABOUT_EXPLORER + MENUITEM "Î &ReactOS...", ID_ABOUT_WINDOWS END END @@ -169,7 +169,7 @@ IDD_DESKBAR_DESKTOP DIALOGEX DISCARDABLE 0, 0, 212, 194 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Ñâîéñòâà Ðàáî÷åãî ñòîëà" +CAPTION "Ñâîéñòâà: Ðàáî÷èé ñòîë" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Âûáåðèòå, íàèáîëåå ïðåäïî÷òèòåëüíûé äëÿ âàñ, \nñïîñîá âûðàâíèâàíèÿ çíà÷êîâ", @@ -339,7 +339,7 @@ IDS_PROGRAMS "Ïðîãðàììû" IDS_SETTINGS "Íàñòðîéêà" IDS_EXPLORE "Îáçîð" - IDS_EMPTY "(Ïóñòî)" + IDS_EMPTY "(ïóñòî)" IDS_RECENT "Íåäàâíèå äîêóìåíòû" IDS_ADMIN "Àäìèíèñòðèðîâàíèå" END Modified: trunk/reactos/base/system/expand/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/lang/ru… ============================================================================== --- trunk/reactos/base/system/expand/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/expand/lang/ru-RU.rc [iso-8859-1] Sat Aug 9 11:16:49 2008 @@ -5,7 +5,7 @@ BEGIN IDS_Copy, "Óòèëèòà ðàñïàêîâêè ôàéëîâ ReactOS, âåðñèÿ 1.0\n\ -Copyright Victor Schneider 1997\n\n\ +Àâòîðñêèå ïðàâà (ñ) Âèêòîð Øíåéäåð 1997\n\n\ Èñïîëüçîâàíèå: %s èñõîäíûé_ôàéë [âûõîäíîé_ôàéë]\n" IDS_FAILS "Íå óäàëîñü âûïîëíèòü LZCopy, âîçâðàùåíî: %ld\n" Modified: trunk/reactos/dll/shellext/deskadp/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/ru-RU.rc [iso-8859-1] Sat Aug 9 11:16:49 2008 @@ -40,9 +40,9 @@ IDES_REFRESHRATEFMT "%d Ãö" IDS_4BPP "16 öâåòîâ" IDS_8BPP "256 öâåòîâ" - IDS_15BPP "High Color (15 áèò)" - IDS_16BPP "High Color (16 áèò)" - IDS_24BPP "True Color (24 áèòà)" - IDS_32BPP "True Color (32 áèòà)" + IDS_15BPP "Âûñîêîå (15 áèò)" + IDS_16BPP "Âûñîêîå (16 áèò)" + IDS_24BPP "Ñàìîå âûñîêîå (24 áèòà)" + IDS_32BPP "Ñàìîå âûñîêîå (32 áèòà)" END

1 0

[hpoussin] 35240: Add module linker flags after project flags, so project ones can be overridden
by hpoussin＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: hpoussin Date: Sat Aug 9 11:01:20 2008 New Revision: 35240 URL: http://svn.reactos.org/svn/reactos?rev=35240&view=rev Log: Add module linker flags after project flags, so project ones can be overridden Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sat Aug 9 11:01:20 2008 @@ -1937,7 +1937,8 @@ fprintf ( fMakefile, - "%s_LFLAGS += $(PROJECT_LFLAGS) -g\n", + "%s_LFLAGS := $(PROJECT_LFLAGS) -g $(%s_LFLAGS)\n", + module.name.c_str (), module.name.c_str () ); } else

1 0

[dchapyshev] 35239: - Fix typo
by dchapyshev＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: dchapyshev Date: Sat Aug 9 10:59:08 2008 New Revision: 35239 URL: http://svn.reactos.org/svn/reactos?rev=35239&view=rev Log: - Fix typo Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Sat Aug 9 10:59:08 2008 @@ -15,7 +15,7 @@ CAPTION "Äîáðî ïîæàëîâàòü â ReactOS" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - LTEXT "Íàæèòå êëàâèøè Control-Alt-Delete...",IDC_STATIC, 29, 22, 144, 14 + LTEXT "Íàæìèòå êëàâèøè Control-Alt-Delete...",IDC_STATIC, 29, 22, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs