diff --git a/documentation/debugging.sgml b/documentation/debugging.sgml
index 3a1bfffbf3a..760b61a7bfa 100644
--- a/documentation/debugging.sgml
+++ b/documentation/debugging.sgml
@@ -9,15 +9,6 @@
-
- The new debugging interface can be considered to be
- stable, with the exception of the in-memory message
- construction functions. However, there is still a lot of
- work to be done to polish things up. To make my life
- easier, please follow the guidelines described in this
- document.
-
-
It is possible to turn on and of debugging output from
within the debuger using the set command. Please see the
@@ -26,13 +17,6 @@
-
- Read this document before writing new code. DO NOT USE
- fprintf (or
- printf) to output things. Also, instead
- of writing FIXMEs in the source, output a FIXME message if
- you can.
-
At the end of the document, there is a "Style Guide" for
debugging messages. Please read it.
@@ -43,16 +27,16 @@
Debugging classes
- There are 4 types (or classes) of debugging messages:
+ There are 4 types (or classes) of messages:
FIXME
- Messages in this class relate to behavior of Wine that
- does not correspond to standard Windows behavior and
- that should be fixed.
+ Messages in this class are meant to signal unimplemented
+ features, known bugs, etc. They serve as a constant and
+ active reminder of what needs to be done.
Examples: stubs, semi-implemented features, etc.
@@ -62,11 +46,9 @@
Messages in this class relate to serious errors in
- Wine. This sort of messages are close to asserts --
- that is, you should output an error message when the
- code detects a condition which should not happen. In
- other words, important things that are not warnings
- (see below), are errors.
+ Wine. This sort of messages signal an inconsistent
+ internal state, or more general, a condition which
+ should never happen by design.
Examples: unexpected change in internal state, etc.
@@ -86,8 +68,7 @@
not deal correctly with it, output a fixme.
- Examples: fail to access a resource required by the
- app, etc.
+ Examples: fail to access a resource required by the app.
@@ -96,7 +77,7 @@
These are detailed debugging messages that are mainly
- useful to debug a component. These are usually turned
+ useful to debug a component. These are usually turned
off.
@@ -107,60 +88,14 @@
-
-
- The user has the capability to turn on or off messages of a
- particular type. You can expect the following patterns of
- usage (but note that any combination is possible):
-
-
-
-
- when you debug a component, all types
- (TRACE, WARN,
- ERR, FIXME) will
- be enabled.
-
-
-
-
- during the pre-alpha (maybe alpha) stage of Wine, most
- likely the TRACE class will be
- disabled by default, but all others
- (WARN, ERR,
- FIXME) will be enabled by default.
-
-
-
-
- when Wine will become stable, most likely the
- TRACE and WARN
- classes will be disabled by default, but all
- ERRs and FIXMEs
- will be enabled.
-
-
-
-
- in some installations that want the smallest footprint
- and where the debug information is of no interest, all
- classes may be disabled by default.
-
-
-
-
- Of course, the user will have the runtime ability to
- override these defaults. However, this ability may be turned
- off and certain classes of messages may be completely
- disabled at compile time to reduce the size of Wine.
-
Debugging channels
- Also, we divide the debugging messages on a component basis.
+ To better manage the large volume of debugging messages that
+ Wine can generate, we divide them also on a component basis.
Each component is assigned a debugging channel. The
identifier of the channel must be a valid C identifier but
note that it may also be a reserved word like
@@ -177,109 +112,57 @@
We will refer to a generic channel as xxx.
-
-
- for those who know the old interface, the channel/type is
- what followed the _ in the
- dprintf_xxx statements. For example,
- to output a message on the debugging channel
- reg in the old interface you would had
- to write:
-
-
-dprintf_reg(stddeb, "Could not access key!\n");
-
-
- In the new interface, we drop the
- stddeb as it is implicit. However, we
- add an orthogonal piece of information to the message: its
- class. This is very important as it will allow us to
- selectively turn on or off certain messages based on the
- type of information they report. For this reason it is
- essential to choose the right class for the message.
- Anyhow, suppose we figured that this message should belong
- in the WARN class, so in the new
- interface, you write:
-
-
-WARN(reg, "Could not access key!\n");
-
-
How to use it
- So, to output a message (class YYY) on
- channel xxx, do:
-
+ Typically, a file contains code pertaining to only one component,
+ and as such, there is only one channel to output to. To simplify
+ usage, you can declare that channel at the beginning of the file,
+ and simply write FIXMEs, ERRs, etc. as such:
+
-#include "debugtools.h"
-
-....
-
-YYY(xxx, "<message>", ...);
-
-
- Some examples from the code:
-
-
-#include "debugtools.h"
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(xxx);
...
- TRACE(crtdll, "CRTDLL_setbuf(file %p buf %p)", file, buf);
-
- WARN(aspi, "Error opening device errno=%d", save_error);
+ FIXME("some unimplemented feature", ...);
+...
+ if (zero != 0)
+ ERR("This should never be non-null: %d", zero);
+...
+
+
+ I rare situations there is a need to output to more then one
+ debug channel per file. In such cases, you need to declare
+ all the additional channels at the top of the file, and
+ use the _-version of the debugging macros:
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(xxx);
+WINE_DECLARE_DEBUG_CHANNEL(yyy);
+WINE_DECLARE_DEBUG_CHANNEL(zzz);
+...
+
+ FIXME("this one goes to xxx channel");
+...
+ FIXME_(yyy)("Some other msg for the yyy channel");
+...
+ WARN_(zzz)("And yet another msg on another channel!");
+...
+
+
+
- If you need to declare a new debugging channel, use it in
- your code and then do:
-
-
-%tools/make_debug
-
-
- in the root directory of Wine. Note that this will result in
- almost complete recompilation of Wine.
+ If you need to declare a new debugging channel, simply use it in
+ your code. It will be picked up automatically by the build process.
-
-
-
-
- Please pay attention to which class you assign the
- message. There are only 4 classes, so it is not hard.
- The reason it is important to get it right is that too
- much information is no information. For example, if
- you put things into the WARN class
- that should really be in the TRACE
- class, the output will be too big and this will force
- the user to turn warnings off. But this way he will
- fail to see the important ones. Also, if you put
- warnings into the TRACE class lets
- say, he will most likely miss those because usually
- the TRACE class is turned off. A
- similar argument can be made if you mix any other two
- classes.
-
-
-
-
- All lines should end with a newline. If you can NOT
- output everything that you want in the line with only
- one statement, then you need to build the string in
- memory. Please read the section below "In-memory
- messages" on the preferred way to do it. PLEASE USE
- THAT INTERFACE TO BUILD MESSAGES IN MEMORY. The reason
- is that we are not sure that we like it and having
- everything in one format will facilitate the
- (automatic) translation to a better interface.
-
-
-
-
@@ -315,155 +198,6 @@ if(TRACE_ON(atom)){
-
- In-memory messages
-
-
- If you NEED to build the message from multiple calls, you
- need to build it in memory. To do that, you should use the
- following interface:
-
-
-
-
-
- declare a string (where you are allowed to declare C
- variables) as follows:
-
-dbg_decl_str(name, len);
-
- where name is the name of the
- string (you should use the channel name on which you
- are going to output it)
-
-
-
-
- print in it with:
-
-dsprintf(name, "<message>", ...);
-
- which is just like a sprintf
- function but instead of a C string as first parameter it
- takes the name you used to declare it.
-
-
-
-
- obtain a pointer to the string with: dbg_str(name)
-
-
-
-
- reset the string (if you want to reuse it with):
-
-dbg_reset_str(name);
-
-
-
-
-
-
- Example (modified from the code):
-
-
-void some_func(tabs)
-{
- INT32 i;
- LPINT16 p = (LPINT16)tabs;
- dbg_decl_str(listbox, 256); /* declare the string */
-
- for (i = 0; i < descr->nb_tabs; i++) {
- descr->tabs[i] = *p++<<1;
- if(TRACING(listbox)) /* write in it only if
- dsprintf(listbox, "%hd ", descr->tabs[i]); /* we are gonna output it */
- }
- TRACE(listbox, "Listbox %04x: settabstops %s",
- wnd->hwndSelf, dbg_str(listbox)); /* output the whole thing */
-}
-
-
- If you need to use it two times in the same scope do like
- this:
-
-
-void some_func(tabs)
-{
- INT32 i;
- LPINT16 p = (LPINT16)tabs;
- dbg_decl_str(listbox, 256); /* declare the string */
-
- for (i = 0; i < descr->nb_tabs; i++) {
- descr->tabs[i] = *p++<<1;
- if(TRACING(listbox)) /* write in it only if
- dsprintf(listbox, "%hd ", descr->tabs[i]); /* we are gonna output it */
- }
- TRACE(listbox, "Listbox %04x: settabstops %s\n",
- wnd->hwndSelf, dbg_str(listbox)); /* output the whole thing */
-
- dbg_reset_str(listbox); /* !!!reset the string!!! */
- for (i = 0; i < descr->extrainfo_nr; i++) {
- descr->extrainfo = *p+1;
- if(TRACING(listbox)) /* write in it only if
- dsprintf(listbox,"%3d ",descr->extrainfo); /* we are gonna output it */
- }
-
- TRACE(listbox, "Listbox %04x: extrainfo %s\n",
- wnd->hwndSelf, dbg_str(listbox)); /* output the whole thing */
-
-}
-
-
-
-
- As I already stated, I do not think this will be the
- ultimate interface for building in-memory debugging
- messages. In fact, I do have better ideas which I hope to
- have time to implement for the next release. For this
- reason, please try not to use it. However, if you need to
- output a line in more than one
- dprintf_xxx calls, then USE THIS
- INTERFACE. DO NOT use other methods. This way, I will
- easily translate everything to the new interface (when it
- will become available). So, if you need to use it, then
- follow the following guidelines:
-
-
-
- wrap calls to dsprintf with a
-
-
-if(YYY(xxx))
- dsprintf(xxx,...);
-
-
- Of course, if the call to
- dsprintf is made from within a
- function which you know is called only if
- YYY(xxx) is true, for example if
- you call it only like this:
-
-
-if(YYY(xxx))
- print_some_debug_info();
-
-
- then you need not (and should not) wrap calls to
- dsprintf with the before
- mentioned if.
-
-
-
-
- name the string EXACTLY like the debugging channel on
- which is going to be output. Please see the above
- example.
-
-
-
-
-
-
Resource identifiers
@@ -474,7 +208,7 @@ if(YYY(xxx))
introduced a new function called debugres.
- The function is defined in debugstr.h
+ The function is defined in wine/debug.h
and has the following prototype:
@@ -482,35 +216,28 @@ LPSTR debugres(const void *id);
It takes a pointer to the resource id and returns a nicely
- formatted string of the identifier. If the high word of the
- pointer is 0, then it assumes that the
- identifier is a number and thus returns a string of the
- form:
+ formatted string of the identifier (which can be a string or
+ a number, depending on the value of the high word).
+ Numbers are formatted as such:
#xxxx
- where xxxx are 4 hex-digits representing
- the low word of id.
-
-
- If the high word of the pointer is not 0,
- then it assumes that the identifier is a string and thus
- returns a string of the form:
+ while strings as:
-'<identifier>'
+'some-string'
- Thus, to use it, do something on the following lines:
+ Simply use it in your code like this:
-#include "debugtools.h"
+#include "wine/debug.h"
...
- YYY(xxx, "resource is %s", debugres(myresource));
+ TRACE("resource is %s", debugres(myresource));
@@ -518,14 +245,15 @@ LPSTR debugres(const void *id);
The <parameter>--debugmsg</parameter> command line option
- So, the --debugmsg command line
- option has been changed as follows:
+ The --debugmsg command line
+ option controls the output of the debug messages.
+ It has the following syntax:
+ --debugmsg [yyy]#xxx[,[yyy1]#xxx1]*
- the new syntax is: --debugmsg
- [yyy]#xxx[,[yyy1]#xxx1]* where
+ where
# is either + or
-
@@ -544,8 +272,7 @@ LPSTR debugres(const void *id);
enables all messages on the reg
channel and disables all messages on the
- file channel. This is same as the old
- semantics.
+ file channel.
@@ -660,7 +387,7 @@ where:
it as the first thing and include them in parentheses,
like this:
-YYY(xxx, "(%d,%p,etc)...\n", par1, par2, ...);
+TRACE("(%d, %p, ...)\n", par1, par2, ...);
@@ -669,17 +396,14 @@ YYY(xxx, "(%d,%p,etc)...\n", par1, par2, ...);
for stubs, you should output a FIXME
message. I suggest this style:
- FIXME(xxx, "(%x,%d...): stub\n", par1, par2, ...);
+FIXME("(%x, %d, ...): stub\n", par1, par2, ...);
- That is, you output the parameters, then a : and then a string
- containing the word "stub". I've seen "empty stub", and others, but I
- think that just "stub" suffices.
- output 1 and ONLY 1 line per message. That is, the format
- string should contain only 1 \n and it
+ try to output one line per message. That is, the format
+ string should contain only one \n and it
should always appear at the end of the string. (there are
many reasons for this requirement, one of them is that
each debug macro adds things to the beginning of the line)
@@ -690,11 +414,11 @@ YYY(xxx, "(%d,%p,etc)...\n", par1, par2, ...);
if you want to name a value, use = and
NOT :. That is, instead of saying:
-FIXME(xxx, "(fd: %d, file: %s): stub\n", fd, name);
+FIXME("(fd: %d, file: %s): stub\n", fd, name);
say:
-FIXME(xxx, "(fd=%d, file=%s): stub\n", fd, name);
+FIXME("(fd=%d, file=%s): stub\n", fd, name);
use : to separate categories.
@@ -705,7 +429,7 @@ FIXME(xxx, "(fd=%d, file=%s): stub\n", fd, name);
FIXME(xxx, "(fd=%d, file=%s)\n", fd, name);
- but use:
+ instead use:
FIXME(xxx, "(fd=%d, file=%s): stub\n", fd, name);
@@ -727,7 +451,7 @@ FIXME(xxx, "(fd=%d, file=%s): stub\n", fd, name);
HANDLE32 WINAPI YourFunc(LPCSTR s)
{
- FIXME(xxx, "(%s): stub\n", debugstr_a(s));
+ FIXME("(%s): stub\n", debugstr_a(s));
}
@@ -739,7 +463,7 @@ HANDLE32 WINAPI YourFunc(LPCSTR s)
HANDLE32 WINAPI YourFunc(LPCSTR res)
{
- FIXME(xxx, "(res=%s): stub\n", debugres(s));
+ FIXME("(res=%s): stub\n", debugres(s));
}
if the resource identifier is a SEGPTR, use