mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 12:19:49 +00:00
a845b88ead
Sun May 31 13:40:13 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [if1632/signal.c] Added display of exception name. * [loader/task.c] Yet another attempt at fixing SwitchStackTo/SwitchStackBack. * [memory/selector.c] [relay32/builtin32.c] [tools/build.c] [win32/kernel32.c] Generate an assembly stub for Win32 register functions to make their names available at link time. * [programs/*/Makefile.in] Added hacks to support old resource compiler. Fri May 29 16:27:14 1998 Marcus Meissner <marcus@jet.franken.de> * [tools/testrun] Merge of my testscripts at home into one single perl program (tested with perl5). Works only on Linux due to 'ps' and 'ipcs' magic. * [controls/menu.c] Added some DefaultMenuItem stubs. * [debugger/stabs.c] Fixed stabs loading, now supports (int,int) typeinfo format used by gcc-2.8 and egcs-1. If it still crashes, please mail me. * [if1632/][relay32/] Added msvideo.dll (stubs only) Replaced some ptr by str for stringcases Added some new stubs (VxDCall, FindCloseNotif....) * [misc/network.c] Some argument fixes. * [misc/registry.c][misc/cpu.c] Registry initialization partially rewritten and enhanced. * [scheduler/*.c] Some additions so we don't do kill(0,SIGUSR1) (kill processgroup instead of targeted thread) Added SetThreadContext. Thu May 28 23:59:59 1998 Bertho Stultiens <bertho@akhphd.au.dk> * [tools/wrc/*] New resource compiler version 1.0.0 (28-May-1998) * [Make.rules.in] [Makefile.in] Changed and added rc rules to point to tools/wrc/wrc. * [configure.in] [include/config.h.in] Added check for function 'stricmp'. * [include/resource.h] Commented out the old resource structure to catch references. It also includes wrc_rsc.h. * [include/wrc_rsc.h] New file. Definitions for the resources generated with wrc. * [include/windows.h] Added #ifdef RC_INVOKED to exclude stdarg.h. Added SS_NOTIFY flag. * [include/winnls.h] Added SUBLANG_* definitions and corrected some defaults. * [loader/libres.c] Changed the sysres load functions to support wrc generated resources. * [resource/sysres_*.rc] Added #include <windows.h> * [resource/sysres.c] Changed declarations to match wrc's output * [resource/Makefile.in] Changed rules to work with wrc. * [tools/makedep.c] Changed generation of .rc file dependencies to .s target. Thu May 28 22:28:39 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de> * [files/file.c][include/windows.c][relay32/kernel32.spec] Implemented GetFileAttributesEx32A/W. * [misc/imagelist.h][include/commctrl.h][relay32/comctl32.spec] Added ImageList_Read and ImageList_Write stubs. Added ImageList_AddIcon function. Added ImageList_LoadImage. It is the same as ImageList_LoadImage32A. * [controls/header.c] Fixed bitmap drawing bug. Added full bitmap support. * [include/commctrl.h] Added missing header macros. * [controls/toolbar.c][include/toolbar.h][include/commctrl.h] [controls/commctrl.c] [relay32/comctl32.spec] First implementation of toolbar control. Implemented CreateToolbar, CreateToolbarEx and CreateMappedBitmap. * [controls/progress.c][controls/status.c] Some code cleanup. * [controls/commctrl.c][include/commctrl.h][relay32/comctl32.spec] Removed CreateStatusWindow16 and DrawStatusText16. CreateStatusWindow is the same as CreateStatusWindow32A. DrawStatusText is the same as DrawStatusText32A. Thu May 28 16:01:28 1998 Matthew J. Francis <asbel@dial.pipex.com> * [objects/bitmap.c] [objects/bitmap.h] [objects/oembitmap.c] [objects/dc.c] [graphics/x11drv/bitblt.c] Added partial implementation of CreateDIBSection, with great thanks to Ulrich Weigand <weigand@informatik.uni-erlangen.de> for contributing the bulk of the patch. Wed May 27 19:04:31 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de> * [win32/kernel32.c] [if1632/thunk.c] [include/flatthunk.h] ThunkConnect16 and related functions moved to emulator. * [loader/ne/segment.c] Call DllEntryPoint with correct arguments. * [relay32/builtin32.c] Bugfix: Relay debugging did not work for multiple processes. * [controls/menu.c] Bugfix: dwItemData was not set for MF_OWNERDRAW menus. * [if1632/relay.c] [relay32/relay386.c] Relay messages converted to use DPRINTF. * [controls/desktop.c] [relay32/user32.spec] Implemented PaintDesktop. * [files/profile.c] [if1632/kernel.spec] [misc/network.c] [misc/printdrv.c] [relay32/winspool.spec] [win32/ordinals.c] [relay32/kernel32.spec] Some stubs added. * [relay32/mpr.spec] All ordinals were off by one. Tue May 26 13:32:57 1998 Bill Hawes <whawes@star.net> * [misc/lstr.c] [include/casemap.h] [tools/unimap.pl] Added Unicode case conversion routines towupper/towlower, with mapping tables casemap.h created by tools/unimap.pl. * [misc/ntdll.c] [include/winnls.h] [relay32/ntdll.spec] [relay32/advapi.spec] Minimal implementation of IsTextUnicode, just enough to get NT4 notepad to open ascii/unicode files. * [Make.rules.in] [resources/sysres_En.rc] Added include file dlgs.h for building resource files, so that resources can refer to defined values (e.g. pshHelp). * [misc/crtdll.c] [relay32/crtdll.spec] Use towupper/towlower for 32W case conversions. * [memory/string.c] Use towupper for 32W case conversions. * [ole/ole2nls.c] Use towupper for 32W case conversions; fix mem leak; minor cleanup * [controls/edit.c] Added soft break flag to edit state. Print unknown action values for WM_VSCROLL (action 190 occurs when running NT4 notepad.) Mon May 25 22:42:40 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> * [files/file.c] Care for a pathological case in SetFilePointer. * [graphics/x11drv/xfont.c] Handle longer Font names in LFD_ComposeLFD and try to catch errors. * [loader/pe_image.c] Unload Dummymodule when PE_LoadLibraryEx32A fails with PE_LoadImage (makes Encarta 98 installer proceed). * [misc/registry.c] Move a check for a special case in RegCreateKeyEx32W after the check for existence. Tue May 25 20:18:26 1998 Matthew Becker <mbecker@glasscity.net> * [misc/ntdll.c] Added some stubs, just guessing at the size of their param lists. * [misc/registry.c] Added stubs for RegUnLoadKey, RegSetKeySecurity, RegSaveKey, RegRestoreKey, and RegReplaceKey * [programs/regtest/regtest.c] Updated registry testing program. Sun May 24 18:11:40 1998 Alex Priem <alexp@sci.kun.nl> * [file/profile.c] Added flag 'return_values' to PROFILE_GetSection. Sun May 24 13:41:10 1998 James Juran <jrj120@psu.edu> * [misc/shell.c] [files/directory.c] Documentation/debugging info additions. * [*/*.c] [include/*.h] Moved many extern function definitions to appropriate header files. Cleaned up a few compile warnings. If #include "debug.h" is present, removed #include <stdio.h>. debug.h includes stdio.h, so it is not necessary to include both. * [graphics/*.c] [if1632/signal.c] [ipc/*.c] [scheduler/*.c] [win32/*.c] [windows/*.c] Final patch to convert fprintf statements to new debugging interface. Some fprintfs are still left, especially in the debugger/ directory. However, IMHO, it's not worth the effort to change the rest. Fri May 22 21:58:35 1998 Morten Welinder <terra@diku.dk> * [windows/keyboard.c] Correct handling of keys "`-=[]\;',./". Fri May 22 12:06:00 1998 Per Lindström <pelinstr@algonet.se> * [include/windows.h] [relay32/kernel32.spec] [win32/console.c] Added stub for ReadConsoleOutputCharacter32A. Thu May 21 16:45:48 1998 Pascal Cuoq <pcuoq@ens-lyon.fr> * [ole/ole2nls.c] Began better implementation of LCMapString32A. Not very well tested yet, and still need improvements. * [controls/scroll.c] Documented functions. Wed May 20 21:37:56 1998 Peter Hunnisett <hunnise@nortel.ca> * [include/windows.h][misc/main.c] Change SystemParameterInfo to support SPI_GETHIGHCONTRAST. Also include some missing SPI_ definitions. * [include/dsound.h][multimedia/dsound.c][relay32/dplayx.spec] Added stubs for DirectPlayLobbyCreate[AW]. Not sure if these should go into a new files dplayx.c? Anyone care? * [include/winnls.h] Added two missing flags for the CompareString32 functions.
193 lines
5.3 KiB
C
193 lines
5.3 KiB
C
/***************************************************************************
|
|
* Copyright 1995, Technion, Israel Institute of Technology
|
|
* Electrical Eng, Software Lab.
|
|
* Author: Michael Veksler.
|
|
***************************************************************************
|
|
* File: shm_block.c
|
|
* Purpose: Treat a shared memory block.
|
|
***************************************************************************
|
|
*/
|
|
#ifdef CONFIG_IPC
|
|
|
|
#define inline __inline__
|
|
#include <sys/types.h>
|
|
#include <sys/sem.h>
|
|
#include <assert.h>
|
|
#include <unistd.h>
|
|
#include <stdlib.h>
|
|
#include "debug.h"
|
|
#include "global.h"
|
|
#include "selectors.h"
|
|
#include "shm_fragment.h"
|
|
#include "shm_block.h"
|
|
#include "shm_semaph.h"
|
|
#include "dde_proc.h"
|
|
#include "xmalloc.h"
|
|
|
|
/* How each shmid is maped to local pointer */
|
|
/* Only attached shm blocks are in this construct */
|
|
struct local_shm_map *shm_map=NULL;
|
|
|
|
/* setup a new shm block (construct a shm block object).
|
|
* block: The pointer to the memory block (local mapping)
|
|
* first: The first data byte (excluding header stuff),
|
|
* if 0 (zero) Use the default.
|
|
* size: The size of the memory block.
|
|
*/
|
|
void shm_setup_block(struct shm_block *block, int first, int size)
|
|
{
|
|
TRACE(shm,"Setting up shm block at 0x%08x\n",(int )block);
|
|
/* setup block internal data structure */
|
|
if (first <= 0) {
|
|
first=sizeof(*block);
|
|
/* round up - so everything starts on cache line boundary
|
|
* (assume cache line=32 bytes, may be bigger/smaller for
|
|
* different processors and different L2 caches .)
|
|
*/
|
|
first=(first+0x1f) & ~0x1f;
|
|
}
|
|
block->free=size-first;
|
|
block->next_shm_id=-1; /* IPC shm ID (for initial linking) */
|
|
block->proc_idx= curr_proc_idx;
|
|
/* block->size is initialized in shm_FragmentInit */
|
|
shm_FragmentInit(block, first, size); /* first item in the free list */
|
|
|
|
TRACE(shm, "block was set up at 0x%08x, size=0x%04xKB, 1st usable=%02x\n",
|
|
(int )block,size/1024,first);
|
|
}
|
|
|
|
/* shm_attach_block: attach existing shm block, setup selectors
|
|
* shm_id - id of the block to attach.
|
|
* proc_idx - if not -1, puts this data into local mapping
|
|
* map - localy mapped info about this block.
|
|
*/
|
|
/* NOTE: there is no check if this block is already attached.
|
|
* Attaching the same block more than once - is possible
|
|
* In case of doubt use shm_locate_block.
|
|
*/
|
|
struct shm_block *shm_attach_block(int shm_id, int proc_idx,
|
|
struct local_shm_map *map)
|
|
{
|
|
struct shm_block *block;
|
|
struct shmid_ds ds;
|
|
struct local_shm_map *this;
|
|
|
|
shmctl(shm_id, IPC_STAT, &ds );
|
|
|
|
block=(struct shm_block*)shmat(shm_id, NULL, 0);
|
|
if (block==NULL || block == (struct shm_block*) -1) return NULL;
|
|
|
|
this=(struct local_shm_map *)xmalloc(sizeof(*this));
|
|
this->next= shm_map;
|
|
shm_map = this;
|
|
this->shm_id= shm_id;
|
|
this->ptr = block;
|
|
|
|
if (proc_idx < 0)
|
|
this->proc_idx=block->proc_idx;
|
|
else
|
|
this->proc_idx=proc_idx;
|
|
|
|
if (map != NULL) {
|
|
memcpy(map, this, sizeof(map));
|
|
map->next= NULL; /* don't pass private info */
|
|
}
|
|
|
|
return block;
|
|
}
|
|
|
|
struct shm_block *shm_create_block(int first, int size, int *shm_id)
|
|
{
|
|
struct shm_block *block;
|
|
|
|
if (size==0)
|
|
size=SHM_MINBLOCK;
|
|
else
|
|
/* round up size to a multiple of SHM_MINBLOCK */
|
|
size= (size+SHM_MINBLOCK-1) & ~(SHM_MINBLOCK-1);
|
|
*shm_id= shmget ( IPC_PRIVATE, size ,0700);
|
|
if (*shm_id==-1)
|
|
return NULL;
|
|
block=shm_attach_block(*shm_id, curr_proc_idx, NULL);
|
|
if (block!=NULL)
|
|
shm_setup_block(block, first, size);
|
|
|
|
return block;
|
|
}
|
|
|
|
/*
|
|
** Locate attached block. (return it, or NULL on failure)
|
|
** shm_id is the block we look for.
|
|
** *map - will get all the info related to this local map + proc_idx
|
|
** (may be NULL)
|
|
** *seg - will get the segment this block is attached to.
|
|
*/
|
|
struct shm_block *shm_locate_attached_block(int shm_id,
|
|
struct local_shm_map *map)
|
|
{
|
|
struct local_shm_map *curr;
|
|
|
|
for (curr= shm_map ; curr != NULL ; curr= curr->next) {
|
|
if (curr->shm_id == shm_id) {
|
|
if (map) {
|
|
memcpy(map, curr, sizeof(*curr) );
|
|
map->next = NULL; /* this is private info ! */
|
|
}
|
|
return curr->ptr;
|
|
}
|
|
}
|
|
|
|
/* block not found ! */
|
|
return 0;
|
|
}
|
|
|
|
/* shm_locate_block: see shm_attach_block.
|
|
In addition to shm_attach_block, make sure this
|
|
block is not already attached.
|
|
*/
|
|
struct shm_block *shm_locate_block(int shm_id, struct local_shm_map *map)
|
|
{
|
|
|
|
struct shm_block *ret;
|
|
ret= shm_locate_attached_block(shm_id, map);
|
|
if (ret!=NULL)
|
|
return ret;
|
|
/* block not found ! , try to attach */
|
|
return shm_attach_block(shm_id, -1, map);
|
|
}
|
|
|
|
static void forget_attached(int shmid)
|
|
{
|
|
struct local_shm_map *curr, **point_to_curr;
|
|
|
|
for (curr= shm_map, point_to_curr= &shm_map ;
|
|
curr != NULL ;
|
|
curr= curr->next, point_to_curr= &curr->next ) {
|
|
if (curr->shm_id == shmid) {
|
|
*point_to_curr= curr->next;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* delete chain of shm blocks (pointing to each other)
|
|
* Do it in reverse order. (This is what the recursion is for)
|
|
*/
|
|
void shm_delete_chain(int *shmid)
|
|
{
|
|
struct shm_block *block;
|
|
|
|
if (*shmid == -1)
|
|
return;
|
|
|
|
block= shm_locate_block(*shmid, NULL);
|
|
forget_attached( *shmid );
|
|
if (block == NULL)
|
|
return;
|
|
shm_delete_chain(&block->next_shm_id);
|
|
shmctl(*shmid, IPC_RMID, NULL);
|
|
*shmid=-1;
|
|
shmdt((char *)block);
|
|
}
|
|
|
|
#endif /* CONFIG_IPC */
|