Start on dumper support for CDB, bug fixes.

Make command execution output shown, use Wide version
of Debug Callbacks and output, provide bases classes
for other output and event handlers, move common
dumper functionality into debugger manager.

1 files changed, 1 insertions, 4 deletions

diff --git a/src/plugins/debugger/cdb/cdbassembler.cpp b/src/plugins/debugger/cdb/cdbassembler.cpp
index 4cb59c7d69..ae030578c9 100644
--- a/src/plugins/debugger/cdb/cdbassembler.cpp
+++ b/src/plugins/debugger/cdb/cdbassembler.cpp
@@ -212,14 +212,11 @@ bool dissassemble(IDebugClient5 *client,
     // in assembler code). We build a complete string first as line breaks
     // may occur in-between messages.
     StringOutputHandler stringHandler;
-    IDebugOutputCallbacksWide *oldHandler = CdbDebugOutputBase::getOutputCallback(client);
-    client->SetOutputCallbacksWide(&stringHandler);
+    OutputRedirector redir(client, &stringHandler);
     // For some reason, we need to output to "all clients"
     const HRESULT hr =  ctl->OutputDisassemblyLines(DEBUG_OUTCTL_ALL_CLIENTS,
                                                     beforeLines, beforeLines + afterLines,
                                                     offset, flags, 0, 0, 0, 0);
-    client->SetOutputCallbacksWide(oldHandler);
-
     if (FAILED(hr)) {
         *errorMessage= QString::fromLatin1("Unable to dissamble at 0x%1: %2").
                        arg(QString::number(offset, 16), msgComFailed("OutputDisassemblyLines", hr));