Release 970914
Thu Sep 11 18:24:56 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [objects/dc.c]
In DC_SetupGCForPatBlt, replace R2_NOT by GXxor with (black xor white).
Tue Sep 9 23:04:02 1997 U. Bonnes <bon@elektron.ikp.physik.th-darmstadt.de>
* [memory/virtual.c]
Do not write debugging info unconditionally to stderr.
* [files/profile.c]
Call PROFILE_GetSection in PROFILE_GetString for key_name "" too.
* [misc/crtdll.c]
Many new functions.
* [include/windows.h] [windows/winpos.c]
ClientToScreen16 doesn't have a return value.
Sun Sep 7 10:06:39 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [misc/main.c] [AUTHORS]
Update the list of contributors. Please let me know if I forgot
someone.
* [if1632/*.spec] [if1632/builtin.c] [tools/build.c]
Ordinal base for Win32 DLLs is now computed automatically from the
lowest ordinal found.
* [include/wintypes.h]
WINAPI is now defined as attribute((stdcall)). This will require
gcc to compile.
* [if1632/thunk.c]
Removed Win32 thunks (no longer needed with stdcall).
* [if1632/crtdll.spec] [misc/crtdll.c]
Make sure we only reference cdecl functions in the spec file.
* [objects/dc.c]
Use CapNotLast drawing style for 1-pixel wide lines.
* [tools/build.c]
Added 'double' argument type.
Added 'varargs' function type for Win32.
Made CallTo16_xxx functions stdcall.
Fri Sep 5 14:50:49 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [tools/build.c] [windows/win.c] [windows/event.c] [windows/message.c]
More fixes to get message exchange closer to the original.
* [misc/spy.c]
Message logs now contain window names.
* [loader/resource.c] [loader/ne_resource.c] [loader/task.c]
[objects/cursoricon.c] [windows/user.c]
Added some obscure features to fix memory leaks.
Fri Sep 5 00:46:28 1997 Jan Willamowius <jan@janhh.shnet.org>
* [if1632/kernel32.spec] [win32/newfns.c]
Added stub for UTRegister() and UTUnRegister().
Thu Sep 4 12:03:12 1997 Frans van Dorsselaer <dorssel@rulhmpc49.LeidenUniv.nl>
* [controls/edit.c]
Allow ASCII codes > 127 in WM_CHAR.
Mon Sep 1 17:23:24 1997 Dimitrie O. Paun <dimi@mail.cs.toronto.edu>
* [controls/widgets.c]
In InitCommonControls, remember the name of the class
because lpszClassName was made to point to a local array
Added the ProgressBar to the list of implemented controls.
Call InitCommonControls from WIDGETS_Init to register all
implemented Common Controls.
* [include/commctrl.h]
Added misc decl for the Progress Bar.
* [controls/progress.c] [include/progress.h]
First attempt at implementiong the Progress Bar class.
* [objects/brush.h]
Implementation for GetSysColorBrush[16|32]
* [controls/status.c]
Use DrawEdge to draw the borders and fill the background
* [controls/uitools.c]
Added DrawDiagEdge32 and DrawRectEdge32
* [graphics/painting.c]
Implement DrawEdge[16|32]
Started DrawFrameControl32
Mon Sep 1 10:07:09 1997 Lawson Whitney <lawson_whitney@juno.com>
* [misc/comm.c] [include/windows.h]
SetCommEventMask returns a SEGPTR.
Sun Aug 31 23:28:32 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_image.c][loader/module.c][include/pe_image.h]
[include/module.h]
Cleaned up the whole Win32 library mess (a bit).
* [debugger/stabs.c]
If 'wine' has no absolute path and isn't found, check $PATH too.
* [misc/ole2nls.c]
Some fixes.
* [misc/ver.c]
Added support for PE style version resources.
* [memory/string.c]
Check for NULL pointers to _lstr* functions, just as Windows95 does.
* [multimedia/time.c]
Made list of timers a simple linked list.
* [loader/resource.c]
Netscape 3 seems to pass NEGATIVE resource Ids (in an
unsigned int, yes). Don't know why, fixed it anyway.
* [objects/bitmap.c]
LoadImageW added.
* [include/win.h][windows/win.c]
Change wIDmenu from UINT16 to UINT32 and changed the
SetWindow(Long|Word) accordingly.
Thu Aug 28 19:30:08 1997 Morten Welinder <terra@diku.dk>
* [include/windows.h]
Add a few more colors defined for Win95.
Add a few more brush styles.
* [windows/syscolor.c]
Add error checks for SYSCOLOR_SetColor, SYSCOLOR_Init,
GetSysColor16, GetSysColor32. Add support for above colors.
Sun Aug 24 16:22:57 1997 Andrew Taylor <andrew@riscan.com>
* [multimedia/mmsystem.c]
Changed mmioDescend to use mmio functions for file I/O, neccessary
for memory files.
diff --git a/misc/spy.c b/misc/spy.c
index 65490b9..56cebfe 100644
--- a/misc/spy.c
+++ b/misc/spy.c
@@ -9,6 +9,7 @@
#include <stdio.h>
#include <string.h>
#include "windows.h"
+#include "win.h"
#include "module.h"
#include "options.h"
#include "stddebug.h"
@@ -568,6 +569,7 @@
static BOOL16 SPY_Exclude[SPY_MAX_MSGNUM+1];
+static BOOL16 SPY_ExcludeDWP = 0;
static int SPY_IndentLevel = 0;
#define SPY_EXCLUDE(msg) \
@@ -578,17 +580,56 @@
*/
const char *SPY_GetMsgName( UINT32 msg )
{
- static char buffer[20];
+ static char msg_buffer[20];
if (msg <= SPY_MAX_MSGNUM)
{
if (!MessageTypeNames[msg]) return "???";
return MessageTypeNames[msg];
}
- sprintf( buffer, "WM_USER+%04x", msg - WM_USER );
- return buffer;
+ sprintf( msg_buffer, "WM_USER+%04x", msg - WM_USER );
+ return msg_buffer;
}
+/***********************************************************************
+ * SPY_GetWndName
+ */
+const char *SPY_GetWndName( HWND32 hwnd )
+{
+ static char wnd_buffer[16];
+
+ WND* pWnd = WIN_FindWndPtr( hwnd );
+ if( pWnd )
+ {
+ INT32 n = sizeof(wnd_buffer) - 6;
+ LPSTR p = wnd_buffer;
+ LPSTR src;
+
+ char postfix;
+
+ if( pWnd->text && pWnd->text[0] != '\0' )
+ {
+ src = pWnd->text;
+ *(p++) = postfix = '\"';
+ while ((n-- > 1) && *src) *p++ = *src++;
+ }
+ else /* get class name */
+ {
+ INT32 len;
+
+ *(p++)='{';
+ GlobalGetAtomName32A( pWnd->class->atomName, p, n + 1);
+ src = p += (len = lstrlen32A(p));
+ if( len >= n ) src = wnd_buffer; /* something nonzero */
+ postfix = '}';
+ }
+ if( *src ) for( n = 0; n < 3; n++ ) *(p++)='.';
+ *(p++) = postfix;
+ *(p++) = '\0';
+ }
+ else lstrcpy32A( wnd_buffer, "\"NULL\"" );
+ return wnd_buffer;
+}
/***********************************************************************
* SPY_EnterMessage
@@ -596,20 +637,24 @@
void SPY_EnterMessage( INT32 iFlag, HWND32 hWnd, UINT32 msg,
WPARAM32 wParam, LPARAM lParam )
{
+ LPCSTR pname;
+
if (!debugging_message || SPY_EXCLUDE(msg)) return;
/* each SPY_SENDMESSAGE must be complemented by call to SPY_ExitMessage */
switch(iFlag)
{
case SPY_DISPATCHMESSAGE16:
- dprintf_message(stddeb,"%*s(%04x) message [%04x] %s dispatched wp=%04x lp=%08lx\n",
- SPY_IndentLevel, "", hWnd, msg, SPY_GetMsgName( msg ),
+ pname = SPY_GetWndName(hWnd);
+ dprintf_message(stddeb,"%*s(%04x) %-16s message [%04x] %s dispatched wp=%04x lp=%08lx\n",
+ SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ),
wParam, lParam);
break;
case SPY_DISPATCHMESSAGE32:
- dprintf_message(stddeb,"%*s(%08x) message [%04x] %s dispatched wp=%08x lp=%08lx\n",
- SPY_IndentLevel, "", hWnd, msg, SPY_GetMsgName( msg ),
+ pname = SPY_GetWndName(hWnd);
+ dprintf_message(stddeb,"%*s(%08x) %-16s message [%04x] %s dispatched wp=%08x lp=%08lx\n",
+ SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ),
wParam, lParam);
break;
@@ -618,32 +663,36 @@
{
char taskName[30];
HTASK16 hTask = GetWindowTask16(hWnd);
+
if (hTask == GetCurrentTask()) strcpy( taskName, "self" );
else if (!hTask) strcpy( taskName, "Wine" );
else sprintf( taskName, "task %04x %s",
- hTask, MODULE_GetModuleName( GetExePtr(hTask) ) );
+ hTask, MODULE_GetModuleName(hTask) );
+ pname = SPY_GetWndName(hWnd);
if (iFlag == SPY_SENDMESSAGE16)
- dprintf_message(stddeb,"%*s(%04x) message [%04x] %s sent from %s wp=%04x lp=%08lx\n",
- SPY_IndentLevel, "", hWnd, msg,
- SPY_GetMsgName( msg ), taskName, wParam,
- lParam );
+ dprintf_message(stddeb,
+ "%*s(%04x) %-16s message [%04x] %s sent from %s wp=%04x lp=%08lx\n",
+ SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ),
+ taskName, wParam, lParam );
else
- dprintf_message(stddeb,"%*s(%08x) message [%04x] %s sent from %s wp=%08x lp=%08lx\n",
- SPY_IndentLevel, "", hWnd, msg,
- SPY_GetMsgName( msg ), taskName, wParam,
- lParam );
+ dprintf_message(stddeb,
+ "%*s(%08x) %-16s message [%04x] %s sent from %s wp=%08x lp=%08lx\n",
+ SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ),
+ taskName, wParam, lParam );
}
break;
case SPY_DEFWNDPROC16:
- dprintf_message(stddeb, "%*s(%04x) DefWindowProc: %s [%04x] wp=%04x lp=%08lx\n",
+ if( SPY_ExcludeDWP ) return;
+ dprintf_message(stddeb, "%*s(%04x) DefWindowProc16: %s [%04x] wp=%04x lp=%08lx\n",
SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ),
msg, wParam, lParam );
break;
case SPY_DEFWNDPROC32:
- dprintf_message(stddeb, "%*s(%08x) DefWindowProc: %s [%04x] wp=%08x lp=%08lx\n",
+ if( SPY_ExcludeDWP ) return;
+ dprintf_message(stddeb, "%*s(%08x) DefWindowProc32: %s [%04x] wp=%08x lp=%08lx\n",
SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ),
msg, wParam, lParam );
break;
@@ -657,29 +706,51 @@
*/
void SPY_ExitMessage( INT32 iFlag, HWND32 hWnd, UINT32 msg, LRESULT lReturn )
{
- if (!debugging_message || SPY_EXCLUDE(msg)) return;
+ LPCSTR pname;
+
+ if (!debugging_message || SPY_EXCLUDE(msg) ||
+ (SPY_ExcludeDWP && (iFlag == SPY_RESULT_DEFWND16 || iFlag == SPY_RESULT_DEFWND32)) )
+ return;
+
if (SPY_IndentLevel) SPY_IndentLevel -= SPY_INDENT_UNIT;
switch(iFlag)
{
+ case SPY_RESULT_DEFWND16:
+ dprintf_message(stddeb,"%*s(%04x) DefWindowProc16: %s [%04x] returned %08lx\n",
+ SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ), msg, lReturn );
+ break;
+
+ case SPY_RESULT_DEFWND32:
+ dprintf_message(stddeb,"%*s(%08x) DefWindowProc32: %s [%04x] returned %08lx\n",
+ SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ), msg, lReturn );
+ break;
+
case SPY_RESULT_OK16:
- dprintf_message(stddeb,"%*s(%04x) message [%04x] %s returned %08lx\n",
- SPY_IndentLevel, "", hWnd, msg,
+ pname = SPY_GetWndName(hWnd);
+ dprintf_message(stddeb,"%*s(%04x) %-16s message [%04x] %s returned %08lx\n",
+ SPY_IndentLevel, "", hWnd, pname, msg,
SPY_GetMsgName( msg ), lReturn );
break;
+
case SPY_RESULT_OK32:
- dprintf_message(stddeb,"%*s(%08x) message [%04x] %s returned %08lx\n",
- SPY_IndentLevel, "", hWnd, msg,
+ pname = SPY_GetWndName(hWnd);
+ dprintf_message(stddeb,"%*s(%08x) %-16s message [%04x] %s returned %08lx\n",
+ SPY_IndentLevel, "", hWnd, pname, msg,
SPY_GetMsgName( msg ), lReturn );
break;
+
case SPY_RESULT_INVALIDHWND16:
- dprintf_message(stddeb,"%*s(%04x) message [%04x] %s HAS INVALID HWND\n",
- SPY_IndentLevel, "", hWnd, msg,
+ pname = SPY_GetWndName(hWnd);
+ dprintf_message(stddeb,"%*s(%04x) %-16s message [%04x] %s HAS INVALID HWND\n",
+ SPY_IndentLevel, "", hWnd, pname, msg,
SPY_GetMsgName( msg ) );
break;
+
case SPY_RESULT_INVALIDHWND32:
- dprintf_message(stddeb,"%*s(%08x) message [%04x] %s HAS INVALID HWND\n",
- SPY_IndentLevel, "", hWnd, msg,
+ pname = SPY_GetWndName(hWnd);
+ dprintf_message(stddeb,"%*s(%08x) %-16s message [%04x] %s HAS INVALID HWND\n",
+ SPY_IndentLevel, "", hWnd, pname, msg,
SPY_GetMsgName( msg ) );
break;
}
@@ -712,5 +783,8 @@
for (i = 0; i <= SPY_MAX_MSGNUM; i++)
SPY_Exclude[i] = (MessageTypeNames[i] && strstr(buffer,MessageTypeNames[i]));
}
+
+ SPY_ExcludeDWP = PROFILE_GetWineIniInt( "Spy", "ExcludeDWP", 0 );
+
return 1;
}
