Sun Mar 1 10:45:23 1998 Andreas Mohr <100.30936@germany.net> * [loader/ne_image.c] Fixed problem with weird DLLs (NE_FFLAGS_SINGLEDATA && DGROUP = 0). * [msdos/dosmem.c] Export address for __0000H, too. * [msdos/dpmi.c] Changed MemAlloc functions to return less fragmented addresses. Sat Feb 28 18:50:12 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [scheduler/process.c] [scheduler/sysdeps.c] Don't use %fs register before threading initialization. Sat Feb 28 14:04:56 1998 Kristian Nielsen <kristian.nielsen@risoe.dk> * [configure.in] [include/acconfig.h] Autoconf macro to check for non-reentrant X libraries. * [windows/winpos.c] In SetWindowPos32(), do not cause WM_SIZE messages when the SWP_NOSIZE flag is specified. This fixes the division-by-zero in Borland C++ 4.0 "Open Project" menu item. Sat Feb 28 13:11:26 1998 James Moody <013263m@dragon.acadiau.ca> * [ole/ole2nls.c] Changed "English" values from German to English. * [files/dos_fs.c] Fixed off-by-one month bug. Fri Feb 27 22:12:01 1998 Douglas Ridgway <ridgway@winehq.com> * [windows/win.c] Fix winelib class menu loading bug. * [include/module.h] [loader/module.c] LoadModule32 should be implemented in terms of CreateProcess. * [programs/view/*] Metafile viewer sample program. * [documentation/wine.texinfo] [documentation/Makefile.in] Improvements and additions, HTML target. Fri Feb 27 04:27:48 1998 Dimitrie O. Paun <dimi@cs.toronto.edu> * [*/*] Switched to the new debug messages interface. For more information please refer to documentation/debug-msgs. Because the new scheme introduces a new semantic level, I had to manually do through about 530 dprintf_xxx! The rest of about 2400 where transformed via a script. Because of the large number of changes that I had to do, some may have not come out as nicely as I wanted them. If this is the case, please let me know. There is a lot of work left to do: -- a few hundred printf's to be converted -- about 2300 fprintf's to be converted -- about 600 FIXME's to be transformed The problem is that in the above mentioned cases, a lot of manual intervention is required because a lot of the information is missing. There are also a lot of other things to be done to the interface and so forth. I have now ideas for a at least a month worth of full time work :) I will proceed with many changes in the next few releases, so please do not start modifing things because there will be a hell of a lot of conflicts. If you have ideas that you want to integrate or you want to work on different things, please coordinate with me. Thu Feb 26 13:04:29 1998 David Lee Lambert <lamber45@egr.msu.edu> * [ole/ole2nls.c] [include/windows.h] First try at OLE date- and time-formatting functions. Wed Feb 25 11:20:35 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de> * [files/*.c] Changed dos device handling, added 'CON' devicehandling. * [graphics/ddraw.c] Bug fixes, some additions. * [if1632/builtin.c][loader/module.c][library/winestub.c] Small hack so we don't need a dummy BUILTIN_LoadModule in winestub.c. * [ole/*][relay32/ole32.spec][if1632/storage.spec] storage.dll started. winword loads documents (saving doesn't work yet, dunno why). Several ole additions, some cleanups and bugfixes. IMalloc16 implemented. * [loader/pe_image.c] Added some comments, fixed circular dll references, fixed modref ordering, fixed tls allocation. * [memory/global.c] Added validity checks before every GET_ARENA_PTR. (several functions rely on Global* return values on invalid handles, like IsTask). Implemented GlobalUnlockFree16. * [memory/virtual.c] Replaced dprintf_virtual by fprintf, so we can do 'info map' again in the debugger. Increase read linesize for Linux2.1 cases. * [misc/cpu.c][misc/registry.c] Moved cpu registry initialization to misc/cpu.c. * [multimedia/dsound.c] Enhanced, replaced GETOSPACE bufferingcheck by SETFRAGMENT. * [relay32/crtdll.spec][relay32/ntdll.spec] Replaced some ptr by respective 'str' and 'wstr' arguments for libc functions. * [scheduler/thread.c] Added some sanity checks to stackallocation, tlshandling fixed. * [tools/build.c] Fixed cdecl argumenttype order (was reversed). * [win32/ordinals.c] Implemented KERNEL_449. * [windows/dinput.c] Some fixes, needs much more work. Tomb Raider2 works with keyboard ;) Tue Feb 24 20:46:37 1998 James Juran <jrj120@psu.edu> * [windows/win.c] Fixed USER32 ordinal numbers in documentation. Sat Feb 21 12:30:38 1998 John Richardson <jrichard@zko.dec.com> * [files/file.c] [include/k32obj.h] [memory/virtual.c] [scheduler/critsection.c] [scheduler/event.c] [scheduler/handle.c] [scheduler/k32obj.c] [scheduler/mutex.c] [scheduler/process.c] [scheduler/semaphore.c] [scheduler/thread.c] Added generic k32obj read and write routines for k32objs that support I/O. * [documentation/console] Updated console docs. * [win32/console.c] Make console work like a k32obj that supports I/O. * [include/windows.h] Make WriteFile and ReadFile take HANDLE32 for handle. Sun Feb 15 14:07:07 1998 Dimitrie O. Paun <dimi@mail.cs.toronto.edu> * [controls/menu.c] [misc/ver.c] [multimedia/dsound.c] [multimedia/joystick.c] [windows/dialog.c] Modified some dprintf_xxx's to prepare them for a new dprintf_ scheme. Basically, I changed the dprintf's that outputed a line with many dprintf calls to do just one dprintf call.
407 lines
13 KiB
C
407 lines
13 KiB
C
/*
|
|
* Built-in modules
|
|
*
|
|
* Copyright 1996 Alexandre Julliard
|
|
*/
|
|
|
|
#include <assert.h>
|
|
#include <ctype.h>
|
|
#include <string.h>
|
|
#include "windows.h"
|
|
#include "builtin32.h"
|
|
#include "gdi.h"
|
|
#include "global.h"
|
|
#include "heap.h"
|
|
#include "module.h"
|
|
#include "miscemu.h"
|
|
#include "neexe.h"
|
|
#include "stackframe.h"
|
|
#include "user.h"
|
|
#include "process.h"
|
|
#include "debug.h"
|
|
|
|
/* Built-in modules descriptors */
|
|
/* Don't change these structures! (see tools/build.c) */
|
|
|
|
typedef struct
|
|
{
|
|
const char *name; /* DLL name */
|
|
void *module_start; /* 32-bit address of the module data */
|
|
int module_size; /* Size of the module data */
|
|
const BYTE *code_start; /* 32-bit address of DLL code */
|
|
const BYTE *data_start; /* 32-bit address of DLL data */
|
|
} WIN16_DESCRIPTOR;
|
|
|
|
typedef struct
|
|
{
|
|
const WIN16_DESCRIPTOR *descr; /* DLL descriptor */
|
|
int flags; /* flags (see below) */
|
|
} BUILTIN16_DLL;
|
|
|
|
/* DLL flags */
|
|
#define DLL_FLAG_NOT_USED 0x01 /* Use original Windows DLL if possible */
|
|
#define DLL_FLAG_ALWAYS_USED 0x02 /* Always use built-in DLL */
|
|
|
|
/* 16-bit DLLs */
|
|
|
|
extern const WIN16_DESCRIPTOR COMMDLG_Descriptor;
|
|
extern const WIN16_DESCRIPTOR COMPOBJ_Descriptor;
|
|
extern const WIN16_DESCRIPTOR DDEML_Descriptor;
|
|
extern const WIN16_DESCRIPTOR GDI_Descriptor;
|
|
extern const WIN16_DESCRIPTOR KERNEL_Descriptor;
|
|
extern const WIN16_DESCRIPTOR KEYBOARD_Descriptor;
|
|
extern const WIN16_DESCRIPTOR LZEXPAND_Descriptor;
|
|
extern const WIN16_DESCRIPTOR MMSYSTEM_Descriptor;
|
|
extern const WIN16_DESCRIPTOR MOUSE_Descriptor;
|
|
extern const WIN16_DESCRIPTOR OLE2CONV_Descriptor;
|
|
extern const WIN16_DESCRIPTOR OLE2DISP_Descriptor;
|
|
extern const WIN16_DESCRIPTOR OLE2NLS_Descriptor;
|
|
extern const WIN16_DESCRIPTOR OLE2PROX_Descriptor;
|
|
extern const WIN16_DESCRIPTOR OLE2THK_Descriptor;
|
|
extern const WIN16_DESCRIPTOR OLE2_Descriptor;
|
|
extern const WIN16_DESCRIPTOR OLECLI_Descriptor;
|
|
extern const WIN16_DESCRIPTOR OLESVR_Descriptor;
|
|
extern const WIN16_DESCRIPTOR SHELL_Descriptor;
|
|
extern const WIN16_DESCRIPTOR SOUND_Descriptor;
|
|
extern const WIN16_DESCRIPTOR STORAGE_Descriptor;
|
|
extern const WIN16_DESCRIPTOR STRESS_Descriptor;
|
|
extern const WIN16_DESCRIPTOR SYSTEM_Descriptor;
|
|
extern const WIN16_DESCRIPTOR TOOLHELP_Descriptor;
|
|
extern const WIN16_DESCRIPTOR USER_Descriptor;
|
|
extern const WIN16_DESCRIPTOR VER_Descriptor;
|
|
extern const WIN16_DESCRIPTOR W32SYS_Descriptor;
|
|
extern const WIN16_DESCRIPTOR WIN32S16_Descriptor;
|
|
extern const WIN16_DESCRIPTOR WIN87EM_Descriptor;
|
|
extern const WIN16_DESCRIPTOR WINASPI_Descriptor;
|
|
extern const WIN16_DESCRIPTOR WINDEBUG_Descriptor;
|
|
extern const WIN16_DESCRIPTOR WING_Descriptor;
|
|
extern const WIN16_DESCRIPTOR WINSOCK_Descriptor;
|
|
extern const WIN16_DESCRIPTOR WPROCS_Descriptor;
|
|
|
|
/* Table of all built-in DLLs */
|
|
|
|
static BUILTIN16_DLL BuiltinDLLs[] =
|
|
{
|
|
{ &KERNEL_Descriptor, DLL_FLAG_ALWAYS_USED },
|
|
{ &USER_Descriptor, DLL_FLAG_ALWAYS_USED },
|
|
{ &GDI_Descriptor, DLL_FLAG_ALWAYS_USED },
|
|
{ &SYSTEM_Descriptor, DLL_FLAG_ALWAYS_USED },
|
|
{ &WPROCS_Descriptor, DLL_FLAG_ALWAYS_USED },
|
|
{ &WINDEBUG_Descriptor, DLL_FLAG_ALWAYS_USED },
|
|
{ &COMMDLG_Descriptor, DLL_FLAG_NOT_USED },
|
|
{ &COMPOBJ_Descriptor, DLL_FLAG_NOT_USED },
|
|
{ &DDEML_Descriptor, DLL_FLAG_NOT_USED },
|
|
{ &KEYBOARD_Descriptor, 0 },
|
|
{ &LZEXPAND_Descriptor, 0 },
|
|
{ &MMSYSTEM_Descriptor, 0 },
|
|
{ &MOUSE_Descriptor, 0 },
|
|
{ &OLE2CONV_Descriptor, DLL_FLAG_NOT_USED },
|
|
{ &OLE2DISP_Descriptor, DLL_FLAG_NOT_USED },
|
|
{ &OLE2NLS_Descriptor, DLL_FLAG_NOT_USED },
|
|
{ &OLE2PROX_Descriptor, DLL_FLAG_NOT_USED },
|
|
{ &OLE2THK_Descriptor, DLL_FLAG_NOT_USED },
|
|
{ &OLE2_Descriptor, DLL_FLAG_NOT_USED },
|
|
{ &OLECLI_Descriptor, DLL_FLAG_NOT_USED },
|
|
{ &OLESVR_Descriptor, DLL_FLAG_NOT_USED },
|
|
{ &SHELL_Descriptor, 0 },
|
|
{ &SOUND_Descriptor, 0 },
|
|
{ &STORAGE_Descriptor, DLL_FLAG_NOT_USED },
|
|
{ &STRESS_Descriptor, 0 },
|
|
{ &TOOLHELP_Descriptor, 0 },
|
|
{ &VER_Descriptor, 0 },
|
|
{ &W32SYS_Descriptor, 0 },
|
|
{ &WIN32S16_Descriptor, 0 },
|
|
{ &WIN87EM_Descriptor, DLL_FLAG_NOT_USED },
|
|
{ &WINASPI_Descriptor, 0 },
|
|
{ &WING_Descriptor, 0 },
|
|
{ &WINSOCK_Descriptor, 0 },
|
|
/* Last entry */
|
|
{ NULL, 0 }
|
|
};
|
|
|
|
/* Ordinal number for interrupt 0 handler in WPROCS.DLL */
|
|
#define FIRST_INTERRUPT_ORDINAL 100
|
|
|
|
|
|
/***********************************************************************
|
|
* BUILTIN_DoLoadModule16
|
|
*
|
|
* Load a built-in Win16 module. Helper function for BUILTIN_LoadModule
|
|
* and BUILTIN_Init.
|
|
*/
|
|
static HMODULE16 BUILTIN_DoLoadModule16( const WIN16_DESCRIPTOR *descr )
|
|
{
|
|
NE_MODULE *pModule;
|
|
int minsize;
|
|
SEGTABLEENTRY *pSegTable;
|
|
|
|
HMODULE16 hModule = GLOBAL_CreateBlock( GMEM_MOVEABLE, descr->module_start,
|
|
descr->module_size, 0,
|
|
FALSE, FALSE, FALSE, NULL );
|
|
if (!hModule) return 0;
|
|
FarSetOwner( hModule, hModule );
|
|
|
|
dprintf_info(module, "Built-in %s: hmodule=%04x\n",
|
|
descr->name, hModule );
|
|
pModule = (NE_MODULE *)GlobalLock16( hModule );
|
|
pModule->self = hModule;
|
|
|
|
/* Allocate the code segment */
|
|
|
|
pSegTable = NE_SEG_TABLE( pModule );
|
|
pSegTable->selector = GLOBAL_CreateBlock( GMEM_FIXED, descr->code_start,
|
|
pSegTable->minsize, hModule,
|
|
TRUE, TRUE, FALSE, NULL );
|
|
if (!pSegTable->selector) return 0;
|
|
pSegTable++;
|
|
|
|
/* Allocate the data segment */
|
|
|
|
minsize = pSegTable->minsize ? pSegTable->minsize : 0x10000;
|
|
minsize += pModule->heap_size;
|
|
if (minsize > 0x10000) minsize = 0x10000;
|
|
pSegTable->selector = GLOBAL_Alloc( GMEM_FIXED, minsize,
|
|
hModule, FALSE, FALSE, FALSE );
|
|
if (!pSegTable->selector) return 0;
|
|
if (pSegTable->minsize) memcpy( GlobalLock16( pSegTable->selector ),
|
|
descr->data_start, pSegTable->minsize);
|
|
if (pModule->heap_size)
|
|
LocalInit( pSegTable->selector, pSegTable->minsize, minsize );
|
|
|
|
MODULE_RegisterModule( pModule );
|
|
return hModule;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* BUILTIN_Init
|
|
*
|
|
* Load all built-in modules marked as 'always used'.
|
|
*/
|
|
BOOL32 BUILTIN_Init(void)
|
|
{
|
|
BUILTIN16_DLL *dll;
|
|
NE_MODULE *pModule;
|
|
WORD vector;
|
|
HMODULE16 hModule;
|
|
|
|
fnBUILTIN_LoadModule = BUILTIN_LoadModule;
|
|
|
|
for (dll = BuiltinDLLs; dll->descr; dll++)
|
|
{
|
|
if (dll->flags & DLL_FLAG_ALWAYS_USED)
|
|
if (!BUILTIN_DoLoadModule16( dll->descr )) return FALSE;
|
|
}
|
|
|
|
/* Set the USER and GDI heap selectors */
|
|
|
|
pModule = MODULE_GetPtr( GetModuleHandle16( "USER" ));
|
|
USER_HeapSel = (NE_SEG_TABLE( pModule ) + pModule->dgroup - 1)->selector;
|
|
pModule = MODULE_GetPtr( GetModuleHandle16( "GDI" ));
|
|
GDI_HeapSel = (NE_SEG_TABLE( pModule ) + pModule->dgroup - 1)->selector;
|
|
|
|
/* Initialize KERNEL.178 (__WINFLAGS) with the correct flags value */
|
|
|
|
hModule = GetModuleHandle16( "KERNEL" );
|
|
MODULE_SetEntryPoint( hModule, 178, GetWinFlags() );
|
|
|
|
/* Initialize the real-mode selector entry points */
|
|
|
|
DOSMEM_InitExports( hModule );
|
|
|
|
/* Set interrupt vectors from entry points in WPROCS.DLL */
|
|
|
|
hModule = GetModuleHandle16( "WPROCS" );
|
|
for (vector = 0; vector < 256; vector++)
|
|
{
|
|
FARPROC16 proc = MODULE_GetEntryPoint( hModule,
|
|
FIRST_INTERRUPT_ORDINAL+vector);
|
|
assert(proc);
|
|
INT_SetHandler( vector, proc );
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* BUILTIN_LoadModule
|
|
*
|
|
* Load a built-in module. If the 'force' parameter is FALSE, we only
|
|
* load the module if it has not been disabled via the -dll option.
|
|
*/
|
|
HMODULE32 BUILTIN_LoadModule( LPCSTR name, BOOL32 force )
|
|
{
|
|
BUILTIN16_DLL *table;
|
|
char dllname[16], *p;
|
|
|
|
/* Fix the name in case we have a full path and extension */
|
|
|
|
if ((p = strrchr( name, '\\' ))) name = p + 1;
|
|
lstrcpyn32A( dllname, name, sizeof(dllname) );
|
|
if ((p = strrchr( dllname, '.' ))) *p = '\0';
|
|
|
|
for (table = BuiltinDLLs; table->descr; table++)
|
|
if (!lstrcmpi32A( table->descr->name, dllname )) break;
|
|
if (!table->descr) return BUILTIN32_LoadModule( name, force,
|
|
PROCESS_Current() );
|
|
if ((table->flags & DLL_FLAG_NOT_USED) && !force) return 0;
|
|
|
|
return BUILTIN_DoLoadModule16( table->descr );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* BUILTIN_GetEntryPoint16
|
|
*
|
|
* Return the ordinal and name corresponding to a CS:IP address.
|
|
* This is used only by relay debugging.
|
|
*/
|
|
LPCSTR BUILTIN_GetEntryPoint16( WORD cs, WORD ip, WORD *pOrd )
|
|
{
|
|
static char buffer[80];
|
|
WORD ordinal, i, max_offset;
|
|
register BYTE *p;
|
|
NE_MODULE *pModule;
|
|
|
|
if (!(pModule = MODULE_GetPtr( FarGetOwner( GlobalHandle16(cs) ))))
|
|
return NULL;
|
|
|
|
/* Search for the ordinal */
|
|
|
|
p = (BYTE *)pModule + pModule->entry_table;
|
|
max_offset = 0;
|
|
ordinal = 1;
|
|
*pOrd = 0;
|
|
while (*p)
|
|
{
|
|
switch(p[1])
|
|
{
|
|
case 0: /* unused */
|
|
ordinal += *p;
|
|
p += 2;
|
|
break;
|
|
case 1: /* code segment */
|
|
i = *p;
|
|
p += 2;
|
|
while (i-- > 0)
|
|
{
|
|
p++;
|
|
if ((*(WORD *)p <= ip) && (*(WORD *)p >= max_offset))
|
|
{
|
|
max_offset = *(WORD *)p;
|
|
*pOrd = ordinal;
|
|
}
|
|
p += 2;
|
|
ordinal++;
|
|
}
|
|
break;
|
|
case 0xff: /* moveable (should not happen in built-in modules) */
|
|
fprintf( stderr, "Built-in module has moveable entry\n" );
|
|
ordinal += *p;
|
|
p += 2 + *p * 6;
|
|
break;
|
|
default: /* other segment */
|
|
ordinal += *p;
|
|
p += 2 + *p * 3;
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* Search for the name in the resident names table */
|
|
/* (built-in modules have no non-resident table) */
|
|
|
|
p = (BYTE *)pModule + pModule->name_table;
|
|
while (*p)
|
|
{
|
|
p += *p + 1 + sizeof(WORD);
|
|
if (*(WORD *)(p + *p + 1) == *pOrd) break;
|
|
}
|
|
|
|
sprintf( buffer, "%.*s.%d: %.*s",
|
|
*((BYTE *)pModule + pModule->name_table),
|
|
(char *)pModule + pModule->name_table + 1,
|
|
*pOrd, *p, (char *)(p + 1) );
|
|
return buffer;
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* BUILTIN_DefaultIntHandler
|
|
*
|
|
* Default interrupt handler.
|
|
*/
|
|
void BUILTIN_DefaultIntHandler( CONTEXT *context )
|
|
{
|
|
WORD ordinal;
|
|
STACK16FRAME *frame = CURRENT_STACK16;
|
|
BUILTIN_GetEntryPoint16( frame->entry_cs, frame->entry_ip, &ordinal );
|
|
INT_BARF( context, ordinal - FIRST_INTERRUPT_ORDINAL );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* BUILTIN_ParseDLLOptions
|
|
*
|
|
* Set runtime DLL usage flags
|
|
*/
|
|
BOOL32 BUILTIN_ParseDLLOptions( const char *str )
|
|
{
|
|
BUILTIN16_DLL *dll;
|
|
const char *p;
|
|
|
|
while (*str)
|
|
{
|
|
while (*str && isspace(*str)) str++;
|
|
if (!*str) return TRUE;
|
|
if ((*str != '+') && (*str != '-')) return FALSE;
|
|
str++;
|
|
if (!(p = strchr( str, ',' ))) p = str + strlen(str);
|
|
while ((p > str) && isspace(p[-1])) p--;
|
|
if (p == str) return FALSE;
|
|
for (dll = BuiltinDLLs; dll->descr; dll++)
|
|
{
|
|
if (!lstrncmpi32A( str, dll->descr->name, (int)(p - str) ))
|
|
{
|
|
if (dll->descr->name[(int)(p-str)]) /* only partial match */
|
|
continue;
|
|
if (str[-1] == '-')
|
|
{
|
|
if (dll->flags & DLL_FLAG_ALWAYS_USED) return FALSE;
|
|
dll->flags |= DLL_FLAG_NOT_USED;
|
|
}
|
|
else dll->flags &= ~DLL_FLAG_NOT_USED;
|
|
break;
|
|
}
|
|
}
|
|
if (!dll->descr)
|
|
if (!BUILTIN32_EnableDLL( str, (int)(p - str), (str[-1] == '+') ))
|
|
return FALSE;
|
|
str = p;
|
|
while (*str && (isspace(*str) || (*str == ','))) str++;
|
|
}
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* BUILTIN_PrintDLLs
|
|
*
|
|
* Print the list of built-in DLLs that can be disabled.
|
|
*/
|
|
void BUILTIN_PrintDLLs(void)
|
|
{
|
|
int i;
|
|
BUILTIN16_DLL *dll;
|
|
|
|
fprintf(stderr,"Example: -dll -ole2 Do not use emulated OLE2.DLL\n");
|
|
fprintf(stderr,"Available Win16 DLLs:\n");
|
|
for (i = 0, dll = BuiltinDLLs; dll->descr; dll++)
|
|
{
|
|
if (!(dll->flags & DLL_FLAG_ALWAYS_USED))
|
|
fprintf( stderr, "%-9s%c", dll->descr->name,
|
|
((++i) % 8) ? ' ' : '\n' );
|
|
}
|
|
fprintf(stderr,"\n");
|
|
BUILTIN32_PrintDLLs();
|
|
}
|