Release 961201
Sat Nov 30 19:21:17 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [configure]
Re-generated with autoconf 2.11. Let me know if you have
problems.
* [controls/listbox.c] [controls/oldlbox.c]
Listboxes rewritten from scratch. Moved old code still used by
comboboxes to oldlbox.c
* [misc/registry.c]
Use temporary file when saving registry.
* [windows/dialog.c]
Implemented Win32 version of DlgDirList() and DlgDirListComboBox().
* [windows/winproc.c]
Added translation for listbox Win32 messages.
Sat Nov 30 21:00:00 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [controls/widgets.c] [controls/button.c]
Fixed some incompatibilities with CTL3D DLL.
* [windows/dialog.c]
Made dialog windows fit into the desktop.
* [misc/winsock.c] [misc/winsock_async.c]
New Winsock engine.
* [windows/message.c]
GetMessage() fixes.
* [windows/queue.c] [windows/hook.c] [windows/win.c]
SetMessageQueue() fixes.
Fri Nov 29 10:25:12 1996 Slaven Rezic <eserte@cs.tu-berlin.de>
* [objects/text.c]
DrawText16(): Fixed return value.
Tue Nov 26 14:47:09 1996 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [files/profile.c] [*/*]
Added Win32 profile functions, updated to new naming standard.
* [objects/font.c] [if1632/thunk.c] [include/windows.h]
Added EnumFonts32*, EnumFontFamiliesEx*, changed prototypes and
structures.
* [misc/ole2nls.c] [if1632/thunk.c]
Added EnumSystemLocales() (winhelp.exe).
* [misc/registry.c]
Added Windows 3.1 registry loader supplied by Tor Sjxwall, tor@sn.no
* [win32/file.c]
Partially fixed CreateFileMapping(), added UnmapViewOfFile().
Sat Nov 23 23:36:05 1996 Ronan Waide <waider@waider.ie>
* [misc/shell.c]
Fixed some FIXMEs relating to ShellExec() and FindExecutable().
* [misc/main.c]
Implemented a few more of the SystemParametersInfo() cases.
Tue Nov 19 01:24:34 1996 Philippe De Muyter <phdm@info.ucl.ac.be>
* [include/keyboard.h]
New file, new macro WINE_VKEY_MAPPINGS (using code taken from event.c).
* [include/windows.h]
New [VK_A, VK_Z] and [VK_0, VK9] macros.
* [misc/keyboard.c]
Fixes in KeyTable and ToAscii.
* [objects/font.c]
FONT_init : Give default value for MSWIN "system" font.
FONT_MatchFont : Do not try every size of a font family if the
family does not exist.
* [windows/event.c]
lastEventChar hack removed.
KeyStateTable replaced by InputKeyStateTable (maintained in event.c)
and QueueKeyStateTable (maintained in message.c).
EVENT_key : Corrections to the extended bit setting.
* [windows/message.c] [windows/keyboard.c]
Implementation of a new QueueKeyStateTable : table of key states
valid when messages are retrieved by GetMessage or PeekMessage,
and valid for TranslateMessage.
TranslateMessage : Convert WM*KEY messages using QueueKeyStateTable
and ToAscii.
Mon Nov 18 16:59:01 1996 Robert Pouliot <krynos@clic.net>
* [graphics/Makefile.in] [graphics/wing.c]
[if1632/wing.spec]
Some functions for WinG support, mostly empty stubs.
* [misc/crtdll.c] [if1632/crtdll.spec]
Many functions added to CRTDLL, mostly calls to Unix C library.
diff --git a/windows/queue.c b/windows/queue.c
index aeff35c..83a8c7d 100644
--- a/windows/queue.c
+++ b/windows/queue.c
@@ -5,10 +5,12 @@
*/
#include <stdlib.h>
+#include <signal.h>
#include "module.h"
#include "queue.h"
#include "task.h"
#include "win.h"
+#include "hook.h"
#include "stddebug.h"
#include "debug.h"
@@ -22,6 +24,8 @@
static MESSAGEQUEUE *pMouseQueue = NULL; /* Queue for last mouse message */
static MESSAGEQUEUE *pKbdQueue = NULL; /* Queue for last kbd message */
+extern void SIGNAL_MaskAsyncEvents(BOOL32);
+
MESSAGEQUEUE *pCursorQueue = NULL;
MESSAGEQUEUE *pActiveQueue = NULL;
@@ -137,6 +141,9 @@
* QUEUE_DeleteMsgQueue
*
* Unlinks and deletes a message queue.
+ *
+ * Note: We need to mask asynchronous events to make sure PostMessage works
+ * even in the signal handler.
*/
BOOL32 QUEUE_DeleteMsgQueue( HQUEUE16 hQueue )
{
@@ -165,6 +172,8 @@
senderQ = sq->hPrevSendingTask;
}
+ SIGNAL_MaskAsyncEvents( TRUE );
+
pPrev = &hFirstQueue;
while (*pPrev && (*pPrev != hQueue))
{
@@ -173,6 +182,9 @@
}
if (*pPrev) *pPrev = msgQueue->next;
msgQueue->self = 0;
+
+ SIGNAL_MaskAsyncEvents( FALSE );
+
GlobalFree16( hQueue );
return 1;
}
@@ -333,6 +345,39 @@
dprintf_msg(stddeb,"ReceiveMessage: done!\n");
}
+/***********************************************************************
+ * QUEUE_FlushMessage
+ *
+ * Try to reply to all pending sent messages on exit.
+ */
+void QUEUE_FlushMessages( HQUEUE16 hQueue )
+{
+ MESSAGEQUEUE *queue = (MESSAGEQUEUE*)GlobalLock16( hQueue );
+
+ if( queue )
+ {
+ MESSAGEQUEUE *senderQ = (MESSAGEQUEUE*)GlobalLock16( queue->hSendingTask);
+ QSMCTRL* CtrlPtr = queue->smResultCurrent;
+
+ while( senderQ )
+ {
+ if( !(queue->hSendingTask = senderQ->hPrevSendingTask) )
+ queue->wakeBits &= ~QS_SENDMESSAGE;
+ QUEUE_SetWakeBit( senderQ, QS_SMPARAMSFREE );
+
+ queue->smResultCurrent = CtrlPtr;
+ while( senderQ->wakeBits & QS_SMRESULT ) OldYield();
+
+ senderQ->SendMessageReturn = 0;
+ senderQ->smResult = queue->smResultCurrent;
+ QUEUE_SetWakeBit( senderQ, QS_SMRESULT);
+
+ if( (senderQ = (MESSAGEQUEUE*)GlobalLock16( queue->hSendingTask)) )
+ CtrlPtr = senderQ->smResultInit;
+ }
+ queue->InSendMessageHandle = 0;
+ }
+}
/***********************************************************************
* QUEUE_AddMsg
@@ -344,12 +389,15 @@
int pos;
MESSAGEQUEUE *msgQueue;
+ SIGNAL_MaskAsyncEvents( TRUE );
+
if (!(msgQueue = (MESSAGEQUEUE *)GlobalLock16( hQueue ))) return FALSE;
pos = msgQueue->nextFreeMessage;
/* Check if queue is full */
if ((pos == msgQueue->nextMessage) && (msgQueue->msgCount > 0))
{
+ SIGNAL_MaskAsyncEvents( FALSE );
fprintf(stderr,"MSG_AddMsg // queue is full !\n");
return FALSE;
}
@@ -361,6 +409,9 @@
else pos = 0;
msgQueue->nextFreeMessage = pos;
msgQueue->msgCount++;
+
+ SIGNAL_MaskAsyncEvents( FALSE );
+
QUEUE_SetWakeBit( msgQueue, QS_POSTMESSAGE );
return TRUE;
}
@@ -403,6 +454,8 @@
*/
void QUEUE_RemoveMsg( MESSAGEQUEUE * msgQueue, int pos )
{
+ SIGNAL_MaskAsyncEvents( TRUE );
+
if (pos >= msgQueue->nextMessage)
{
for ( ; pos > msgQueue->nextMessage; pos--)
@@ -420,6 +473,8 @@
}
msgQueue->msgCount--;
if (!msgQueue->msgCount) msgQueue->wakeBits &= ~QS_POSTMESSAGE;
+
+ SIGNAL_MaskAsyncEvents( FALSE );
}
@@ -633,12 +688,18 @@
}
queuePtr = (MESSAGEQUEUE *)GlobalLock16( hNewQueue );
+ SIGNAL_MaskAsyncEvents( TRUE );
+
/* Copy data and free the old message queue */
if ((hQueue = GetTaskQueue(0)) != 0)
{
MESSAGEQUEUE *oldQ = (MESSAGEQUEUE *)GlobalLock16( hQueue );
memcpy( &queuePtr->reserved2, &oldQ->reserved2,
(int)oldQ->messages - (int)(&oldQ->reserved2) );
+ HOOK_ResetQueueHooks( hNewQueue );
+ if( WIN_GetDesktop()->hmemTaskQ == hQueue )
+ WIN_GetDesktop()->hmemTaskQ = hNewQueue;
+ WIN_ResetQueueWindows( WIN_GetDesktop()->child, hQueue, hNewQueue );
QUEUE_DeleteMsgQueue( hQueue );
}
@@ -648,8 +709,9 @@
hFirstQueue = hNewQueue;
if( !queuePtr->next ) pCursorQueue = queuePtr;
-
SetTaskQueue( 0, hNewQueue );
+
+ SIGNAL_MaskAsyncEvents( FALSE );
return TRUE;
}
