mirror of
https://github.com/reactos/wine.git
synced 2024-11-25 12:49:45 +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.
284 lines
7.2 KiB
C
284 lines
7.2 KiB
C
/***************************************************************************
|
|
* Copyright 1995, Technion, Israel Institute of Technology
|
|
* Electrical Eng, Software Lab.
|
|
* Author: Michael Veksler.
|
|
***************************************************************************
|
|
* File: dde_mem.c
|
|
* Purpose : shared DDE memory functionality for DDE
|
|
***************************************************************************
|
|
*/
|
|
#ifdef CONFIG_IPC
|
|
|
|
#include <assert.h>
|
|
#include "debug.h"
|
|
#include "ldt.h"
|
|
#include "shm_main_blk.h"
|
|
#include "shm_fragment.h"
|
|
#include "shm_semaph.h"
|
|
#include "dde_mem.h"
|
|
#include "bit_array.h"
|
|
|
|
#define SEGPTR2HANDLE_INFO(sptr) ( (struct handle_info*)PTR_SEG_TO_LIN(sptr) )
|
|
|
|
#define HINFO2DATAPTR(h_info_ptr) ( (void*) ( (char*)h_info_ptr + \
|
|
sizeof(struct handle_info) ) )
|
|
#define DDE_MEM_IDX(handle) ((handle)& 0x7fff)
|
|
#define DDE_MEM_HANDLE(idx) ((idx) | 0x8000)
|
|
#define DDE_MEM_INFO(handle) (main_block->handles[ DDE_MEM_IDX(handle) ])
|
|
/* List of shared handles.
|
|
* This entry resides on the shared memory, the data comes right
|
|
* after the `handle_info'.
|
|
* The entry is on the same block as the actual data.
|
|
* The `next' field gives relative reference (relative to the start of
|
|
* the blcok.
|
|
*/
|
|
struct handle_info {
|
|
WORD lock_count;
|
|
WORD flags;
|
|
int size; /* size of the data (net)*/
|
|
};
|
|
|
|
static bit_array free_handles;
|
|
int debug_last_handle_size= 0; /* for debugging purpose only */
|
|
|
|
|
|
/* locate_handle:
|
|
* locate a shared memory handle.
|
|
* Application:
|
|
* The handle is first searched for in attached blocks.
|
|
* At the beginning, only blocks owned by this process are
|
|
* attached.
|
|
* If a handle is not found, new blocks are attached.
|
|
* Arguments:
|
|
* h - the handle.
|
|
* RETURN: pointer to handle info.
|
|
*/
|
|
static struct handle_info *locate_handle(HGLOBAL16 h, struct local_shm_map *map)
|
|
{
|
|
struct shm_block *block;
|
|
|
|
TRACE(global,"shm: (0x%04x)\n", h);
|
|
|
|
|
|
if (SampleBit( &free_handles, DDE_MEM_IDX(h)) == 0) {
|
|
TRACE(global, "shm: return NULL\n");
|
|
return NULL; /* free!!! */
|
|
}
|
|
|
|
block= shm_locate_block(DDE_MEM_INFO(h).shmid, map);
|
|
if (block == NULL) {
|
|
/* nothing found */
|
|
TRACE(global, "shm: return NULL\n");
|
|
return NULL;
|
|
}
|
|
|
|
return (struct handle_info *) REL2PTR(block, DDE_MEM_INFO(h).rel);
|
|
|
|
}
|
|
|
|
/* dde_alloc_handle: allocate shared DDE handle */
|
|
static HGLOBAL16 dde_alloc_handle()
|
|
{
|
|
int bit_nr;
|
|
|
|
bit_nr= AllocateBit( &free_handles);
|
|
|
|
if (bit_nr != -1)
|
|
return DDE_MEM_HANDLE(bit_nr);
|
|
|
|
TRACE(global,"dde_alloc_handle: no free DDE handle found\n");
|
|
return 0;
|
|
}
|
|
/**********************************************************************
|
|
* DDE_malloc
|
|
*/
|
|
void *
|
|
DDE_malloc(unsigned int flags, unsigned long size, SHMDATA *shmdata)
|
|
{
|
|
int shmid;
|
|
struct shm_block *block;
|
|
struct handle_info *h_info;
|
|
struct local_shm_map *curr;
|
|
HGLOBAL16 handle;
|
|
|
|
TRACE(global,"DDE_malloc flags %4X, size %ld\n", flags, size);
|
|
DDE_IPC_init(); /* make sure main shm block allocated */
|
|
|
|
shm_write_wait(main_block->proc[curr_proc_idx].sem);
|
|
|
|
/* Try to find fragment big enough for `size' */
|
|
/* iterate through all local shm blocks, and try to allocate
|
|
the fragment */
|
|
|
|
h_info= NULL;
|
|
for (curr= shm_map ; curr != NULL ; curr= curr->next) {
|
|
if (curr->proc_idx == curr_proc_idx) {
|
|
h_info= (struct handle_info *)
|
|
shm_FragPtrAlloc(curr->ptr, size+sizeof(struct handle_info));
|
|
if (h_info!=NULL) {
|
|
shmid= curr->shm_id;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (h_info == NULL) {
|
|
|
|
block= shm_create_block(0, size+sizeof(struct handle_info), &shmid);
|
|
if (block==NULL) {
|
|
shm_write_signal(main_block->proc[curr_proc_idx].sem);
|
|
return 0;
|
|
}
|
|
/* put the new block in the linked list */
|
|
block->next_shm_id= main_block->proc[curr_proc_idx].shmid;
|
|
main_block->proc[curr_proc_idx].shmid= shmid;
|
|
h_info= (struct handle_info *)
|
|
shm_FragPtrAlloc(block, size+sizeof(struct handle_info));
|
|
if (h_info==NULL) {
|
|
ERR(global,"BUG! unallocated fragment\n");
|
|
shm_write_signal(main_block->proc[curr_proc_idx].sem);
|
|
return 0;
|
|
}
|
|
} else {
|
|
block= curr->ptr;
|
|
}
|
|
|
|
/* Here we have an allocated fragment */
|
|
h_info->flags= flags;
|
|
h_info->lock_count= 0;
|
|
h_info->size= size;
|
|
handle= dde_alloc_handle();
|
|
|
|
if (handle) {
|
|
TRACE(global, "returning handle=0x%4x, ptr=0x%08lx\n",
|
|
(int)handle, (long) HINFO2DATAPTR(h_info));
|
|
DDE_MEM_INFO(handle).rel= PTR2REL(block, h_info);
|
|
DDE_MEM_INFO(handle).shmid= shmid;
|
|
}
|
|
else
|
|
WARN(global, "failed\n");
|
|
|
|
shm_write_signal(main_block->proc[curr_proc_idx].sem);
|
|
|
|
shmdata->handle= handle;
|
|
return (char *)HINFO2DATAPTR(h_info);
|
|
}
|
|
|
|
HGLOBAL16 DDE_GlobalFree(HGLOBAL16 h)
|
|
{
|
|
struct handle_info *h_info;
|
|
int handle_index= h & 0x7fff;
|
|
struct local_shm_map map;
|
|
|
|
TRACE(global,"(0x%04x)\n",h);
|
|
|
|
if (h==0)
|
|
return 0;
|
|
|
|
h_info= locate_handle(h, &map);
|
|
if (h_info == NULL)
|
|
return h;
|
|
|
|
shm_write_wait(main_block->proc[map.proc_idx].sem);
|
|
|
|
shm_FragPtrFree(map.ptr, (struct shm_fragment *) h_info);
|
|
|
|
AssignBit( &free_handles, handle_index, 0);
|
|
|
|
/* FIXME: must free the shm block some day. */
|
|
shm_write_signal(main_block->proc[map.proc_idx].sem);
|
|
return 0;
|
|
}
|
|
|
|
WORD DDE_SyncHandle(HGLOBAL16 handle, WORD sel)
|
|
|
|
{
|
|
struct handle_info *h_info;
|
|
void *local_ptr;
|
|
ldt_entry entry;
|
|
|
|
h_info= locate_handle(handle, NULL);
|
|
local_ptr= (void *)GET_SEL_BASE(sel);
|
|
|
|
|
|
if (h_info == NULL)
|
|
return 0;
|
|
|
|
if (local_ptr == (void *) HINFO2DATAPTR(h_info))
|
|
return sel;
|
|
|
|
/* need syncronization ! */
|
|
LDT_GetEntry( SELECTOR_TO_ENTRY(sel), &entry );
|
|
entry.base= (unsigned long) HINFO2DATAPTR(h_info);
|
|
LDT_SetEntry( SELECTOR_TO_ENTRY(sel), &entry );
|
|
|
|
return sel;
|
|
}
|
|
|
|
/*
|
|
* DDE_AttachHandle:
|
|
* Attach shm memory (The data must not be already attached).
|
|
* Parameters:
|
|
* handle - the memory to attach.
|
|
* segptr - in not null, return SEGPTR to the same block.
|
|
* return value:
|
|
* 32 bit pointer to the memory.
|
|
*/
|
|
|
|
void *DDE_AttachHandle(HGLOBAL16 handle, SEGPTR *segptr)
|
|
{
|
|
struct handle_info *h_info;
|
|
SHMDATA shmdata;
|
|
void *ptr;
|
|
HGLOBAL16 hOwner = GetCurrentPDB();
|
|
|
|
assert(is_dde_handle(handle));
|
|
if (segptr != NULL)
|
|
*segptr=0;
|
|
|
|
TRACE(global,"(%04x)\n",handle);
|
|
h_info=locate_handle(handle, NULL);
|
|
|
|
if (h_info == NULL)
|
|
return NULL;
|
|
|
|
if ( !(h_info->flags & GMEM_DDESHARE) ) {
|
|
ERR(global,"Corrupted memory handle info\n");
|
|
return NULL;
|
|
}
|
|
|
|
TRACE(global,"h_info=%06lx\n",(long)h_info);
|
|
|
|
shmdata.handle= handle;
|
|
shmdata.shmid= DDE_MEM_INFO(handle).shmid;
|
|
|
|
ptr= HINFO2DATAPTR(h_info);
|
|
/* Allocate the selector(s) */
|
|
if (! GLOBAL_CreateBlock( h_info->flags, ptr, h_info->size, hOwner,
|
|
FALSE, FALSE, FALSE, &shmdata))
|
|
return NULL;
|
|
|
|
if (segptr != NULL)
|
|
*segptr= (SEGPTR)MAKELONG( 0, shmdata.sel);
|
|
|
|
if (TRACE_ON(dde))
|
|
debug_last_handle_size= h_info->size;
|
|
|
|
TRACE(global,"DDE_AttachHandle returns ptr=0x%08lx\n", (long)ptr);
|
|
|
|
return (LPSTR)ptr;
|
|
|
|
}
|
|
|
|
void DDE_mem_init()
|
|
{
|
|
int nr_of_bits;
|
|
|
|
shm_init();
|
|
|
|
nr_of_bits= BITS_PER_BYTE * sizeof(main_block->free_handles);
|
|
AssembleArray( &free_handles, main_block->free_handles, nr_of_bits);
|
|
}
|
|
|
|
#endif /* CONFIG_IPC */
|