Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[fireball] 41146: Mikhail Denisenko <denisenkom@gmail.com> - Destroy proper windows, fixes one more memory leak. See issue #2012 for more details.
by fireball＠svn.reactos.org 27 May '09

27 May '09

Author: fireball Date: Wed May 27 21:37:35 2009 New Revision: 41146 URL: http://svn.reactos.org/svn/reactos?rev=41146&view=rev Log: Mikhail Denisenko <denisenkom(a)gmail.com> - Destroy proper windows, fixes one more memory leak. See issue #2012 for more details. Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] Wed May 27 21:37:35 2009 @@ -1943,7 +1943,8 @@ #ifndef __REACTOS__ case IDC_TERMINATE: - DestroyWindow(GetParent(_hwnd)); + DestroyWindow(g_Globals._hwndDesktopBar); + DestroyWindow(g_Globals._hwndDesktop); break; #endif

1 0

[fireball] 41145: Mikhail Denisenko <denisenkom@gmail.com> - RegisterDragDrop should be coupled with a RevokeDragDrop, so add that. - Remove _pDropTarget from class members, it's a var local to DesktopShellView::InitDragDrop() method. See issue #2012 for more details.
by fireball＠svn.reactos.org 27 May '09

27 May '09

Author: fireball Date: Wed May 27 21:35:02 2009 New Revision: 41145 URL: http://svn.reactos.org/svn/reactos?rev=41145&view=rev Log: Mikhail Denisenko <denisenkom(a)gmail.com> - RegisterDragDrop should be coupled with a RevokeDragDrop, so add that. - Remove _pDropTarget from class members, it's a var local to DesktopShellView::InitDragDrop() method. See issue #2012 for more details. Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp trunk/reactos/base/shell/explorer/desktop/desktop.h Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] Wed May 27 21:35:02 2009 @@ -506,24 +506,29 @@ InitDragDrop(); } + +DesktopShellView::~DesktopShellView() +{ + if (FAILED(RevokeDragDrop(_hwnd))) + assert(0); +} + + bool DesktopShellView::InitDragDrop() { CONTEXT("DesktopShellView::InitDragDrop()"); - _pDropTarget = new DesktopDropTarget(_hwnd); - - if (!_pDropTarget) + DesktopDropTarget * pDropTarget = new DesktopDropTarget(_hwnd); + + if (!pDropTarget) return false; - _pDropTarget->AddRef(); - - if (FAILED(RegisterDragDrop(_hwnd, _pDropTarget))) { - _pDropTarget->Release(); - _pDropTarget = NULL; + pDropTarget->AddRef(); + + if (FAILED(RegisterDragDrop(_hwnd, pDropTarget))) { + pDropTarget->Release(); return false; } - else - _pDropTarget->Release(); FORMATETC ftetc; @@ -532,7 +537,8 @@ ftetc.tymed = TYMED_HGLOBAL; ftetc.cfFormat = CF_HDROP; - _pDropTarget->AddSuportedFormat(ftetc); + pDropTarget->AddSuportedFormat(ftetc); + pDropTarget->Release(); return true; } Modified: trunk/reactos/base/shell/explorer/desktop/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop/desktop.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop/desktop.h [iso-8859-1] Wed May 27 21:35:02 2009 @@ -170,6 +170,7 @@ typedef ExtContextMenuHandlerT<SubclassedWindow> super; DesktopShellView(HWND hwnd, IShellView* pShellView); + ~DesktopShellView(); bool InitDragDrop(); @@ -186,7 +187,6 @@ void refresh(); - DesktopDropTarget* _pDropTarget; HWND _hwndListView; int _icon_algo; };

1 0

[fireball] 41144: Mikhail Denisenko <denisenkom@gmail.com> - Free subentries in Entry destructor. Fixes QuickLaunch entries leak. See issue #2012 for more details.
by fireball＠svn.reactos.org 27 May '09

27 May '09

Author: fireball Date: Wed May 27 21:28:59 2009 New Revision: 41144 URL: http://svn.reactos.org/svn/reactos?rev=41144&view=rev Log: Mikhail Denisenko <denisenkom(a)gmail.com> - Free subentries in Entry destructor. Fixes QuickLaunch entries leak. See issue #2012 for more details. Modified: trunk/reactos/base/shell/explorer/shell/entries.cpp Modified: trunk/reactos/base/shell/explorer/shell/entries.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/entries.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/entries.cpp [iso-8859-1] Wed May 27 21:28:59 2009 @@ -96,6 +96,8 @@ // free a directory entry Entry::~Entry() { + free_subentries(); + if (_icon_id > ICID_NONE) g_Globals._icon_cache.free_icon(_icon_id);

1 0

[sginsberg] 41143: - IntEmptyClipboardData: Check before freeing a potential null pointer
by sginsberg＠svn.reactos.org 27 May '09

27 May '09

Author: sginsberg Date: Wed May 27 20:39:24 2009 New Revision: 41143 URL: http://svn.reactos.org/svn/reactos?rev=41143&view=rev Log: - IntEmptyClipboardData: Check before freeing a potential null pointer Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Wed May 27 20:39:24 2009 @@ -229,7 +229,10 @@ while(ce) { tmp = ce->next; - ExFreePool(ce->hData); + if (ce->hData) + { + ExFreePool(ce->hData); + } ExFreePool(ce); ce = tmp; }

1 0

[cwittich] 41142: -only send data to debugger when kdbg is entered -set correct kdbg status when entering cont manually -enable/disable appropriate commands in debugger menu to reflect current status
by cwittich＠svn.reactos.org 27 May '09

27 May '09

Author: cwittich Date: Wed May 27 19:40:26 2009 New Revision: 41142 URL: http://svn.reactos.org/svn/reactos?rev=41142&view=rev Log: -only send data to debugger when kdbg is entered -set correct kdbg status when entering cont manually -enable/disable appropriate commands in debugger menu to reflect current status Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/RawTraffic.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] Wed May 27 19:40:26 2009 @@ -126,27 +126,27 @@ this.toolStripSeparator1, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.fileToolStripMenuItem.Text = "&File"; // // openSourceFileToolStripMenuItem // this.openSourceFileToolStripMenuItem.Name = "openSourceFileToolStripMenuItem"; this.openSourceFileToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openSourceFileToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.openSourceFileToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.openSourceFileToolStripMenuItem.Text = "&Open Source File ..."; this.openSourceFileToolStripMenuItem.Click += new System.EventHandler(this.openSourceFileToolStripMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(210, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(217, 6); // // connectSerialToolStripMenuItem // this.connectSerialToolStripMenuItem.Name = "connectSerialToolStripMenuItem"; this.connectSerialToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L))); - this.connectSerialToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.connectSerialToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.connectSerialToolStripMenuItem.Text = "Connect Seria&l ..."; this.connectSerialToolStripMenuItem.Click += new System.EventHandler(this.connectSerialToolStripMenuItem_Click); // @@ -154,7 +154,7 @@ // this.connectPipeToolStripMenuItem.Name = "connectPipeToolStripMenuItem"; this.connectPipeToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); - this.connectPipeToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.connectPipeToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.connectPipeToolStripMenuItem.Text = "Connect &Pipe ..."; this.connectPipeToolStripMenuItem.Click += new System.EventHandler(this.connectPipeToolStripMenuItem_Click); // @@ -162,33 +162,33 @@ // this.connectTCPIPToolStripMenuItem.Name = "connectTCPIPToolStripMenuItem"; this.connectTCPIPToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T))); - this.connectTCPIPToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.connectTCPIPToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.connectTCPIPToolStripMenuItem.Text = "Connect &TCP/IP ..."; this.connectTCPIPToolStripMenuItem.Click += new System.EventHandler(this.connectTCPIPToolStripMenuItem_Click); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(210, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(217, 6); // // symbolDirectoryToolStripMenuItem // this.symbolDirectoryToolStripMenuItem.Name = "symbolDirectoryToolStripMenuItem"; this.symbolDirectoryToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.symbolDirectoryToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.symbolDirectoryToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.symbolDirectoryToolStripMenuItem.Text = "&Settings ..."; this.symbolDirectoryToolStripMenuItem.Click += new System.EventHandler(this.symbolDirectoryToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(210, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(217, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.X))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.exitToolStripMenuItem.Text = "E&xit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -199,14 +199,14 @@ this.pasteToInteractionToolStripMenuItem, this.memoryToolStripMenuItem}); this.editToolStripMenuItem.Name = "editToolStripMenuItem"; - this.editToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); this.editToolStripMenuItem.Text = "&Edit"; // // copyToolStripMenuItem // this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.copyToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.copyToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.copyToolStripMenuItem.Text = "&Copy"; this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); // @@ -214,14 +214,14 @@ // this.pasteToInteractionToolStripMenuItem.Enabled = false; this.pasteToInteractionToolStripMenuItem.Name = "pasteToInteractionToolStripMenuItem"; - this.pasteToInteractionToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.pasteToInteractionToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.pasteToInteractionToolStripMenuItem.Text = "&Paste to Interaction"; // // memoryToolStripMenuItem // this.memoryToolStripMenuItem.Enabled = false; this.memoryToolStripMenuItem.Name = "memoryToolStripMenuItem"; - this.memoryToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.memoryToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.memoryToolStripMenuItem.Text = "&Memory at Clipboard"; // // debugToolStripMenuItem @@ -237,49 +237,53 @@ this.breakpointClipboardToolStripMenuItem, this.followListToolStripMenuItem}); this.debugToolStripMenuItem.Name = "debugToolStripMenuItem"; - this.debugToolStripMenuItem.Size = new System.Drawing.Size(50, 20); + this.debugToolStripMenuItem.Size = new System.Drawing.Size(54, 20); this.debugToolStripMenuItem.Text = "&Debug"; // // bugcheckToolStripMenuItem // this.bugcheckToolStripMenuItem.Enabled = false; this.bugcheckToolStripMenuItem.Name = "bugcheckToolStripMenuItem"; - this.bugcheckToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.bugcheckToolStripMenuItem.Size = new System.Drawing.Size(186, 22); this.bugcheckToolStripMenuItem.Text = "&Bugcheck"; // // continueToolStripMenuItem // + this.continueToolStripMenuItem.Enabled = false; this.continueToolStripMenuItem.Name = "continueToolStripMenuItem"; this.continueToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5; - this.continueToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.continueToolStripMenuItem.Size = new System.Drawing.Size(186, 22); this.continueToolStripMenuItem.Text = "&Continue"; this.continueToolStripMenuItem.Click += new System.EventHandler(this.continueToolStripMenuItem_Click); // // stepToolStripMenuItem // + this.stepToolStripMenuItem.Enabled = false; this.stepToolStripMenuItem.Name = "stepToolStripMenuItem"; this.stepToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F11; - this.stepToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.stepToolStripMenuItem.Size = new System.Drawing.Size(186, 22); this.stepToolStripMenuItem.Text = "&Step"; this.stepToolStripMenuItem.Click += new System.EventHandler(this.stepToolStripMenuItem_Click); // // nextToolStripMenuItem // + this.nextToolStripMenuItem.Enabled = false; this.nextToolStripMenuItem.Name = "nextToolStripMenuItem"; this.nextToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F10; - this.nextToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.nextToolStripMenuItem.Size = new System.Drawing.Size(186, 22); this.nextToolStripMenuItem.Text = "&Next"; this.nextToolStripMenuItem.Click += new System.EventHandler(this.nextToolStripMenuItem_Click); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(170, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(183, 6); // // breakToolStripMenuItem // + this.breakToolStripMenuItem.Enabled = false; this.breakToolStripMenuItem.Name = "breakToolStripMenuItem"; - this.breakToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.breakToolStripMenuItem.Size = new System.Drawing.Size(186, 22); this.breakToolStripMenuItem.Text = "B&reak"; this.breakToolStripMenuItem.Click += new System.EventHandler(this.breakToolStripMenuItem_Click); // @@ -288,21 +292,21 @@ this.breakHereToolStripMenuItem.Enabled = false; this.breakHereToolStripMenuItem.Name = "breakHereToolStripMenuItem"; this.breakHereToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F9; - this.breakHereToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.breakHereToolStripMenuItem.Size = new System.Drawing.Size(186, 22); this.breakHereToolStripMenuItem.Text = "Breakpoint &Here"; // // breakpointClipboardToolStripMenuItem // this.breakpointClipboardToolStripMenuItem.Enabled = false; this.breakpointClipboardToolStripMenuItem.Name = "breakpointClipboardToolStripMenuItem"; - this.breakpointClipboardToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.breakpointClipboardToolStripMenuItem.Size = new System.Drawing.Size(186, 22); this.breakpointClipboardToolStripMenuItem.Text = "Breakpoint Cli&pboard"; // // followListToolStripMenuItem // this.followListToolStripMenuItem.Enabled = false; this.followListToolStripMenuItem.Name = "followListToolStripMenuItem"; - this.followListToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.followListToolStripMenuItem.Size = new System.Drawing.Size(186, 22); this.followListToolStripMenuItem.Text = "&Follow List"; // // windowToolStripMenuItem @@ -312,26 +316,26 @@ this.detachCurrentTabToolStripMenuItem, this.closeCurrentTabToolStripMenuItem}); this.windowToolStripMenuItem.Name = "windowToolStripMenuItem"; - this.windowToolStripMenuItem.Size = new System.Drawing.Size(57, 20); + this.windowToolStripMenuItem.Size = new System.Drawing.Size(63, 20); this.windowToolStripMenuItem.Text = "&Window"; // // NewWindowItem // this.NewWindowItem.Name = "NewWindowItem"; - this.NewWindowItem.Size = new System.Drawing.Size(169, 22); + this.NewWindowItem.Size = new System.Drawing.Size(177, 22); this.NewWindowItem.Text = "&New"; // // detachCurrentTabToolStripMenuItem // this.detachCurrentTabToolStripMenuItem.Name = "detachCurrentTabToolStripMenuItem"; - this.detachCurrentTabToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.detachCurrentTabToolStripMenuItem.Size = new System.Drawing.Size(177, 22); this.detachCurrentTabToolStripMenuItem.Text = "&Detach Current Tab"; this.detachCurrentTabToolStripMenuItem.Click += new System.EventHandler(this.detachCurrentTabToolStripMenuItem_Click); // // closeCurrentTabToolStripMenuItem // this.closeCurrentTabToolStripMenuItem.Name = "closeCurrentTabToolStripMenuItem"; - this.closeCurrentTabToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.closeCurrentTabToolStripMenuItem.Size = new System.Drawing.Size(177, 22); this.closeCurrentTabToolStripMenuItem.Text = "&Close Current Tab"; this.closeCurrentTabToolStripMenuItem.Click += new System.EventHandler(this.closeCurrentTabToolStripMenuItem_Click); // @@ -348,14 +352,14 @@ // this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; this.helpToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F1; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(118, 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(114, 22); + this.infoToolStripMenuItem.Size = new System.Drawing.Size(118, 22); this.infoToolStripMenuItem.Text = "&About"; // // splitContainer2 @@ -408,12 +412,12 @@ this.contextMenuTabStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.closeToolStripMenuItem}); this.contextMenuTabStrip.Name = "contextMenuTabStrip"; - this.contextMenuTabStrip.Size = new System.Drawing.Size(101, 26); + this.contextMenuTabStrip.Size = new System.Drawing.Size(104, 26); // // closeToolStripMenuItem // this.closeToolStripMenuItem.Name = "closeToolStripMenuItem"; - this.closeToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.closeToolStripMenuItem.Size = new System.Drawing.Size(103, 22); this.closeToolStripMenuItem.Text = "&Close"; this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click); // @@ -425,7 +429,7 @@ this.Controls.Add(this.splitContainer1); this.MainMenuStrip = this.menuStrip1; this.Name = "MainWindow"; - this.Text = "ReactOS Debug Shell"; + this.Text = "ReactOS Remote Debugger"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainWindow_FormClosing); this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel1.PerformLayout(); 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] Wed May 27 19:40:26 2009 @@ -88,6 +88,14 @@ RunStatus.Text = "ConnectionMode: " + mConnectionMode + " - Running: " + mRunning + " - Source Location: " + mCurrentFile + ":" + mCurrentLine; } + void UpdateDebuggerMenu() + { + breakToolStripMenuItem.Enabled = mRunning; + nextToolStripMenuItem.Enabled = !mRunning; + stepToolStripMenuItem.Enabled = !mRunning; + continueToolStripMenuItem.Enabled = !mRunning; + } + protected override void OnLoad(EventArgs e) { base.OnLoad(e); @@ -121,6 +129,7 @@ { mRunning = args.Running; Invoke(Delegate.CreateDelegate(typeof(NoParamsDelegate), this, "ComposeTitleString")); + Invoke(Delegate.CreateDelegate(typeof(NoParamsDelegate), this, "UpdateDebuggerMenu")); } void DebugConnectionModeChangedEvent(object sender, DebugConnectionModeChangedEventArgs args) Modified: trunk/tools/reactosdbg/RosDBG/RawTraffic.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RawTraffic… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RawTraffic.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RawTraffic.cs [iso-8859-1] Wed May 27 19:40:26 2009 @@ -69,7 +69,7 @@ private void RawTrafficText_KeyPress(object sender, KeyPressEventArgs e) { - if (mConnection.ConnectionMode != DebugConnection.Mode.ClosedMode) + if ((mConnection.ConnectionMode != DebugConnection.Mode.ClosedMode) && (!mConnection.Running)) { switch ((int)e.KeyChar) { @@ -78,6 +78,8 @@ InputLabel.Text = InputLabel.Text.Substring(0, InputLabel.Text.Length - 1); break; case 13: /* Return */ + if (InputLabel.Text.ToLower().CompareTo("cont") == 0) + mConnection.Running = true; InputLabel.Text = ""; break; default:

1 0

[dgorbachev] 41141: Fix some bugs in Paint.
by dgorbachev＠svn.reactos.org 27 May '09

27 May '09

Author: dgorbachev Date: Wed May 27 16:03:18 2009 New Revision: 41141 URL: http://svn.reactos.org/svn/reactos?rev=41141&view=rev Log: Fix some bugs in Paint. Modified: trunk/reactos/base/applications/paint/dialogs.c trunk/reactos/base/applications/paint/dib.c trunk/reactos/base/applications/paint/dib.h trunk/reactos/base/applications/paint/history.c trunk/reactos/base/applications/paint/main.c trunk/reactos/base/applications/paint/mouse.c trunk/reactos/base/applications/paint/selection.c trunk/reactos/base/applications/paint/toolsettings.c trunk/reactos/base/applications/paint/winproc.c Modified: trunk/reactos/base/applications/paint/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/di… ============================================================================== --- trunk/reactos/base/applications/paint/dialogs.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/dialogs.c [iso-8859-1] Wed May 27 16:03:18 2009 @@ -59,6 +59,7 @@ default: return FALSE; } + return TRUE; } int mirrorRotateDlg() @@ -93,6 +94,7 @@ default: return FALSE; } + return TRUE; } int attributesDlg() @@ -125,6 +127,7 @@ default: return FALSE; } + return TRUE; } int changeSizeDlg() Modified: trunk/reactos/base/applications/paint/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/di… ============================================================================== --- trunk/reactos/base/applications/paint/dib.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/dib.c [iso-8859-1] Wed May 27 16:03:18 2009 @@ -43,7 +43,7 @@ return bm.bmHeight; } -void SaveDIBToFile(HBITMAP hbm, char name[], HDC hdc) +void SaveDIBToFile(HBITMAP hbm, LPSTR name, HDC hdc) { BITMAP bm; GetObject(hbm, sizeof(BITMAP), &bm); @@ -77,7 +77,7 @@ HeapFree(GetProcessHeap(), 0, buffer); } -HBITMAP LoadDIBFromFile(char name[]) +HBITMAP LoadDIBFromFile(LPSTR name) { HBITMAP bm; BITMAPFILEHEADER bfh; @@ -88,7 +88,7 @@ ReadFile(f, &bfh, 14, (LPDWORD)&bytesRead, NULL); if (bfh.bfType!=0x4d42) { - fclose(f); + CloseHandle(f); return NULL; } bi = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, bfh.bfOffBits-14); Modified: trunk/reactos/base/applications/paint/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/di… ============================================================================== --- trunk/reactos/base/applications/paint/dib.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/dib.h [iso-8859-1] Wed May 27 16:03:18 2009 @@ -12,6 +12,6 @@ int GetDIBHeight(HBITMAP hbm); -void SaveDIBToFile(HBITMAP hbm, char name[], HDC hdc); +void SaveDIBToFile(HBITMAP hbm, LPSTR name, HDC hdc); -HBITMAP LoadDIBFromFile(char name[]); +HBITMAP LoadDIBFromFile(LPSTR name); Modified: trunk/reactos/base/applications/paint/history.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/hi… ============================================================================== --- trunk/reactos/base/applications/paint/history.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/history.c [iso-8859-1] Wed May 27 16:03:18 2009 @@ -14,6 +14,8 @@ #include "definitions.h" /* FUNCTIONS ********************************************************/ + +extern void updateCanvasAndScrollbars(void); void setImgXYRes(int x, int y) { Modified: trunk/reactos/base/applications/paint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/ma… ============================================================================== --- trunk/reactos/base/applications/paint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/main.c [iso-8859-1] Wed May 27 16:03:18 2009 @@ -194,11 +194,11 @@ wclSelection.hbrBackground = NULL;//GetSysColorBrush(COLOR_BTNFACE); RegisterClassEx (&wclSelection); - LoadString(hThisInstance, IDS_DEFAULTFILENAME, (LPTSTR)&filename, 256); + LoadString(hThisInstance, IDS_DEFAULTFILENAME, (LPTSTR)filename, sizeof(filename)); char progtitle[1000]; char resstr[100]; - LoadString(hThisInstance, IDS_WINDOWTITLE, (LPTSTR)&resstr, 100); - sprintf(progtitle, resstr, &filename); + LoadString(hThisInstance, IDS_WINDOWTITLE, (LPTSTR)resstr, sizeof(resstr)); + sprintf(progtitle, resstr, filename); // create main window @@ -240,9 +240,9 @@ for (i=0; i<16; i++) { int wrapnow = 0; - if (i%2==1) wrapnow = TBSTATE_WRAP; - LoadString(hThisInstance, IDS_TOOLTIP1+i, (LPTSTR)&tooltips[i], 30); - TBBUTTON tbbutton = {i, (HMENU)(ID_FREESEL+i), TBSTATE_ENABLED | wrapnow, TBSTYLE_CHECKGROUP, {0}, 0, &tooltips[i]}; + if (i % 2 == 1) wrapnow = TBSTATE_WRAP; + LoadString(hThisInstance, IDS_TOOLTIP1 + i, (LPTSTR)tooltips[i], 30); + TBBUTTON tbbutton = { i, ID_FREESEL + i, TBSTATE_ENABLED | wrapnow, TBSTYLE_CHECKGROUP, {0}, 0, (INT_PTR)tooltips[i] }; SendMessage(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&tbbutton); } // SendMessage(hToolbar, TB_SETROWS, MAKEWPARAM(8, FALSE), (LPARAM)NULL); @@ -299,41 +299,41 @@ choosecolor.lpfnHook = NULL; choosecolor.lpTemplateName = NULL; - int c; + char *c; // initializing the OPENFILENAME structure for use with GetOpenFileName and GetSaveFileName char ofnFilename[1000]; - CopyMemory(&ofnFilename, &filename, 256); + CopyMemory(ofnFilename, filename, sizeof(filename)); char ofnFiletitle[256]; char ofnFilter[1000]; - LoadString(hThisInstance, IDS_OPENFILTER, (LPTSTR)&ofnFilter, 1000); - for (c=0; c<1000; c++) if (ofnFilter[c]==(char)1) ofnFilter[c] = (char)0; + LoadString(hThisInstance, IDS_OPENFILTER, (LPTSTR)ofnFilter, sizeof(ofnFilter)); + for (c = ofnFilter; *c; c++) if (*c == '\1') *c = '\0'; ZeroMemory(&ofn, sizeof(OPENFILENAME)); ofn.lStructSize = sizeof (OPENFILENAME); ofn.hwndOwner = hwnd; ofn.hInstance = hThisInstance; - ofn.lpstrFilter = (LPCTSTR)&ofnFilter; - ofn.lpstrFile = (LPTSTR)&ofnFilename; - ofn.nMaxFile = 1000; - ofn.lpstrFileTitle = (LPTSTR)&ofnFiletitle; - ofn.nMaxFileTitle = 256; + ofn.lpstrFilter = (LPCTSTR)ofnFilter; + ofn.lpstrFile = (LPTSTR)ofnFilename; + ofn.nMaxFile = sizeof(ofnFilename); + ofn.lpstrFileTitle = (LPTSTR)ofnFiletitle; + ofn.nMaxFileTitle = sizeof(ofnFiletitle); ofn.Flags = OFN_HIDEREADONLY; char sfnFilename[1000]; - CopyMemory(&sfnFilename, &filename, 256); + CopyMemory(sfnFilename, filename, sizeof(filename)); char sfnFiletitle[256]; char sfnFilter[1000]; - LoadString(hThisInstance, IDS_SAVEFILTER, (LPTSTR)&sfnFilter, 1000); - for (c=0; c<1000; c++) if (sfnFilter[c]==(char)1) sfnFilter[c] = (char)0; + LoadString(hThisInstance, IDS_SAVEFILTER, (LPTSTR)sfnFilter, sizeof(sfnFilter)); + for (c = sfnFilter; *c; c++) if (*c == '\1') *c = '\0'; ZeroMemory(&sfn, sizeof(OPENFILENAME)); sfn.lStructSize = sizeof (OPENFILENAME); sfn.hwndOwner = hwnd; sfn.hInstance = hThisInstance; - sfn.lpstrFilter = (LPCTSTR)&sfnFilter; - sfn.lpstrFile = (LPTSTR)&sfnFilename; - sfn.nMaxFile = 1000; - sfn.lpstrFileTitle = (LPTSTR)&sfnFiletitle; - sfn.nMaxFileTitle = 256; + sfn.lpstrFilter = (LPCTSTR)sfnFilter; + sfn.lpstrFile = (LPTSTR)sfnFilename; + sfn.nMaxFile = sizeof(sfnFilename); + sfn.lpstrFileTitle = (LPTSTR)sfnFiletitle; + sfn.nMaxFileTitle = sizeof(sfnFiletitle); sfn.Flags = OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY; Modified: trunk/reactos/base/applications/paint/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/mo… ============================================================================== --- trunk/reactos/base/applications/paint/mouse.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/mouse.c [iso-8859-1] Wed May 27 16:03:18 2009 @@ -9,6 +9,9 @@ /* INCLUDES *********************************************************/ #include "globalvar.h" +#include "dib.h" +#include "drawing.h" +#include "history.h" /* FUNCTIONS ********************************************************/ Modified: trunk/reactos/base/applications/paint/selection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/se… ============================================================================== --- trunk/reactos/base/applications/paint/selection.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/selection.c [iso-8859-1] Wed May 27 16:03:18 2009 @@ -10,6 +10,9 @@ #include <windows.h> #include "globalvar.h" +#include "drawing.h" +#include "history.h" +#include "mouse.h" /* FUNCTIONS ********************************************************/ Modified: trunk/reactos/base/applications/paint/toolsettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/to… ============================================================================== --- trunk/reactos/base/applications/paint/toolsettings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/toolsettings.c [iso-8859-1] Wed May 27 16:03:18 2009 @@ -10,6 +10,7 @@ #include <windows.h> #include "globalvar.h" +#include "drawing.h" /* FUNCTIONS ********************************************************/ Modified: trunk/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/wi… ============================================================================== --- trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] Wed May 27 16:03:18 2009 @@ -16,7 +16,10 @@ #include "definitions.h" #include "globalvar.h" #include "dialogs.h" +#include "dib.h" +#include "drawing.h" #include "history.h" +#include "mouse.h" /* FUNCTIONS ********************************************************/ @@ -59,11 +62,11 @@ { char programname[20]; char saveprompttext[100]; - LoadString(hProgInstance, IDS_PROGRAMNAME, (LPTSTR)&programname, 20); - LoadString(hProgInstance, IDS_SAVEPROMPTTEXT, (LPTSTR)&saveprompttext, 100); + LoadString(hProgInstance, IDS_PROGRAMNAME, (LPTSTR)programname, sizeof(programname)); + LoadString(hProgInstance, IDS_SAVEPROMPTTEXT, (LPTSTR)saveprompttext, sizeof(saveprompttext)); char temptext[500]; sprintf(temptext, saveprompttext, filename); - switch (MessageBox(hwnd, (LPTSTR)&temptext, (LPTSTR)&programname, MB_YESNOCANCEL | MB_ICONQUESTION)) + switch (MessageBox(hwnd, (LPTSTR)temptext, (LPTSTR)programname, MB_YESNOCANCEL | MB_ICONQUESTION)) { case IDNO: DestroyWindow(hwnd); @@ -361,9 +364,9 @@ HICON paintIcon = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDI_APPICON)); char infotitle[100]; char infotext[200]; - LoadString(hProgInstance, IDS_INFOTITLE, (LPTSTR)&infotitle, 100); - LoadString(hProgInstance, IDS_INFOTEXT, (LPTSTR)&infotext, 200); - ShellAbout(hMainWnd, (LPTSTR)&infotitle, (LPTSTR)&infotext, paintIcon); + LoadString(hProgInstance, IDS_INFOTITLE, (LPTSTR)infotitle, sizeof(infotitle)); + LoadString(hProgInstance, IDS_INFOTEXT, (LPTSTR)infotext, sizeof(infotext)); + ShellAbout(hMainWnd, (LPTSTR)infotitle, (LPTSTR)infotext, paintIcon); DeleteObject(paintIcon); } break; @@ -387,10 +390,10 @@ updateCanvasAndScrollbars(); char tempstr[1000]; char resstr[100]; - CopyMemory(&filename, ofn.lpstrFileTitle, 256); - CopyMemory(&filepathname, ofn.lpstrFileTitle, 1000); - LoadString(hProgInstance, IDS_WINDOWTITLE, (LPTSTR)&resstr, 100); - sprintf(tempstr, resstr, &filename); + CopyMemory(filename, ofn.lpstrFileTitle, sizeof(filename)); + CopyMemory(filepathname, ofn.lpstrFileTitle, sizeof(filepathname)); + LoadString(hProgInstance, IDS_WINDOWTITLE, (LPTSTR)resstr, sizeof(resstr)); + sprintf(tempstr, resstr, filename); SetWindowText(hMainWnd, tempstr); clearHistory(); isAFile = TRUE; @@ -399,7 +402,7 @@ break; case IDM_FILESAVE: if (isAFile) - SaveDIBToFile(hBms[currInd], &filepathname, hDrawingDC); + SaveDIBToFile(hBms[currInd], filepathname, hDrawingDC); else SendMessage(hwnd, WM_COMMAND, IDM_FILESAVEAS, 0); break; @@ -409,10 +412,10 @@ SaveDIBToFile(hBms[currInd], sfn.lpstrFile, hDrawingDC); char tempstr[1000]; char resstr[100]; - CopyMemory(&filename, sfn.lpstrFileTitle, 256); - CopyMemory(&filepathname, sfn.lpstrFileTitle, 1000); - LoadString(hProgInstance, IDS_WINDOWTITLE, (LPTSTR)&resstr, 100); - sprintf(tempstr, resstr, &filename); + CopyMemory(filename, sfn.lpstrFileTitle, sizeof(filename)); + CopyMemory(filepathname, sfn.lpstrFileTitle, sizeof(filepathname)); + LoadString(hProgInstance, IDS_WINDOWTITLE, (LPTSTR)resstr, sizeof(resstr)); + sprintf(tempstr, resstr, filename); SetWindowText(hMainWnd, tempstr); isAFile = TRUE; } @@ -503,7 +506,7 @@ break; case IDM_IMAGEATTRIBUTES: { - int attrdata[8] = {0, 0, 0, 0, 0, 0, 0, 0}; + //int attrdata[8] = {0, 0, 0, 0, 0, 0, 0, 0}; attributesDlg(); //cropReversible(640, 200); //ZoomTo(zoom);

1 0

[dgorbachev] 41140: Fix build, part 2.
by dgorbachev＠svn.reactos.org 27 May '09

27 May '09

Author: dgorbachev Date: Wed May 27 15:50:52 2009 New Revision: 41140 URL: http://svn.reactos.org/svn/reactos?rev=41140&view=rev Log: Fix build, part 2. Modified: trunk/reactos/drivers/bus/pci/pdo.c Modified: trunk/reactos/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] Wed May 27 15:50:52 2009 @@ -701,7 +701,7 @@ } /* Calculate the resource list size */ - ListSize = FIELD_OFFSET(CM_RESOURCE_LIST, List->PartialResourceList.PartialDescriptors) + ListSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors) + ResCount * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); /* Allocate the resource list */

1 0

[dgorbachev] 41139: Trying to fix build.
by dgorbachev＠svn.reactos.org 27 May '09

27 May '09

Author: dgorbachev Date: Wed May 27 15:42:18 2009 New Revision: 41139 URL: http://svn.reactos.org/svn/reactos?rev=41139&view=rev Log: Trying to fix build. Modified: trunk/reactos/drivers/bus/pci/pdo.c Modified: trunk/reactos/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] Wed May 27 15:42:18 2009 @@ -393,7 +393,7 @@ } /* Calculate the resource list size */ - ListSize = FIELD_OFFSET(IO_RESOURCE_REQUIREMENTS_LIST, List->Descriptors) + ListSize = FIELD_OFFSET(IO_RESOURCE_REQUIREMENTS_LIST, List[0].Descriptors) + ResCount * sizeof(IO_RESOURCE_DESCRIPTOR); DPRINT("ListSize %lu (0x%lx)\n", ListSize, ListSize);

1 0

[dgorbachev] 41138: Fix warnings that are issued by new GCC versions.
by dgorbachev＠svn.reactos.org 27 May '09

27 May '09

Author: dgorbachev Date: Wed May 27 14:55:41 2009 New Revision: 41138 URL: http://svn.reactos.org/svn/reactos?rev=41138&view=rev Log: Fix warnings that are issued by new GCC versions. Modified: trunk/reactos/include/ddk/ntdef.h trunk/reactos/include/host/typedefs.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=41… ============================================================================== --- trunk/reactos/include/ddk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Wed May 27 14:55:41 2009 @@ -156,8 +156,12 @@ // Returns the byte offset of the specified structure's member // #ifndef FIELD_OFFSET +#ifndef __GNUC__ #define FIELD_OFFSET(Type, Field) \ ((LONG)(LONG_PTR) (&(((Type *) 0)->Field))) +#else +#define FIELD_OFFSET(Type, Field) __builtin_offsetof(Type, Field) +#endif #endif // Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h [iso-8859-1] (original) +++ trunk/reactos/include/host/typedefs.h [iso-8859-1] Wed May 27 14:55:41 2009 @@ -218,7 +218,11 @@ #define MAKELONG(a,b) ((LONG)(((WORD)(a))|(((DWORD)((WORD)(b)))<<16))) #define NT_SUCCESS(x) ((x)>=0) +#if !defined(__GNUC__) #define FIELD_OFFSET(t,f) ((LONG_PTR)&(((t*)0)->f)) +#else +#define FIELD_OFFSET(t,f) __builtin_offsetof(t,f) +#endif #define RTL_CONSTANT_STRING(s) { sizeof(s)-sizeof((s)[0]), sizeof(s), s } #define CONTAINING_RECORD(address, type, field) ((type *)(((ULONG_PTR)address) - (ULONG_PTR)(&(((type *)0)->field)))) Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Wed May 27 14:55:41 2009 @@ -1280,7 +1280,11 @@ #define RTL_CRITSECT_TYPE 0 #define RTL_RESOURCE_TYPE 1 /* Also in winddk.h */ +#ifndef __GNUC__ #define FIELD_OFFSET(t,f) ((LONG_PTR)&(((t*)0)->f)) +#else +#define FIELD_OFFSET(t,f) __builtin_offsetof(t,f) +#endif #ifndef CONTAINING_RECORD #define CONTAINING_RECORD(address, type, field) \ ((type *)(((ULONG_PTR)address) - (ULONG_PTR)(&(((type *)0)->field))))

1 0

[cwittich] 41137: add msi installer project (req. WiX v3)
by cwittich＠svn.reactos.org 27 May '09

27 May '09

Author: cwittich Date: Wed May 27 14:53:33 2009 New Revision: 41137 URL: http://svn.reactos.org/svn/reactos?rev=41137&view=rev Log: add msi installer project (req. WiX v3) Added: trunk/tools/reactosdbg/Installer/ (with props) trunk/tools/reactosdbg/Installer/Installer.wixproj (with props) trunk/tools/reactosdbg/Installer/Product.wxs (with props) Modified: trunk/tools/reactosdbg/ReactosDBG.sln Propchange: trunk/tools/reactosdbg/Installer/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed May 27 14:53:33 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/tools/reactosdbg/Installer/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/tools/reactosdbg/Installer/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/tools/reactosdbg/Installer/Installer.wixproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Installer/Install… ============================================================================== --- trunk/tools/reactosdbg/Installer/Installer.wixproj (added) +++ trunk/tools/reactosdbg/Installer/Installer.wixproj [iso-8859-1] Wed May 27 14:53:33 2009 @@ -1,0 +1,64 @@ +ï»¿<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">x86</Platform> + <ProductVersion>3.0</ProductVersion> + <ProjectGuid>{b2c4fede-c383-49a2-b871-d17da238bb47}</ProjectGuid> + <SchemaVersion>2.0</SchemaVersion> + <OutputName>RosDbg</OutputName> + <OutputType>Package</OutputType> + <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath> + <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <OutputPath>bin\$(Configuration)\</OutputPath> + <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> + <DefineConstants>Debug</DefineConstants> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <OutputPath>bin\$(Configuration)\</OutputPath> + <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> + </PropertyGroup> + <ItemGroup> + <Compile Include="Product.wxs" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\DbgHelp\DbgHelp.csproj"> + <Name>DbgHelp</Name> + <Project>{3442437a-cb9c-4c73-b35b-3f6e4f60f3b2}</Project> + <Private>True</Private> + </ProjectReference> + <ProjectReference Include="..\DebugProtocol\DebugProtocol.csproj"> + <Name>DebugProtocol</Name> + <Project>{76a02c1d-4b11-4d43-966e-e5c053870d65}</Project> + <Private>True</Private> + </ProjectReference> + <ProjectReference Include="..\Pipe\Pipe.csproj"> + <Name>Pipe</Name> + <Project>{f943218a-0a5e-436e-a7a4-475f37f45fa8}</Project> + <Private>True</Private> + </ProjectReference> + <ProjectReference Include="..\RosDBG\RosDBG.csproj"> + <Name>RosDBG</Name> + <Project>{fb776bfe-d2c2-465e-b713-6ad82cae1a39}</Project> + <Private>True</Private> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <WixExtension Include="WixNetFxExtension"> + <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath> + </WixExtension> + <WixExtension Include="WixUIExtension"> + <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath> + </WixExtension> + </ItemGroup> + <Import Project="$(WixTargetsPath)" /> +  +</Project> Propchange: trunk/tools/reactosdbg/Installer/Installer.wixproj ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/reactosdbg/Installer/Product.wxs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Installer/Product… ============================================================================== --- trunk/tools/reactosdbg/Installer/Product.wxs (added) +++ trunk/tools/reactosdbg/Installer/Product.wxs [iso-8859-1] Wed May 27 14:53:33 2009 @@ -1,0 +1,105 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <Product Id="c10bd463-0752-4b27-82ab-fc852bb11ee3" Name="ReactOS Remote Debugger" Language="1033" Version="1.0.0.0" Manufacturer="ReactOS Team" UpgradeCode="ea120514-a7ac-44c9-b68f-819bb15d22bd"> + <Package InstallerVersion="200" Compressed="yes" /> + + <Media Id="1" Cabinet="media1.cab" EmbedCab="yes" /> + + <Directory Id="TARGETDIR" Name="SourceDir"> + + <Directory Id="ProgramFilesFolder"> + <Directory Id="INSTALLLOCATION" Name="ReactOS Remote Debugger"> + <Component Id ="ProgramFiles" Guid ="326981F4-EF71-49fc-BE0C-9433F674F059"> + + + <File Id="dbghelp.dll" Name="dbghelp.dll" Source="$(var.SolutionDir)dbghelptest\dbghelp.dll" DiskId="1"/> + <File Id="$(var.DbgHelp.TargetFileName)" Name="$(var.DbgHelp.TargetFileName)" Source="$(var.DbgHelp.TargetPath)" DiskId="1"/> + <File Id="$(var.Pipe.TargetFileName)" Name="$(var.Pipe.TargetFileName)" Source="$(var.Pipe.TargetPath)" DiskId="1"/> + <File Id="$(var.DebugProtocol.TargetFileName)" Name="$(var.DebugProtocol.TargetFileName)" Source="$(var.DebugProtocol.TargetPath)" DiskId="1"/> + <File Id="$(var.RosDBG.TargetFileName)" Name="$(var.RosDBG.TargetFileName)" Source="$(var.RosDBG.TargetPath)" DiskId="1" KeyPath="yes"> + <Shortcut Id="startmenuRosDbg" Directory="ProgramMenuDir" Name="ReactOS Remote Debugger" WorkingDirectory='INSTALLDIR' + Icon="$(var.RosDBG.TargetFileName)" IconIndex="0" Advertise="yes" /> + <Shortcut Id="desktopRosDbg" Directory="DesktopFolder" Name="ReactOS Remote Debugger" WorkingDirectory='INSTALLDIR' + Icon="$(var.RosDBG.TargetFileName)" IconIndex="0" Advertise="yes" /> + </File> + </Component> + </Directory> + </Directory> + + <Directory Id="ProgramMenuFolder"> + <Directory Id="ProgramMenuDir" Name='ReactOS Remote Debugger'> + <Component Id='ProgramMenuDir' Guid='C8B5EF28-F6D9-40a6-B7CB-6F6BF22FC0D7'> + <RemoveFolder Id='ProgramMenuDir' On='uninstall'/> + <RegistryValue Root='HKCU' Key='SOFTWARE\ReactOS\RosDbg' + Type='string' Value='StartMenuFolder' + KeyPath='yes' /> + </Component > + </Directory> + </Directory> + <Directory Id="DesktopFolder" Name="Desktop" /> + + </Directory> + + <Icon Id="$(var.RosDBG.TargetFileName)" SourceFile="$(var.RosDBG.TargetPath)" /> + + <Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" /> + <UIRef Id="WixUI_Common" /> + <UIRef Id="WixUI_ErrorProgressText" /> + + <UI Id="WixUI_InstallDir"> + <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" /> + <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" /> + <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" /> + + <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" /> + <Property Id="WixUI_Mode" Value="InstallDir" /> + + <DialogRef Id="BrowseDlg" /> + <DialogRef Id="DiskCostDlg" /> + <DialogRef Id="ErrorDlg" /> + <DialogRef Id="FatalError" /> + <DialogRef Id="FilesInUse" /> + <DialogRef Id="MsiRMFilesInUse" /> + <DialogRef Id="PrepareDlg" /> + <DialogRef Id="ProgressDlg" /> + <DialogRef Id="ResumeDlg" /> + <DialogRef Id="UserExit" /> + + <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish> + <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish> + + <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish> + + <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">1</Publish> + + <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish> + <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish> + <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">1</Publish> + <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish> + <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID="1"]]></Publish> + <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish> + <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish> + + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1">NOT Installed</Publish> + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed</Publish> + + <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish> + + <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish> + + <Property Id="ARPNOMODIFY" Value="1" /> + </UI> + + <PropertyRef Id="NETFRAMEWORK35" /> + <Condition Message="This setup requires the .NET Framework 3.5 to be installed."> + Installed OR NETFRAMEWORK35 + </Condition> + + <Feature Id="ProductFeature" Title="ReactOS Remote Debugger" Level="1"> + <ComponentRef Id='ProgramFiles' /> + <ComponentRef Id='ProgramMenuDir' /> + </Feature> + </Product> +</Wix> Propchange: trunk/tools/reactosdbg/Installer/Product.wxs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/reactosdbg/ReactosDBG.sln URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/ReactosDBG.sln?re… ============================================================================== --- trunk/tools/reactosdbg/ReactosDBG.sln [iso-8859-1] (original) +++ trunk/tools/reactosdbg/ReactosDBG.sln [iso-8859-1] Wed May 27 14:53:33 2009 @@ -1,6 +1,6 @@ ï»¿ Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C# Express 2008 +# Visual Studio 2008 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RosDBG", "RosDBG\RosDBG.csproj", "{FB776BFE-D2C2-465E-B713-6AD82CAE1A39}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DebugProtocol", "DebugProtocol\DebugProtocol.csproj", "{76A02C1D-4B11-4D43-966E-E5C053870D65}" @@ -9,28 +9,68 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbgHelp", "DbgHelp\DbgHelp.csproj", "{3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}" EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{B2C4FEDE-C383-49A2-B871-D17DA238BB47}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|Mixed Platforms = Debug|Mixed Platforms + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|Mixed Platforms = Release|Mixed Platforms + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|x86.ActiveCfg = Debug|Any CPU {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|Any CPU.ActiveCfg = Release|Any CPU {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|Any CPU.Build.0 = Release|Any CPU + {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|x86.ActiveCfg = Release|Any CPU {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|Any CPU.Build.0 = Debug|Any CPU + {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|x86.ActiveCfg = Debug|Any CPU {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|Any CPU.ActiveCfg = Release|Any CPU {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|Any CPU.Build.0 = Release|Any CPU + {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|x86.ActiveCfg = Release|Any CPU {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|x86.ActiveCfg = Debug|Any CPU {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|Any CPU.ActiveCfg = Release|Any CPU {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|Any CPU.Build.0 = Release|Any CPU + {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|x86.ActiveCfg = Release|Any CPU {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|x86.ActiveCfg = Debug|Any CPU {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|Any CPU.ActiveCfg = Release|Any CPU {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|Any CPU.Build.0 = Release|Any CPU + {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|x86.ActiveCfg = Release|Any CPU + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|Any CPU.ActiveCfg = Debug|x86 + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|x86.ActiveCfg = Debug|x86 + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|x86.Build.0 = Debug|x86 + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Release|Any CPU.ActiveCfg = Release|x86 + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Release|Mixed Platforms.Build.0 = Release|x86 + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Release|x86.ActiveCfg = Release|x86 + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2009