Release 950606
Tue Jun 6 12:11:41 1995 Alexandre Julliard (julliard@sunsite.unc.edu)
* [controls/menu.c]
Fixed bug with drawing multi-column menus with vertical separator.
* [debugger/debug.l]
Fixed NULL-pointer reference after readline().
* [if1632/winprocs.spec] [miscemu/int21.c] [miscemu/interrupts.c]
Added interrupt vector emulation. Allows to retrieve an interrupt
vector and jump to it without crashing.
* [loader/ldt.c]
Moved ldt.c to memory directory.
* [loader/task.c]
Implemented LockCurrentTask() and GetInstanceData().
* [objects/bitblt.c]
Fixed a bug that caused StretchBlt() to use wrong colors when
stretching a monochrome bitmap to a color display.
* [objects/bitmap.c]
Fixed a segmented pointer bug in CreateBitmapIndirect().
* [tools/build.c]
Added possibility to have arguments for register functions; used
by interrupt vectors to remove the flags from the stack.
Generate a new function CallTo32_LargeStack(), that allows calling
a 32-bit function using the original 32-bit stack, for functions
that need more that 64k of stack.
Tue May 30 10:29:56 1995 Martin von Loewis <martin@informatik.hu-berlin.de>
* [if1632/shell.spec] [misc/shell.c]
DoEnvironmentSubst: fixed prototype
* [if1632/gdi.spec] [objects/palette.c]
SetSystemPaletteUse: new function
* [if1632/kernel.spec] [loader/resource.c]
DirectResAlloc: new function
* [if1632/user.spec] [windows/keyboard.c]
SetKeyboardState: new function
Mon May 29 12:58:28 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de>
* [tools/build.c]
Prevent interrupts from destroying the args for a 32 bit function
by loading the correct value into %esp directly after %ss.
* [loader/ne_image.c] [loader/module.c]
The new instance must be created earlier in LoadModule(), so that
fixups referencing it will be handled correctly.
Initialize the local heap for a DGROUP in NE_LoadSegment().
* [objects/dib.c]
Like RLE8 bitmaps, RLE4 bitmaps don't always end with a proper code.
This used to crash Wine. Fixed.
* [objects/text.c]
Fix possible null pointer dereference in debugging output.
* [misc/commdlg.c]
Handle user input in the edit control better. Some bugs fixed.
* [memory/local.c]
Started implementing moveable blocks. This is unfinished (!), but
at least it does not seem to break things.
Wed May 24 13:26:36 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de>
* [loader/module.c]
LoadModule(): DLLs occasionally have a data segment, and they work
much better if it is loaded :-)
LoadLibrary(): pass HMODULE instead of HINSTANCE to NE_InitializeDLLs.
FindModule(): also strip off the last backslash of the pathnames
(Winhelp tried to load C:\WINDOWS\SYSTEM\COMMDLG.DLL).
GetModuleHandle(): just call MODULE_FindModule, it does the same job,
only better.
* [loader/ne_image.c]
LocalInit() the heap of a DLL in NE_InitDLL. (This is probably
not really correct, it seems that all programs and DLLs try to do
this themselves. But they pass weird parameters.)
NE_InitializeDLLs should also call NE_InitDLL for the passed hModule.
* [loader/task.c] [misc/user.c]
Finish global initializations in InitTask instead of InitApp, or
all the DLLs will be initialized in InitTask without any available
window classes!
diff --git a/loader/task.c b/loader/task.c
index 33d53de..5663419 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -12,6 +12,7 @@
#include "callback.h"
#include "global.h"
#include "instance.h"
+#include "miscemu.h"
#include "module.h"
#include "neexe.h"
#include "selectors.h"
@@ -31,6 +32,7 @@
static HTASK hFirstTask = 0;
static HTASK hCurrentTask = 0;
static HTASK hTaskToKill = 0;
+static HTASK hLockedTask = 0;
static WORD nTaskCount = 0;
/* TASK_Reschedule() 16-bit entry point */
@@ -281,12 +283,11 @@
/* Fill the PDB */
pTask->pdb.int20 = 0x20cd;
- pTask->pdb.dispatcher[0] = 0x9a;
+ pTask->pdb.dispatcher[0] = 0x9a; /* ljmp */
*(DWORD *)&pTask->pdb.dispatcher[1] = MODULE_GetEntryPoint( GetModuleHandle("KERNEL"), 102 ); /* KERNEL.102 is DOS3Call() */
- pTask->pdb.savedint22 = MODULE_GetEntryPoint( GetModuleHandle("KERNEL"),
- 137 ); /* KERNEL.137 is FatalAppExit() */
- pTask->pdb.savedint23 = pTask->pdb.savedint22;
- pTask->pdb.savedint24 = pTask->pdb.savedint22;
+ pTask->pdb.savedint22 = INT_GetHandler( 0x22 );
+ pTask->pdb.savedint23 = INT_GetHandler( 0x23 );
+ pTask->pdb.savedint24 = INT_GetHandler( 0x24 );
pTask->pdb.environment = hEnvironment;
strncpy( pTask->pdb.cmdLine + 1, cmdLine, 126 );
pTask->pdb.cmdLine[127] = '\0';
@@ -347,8 +348,8 @@
frame16->saved_sp = pTask->sp;
frame16->ds = pTask->hInstance;
frame16->entry_point = 0;
- frame16->ordinal_number = 1;
- frame16->dll_id = 1;
+ frame16->ordinal_number = 24; /* WINPROCS.24 is TASK_Reschedule */
+ frame16->dll_id = 24; /* WINPROCS */
frame16->bp = 0;
frame16->ip = LOWORD( CALL16_RetAddr_word );
frame16->cs = HIWORD( CALL16_RetAddr_word );
@@ -431,6 +432,7 @@
TASK_UnlinkTask( hCurrentTask );
hTaskToKill = hCurrentTask;
+ hLockedTask = 0;
Yield();
/* We never return from Yield() */
}
@@ -454,6 +456,10 @@
if (hTaskToKill && (hTaskToKill != hCurrentTask))
TASK_DeleteTask( hTaskToKill );
+ /* If current task is locked, simply return */
+
+ if (hLockedTask) return;
+
/* Find a task to yield to */
pOldTask = (TDB *)GlobalLock( hCurrentTask );
@@ -496,6 +502,7 @@
pOldTask->sp = IF1632_Saved16_sp;
pOldTask->esp = IF1632_Saved32_esp;
}
+ else IF1632_Original32_esp = IF1632_Saved32_esp;
/* Make the task the last in the linked list (round-robin scheduling) */
@@ -519,6 +526,7 @@
*/
void InitTask( struct sigcontext_struct context )
{
+ static int firstTask = 1;
TDB *pTask;
NE_MODULE *pModule;
@@ -526,6 +534,22 @@
if (!(pTask = (TDB *)GlobalLock( hCurrentTask ))) return;
if (!(pModule = (NE_MODULE *)GlobalLock( pTask->hModule ))) return;
+ if (firstTask)
+ {
+ extern BOOL WIDGETS_Init(void);
+ extern BOOL WIN_CreateDesktopWindow(void);
+
+ /* Perform global initialisations that need a task context */
+
+ /* Initialize built-in window classes */
+ if (!WIDGETS_Init()) return;
+
+ /* Create desktop window */
+ if (!WIN_CreateDesktopWindow()) return;
+
+ firstTask = 0;
+ }
+
NE_InitializeDLLs( pTask->hModule );
/* Registers on return are:
@@ -602,6 +626,26 @@
/***********************************************************************
+ * LockCurrentTask (KERNEL.33)
+ */
+HTASK LockCurrentTask( BOOL bLock )
+{
+ if (bLock) hLockedTask = hCurrentTask;
+ else hLockedTask = 0;
+ return hLockedTask;
+}
+
+
+/***********************************************************************
+ * IsTaskLocked (KERNEL.122)
+ */
+WORD IsTaskLocked(void)
+{
+ return hLockedTask;
+}
+
+
+/***********************************************************************
* OldYield (KERNEL.117)
*/
void OldYield(void)
@@ -747,6 +791,19 @@
/***********************************************************************
+ * GetInstanceData (KERNEL.54)
+ */
+int GetInstanceData( HANDLE instance, WORD buffer, int len )
+{
+ char *ptr = (char *)GlobalLock( instance );
+ if (!ptr || !len) return 0;
+ if ((int)buffer + len >= 0x10000) len = 0x10000 - buffer;
+ memcpy( ptr + buffer, (char *)GlobalLock( CURRENT_DS ) + buffer, len );
+ return len;
+}
+
+
+/***********************************************************************
* GetNumTasks (KERNEL.152)
*/
WORD GetNumTasks(void)
