Sat Aug 22 17:46:19 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de> * [include/dosexe.h] [include/module.h] [include/pe_image.h] [include/process.h] [include/windows.h] [loader/dos/module.c] [loader/module.c] [loader/ne/module.c] [loader/pe_image.c] [scheduler/process.c] [win32/process.c] Partially implemented CreateProcess32. * [win32/device.c] [relay32/kernel32.spec] [scheduler/k32obj.c] [misc/registry.c] [win32/file.c] Partially implemented VxDCall (VMM registry services). * [files/dos_fs.c] DOSFS_FindNext made thread-safe. * [include/sig_context.h] [include/syslevel.h] [loader/signal.c] [scheduler/syslevel.c] [tools/build.c] Replaced CALLTO16_Current_fs by SYSLEVEL_Win16CurrentTeb. * [win32/kernel32.c] Bugfix: QT_Thunk/FT_Thunk should return 'long' in DX:AX, not EAX. * [if1632/relay.c] [relay32/builtin32.c] [windows/msgbox.c] [msdos/int20.c] [msdos/int21.c] Use ExitProcess instead of TASK_KillCurrentTask. * [include/task.h] [include/thread.h] [loader/task.c] [scheduler/thread.c] [include/queue.h] [windows/message.c] [windows/queue.c] [windows/win.c] Prevent Win32 threads from entering the TASK_Reschedule loop. (Note: Win32 messaging still doesn't work correctly; this patch is just preventing the system from crashing when Win32 threads call messaging functions. Messages will probably still get lost.) * [scheduler/critsection.c] Deactivated the use of SEM_UNDO for the SYSTEM_LOCK semaphore; for some reason, this leads to problems after threads terminate... Sat Aug 22 15:00:00 1998 Jürgen Schmied <juergen.schmied@metronet.de> * [include/authors.h] New file, includes all names of the developer (former shell.c) * [Makefile.in][configure][configure.in][dlls/Makefile.in] [dlls/shell32/Makefile.in][shres.rc] Created dlls/shell32 and moved the shell32 stuff in it. Started to create internal resources. * [dlls/shell32/*] Split the shell32 implementation into smaller files. New classes: IContextMenu, IExtractIcon, IShellView. Implemented Shell_GetImageList(). shell32 links to comctl32 now dynamically so it can use internal/external implementations. * [documentation/internal-dll] [documentation/shell32] New, could anybody do a spellcheck? * [include/commctrl.h] Many new LV constants, structures, functions. * [controls/comctl32undoc.c] Rewrote the DSA* functions. * [windows/winpos.c] SetShellWindow32, GetShellWindow32. Sat Aug 22 14:02:15 1998 Alexander Lukyanov <lav@long.yar.ru> * [loader/resource.c] Mark last accelerator as such in LoadAccelerators32W. * [relay32/shell32.spec] [misc/shell.c] Add stubs for SHGetSpecialFolderPath[AW]. Sat Aug 22 02:07:42 1998 Adrian Harvey <adrian@select.com.au> * [include/file.h] [file/file.c] [msdos/int21.c] [msdos/vxd.c] [misc/lzexpand.c] [win32/kernel32.c] [documentation/filehandles] Fixed file handle handling. Created universal HFILE16 to HFILE32 translation macro from msdos/int21 code by Ove Kaaven. Used macro in all Win16 functions so that win32 handles are translated to avoid DOS/Win16 stdxx handles. Removed handle translation from int21.c where Win16 functions are called. Changed remaining calls to use new macro names. Documented filehandle handling and differences between win 16 & 32. Fri Aug 21 20:32:49 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [server/process.c] [server/thread.c] Implemented object wait queues and synchronization. Fri Aug 21 18:40:02 1998 Huw D M Davies <daviesh@abacus.physics.ox.ac.uk> * [graphics/psdrv/*] DEVMODE dmPaper{Width|Length} fields are in 0.1mm. Select a 100 pixel default font in CreateDC. Thu Aug 20 22:47:39 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> * [objects/bitmap.c] Handle bits=32 in SetBitmapBits32 and GetBitmapBits32. * [msdos/int21.c] Add handling of Int21 0A and 37. * [misc/commdlg.c] Use MapHModuleLS and MapHModuleSL when translating HINSTANCE16 to HINSTANCE32 and vice versa. * [win32/file.c] CreateFile32A: Abort if filename == NULL. Thu Aug 20 12:28:31 1998 Marcus Meissner <marcus@jet.franken.de> * [*/*] Lots of missing prototypes added, some parameter types adapted to match SDK. * [debugger/stabs.c] Don't loop forever if we don't find wine or one of the libxxx.so. * [loader/ne/module.c] Implemented MapHModuleLS,MapHModuleSL,MapHinstLS,MapHinstSL. * [misc/network.c] Implemented WNetGetUser32A. * [misc/shellord.c] Implemented ILRemoveLastID. * [multimedia/dsound.c] Fixed StarCraft memory leak. * [graphics/ddraw.c] Removed some unnecessary simple relaying functions, tried polishing up the Xlib implementation (still doesn't work), temp. removed Xshm code (to be remerged with working Xlib code). Tue Aug 18 22:29:17 1998 Ove Kaaven <ovek@arcticnet.no> * [multimedia/mmio.c] [multimedia/mmsystem.c] Fixed most mmio bugs, fully implementing mmioSetBuffer buffering, ability to read memory files, and the sndPlaySound() SND_MEMORY flag. Most mmio-using programs now work fine. * [include/dosexe.h] [include/miscemu.h] [include/module.h] [loader/module.c] [loader/task.c] [msdos/dosmem.c] Improved DOS VM flexibility and portability somewhat. (Did I get the #ifdefs right this time, BSD-ers?) * [msdos/int21.c] Made "Get Current PSP address" work as expected in a DOS VM. * [loader/dos/*] Began improving flexibility and portability somewhat. It should be easier to add DPMI RMCB callbacks now. The DOS VM no longer leaves big files lying around in /tmp after a crash. Tue Aug 18 12:38:31 1998 Turchanov Sergey <turchanov@usa.net> * [relay32/winmm.spec] This patch allows WinAmp to play WAV files (at least in PCM format). Sun Aug 16 05:34:13 1998 Pablo Saratxaga <srtxg@chanae.alphanet.ch> * [windows/keyboard.c] Corrected keyboard code to properly handle keys : ? ~ and " on non US keyboards. Sat Aug 15 18:47:14 1998 Brian Craft <bcboy@dorothy.wanglab.brandeis.edu> * [windows/win.c] Fixed severe bug in EnumChildWindwos(). Thu Aug 13 21:05:35 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de> * [controls/tooltips.c] Fixed some bugs. Added subclassing support. * [controls/toolbar.c] Improved tooltip integration. Fixed some bugs. * [controls/commctrl.c] Changed control registration and added some documentation. Fixed ShowHideMenuCtl. * [controls/rebar.c][include/rebar.h][include/commctrl.h] Improved rebar implementation (still no display). * [controls/pager.c][include/pager.h][include/commctrl.h] Improved pager implementation (still no display). * [misc/imagelist.c] Fixed a bug. * [documentation/common_controls] Updated. Sun Aug 9 19:50:20 1998 James Juran <jrj120@psu.edu> * [Makefile.in] [documentation/Makefile.in] [programs/Makefile.in] [programs/*/Makefile.in] Added uninstall rules, cleaned up install rules a little bit. Sun Aug 9 13:21:35 1998 Andreas Mohr <100.30936@germany.net> * [loader/ne/module.c] [if1632/kernel.spec] Added the undocumented HIWORD of GetModuleHandle (hFirstModule). * [loader/ne/segment.c] Wine forgot to set some NE_SEGFLAGS_*. Combined with another loader change, this fixed the "BLINKER -- error in loading module" or ghost MessageBox problem that about 1% of all Windows programs have. Some BLINKER programs still don't work, though. But I'm working on it, with great help from Blinkinc. * [loader/task.c] InitTask needs to decrement the SP register by two as Win95 does. Sun Aug 9 02:41:28 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de> * [if1632/kernel.spec] [relay32/kernel32.spec] [scheduler/syslevel.c] [loader/main.c] [win32/ordinals.c] [include/syslevel.h] [scheduler/Makefile.in] Implemented Win95 'syslevel' routines (including Win16Lock). * [if1632/relay.c] [if1632/thunk.c] [tools/build.c] [loader/task.c] [loader/ne/segment.c] [win32/kernel32.c] [memory/selector.c] [include/stackframe.h] [include/thread.h] 16-bit %fs handling revised. Use Win16Lock where appropriate. * [include/thread.h] [scheduler/synchro.c] [windows/message.c] [windows/queue.c] [win32/process.c] Implemented MsgWaitForMultipleObjects. * [files/change.c] [files/Makefile.in] [scheduler/k32obj.c] [win32/newfns.c] Implemented (dummy) file change notification objects. * [debugger/dbg.y] [scheduler/process.c] [scheduler/thread.c] [include/process.h] [include/thread.h] Suspend all threads except current when hitting debugger break point. * [objects/dib.c] Bugfix for CreateDIBSection.
186 lines
7.1 KiB
C
186 lines
7.1 KiB
C
/*
|
|
* Module definitions
|
|
*
|
|
* Copyright 1995 Alexandre Julliard
|
|
*/
|
|
|
|
#ifndef __WINE_MODULE_H
|
|
#define __WINE_MODULE_H
|
|
|
|
#include "wintypes.h"
|
|
#include "pe_image.h"
|
|
|
|
struct _DOSTASK;
|
|
|
|
/* In-memory module structure. See 'Windows Internals' p. 219 */
|
|
typedef struct _NE_MODULE
|
|
{
|
|
WORD magic; /* 00 'NE' signature */
|
|
WORD count; /* 02 Usage count */
|
|
WORD entry_table; /* 04 Near ptr to entry table */
|
|
HMODULE16 next; /* 06 Selector to next module */
|
|
WORD dgroup_entry; /* 08 Near ptr to segment entry for DGROUP */
|
|
WORD fileinfo; /* 0a Near ptr to file info (OFSTRUCT) */
|
|
WORD flags; /* 0c Module flags */
|
|
WORD dgroup; /* 0e Logical segment for DGROUP */
|
|
WORD heap_size; /* 10 Initial heap size */
|
|
WORD stack_size; /* 12 Initial stack size */
|
|
WORD ip; /* 14 Initial ip */
|
|
WORD cs; /* 16 Initial cs (logical segment) */
|
|
WORD sp; /* 18 Initial stack pointer */
|
|
WORD ss; /* 1a Initial ss (logical segment) */
|
|
WORD seg_count; /* 1c Number of segments in segment table */
|
|
WORD modref_count; /* 1e Number of module references */
|
|
WORD nrname_size; /* 20 Size of non-resident names table */
|
|
WORD seg_table; /* 22 Near ptr to segment table */
|
|
WORD res_table; /* 24 Near ptr to resource table */
|
|
WORD name_table; /* 26 Near ptr to resident names table */
|
|
WORD modref_table; /* 28 Near ptr to module reference table */
|
|
WORD import_table; /* 2a Near ptr to imported names table */
|
|
DWORD nrname_fpos; /* 2c File offset of non-resident names table */
|
|
WORD moveable_entries; /* 30 Number of moveable entries in entry table*/
|
|
WORD alignment; /* 32 Alignment shift count */
|
|
WORD truetype; /* 34 Set to 2 if TrueType font */
|
|
BYTE os_flags; /* 36 Operating system flags */
|
|
BYTE misc_flags; /* 37 Misc. flags */
|
|
HANDLE16 dlls_to_init; /* 38 List of DLLs to initialize */
|
|
HANDLE16 nrname_handle; /* 3a Handle to non-resident name table */
|
|
WORD min_swap_area; /* 3c Min. swap area size */
|
|
WORD expected_version; /* 3e Expected Windows version */
|
|
/* From here, these are extra fields not present in normal Windows */
|
|
HMODULE32 module32; /* 40 PE module handle for Win32 modules */
|
|
HMODULE16 self; /* 44 Handle for this module */
|
|
WORD self_loading_sel; /* 46 Selector used for self-loading apps. */
|
|
struct _DOSTASK *lpDosTask;
|
|
LPVOID dos_image; /* pointer to DOS memory (for DOS apps) */
|
|
} NE_MODULE;
|
|
|
|
|
|
/* In-memory segment table */
|
|
typedef struct
|
|
{
|
|
WORD filepos; /* Position in file, in sectors */
|
|
WORD size; /* Segment size on disk */
|
|
WORD flags; /* Segment flags */
|
|
WORD minsize; /* Min. size of segment in memory */
|
|
HANDLE16 selector; /* Selector of segment in memory */
|
|
} SEGTABLEENTRY;
|
|
|
|
|
|
/* Self-loading modules contain this structure in their first segment */
|
|
|
|
#pragma pack(1)
|
|
|
|
typedef struct
|
|
{
|
|
WORD version; /* Must be 0xA0 */
|
|
WORD reserved;
|
|
FARPROC16 BootApp; /* startup procedure */
|
|
FARPROC16 LoadAppSeg; /* procedure to load a segment */
|
|
FARPROC16 reserved2;
|
|
FARPROC16 MyAlloc; /* memory allocation procedure,
|
|
* wine must write this field */
|
|
FARPROC16 EntryAddrProc;
|
|
FARPROC16 ExitProc; /* exit procedure */
|
|
WORD reserved3[4];
|
|
FARPROC16 SetOwner; /* Set Owner procedure, exported by wine */
|
|
} SELFLOADHEADER;
|
|
|
|
/* Parameters for LoadModule() */
|
|
typedef struct
|
|
{
|
|
HGLOBAL16 hEnvironment; /* Environment segment */
|
|
SEGPTR cmdLine WINE_PACKED; /* Command-line */
|
|
SEGPTR showCmd WINE_PACKED; /* Code for ShowWindow() */
|
|
SEGPTR reserved WINE_PACKED;
|
|
} LOADPARAMS;
|
|
|
|
typedef struct
|
|
{
|
|
LPSTR lpEnvAddress;
|
|
LPSTR lpCmdLine;
|
|
UINT16 *lpCmdShow;
|
|
DWORD dwReserved;
|
|
} LOADPARAMS32;
|
|
|
|
#pragma pack(4)
|
|
|
|
/* internal representation of 32bit modules. per process. */
|
|
typedef enum { MODULE32_PE=1, MODULE32_ELF /* ,... */ } MODULE32_TYPE;
|
|
typedef struct _wine_modref
|
|
{
|
|
struct _wine_modref *next;
|
|
MODULE32_TYPE type;
|
|
union {
|
|
PE_MODREF pe;
|
|
/* ELF_MODREF elf; */
|
|
} binfmt;
|
|
|
|
HMODULE32 module;
|
|
|
|
char *modname;
|
|
char *shortname;
|
|
char *longname;
|
|
} WINE_MODREF;
|
|
|
|
/* Resource types */
|
|
typedef struct resource_typeinfo_s NE_TYPEINFO;
|
|
typedef struct resource_nameinfo_s NE_NAMEINFO;
|
|
|
|
#define NE_SEG_TABLE(pModule) \
|
|
((SEGTABLEENTRY *)((char *)(pModule) + (pModule)->seg_table))
|
|
|
|
#define NE_MODULE_TABLE(pModule) \
|
|
((WORD *)((char *)(pModule) + (pModule)->modref_table))
|
|
|
|
#define NE_MODULE_NAME(pModule) \
|
|
(((OFSTRUCT *)((char*)(pModule) + (pModule)->fileinfo))->szPathName)
|
|
|
|
/* module.c */
|
|
extern FARPROC32 MODULE_GetProcAddress32( struct _PDB32*pdb,HMODULE32 hModule,LPCSTR function );
|
|
extern WINE_MODREF *MODULE32_LookupHMODULE( struct _PDB32 *process, HMODULE32 hModule );
|
|
extern HMODULE32 MODULE_FindModule32( struct _PDB32 *process, LPCSTR path );
|
|
extern HMODULE32 MODULE_CreateDummyModule( const OFSTRUCT *ofs );
|
|
extern FARPROC16 MODULE_GetWndProcEntry16( const char *name );
|
|
extern FARPROC16 WINAPI WIN32_GetProcAddress16( HMODULE32 hmodule, LPCSTR name );
|
|
|
|
/* loader/ne/module.c */
|
|
extern NE_MODULE *NE_GetPtr( HMODULE16 hModule );
|
|
extern void NE_DumpModule( HMODULE16 hModule );
|
|
extern void NE_WalkModules(void);
|
|
extern void NE_RegisterModule( NE_MODULE *pModule );
|
|
extern WORD NE_GetOrdinal( HMODULE16 hModule, const char *name );
|
|
extern FARPROC16 NE_GetEntryPoint( HMODULE16 hModule, WORD ordinal );
|
|
extern BOOL16 NE_SetEntryPoint( HMODULE16 hModule, WORD ordinal, WORD offset );
|
|
extern int NE_OpenFile( NE_MODULE *pModule );
|
|
extern HINSTANCE16 NE_LoadModule( LPCSTR name, HINSTANCE16 *hPrevInstance,
|
|
BOOL32 implicit, BOOL32 lib_only );
|
|
|
|
/* loader/ne/resource.c */
|
|
extern HGLOBAL16 WINAPI NE_DefResourceHandler(HGLOBAL16,HMODULE16,HRSRC16);
|
|
extern BOOL32 NE_InitResourceHandler( HMODULE16 hModule );
|
|
|
|
/* loader/ne/segment.c */
|
|
extern BOOL32 NE_LoadSegment( NE_MODULE *pModule, WORD segnum );
|
|
extern BOOL32 NE_LoadAllSegments( NE_MODULE *pModule );
|
|
extern void NE_FixupPrologs( NE_MODULE *pModule );
|
|
extern void NE_InitializeDLLs( HMODULE16 hModule );
|
|
extern BOOL32 NE_CreateSegments( NE_MODULE *pModule );
|
|
extern HINSTANCE16 NE_CreateInstance( NE_MODULE *pModule, HINSTANCE16 *prev,
|
|
BOOL32 lib_only );
|
|
|
|
/* if1632/builtin.c */
|
|
extern BOOL32 BUILTIN_Init(void);
|
|
extern HMODULE16 BUILTIN_LoadModule( LPCSTR name, BOOL32 force );
|
|
extern LPCSTR BUILTIN_GetEntryPoint16( WORD cs, WORD ip, WORD *pOrd );
|
|
extern BOOL32 BUILTIN_ParseDLLOptions( const char *str );
|
|
extern void BUILTIN_PrintDLLs(void);
|
|
|
|
/* relay32/builtin.c */
|
|
extern HMODULE32 BUILTIN32_LoadModule( LPCSTR name, BOOL32 force,
|
|
struct _PDB32 *process );
|
|
|
|
/* if1632/builtin.c */
|
|
extern HMODULE16 (*fnBUILTIN_LoadModule)(LPCSTR name, BOOL32 force);
|
|
|
|
#endif /* __WINE_MODULE_H */
|