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/objects/Makefile.in b/objects/Makefile.in
new file mode 100644
index 0000000..4196d0a
--- /dev/null
+++ b/objects/Makefile.in
@@ -0,0 +1,51 @@
+CC = @CC@
+CFLAGS = @CFLAGS@
+XINCL = @x_includes@
+TOPSRC = @top_srcdir@
+DIVINCL = -I$(TOPSRC)/include
+LD = @LD@
+LDCOMBINEFLAGS = @LDCOMBINEFLAGS@
+
+
+MODULE = objects
+
+SRCS = bitblt.c bitmap.c brush.c clipping.c color.c dc.c dcvalues.c \
+ dib.c font.c gdiobj.c linedda.c metafile.c oembitmap.c palette.c \
+ pen.c region.c text.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/objects/bitmap.c b/objects/bitmap.c
index e0f15c4..179d16d 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -12,7 +12,7 @@
#include "callback.h"
#include "dc.h"
#include "bitmap.h"
-#include "prototypes.h"
+#include "resource.h" /* for ConvertCore/InfoBitmap */
#include "stddebug.h"
/* #define DEBUG_GDI */
/* #define DEBUG_BITMAP */
diff --git a/objects/clipping.c b/objects/clipping.c
index 42dda4e..003a6ae 100644
--- a/objects/clipping.c
+++ b/objects/clipping.c
@@ -314,7 +314,9 @@
dprintf_clipping(stddeb,"RectVisible: %x %d,%dx%d,%d\n",
hdc, rect->left, rect->top, rect->right, rect->bottom );
if (!dc->w.hGCClipRgn) return FALSE;
- LPtoDP( hdc, (LPPOINT)rect, 2 );
+ /* copy rectangle to avoid overwriting by LPtoDP */
+ tmpRect = *rect;
+ LPtoDP( hdc, (LPPOINT)&tmpRect, 2 );
return RectInRegion( dc->w.hGCClipRgn, &tmpRect );
}
diff --git a/objects/dib.c b/objects/dib.c
index 78ab1ee..c2538b4 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -517,17 +517,8 @@
break;
}
if (colorMapping) free(colorMapping);
- {
- WORD saved_ds = CURRENT_DS;
- XPutImage( display, drawable, gc, bmpImage, xSrc, ySrc,
- xDest, yDest, width, height );
- if (saved_ds != CURRENT_DS) {
- fprintf(stderr,"Uh oh. XPutImage clobbered the 16 bit stack.\n"
- "Please report: %s compression, %d bitplanes!!\n",
- info->bmiHeader.biCompression ? "" : "no",
- info->bmiHeader.biBitCount);
- }
- }
+ XPutImage( display, drawable, gc, bmpImage, xSrc, ySrc,
+ xDest, yDest, width, height );
XDestroyImage( bmpImage );
return lines;
}
@@ -656,8 +647,9 @@
if (bits)
{
- bmpImage = XGetImage( display, bmp->pixmap, 0, 0, bmp->bitmap.bmWidth,
- bmp->bitmap.bmHeight, AllPlanes, ZPixmap );
+ bmpImage = (XImage *)CallTo32_LargeStack( (int (*)())XGetImage, 8,
+ display, bmp->pixmap, 0, 0, bmp->bitmap.bmWidth,
+ bmp->bitmap.bmHeight, AllPlanes, ZPixmap );
dibImage = DIB_DIBmpToImage( &info->bmiHeader, bits );
for (y = 0; y < lines; y++)
@@ -733,4 +725,3 @@
SetBkColor( hDC, oldBg );
return TRUE;
}
-
diff --git a/objects/font.c b/objects/font.c
index be92707..200b605 100644
--- a/objects/font.c
+++ b/objects/font.c
@@ -262,32 +262,31 @@
/***********************************************************************
* GetGlyphOutLine (GDI.309)
*/
-DWORD GetGlyphOutLine(
- HDC hdc, UINT uChar, UINT fuFormat, LPGLYPHMETRICS lpgm,
- DWORD cbBuffer, LPSTR lpBuffer, LPMAT2 lpmat2
-) {
- dprintf_font(stdnimp,"GetGlyphOutLine(0x%x, '%c', 0x%x, %p, %d, %p, %p) // - empty stub!\n",
- hdc,uChar,fuFormat,lpgm,cbBuffer,lpBuffer,lpmat2
- );
- return (DWORD)-1; /* failure */
+DWORD GetGlyphOutLine(HDC hdc, UINT uChar, UINT fuFormat, LPGLYPHMETRICS lpgm,
+ DWORD cbBuffer, LPSTR lpBuffer, LPMAT2 lpmat2)
+{
+ fprintf( stdnimp,"GetGlyphOutLine(%04x, '%c', %04x, %p, %ld, %p, %p) // - empty stub!\n",
+ hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, lpmat2 );
+ return (DWORD)-1; /* failure */
}
+
+
/***********************************************************************
* CreateScalableFontResource (GDI.310)
*/
-BOOL CreateScalableFontResource(
- UINT fHidden,LPSTR lpszResourceFile,
- LPSTR lpszFontFile,LPSTR lpszCurrentPath
-) {
- /* fHidden=1 - only visible for the calling app, read-only, not
- * enumbered with EnumFonts/EnumFontFamilies
- * lpszCurrentPath can be NULL
- */
- dprintf_font(stdnimp,"CreateScalableFontResource(%d,%s,%s,%x(%s)) // empty stub!\n",
- fHidden,lpszResourceFile,lpszFontFile,lpszCurrentPath
- );
- return FALSE; /* create failed */
+BOOL CreateScalableFontResource( UINT fHidden,LPSTR lpszResourceFile,
+ LPSTR lpszFontFile, LPSTR lpszCurrentPath )
+{
+ /* fHidden=1 - only visible for the calling app, read-only, not
+ * enumbered with EnumFonts/EnumFontFamilies
+ * lpszCurrentPath can be NULL
+ */
+ fprintf(stdnimp,"CreateScalableFontResource(%d,%s,%s,%s) // empty stub!\n",
+ fHidden, lpszResourceFile, lpszFontFile, lpszCurrentPath );
+ return FALSE; /* create failed */
}
+
/***********************************************************************
* CreateFontIndirect (GDI.57)
*/
@@ -737,7 +736,7 @@
LPTEXTMETRIC lptm;
LPSTR lpOldName;
char FaceName[LF_FACESIZE];
- int nRet;
+ int nRet = 0;
int i;
dprintf_font(stddeb,"EnumFonts(%04X, %p='%s', %08lx, %p)\n",
@@ -807,7 +806,7 @@
LPTEXTMETRIC lptm;
LPSTR lpOldName;
char FaceName[LF_FACESIZE];
- int nRet;
+ int nRet = 0;
int i;
dprintf_font(stddeb,"EnumFontFamilies(%04X, %p, %08lx, %p)\n",
diff --git a/objects/gdiobj.c b/objects/gdiobj.c
index 2cfcd75..af7cccc 100644
--- a/objects/gdiobj.c
+++ b/objects/gdiobj.c
@@ -416,7 +416,7 @@
WORD wMagic;
LPSTR lpLog; /* Point to a LOGBRUSH or LOGPEN struct */
HANDLE hLog;
- int i, nRet = 0;
+ int nRet = 0;
if (lpEnumFunc == NULL) {
fprintf(stderr,"EnumObjects // Bad EnumProc callback address !\n");
diff --git a/objects/metafile.c b/objects/metafile.c
index 9a8208a..846964e 100644
--- a/objects/metafile.c
+++ b/objects/metafile.c
@@ -212,7 +212,7 @@
METAHEADER *mh;
METARECORD *mr;
HANDLETABLE *ht;
- char *buffer;
+ char *buffer = (char *)NULL;
if (mf->wMagic != METAFILE_MAGIC)
return FALSE;
diff --git a/objects/region.c b/objects/region.c
index 41df11b..02a10d7 100644
--- a/objects/region.c
+++ b/objects/region.c
@@ -377,6 +377,27 @@
}
}
+/***********************************************************************
+ * REGION_CreateFrameRgn
+ *
+ * Create a region that is a frame around another region
+ */
+BOOL REGION_FrameRgn( HRGN hDest, HRGN hSrc, int x, int y )
+{
+ RGNOBJ *destObj,*srcObj;
+ Region result;
+
+ destObj = (RGNOBJ*) GDI_GetObjPtr( hDest, REGION_MAGIC );
+ srcObj = (RGNOBJ*) GDI_GetObjPtr( hSrc, REGION_MAGIC );
+ if (!srcObj->xrgn) return 0;
+ REGION_CopyRegion( srcObj, destObj );
+ XShrinkRegion( destObj->xrgn, -x, -y );
+ result = XCreateRegion();
+ XSubtractRegion( destObj->xrgn, srcObj->xrgn, result );
+ XDestroyRegion( destObj->xrgn );
+ destObj->xrgn = result;
+ return 1;
+}
/***********************************************************************
* CombineRgn (GDI.451)
diff --git a/objects/text.c b/objects/text.c
index 09a58e4..1ee64d0 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -188,7 +188,9 @@
SIZE size;
char *strPtr;
static char line[1024];
- int len, lh, prefix_x, prefix_end;
+ int len, lh;
+ int prefix_x = 0;
+ int prefix_end = 0;
TEXTMETRIC tm;
int x = rect->left, y = rect->top;
int width = rect->right - rect->left;
