Sun Oct 30 13:01:18 1994 Alexandre Julliard (julliard@lamisun.epfl.ch) * [controls/static.c] Bug fix for SS_ICON controls. * [if1632/Imakefile] Fixed call.o dependencies. * [objects/clipping.c] [objects/dc.c] Fixed visible region handling. hVisRgn is always non-null now. * [windows/dce.c] Bug fix in GetDCEx for CS_OWNDC windows. * [windows/nonclient.c] [windows/painting.c] Fixes to icon window drawing. * [windows/winpos.c] A few fixes in SetWindowPos(). Sun Oct 30 12:50:24 1994 Michael Patra <micky@marie.physik.tu-berlin.de> * [objects/bitblt.c] BitBlt(): BitBlt is now able to handle any raster operation. If the request can't be passed to XWindows directly, it's quite slow, though. * [*/*.c] [misc/main.c] Improvements of the system for handling debug messages. Options are now also loaded from /usr/lib/X11/app-defaults/Wine (insert *debugoptions: +xxx there if you want to have turn messages xxx on). * [controls/menu.c] DestroyMenu(): The whole window won't be destroyed as a sideeffect any longer. * [misc/file.c] OpenFile(): Fixed bug in searching in system/window-directory. Sun Oct 30 12:25:53 1994 Jimmy Tirtawangsa <j0t2527@tam2000.tamu.edu> * [include/windows.h] Bug fix for window related structures. DCB and COMSTAT are affected. They must be packed. * [misc/comm.c] Bug fix for COM ports: Dial and dialog window in terminal.exe now works. Non sequential COM assignments in wine.conf should not break now. Baudrate can be specified in wine.conf to overcome baudrate limitation in mswindow. See sample wine.ini * [include/comm.h] add baudrate field to DosDeviceStructre * [object/font.c] Bug fix for font assignment. Use pairs of foundry and family fontnames in X11 to correspond with window's fonts. Put font assignment ini wine.ini. * [wine.ini] Adding optional baudrate after port name in "serialports" section Add new section, "fonts". "default" is special key in "fonts" to match any unmatch window font. Oct 29, 94 (new address) wine@trgcorp.mksinfo.qc.ca (Martin Ayotte) * [if1632/relay.c] * [if1632/commdlg.spec] New file. * [misc/commdlg.c] New file. * [include/commdlg.h] New file. Begin of an emulated COMMDLG DLL, built-in for now. (BTW, if you want to switch between built-in & 16bits CommDlg, only thing you need to do is to put the real/dummy name in file relay.c) * [controls/scroll.c] * [controls/combo.c] * [controls/listbox.c] Few bug fixes and/or cosmetic. * [misc/audio.c] * [misc/mmaux.c] bug fixes and flags returned to emulate SB16. * [misc/midi.c] New file. skeleton for 'Midi' MMSYSTEM & MCI driver. * [misc/mcianim.c] New file. skeleton for 'Animation1' MCI driver. * [windows/win.c] Add new stub for GetLastActiveWindow(). Tue Oct 25 09:17:25 1994 Olaf Flebbe (flebbe@tat.physik.uni-tuebingen.de) * [if1632/call.S] [tools/build.c] Support for ELF format. (Not complete) Sun Oct 23 00:51:50 1994 Paul Falstad (pf@zoof) * [if1632/user.spec] Add stubs for ArrangeIconicWindows(), etc. * [if1632/kernel.spec] Add IsBad*Ptr() functions. * [loader/signal.c] Add test_memory(), for use with IsBad*Ptr(). * [windows/winpos.c] Add stubs for TileChildWindows(), etc. * [windows/win.c] IsWindow() shouldn't crash if it's given a bad handle. Add stub for GetLastActivePopup(). * [memory/global.c] Implement the IsBad*Ptr() functions. * [controls/listbox.c] Return the full longword of the item data in LB_GETITEMDATA. * [controls/edit.c] Don't let the user select an area past the end of the text. * [objects/text.c] In DrawText(), the code to delete crlfs also removed multiple consecutive newlines. Also, using DT_CALCRECT didn't return the right height, and the width wasn't returned at all. This caused MessageBoxes to be missing much of their text. * [windows/scroll.c] ScrollWindow[Ex] didn't work right with null LPRECT arguments. Fri Oct 21 21:47:19 1994 Paul Falstad (pf@zoof.cts.com) * [miscemu/int21.c] Fixed int21 0x42 handler to properly assemble 32-bit seek ptr. * [misc/property.c] Fixed inverted logic in EnumProps(), and changed CallBack16() call to use new arg format. * [windows/win.c] Fixed CallBack16() call in Enum[Child]Windows to use new arg format; this fixes crashes in enum procedures. Wed Oct 19 21:30:00 PDT 1994 martin@cs.csufresno.edu * [misc/clipboard.c] [windows/event.c] [windows/message.c] Added cut and paste between Wine and other X clients via the PRIMARY selection. Text only this time. * [controls/edit.c] EDIT_LineLength, EDIT_TextLine return 0 for lines after last one. * [windows/defwnd.c] Send WM_SYSCOMMAND to overlapped ancestor window, not the receiver of WM_SYSKEYDOWN Sat Oct 22 15:01:02 1994 Thomas Sandford <t.d.g.sandford@bradford.ac.uk> * [controls/edit.c] ClientWidth()/ClientHeight() macros: return 0 if size would be negative EDIT_StrLength(): takes unsigned char* instead of char* * [controls/listbox.c] ListBoxWndProc(): in "case WM_MOUSEMOVE" - set lphl at start of case instead of in each place required (it was omitted in some places causing problems!) * [controls/menu.c] MENU_CalcItemSize(): don't try to find size of a text item if the pointer is NULL * [include/heap.h] added definition of HEAP_LocalInit() * [include/msdos.h] removed buggy pointer() macro (use SAFEMAKEPTR() from segmem.h instead) * [loader/selector.c] IPCCopySelector(): added missing flags to shmget() call ? does this break linux - I added these flags in a previous patch but they were missing in the corresponding release ? * [loader/signal.c] win_fault(): added missing definitions of i, dump for those not running NetBSD or linux * [misc/dos_fs.c] DOS_GetCurrentDir(): made temp[] static so it can be safely returned * [miscemu/int21.c,int25.c,int26.c] Changed all invocations of pointer() to SAFEMAKEPTR(). Included segmem.h where necessary. * [windows/dialog.c] CreateDialogIndirectParam(): Changed HEAP_Init() call to HEAP_LocalInit(), removed redundant variables Sat Oct 22 00:29:41 MET 1994 Dag Asheim (dash@ifi.uio.no) * [loader/library.c] [loader/main.c] [loader/ne_image.c] [misc/exec.c] [miscemu/int10.c] [miscemu/int21.c] [objects/bitblt.c] [objects/metafile.c] Rewritten more printf's to use the new debugging system, and made wine less verbose per default. Use "-debugmsg +module" to get (almost) the same behavior as before.
315 lines
7.5 KiB
C
315 lines
7.5 KiB
C
#ifndef WINELIB
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <signal.h>
|
|
#include <errno.h>
|
|
#include <time.h>
|
|
#include <setjmp.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;
|
|
#if !(defined (linux) || defined (__NetBSD__))
|
|
int i, *dump;
|
|
#endif
|
|
|
|
/* 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:%lx)."
|
|
" 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:%lx\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
|
|
}
|
|
|
|
static sigjmp_buf segv_jmpbuf;
|
|
|
|
static void
|
|
segv_handler()
|
|
{
|
|
siglongjmp(segv_jmpbuf, 1);
|
|
}
|
|
|
|
int
|
|
test_memory( char *p, int write )
|
|
{
|
|
int ret = FALSE;
|
|
struct sigaction new_act;
|
|
struct sigaction old_act;
|
|
|
|
memset(&new_act, 0, sizeof new_act);
|
|
new_act.sa_handler = segv_handler;
|
|
if (sigsetjmp( segv_jmpbuf, 1 ) == 0) {
|
|
char c = 100;
|
|
if (sigaction(SIGSEGV, &new_act, &old_act) < 0)
|
|
perror("sigaction");
|
|
c = *p;
|
|
if (write)
|
|
*p = c;
|
|
ret = TRUE;
|
|
}
|
|
wine_sigaction(SIGSEGV, &old_act, NULL);
|
|
return ret;
|
|
}
|
|
|
|
#endif /* ifndef WINELIB */
|