Release 970824
Sat Aug 23 00:05:23 1997 Andreas Mohr <100.30936@germany.net>
* [if1632/kernel.spec] [if1632/mmsystem.spec]
Added some stubs.
* [include/neexe.h] [loader/module.c]
Added warning for OS/2 executables.
* [multimedia/midi.c]
Shortened MIDIOUT driver version string to be less than 31 chars.
* [objects/gdiobj.c]
Fixed DeleteObject32() to react properly when called with stock object.
Fri Aug 22 18:03:26 1997 Dimitrie O. Paun <dimi@cs.toronto.edu>
* [controls/updown.c] [include/updown.h]
First attempt at implementiong the UpDown class.
* [controls/widgets.c]
Added the UpDown class to be initialized by InitCommonControls().
Wed Aug 20 18:01:33 1997 Doug Ridgway <ridgway@routh.UCSD.EDU>
* [graphics/*] [objects/*] [include/gdi.h]
Made all GDI objects (except DCs) moveable.
Mon Aug 18 03:25:30 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/event.c] [misc/winsock.c] [misc/winsock_dns.c]
Removed IPC communication to speed up winsock services
(tested only with 16-bit netscape 3.03).
* [graphics/x11drv/xfont.c] [documentation/fonts]
Miscellaneous improvements. Updated docs.
Sun Aug 17 20:39:55 1997 Ingo Schneider <schneidi@informatik.tu-muenchen.de>
* [misc/comm.c]
A couple of bug fixes.
Sun Aug 17 19:29:22 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/dbg.y]
Display next instruction after stepi/nexti.
* [if1632/relay.c] [include/callback.h] [tools/build.c]
Replaced CallTo32_LargeStack with the CALL_LARGE_STACK macro for
better Winelib support.
* [include/sigcontext.h]
Renamed to sig_context.h to avoid conflicts with libc.
* [*/*]
All API functions are now prefixed with WINAPI in prevision of
future Winelib integration.
* [loader/signal.c] [memory/ldt.c]
Fixed assembly code to be -fPIC compatible.
Thu Aug 14 14:38:15 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [if1632/crtdll.spec][win32/except.c]
_global_unwind, _local_unwind stub added.
* [objects/dib.c]
Don't read memory you don't even need for the target bitmap (fixes
one 'lazy' program).
* [if1632/relay.c][if1632/thunk.c][if1632/kernel32.spec]
[win32/ordinals.c][memory/selector.c][memory/global.c]
[include/callback.h]
Added/moved some more win95 ordinal stuff. Implemented QT_Thunk
(not 100% correct yet) and some friends.
* [loader/pe_image.c]
Add possibility to break at the DLL entrypoint.
* [controls/static.c][misc/commdlg.c][scheduler/thread.c]
Misc bugfixes and additions.
* [misc/registry.c]
The registry seems to be case-preserving but case-insensitive.
* [memory/global.c]
Adapted to new /proc/meminfo format.
* [objects/font.c][graphics/x11drv/xfont.c]
FONT_SelectObject and GetTextMetrics* get passed ranges in logical
and not device points (thanks to Marion Reyzl for pointing this
out).
* [windows/caret.c]
Use the windows own DC if present (The caret coordinates are
logical coordinates based on it). Fixes another AMIPRO problem.
Wed Aug 6 18:22:22 1997 Morten Welinder <terra@diku.dk>
* [controls/menu.c]
General clean-up and Win32 work: split item_flags into fType and
fState; split item_id into wID and hSubMenu. Improved
debug-printing. Implemented InsertMenuItem32[AW],
SetMenuDefaultItem32, and SetMenuItemInfo32[AW]. Fixed
GetMenuItemInfo32[AW].
* [if1632/user32.spec]
Define above new functions.
* [include/windows.h]
Define MF_DEFAULT and MF_RIGHTJUSTIFY. Prototype above functions.
* [include/menu.h]
Don't prototype now-static MENU_InitSysMenuPopup.
* [include/comm.h]
Reduce MAX_PORTS to 9 (which the profile code can handle).
Tue Aug 5 20:16:22 1997 Victor Schneider <vischne@ibm.net>
* [library/winestub.c] [libtest/expand.c]
These patches let people porting Windows apps compile them using
the same conventions regarding global _argc and _argv as those on
Windows C/C++ compilers.
diff --git a/loader/task.c b/loader/task.c
index 4094ee9..467548c 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -40,8 +40,9 @@
/* Min. number of thunks allocated when creating a new segment */
#define MIN_THUNKS 32
-extern void USER_AppExit( HTASK16, HINSTANCE16, HQUEUE16 );
-extern void PE_InitTls( PE_MODULE *module );
+extern INT32 WINSOCK_DeleteTaskWSI( TDB* pTask, struct _WSINFO* pwsi );
+extern void USER_AppExit( HTASK16, HINSTANCE16, HQUEUE16 );
+extern void PE_InitTls( PE_MODULE *module );
/* Saved 16-bit stack for current process (Win16 only) */
DWORD IF1632_Saved16_ss_sp = 0;
@@ -50,7 +51,10 @@
DWORD IF1632_Saved32_esp = 0;
/* Original Unix stack */
-DWORD IF1632_Original32_esp;
+DWORD IF1632_Original32_esp = 0;
+
+ /* Pointer to function to switch to a larger stack */
+int (*IF1632_CallLargeStack)( int (*func)(), void *arg ) = NULL;
static HTASK16 hFirstTask = 0;
static HTASK16 hCurrentTask = 0;
@@ -685,6 +689,16 @@
TDB* pTask = (TDB*) GlobalLock16( hCurrentTask );
if (!pTask) USER_ExitWindows(); /* No current task yet */
+ dprintf_task(stddeb, "Killing task %04x\n", hCurrentTask );
+
+ /* Clean up sockets */
+
+ if( pTask->pwsi )
+ {
+ dprintf_task(stddeb, "\tremoving socket table\n");
+ WINSOCK_DeleteTaskWSI( pTask, pTask->pwsi );
+ }
+
/* Perform USER cleanup */
USER_AppExit( hCurrentTask, pTask->hInstance, pTask->hQueue );
@@ -698,7 +712,7 @@
if (nTaskCount <= 1)
{
- dprintf_task( stddeb, "Killing the last task, exiting\n" );
+ dprintf_task( stddeb, "\nthis is the last task, exiting\n" );
USER_ExitWindows();
}
@@ -767,7 +781,7 @@
/* extract hardware events only! */
- if (!hTask) EVENT_WaitXEvent( FALSE, TRUE );
+ if (!hTask) EVENT_WaitNetEvent( FALSE, TRUE );
while (!hTask)
{
@@ -788,7 +802,7 @@
/* No task found, wait for some events to come in */
- EVENT_WaitXEvent( TRUE, TRUE );
+ EVENT_WaitNetEvent( TRUE, TRUE );
}
if (hTask == hCurrentTask)
@@ -845,7 +859,7 @@
!(pQ->wakeBits & (QS_SENDMESSAGE | QS_SMRESULT)) )
{
pQ->flags &= ~QUEUE_FLAG_XEVENT;
- EVENT_WaitXEvent( FALSE, FALSE );
+ EVENT_WaitNetEvent( FALSE, FALSE );
}
}
}
@@ -854,7 +868,7 @@
/***********************************************************************
* InitTask (KERNEL.91)
*/
-void InitTask( CONTEXT *context )
+void WINAPI InitTask( CONTEXT *context )
{
TDB *pTask;
NE_MODULE *pModule;
@@ -912,7 +926,7 @@
/***********************************************************************
* WaitEvent (KERNEL.30)
*/
-BOOL16 WaitEvent( HTASK16 hTask )
+BOOL16 WINAPI WaitEvent( HTASK16 hTask )
{
TDB *pTask;
@@ -935,7 +949,7 @@
/***********************************************************************
* PostEvent (KERNEL.31)
*/
-void PostEvent( HTASK16 hTask )
+void WINAPI PostEvent( HTASK16 hTask )
{
TDB *pTask;
@@ -948,7 +962,7 @@
/***********************************************************************
* SetPriority (KERNEL.32)
*/
-void SetPriority( HTASK16 hTask, INT16 delta )
+void WINAPI SetPriority( HTASK16 hTask, INT16 delta )
{
TDB *pTask;
INT16 newpriority;
@@ -969,7 +983,7 @@
/***********************************************************************
* LockCurrentTask (KERNEL.33)
*/
-HTASK16 LockCurrentTask( BOOL16 bLock )
+HTASK16 WINAPI LockCurrentTask( BOOL16 bLock )
{
if (bLock) hLockedTask = hCurrentTask;
else hLockedTask = 0;
@@ -980,7 +994,7 @@
/***********************************************************************
* IsTaskLocked (KERNEL.122)
*/
-HTASK16 IsTaskLocked(void)
+HTASK16 WINAPI IsTaskLocked(void)
{
return hLockedTask;
}
@@ -989,7 +1003,7 @@
/***********************************************************************
* OldYield (KERNEL.117)
*/
-void OldYield(void)
+void WINAPI OldYield(void)
{
TDB *pCurTask;
@@ -1003,7 +1017,7 @@
/***********************************************************************
* DirectedYield (KERNEL.150)
*/
-void DirectedYield( HTASK16 hTask )
+void WINAPI DirectedYield( HTASK16 hTask )
{
TDB *pCurTask = (TDB *)GlobalLock16( hCurrentTask );
pCurTask->hYieldTo = hTask;
@@ -1014,7 +1028,7 @@
/***********************************************************************
* UserYield (USER.332)
*/
-void UserYield(void)
+void WINAPI UserYield(void)
{
TDB *pCurTask = (TDB *)GlobalLock16( hCurrentTask );
MESSAGEQUEUE *queue = (MESSAGEQUEUE *)GlobalLock16( pCurTask->hQueue );
@@ -1033,7 +1047,7 @@
/***********************************************************************
* Yield (KERNEL.29)
*/
-void Yield(void)
+void WINAPI Yield(void)
{
TDB *pCurTask = (TDB *)GlobalLock16( hCurrentTask );
if (pCurTask) pCurTask->hYieldTo = 0;
@@ -1045,7 +1059,7 @@
/***********************************************************************
* MakeProcInstance16 (KERNEL.51)
*/
-FARPROC16 MakeProcInstance16( FARPROC16 func, HANDLE16 hInstance )
+FARPROC16 WINAPI MakeProcInstance16( FARPROC16 func, HANDLE16 hInstance )
{
BYTE *thunk;
SEGPTR thunkaddr;
@@ -1070,7 +1084,7 @@
/***********************************************************************
* FreeProcInstance16 (KERNEL.52)
*/
-void FreeProcInstance16( FARPROC16 func )
+void WINAPI FreeProcInstance16( FARPROC16 func )
{
dprintf_task( stddeb, "FreeProcInstance(%08lx)\n", (DWORD)func );
if (!__winelib) TASK_FreeThunk( hCurrentTask, (SEGPTR)func );
@@ -1080,7 +1094,7 @@
/**********************************************************************
* GetCodeHandle (KERNEL.93)
*/
-HANDLE16 GetCodeHandle( FARPROC16 proc )
+HANDLE16 WINAPI GetCodeHandle( FARPROC16 proc )
{
HANDLE16 handle;
BYTE *thunk = (BYTE *)PTR_SEG_TO_LIN( proc );
@@ -1103,7 +1117,7 @@
/***********************************************************************
* SetTaskQueue (KERNEL.34)
*/
-HQUEUE16 SetTaskQueue( HTASK16 hTask, HQUEUE16 hQueue )
+HQUEUE16 WINAPI SetTaskQueue( HTASK16 hTask, HQUEUE16 hQueue )
{
HQUEUE16 hPrev;
TDB *pTask;
@@ -1123,7 +1137,7 @@
/***********************************************************************
* GetTaskQueue (KERNEL.35)
*/
-HQUEUE16 GetTaskQueue( HTASK16 hTask )
+HQUEUE16 WINAPI GetTaskQueue( HTASK16 hTask )
{
TDB *pTask;
@@ -1136,7 +1150,7 @@
/***********************************************************************
* SwitchStackTo (KERNEL.108)
*/
-void SwitchStackTo( WORD seg, WORD ptr, WORD top )
+void WINAPI SwitchStackTo( WORD seg, WORD ptr, WORD top )
{
TDB *pTask;
STACK16FRAME *oldFrame, *newFrame;
@@ -1177,7 +1191,7 @@
* to make sure all registers are preserved, but we don't use them in any
* way, so we don't need a CONTEXT* argument.
*/
-void SwitchStackBack(void)
+void WINAPI SwitchStackBack(void)
{
TDB *pTask;
STACK16FRAME *oldFrame, *newFrame;
@@ -1216,7 +1230,7 @@
/***********************************************************************
* GetTaskQueueDS (KERNEL.118)
*/
-void GetTaskQueueDS( CONTEXT *context )
+void WINAPI GetTaskQueueDS( CONTEXT *context )
{
DS_reg(context) = GlobalHandleToSel( GetTaskQueue(0) );
}
@@ -1225,7 +1239,7 @@
/***********************************************************************
* GetTaskQueueES (KERNEL.119)
*/
-void GetTaskQueueES( CONTEXT *context )
+void WINAPI GetTaskQueueES( CONTEXT *context )
{
ES_reg(context) = GlobalHandleToSel( GetTaskQueue(0) );
}
@@ -1234,12 +1248,12 @@
/***********************************************************************
* GetCurrentTask (KERNEL.36)
*/
-HTASK16 GetCurrentTask(void)
+HTASK16 WINAPI GetCurrentTask(void)
{
return hCurrentTask;
}
-DWORD WIN16_GetCurrentTask(void)
+DWORD WINAPI WIN16_GetCurrentTask(void)
{
/* This is the version used by relay code; the first task is */
/* returned in the high word of the result */
@@ -1250,7 +1264,7 @@
/***********************************************************************
* GetCurrentPDB (KERNEL.37)
*/
-HANDLE16 GetCurrentPDB(void)
+HANDLE16 WINAPI GetCurrentPDB(void)
{
TDB *pTask;
@@ -1262,7 +1276,7 @@
/***********************************************************************
* GetInstanceData (KERNEL.54)
*/
-INT16 GetInstanceData( HINSTANCE16 instance, WORD buffer, INT16 len )
+INT16 WINAPI GetInstanceData( HINSTANCE16 instance, WORD buffer, INT16 len )
{
char *ptr = (char *)GlobalLock16( instance );
if (!ptr || !len) return 0;
@@ -1275,7 +1289,7 @@
/***********************************************************************
* GetExeVersion (KERNEL.105)
*/
-WORD GetExeVersion(void)
+WORD WINAPI GetExeVersion(void)
{
TDB *pTask;
@@ -1287,7 +1301,7 @@
/***********************************************************************
* SetErrorMode16 (KERNEL.107)
*/
-UINT16 SetErrorMode16( UINT16 mode )
+UINT16 WINAPI SetErrorMode16( UINT16 mode )
{
TDB *pTask;
UINT16 oldMode;
@@ -1303,7 +1317,7 @@
/***********************************************************************
* SetErrorMode32 (KERNEL32.486)
*/
-UINT32 SetErrorMode32( UINT32 mode )
+UINT32 WINAPI SetErrorMode32( UINT32 mode )
{
return SetErrorMode16( (UINT16)mode );
}
@@ -1312,7 +1326,7 @@
/***********************************************************************
* GetDOSEnvironment (KERNEL.131)
*/
-SEGPTR GetDOSEnvironment(void)
+SEGPTR WINAPI GetDOSEnvironment(void)
{
TDB *pTask;
@@ -1324,7 +1338,7 @@
/***********************************************************************
* GetNumTasks (KERNEL.152)
*/
-UINT16 GetNumTasks(void)
+UINT16 WINAPI GetNumTasks(void)
{
return nTaskCount;
}
@@ -1336,7 +1350,7 @@
* Note: this function apparently returns a DWORD with LOWORD == HIWORD.
* I don't think we need to bother with this.
*/
-HINSTANCE16 GetTaskDS(void)
+HINSTANCE16 WINAPI GetTaskDS(void)
{
TDB *pTask;
@@ -1348,7 +1362,7 @@
/***********************************************************************
* IsTask (KERNEL.320)
*/
-BOOL16 IsTask( HTASK16 hTask )
+BOOL16 WINAPI IsTask( HTASK16 hTask )
{
TDB *pTask;
@@ -1361,7 +1375,7 @@
/***********************************************************************
* SetTaskSignalProc (KERNEL.38)
*/
-FARPROC16 SetTaskSignalProc( HTASK16 hTask, FARPROC16 proc )
+FARPROC16 WINAPI SetTaskSignalProc( HTASK16 hTask, FARPROC16 proc )
{
TDB *pTask;
FARPROC16 oldProc;
@@ -1377,8 +1391,8 @@
/***********************************************************************
* SetSigHandler (KERNEL.140)
*/
-WORD SetSigHandler( FARPROC16 newhandler, FARPROC16* oldhandler,
- UINT16 *oldmode, UINT16 newmode, UINT16 flag )
+WORD WINAPI SetSigHandler( FARPROC16 newhandler, FARPROC16* oldhandler,
+ UINT16 *oldmode, UINT16 newmode, UINT16 flag )
{
fprintf(stdnimp,"SetSigHandler(%p,%p,%p,%d,%d), unimplemented.\n",
newhandler,oldhandler,oldmode,newmode,flag );
@@ -1402,7 +1416,7 @@
/***********************************************************************
* GlobalNotify (KERNEL.154)
*/
-VOID GlobalNotify( FARPROC16 proc )
+VOID WINAPI GlobalNotify( FARPROC16 proc )
{
TDB *pTask;
@@ -1414,7 +1428,7 @@
/***********************************************************************
* GetExePtr (KERNEL.133)
*/
-HMODULE16 GetExePtr( HANDLE16 handle )
+HMODULE16 WINAPI GetExePtr( HANDLE16 handle )
{
char *ptr;
HTASK16 hTask;
@@ -1454,7 +1468,7 @@
/***********************************************************************
* TaskFirst (TOOLHELP.63)
*/
-BOOL16 TaskFirst( TASKENTRY *lpte )
+BOOL16 WINAPI TaskFirst( TASKENTRY *lpte )
{
lpte->hNext = hFirstTask;
return TaskNext( lpte );
@@ -1464,7 +1478,7 @@
/***********************************************************************
* TaskNext (TOOLHELP.64)
*/
-BOOL16 TaskNext( TASKENTRY *lpte )
+BOOL16 WINAPI TaskNext( TASKENTRY *lpte )
{
TDB *pTask;
INSTANCEDATA *pInstData;
@@ -1496,7 +1510,7 @@
/***********************************************************************
* TaskFindHandle (TOOLHELP.65)
*/
-BOOL16 TaskFindHandle( TASKENTRY *lpte, HTASK16 hTask )
+BOOL16 WINAPI TaskFindHandle( TASKENTRY *lpte, HTASK16 hTask )
{
lpte->hNext = hTask;
return TaskNext( lpte );
@@ -1506,7 +1520,7 @@
/***********************************************************************
* GetAppCompatFlags16 (KERNEL.354)
*/
-DWORD GetAppCompatFlags16( HTASK16 hTask )
+DWORD WINAPI GetAppCompatFlags16( HTASK16 hTask )
{
return GetAppCompatFlags32( hTask );
}
@@ -1515,7 +1529,7 @@
/***********************************************************************
* GetAppCompatFlags32 (USER32.205)
*/
-DWORD GetAppCompatFlags32( HTASK32 hTask )
+DWORD WINAPI GetAppCompatFlags32( HTASK32 hTask )
{
TDB *pTask;
