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/memory/Makefile.in b/memory/Makefile.in
new file mode 100644
index 0000000..80be79a
--- /dev/null
+++ b/memory/Makefile.in
@@ -0,0 +1,49 @@
+CC = @CC@
+CFLAGS = @CFLAGS@
+XINCL = @x_includes@
+TOPSRC = @top_srcdir@
+DIVINCL = -I$(TOPSRC)/include
+LD = @LD@
+LDCOMBINEFLAGS = @LDCOMBINEFLAGS@
+
+
+MODULE = memory
+
+SRCS = selector.c global.c ldt.c local.c
+
+OBJS = $(SRCS:.c=.o)
+
+.c.o:
+ $(CC) -c $(CFLAGS) $(XINCL) $(DIVINCL) -o $*.o $<
+
+all: $(MODULE).o
+
+$(MODULE).o: $(OBJS)
+ $(LD) $(LDCOMBINEFLAGS) $(OBJS) -o $(MODULE).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 \#*\# *~ 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/memory/global.c b/memory/global.c
index c1f5ab9..83c3213 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -6,10 +6,12 @@
#include <stdlib.h>
#include <string.h>
+
#include "windows.h"
#include "global.h"
#include "toolhelp.h"
#include "selectors.h"
+#include "dde_mem.h"
#include "stackframe.h"
#include "stddebug.h"
#include "debug.h"
@@ -25,12 +27,14 @@
BYTE pageLockCount; /* Count of GlobalPageLock() calls */
BYTE flags; /* Allocation flags */
BYTE selCount; /* Number of selectors allocated for this block */
+ int shmid;
} GLOBALARENA;
/* Flags definitions */
#define GA_MOVEABLE 0x02 /* same as GMEM_MOVEABLE */
#define GA_DGROUP 0x04
#define GA_DISCARDABLE 0x08
+#define GA_IPCSHARE 0x10 /* same as GMEM_DDESHARE */
/* Arena array */
static GLOBALARENA *pGlobalArena = NULL;
@@ -62,6 +66,36 @@
}
+void debug_handles()
+{
+ int printed=0;
+ int i;
+ for (i = globalArenaSize-1 ; i>=0 ; i--) {
+ if (pGlobalArena[i].size!=0 && (pGlobalArena[i].handle & 0x8000)){
+ printed=1;
+ printf("0x%08x, ",pGlobalArena[i].handle);
+ }
+ }
+ if (printed)
+ printf("\n");
+}
+/***********************************************************************
+ * GLOBAL_FindArena
+ *
+ * Find the arena for a given handle
+ * (when handle is not serial - e.g. DDE)
+ */
+static GLOBALARENA *GLOBAL_FindArena( HGLOBAL handle)
+{
+ int i;
+ for (i = globalArenaSize-1 ; i>=0 ; i--) {
+ if (pGlobalArena[i].size!=0 && pGlobalArena[i].handle == handle)
+ return ( &pGlobalArena[i] );
+ }
+ return NULL;
+}
+
+
/***********************************************************************
* GLOBAL_CreateBlock
*
@@ -69,15 +103,18 @@
*/
HGLOBAL GLOBAL_CreateBlock( WORD flags, void *ptr, DWORD size,
HGLOBAL hOwner, BOOL isCode,
- BOOL is32Bit, BOOL isReadOnly )
+ BOOL is32Bit, BOOL isReadOnly,
+ SHMDATA *shmdata )
{
WORD sel, selcount;
GLOBALARENA *pArena;
/* Allocate the selector(s) */
- sel = SELECTOR_AllocBlock( ptr, size, isCode ? SEGMENT_CODE : SEGMENT_DATA,
- is32Bit, isReadOnly );
+ sel = SELECTOR_AllocBlock( ptr, size,
+ isCode ? SEGMENT_CODE : SEGMENT_DATA,
+ is32Bit, isReadOnly );
+
if (!sel) return 0;
selcount = (size + 0xffff) / 0x10000;
@@ -91,12 +128,23 @@
pArena->base = (DWORD)ptr;
pArena->size = GET_SEL_LIMIT(sel) + 1;
- pArena->handle = (flags & GMEM_MOVEABLE) ? sel - 1 : sel;
+ if (flags & GMEM_DDESHARE)
+ {
+ pArena->handle = shmdata->handle;
+ pArena->shmid = shmdata->shmid;
+ shmdata->sel = sel;
+ }
+ else
+ {
+ pArena->handle = (flags & GMEM_MOVEABLE) ? sel - 1 : sel;
+ pArena->shmid = 0;
+ }
pArena->hOwner = hOwner;
pArena->lockCount = 0;
pArena->pageLockCount = 0;
pArena->flags = flags & GA_MOVEABLE;
if (flags & GMEM_DISCARDABLE) pArena->flags |= GA_DISCARDABLE;
+ if (flags & GMEM_DDESHARE) pArena->flags |= GA_IPCSHARE;
if (!isCode) pArena->flags |= GA_DGROUP;
pArena->selCount = selcount;
if (selcount > 1) /* clear the next arena blocks */
@@ -119,7 +167,7 @@
if (!handle) return TRUE;
sel = GlobalHandleToSel( handle );
if (FreeSelector( sel )) return FALSE; /* failed */
- memset( GET_ARENA_PTR(handle), 0, sizeof(GLOBALARENA) );
+ memset( GET_ARENA_PTR(sel), 0, sizeof(GLOBALARENA) );
return TRUE;
}
@@ -134,6 +182,7 @@
{
void *ptr;
HGLOBAL handle;
+ SHMDATA shmdata;
dprintf_global( stddeb, "GlobalAlloc: %ld flags=%04x\n", size, flags );
@@ -145,13 +194,16 @@
/* Allocate the linear memory */
- ptr = malloc( size );
+ if (flags & GMEM_DDESHARE)
+ ptr= DDE_malloc(flags, size, &shmdata);
+ else
+ ptr = malloc( size );
if (!ptr) return 0;
/* Allocate the selector(s) */
handle = GLOBAL_CreateBlock( flags, ptr, size, hOwner,
- isCode, is32Bit, isReadOnly);
+ isCode, is32Bit, isReadOnly, &shmdata);
if (!handle)
{
free( ptr );
@@ -162,6 +214,29 @@
return handle;
}
+/***********************************************************************
+ * DDE_GlobalHandleToSel
+ */
+
+WORD DDE_GlobalHandleToSel( HGLOBAL handle )
+{
+ GLOBALARENA *pArena;
+ SEGPTR segptr;
+
+ pArena= GLOBAL_FindArena(handle);
+ if (pArena) {
+ int ArenaIdx = pArena - pGlobalArena;
+
+ /* See if synchronized to the shared memory */
+ return DDE_SyncHandle(handle, ( ArenaIdx << __AHSHIFT) | 7);
+ }
+
+ /* attach the block */
+ DDE_AttachHandle(handle, &segptr);
+
+ return SELECTOROF( segptr );
+}
+
/***********************************************************************
* GlobalAlloc (KERNEL.15)
@@ -172,7 +247,6 @@
if (flags & GMEM_DDESHARE)
owner = GetExePtr(owner); /* Make it a module handle */
-
return GLOBAL_Alloc( flags, size, owner, FALSE, FALSE, FALSE );
}
@@ -182,14 +256,22 @@
*/
HGLOBAL GlobalReAlloc( HGLOBAL handle, DWORD size, WORD flags )
{
- WORD sel, selcount;
+ WORD selcount;
DWORD oldsize;
void *ptr;
GLOBALARENA *pArena, *pNewArena;
+ WORD sel = GlobalHandleToSel( handle );
dprintf_global( stddeb, "GlobalReAlloc: %04x %ld flags=%04x\n",
handle, size, flags );
if (!handle) return 0;
+
+ if (flags & GMEM_DDESHARE || is_dde_handle(handle)) {
+ fprintf(stdnimp,
+ "GlobalReAlloc: shared memory reallocating unimplemented\n");
+ return 0;
+ }
+
pArena = GET_ARENA_PTR( handle );
/* Discard the block if requested */
@@ -201,6 +283,10 @@
(pArena->lockCount > 0) || (pArena->pageLockCount > 0)) return 0;
free( (void *)pArena->base );
pArena->base = 0;
+ /* Note: we rely on the fact that SELECTOR_ReallocBlock won't */
+ /* change the selector if we are shrinking the block */
+ SELECTOR_ReallocBlock( sel, 0, 1, SEGMENT_DATA, 0, 0 );
+ return handle;
}
/* Fixup the size */
@@ -221,7 +307,6 @@
/* Reallocate the linear memory */
- sel = GlobalHandleToSel( handle );
ptr = (void *)pArena->base;
oldsize = pArena->size;
dprintf_global(stddeb,"oldsize %08lx\n",oldsize);
@@ -275,12 +360,12 @@
*/
HGLOBAL GlobalFree( HGLOBAL handle )
{
- void *ptr;
+ void *ptr = GlobalLock( handle );
dprintf_global( stddeb, "GlobalFree: %04x\n", handle );
- if (!(ptr = GlobalLock( handle ))) return handle; /* failed */
if (!GLOBAL_FreeBlock( handle )) return handle; /* failed */
- free( ptr );
+ if (is_dde_handle(handle)) return DDE_GlobalFree(handle);
+ if (ptr) free( ptr );
return 0;
}
@@ -295,7 +380,9 @@
dprintf_global( stddeb, "WIN16_GlobalLock(%04x) -> %08lx\n",
handle, MAKELONG( 0, GlobalHandleToSel(handle)) );
if (!handle) return 0;
- if (!GET_ARENA_PTR(handle)->base) return (SEGPTR)0;
+ if ( !is_dde_handle(handle) && !GET_ARENA_PTR(handle)->base)
+ return (SEGPTR)0;
+
return (SEGPTR)MAKELONG( 0, GlobalHandleToSel(handle) );
}
@@ -308,6 +395,9 @@
LPSTR GlobalLock( HGLOBAL handle )
{
if (!handle) return 0;
+ if (is_dde_handle(handle)) {
+ return DDE_AttachHandle(handle, NULL);
+ }
return (LPSTR)GET_ARENA_PTR(handle)->base;
}
@@ -552,6 +642,9 @@
{
dprintf_toolhelp( stddeb, "GlobalHandleToSel: %04x\n", handle );
if (!handle) return 0;
+ if (is_dde_handle(handle))
+ return DDE_GlobalHandleToSel(handle);
+
if (!(handle & 7))
{
fprintf( stderr, "Program attempted invalid selector conversion\n" );
diff --git a/memory/ldt.c b/memory/ldt.c
index f80b2cc..2b07893 100644
--- a/memory/ldt.c
+++ b/memory/ldt.c
@@ -157,7 +157,8 @@
ldt_flags_copy[entry] = (content->type & LDT_FLAGS_TYPE) |
(content->read_only ? LDT_FLAGS_READONLY : 0) |
(content->seg_32bit ? LDT_FLAGS_32BIT : 0) |
- (content->limit_in_pages ? LDT_FLAGS_BIG : 0);
+ (content->limit_in_pages ? LDT_FLAGS_BIG : 0) |
+ (ldt_flags_copy[entry] & LDT_FLAGS_ALLOCATED);
return ret;
}
diff --git a/memory/selector.c b/memory/selector.c
index 57afc7f..1959c71 100644
--- a/memory/selector.c
+++ b/memory/selector.c
@@ -8,6 +8,7 @@
#include "windows.h"
#include "ldt.h"
#include "selectors.h"
+#include "stackframe.h"
#include "stddebug.h"
#include "debug.h"
@@ -29,7 +30,9 @@
else if (++size >= count) break;
}
if (i == LDT_SIZE) return 0;
- return ENTRY_TO_SELECTOR( i - size + 1 );
+ /* Mark selector as allocated */
+ while (size--) ldt_flags_copy[i--] |= LDT_FLAGS_ALLOCATED;
+ return ENTRY_TO_SELECTOR( i + 1 );
}
@@ -68,8 +71,22 @@
if (IS_SELECTOR_FREE(sel)) return sel; /* error */
count = (GET_SEL_LIMIT(sel) >> 16) + 1;
memset( &entry, 0, sizeof(entry) ); /* clear the LDT entries */
- for (i = 0; i < count; i++)
- LDT_SetEntry( SELECTOR_TO_ENTRY(sel) + i, &entry );
+ /* FIXME: is it correct to free the whole array? */
+ for (i = SELECTOR_TO_ENTRY(sel); count; i++, count--)
+ {
+ LDT_SetEntry( i, &entry );
+ ldt_flags_copy[i] &= ~LDT_FLAGS_ALLOCATED;
+ }
+
+ /* Clear the saved 16-bit selector */
+#ifndef WINELIB
+ if (CURRENT_STACK16)
+ {
+ /* FIXME: maybe we ought to walk up the stack and fix all frames */
+ if (CURRENT_STACK16->ds == sel) CURRENT_STACK16->ds = 0;
+ if (CURRENT_STACK16->es == sel) CURRENT_STACK16->es = 0;
+ }
+#endif
return 0;
}
@@ -108,38 +125,6 @@
/***********************************************************************
- * SELECTOR_ReallocArray
- *
- * Change the size of an allocated selector array.
- */
-static WORD SELECTOR_ReallocArray( WORD sel, WORD newcount )
-{
- WORD i, oldcount;
- ldt_entry entry;
-
- oldcount = (GET_SEL_LIMIT(sel) >> 16) + 1;
- if (oldcount < newcount) /* We need to add selectors */
- {
- /* Check if the next selectors are free */
- for (i = oldcount; i < newcount; i++)
- if (!IS_SELECTOR_FREE(sel+i)) break;
- if (i < newcount)
- {
- FreeSelector( sel );
- sel = AllocSelectorArray( newcount );
- }
- }
- else if (oldcount > newcount) /* We need to remove selectors */
- {
- memset( &entry, 0, sizeof(entry) ); /* clear the LDT entries */
- for (i = oldcount; i < newcount; i++)
- LDT_SetEntry( SELECTOR_TO_ENTRY(sel) + i, &entry );
- }
- return sel;
-}
-
-
-/***********************************************************************
* SELECTOR_AllocBlock
*
* Allocate selectors for a block of linear memory.
@@ -165,15 +150,41 @@
WORD SELECTOR_ReallocBlock( WORD sel, void *base, DWORD size,
enum seg_type type, BOOL is32bit, BOOL readonly )
{
- WORD count;
+ WORD i, oldcount, newcount;
+ ldt_entry entry;
- if (!size)
+ if (!size) size = 1;
+ oldcount = (GET_SEL_LIMIT(sel) >> 16) + 1;
+ newcount = (size + 0xffff) >> 16;
+
+ if (oldcount < newcount) /* We need to add selectors */
{
- FreeSelector( sel );
- return 0;
+ /* Check if the next selectors are free */
+ if (SELECTOR_TO_ENTRY(sel) + newcount > LDT_SIZE) i = oldcount;
+ else
+ for (i = oldcount; i < newcount; i++)
+ if (!IS_LDT_ENTRY_FREE(SELECTOR_TO_ENTRY(sel)+i)) break;
+
+ if (i < newcount) /* they are not free */
+ {
+ FreeSelector( sel );
+ sel = AllocSelectorArray( newcount );
+ }
+ else /* mark the selectors as allocated */
+ {
+ for (i = oldcount; i < newcount; i++)
+ ldt_flags_copy[SELECTOR_TO_ENTRY(sel)+i] |=LDT_FLAGS_ALLOCATED;
+ }
}
- count = (size + 0xffff) / 0x10000;
- sel = SELECTOR_ReallocArray( sel, count );
+ else if (oldcount > newcount) /* We need to remove selectors */
+ {
+ memset( &entry, 0, sizeof(entry) ); /* clear the LDT entries */
+ for (i = oldcount; i < newcount; i++)
+ {
+ LDT_SetEntry( SELECTOR_TO_ENTRY(sel) + i, &entry );
+ ldt_flags_copy[SELECTOR_TO_ENTRY(sel) + i] &= ~LDT_FLAGS_ALLOCATED;
+ }
+ }
if (sel) SELECTOR_SetEntries( sel, base, size, type, is32bit, readonly );
return sel;
}
