Release 950727
Sat Jul 22 22:39:09 IDT 1995 Michael Veksler <e1678223@tochnapc2.technion.ac.il>
* [ipc/*]
New directory. This directory contains the new inter-wine
communications support. It enables DDE protocols between two wine
instances. Currently it is limited to DDE, but can be enhanced to
support OLE between 2 different wine instances. This is very
important for libwine.a DDE/OLE support.
* [tools/ipcl]
A script to delete garbage IPC handles (shared memory, semaphores
and message queues). The current inter-wine communication is not
perfect, and sometimes leaves garbage behind.
* [if1632/relay.c] [include/atom.h] [include/global.h]
[loader/selector.c] [loader/task.c] [loader/module.c]
[loader/signal.c] [memory/global.c] [misc/atom.c]
[windows/class.c] [windows/message.c] [windows/win.c]
[Imakefile]
Hooks for inter-wine DDE support, current Global.*Atom functions
renamed to Local.*Atom since Global.*Atom are used for Inter-Wine
DDE communication. (The first call to these functions sets up the
IPC structures - which otherwise cause unneeded overhead.
Mon Jul 17 19:55:21 1995 Alexandre Julliard <julliard@sunsite.unc.edu>
* [controls/menu.c]
Don't crash if a NULL string is passed to menu functions.
* [memory/selector.c]
We now use a bit in ldt_flags_copy to indicate free LDT entries.
Fixed a bug in SELECTOR_ReallocBlock that could cause it to
overwrite valid LDT entries when growing a block.
* [miscemu/instr.c]
Emulate int xx instruction by storing the interrupt vector in
CS:IP and returning directly. This allows a program to install an
interrupt vector.
* [windows/win.c]
Added function WIN_GetTopParent to get the top-level parent of a
window.
Sun Jul 16 18:17:17 1995 Gregory Trubetskoy <grisha@mira.com>
* [loader/resource.c]
Added LoadIconHandler. It doesn't do anything yet, but now you
can use borland help files with winhelp.exe.
Sun Jul 16 11:58:45 1995 Anand Kumria <akumria@ozemail.com.au>
* [misc/main.c]
Fixed to return 386 Enhanced mode correctly. Also return the same
type of CPU, for both Enhanced and Standard mode, namely a 386.
Sun Jul 16 00:02:04 1995 Martin von Loewis <loewis@informatik.hu-berlin.de>
* [Configure] [include/options.h] [include/wineopts.h]
[misc/main.c][misc/spy.c]
Removed support of spy file. Redirected spy messages to stddeb.
Removed -spy option. Added -debugmsg +spy option.
* [debugger/dbg.y][debugger/debug.l]
Enabled segmented addresses (seg:offs) for break and x commands.
* [if1632/gdi.spec] [objects/region.c] [windows/graphics.c]
[include/region.h]
FrameRgn, REGION_FrameRgn: New functions
* [if1632/kernel.spec]
IsWinOldApTask: Return false
* [if1632/mouse.spec]
CplApplet: Removed
* [if1632/user.spec] [windows/win.c]
ShowOwnedPopups: New function
* [if1632/winsock.spec] [misc/winsocket.c]
inet_addr, select: New prototypes in relay code
Fixed memory layout for netdb functions (getXbyY).
WINSOCK_ioctlsocket: Translated FIONREAD, FIONBIO, and FIOASYNC
* [objects/clipping.c]
RectVisible: Fixed call to LPToDP
* [rc/winerc.c]
main: Removed extra argument to getopt for Linux.
Tue Jul 11 00:14:41 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de>
* [controls/listbox.c]
Yet another fix for ListBoxDirectory().
* [loader/module.c] [if1632/kernel.spec]
Make GetModuleHandle() accept instance handles as parameter.
* [if1632/relay.c] [loader/task.c]
Put a magic cookie at the bottom of the 32 bit stack, and check on
each return from a 32 bit function whether it's still there. Complain
if it's not.
* [if1632/user.spec]
Wrong entry for CloseDriver().
* [misc/dos_fs.c] [loader/task.c] [include/dos_fs.h] [misc/file.c]
[miscemu/int21.c]
Large parts of dos_fs.c simplified. Changed it to use one
current drive/directory per task, which is set to the module path on
task creation.
Prevent CorelPaint from closing stdin.
open() with O_CREAT set must be passed three parameters.
DOS FindFirst()/FindNext() could crash when FA_LABEL was set. Fixed,
it's in DOS_readdir() now.
* [misc/profile.c]
Some badly written software (Lotus Freelance Graphics) passes a bogus
size parameter that caused Wine to write off the end of a segment.
Fixed. (It's probably too paranoid now.)
* [multimedia/mmsystem.c] [multimedia/time.c] [multimedia/joystick.c]
[multimedia/Imakefile] [if1632/winprocs.spec]
16 bit entry point for MMSysTimeCallback.
Split off time.c and joystick.c from mmsystem.c.
* [objects/dib.c]
GetDIBits(): call XGetImage() via CallTo32_LargeStack.
* [windows/cursor.c]
DestroyCursor(): do nothing for builtin cursors.
* [windows/mdi.c]
Half of WM_MDISETMENU implemented.
* [windows/win.c]
EnumWindows() and EnumTaskWindows() never enumerated any windows.
Fixed.
* [windows/*.c]
Fixed GetParent() to return correct values for owned windows.
* [windows/message.c]
Don't try to activate disabled top-level windows.
* [windows/nonclient.c]
Work around a bug in gcc-2.7.0.
* [tools/build.c] [include/stackframe.h] [memory/global.c]
[loader/task.c] [memory/selector.c]
Some Visual Basic programs (and possibly others, too) expect ES to be
preserved by a call to an API function, so we have to save it.
In GlobalFree() and FreeSelector(), we must clear CURRENT_STACK16->es
to prevent segfaults if ES contained the selector to be freed.
Sun Jul 9 20:21:20 1995 Jon Tombs <jon@gtex02.us.es>
* [*/*]
Added missing prototypes to header files and relevant includes
to reduce compile time warnings.
Sun Jul 9 18:32:56 1995 Michael Patra <micky@marie.physik.tu-berlin.de>
* [configure.in] [include/config.h] [*/Makefile.in]
New configuration scheme based on autoconf.
Sat Jul 8 14:12:45 1995 Morten Welinder <terra+@cs.cmu.edu>
* [miscemu/ioports.c]
Revamp to have only one in- and one out- variant, both really
implemented.
* [miscemu/instr.c]
INSTR_EmulateInstruction: Use new ioport interface. Implement
string io. Correct instruction pointer for 32-bit code.
* [include/miscemu.h]
Update port function prototypes.
* [include/registers.h]
Defined FS and GS.
Sat Jul 8 13:38:54 1995 Hans de Graaff <graaff@twi72.twi.tudelft.nl>
* [misc/dos_fs.c]
ChopOffSlash(): A path consisting off a single slash is left
intact, and multiple slashes are all removed.
diff --git a/windows/Makefile.in b/windows/Makefile.in
new file mode 100644
index 0000000..3b0d318
--- /dev/null
+++ b/windows/Makefile.in
@@ -0,0 +1,54 @@
+CC = @CC@
+CFLAGS = @CFLAGS@
+XINCL = @x_includes@
+TOPSRC = @top_srcdir@
+DIVINCL = -I$(TOPSRC)/include
+LD = @LD@
+LDCOMBINEFLAGS = @LDCOMBINEFLAGS@
+
+
+MODULE = windows
+
+SRCS = caret.c class.c cursor.c dce.c defdlg.c defwnd.c dialog.c \
+ event.c focus.c graphics.c hook.c keyboard.c mapping.c mdi.c \
+ message.c msgbox.c nonclient.c painting.c property.c scroll.c \
+ syscolor.c sysmetrics.c timer.c utility.c win.c \
+ winpos.c
+
+
+OBJS = $(SRCS:.c=.o)
+
+.c.o:
+ $(CC) -c $(CFLAGS) $(XINCL) $(DIVINCL) -o $*.o $<
+
+all: $(MODULE).o
+
+$(MODULE).o: $(OBJS)
+ $(LD) $(LDCOMBINEFLAGS) $(OBJS) -o $(MODULE).o
+
+depend:
+ sed '/\#\#\# Dependencies/q' < Makefile > tmp_make
+ $(CC) $(DIVINCL) $(XINCL) -MM *.c >> tmp_make
+ cp tmp_make Makefile
+ rm tmp_make
+
+clean:
+ rm -f *.o \#*\# *~ tmp_make
+
+distclean: clean
+ rm Makefile
+
+countryclean:
+
+NAMES = $(SRCS:.c=)
+
+winelibclean:
+ for i in $(NAMES); do \
+ if test `grep -c WINELIB $$i.c` -ne 0; then \
+ rm $$i.o; \
+ fi; \
+ done
+
+dummy:
+
+### Dependencies:
diff --git a/windows/class.c b/windows/class.c
index 050d4e7..4c60a79 100644
--- a/windows/class.c
+++ b/windows/class.c
@@ -11,6 +11,7 @@
#include "user.h"
#include "win.h"
#include "dce.h"
+#include "atom.h"
#include "toolhelp.h"
#include "stddebug.h"
/* #define DEBUG_CLASS */
@@ -32,7 +33,7 @@
HCLASS class;
CLASS * classPtr;
- if (!(atom = GlobalFindAtom( name ))) return 0;
+ if (!(atom = LocalFindAtom( name ))) return 0;
/* First search task-specific classes */
@@ -122,7 +123,7 @@
newClass->wc.cbWndExtra = (class->cbWndExtra < 0) ? 0 : class->cbWndExtra;
newClass->wc.cbClsExtra = classExtra;
- newClass->atomName = GlobalAddAtom( name );
+ newClass->atomName = LocalAddAtom( name );
newClass->wc.lpszClassName = NULL;
if (newClass->wc.style & CS_CLASSDC)
@@ -183,7 +184,7 @@
/* Delete the class */
if (classPtr->hdce) DCE_FreeDCE( classPtr->hdce );
if (classPtr->wc.hbrBackground) DeleteObject( classPtr->wc.hbrBackground );
- /*if (classPtr->wc.style & CS_GLOBALCLASS)*/ GlobalDeleteAtom( classPtr->atomName );
+ /*if (classPtr->wc.style & CS_GLOBALCLASS)*/ LocalDeleteAtom( classPtr->atomName );
/*else DeleteAtom( classPtr->atomName );*/
if ((int)classPtr->wc.lpszMenuName & 0xffff0000)
USER_HEAP_FREE( (int)classPtr->wc.lpszMenuName & 0xffff );
@@ -264,7 +265,7 @@
if (!(wndPtr = WIN_FindWndPtr(hwnd))) return 0;
if (!(classPtr = CLASS_FindClassPtr(wndPtr->hClass))) return 0;
- return GlobalGetAtomName(classPtr->atomName, lpClassName, maxCount);
+ return LocalGetAtomName(classPtr->atomName, lpClassName, maxCount);
}
@@ -328,7 +329,7 @@
pClassEntry->hInst = classPtr->wc.hInstance;
pClassEntry->wNext = classPtr->hNext;
- GlobalGetAtomName( classPtr->atomName, pClassEntry->szClassName,
+ LocalGetAtomName( classPtr->atomName, pClassEntry->szClassName,
sizeof(pClassEntry->szClassName) );
return TRUE;
}
diff --git a/windows/cursor.c b/windows/cursor.c
index 810dcf2..5a41d3c 100644
--- a/windows/cursor.c
+++ b/windows/cursor.c
@@ -18,9 +18,8 @@
#include "neexe.h"
#include "wine.h"
#include "cursor.h"
+#include "resource.h"
#include "stddebug.h"
-/* #define DEBUG_CURSOR */
-/* #define DEBUG_RESOURCE */
#include "debug.h"
#include "arch.h"
@@ -191,7 +190,7 @@
fprintf(stderr,"No bitmap for cursor?\n");
lpcur->hBitmap = 0;
}
- lpl = (char *)lpl + size + 8;
+ lpl = (LONG *)((char *)lpl + size + 8);
/* This is rather strange! The data is stored *BACKWARDS* and */
/* mirrored! But why?? FIXME: the image must be flipped at the Y */
/* axis, either here or in CreateCusor(); */
@@ -308,8 +307,13 @@
*/
BOOL DestroyCursor(HCURSOR hCursor)
{
+ int i;
CURSORALLOC *lpcur;
- if (hCursor == (HCURSOR)NULL) return FALSE;
+
+ if (hCursor == 0) return FALSE;
+ for (i = 0; i < NB_SYS_CURSORS; i++) {
+ if (system_cursor[i].cursor == hCursor) return TRUE;
+ }
lpcur = (CURSORALLOC *)GlobalLock(hCursor);
if (lpcur->hBitmap != (HBITMAP)NULL) DeleteObject(lpcur->hBitmap);
GlobalUnlock(hCursor);
@@ -451,7 +455,3 @@
if (lpRetClipRect != NULL)
CopyRect(lpRetClipRect, &ClipCursorRect);
}
-
-
-
-
diff --git a/windows/defwnd.c b/windows/defwnd.c
index e5811fb..6263dd5 100644
--- a/windows/defwnd.c
+++ b/windows/defwnd.c
@@ -2,9 +2,7 @@
* Default window procedure
*
* Copyright 1993 Alexandre Julliard
-
-static char Copyright[] = "Copyright Alexandre Julliard, 1993";
-*/
+ */
#include <stdlib.h>
#include <stdio.h>
@@ -38,7 +36,6 @@
strcpy( textPtr, text );
}
-#include <assert.h>
/***********************************************************************
* DefWindowProc (USER.107)
@@ -206,7 +203,7 @@
textPtr = (LPSTR)USER_HEAP_LIN_ADDR(wndPtr->hText);
return (DWORD)strlen(textPtr);
}
- return (0L);
+ return 0;
}
case WM_SETTEXT:
@@ -226,14 +223,13 @@
case WM_SYSKEYDOWN:
if (wParam == VK_MENU)
{ /* Send to WS_OVERLAPPED parent. TODO: Handle MDI */
- HWND top;
- for(top=hwnd;GetParent(top)!=0;top=GetParent(top));
- SendMessage( top, WM_SYSCOMMAND, SC_KEYMENU, 0L );
+ SendMessage( WIN_GetTopParent(hwnd), WM_SYSCOMMAND,
+ SC_KEYMENU, 0L );
}
break;
case WM_SYSKEYUP:
- break;
+ break;
}
return 0;
}
diff --git a/windows/dialog.c b/windows/dialog.c
index b5b78a4..79116d4 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -415,7 +415,7 @@
int retval;
/* Owner must be a top-level window */
- while (owner && GetParent(owner)) owner = GetParent(owner);
+ owner = WIN_GetTopParent( owner );
if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return -1;
if (!(msgHandle = USER_HEAP_ALLOC( sizeof(MSG) ))) return -1;
lpmsg = (MSG *) USER_HEAP_LIN_ADDR( msgHandle );
diff --git a/windows/event.c b/windows/event.c
index 05c21ce..9803e0a 100644
--- a/windows/event.c
+++ b/windows/event.c
@@ -283,7 +283,8 @@
char Str[24];
XComposeStatus cs;
KeySym keysym;
- WORD xkey, vkey, key_type, key;
+ WORD vkey = 0;
+ WORD xkey, key_type, key;
KEYLP keylp;
BOOL extended = FALSE;
diff --git a/windows/graphics.c b/windows/graphics.c
index bbc674b..d623752 100644
--- a/windows/graphics.c
+++ b/windows/graphics.c
@@ -19,6 +19,7 @@
#include "syscolor.h"
#include "stddebug.h"
#include "color.h"
+#include "region.h"
#include "debug.h"
static __inline__ void swap_int(int *a, int *b)
@@ -626,6 +627,17 @@
return retval;
}
+/***********************************************************************
+ * FrameRgn (GDI.41)
+ */
+BOOL FrameRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush, int nWidth, int nHeight )
+{
+ HRGN tmp = CreateRectRgn( 0, 0, 0, 0 );
+ if(!REGION_FrameRgn( tmp, hrgn, nWidth, nHeight )) return 0;
+ FillRgn( hdc, tmp, hbrush );
+ DeleteObject( tmp );
+ return 1;
+}
/***********************************************************************
* InvertRgn (GDI.42)
diff --git a/windows/mdi.c b/windows/mdi.c
index 85b49b5..aa67bf0 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -15,7 +15,6 @@
#include "menu.h"
#include "sysmetrics.h"
#include "stddebug.h"
-/* #define DEBUG_MDI */
#include "debug.h"
/**********************************************************************
@@ -61,6 +60,21 @@
}
}
+/**********************************************************************
+ * MDISetMenu
+ * FIXME: This is not complete.
+ */
+HMENU MDISetMenu(HWND hwnd, BOOL fRefresh, HMENU hmenuFrame, HMENU hmenuWindow)
+{
+ dprintf_mdi(stddeb, "WM_MDISETMENU: %04x %04x %04x %04x\n", hwnd, fRefresh, hmenuFrame, hmenuWindow);
+ if (!fRefresh) {
+ HWND hwndFrame = GetParent(hwnd);
+ HMENU oldFrameMenu = GetMenu(hwndFrame);
+ SetMenu(hwndFrame, hmenuFrame);
+ return oldFrameMenu;
+ }
+ return 0;
+}
/**********************************************************************
* MDIIconArrange
@@ -666,8 +680,7 @@
return MDIRestoreChild(hwnd, ci);
case WM_MDISETMENU:
- /* return MDISetMenu(...) */
- break;
+ return MDISetMenu(hwnd, wParam, LOWORD(lParam), HIWORD(lParam));
case WM_MDITILE:
return MDITile(hwnd, ci);
diff --git a/windows/message.c b/windows/message.c
index 37a869c..957f611 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -7,15 +7,17 @@
#include <stdlib.h>
#include <sys/time.h>
#include <sys/types.h>
+#include <errno.h>
#include "message.h"
#include "win.h"
#include "gdi.h"
-#include "wineopts.h"
#include "sysmetrics.h"
#include "hook.h"
#include "event.h"
#include "winpos.h"
+#include "atom.h"
+#include "dde.h"
#include "stddebug.h"
/* #define DEBUG_MSG */
#include "debug.h"
@@ -26,6 +28,15 @@
#define MAX_QUEUE_SIZE 120 /* Max. size of a message queue */
+/* used for passing message information when sending message */
+typedef struct {
+ LONG lParam;
+ WORD wParam;
+ WORD wMsg;
+ WORD hWnd;
+} msgstruct;
+
+
extern BOOL TIMER_CheckTimer( LONG *next, MSG *msg,
HWND hwnd, BOOL remove ); /* timer.c */
@@ -135,6 +146,8 @@
{
int i, pos = msgQueue->nextMessage;
+ dprintf_msg(stddeb,"MSG_FindMsg: hwnd=0x%04x, proc=%d\n",
+ hwnd, curr_proc_idx);
if (!msgQueue->msgCount) return -1;
if (!hwnd && !first && !last) return pos;
@@ -191,7 +204,8 @@
{
WND *wndPtr;
HWND hwnd;
- INT hittest, x, y;
+ INT hittest = HTERROR;
+ INT x, y;
*phwnd = hwnd = GetDesktopWindow();
x = pt.x;
@@ -212,11 +226,11 @@
(y < wndPtr->rectWindow.bottom))
{
*phwnd = hwnd;
+ x -= wndPtr->rectClient.left;
+ y -= wndPtr->rectClient.top;
/* If window is minimized or disabled, ignore its children */
if ((wndPtr->dwStyle & WS_MINIMIZE) ||
(wndPtr->dwStyle & WS_DISABLED)) break;
- x -= wndPtr->rectClient.left;
- y -= wndPtr->rectClient.top;
hwnd = wndPtr->hwndChild;
}
else hwnd = wndPtr->hwndNext;
@@ -276,7 +290,7 @@
static BOOL MSG_TranslateMouseMsg( MSG *msg, BOOL remove )
{
BOOL eatMsg = FALSE;
- INT hittest_result;
+ INT hittest;
static DWORD lastClickTime = 0;
static WORD lastClickMsg = 0;
static POINT lastClickPos = { 0, 0 };
@@ -294,38 +308,40 @@
ScreenToClient( msg->hwnd, (LPPOINT)&msg->lParam );
return TRUE; /* No need to further process the message */
}
- else hittest_result = MSG_GetWindowForEvent( msg->pt, &msg->hwnd );
-
- /* Send the WM_PARENTNOTIFY message */
-
- if (mouseClick) WIN_SendParentNotify( msg->hwnd, msg->message,
- MAKELONG( msg->pt.x, msg->pt.y ) );
-
- /* Activate the window if needed */
-
- if (mouseClick)
+
+ if ((hittest = MSG_GetWindowForEvent( msg->pt, &msg->hwnd )) != HTERROR)
{
- HWND parent, hwndTop = msg->hwnd;
- while ((parent = GetParent(hwndTop)) != 0) hwndTop = parent;
- if (hwndTop != GetActiveWindow())
- {
- LONG ret = SendMessage( msg->hwnd, WM_MOUSEACTIVATE, hwndTop,
- MAKELONG( hittest_result, msg->message ) );
- if ((ret == MA_ACTIVATEANDEAT) || (ret == MA_NOACTIVATEANDEAT))
- eatMsg = TRUE;
- if ((ret == MA_ACTIVATE) || (ret == MA_ACTIVATEANDEAT))
- {
- SetWindowPos( hwndTop, HWND_TOP, 0, 0, 0, 0,
- SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE );
- WINPOS_ChangeActiveWindow( hwndTop, TRUE );
- }
- }
+
+ /* Send the WM_PARENTNOTIFY message */
+
+ if (mouseClick) WIN_SendParentNotify( msg->hwnd, msg->message,
+ MAKELONG( msg->pt.x, msg->pt.y ) );
+
+ /* Activate the window if needed */
+
+ if (mouseClick)
+ {
+ HWND hwndTop = WIN_GetTopParent( msg->hwnd );
+ if (hwndTop != GetActiveWindow())
+ {
+ LONG ret = SendMessage( msg->hwnd, WM_MOUSEACTIVATE, hwndTop,
+ MAKELONG( hittest, msg->message ) );
+ if ((ret == MA_ACTIVATEANDEAT) || (ret == MA_NOACTIVATEANDEAT))
+ eatMsg = TRUE;
+ if ((ret == MA_ACTIVATE) || (ret == MA_ACTIVATEANDEAT))
+ {
+ SetWindowPos( hwndTop, HWND_TOP, 0, 0, 0, 0,
+ SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE );
+ WINPOS_ChangeActiveWindow( hwndTop, TRUE );
+ }
+ }
+ }
}
/* Send the WM_SETCURSOR message */
SendMessage( msg->hwnd, WM_SETCURSOR, msg->hwnd,
- MAKELONG( hittest_result, msg->message ));
+ MAKELONG( hittest, msg->message ));
if (eatMsg) return FALSE;
/* Check for double-click */
@@ -340,7 +356,7 @@
(abs(msg->pt.y - lastClickPos.y) < SYSMETRICS_CYDOUBLECLK/2))
dbl_click = TRUE;
- if (dbl_click && (hittest_result == HTCLIENT))
+ if (dbl_click && (hittest == HTCLIENT))
{
/* Check whether window wants the double click message. */
WND * wndPtr = WIN_FindWndPtr( msg->hwnd );
@@ -366,13 +382,13 @@
/* Build the translated message */
msg->lParam = MAKELONG( msg->pt.x, msg->pt.y );
- if (hittest_result == HTCLIENT)
+ if (hittest == HTCLIENT)
{
ScreenToClient( msg->hwnd, (LPPOINT)&msg->lParam );
}
else
{
- msg->wParam = hittest_result;
+ msg->wParam = hittest;
msg->message += WM_NCLBUTTONDOWN - WM_LBUTTONDOWN;
}
@@ -713,19 +729,43 @@
XEvent event;
int fd = ConnectionNumber(display);
- if (!XPending(display) && (maxWait != -1))
+ if (!XPending(display))
{
FD_ZERO( &read_set );
FD_SET( fd, &read_set );
- timeout.tv_sec = maxWait / 1000;
- timeout.tv_usec = (maxWait % 1000) * 1000;
- if (select( fd+1, &read_set, NULL, NULL, &timeout ) != 1)
- return FALSE; /* Timeout or error */
+ sigsetjmp(env_wait_x, 1);
+
+ stop_wait_op= CONT;
+
+ if (DDE_GetRemoteMessage()) {
+ while(DDE_GetRemoteMessage())
+ ;
+ return TRUE;
+ }
+
+ timeout.tv_usec = (maxWait % 1000) * 1000;
+ timeout.tv_sec = maxWait / 1000;
+
+ stop_wait_op= STOP_WAIT_X;
+ /* The code up to the next "stop_wait_op= CONT" must be reentrant */
+ if (select( fd+1, &read_set, NULL, NULL, &timeout ) != 1 &&
+ !XPending(display)) {
+ stop_wait_op= CONT;
+ return FALSE;
+ } else {
+ stop_wait_op= CONT;
+ }
+
}
/* Process the event (and possibly others that occurred in the meantime) */
do
{
+ if (DDE_GetRemoteMessage()) {
+ while(DDE_GetRemoteMessage())
+ ;
+ return TRUE;
+ }
XNextEvent( display, &event );
EVENT_ProcessEvent( &event );
}
@@ -744,6 +784,9 @@
MESSAGEQUEUE *msgQueue;
LONG nextExp; /* Next timer expiration time */
+ DDE_TestDDE(hwnd); /* do we have dde handling in the window ?*/
+ DDE_GetRemoteMessage();
+
if (first || last)
{
mask = QS_POSTMESSAGE; /* Always selectioned */
@@ -918,6 +961,17 @@
MSG msg;
WND *wndPtr;
+ msg.hwnd = hwnd;
+ msg.message = message;
+ msg.wParam = wParam;
+ msg.lParam = lParam;
+ msg.time = GetTickCount();
+ msg.pt.x = 0;
+ msg.pt.y = 0;
+
+ if (DDE_PostMessage(&msg))
+ return TRUE;
+
if (hwnd == HWND_BROADCAST) {
dprintf_msg(stddeb,"PostMessage // HWND_BROADCAST !\n");
hwnd = GetTopWindow(GetDesktopWindow());
@@ -928,11 +982,6 @@
hwnd, message, wParam, lParam);
PostMessage(hwnd, message, wParam, lParam);
}
- /*{
- char str[128];
- GetWindowText(hwnd, str, sizeof(str));
- dprintf_msg(stddeb, "BROADCAST GetWindowText()='%s' !\n", str);
- }*/
hwnd = wndPtr->hwndNext;
}
dprintf_msg(stddeb,"PostMessage // End of HWND_BROADCAST !\n");
@@ -941,13 +990,6 @@
wndPtr = WIN_FindWndPtr( hwnd );
if (!wndPtr || !wndPtr->hmemTaskQ) return FALSE;
- msg.hwnd = hwnd;
- msg.message = message;
- msg.wParam = wParam;
- msg.lParam = lParam;
- msg.time = GetTickCount();
- msg.pt.x = 0;
- msg.pt.y = 0;
return MSG_AddMsg( wndPtr->hmemTaskQ, &msg, 0 );
}
@@ -979,35 +1021,48 @@
{
WND * wndPtr;
LONG ret;
-
- wndPtr = WIN_FindWndPtr( hwnd );
- if (!wndPtr) return 0;
- else {
- /* Argh. This is inefficient. */
- typedef struct {
+ MSG DDE_msg;
+ struct
+ {
LONG lParam;
WORD wParam;
WORD wMsg;
WORD hWnd;
- } msgstruct;
- HANDLE msgh = GlobalAlloc(0,sizeof(msgstruct));
- SEGPTR segmsg = WIN16_GlobalLock(msgh);
- msgstruct *Msg = PTR_SEG_TO_LIN(segmsg);
-
- Msg->hWnd = hwnd;
- Msg->wMsg = msg;
- Msg->wParam = wParam;
- Msg->lParam = lParam;
- CALL_SYSTEM_HOOK( WH_CALLWNDPROC, 0, 0, (LPARAM)segmsg );
- CALL_TASK_HOOK( WH_CALLWNDPROC, 0, 0, (LPARAM)segmsg );
- ret = CallWindowProc( wndPtr->lpfnWndProc, Msg->hWnd, Msg->wMsg, Msg->wParam,
- Msg->lParam );
- GlobalUnlock(msgh);
- GlobalFree(msgh);
- dprintf_msg( stddeb,"SendMessage(%4.4x,%x,%x,%lx) -> %lx\n",
- hwnd, msg, wParam, lParam, ret );
- return ret;
+ } msgstruct = { lParam, wParam, msg, hwnd };
+
+ DDE_msg.hwnd = hwnd;
+ DDE_msg.message = msg;
+ DDE_msg.wParam = wParam;
+ DDE_msg.lParam = lParam;
+ if (DDE_SendMessage(&DDE_msg)) return TRUE;
+
+ if (hwnd == HWND_BROADCAST)
+ {
+ dprintf_msg(stddeb,"SendMessage // HWND_BROADCAST !\n");
+ hwnd = GetTopWindow(GetDesktopWindow());
+ while (hwnd)
+ {
+ if (!(wndPtr = WIN_FindWndPtr(hwnd))) break;
+ if (wndPtr->dwStyle & WS_POPUP || wndPtr->dwStyle & WS_CAPTION)
+ {
+ dprintf_msg(stddeb,"BROADCAST Message to hWnd=%04X m=%04X w=%04X l=%08lX !\n",
+ hwnd, msg, wParam, lParam);
+ ret |= SendMessage( hwnd, msg, wParam, lParam );
+ }
+ hwnd = wndPtr->hwndNext;
+ }
+ dprintf_msg(stddeb,"SendMessage // End of HWND_BROADCAST !\n");
+ return TRUE;
}
+
+ CALL_SYSTEM_HOOK( WH_CALLWNDPROC, 0, 0, MAKE_SEGPTR(&msgstruct) );
+ CALL_TASK_HOOK( WH_CALLWNDPROC, 0, 0, MAKE_SEGPTR(&msgstruct) );
+ if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return 0;
+ ret = CallWindowProc( wndPtr->lpfnWndProc, msgstruct.hWnd, msgstruct.wMsg,
+ msgstruct.wParam, msgstruct.lParam );
+ dprintf_msg( stddeb,"SendMessage(%4.4x,%x,%x,%lx) -> %lx\n",
+ hwnd, msg, wParam, lParam, ret );
+ return ret;
}
@@ -1020,6 +1075,8 @@
MESSAGEQUEUE *queue;
LONG nextExp = -1; /* Next timer expiration time */
+ DDE_GetRemoteMessage();
+
if (!(queue = (MESSAGEQUEUE *)GlobalLock( GetTaskQueue(0) ))) return;
if ((queue->wPostQMsg) ||
(queue->status & (QS_SENDMESSAGE | QS_PAINT)) ||
@@ -1028,6 +1085,7 @@
if ((queue->status & QS_TIMER) &&
TIMER_CheckTimer( &nextExp, &msg, 0, FALSE))
return;
+ /* FIXME: (dde) must check DDE & X-events simultaneously */
MSG_WaitXEvent( nextExp );
}
@@ -1066,8 +1124,12 @@
if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER))
{
if (msg->lParam)
- return CallWndProc( (WNDPROC)msg->lParam, CURRENT_DS, msg->hwnd,
- msg->message, msg->wParam, GetTickCount() );
+ {
+ WORD ds = msg->hwnd ? GetWindowWord( msg->hwnd, GWW_HINSTANCE )
+ : CURRENT_DS;
+ return CallWndProc( (WNDPROC)msg->lParam, ds, msg->hwnd,
+ msg->message, msg->wParam, GetTickCount() );
+ }
}
if (!msg->hwnd) return 0;
@@ -1131,7 +1193,7 @@
{
WORD wRet;
dprintf_msg(stddeb, "RegisterWindowMessage: '%s'\n", str );
- wRet = GlobalAddAtom( str );
+ wRet = LocalAddAtom( str );
return wRet;
}
diff --git a/windows/nonclient.c b/windows/nonclient.c
index 8af8dd3..a192262 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -10,6 +10,7 @@
#include "message.h"
#include "sysmetrics.h"
#include "user.h"
+#include "shell.h"
#include "dialog.h"
#include "syscolor.h"
#include "menu.h"
@@ -152,7 +153,10 @@
MinMax.ptMaxSize.x += 2 * xinc;
MinMax.ptMaxSize.y += 2 * yinc;
- if ((wndPtr->ptMaxPos.x != -1) || (wndPtr->ptMaxPos.y != -1))
+ /* Note: The '+' in the following test should really be a ||, but
+ * that would cause gcc-2.7.0 to generate incorrect code.
+ */
+ if ((wndPtr->ptMaxPos.x != -1) + (wndPtr->ptMaxPos.y != -1))
MinMax.ptMaxPosition = wndPtr->ptMaxPos;
else
{
diff --git a/windows/painting.c b/windows/painting.c
index e29056e..b188ac3 100644
--- a/windows/painting.c
+++ b/windows/painting.c
@@ -124,7 +124,7 @@
if (!hwnd) hwnd = GetDesktopWindow();
if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return FALSE;
- if (!(wndPtr->dwStyle & WS_VISIBLE) || (wndPtr->flags & WIN_NO_REDRAW))
+ if (!IsWindowVisible(hwnd) || (wndPtr->flags & WIN_NO_REDRAW))
return TRUE; /* No redraw needed */
if (rectUpdate)
diff --git a/windows/timer.c b/windows/timer.c
index 96fff6a..88b7073 100644
--- a/windows/timer.c
+++ b/windows/timer.c
@@ -114,6 +114,8 @@
TIMER_RestartTimer( pTimer, curTime );
}
+ dprintf_timer(stddeb, "Timer expired: %p, %04x, %04x, %04x, %08lx\n",
+ pTimer, pTimer->hwnd, pTimer->msg, pTimer->id, pTimer->proc);
/* Build the message */
msg->hwnd = pTimer->hwnd;
msg->message = pTimer->msg;
@@ -168,6 +170,8 @@
pTimer->timeout = timeout;
pTimer->expires = GetTickCount() + timeout;
pTimer->proc = proc;
+ dprintf_timer(stddeb, "Timer added: %p, %04x, %04x, %04x, %08lx\n",
+ pTimer, pTimer->hwnd, pTimer->msg, pTimer->id, pTimer->proc);
TIMER_InsertTimer( pTimer );
MSG_IncTimerCount( GetTaskQueue(0) );
if (!id)
diff --git a/windows/win.c b/windows/win.c
index aad3546..de84af9 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -21,6 +21,8 @@
#include "nonclient.h"
#include "winpos.h"
#include "color.h"
+#include "shm_main_blk.h"
+#include "dde_proc.h"
#include "callback.h"
#include "stddebug.h"
/* #define DEBUG_WIN */
@@ -165,14 +167,14 @@
*/
void WIN_SendParentNotify( HWND hwnd, WORD event, LONG lParam )
{
- HWND current = GetParent( hwnd );
WND *wndPtr = WIN_FindWndPtr( hwnd );
- if (!wndPtr || (wndPtr->dwExStyle & WS_EX_NOPARENTNOTIFY)) return;
- while (current)
+ while (wndPtr && (wndPtr->dwStyle & WS_CHILD))
{
- SendMessage( current, WM_PARENTNOTIFY, event, lParam );
- current = GetParent( current );
+ if (wndPtr->dwExStyle & WS_EX_NOPARENTNOTIFY) break;
+ SendMessage( wndPtr->hwndParent, WM_PARENTNOTIFY, event, lParam );
+ wndPtr = WIN_FindWndPtr( wndPtr->hwndParent );
+
}
}
@@ -187,6 +189,9 @@
WND *wndPtr = WIN_FindWndPtr( hwnd );
CLASS *classPtr = CLASS_FindClassPtr( wndPtr->hClass );
+ if (main_block)
+ DDE_DestroyWindow(hwnd);
+
if (!wndPtr || !classPtr) return;
WIN_UnlinkWindow( hwnd ); /* Remove the window from the linked list */
wndPtr->dwMagic = 0; /* Mark it as invalid */
@@ -364,7 +369,7 @@
wndPtr->window = 0;
wndPtr->dwMagic = WND_MAGIC;
wndPtr->hwndParent = (style & WS_CHILD) ? parent : hwndDesktop;
- wndPtr->hwndOwner = (style & WS_CHILD) ? 0 : parent;
+ wndPtr->hwndOwner = (style & WS_CHILD) ? 0 : WIN_GetTopParent(parent);
wndPtr->hClass = class;
wndPtr->hInstance = instance;
wndPtr->ptIconPos.x = -1;
@@ -390,11 +395,6 @@
memset( wndPtr->wExtra, 0, classPtr->wc.cbWndExtra );
classPtr->cWindows++;
- /* Make sure owner is a top-level window */
-
- while (wndPtr->hwndOwner && GetParent(wndPtr->hwndOwner))
- wndPtr->hwndOwner = GetParent(wndPtr->hwndOwner);
-
/* Get class or window DC if needed */
if (classPtr->wc.style & CS_OWNDC)
@@ -844,10 +844,29 @@
HWND GetParent(HWND hwnd)
{
WND *wndPtr = WIN_FindWndPtr(hwnd);
- if (!wndPtr || !(wndPtr->dwStyle & WS_CHILD)) return 0;
- return wndPtr->hwndParent;
+ if (!wndPtr) return 0;
+ return (wndPtr->dwStyle & WS_CHILD) ?
+ wndPtr->hwndParent : wndPtr->hwndOwner;
}
+
+/*****************************************************************
+ * WIN_GetTopParent
+ *
+ * Get the top-level parent for a child window.
+ */
+HWND WIN_GetTopParent( HWND hwnd )
+{
+ while (hwnd)
+ {
+ WND *wndPtr = WIN_FindWndPtr( hwnd );
+ if (wndPtr->dwStyle & WS_CHILD) hwnd = wndPtr->hwndParent;
+ else break;
+ }
+ return hwnd;
+}
+
+
/*****************************************************************
* SetParent (USER.233)
*/
@@ -984,6 +1003,20 @@
return GetWindow( hwnd, flag );
}
+/*******************************************************************
+ * ShowOwnedPopups (USER.265)
+ */
+void ShowOwnedPopups( HWND owner, BOOL fShow )
+{
+ HWND hwnd = GetWindow( hwndDesktop, GW_CHILD );
+ while (hwnd)
+ {
+ WND *wnd = WIN_FindWndPtr(hwnd);
+ if (wnd->hwndOwner == owner && (wnd->dwStyle & WS_POPUP))
+ ShowWindow( hwnd, fShow ? SW_SHOW : SW_HIDE );
+ hwnd = wnd->hwndNext;
+ }
+}
/*******************************************************************
@@ -1015,7 +1048,7 @@
/* First count the windows */
count = 0;
- for (hwnd = hwndDesktop; hwnd != 0; hwnd = wndPtr->hwndNext)
+ for (hwnd = GetTopWindow(hwndDesktop); hwnd != 0; hwnd = wndPtr->hwndNext)
{
if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return FALSE;
count++;
@@ -1025,7 +1058,7 @@
/* Now build the list of all windows */
if (!(list = (HWND *)malloc( sizeof(HWND) * count ))) return FALSE;
- for (hwnd = hwndDesktop, pWnd = list; hwnd != 0; hwnd = wndPtr->hwndNext)
+ for (hwnd = GetTopWindow(hwndDesktop), pWnd = list; hwnd != 0; hwnd = wndPtr->hwndNext)
{
wndPtr = WIN_FindWndPtr( hwnd );
*pWnd++ = hwnd;
@@ -1061,7 +1094,7 @@
/* First count the windows */
count = 0;
- for (hwnd = hwndDesktop; hwnd != 0; hwnd = wndPtr->hwndNext)
+ for (hwnd = GetTopWindow(hwndDesktop); hwnd != 0; hwnd = wndPtr->hwndNext)
{
if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return FALSE;
if (wndPtr->hmemTaskQ == hQueue) count++;
@@ -1071,7 +1104,7 @@
/* Now build the list of all windows */
if (!(list = (HWND *)malloc( sizeof(HWND) * count ))) return FALSE;
- for (hwnd = hwndDesktop, pWnd = list; hwnd != 0; hwnd = wndPtr->hwndNext)
+ for (hwnd = GetTopWindow(hwndDesktop), pWnd = list; hwnd != 0; hwnd = wndPtr->hwndNext)
{
wndPtr = WIN_FindWndPtr( hwnd );
if (wndPtr->hmemTaskQ == hQueue) *pWnd++ = hwnd;
diff --git a/windows/winpos.c b/windows/winpos.c
index b241afc..577221d 100644
--- a/windows/winpos.c
+++ b/windows/winpos.c
@@ -773,7 +773,8 @@
(hwndInsertAfter == HWND_NOTOPMOST)) hwndInsertAfter = HWND_TOP;
/* hwndInsertAfter must be a sibling of the window */
if ((hwndInsertAfter != HWND_TOP) && (hwndInsertAfter != HWND_BOTTOM) &&
- (GetParent(hwnd) != GetParent(hwndInsertAfter))) return FALSE;
+ (wndPtr->hwndParent != WIN_FindWndPtr(hwndInsertAfter)->hwndParent))
+ return FALSE;
/* Fill the WINDOWPOS structure */
@@ -965,14 +966,16 @@
DWP *pDWP;
int i;
HDWP newhdwp = hdwp;
+ HWND parent;
pDWP = (DWP *) USER_HEAP_LIN_ADDR( hdwp );
if (!pDWP) return 0;
/* All the windows of a DeferWindowPos() must have the same parent */
- if (pDWP->actualCount == 0) pDWP->hwndParent = GetParent( hwnd );
- else if (GetParent( hwnd ) != pDWP->hwndParent)
+ parent = WIN_FindWndPtr( hwnd )->hwndParent;
+ if (pDWP->actualCount == 0) pDWP->hwndParent = parent;
+ else if (parent != pDWP->hwndParent)
{
USER_HEAP_FREE( hdwp );
return 0;
