mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 11:43:31 +00:00
f90efa9cf0
Sun Jun 15 10:30:35 1998 Andreas Mohr <100.30936@germany.net> * [files/dos_fs.c] [files/file.c] [if1632/wprocs.spec] [misc/aspi.c] Added support for scanners that need Adaptec's ASPI2DOS. * [graphics/env.c] [misc/printerdrv.c] [graphics/win16drv/init.c] [if1632/gdi.spec] [include/gdi.h] Enhanced printer support (especially Win95): Drv[GS]etPrinterData, [GS]etEnvironment; added AbortProc handling. * [misc/tapi32.c] [relay32/tapi32.spec] Added some stubs. * [configure.in] [graphics/fontengine.c] [include/windows.h] [misc/comm.c] [misc/w32skrnl.c] [misc/win32s16.c] Made Wine compile on HP-UX (just for fun ;) * [controls/menu.c] [include/windows.h] Complete rewrite of EnableMenuItem32. Free Agent 32 still doesn't work :( * [misc/version.c] [if1632/kernel.spec] [include/winbase.h] Implemented GetVersionEx16. * [misc/network.c] [if1632/user.spec] Fixed arguments of WNetGetPropertyText. * [misc/version.c] [relay32/comctl32.spec] [relay32/oleaut32.spec] Implemented COMCTL32_DllGetVersion, OaBuildVersion. * [win32/file.c] Fixed UNC handling of CreateFile32. Sat Jun 13 22:35:12 1998 Douglas Ridgway <ridgway@winehq.com> * [Makefile.in] [Make.rules.in] Added pattern for CVS merge files to 'make clean' * [ole/olecli.c] [windows/scroll.c] [windows/grahics.c] Add some DC handle unlocking. (When hdc's are always unlocked, they can be made moveable.) * [documentation/wine.texinfo] Started a Wine Design chapter with discussion of graphics driver model. Sat Jun 13 11:19:25 1998 David Luyer <luyer@ucs.uwa.edu.au> * [misc/main.c] [relay32/relay386.c] Added new option -debugmsg +relay=.... or -debugmsg -relay=... Fri Jun 12 22:56:09 1998 Marcus Meissner <marcus@jet.franken.de> * [relay32/snoop.c][relay32/builtin.c][loader/pe_image.c] Added inter win32 dll snooping. Use -debugmsg +snoop. Number of arguments and string references are autodetected. Some small bugfixes in the PE loader. * [misc/system.c] Disabled SystemTimers. They do not work with the current %fs handling in the 32->16 relaycode. (helps labview) * [msdos/dpmi.c][msdos/int2f.c][files/drive.c] Added a monoton linear increasing memory allocator for DPMI (required for LabView, HAFAS, ...) mscdex handling in emulated realmode interrupts (for mcicda.drv) allocate logical drives only once. (helps Myst) * [files/profile.c] Handle ^Z as space. Found on CDROMS (helps Myst Installer). * [multimedia/mmio.c] mmio* partially updated to win32. No funny additions. * [windows/driver.c] Added win32 driver handling (will be used for win32 multimedia/ msvideo drivers). * [win32/device.c] Added device handling (K32OBJ_DEVICE_IOCTL). Implemented VTDAPI.5 (used by win95' WINMM.timeGetTime()) Fri Jun 12 18:01:18 1998 Rein Klazes <rklazes@casema.net> * [ole/compobj.c relay32/ole32.spec] Add a stub for CoLockObjectExternal32. * [objects/clipping.c] Fix in IntersectClipRect(), when there is no initial clipping region. * [graphics/x11drv/graphics.c] Corrected several "one-off" errors for the Ellipse, Rectangle and RoundRectangle (especially small ones) draw routines. Arc and friends still have to be done. Fri Jun 12 06:23:19 1998 Matthew Becker <mbecker@glasscity.net> * [misc/ntdll.c] Fixed some of the parameter counts. * [misc/registry.c] General cleanup, documentation. Standard keys are allowed to be 'closed' and succeed. * [misc/shell.c] Check for correct return values from Reg* functions. * [win32/newfns.c] Added stubs for OpenDesktopA, SetThreadDesktop, and SetUserObjectInformationA. Wed Jun 10 20:28:08 1998 James Juran <jrj120@psu.edu> * [debugger/break.c] Fixed bug introduced in 980503 that broke the -debug command line option for PE executable files. * [configure.in] [include/acconfig.h] [include/debugtools.h] [documentation/debug-msgs] Added 'configure' options to compile out debugging messages. Use --disable-debug to disable all debugging messages, and --disable-trace to just disable TRACE messages. This results in a stripped executable that is 15-20% smaller. This option is very much untested--don't expect it to work. * [documentation/debug-msgs] [documentation/debugging] Minor updates. * [*/*.c] Fixed some compile warnings. This also includes the compile_warnings_trivial patch from WineHQ. Tue Jun 10 22:00:18 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de> * [windows/sysmetrics.c][include/sysmetrics.h] Fixed some Win95 values. * [windows/nonclient.c][include/windows.h] Fixed some Win95 drawing bugs. Added extended window style flags (WS_EX_xxx). * [misc/printdrv.c][relay32/winspool.spec] Added stubs for DeletePrinterDriver32A, DeleteMonitor32A and DeletePort32A. * [windows/mdi.c][include/windows.h][relay32/user32.spec] Added stubs for CascadeWindows and TileWindows. * [controls/toolbar.c][include/toolbar.h] Fixed a few bugs and implemented new features. * [misc/shellord.c][relay32/shell32.spec] Added stubs for SHELL32_60, SHELL32_61 and SHELL32_184. * [controls/comctl32undoc.c][relay32/comctl32.spec] New file comctl32undoc.c. Contains undocumented functions of COMCTL32.DLL. These functions are needed to run EXPLORER.EXE IEXPLORE.EXE and TASKMAN.EXE. * [controls/status.c] Added text alignment. Tue Jun 8 22:00:00 1998 Bertho Stultiens <bertho@akhphd.au.dk> * [programs/*/Makefile.in] Changed the rules to use wrc as resource compiler but passing the source through gcc first for macro expansion. * [programs/*/*.rc] Added #include "windows.h" for the resource compiler in the appropriate files. * [tools/wrc/wrc.[ch]] [tools/wrc/writeres.c] Added commandline option -A for autoregister code. Corrected the underscore problem by checking the proper define from config.h. Sun Jun 7 22:09:29 1998 Pascal Cuoq <pcuoq@ens-lyon.fr> * [ole/ole2nls.c] [memory/string.c] Improved LCMapString32A, and changed CompareString32A, lstrcmp, lstrcmpi to use it. Sat Jun 6 19:00:50 1998 Martin Strömberg <ams@ludd.luth.se> * [include/winnt.h] Added typedefs for security and tokens. Sat Jun 6 12:26:31 1998 Morten Welinder <terra@diku.dk> * [objects/text.c] Use debugstr_an in DrawText16. * [loader/resource.c] Use debugres_w in FindResourceEx32W. Avoid crashing during debug when wm is NULL. * [if1632/relay.c] In RELAY_DebugCallTo16, send output to the right place and avoid side effects in macro arguments. Wed Jun 3 20:56:03 1998 Huw D M Davies <daviesh@abacus.physics.ox.ac.uk> * [controls/scroll.c] [windows/nonclient.c] Fix several off by one errors in scrollbar painting. Tue Jun 2 23:58:59 1998 Insomnia (Stea Greene) <insomnia@core.binghamton.edu> * [graphics/dsound.c] Rewrote mixer code to handle panning and volume for 16->16, 16->8, 8->16, and 8->8 bit mixes. Conforms to DirectX's "logarithmic hearing scale" as specified in M$VC docs. Still does not handle mixing of different frequencies (I am still working on that). Tested 16->16 extensively with StarCraft. Other mixing combinations untested but should work fine. Still kind of a work in progress, so be warned. Tue Jun 2 03:31:33 1998 Alexander V. Lukyanov <lav@long.yar.ru> * [tools/wrc/utils.c] dup_basename: fix to strip directory. Mon Jun 1 20:00:00 1998 Juergen Schmied <juergen.schmied@metronet.de> * [include/windows.h] [objects/cursoricon.c] [relay32/user32.spec] Added stubs LoadCursorFromFileW and LoadCursorFromFileA.
293 lines
9 KiB
C
293 lines
9 KiB
C
/*
|
|
* LDT manipulation functions
|
|
*
|
|
* Copyright 1993 Robert J. Amstadt
|
|
* Copyright 1995 Alexandre Julliard
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include "ldt.h"
|
|
#include "debug.h"
|
|
|
|
#ifdef __i386__
|
|
|
|
#ifdef linux
|
|
#include <sys/syscall.h>
|
|
|
|
struct modify_ldt_s
|
|
{
|
|
unsigned int entry_number;
|
|
unsigned long base_addr;
|
|
unsigned int limit;
|
|
unsigned int seg_32bit : 1;
|
|
unsigned int contents : 2;
|
|
unsigned int read_exec_only : 1;
|
|
unsigned int limit_in_pages : 1;
|
|
unsigned int seg_not_present : 1;
|
|
};
|
|
|
|
static __inline__ int modify_ldt( int func, struct modify_ldt_s *ptr,
|
|
unsigned long count )
|
|
{
|
|
int res;
|
|
#ifdef __PIC__
|
|
__asm__ __volatile__( "pushl %%ebx\n\t"
|
|
"movl %2,%%ebx\n\t"
|
|
"int $0x80\n\t"
|
|
"popl %%ebx"
|
|
: "=a" (res)
|
|
: "0" (SYS_modify_ldt),
|
|
"g" (func),
|
|
"c" (ptr),
|
|
"d" (count) );
|
|
#else
|
|
__asm__ __volatile__("int $0x80"
|
|
: "=a" (res)
|
|
: "0" (SYS_modify_ldt),
|
|
"b" (func),
|
|
"c" (ptr),
|
|
"d" (count) );
|
|
#endif /* __PIC__ */
|
|
if (res >= 0) return res;
|
|
errno = -res;
|
|
return -1;
|
|
}
|
|
|
|
#endif /* linux */
|
|
|
|
#if defined(__svr4__) || defined(_SCO_DS)
|
|
#include <sys/sysi86.h>
|
|
#ifndef __sun__
|
|
#include <sys/seg.h>
|
|
#endif
|
|
#endif
|
|
|
|
#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
|
#include <machine/segments.h>
|
|
|
|
extern int i386_get_ldt(int, union descriptor *, int);
|
|
extern int i386_set_ldt(int, union descriptor *, int);
|
|
#endif /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ */
|
|
|
|
#endif /* __i386__ */
|
|
|
|
|
|
ldt_copy_entry ldt_copy[LDT_SIZE];
|
|
unsigned char ldt_flags_copy[LDT_SIZE];
|
|
|
|
|
|
/***********************************************************************
|
|
* LDT_BytesToEntry
|
|
*
|
|
* Convert the raw bytes of the descriptor to an ldt_entry structure.
|
|
*/
|
|
void LDT_BytesToEntry( const unsigned long *buffer, ldt_entry *content )
|
|
{
|
|
content->base = (*buffer >> 16) & 0x0000ffff;
|
|
content->limit = *buffer & 0x0000ffff;
|
|
buffer++;
|
|
content->base |= (*buffer & 0xff000000) | ((*buffer << 16) & 0x00ff0000);
|
|
content->limit |= (*buffer & 0x000f0000);
|
|
content->type = (*buffer >> 10) & 3;
|
|
content->seg_32bit = (*buffer & 0x00400000) != 0;
|
|
content->read_only = (*buffer & 0x00000200) == 0;
|
|
content->limit_in_pages = (*buffer & 0x00800000) != 0;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* LDT_EntryToBytes
|
|
*
|
|
* Convert an ldt_entry structure to the raw bytes of the descriptor.
|
|
*/
|
|
void LDT_EntryToBytes( unsigned long *buffer, const ldt_entry *content )
|
|
{
|
|
*buffer++ = ((content->base & 0x0000ffff) << 16) |
|
|
(content->limit & 0x0ffff);
|
|
*buffer = (content->base & 0xff000000) |
|
|
((content->base & 0x00ff0000)>>16) |
|
|
(content->limit & 0xf0000) |
|
|
(content->type << 10) |
|
|
((content->read_only == 0) << 9) |
|
|
((content->seg_32bit != 0) << 22) |
|
|
((content->limit_in_pages != 0) << 23) |
|
|
0xf000;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* LDT_GetEntry
|
|
*
|
|
* Retrieve an LDT entry.
|
|
*/
|
|
int LDT_GetEntry( int entry, ldt_entry *content )
|
|
{
|
|
int ret = 0;
|
|
|
|
content->base = ldt_copy[entry].base;
|
|
content->limit = ldt_copy[entry].limit;
|
|
content->type = (ldt_flags_copy[entry] & LDT_FLAGS_TYPE);
|
|
content->seg_32bit = (ldt_flags_copy[entry] & LDT_FLAGS_32BIT) != 0;
|
|
content->read_only = (ldt_flags_copy[entry] & LDT_FLAGS_READONLY) !=0;
|
|
content->limit_in_pages = (ldt_flags_copy[entry] & LDT_FLAGS_BIG) !=0;
|
|
if (content->limit_in_pages) content->limit >>= 12;
|
|
return ret;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* LDT_SetEntry
|
|
*
|
|
* Set an LDT entry.
|
|
*/
|
|
int LDT_SetEntry( int entry, const ldt_entry *content )
|
|
{
|
|
int ret = 0;
|
|
|
|
TRACE(ldt, "entry=%04x base=%08lx limit=%05lx %s %d-bit "
|
|
"flags=%c%c%c\n", entry, content->base, content->limit,
|
|
content->limit_in_pages ? "pages" : "bytes",
|
|
content->seg_32bit ? 32 : 16,
|
|
content->read_only && (content->type & SEGMENT_CODE) ? '-' : 'r',
|
|
content->read_only || (content->type & SEGMENT_CODE) ? '-' : 'w',
|
|
(content->type & SEGMENT_CODE) ? 'x' : '-' );
|
|
|
|
/* Entry 0 must not be modified; its base and limit are always 0 */
|
|
if (!entry) return 0;
|
|
|
|
#ifdef __i386__
|
|
|
|
#ifdef linux
|
|
{
|
|
struct modify_ldt_s ldt_info;
|
|
|
|
ldt_info.entry_number = entry;
|
|
ldt_info.base_addr = content->base;
|
|
ldt_info.limit = content->limit;
|
|
ldt_info.seg_32bit = content->seg_32bit != 0;
|
|
ldt_info.contents = content->type;
|
|
ldt_info.read_exec_only = content->read_only != 0;
|
|
ldt_info.limit_in_pages = content->limit_in_pages != 0;
|
|
ldt_info.seg_not_present = 0;
|
|
/* Make sure the info will be accepted by the kernel */
|
|
/* This is ugly, but what can I do? */
|
|
if (content->type == SEGMENT_STACK)
|
|
{
|
|
/* FIXME */
|
|
}
|
|
else
|
|
{
|
|
if (ldt_info.base_addr >= 0xc0000000)
|
|
{
|
|
WARN(ldt, "Invalid base addr %08lx\n",
|
|
ldt_info.base_addr );
|
|
return -1;
|
|
}
|
|
if (content->limit_in_pages)
|
|
{
|
|
if ((ldt_info.limit << 12) + 0xfff >
|
|
0xc0000000 - ldt_info.base_addr)
|
|
ldt_info.limit = (0xc0000000 - 0xfff - ldt_info.base_addr) >> 12;
|
|
}
|
|
else
|
|
{
|
|
if (ldt_info.limit > 0xc0000000 - ldt_info.base_addr)
|
|
ldt_info.limit = 0xc0000000 - ldt_info.base_addr;
|
|
}
|
|
}
|
|
if ((ret = modify_ldt(1, &ldt_info, sizeof(ldt_info))) < 0)
|
|
perror( "modify_ldt" );
|
|
}
|
|
#endif /* linux */
|
|
|
|
#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
|
{
|
|
long d[2];
|
|
|
|
LDT_EntryToBytes( d, content );
|
|
ret = i386_set_ldt(entry, (union descriptor *)d, 1);
|
|
if (ret < 0)
|
|
{
|
|
perror("i386_set_ldt");
|
|
MSG("Did you reconfigure the kernel with \"options USER_LDT\"?\n");
|
|
exit(1);
|
|
}
|
|
}
|
|
#endif /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ */
|
|
|
|
#if defined(__svr4__) || defined(_SCO_DS)
|
|
{
|
|
struct ssd ldt_mod;
|
|
int i;
|
|
ldt_mod.sel = ENTRY_TO_SELECTOR(entry) | 4;
|
|
ldt_mod.bo = content->base;
|
|
ldt_mod.ls = content->limit;
|
|
i = ((content->limit & 0xf0000) |
|
|
(content->type << 10) |
|
|
(((content->read_only != 0) ^ 1) << 9) |
|
|
((content->seg_32bit != 0) << 22) |
|
|
((content->limit_in_pages != 0)<< 23) |
|
|
(1<<15) |
|
|
0x7000);
|
|
|
|
ldt_mod.acc1 = (i & 0xff00) >> 8;
|
|
ldt_mod.acc2 = (i & 0xf00000) >> 20;
|
|
|
|
if (content->base == 0)
|
|
{
|
|
ldt_mod.acc1 = 0;
|
|
ldt_mod.acc2 = 0;
|
|
}
|
|
if ((ret = sysi86(SI86DSCR, &ldt_mod)) == -1) perror("sysi86");
|
|
}
|
|
#endif
|
|
|
|
#endif /* __i386__ */
|
|
|
|
if (ret < 0) return ret;
|
|
ldt_copy[entry].base = content->base;
|
|
if (!content->limit_in_pages) ldt_copy[entry].limit = content->limit;
|
|
else ldt_copy[entry].limit = (content->limit << 12) | 0x0fff;
|
|
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) |
|
|
(ldt_flags_copy[entry] & LDT_FLAGS_ALLOCATED);
|
|
return ret;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* LDT_Print
|
|
*
|
|
* Print the content of the LDT on stdout.
|
|
*/
|
|
void LDT_Print( int start, int length )
|
|
{
|
|
int i;
|
|
char flags[3];
|
|
|
|
if (length == -1) length = LDT_SIZE - start;
|
|
for (i = start; i < start + length; i++)
|
|
{
|
|
if (!ldt_copy[i].base && !ldt_copy[i].limit) continue; /* Free entry */
|
|
if ((ldt_flags_copy[i] & LDT_FLAGS_TYPE) == SEGMENT_CODE)
|
|
{
|
|
flags[0] = (ldt_flags_copy[i] & LDT_FLAGS_EXECONLY) ? '-' : 'r';
|
|
flags[1] = '-';
|
|
flags[2] = 'x';
|
|
}
|
|
else
|
|
{
|
|
flags[0] = 'r';
|
|
flags[1] = (ldt_flags_copy[i] & LDT_FLAGS_READONLY) ? '-' : 'w';
|
|
flags[2] = '-';
|
|
}
|
|
MSG("%04x: sel=%04x base=%08lx limit=%08lx %d-bit %c%c%c\n",
|
|
i, ENTRY_TO_SELECTOR(i), ldt_copy[i].base, ldt_copy[i].limit,
|
|
ldt_flags_copy[i] & LDT_FLAGS_32BIT ? 32 : 16,
|
|
flags[0], flags[1], flags[2] );
|
|
}
|
|
}
|