Sun Jan 2 12:38:53 1994 David Metcalfe <david@prism.demon.co.uk> * [windows/class.c] Implemented GetClassName and GetClassInfo. * [windows/caret.c] Various improvements to text caret code. Fri Dec 31 15:22:22 1993 John Brezak <brezak@apollo.hp.com> * [misc/comm.c] Patches to work with NetBSD. Thu Dec 30 12:11:55 1993 John Richardson <jrichard@cs.uml.edu> * [objects/bitblt.c] Added StretchBlt(). Tue Jan 4 05:22:07 1994 julliard@di.epfl.ch (Alexandre Julliard) * [misc/user.c] Added creation of system message queue. * [objects/bitmap.c] [objects/dcvalues.c] [windows/dc.c] Added DC size fields into DC structure. * [objects/clipping.c] Bug fix in CLIPPING_IntersectRect(). * [windows/class.c] Allocate a DCE instead of a DC for CS_CLASSDC classes. * [windows/clipping.c] Fixed GetUpdateRect() and GetUpdateRgn() to clip to the client area. * [windows/dce.c] Implemented GetDCEx() and GetWindowDC(). * [windows/defwnd.c] Implemented WM_WINDOWPOSCHANGED handling. * [windows/event.c] Preliminary support for Xlib event handling instead of Xt callbacks. Changed MSG_AddMsg() calls to hardware_event() or PostMessage(). * [windows/message.c] Preliminary support for multiple message queues. Implemented hardware_event() to store messages into the system queue. Implemented Get/SetTaskQueue(). Better WM_PAINT and WM_TIMER handling. Changes to use Xlib instead of Xt for events. * [windows/painting.c] Use GetDCEx() to retrieve the DC, to get a correct visible region. * [windows/timer.c] Moved the timer procedure callback into DispatchMessage(). Changed implementation to get rid of Xt timeouts. Timer checking is now done inside GetMessage(). * [windows/win.c] Allocate a DCE instead of a DC for CS_OWNDC windows. Replaced Xt calls with Xlib calls. Moved window positioning functions into windows/winpos.c * [windows/winpos.c] (New file) Rewritten most of the window positioning functions. Implemented SetWindowPos() and MapWindowPoints(). Jan 3, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte) * [if1632/user.spec] Bad arguments description for function SetDlgItemText. * [objects/text.c] Function DrawText now handle DT_CALCRECT request. * [misc/message.c] Message boxes now use DrawText with DT_CALCRECT. * [windows/graphics.c] Bug fix in function FrameRect, (it was using PEN instead of BRUSH). * [windows/win.c] Bug fix for flags in function ShowWindow. More accurate WM_SIZE generated by function ShowWindow. * [controls/listbox.c] More code for LBS_MULTIPLESEL. More code for LBS_MULTICOLUMN. * [include/windows.h] Bad define for MF_SEPARATOR. * [controls/menu.c] New functions: PopMenuWndProc() with 'glues', CreatePopupMenu(), AppendMenu(), InsertMenu(), RemoveMenu(), DeleteMenu(), ModifyMenu(), TrackPopupMenu(). Code in stubs: CreateMenu(), DestroyMenu(). Sat Jan 1 10:22:43 1994 Bob Amstadt (bob@pooh) * loader/wine.c: Added support for relocation types 5 and 6. Mon Dec 27 11:06:03 1993 Erik Bos (erik@trashcan.hacktic.nl) * [misc/comm.c] new functions: BuildCommDCB(), OpenComm(), CloseComm(), SetCommBreak(), ClearCommBreak(), EscapeCommFunction(), FlushComm(), GetCommError(), SetCommEventMask(), GetCommEventMask(), SetCommState(), GetCommState(), TransmitCommChar(), ReadComm(), WriteComm(). Wed Dec 22 13:00:15 1993 David Metcalfe <david@prism.demon.co.uk> * [windows/caret.c] Implemented text caret functions. Tue Dec 21 06:13:58 1993 julliard@di.epfl.ch (Alexandre Julliard) * [loader/wine.c] Bug fix in LoadImage(). * [objects/bitblt.c] [objects/clipping.c] [objects/text.c] [windows/dc.c] [windows/dce.c] [windows/graphics.c] Modified graphics calls to take into account the DC origin. * [windows/defwnd.c] Added preliminary WM_NCCALCSIZE handling. * [windows/event.c] Send WM_NCCALCSIZE message on resize event. * [windows/win.c] Send WM_NCCALCSIZE message in CreateWindow(). Realize widgets at creation time (should prevent problems with unrealized widgets). Dec 19, 93 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte) * [controls/static.c] Send mouse & keyboard message received to its parent. * [controls/scroll.c] Send keyboard message received to its parent. * [controls/listbox.c] Add Navigation keys . ListBox now use VSCROLL & HSCROLL instead of children. Alpha version of LBS_MULTIPLESEL. Alpha version of LBS_MULTICOLUMN. * [controls/combo.c] Add Navigation keys on closed ComboBox. Remove useless 'COMBOBOX_CreateComboBox' function. Mon Dec 19 20:39:34 1993 Erik Bos (erik@trashcan.hacktic.nl) * [loader/wine. LoadImage() modified to use FindFile(). * [misc/file.c] SetErrorMode added * [misc/dos_fs.c] bug fixes. Dec 13, 93 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte) * [memory/global.c] bug fix in GlobalGetFreeSegment : good ptr in 'g_prev'. * [sysres.dll] preliminary version of a 'glass of wine' bitmap * [windows/event.c] New function 'GetCapture'. * [controls/scroll.c] Remove useless 'SCROLLBAR_CreateScrollBar' function. * [controls/listbox.c] Remove useless 'LISTBOX_CreateListBox' function. Mon Dec 13 13:51:00 1993 David Metcalfe <david@prism.demon.co.uk> * [objects/font.c] Corrected bugs in GetCharWidth(). * [windows/event.c] Modified EVENT_key to send Windows virtual key codes for WM_KEYDOWN and WM_KEYUP messages, and a WM_CHAR message for printable characters. Wed Dec 08 19:20:00 1993 Karl Guenter Wuensch (hn324wu@unidui.uni-duisburg.de) * [windows/graphics.c] Added Polyline and Polygon Mon Dec 13 14:51:54 1993 Erik Bos (erik@trashcan.hacktic.nl) * [controls/listbox.c] ListBoxDirectory() modified to use dos_fs.c's functions to access files&|drives. Sat Dec 04 17:04:23 1993 Erik Bos (erik@trashcan.hacktic.nl) * [misc/dos_fs.c] Added FindFile() to search a file in a dos/unix style path. * [misc/file.c] New Win31 functions: OpenFile, _lcreate, _llseek, GetTempDrive, GetTempFileName, GetWindowsDirectory, GetSystemDirectory, GetDriveType. * [misc/int21.c] Modified. Wed Dec 1 16:20:45 1993 Miguel de Icaza (miguel@roxanne.nuclecu.unam.mx) * [misc/profile.c] The Profile functions now return the correct values. They now implement all the features described in the SDK. Tue Nov 30 13:55:27 1993 Bob Amstadt (bob at amscons) * [loader/selector.c] Rewrote selector aliasing routines to use System V IPC routine to alias memory segments. Nov 28, 93 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte) * [controls/listbox.c] More consistency in functions using wIndexes * [controls/scroll.c] New function : ShowScrollBar(). * [loader/cursor.c] ... New file Move cursor functions from [loader/resource.c]. New function : ClipCursor(). New function : GetClipCursor(). New function : CreateCursor(). SetCursor() now working using gloabal variable 'winHasCursor'. *[object/palette.c] New stub only : SelectPalette(). New stub only : RealizePalette(). *[win/event.c] New function : EVENT_enter_notify(), update 'winHasCursor' and send WM_SETCURSOR. *[win/defwnd.c] Add processing of WM_SETCURSOR message. *[win/win.c] New members in WND structure : hCursor, hWndVScroll & hWndHScroll. CreateWindowEx() now create children for WM_HSCROLL & WM_VSCROLL. New function ClientToScreen(). New function ScreenToClient(). Mon Nov 25 18:25:40 1993 Erik Bos (erik@trashcan.hacktic.nl) * [files.h / regfunc.h / misc/dos.c] Removed. * [misc/dos_fs.c] Added support for loading dosdrive cfg from wine.ini. * [misc/int21.c] Modified. Wed Nov 24 11:37:33 1993 julliard@disuns2.epfl.ch (Alexandre Julliard) * [include/atom.h] [memory/atom.c] Implemented atoms. * [windows/class.c] Modified RegisterClass() to use atoms. Implemented CS_GLOBALCLASS style. * [windows/message.c] Implemented RegisterWindowMessage(). * [loader/resource.c] Bug fix in LoadResource(). * [windows/dialog.c] Modified CreateDialogParam() to use Find/LoadResource().
284 lines
6.8 KiB
C
284 lines
6.8 KiB
C
static char RCSId[] = "$Id: relay.c,v 1.2 1993/07/04 04:04:21 root Exp root $";
|
|
static char Copyright[] = "Copyright Robert J. Amstadt, 1993";
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
#ifdef linux
|
|
#include <linux/unistd.h>
|
|
#include <linux/head.h>
|
|
#include <linux/ldt.h>
|
|
#include <linux/segment.h>
|
|
#endif
|
|
#include <errno.h>
|
|
#include "neexe.h"
|
|
#include "segmem.h"
|
|
#include "prototypes.h"
|
|
#include "dlls.h"
|
|
|
|
#define N_BUILTINS 8
|
|
|
|
struct dll_name_table_entry_s dll_builtin_table[N_BUILTINS] =
|
|
{
|
|
{ "KERNEL", KERNEL_table, 410, 1 },
|
|
{ "USER", USER_table, 540, 2 },
|
|
{ "GDI", GDI_table, 490, 3 },
|
|
{ "UNIXLIB", UNIXLIB_table, 10, 4 },
|
|
{ "WIN87EM", WIN87EM_table, 10, 5 },
|
|
{ "SHELL", SHELL_table, 256, 6 },
|
|
{ "SOUND", SOUND_table, 20, 7 },
|
|
{ "KEYBOARD",KEYBOARD_table,137, 8 },
|
|
};
|
|
|
|
unsigned short *Stack16Frame;
|
|
|
|
extern unsigned long IF1632_Saved16_esp;
|
|
extern unsigned long IF1632_Saved16_ebp;
|
|
extern unsigned short IF1632_Saved16_ss;
|
|
|
|
/**********************************************************************
|
|
* DLLRelay
|
|
*
|
|
* We get a stack frame pointer to data that looks like this:
|
|
*
|
|
* Hex Offset Contents
|
|
* ---------- -------
|
|
* +00 previous saved_16ss
|
|
* +02 previous saved_16ebp
|
|
* +06 previous saved_16esp
|
|
* +0A 16-bit es
|
|
* +0C 16-bit ds
|
|
* +0E 16-bit ebp
|
|
* +12 length of 16-bit arguments
|
|
* +14 16-bit ip
|
|
* +16 16-bit cs
|
|
* +18 arguments
|
|
*/
|
|
int
|
|
DLLRelay(unsigned int func_num, unsigned int seg_off)
|
|
{
|
|
struct dll_table_entry_s *dll_p;
|
|
unsigned int segment;
|
|
unsigned int offset;
|
|
unsigned int dll_id;
|
|
unsigned int ordinal;
|
|
int arg_table[DLL_MAX_ARGS];
|
|
void *arg_ptr;
|
|
int (*func_ptr)();
|
|
int i;
|
|
int ret_val;
|
|
|
|
/*
|
|
* Determine address of arguments.
|
|
*/
|
|
Stack16Frame = (unsigned short *) seg_off;
|
|
arg_ptr = (void *) (seg_off + 0x18);
|
|
|
|
/*
|
|
* Extract the DLL number and ordinal number.
|
|
*/
|
|
dll_id = ((func_num >> 16) & 0xffff) - 1;
|
|
ordinal = func_num & 0xffff;
|
|
dll_p = &dll_builtin_table[dll_id].dll_table[ordinal];
|
|
|
|
#ifdef DEBUG_RELAY
|
|
{
|
|
unsigned int *ret_addr;
|
|
unsigned short *stack_p;
|
|
|
|
ret_addr = (unsigned int *) ((char *) seg_off + 0x14);
|
|
printf("Calling %s (%s.%d), 16-bit stack at %04x:%04x, ",
|
|
dll_p->export_name,
|
|
dll_builtin_table[dll_id].dll_name, ordinal,
|
|
seg_off >> 16, seg_off & 0xffff);
|
|
printf("return to %08x\n", *ret_addr);
|
|
printf(" ESP %08x, EBP %08x, SS %04x\n",
|
|
IF1632_Saved16_esp, IF1632_Saved16_ebp,
|
|
IF1632_Saved16_ss);
|
|
|
|
if (strcmp("GetMessage", dll_p->export_name) == 0 &&
|
|
seg_off == 0x00972526 &&
|
|
*ret_addr == 0x004700cd &&
|
|
IF1632_Saved16_esp == 0x2526 &&
|
|
IF1632_Saved16_ebp == 0x2534 &&
|
|
IF1632_Saved16_ss == 0x0097)
|
|
printf("ACK!!\n");
|
|
|
|
#ifdef DEBUG_STACK
|
|
stack_p = (unsigned short *) seg_off;
|
|
for (i = 0; i < 24; i++, stack_p++)
|
|
{
|
|
printf("%04x ", *stack_p);
|
|
if ((i & 7) == 7)
|
|
printf("\n");
|
|
}
|
|
printf("\n");
|
|
#endif /* DEBUG_STACK */
|
|
}
|
|
#endif /* DEBUG_RELAY */
|
|
|
|
/*
|
|
* Make sure we have a handler defined for this call.
|
|
*/
|
|
if (dll_p->handler == NULL)
|
|
{
|
|
char buffer[100];
|
|
|
|
sprintf(buffer, "No handler for routine %s.%d",
|
|
dll_builtin_table[dll_id].dll_name, ordinal);
|
|
myerror(buffer);
|
|
}
|
|
func_ptr = dll_p->handler;
|
|
|
|
/*
|
|
* OK, special case. If the handler is define as taking no arguments
|
|
* then pass the address of the arguments on the 16-bit stack to the
|
|
* handler. It will just ignore the pointer if it really takes no
|
|
* arguments. This allows us to write slightly faster library routines
|
|
* if we choose.
|
|
*/
|
|
if (dll_p->n_args == 0)
|
|
return (*func_ptr)(arg_ptr);
|
|
|
|
/*
|
|
* Getting this far means we need to convert the 16-bit argument stack.
|
|
*/
|
|
for (i = 0; i < dll_p->n_args; i++)
|
|
{
|
|
short *sp;
|
|
int *ip;
|
|
|
|
offset = dll_p->args[i].dst_arg;
|
|
|
|
switch (dll_p->args[i].src_type)
|
|
{
|
|
case DLL_ARGTYPE_SIGNEDWORD:
|
|
sp = (short *) ((char *) arg_ptr + offset);
|
|
arg_table[i] = *sp;
|
|
break;
|
|
|
|
case DLL_ARGTYPE_WORD:
|
|
sp = (short *) ((char *) arg_ptr + offset);
|
|
arg_table[i] = (int) *sp & 0xffff;
|
|
break;
|
|
|
|
case DLL_ARGTYPE_LONG:
|
|
ip = (int *) ((char *) arg_ptr + offset);
|
|
arg_table[i] = *ip;
|
|
break;
|
|
|
|
case DLL_ARGTYPE_FARPTR:
|
|
ip = (int *) ((char *) arg_ptr + offset);
|
|
if (*ip & 0xffff0000)
|
|
arg_table[i] = FIXPTR(*ip);
|
|
else
|
|
arg_table[i] = *ip;
|
|
break;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Call the handler
|
|
*/
|
|
ret_val = (*func_ptr)(arg_table[0], arg_table[1], arg_table[2],
|
|
arg_table[3], arg_table[4], arg_table[5],
|
|
arg_table[6], arg_table[7], arg_table[8],
|
|
arg_table[9], arg_table[10], arg_table[11],
|
|
arg_table[12], arg_table[13], arg_table[14],
|
|
arg_table[15]);
|
|
|
|
#ifdef DEBUG_RELAY
|
|
printf("Returning %08.8x from %s (%s.%d)\n",
|
|
ret_val,
|
|
dll_p->export_name,
|
|
dll_builtin_table[dll_id].dll_name, ordinal);
|
|
#endif
|
|
|
|
return ret_val;
|
|
}
|
|
|
|
/**********************************************************************
|
|
* FindDLLTable
|
|
*/
|
|
struct dll_table_entry_s *
|
|
FindDLLTable(char *dll_name)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < N_BUILTINS; i++)
|
|
if (strcmp(dll_builtin_table[i].dll_name, dll_name) == 0)
|
|
return dll_builtin_table[i].dll_table;
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/**********************************************************************
|
|
* FindOrdinalFromName
|
|
*/
|
|
int
|
|
FindOrdinalFromName(struct dll_table_entry_s *dll_table, char *func_name)
|
|
{
|
|
int i, limit;
|
|
|
|
for (i = 0; i < N_BUILTINS; i++)
|
|
if (dll_table == dll_builtin_table[i].dll_table)
|
|
break;
|
|
|
|
if (i == N_BUILTINS)
|
|
return 0;
|
|
|
|
limit = dll_builtin_table[i].dll_table_length;
|
|
for (i = 0; i < limit; i++)
|
|
if (strcasecmp(dll_table[i].export_name, func_name) == 0)
|
|
return i;
|
|
|
|
return 0;
|
|
}
|
|
/**********************************************************************
|
|
* ReturnArg
|
|
*/
|
|
int
|
|
ReturnArg(int arg)
|
|
{
|
|
return arg;
|
|
}
|
|
|
|
#ifdef WINESTAT
|
|
void winestat(){
|
|
int i, j;
|
|
double perc;
|
|
int used, implemented;
|
|
int tused, timplemented;
|
|
struct dll_table_entry_s *table;
|
|
|
|
tused = 0;
|
|
timplemented = 0;
|
|
for (i = 0; i < N_BUILTINS; i++) {
|
|
table = dll_builtin_table[i].dll_table;
|
|
used = 0;
|
|
implemented = 0;
|
|
for(j=0; j < dll_builtin_table[i].dll_table_length; j++) {
|
|
if(table[j].used){
|
|
used++;
|
|
if (table[j].handler) implemented++;
|
|
else
|
|
printf("%s.%d\n",
|
|
dll_builtin_table[i].dll_name,
|
|
j);
|
|
};
|
|
};
|
|
tused += used;
|
|
timplemented += implemented;
|
|
if(used)
|
|
perc = implemented * 100.00 / used;
|
|
else
|
|
perc = 0.0;
|
|
printf("%s: %d %d %3.1f\n", dll_builtin_table[i].dll_name, implemented, used, perc);
|
|
};
|
|
perc = timplemented * 100.00 / tused;
|
|
printf("TOTAL: %d %d %3.1f\n",timplemented, tused, perc);
|
|
}
|
|
#endif /* WINESTAT */
|