mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-19 11:48:58 +00:00
dadf78ffa9
Sun May 17 16:23:56 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> * [file/profile.c] Fix the return value of PROFILE_GetSection * [misc/crtdll.c] Do _getdrive, fix _chdrive. * [misc/commdlg.c] First cut at ChooseColor[WA]. * [misc/network.c] Do something sensible for WNetGetDirectoryType16. Sun May 17 10:21:35 1998 Andreas Mohr <100.30936@germany.net> * [controls/menu.c] Fixed disabled sub menus with MF_BYPOSITION that were not disabled. * [misc/crtdll.c] [relay32/crtdll.spec] [include/winerror.h] Implemented fscanf, fsetpos, _access, _fpreset (thanks to Uwe Bonnes), and _ltoa. * [loader/task.c] MakeProcInstance: must use CURRENT_DS if hInst == NULL. * [misc/shell.c] SHELL_GetResourceTable, InternalExtractIcon: fixed broken .ICO handling * [windows/winpos.c] DeferWindowPos: removed "same parent" requirement. Which doc states that this is required ? Sat May 16 20:08:11 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [loader/module.c] [loader/ne/module.c] More NE module cleanups. * [loader/task.c] Fixed SwitchStackBack(). Fri May 15 10:04:27 1998 Marcus Meissner <marcus@jet.franken.de> * [configure.in][inlcude/acconfig.h] Fixed broken OSS check, added check for working sigaltstack, fixed broken statfs checks on some linux systems. * [files/directory.c][loader/pe_image.c][relay32/builtin.c] [loader/module.c] Added handling of win32 module pathnames. * [relay32/wnaspi32.spec] New file. * [misc/lzexpand.c] LZCopy auto-decompresses LZ compressed files, even if they are not specially flagged. Fixes some InstallShield problems. * [misc/registry.c] Some fixes for RegQueryInfoKey (reference program monkey.exe from Win32 SDK works now better). Probably still has faults. Fri May 15 08:58:58 1998 Martin Boehme <boehme@informatik.mu-luebeck.de> * [graphics/mapping.c] [include/dc.h] [include/gdi.h] [objects/dc.c] Reworked the way world transformations and mapping modes are handled so that both of these transformations can be computed in a single step. * [graphics/painting.c] [graphics/path.c] [include/path.h] More GDI path support. * [graphics/x11drv/graphics.c] Fixed the return value of GRAPH_DrawArc for the zero height / zero width case to reflect Windows' behaviour. * [include/windows.h] [relay32/gdi32.spec] [objects/dc.c] Implemented ModifyWorldTransform and CombineTransform. Tue May 14 18:03:46 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de> * [controls/commctrl.c][relay32/comctl32.spec] [controls/*.c][include/*.h] Implemented InitCommonControlsEx (dll version 4.72 compatible). InitCommonControls calls ImageCommonControlsEx. Registering code of the common controls had to be changed (see XXXX_Register functions). * [controls/status.c][include/commctrl.h][include/status.h] Implemented most new features and fixed the look and feel. * [contols/commctrl.c][include/commctrl.h][relay32/comctl32.spec] Implemented MenuHelp (incomplete). * [controls/status.c][controls/progress.c] Changed allocation strategy for control specific memory. * [controls/header.c][include/header.h][include/commctrl.h] First implementation of header control. * [windows/defwnd.c][windows/syscolors.c] Fixed default control colors for Win95 look. * [windows/nonclient.c] Fixed off by one error for Win95 look. Top border of child windows should be visible. * [misc/imagelist.h] Improved documentation and fixed some bugs. Thu May 14 15:42:21 1998 Robert Wilhelm <robert@physiol.med.tu-muenchen.de> * [relay32/crtdll.spec] Added hypot,j0,j1,jn and ceil. Wed May 13 19:10:10 1998 Pascal Cuoq <pcuoq@ens-lyon.fr> * [controls/listbox.c] Item height is now exactly font height. Wine listboxes now behave like Windows' when they are created without WS_VSCROLL but the program subsequently calls ShowScrollBar or SetScrollInfo. Wed May 13 18:33:01 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de> * [relay32/relay386.c] Restore ES also in the non-debug case. * [windows/event.c] Bugfix: Blocking TSXNextEvent could deadlock Wine. * [win32/process.c] [windows/message.c] Silly stubs for MsgWaitForMultipleObjects / PostThreadMessage that make some programs run better. * [windows/winproc.c] WINPROC_MapMsg32Ato16/16To32A: added WM_NOTIFY. * [win32/kernel32.c] Added 16->32 thunking and improved 32->16 thunking functions. * [tools/build.c] Added new variant of CallFrom16 stub for use with Win95 thunks. * [if1632/kernel.spec] [if1632/builtin.c] [win32/kernel32.c] Added a few undocumented KERNEL functions. * [loader/ne/module.c] [loader/ne/segment.c] Call DllEntryPoint for 16-bit DLLs with subsystem >= 4.0. * [win32/kernel32.spec] [win32/wow32.spec] [win32/ordinals.c] Use names from the Oct 94 beta release for undoc. functions. Wed May 13 14:18:26 1998 Matthew Becker <mbecker@glasscity.net> * [misc/registry.c] Code cleanup. * [misc/cpu.c] Commented out the registry puts temporarily. * [programs/regtest/*] New registry testing program. Tue May 12 22:54:03 1998 Michael Mess <michael@kawo2.rwth-aachen.de> * [multimedia/audio.c] ioctl's do not commute in /dev/dsp initialization. Tue May 12 20:11:42 1998 Karl Garrison <karlos@eznet.net> * [win32/console.c] Implemented SetConsoleTextAttribute, FillConsoleOutputCharacter. Improved cursor positioning. This allows for text colors in an xterm, rxvt, or console. Tue May 12 17:57:52 1998 Petter Reinholdtsen <pere@td.org.uit.no> * [Makefile.in] Create prefix/{bin|lib} directories if missing during install. Sun May 10 19:37:51 1998 Jan Willamowius <jan@janhh.shnet.org> * [multimedia/mmio.c] Have mmioSetBuffer return success (0), so Corel Draw 4 keeps working. (IO is still unbuffered) Wed May 6 16:57:55 1998 James Juran <jrj120@psu.edu> * [Makefile.in] [Make.rules.in] Changed "make clean" to remove `textedit` backup files (*%) * [controls/menu.c][graphics/x11drv/xfont.c][include/libres.h] [loader/main.c][loader/ne/module.c][scheduler/synchro.c] [win32/time.c][windows/winpos.c][include/windows.h] Fixed miscellaneous compilation warnings. * [misc/main.c][miscemu/main.c][include/main.h] Moved prototypes to new include file main.h, various cleanups. Tue May 5 21:05:06 1998 Morten Welinder <terra@diku.dk> * [misc/winsock.c] Don't refer to __FreeBSD__ when HAVE_STRERROR is meant. * [misc/debugstr.c] For debug_dumpstrSend, send strings to stderr. Tue May 5 21:47:40 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk> * [objects/region.c] Fix for REGION_RegionOp() if newReg is one of the source regions. Tue May 5 18:27:32 1998 Jim Peterson <jspeter@roanoke.infi.net> * [misc/main.c] Add '-h/-help' option and print WINE_RELEASE_INFO with usage message. * [misc/spy.c] Realign trace messages. Tue May 5 15:46:47 1998 Donnie V. Savage <dsavage@cisco.com> * [graphics/ddraw.c] Fixed compile warnings * [misc/winsock.c] Warnings should not be errors. Tue May 5 13:40:42 1998 Jim Peterson <jspeter@roanoke.infi.net> * [*/*] Remove many warnings through explicit casts, added #include's, and corrected printf formats. Tue May 5 05:18:12 1998 Insomnia (Stea Greene) <insomnia@core.binghamton.edu> * [graphics/ddraw.c] Kept unchanged portion of old palette when changing only a few palette entries. Really should only deallocate the changed cells. This make StarCraft work almost perfectly (sound overflows still cause static). Mon May 4 15:04:57 1998 Alexander V. Lukyanov <lav@long.yar.ru> * [misc/lstr.c] FormatMessage: terminate string on %0, undo linefeed strip.
247 lines
9.6 KiB
C
247 lines
9.6 KiB
C
/*
|
|
* 386-specific Win32 relay functions
|
|
*
|
|
* Copyright 1997 Alexandre Julliard
|
|
*/
|
|
|
|
#ifdef __i386__
|
|
|
|
#include <assert.h>
|
|
#include "winnt.h"
|
|
#include "windows.h"
|
|
#include "builtin32.h"
|
|
#include "selectors.h"
|
|
#include "debugstr.h"
|
|
#include "debug.h"
|
|
|
|
/***********************************************************************
|
|
* RELAY_CallFrom32
|
|
*
|
|
* Stack layout on entry to this function:
|
|
* ... ...
|
|
* (esp+12) arg2
|
|
* (esp+8) arg1
|
|
* (esp+4) ret_addr
|
|
* (esp) return addr to relay code
|
|
*/
|
|
int RELAY_CallFrom32( int ret_addr, ... )
|
|
{
|
|
int i, ret;
|
|
char buffer[80];
|
|
FARPROC32 func;
|
|
unsigned int mask, typemask;
|
|
WORD fs;
|
|
|
|
int *args = &ret_addr;
|
|
/* Relay addr is the return address for this function */
|
|
BYTE *relay_addr = (BYTE *)args[-1];
|
|
WORD nb_args = *(WORD *)(relay_addr + 1) / sizeof(int);
|
|
|
|
assert(TRACE_ON(relay));
|
|
func = (FARPROC32)BUILTIN32_GetEntryPoint( buffer, relay_addr - 5,
|
|
&typemask );
|
|
printf( "Call %s(", buffer );
|
|
args++;
|
|
for (i = 0, mask = 3; i < nb_args; i++, mask <<= 2)
|
|
{
|
|
if (i) printf( "," );
|
|
if ((typemask & mask) && HIWORD(args[i]))
|
|
{
|
|
if (typemask & (2<<(2*i)))
|
|
{
|
|
char buff[80];
|
|
lstrcpynWtoA( buff, (LPWSTR)args[i], sizeof(buff) );
|
|
buff[sizeof(buff)-1]='\0';
|
|
printf( "%08x L", args[i] );
|
|
debug_dumpstr( buff );
|
|
}
|
|
else {
|
|
printf( "%08x ", args[i] );
|
|
debug_dumpstr((LPCSTR)args[i]);
|
|
}
|
|
}
|
|
else printf( "%08x", args[i] );
|
|
}
|
|
GET_FS( fs );
|
|
printf( ") ret=%08x fs=%04x\n", ret_addr, fs );
|
|
if (*relay_addr == 0xc3) /* cdecl */
|
|
{
|
|
LRESULT (*cfunc)() = (LRESULT(*)())func;
|
|
switch(nb_args)
|
|
{
|
|
case 0: ret = cfunc(); break;
|
|
case 1: ret = cfunc(args[0]); break;
|
|
case 2: ret = cfunc(args[0],args[1]); break;
|
|
case 3: ret = cfunc(args[0],args[1],args[2]); break;
|
|
case 4: ret = cfunc(args[0],args[1],args[2],args[3]); break;
|
|
case 5: ret = cfunc(args[0],args[1],args[2],args[3],args[4]); break;
|
|
case 6: ret = cfunc(args[0],args[1],args[2],args[3],args[4],
|
|
args[5]); break;
|
|
case 7: ret = cfunc(args[0],args[1],args[2],args[3],args[4],args[5],
|
|
args[6]); break;
|
|
case 8: ret = cfunc(args[0],args[1],args[2],args[3],args[4],args[5],
|
|
args[6],args[7]); break;
|
|
case 9: ret = cfunc(args[0],args[1],args[2],args[3],args[4],args[5],
|
|
args[6],args[7],args[8]); break;
|
|
case 10: ret = cfunc(args[0],args[1],args[2],args[3],args[4],args[5],
|
|
args[6],args[7],args[8],args[9]); break;
|
|
case 11: ret = cfunc(args[0],args[1],args[2],args[3],args[4],args[5],
|
|
args[6],args[7],args[8],args[9],args[10]); break;
|
|
case 12: ret = cfunc(args[0],args[1],args[2],args[3],args[4],args[5],
|
|
args[6],args[7],args[8],args[9],args[10],
|
|
args[11]); break;
|
|
case 13: ret = cfunc(args[0],args[1],args[2],args[3],args[4],args[5],
|
|
args[6],args[7],args[8],args[9],args[10],args[11],
|
|
args[12]); break;
|
|
case 14: ret = cfunc(args[0],args[1],args[2],args[3],args[4],args[5],
|
|
args[6],args[7],args[8],args[9],args[10],args[11],
|
|
args[12],args[13]); break;
|
|
case 15: ret = cfunc(args[0],args[1],args[2],args[3],args[4],args[5],
|
|
args[6],args[7],args[8],args[9],args[10],args[11],
|
|
args[12],args[13],args[14]); break;
|
|
default:
|
|
fprintf( stderr, "RELAY_CallFrom32: Unsupported nb args %d\n",
|
|
nb_args );
|
|
assert(FALSE);
|
|
}
|
|
}
|
|
else /* stdcall */
|
|
{
|
|
switch(nb_args)
|
|
{
|
|
case 0: ret = func(); break;
|
|
case 1: ret = func(args[0]); break;
|
|
case 2: ret = func(args[0],args[1]); break;
|
|
case 3: ret = func(args[0],args[1],args[2]); break;
|
|
case 4: ret = func(args[0],args[1],args[2],args[3]); break;
|
|
case 5: ret = func(args[0],args[1],args[2],args[3],args[4]); break;
|
|
case 6: ret = func(args[0],args[1],args[2],args[3],args[4],
|
|
args[5]); break;
|
|
case 7: ret = func(args[0],args[1],args[2],args[3],args[4],args[5],
|
|
args[6]); break;
|
|
case 8: ret = func(args[0],args[1],args[2],args[3],args[4],args[5],
|
|
args[6],args[7]); break;
|
|
case 9: ret = func(args[0],args[1],args[2],args[3],args[4],args[5],
|
|
args[6],args[7],args[8]); break;
|
|
case 10: ret = func(args[0],args[1],args[2],args[3],args[4],args[5],
|
|
args[6],args[7],args[8],args[9]); break;
|
|
case 11: ret = func(args[0],args[1],args[2],args[3],args[4],args[5],
|
|
args[6],args[7],args[8],args[9],args[10]); break;
|
|
case 12: ret = func(args[0],args[1],args[2],args[3],args[4],args[5],
|
|
args[6],args[7],args[8],args[9],args[10],
|
|
args[11]); break;
|
|
case 13: ret = func(args[0],args[1],args[2],args[3],args[4],args[5],
|
|
args[6],args[7],args[8],args[9],args[10],args[11],
|
|
args[12]); break;
|
|
case 14: ret = func(args[0],args[1],args[2],args[3],args[4],args[5],
|
|
args[6],args[7],args[8],args[9],args[10],args[11],
|
|
args[12],args[13]); break;
|
|
case 15: ret = func(args[0],args[1],args[2],args[3],args[4],args[5],
|
|
args[6],args[7],args[8],args[9],args[10],args[11],
|
|
args[12],args[13],args[14]); break;
|
|
default:
|
|
fprintf( stderr, "RELAY_CallFrom32: Unsupported nb args %d\n",
|
|
nb_args );
|
|
assert(FALSE);
|
|
}
|
|
}
|
|
printf( "Ret %s() retval=%08x ret=%08x fs=%04x\n",
|
|
buffer, ret, ret_addr, fs );
|
|
return ret;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* RELAY_CallFrom32Regs
|
|
*
|
|
* 'context' contains the register contents at the point of call of
|
|
* the REG_ENTRY_POINT. The stack layout of the stack pointed to by
|
|
* ESP_reg(&context) is as follows:
|
|
*
|
|
* If debugmsg(relay) is OFF:
|
|
* ... ...
|
|
* (esp+4) args
|
|
* (esp) return addr to caller
|
|
* (esp-4) function entry point
|
|
*
|
|
* If debugmsg(relay) is ON:
|
|
* ... ...
|
|
* (esp+8) args
|
|
* (esp+4) return addr to caller
|
|
* (esp) return addr to DEBUG_ENTRY_POINT
|
|
* (esp-4) function entry point
|
|
*
|
|
* As the called function might change the stack layout
|
|
* (e.g. FT_Prolog, FT_ExitNN), we remove all modifications to the stack,
|
|
* so that the called function sees (in both cases):
|
|
*
|
|
* ... ...
|
|
* (esp+4) args
|
|
* (esp) return addr to caller
|
|
* ... >128 bytes space free to be modified (ensured by the assembly glue)
|
|
*
|
|
* NOTE: This routine makes no assumption about the relative position of
|
|
* its own stack to the stack pointed to by ESP_reg(&context),
|
|
* except that the latter must have >128 bytes space to grow.
|
|
* This means the assembly glue could even switch stacks completely
|
|
* (e.g. to allow for large stacks).
|
|
*
|
|
*/
|
|
|
|
void RELAY_CallFrom32Regs( CONTEXT context )
|
|
{
|
|
typedef void (CALLBACK *entry_point_t)(CONTEXT *);
|
|
entry_point_t entry_point = *(entry_point_t*) (ESP_reg(&context) - 4);
|
|
|
|
__RESTORE_ES;
|
|
|
|
if (!TRACE_ON(relay))
|
|
{
|
|
/* Simply call the entry point */
|
|
entry_point( &context );
|
|
}
|
|
else
|
|
{
|
|
char buffer[80];
|
|
unsigned int typemask;
|
|
BYTE *relay_addr;
|
|
|
|
/*
|
|
* Fixup the context structure because of the extra parameter
|
|
* pushed by the relay debugging code.
|
|
* Note that this implicitly does a RET on the CALL from the
|
|
* DEBUG_ENTRY_POINT to the REG_ENTRY_POINT; setting the EIP register
|
|
* ensures that the assembly glue will directly return to the
|
|
* caller, just as in the non-debugging case.
|
|
*/
|
|
|
|
relay_addr = *(BYTE **) ESP_reg(&context);
|
|
ESP_reg(&context) += sizeof(BYTE *);
|
|
EIP_reg(&context) = *(DWORD *)ESP_reg(&context);
|
|
|
|
BUILTIN32_GetEntryPoint( buffer, relay_addr - 5, &typemask );
|
|
printf("Call %s(regs) ret=%08x\n", buffer, *(int *)ESP_reg(&context) );
|
|
printf(" EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx ESI=%08lx EDI=%08lx\n",
|
|
EAX_reg(&context), EBX_reg(&context), ECX_reg(&context),
|
|
EDX_reg(&context), ESI_reg(&context), EDI_reg(&context) );
|
|
printf(" EBP=%08lx ESP=%08lx EIP=%08lx DS=%04lx ES=%04lx FS=%04lx GS=%04lx EFL=%08lx\n",
|
|
EBP_reg(&context), ESP_reg(&context), EIP_reg(&context),
|
|
DS_reg(&context), ES_reg(&context), FS_reg(&context),
|
|
GS_reg(&context), EFL_reg(&context) );
|
|
|
|
/* Now call the real function */
|
|
entry_point( &context );
|
|
|
|
printf("Ret %s() retval=regs ret=%08x\n", buffer, *(int *)ESP_reg(&context) );
|
|
printf(" EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx ESI=%08lx EDI=%08lx\n",
|
|
EAX_reg(&context), EBX_reg(&context), ECX_reg(&context),
|
|
EDX_reg(&context), ESI_reg(&context), EDI_reg(&context) );
|
|
printf(" EBP=%08lx ESP=%08lx EIP=%08lx DS=%04lx ES=%04lx FS=%04lx GS=%04lx EFL=%08lx\n",
|
|
EBP_reg(&context), ESP_reg(&context), EIP_reg(&context),
|
|
DS_reg(&context), ES_reg(&context), FS_reg(&context),
|
|
GS_reg(&context), EFL_reg(&context) );
|
|
}
|
|
}
|
|
|
|
#endif /* __i386__ */
|