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 :-(
281 lines
6.9 KiB
C
281 lines
6.9 KiB
C
#ifndef WINELIB
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <signal.h>
|
|
#include <errno.h>
|
|
#include <time.h>
|
|
|
|
#if defined(__NetBSD__) || defined(__FreeBSD__)
|
|
#include <sys/syscall.h>
|
|
#include <sys/param.h>
|
|
#else
|
|
#include <syscall.h>
|
|
#endif
|
|
#ifdef linux
|
|
#define inline __inline__ /* So we can compile with -ansi */
|
|
#include <linux/sched.h>
|
|
#include <asm/system.h>
|
|
#undef inline
|
|
#endif
|
|
|
|
#include "wine.h"
|
|
#include "segmem.h"
|
|
#include "prototypes.h"
|
|
#include "win.h"
|
|
|
|
extern int do_int10(struct sigcontext_struct *);
|
|
extern int do_int13(struct sigcontext_struct *);
|
|
extern int do_int15(struct sigcontext_struct *);
|
|
extern int do_int16(struct sigcontext_struct *);
|
|
extern int do_int25(struct sigcontext_struct *);
|
|
extern int do_int26(struct sigcontext_struct *);
|
|
extern int do_int2a(struct sigcontext_struct *);
|
|
extern int do_int2f(struct sigcontext_struct *);
|
|
extern int do_int31(struct sigcontext_struct *);
|
|
|
|
#if !defined(BSD4_4) || defined(linux)
|
|
char * cstack[4096];
|
|
#endif
|
|
struct sigaction segv_act;
|
|
|
|
#ifdef linux
|
|
extern void ___sig_restore();
|
|
extern void ___masksig_restore();
|
|
|
|
/* Similar to the sigaction function in libc, except it leaves alone the
|
|
restorer field */
|
|
|
|
static int
|
|
wine_sigaction(int sig,struct sigaction * new, struct sigaction * old)
|
|
{
|
|
__asm__("int $0x80":"=a" (sig)
|
|
:"0" (SYS_sigaction),"b" (sig),"c" (new),"d" (old));
|
|
if (sig>=0)
|
|
return 0;
|
|
errno = -sig;
|
|
return -1;
|
|
}
|
|
#endif
|
|
|
|
int do_int(int intnum, struct sigcontext_struct *scp)
|
|
{
|
|
switch(intnum)
|
|
{
|
|
case 0x10: return do_int10(scp);
|
|
|
|
case 0x11:
|
|
scp->sc_eax = (scp->sc_eax & 0xffff0000L) | DOS_GetEquipment();
|
|
return 1;
|
|
|
|
case 0x12:
|
|
scp->sc_eax = (scp->sc_eax & 0xffff0000L) | 640L;
|
|
return 1; /* get base mem size */
|
|
|
|
case 0x13: return do_int13(scp);
|
|
case 0x15: return do_int15(scp);
|
|
case 0x16: return do_int16(scp);
|
|
case 0x1A: return do_int1A(scp);
|
|
case 0x21: return do_int21(scp);
|
|
|
|
case 0x22:
|
|
scp->sc_eax = 0x1234;
|
|
scp->sc_ebx = 0x5678;
|
|
scp->sc_ecx = 0x9abc;
|
|
scp->sc_edx = 0xdef0;
|
|
return 1;
|
|
|
|
case 0x25: return do_int25(scp);
|
|
case 0x26: return do_int26(scp);
|
|
case 0x2a: return do_int2a(scp);
|
|
case 0x2f: return do_int2f(scp);
|
|
case 0x31: return do_int31(scp);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
#ifdef linux
|
|
static void win_fault(int signal, struct sigcontext_struct context)
|
|
{
|
|
struct sigcontext_struct *scp = &context;
|
|
#else
|
|
static void win_fault(int signal, int code, struct sigcontext *scp)
|
|
{
|
|
#endif
|
|
unsigned char * instr;
|
|
|
|
/* First take care of a few preliminaries */
|
|
#ifdef linux
|
|
if(signal != SIGSEGV
|
|
&& signal != SIGILL
|
|
#ifdef SIGBUS
|
|
&& signal != SIGBUS
|
|
#endif
|
|
&& signal != SIGTRAP)
|
|
{
|
|
exit(1);
|
|
}
|
|
|
|
/* And back up over the int3 instruction. */
|
|
if(signal == SIGTRAP) {
|
|
scp->sc_eip--;
|
|
goto oops;
|
|
};
|
|
|
|
if((scp->sc_cs & 7) != 7)
|
|
{
|
|
#endif
|
|
#if defined(__NetBSD__) || defined(__FreeBSD__)
|
|
/* set_es(0x27); set_ds(0x27); */
|
|
if(signal != SIGBUS && signal != SIGSEGV && signal != SIGTRAP)
|
|
exit(1);
|
|
if(scp->sc_cs == 0x1f)
|
|
{
|
|
#endif
|
|
fprintf(stderr,
|
|
"Segmentation fault in Wine program (%x:%x)."
|
|
" Please debug\n",
|
|
scp->sc_cs, scp->sc_eip);
|
|
goto oops;
|
|
};
|
|
|
|
/* Now take a look at the actual instruction where the program
|
|
bombed */
|
|
instr = (unsigned char *) SAFEMAKEPTR(scp->sc_cs, scp->sc_eip);
|
|
|
|
switch(*instr)
|
|
{
|
|
case 0xcd: /* int <XX> */
|
|
instr++;
|
|
if (!do_int(*instr, scp)) {
|
|
fprintf(stderr,"Unexpected Windows interrupt %x\n", *instr);
|
|
goto oops;
|
|
}
|
|
scp->sc_eip += 2; /* Bypass the int instruction */
|
|
break;
|
|
|
|
case 0xec: /* inb al,dx */
|
|
inportb(scp);
|
|
scp->sc_eip++;
|
|
break;
|
|
|
|
case 0xed: /* in ax,dx */
|
|
inport(scp);
|
|
scp->sc_eip++;
|
|
break;
|
|
|
|
case 0xee: /* outb dx,al */
|
|
outportb(scp);
|
|
scp->sc_eip++;
|
|
break;
|
|
|
|
case 0xef: /* out dx,ax */
|
|
outport(scp);
|
|
scp->sc_eip++;
|
|
break;
|
|
|
|
case 0xfa: /* cli, ignored */
|
|
scp->sc_eip++;
|
|
break;
|
|
|
|
case 0xfb: /* sti, ignored */
|
|
scp->sc_eip++;
|
|
break;
|
|
|
|
default:
|
|
fprintf(stderr, "Unexpected Windows program segfault"
|
|
" - opcode = %x\n", *instr);
|
|
goto oops;
|
|
}
|
|
|
|
/* OK, done handling the interrupt */
|
|
|
|
return;
|
|
|
|
oops:
|
|
XUngrabPointer(display, CurrentTime);
|
|
XUngrabServer(display);
|
|
XFlush(display);
|
|
fprintf(stderr,"In win_fault %x:%x\n", scp->sc_cs, scp->sc_eip);
|
|
#if defined(linux) || defined(__NetBSD__)
|
|
wine_debug(signal, scp); /* Enter our debugger */
|
|
#else
|
|
fprintf(stderr,"Stack: %x:%x\n", scp->sc_ss, scp->sc_esp);
|
|
dump = (int*) scp;
|
|
for(i=0; i<22; i++)
|
|
{
|
|
fprintf(stderr," %8.8x", *dump++);
|
|
if ((i % 8) == 7)
|
|
fprintf(stderr,"\n");
|
|
}
|
|
fprintf(stderr,"\n");
|
|
exit(1);
|
|
#endif
|
|
}
|
|
|
|
int init_wine_signals(void)
|
|
{
|
|
#ifdef linux
|
|
segv_act.sa_handler = (__sighandler_t) win_fault;
|
|
/* Point to the top of the stack, minus 4 just in case, and make
|
|
it aligned */
|
|
segv_act.sa_restorer =
|
|
(void (*)()) (((unsigned int)(cstack) + sizeof(cstack) - 4) & ~3);
|
|
wine_sigaction(SIGSEGV, &segv_act, NULL);
|
|
wine_sigaction(SIGILL, &segv_act, NULL);
|
|
#ifdef SIGBUS
|
|
wine_sigaction(SIGBUS, &segv_act, NULL);
|
|
#endif
|
|
wine_sigaction(SIGTRAP, &segv_act, NULL); /* For breakpoints */
|
|
#endif
|
|
#if defined(__NetBSD__) || defined(__FreeBSD__)
|
|
sigset_t sig_mask;
|
|
#ifdef BSD4_4
|
|
struct sigaltstack ss;
|
|
|
|
if ((ss.ss_base = malloc(MINSIGSTKSZ)) == NULL) {
|
|
fprintf(stderr, "Unable to allocate signal stack (%d bytes)\n",
|
|
MINSIGSTKSZ);
|
|
exit(1);
|
|
}
|
|
ss.ss_size = MINSIGSTKSZ;
|
|
ss.ss_flags = 0;
|
|
if (sigaltstack(&ss, NULL) < 0) {
|
|
perror("sigstack");
|
|
exit(1);
|
|
}
|
|
#else
|
|
struct sigstack ss;
|
|
|
|
ss.ss_sp = (char *) (((unsigned int)(cstack) + sizeof(cstack) - 4) & ~3);
|
|
ss.ss_onstack = 0;
|
|
if (sigstack(&ss, NULL) < 0) {
|
|
perror("sigstack");
|
|
exit(1);
|
|
}
|
|
#endif
|
|
sigemptyset(&sig_mask);
|
|
segv_act.sa_handler = (void (*)) win_fault;
|
|
segv_act.sa_flags = SA_ONSTACK;
|
|
segv_act.sa_mask = sig_mask;
|
|
if (sigaction(SIGBUS, &segv_act, NULL) < 0) {
|
|
perror("sigaction: SIGBUS");
|
|
exit(1);
|
|
}
|
|
segv_act.sa_handler = (void (*)) win_fault;
|
|
segv_act.sa_flags = SA_ONSTACK;
|
|
segv_act.sa_mask = sig_mask;
|
|
if (sigaction(SIGSEGV, &segv_act, NULL) < 0) {
|
|
perror("sigaction: SIGSEGV");
|
|
exit(1);
|
|
}
|
|
segv_act.sa_handler = (void (*)) win_fault; /* For breakpoints */
|
|
segv_act.sa_flags = SA_ONSTACK;
|
|
segv_act.sa_mask = sig_mask;
|
|
if (sigaction(SIGTRAP, &segv_act, NULL) < 0) {
|
|
perror("sigaction: SIGTRAP");
|
|
exit(1);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
#endif /* ifndef WINELIB */
|