Rebase against 3bb824f98891e8eb907c9c652fe528373a17b10d.

This commit is contained in:
Zebediah Figura
2020-05-18 17:57:40 -05:00
parent 68f3e40ff7
commit 0a85e3f331
10 changed files with 88 additions and 74 deletions

View File

@@ -1,17 +1,17 @@
From 83bfe1190916708b3ffa46397b589fe39dfca591 Mon Sep 17 00:00:00 2001
From a3c6f83abc21e88b69bb6b50e02892ab78a04774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 27 May 2019 09:19:56 +1000
Subject: [PATCH] libwine: Add process specific debug channels.
---
dlls/ntdll/debugtools.c | 28 ++++++++++++++++++++++++++--
dlls/ntdll/unix/debug.c | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c
index 64355ab..366e71e 100644
--- a/dlls/ntdll/debugtools.c
+++ b/dlls/ntdll/debugtools.c
@@ -30,6 +30,7 @@
diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c
index 7bc7787c9de..cf4ce6fb9a6 100644
--- a/dlls/ntdll/unix/debug.c
+++ b/dlls/ntdll/unix/debug.c
@@ -34,6 +34,7 @@
#endif
#include "wine/debug.h"
@@ -19,7 +19,7 @@ index 64355ab..366e71e 100644
#include "ntdll_misc.h"
WINE_DECLARE_DEBUG_CHANNEL(pid);
@@ -103,10 +104,22 @@ static void add_option( const char *name, unsigned char set, unsigned char clear
@@ -107,10 +108,22 @@ static void add_option( const char *name, unsigned char set, unsigned char clear
nb_debug_options++;
}
@@ -43,7 +43,7 @@ index 64355ab..366e71e 100644
unsigned int i;
if (!(options = strdup(str))) return;
@@ -117,6 +130,17 @@ static void parse_options( const char *str )
@@ -121,6 +134,17 @@ static void parse_options( const char *str )
if ((next = strchr( opt, ',' ))) *next++ = 0;
@@ -61,7 +61,7 @@ index 64355ab..366e71e 100644
p = opt + strcspn( opt, "+-" );
if (!p[0]) p = opt; /* assume it's a debug channel name */
@@ -157,7 +181,7 @@ static void debug_usage(void)
@@ -161,7 +185,7 @@ static void debug_usage(void)
{
static const char usage[] =
"Syntax of the WINEDEBUG variable:\n"
@@ -71,5 +71,5 @@ index 64355ab..366e71e 100644
" turns on relay traces, disable heap warnings\n"
"Available message classes: err, warn, fixme, trace\n";
--
1.9.1
2.26.2