Author: fireball
Date: Sat Jun 28 03:37:56 2008
New Revision: 34146
URL:
http://svn.reactos.org/svn/reactos?rev=34146&view=rev
Log:
- Merge 34111, 34127 (usermode GDB fixes), 34144 (fixing broken links in downloader).
Modified:
branches/ros-branch-0_3_5/reactos/dll/ntdll/ldr/startup.c
branches/ros-branch-0_3_5/reactos/ntoskrnl/dbgk/dbgkobj.c
branches/ros-branch-0_3_5/rosapps/downloader/downloader.xml
Modified: branches/ros-branch-0_3_5/reactos/dll/ntdll/ldr/startup.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_5/reactos/dll/nt…
==============================================================================
--- branches/ros-branch-0_3_5/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original)
+++ branches/ros-branch-0_3_5/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Sat Jun 28
03:37:56 2008
@@ -484,6 +484,10 @@
ZwTerminateProcess(NtCurrentProcess(), STATUS_INVALID_IMAGE_FORMAT);
}
}
+
+ /* Break into debugger */
+ if (Peb->BeingDebugged) DbgBreakPoint();
+
/* attach the thread */
RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock);
LdrpAttachThread();
Modified: branches/ros-branch-0_3_5/reactos/ntoskrnl/dbgk/dbgkobj.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_5/reactos/ntoskr…
==============================================================================
--- branches/ros-branch-0_3_5/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original)
+++ branches/ros-branch-0_3_5/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Sat Jun 28
03:37:56 2008
@@ -865,6 +865,9 @@
/* Copy the exception record */
WaitStateChange->StateInfo.Exception.ExceptionRecord =
DebugEvent->ApiMsg.Exception.ExceptionRecord;
+ /* Copy FirstChance flag */
+ WaitStateChange->StateInfo.Exception.FirstChance =
+ DebugEvent->ApiMsg.Exception.FirstChance;
break;
/* Process exited */
@@ -1598,7 +1601,7 @@
if (NeedsWake)
{
/* Set the continue status */
- DebugEvent->ApiMsg.ReturnedStatus = Status;
+ DebugEvent->ApiMsg.ReturnedStatus = ContinueStatus;
DebugEvent->Status = STATUS_SUCCESS;
/* Wake the target */
Modified: branches/ros-branch-0_3_5/rosapps/downloader/downloader.xml
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_5/rosapps/downlo…
==============================================================================
--- branches/ros-branch-0_3_5/rosapps/downloader/downloader.xml [iso-8859-1] (original)
+++ branches/ros-branch-0_3_5/rosapps/downloader/downloader.xml [iso-8859-1] Sat Jun 28
03:37:56 2008
@@ -8,11 +8,11 @@
<location>http://svn.reactos.org/packages/Firefox%20Setup%201.5.0.12.exe</location>
</application>
<application name="Firefox 2.0">
- <regname>Mozilla Firefox (2.0.0.13)</regname>
- <licence>MPL/GPL/LGPL</licence>
- <version>2.0.0.13</version>
+ <regname>Mozilla Firefox (2.0.0.14)</regname>
+ <licence>MPL/GPL/LGPL</licence>
+ <version>2.0.0.14</version>
<description>The most popular and one of the best free Web Browsers out
there.</description>
- <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-2.0/win32/en-US/Firefox%20Setup%202.0.0.13.exe</location>
+ <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-2.0/win32/en-US/Firefox%20Setup%202.0.0.14.exe</location>
</application>
<application name="Opera">
<regname>Opera</regname>
@@ -29,11 +29,11 @@
<location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-1.5/win32/en-US/Thunderbird%20Setup%201.5.0.14.exe</location>
</application>
<application name="Thunderbird 2.0">
- <regname>Mozilla Thunderbird (2.0.0.12)</regname>
- <licence>MPL/GPL/LGPL</licence>
- <version>2.0.0.12</version>
+ <regname>Mozilla Thunderbird (2.0.0.14)</regname>
+ <licence>MPL/GPL/LGPL</licence>
+ <version>2.0.0.14</version>
<description>The most popular and one of the best free Mail Clients out
there.</description>
- <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-2.0/win32/en-US/Thunderbird%20Setup%202.0.0.12.exe</location>
+ <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.14/win32/en-US/Thunderbird%20Setup%202.0.0.14.exe</location>
</application>
<application name="SeaMonkey">
<regname>SeaMonkey (1.1.9)</regname>
@@ -212,7 +212,7 @@
<regname>Audiograbber 1.83 SE</regname>
<version>1.83 SE</version>
<description>A very good CD Ripper/Audio File Converter.</description>
- <location>http://www.audiograbber.de/files/342677432/agsetup183se.exe</location>
+ <location>http://www.audiograbber.de/files/4898276276/agsetup183se.exe</location>
</application>
</category>
<category name="Others" icon="8">