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/loader/task.c b/loader/task.c
index 467548c..3266976 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -9,7 +9,7 @@
#include <string.h>
#include "windows.h"
-#include "task.h"
+#include "user.h"
#include "callback.h"
#include "file.h"
#include "global.h"
@@ -40,9 +40,9 @@
/* Min. number of thunks allocated when creating a new segment */
#define MIN_THUNKS 32
-extern INT32 WINSOCK_DeleteTaskWSI( TDB* pTask, struct _WSINFO* pwsi );
-extern void USER_AppExit( HTASK16, HINSTANCE16, HQUEUE16 );
-extern void PE_InitTls( PE_MODULE *module );
+extern INT32 WINSOCK_DeleteTaskWSI( TDB* pTask, struct _WSINFO* );
+extern BOOL32 MODULE_FreeModule( HMODULE16 hModule, TDB* ptaskContext );
+extern void PE_InitTls( PDB32 *pdb32 );
/* Saved 16-bit stack for current process (Win16 only) */
DWORD IF1632_Saved16_ss_sp = 0;
@@ -370,12 +370,16 @@
extern void InitTask( CONTEXT *context );
+ FARPROC32 entry = (FARPROC32)(pCurrentProcess->exe_modref->load_addr +
+ pCurrentProcess->exe_modref->pe_module->pe_header->OptionalHeader.AddressOfEntryPoint);
+
InitTask( NULL );
InitApp( pTask->hModule );
__asm__ __volatile__("movw %w0,%%fs"::"r" (pCurrentThread->teb_sel));
- PE_InitializeDLLs( pTask->hModule, DLL_PROCESS_ATTACH, (LPVOID)-1 );
- exit_code = CallTaskStart32((FARPROC32)(pModule->pe_module->load_addr +
- pModule->pe_module->pe_header->OptionalHeader.AddressOfEntryPoint) );
+
+ PE_InitializeDLLs( pCurrentProcess, DLL_PROCESS_ATTACH, (LPVOID)-1 );
+ dprintf_relay( stddeb, "CallTo32(entryproc=%p)\n", entry );
+ exit_code = entry();
TASK_KillCurrentTask( exit_code );
}
else
@@ -437,6 +441,7 @@
STACK32FRAME *frame32;
#ifndef WINELIB32
extern DWORD CALLTO16_RetAddr_word;
+ extern void CALLTO16_Restore();
#endif
if (!(pModule = MODULE_GetPtr( hModule ))) return 0;
@@ -546,18 +551,21 @@
/* Create the Win32 part of the task */
- pdb32 = PROCESS_Create( pTask );
+ pCurrentProcess = pdb32 = PROCESS_Create( pTask, cmdLine );
pdb32->task = hTask;
if (pModule->flags & NE_FFLAGS_WIN32)
{
+ /*
LPTHREAD_START_ROUTINE start =
- (LPTHREAD_START_ROUTINE)(pModule->pe_module->load_addr +
- pModule->pe_module->pe_header->OptionalHeader.AddressOfEntryPoint);
- pTask->thdb = THREAD_Create( pdb32, 0, start );
+ (LPTHREAD_START_ROUTINE)(
+ pCurrentProcess->exe_modref->load_addr +
+ pCurrentProcess->exe_modref->pe_module->pe_header->OptionalHeader.AddressOfEntryPoint);
+ */
+ pTask->thdb = THREAD_Create( pdb32, 0, 0 );
#ifndef WINELIB
/* FIXME: should not be done here */
pCurrentThread = pTask->thdb;
- PE_InitTls( pModule->pe_module );
+ PE_InitTls( pdb32 );
#endif
}
else
@@ -575,6 +583,7 @@
frame32->ebx = 0;
frame32->ebp = 0;
#ifndef WINELIB
+ frame32->restore_addr = (DWORD)CALLTO16_Restore;
frame32->retaddr = (DWORD)TASK_CallToStart;
frame32->codeselector = WINE_CODE_SELECTOR;
#endif
@@ -613,10 +622,12 @@
{
if (pModule->flags & NE_FFLAGS_WIN32)
{
- DBG_ADDR addr = { NULL, 0, pModule->pe_module->load_addr +
- pModule->pe_module->pe_header->OptionalHeader.AddressOfEntryPoint };
+ /*
+ DBG_ADDR addr = { NULL, 0, pCurrentProcess->exe_modref->load_addr +
+ pCurrentProcess->exe_modref->pe_module->pe_header->OptionalHeader.AddressOfEntryPoint };
fprintf( stderr, "Win32 task '%s': ", name );
DEBUG_AddBreakpoint( &addr );
+ */
}
else
{
@@ -656,7 +667,7 @@
/* Free the task module */
- FreeModule16( pTask->hModule );
+ MODULE_FreeModule( pTask->hModule, pTask );
/* Free the selector aliases */
@@ -691,17 +702,16 @@
dprintf_task(stddeb, "Killing task %04x\n", hCurrentTask );
- /* Clean up sockets */
+ /* Delete active sockets */
- if( pTask->pwsi )
- {
- dprintf_task(stddeb, "\tremoving socket table\n");
+ if( pTask->pwsi )
WINSOCK_DeleteTaskWSI( pTask, pTask->pwsi );
- }
/* Perform USER cleanup */
- USER_AppExit( hCurrentTask, pTask->hInstance, pTask->hQueue );
+ if (pTask->userhandler)
+ pTask->userhandler( hCurrentTask, USIG_TERMINATION, 0,
+ pTask->hInstance, pTask->hQueue );
if (hTaskToKill && (hTaskToKill != hCurrentTask))
{
@@ -867,6 +877,8 @@
/***********************************************************************
* InitTask (KERNEL.91)
+ *
+ * Called by the application startup code.
*/
void WINAPI InitTask( CONTEXT *context )
{
@@ -880,7 +892,13 @@
if (!(pTask = (TDB *)GlobalLock16( hCurrentTask ))) return;
if (!(pModule = MODULE_GetPtr( pTask->hModule ))) return;
+ /* This is a hack to install task USER signal handler before
+ * implicitly loaded DLLs are initialized (see windows/user.c) */
+
+ pTask->userhandler = (USERSIGNALPROC)&USER_SignalProc;
+
#ifndef WINELIB
+ /* Initialize implicitly loaded DLLs */
NE_InitializeDLLs( pTask->hModule );
#endif
@@ -1374,6 +1392,8 @@
/***********************************************************************
* SetTaskSignalProc (KERNEL.38)
+ *
+ * Real 16-bit interface is provided by the THUNK_SetTaskSignalProc.
*/
FARPROC16 WINAPI SetTaskSignalProc( HTASK16 hTask, FARPROC16 proc )
{
@@ -1382,8 +1402,8 @@
if (!hTask) hTask = hCurrentTask;
if (!(pTask = (TDB *)GlobalLock16( hTask ))) return NULL;
- oldProc = pTask->userhandler;
- pTask->userhandler = proc;
+ oldProc = (FARPROC16)pTask->userhandler;
+ pTask->userhandler = (USERSIGNALPROC)proc;
return oldProc;
}
@@ -1464,7 +1484,6 @@
return 0;
}
-
/***********************************************************************
* TaskFirst (TOOLHELP.63)
*/
