aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/windows-nat.c3
2 files changed, 8 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1d64788..f5ea395 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
2015-04-22 Jon Turney <jon.turney@dronecode.org.uk>
+ * windows-nat.c (handle_output_debug_string): Don't change
+ current_event.dwThreadId.
+ (get_windows_debug_event): Use thread_id, rather than relying on
+ current_event.dwThreadId being changed.
+
+2015-04-22 Jon Turney <jon.turney@dronecode.org.uk>
+
* windows-nat.c (windows_continue): Report an error if
ContinueDebugEvent() fails.
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 6942d64..be5d7e8 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -850,7 +850,6 @@ handle_output_debug_string (struct target_waitstatus *ourstatus)
__COPY_CONTEXT_SIZE, &n)
&& n == __COPY_CONTEXT_SIZE)
have_saved_context = 1;
- current_event.dwThreadId = retval;
}
}
#endif
@@ -1509,7 +1508,7 @@ get_windows_debug_event (struct target_ops *ops,
thread_id);
current_thread = th;
if (!current_thread)
- current_thread = thread_rec (current_event.dwThreadId, TRUE);
+ current_thread = thread_rec (thread_id, TRUE);
}
out: