Release 950727
Sat Jul 22 22:39:09 IDT 1995 Michael Veksler <e1678223@tochnapc2.technion.ac.il>
* [ipc/*]
New directory. This directory contains the new inter-wine
communications support. It enables DDE protocols between two wine
instances. Currently it is limited to DDE, but can be enhanced to
support OLE between 2 different wine instances. This is very
important for libwine.a DDE/OLE support.
* [tools/ipcl]
A script to delete garbage IPC handles (shared memory, semaphores
and message queues). The current inter-wine communication is not
perfect, and sometimes leaves garbage behind.
* [if1632/relay.c] [include/atom.h] [include/global.h]
[loader/selector.c] [loader/task.c] [loader/module.c]
[loader/signal.c] [memory/global.c] [misc/atom.c]
[windows/class.c] [windows/message.c] [windows/win.c]
[Imakefile]
Hooks for inter-wine DDE support, current Global.*Atom functions
renamed to Local.*Atom since Global.*Atom are used for Inter-Wine
DDE communication. (The first call to these functions sets up the
IPC structures - which otherwise cause unneeded overhead.
Mon Jul 17 19:55:21 1995 Alexandre Julliard <julliard@sunsite.unc.edu>
* [controls/menu.c]
Don't crash if a NULL string is passed to menu functions.
* [memory/selector.c]
We now use a bit in ldt_flags_copy to indicate free LDT entries.
Fixed a bug in SELECTOR_ReallocBlock that could cause it to
overwrite valid LDT entries when growing a block.
* [miscemu/instr.c]
Emulate int xx instruction by storing the interrupt vector in
CS:IP and returning directly. This allows a program to install an
interrupt vector.
* [windows/win.c]
Added function WIN_GetTopParent to get the top-level parent of a
window.
Sun Jul 16 18:17:17 1995 Gregory Trubetskoy <grisha@mira.com>
* [loader/resource.c]
Added LoadIconHandler. It doesn't do anything yet, but now you
can use borland help files with winhelp.exe.
Sun Jul 16 11:58:45 1995 Anand Kumria <akumria@ozemail.com.au>
* [misc/main.c]
Fixed to return 386 Enhanced mode correctly. Also return the same
type of CPU, for both Enhanced and Standard mode, namely a 386.
Sun Jul 16 00:02:04 1995 Martin von Loewis <loewis@informatik.hu-berlin.de>
* [Configure] [include/options.h] [include/wineopts.h]
[misc/main.c][misc/spy.c]
Removed support of spy file. Redirected spy messages to stddeb.
Removed -spy option. Added -debugmsg +spy option.
* [debugger/dbg.y][debugger/debug.l]
Enabled segmented addresses (seg:offs) for break and x commands.
* [if1632/gdi.spec] [objects/region.c] [windows/graphics.c]
[include/region.h]
FrameRgn, REGION_FrameRgn: New functions
* [if1632/kernel.spec]
IsWinOldApTask: Return false
* [if1632/mouse.spec]
CplApplet: Removed
* [if1632/user.spec] [windows/win.c]
ShowOwnedPopups: New function
* [if1632/winsock.spec] [misc/winsocket.c]
inet_addr, select: New prototypes in relay code
Fixed memory layout for netdb functions (getXbyY).
WINSOCK_ioctlsocket: Translated FIONREAD, FIONBIO, and FIOASYNC
* [objects/clipping.c]
RectVisible: Fixed call to LPToDP
* [rc/winerc.c]
main: Removed extra argument to getopt for Linux.
Tue Jul 11 00:14:41 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de>
* [controls/listbox.c]
Yet another fix for ListBoxDirectory().
* [loader/module.c] [if1632/kernel.spec]
Make GetModuleHandle() accept instance handles as parameter.
* [if1632/relay.c] [loader/task.c]
Put a magic cookie at the bottom of the 32 bit stack, and check on
each return from a 32 bit function whether it's still there. Complain
if it's not.
* [if1632/user.spec]
Wrong entry for CloseDriver().
* [misc/dos_fs.c] [loader/task.c] [include/dos_fs.h] [misc/file.c]
[miscemu/int21.c]
Large parts of dos_fs.c simplified. Changed it to use one
current drive/directory per task, which is set to the module path on
task creation.
Prevent CorelPaint from closing stdin.
open() with O_CREAT set must be passed three parameters.
DOS FindFirst()/FindNext() could crash when FA_LABEL was set. Fixed,
it's in DOS_readdir() now.
* [misc/profile.c]
Some badly written software (Lotus Freelance Graphics) passes a bogus
size parameter that caused Wine to write off the end of a segment.
Fixed. (It's probably too paranoid now.)
* [multimedia/mmsystem.c] [multimedia/time.c] [multimedia/joystick.c]
[multimedia/Imakefile] [if1632/winprocs.spec]
16 bit entry point for MMSysTimeCallback.
Split off time.c and joystick.c from mmsystem.c.
* [objects/dib.c]
GetDIBits(): call XGetImage() via CallTo32_LargeStack.
* [windows/cursor.c]
DestroyCursor(): do nothing for builtin cursors.
* [windows/mdi.c]
Half of WM_MDISETMENU implemented.
* [windows/win.c]
EnumWindows() and EnumTaskWindows() never enumerated any windows.
Fixed.
* [windows/*.c]
Fixed GetParent() to return correct values for owned windows.
* [windows/message.c]
Don't try to activate disabled top-level windows.
* [windows/nonclient.c]
Work around a bug in gcc-2.7.0.
* [tools/build.c] [include/stackframe.h] [memory/global.c]
[loader/task.c] [memory/selector.c]
Some Visual Basic programs (and possibly others, too) expect ES to be
preserved by a call to an API function, so we have to save it.
In GlobalFree() and FreeSelector(), we must clear CURRENT_STACK16->es
to prevent segfaults if ES contained the selector to be freed.
Sun Jul 9 20:21:20 1995 Jon Tombs <jon@gtex02.us.es>
* [*/*]
Added missing prototypes to header files and relevant includes
to reduce compile time warnings.
Sun Jul 9 18:32:56 1995 Michael Patra <micky@marie.physik.tu-berlin.de>
* [configure.in] [include/config.h] [*/Makefile.in]
New configuration scheme based on autoconf.
Sat Jul 8 14:12:45 1995 Morten Welinder <terra+@cs.cmu.edu>
* [miscemu/ioports.c]
Revamp to have only one in- and one out- variant, both really
implemented.
* [miscemu/instr.c]
INSTR_EmulateInstruction: Use new ioport interface. Implement
string io. Correct instruction pointer for 32-bit code.
* [include/miscemu.h]
Update port function prototypes.
* [include/registers.h]
Defined FS and GS.
Sat Jul 8 13:38:54 1995 Hans de Graaff <graaff@twi72.twi.tudelft.nl>
* [misc/dos_fs.c]
ChopOffSlash(): A path consisting off a single slash is left
intact, and multiple slashes are all removed.
diff --git a/tools/Makefile.in b/tools/Makefile.in
new file mode 100644
index 0000000..e5b6a7b
--- /dev/null
+++ b/tools/Makefile.in
@@ -0,0 +1,41 @@
+CC = @CC@
+CFLAGS = @CFLAGS@
+XINCL = @x_includes@
+TOPSRC = @top_srcdir@
+DIVINCL = -I$(TOPSRC)/include
+
+
+all: build
+
+build: build.o
+ $(CC) $(CFLAGS) -o build build.o
+
+.c.o:
+ $(CC) -c $(CFLAGS) $(XINCL) $(DIVINCL) -o $*.o $<
+
+depend:
+ sed '/\#\#\# Dependencies/q' < Makefile > tmp_make
+ $(CC) $(DIVINCL) $(XINCL) -MM *.c >> tmp_make
+ cp tmp_make Makefile
+ rm tmp_make
+
+clean:
+ rm -f *.o \#*\# *~ build tmp_make
+
+distclean: clean
+ rm Makefile
+
+countryclean:
+
+NAMES = $(SRCS:.c=)
+
+winelibclean:
+ for i in $(NAMES); do \
+ if test `grep -c WINELIB $$i.c` -ne 0; then \
+ rm $$i.o; \
+ fi; \
+ done
+
+dummy:
+
+### Dependencies:
diff --git a/tools/build.c b/tools/build.c
index e88bbd9..4fab002 100644
--- a/tools/build.c
+++ b/tools/build.c
@@ -1145,10 +1145,10 @@
printf( "\tmovl %%edx,%d(%%ebx)\n", CONTEXTOFFSET(sc_edx) );
printf( "\tmovl %%esi,%d(%%ebx)\n", CONTEXTOFFSET(sc_esi) );
printf( "\tmovl %%edi,%d(%%ebx)\n", CONTEXTOFFSET(sc_edi) );
- printf( "\tpushw %%es\n" );
- printf( "\tpopw %d(%%ebx)\n", CONTEXTOFFSET(sc_es) );
printf( "\tmovw -10(%%ebp),%%ax\n" ); /* Get saved ds from stack */
printf( "\tmovw %%ax,%d(%%ebx)\n", CONTEXTOFFSET(sc_ds) );
+ printf( "\tmovw -12(%%ebp),%%ax\n" ); /* Get saved es from stack */
+ printf( "\tmovw %%ax,%d(%%ebx)\n", CONTEXTOFFSET(sc_es) );
printf( "\tpushfl\n" );
#ifndef __FreeBSD__
printf( "\tpopl %d(%%ebx)\n", CONTEXTOFFSET(sc_eflags) );
@@ -1175,10 +1175,9 @@
printf( "\tmovl %d(%%ebx),%%edx\n", CONTEXTOFFSET(sc_edx) );
printf( "\tmovl %d(%%ebx),%%esi\n", CONTEXTOFFSET(sc_esi) );
printf( "\tmovl %d(%%ebx),%%edi\n", CONTEXTOFFSET(sc_edi) );
- printf( "\tpushw %d(%%ebx)\n", CONTEXTOFFSET(sc_es) );
- printf( "\tpopw %%es\n" );
- printf( "\tpopw %%ax\n" ); /* Remove old ds from the stack */
+ printf( "\tpopl %%eax\n" ); /* Remove old ds and es from stack */
printf( "\tpushw %d(%%ebx)\n", CONTEXTOFFSET(sc_ds) ); /* Push new ds */
+ printf( "\tpushw %d(%%ebx)\n", CONTEXTOFFSET(sc_es) ); /* Push new es */
#ifndef __FreeBSD__
printf( "\tpushl %d(%%ebx)\n", CONTEXTOFFSET(sc_eflags) );
#else
@@ -1241,14 +1240,17 @@
printf( "\tmovzwl %%sp,%%ebp\n" );
printf( "\taddw $8,%%bp\n" );
- /* Save 16-bit ds */
+ /* Save 16-bit ds and es */
printf( "\tpushw %%ds\n" );
+ printf( "\tpushw %%es\n" );
- /* Restore 32-bit ds */
+ /* Restore 32-bit ds and es */
- printf( "\tpushw $0x%04x\n", WINE_DATA_SELECTOR );
+ printf( "\tpushl $0x%04x%04x\n", WINE_DATA_SELECTOR, WINE_DATA_SELECTOR );
printf( "\tpopw %%ds\n" );
+ printf( "\tpopw %%es\n" );
+
/* Save the 16-bit stack */
@@ -1271,11 +1273,6 @@
if (!reg_func && short_ret)
printf( "\tmovl %%edx,-8(%%ebp)\n" );
- /* Setup es */
-
- printf( "\tpushw %%ds\n" );
- printf( "\tpopw %%es\n" );
-
/* Switch to the 32-bit stack */
printf( "\tmovl " PREFIX "IF1632_Saved32_esp,%%ebp\n" );
@@ -1294,9 +1291,11 @@
{
printf( "\tpushl %%eax\n" );
printf( "\tpushl $CALL32_Str_%s\n", profile );
+ printf( "\tpushl $%d\n", reg_func ? 2 : (short_ret ? 1 : 0) );
printf( "\tcall " PREFIX "RELAY_DebugCall32\n" );
printf( "\tpopl %%eax\n" );
printf( "\tpopl %%eax\n" );
+ printf( "\tpopl %%eax\n" );
}
/* Call the entry point */
@@ -1346,8 +1345,9 @@
}
}
- /* Restore ds */
+ /* Restore ds and es */
+ printf( "\tpopw %%es\n" );
printf( "\tpopw %%ds\n" );
/* Get the return value into dx:ax and clean up the stack */
@@ -1532,7 +1532,6 @@
printf( "\tpushl 12(%%ebx)\n" );
/* Get the 16-bit ds */
- /* FIXME: this shouldn't be necessary if function prologs fixup worked. */
if (reg_func)
{
@@ -1544,8 +1543,6 @@
{
/* Set ax equal to ds for window procedures */
printf( "\tmovw 16(%%ebx),%%ax\n" );
-
- /* This seems to be needed, although I still don't see why... */
printf( "\tmovw %%ax,%%ds\n" );
}
diff --git a/tools/ipcl b/tools/ipcl
new file mode 100644
index 0000000..7a066d5
--- /dev/null
+++ b/tools/ipcl
@@ -0,0 +1,92 @@
+#!/usr/bin/perl
+
+#
+# Copyright 1995. Michael Veksler.
+#
+
+$IPC_RMID=0;
+$USER=$ENV{USER};
+
+do open_pipe(IPCS,"ipcs");
+
+#
+# The following part is OS dependant, it works under linux only.
+# To make it work under other OS
+# You should fill in @shm, @sem, @msq lists, with the relevent IPC
+# keys.
+
+#
+# This code was written to be as much as possible generic, but...
+# It works for Linux and ALPHA. I had no BSD machine to test it.
+# (As I remember, AIX will work also).
+
+while(<IPCS>) {
+ split;
+
+ # try to find out the IPC-ID, assume it is the first number.
+ foreach (@_) {
+ $_ ne int($_) && next; # not a decimal number
+ $num=$_;
+ last;
+ }
+ if (/mem/i .. /^\s*$/ ) {
+ index($_,$USER)>=0 || next;
+ push(@shm,$num);
+ }
+ if (/sem/i .. /^\s*$/ ) {
+ index($_,$USER)>=0 || next;
+ push(@sem,$num);
+ }
+ if (/mes/i .. /^\s*$/ ) {
+ index($_,$USER)>=0 || next;
+ push(@msq,$num);
+ }
+}
+
+
+#
+# This is the end of OS dependant code.
+#
+
+@shm && print "shmid ", join(":",@shm),"\n";
+@sem && print "semid ", join(":",@sem),"\n";
+@msq && print "msqid ", join(":",@msq),"\n";
+foreach (@shm) {
+ shmctl($_, $IPC_RMID,0);
+}
+foreach (@sem) {
+ semctl($_, 0, $IPC_RMID,0);
+}
+foreach (@msq) {
+ msgctl($_, $IPC_RMID,0);
+}
+
+exit(0);
+
+
+
+
+
+sub open_pipe {
+ local($pid);
+ local($handle,@params)=@_;
+ pipe($handle,WRITE) || die "can't pipe";
+
+ $pid=fork();
+
+ die "can't fork" if ($pid<0);
+ if ($pid>0) {
+ # whe are in the parent
+ close(WRITE);
+ waitpid($pid,0) || print "$params[0] exits status=$? ",$? >> 8, "\n";
+ } else {
+ # we are in the son.
+ open(STDOUT,">&WRITE");
+ open(STDERR, ">&WRITE");
+ close($handle);
+ close(WRITE);
+ exec(@params);
+ exit(-1);
+ }
+
+}
