wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Updated libs-Debug_Channel patchset

Browse Source 
Thanks Derek Lesho.
This commit is contained in:
Alistair Leslie-Hughes 2019-05-27 09:31:51 +10:00
parent 7fd92efae8
commit f25c0ce411
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
patches/libs-Debug_Channel/0001-libwine-Add-process-specific-debug-channels.patch
View File

@ -1,17 +1,25 @@
From 90d826bf3bfe4cb92334bdab29fd0b71d5cb947b Mon Sep 17 00:00:00 2001
From 83bfe1190916708b3ffa46397b589fe39dfca591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 16 Apr 2015 21:23:10 +0200
Subject: libwine: Add process specific debug channels.
Date: Mon, 27 May 2019 09:19:56 +1000
Subject: [PATCH] libwine: Add process specific debug channels.
---
libs/wine/debug.c | 27 +++++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
dlls/ntdll/debugtools.c | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/libs/wine/debug.c b/libs/wine/debug.c
index 548ef22..caaf383 100644
--- a/libs/wine/debug.c
+++ b/libs/wine/debug.c
@@ -125,10 +125,22 @@ static void add_option( const char *name, unsigned char set, unsigned char clear
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 @@
#endif
#include "wine/debug.h"
+#include "wine/library.h"
#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
nb_debug_options++;
}
@ -35,7 +43,7 @@ index 548ef22..caaf383 100644
unsigned int i;
if (!(options = strdup(str))) return;
@@ -139,6 +151,17 @@ static void parse_options( const char *str )
@@ -117,6 +130,17 @@ static void parse_options( const char *str )
if ((next = strchr( opt, ',' ))) *next++ = 0;
@ -53,15 +61,15 @@ index 548ef22..caaf383 100644
p = opt + strcspn( opt, "+-" );
if (!p[0]) p = opt; /* assume it's a debug channel name */
@@ -180,7 +203,7 @@ static void debug_usage(void)
@@ -157,7 +181,7 @@ static void debug_usage(void)
{
static const char usage[] =
"Syntax of the WINEDEBUG variable:\n"
- " WINEDEBUG=[class]+xxx,[class]-yyy,...\n\n"
+ " WINEDEBUG=[+process:][class]+xxx,[-process:][class]-yyy,...\n\n"
"Example: WINEDEBUG=+all,warn-heap\n"
" turns on all messages except warning heap messages\n"
"Example: WINEDEBUG=+relay,warn-heap\n"
" turns on relay traces, disable heap warnings\n"
"Available message classes: err, warn, fixme, trace\n";
--
2.3.5
1.9.1