Commit a1d12ad5 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

kernel32: Don't clear WINEDEBUG in the debugger process if +winedbg is set.

parent 7973699a
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DEFAULT_DEBUG_CHANNEL(seh);
WINE_DECLARE_DEBUG_CHANNEL(winedbg);
static PTOP_LEVEL_EXCEPTION_FILTER top_filter; static PTOP_LEVEL_EXCEPTION_FILTER top_filter;
...@@ -289,6 +290,8 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent) ...@@ -289,6 +290,8 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent)
/* make WINEDEBUG empty in the environment */ /* make WINEDEBUG empty in the environment */
env = GetEnvironmentStringsA(); env = GetEnvironmentStringsA();
if (!TRACE_ON(winedbg))
{
for (p = env; *p; p += strlen(p) + 1) for (p = env; *p; p += strlen(p) + 1)
{ {
if (!memcmp( p, "WINEDEBUG=", sizeof("WINEDEBUG=")-1 )) if (!memcmp( p, "WINEDEBUG=", sizeof("WINEDEBUG=")-1 ))
...@@ -300,6 +303,7 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent) ...@@ -300,6 +303,7 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent)
break; break;
} }
} }
}
TRACE("Starting debugger %s\n", debugstr_a(cmdline)); TRACE("Starting debugger %s\n", debugstr_a(cmdline));
memset(&startup, 0, sizeof(startup)); memset(&startup, 0, sizeof(startup));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment