3ed37e0869
Sun Nov 6 18:52:04 1994 Alexandre Julliard (julliard@lamisun.epfl.ch) * [objects/oembitmap.c] (New file) Added possibility to use .xpm files for OEM bitmaps. * [include/bitmaps/obm*] (New files) Redrawn all OEM bitmaps in xpm format. * [objects/font.c] Add space for internal leading when using a negative font height. Stubs for AddFontResource() and RemoveFontResource(). Fix in FONT_Init() for uninitialised default font. * [windows/dialog.c] Make font height negative as it is really a point size and not a pixel size; dialogs using 8-point fonts look better now. * [windows/graphics.c] Fixed the fix :-) for Pie() to make it work for Arc() and Chord() also. * [windows/nonclient.c] A few changes for new OEM bitmaps. Sun Nov 6 18:22:18 1994 Michael Patra <micky@marie.physik.tu-berlin.de> * [windows/class.c] The names of local classes have to be stored using GlobalAtom*. Otherwise they couldn't be accessed from other modules (e.g. BWCC) * [if1632/call.S] CallTo16(cx): It's possible to set the contents of the cx-register. * [loader/ne_image.c] InitNEDLL(): The size of the local heap is now passed in the cx- register when initializing a DLL. * [memory/heap.c] LocalInit(): The case start==0 is now handled in the way it should. * [windows/win.c] GetWindowLong(): If the adress of the windows function is requested it's no longer returned if it's within the Wine code (and therefore unreachable by a windows program). This makes Borland's OWL happy. * [controls/edit.c] EDIT_GetStr(): Added handling for off<0. Sun Nov 6 17:37:14 1994 Chris Jones <chrisj@ichips.intel.com> * [loader/library.c] Fixed infinite loop bug when two DLLs refer to each other (fixes hangup of Quicken during loading). Thu Nov 04 12:00:00 1994 Jan Willamowius (jan@janhh.sh.sub.de) * [misc/dos_fs.c] Bug fix: The size of a disk an the available space is now returned in bytes instead of (incorrectly) KBytes. Thu Nov 03 12:00:00 1994 Jan Willamowius (jan@janhh.sh.sub.de) * [windows/graphics.c] Bug fix: Pie segments are now filled with correct brush. Thu Nov 3 10:40:09 1994 Martin von Loewis (martin@cs.csufresno.edu) * [Imakefile] generate rc.o before loader.o * [controls/menu.c] CopySysMenu: generate SYSMENU on the fly, eliminate hSysMenu * [include/resource.h] Add struct ResourceTable * [loader/bitmap.h] Load system bitmaps from sysresbmTable * [misc/clipboard.c] [windows/event.c] IsClipboardFormatAvailable,EVENT_SelectionRequest: bug fixes * [rc/Imakefile] generate rc.o from sysres.o and sysresbm.o. Added -lfl * [rc/rc.y] change style handling to allow ( S1 | S2 ) | S3 * [rc/sysres.rc] [rc/sysresbm.rc] Put bitmaps and icons to sysresbm, everything else to sysres * [rc/winerc.c] [rc/winerc.h] Added -o, -c flags. New function set_out_file. Output to files. * [windows/dialog.c] DialogBoxIndirectPtr, DialogBoxIndirectParamPtr: New functions * [windows/nonclient.c] Create AboutWine dialog from template pointer
85 lines
2.1 KiB
C
85 lines
2.1 KiB
C
/* $Id: segmem.h,v 1.3 1993/07/04 04:04:21 root Exp root $
|
|
*/
|
|
/*
|
|
* Copyright Robert J. Amstadt, 1993
|
|
*/
|
|
#ifndef SEGMEM_H
|
|
#define SEGMEM_H
|
|
|
|
#include "wine.h"
|
|
|
|
#ifdef __linux__
|
|
#define HAVE_IPC
|
|
#include <sys/ipc.h>
|
|
#include <sys/shm.h>
|
|
#endif
|
|
|
|
#if defined(__NetBSD__) || defined(__FreeBSD__)
|
|
#define HAVE_IPC
|
|
#include <sys/types.h>
|
|
#include <sys/ipc.h>
|
|
#include <sys/shm.h>
|
|
#define SHMSEG 32 /* XXX SEMMNI /usr/src/sys/conf/param.h */
|
|
#define SHM_RANGE_START 0x40000000
|
|
#endif
|
|
|
|
/*
|
|
* Array to track selector allocation.
|
|
*/
|
|
#define MAX_SELECTORS 512
|
|
#define SELECTOR_ISFREE 0x8000
|
|
#define SELECTOR_INDEXMASK 0x0fff
|
|
|
|
extern unsigned short SelectorMap[MAX_SELECTORS];
|
|
|
|
#ifdef HAVE_IPC
|
|
#define SAFEMAKEPTR(s, o) ((void *)(((int) (s) << 16) | ((o) & 0xffff)))
|
|
#define FIXPTR(p) (p)
|
|
#else
|
|
#define SAFEMAKEPTR(s, o) \
|
|
((void *)(((int)SelectorMap[SelectorMap[(s) >> 3] & SELECTOR_INDEXMASK] \
|
|
<< 19) | 0x70000 | ((o) & 0xffff)))
|
|
#define FIXPTR(p) SAFEMAKEPTR((unsigned long) (p) >> 16, (p))
|
|
#endif
|
|
|
|
/*
|
|
* Structure to hold info about each selector we create.
|
|
*/
|
|
|
|
typedef struct segment_descriptor_s
|
|
{
|
|
void *base_addr; /* Pointer to segment in flat memory */
|
|
unsigned int length; /* Length of segment */
|
|
unsigned int flags; /* Segment flags (see neexe.h and below)*/
|
|
unsigned short selector; /* Selector used to access this segment */
|
|
unsigned short owner; /* Handle of owner program */
|
|
unsigned char type; /* DATA or CODE */
|
|
#ifdef HAVE_IPC
|
|
key_t shm_key; /* Shared memory key or -1 */
|
|
#endif
|
|
} SEGDESC;
|
|
|
|
extern int IPCCopySelector(int i_old, unsigned long new, int swap_type);
|
|
|
|
/*
|
|
* Additional flags
|
|
*/
|
|
#define NE_SEGFLAGS_MALLOCED 0x00010000 /* Memory allocated with malloc() */
|
|
|
|
/*
|
|
* Global memory flags
|
|
*/
|
|
#define GLOBAL_FLAGS_MOVEABLE 0x0002
|
|
#define GLOBAL_FLAGS_ZEROINIT 0x0040
|
|
#define GLOBAL_FLAGS_CODE 0x00010000
|
|
#define GLOBAL_FLAGS_EXECUTEONLY 0x00020000
|
|
#define GLOBAL_FLAGS_READONLY 0x00020000
|
|
|
|
#define FIRST_SELECTOR 8
|
|
|
|
#define IS_16_BIT_ADDRESS(addr) \
|
|
((unsigned int)(addr) >= (((FIRST_SELECTOR << 3) | 0x0007) << 16))
|
|
|
|
extern SEGDESC Segments[];
|
|
|
|
#endif /* SEGMEM_H */
|