Sun Oct 16 13:29:07 1994 Alexandre Julliard (julliard@lamisun.epfl.ch) * [controls/button.c] Implemented WM_GETDLGCODE, WM_SETFONT, BM_SETSTYLE, BM_SETCHECK, BM_SETSTATE. Implemented default button painting. Optimised redrawing. Fixed owner-draw buttons. * [controls/static.c] Implemented WM_SETFONT. A few optimisations in painting code. Bug fix for SS_SIMPLE controls. * [if1632/callback.c] Preliminary GetCodeHandle(). * [if1632/gdi.spec] Changed 'pascal' to 'pascal16' everywhere it's needed. * [include/windows.h] Fixed a few data structures. * [memory/heap.c] Bug fix in HEAP_ReAlloc(). * [misc/cursor.c] Fixed SetCursor(). * [objects/bitblt.c] Fixed PatBlt() when using BLACKNESS or WHITENESS codes. * [objects/font.c] Better font mapping code. Implemented GetTextFace(). * [objects/region.c] Bug fix in REGION_MakePixmap(). Faster region copying. * [objects/text.c] Implemented ExtTextOut(). Implemented DT_NOCLIP style for DrawText(). * [windows/dc.c] Free the bitmap when deleting a memory DC. * [windows/dce.c] Added support for windows that have no associated X window. Implemented DCX_CLIPSIBLINGS and DCX_PARENTCLIP in GetDCEx(). * [windows/defdlg.c] Implemented default push button handling and DM_SETDEFID. Implemented WM_NEXTDLGCTL. * [windows/dialog.c] Implemented default push button handling. Beginning of a keyboard interface in dialogs (does not really work yet). Fixed dialogs that use a special font. * [windows/event.c] [windows/focus.c] Added support for non-X windows. * [windows/graphics.c] Rewritten FloodFill() and implemented ExtFloodFill(). * [windows/message.c] Cleaner hardware messages and X events handling. * [windows/defwnd.c] [windows/painting.c] Implemented WM_SETREDRAW. * [windows/win.c] Only create an X window for top-level windows, or for the desktop. Child windows now use their parent's drawable. * [windows/winpos.c] Beginning of support for non-X windows (still somewhat broken). Implemented *DeferWindowPos(). * [*/Imakefile] Cleaned up some Imakefiles. Moved dc.c from windows/ to objects/. Moved cursor.c from misc/ to windows/. Sun Oct 16 12:21:52 1994 Michael Patra <micky@marie.physik.tu-berlin.d400.de> * [include/debug.h] [include/stddebug.h] [*/*.c] Rewritten all the calls to printf for displaying debug-information (messages like "LoadImage: loading SOL (SOL.EXE)" etc.) Added option "-debugmsg" to Wine. Example: "-debugmsg +all" will turn all these messages on, "-debugmsg -dll" will turn all messages concerning DLLs off. * [controls/combo.c] Added some handling for combo controls with ownerdraw-styles (just creating and passing the necessary messages to the corresponding listbox control; the edit-control needs to be replaced with something else). * [controls/edit.c] [windows/dialog.c] Added support for use of global heap memory in dialogs with edit controls. * [controls/listbox.c] Added support for item data. ListBoxInsertString(): Fixed bug for elements which are not inserted after the currently last element. * [misc/dos_fs.c] [miscemu/int21.c] DOS_ValidDirectory(): Checks whether a given string is in fact the valid name of a directory. Sat Oct 15 17:35:00 PDT 1994 <martin@cs.csufresno.edu> * [Imakefile] generate wine.sym after creating wine * [debugger/dbg.y] load "wine.sym" when entering debugger * [debugger/info.c] symbolic backtrace for 32-bit stack. Breaks 16-bit bt. Sun Sep 25 12:00:00 PDT 1994 <martin@osiris.cs.csufresno.edu> * [rc/rc.y] [rc/rc.h] [rc/rc.l] [rc/winerc.c] Files created Sun Sep 18 11:04:45 MET DST 1994 Dag Asheim (dash@ifi.uio.no) * [misc/spy.c] Exclude and Include no longer requires a terminating ';' to register the last component. Thu Sep 15 23:10:09 MET DST 1994 Dag Asheim (dash@ifi.uio.no) * [Configure] Rewrote much of it. Added capability to generate a wine.ini file. Commented out the processor emulator options until that becomes interesting. Gives a warning if it sees any *.rej files. I hope I haven't assumed to much about the shell/OS so that it breaks under *BSD. * [misc/dos_fs.c] Removed/changed calls to ToUnix() (which calls tolower()) so that the part of the pathname which correspond with the drive letter on DOS no longer will be mapped to lowercase. This means that it should be possible to have uppercase letters in the [drives] section of wine.ini. * [LICENSE] Cosmetic changes so that it displays better in the window you get from pressing "Credit_License" in the "About WINE" window. Sun Aug 21 21:12:06 MET DST 1994 <erik@xs4all.nl> * [controls/menu.c] LoadMenu() moved to loader/resource.c. * [misc/main.c] Added stub for FileCDR(). * [include/peexe.h] Added, from Eric's pe-test. * [include/resource.h] Added. * [loader/resources.c] Removed duplicated code in *Resource() functions. Moved NE-program specific functions into ne_image.c. Moved NE-fileformat functions to ne_resource.c. * [pe_image.c] [pe_resource.c] Added. Nothing implemented to run PE-executables, resource loading only. * [misc/file.c] Changed OpenFile() to use macros. * [misc/shell.c] Added NULL-ptr checks to ShellAbout(). * [miscemu/int21.c] Fixed a few typos. * [miscemu/kernel.c] Added _DI = _DS, to put the caller's instance in DI. Doesn't work properly if caller changed DS :-(
311 lines
7.7 KiB
C
311 lines
7.7 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 <string.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"
|
|
#include "options.h"
|
|
|
|
#define DEBUG_RELAY /* */
|
|
|
|
#ifdef WINELIB
|
|
#define WineLibSkip(x) 0
|
|
#else
|
|
#define WineLibSkip(x) x
|
|
#endif
|
|
|
|
struct dll_name_table_entry_s dll_builtin_table[N_BUILTINS] =
|
|
{
|
|
{ "KERNEL", WineLibSkip(KERNEL_table), 410, 1 },
|
|
{ "USER", WineLibSkip(USER_table), 540, 2 },
|
|
{ "GDI", WineLibSkip(GDI_table), 490, 3 },
|
|
{ "UNIXLIB", WineLibSkip(UNIXLIB_table), 10, 4 },
|
|
{ "WIN87EM", WineLibSkip(WIN87EM_table), 10, 5 },
|
|
{ "SHELL", WineLibSkip(SHELL_table), 103, 6 },
|
|
{ "SOUND", WineLibSkip(SOUND_table), 20, 7 },
|
|
{ "KEYBOARD",WineLibSkip(KEYBOARD_table),137, 8 },
|
|
{ "WINSOCK", WineLibSkip(WINSOCK_table), 155, 9 },
|
|
{ "STRESS", WineLibSkip(STRESS_table), 15, 10},
|
|
{ "MMSYSTEM",WineLibSkip(MMSYSTEM_table),1226,11},
|
|
{ "SYSTEM", WineLibSkip(SYSTEM_table), 20 ,12},
|
|
{ "TOOLHELP",WineLibSkip(TOOLHELP_table), 83, 13},
|
|
{ "MOUSE", WineLibSkip(MOUSE_table), 8, 14},
|
|
};
|
|
/* don't forget to increase N_BUILTINS in dll.h if you add a dll */
|
|
|
|
#ifndef WINELIB
|
|
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 short *saved_Stack16Frame;
|
|
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.
|
|
*/
|
|
saved_Stack16Frame = Stack16Frame;
|
|
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
|
|
if (Options.relay_debug)
|
|
{
|
|
unsigned int *ret_addr;
|
|
unsigned short *stack_p;
|
|
|
|
ret_addr = (unsigned int *) ((char *) seg_off + 0x14);
|
|
printf("Call %s (%s.%d), stack=%04x:%04x, ",
|
|
dll_p->export_name,
|
|
dll_builtin_table[dll_id].dll_name, ordinal,
|
|
seg_off >> 16, seg_off & 0xffff);
|
|
printf("ret=%08x", *ret_addr);
|
|
printf(" ESP=%08x, EBP=%08x, SS=%04x\n",
|
|
IF1632_Saved16_esp, IF1632_Saved16_ebp,
|
|
IF1632_Saved16_ss);
|
|
|
|
#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)
|
|
{
|
|
ret_val = (*func_ptr)(arg_ptr);
|
|
Stack16Frame = saved_Stack16Frame;
|
|
return ret_val;
|
|
}
|
|
|
|
/*
|
|
* 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
|
|
if (Options.relay_debug)
|
|
{
|
|
printf("Returning %08.8x from %s (%s.%d)\n",
|
|
ret_val,
|
|
dll_p->export_name,
|
|
dll_builtin_table[dll_id].dll_name, ordinal);
|
|
}
|
|
#endif
|
|
|
|
Stack16Frame = saved_Stack16Frame;
|
|
return ret_val;
|
|
}
|
|
#endif
|
|
|
|
/**********************************************************************
|
|
* FindDLLTable
|
|
*/
|
|
struct dll_table_entry_s *
|
|
FindDLLTable(char *dll_name)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < N_BUILTINS; i++)
|
|
if (strcasecmp(dll_builtin_table[i].dll_name, dll_name) == 0)
|
|
#ifdef WINELIB
|
|
return dll_builtin_table[i].dll_number;
|
|
#else
|
|
return dll_builtin_table[i].dll_table;
|
|
#endif
|
|
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;
|
|
}
|
|
|
|
#ifndef WINELIB
|
|
#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 not implemented\n",
|
|
dll_builtin_table[i].dll_name,
|
|
j);
|
|
};
|
|
};
|
|
tused += used;
|
|
timplemented += implemented;
|
|
if(used)
|
|
perc = implemented * 100.00 / used;
|
|
else
|
|
perc = 0.0;
|
|
if (used)
|
|
printf("%s: %d of %d (%3.1f %%)\n", dll_builtin_table[i].dll_name, implemented, used, perc);
|
|
};
|
|
perc = timplemented * 100.00 / tused;
|
|
printf("TOTAL: %d of %d winapi functions implemented (%3.1f %%)\n",timplemented, tused, perc);
|
|
}
|
|
#endif /* WINESTAT */
|
|
#endif /* !WINELIB */
|