Release 980927
Sun Sep 27 14:25:38 1998 Petter Reinholdtsen <pere@td.org.uit.no>
* [files/drive.c]
Make sure GetDriveType32A() handles param NULL. Added some
doc on function.
Sun Sep 27 14:07:26 1998 Huw D M Davies <daviesh@abacus.physics.ox.ac.uk>
* [controls/edit.c] [windows/win.c]
Don't call SetWindowLong() in EDIT_WM_NCREATE.
Fix SetWindowLong(GWL_[EX]STYLE) to work for 16bit windows. Remove
UpdateWindow() call.
Sun Sep 27 13:41:22 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [scheduler/*.c] [server/event.c] [server/mutex.c]
[server/semaphore.c]
Implemented server-side synchronisation objects.
Sun Sep 27 01:13:35 1998 Alex Priem <alexp@sci.kun.nl>
* [dlls/comctl32/treeview.c] [include/treeview.h] [include/comctl.h]
Treeview implementation.
* [dlls/comctl32/trackbar.c] [include/trackbar.h]
Trackbar implementation.
Sat Sep 26 20:49:13 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [if1632/thunk.c] [tools/build.c] [win32/kernel32.c]
Bugfix: several problems with flat thunks fixed.
* [memory/selector.c]
Bugfix: IsBad...Ptr16 didn't work for limit_in_pages segments.
* [scheduler/thread.c]
Bugfix: CreateThread: Allow id parameter == NULL.
* [objects/gdiobj.c]
Bugfix: IsGDIObject: Return correct object type for stock objects.
* [msdos/dpmi.c]
Bugfix: fixed typo in INT_DoRealModeInt.
* [msdos/int21.c]
Bugfix: int21 READ *must* use WIN16_hread, not _hread16.
* [if1632/kernel.spec] [if1632/dummy.c] [if1632/thunk.c]
[loader/ne/module.c] [scheduler/event.c] [scheduler/synchro.c]
[scheduler/thread.c] [win32/kernel32.c] [win32/ordinals.c]
Added names/stubs for all undocumented KERNEL routines (Win95).
Added the following undoc. 16-bit equivalents to Win32 routines:
KERNEL.441-443,449-453,456-462,471-476,479-486,488.
Added stubs for some other KERNEL routines.
* [memory/heap.c] [memory/global.c] [include/global.h]
Implemented Local32... 32-bit local heap routines (KERNEL.208-215, 229).
* [miscemu/instr.c] [loader/module.c] [include/module.h]
Implemented __GP fault handling and HasGPHandler (KERNEL.338).
* [misc/error.c]
Implemented LogParamErrorRegs (KERNEL.327).
* [loader/task.c] [include/windows.h]
Implemented GetCodeInfo (KERNEL.104).
* [loader/task.c] [scheduler/thread.c] [include/thread.h]
Implemented [GS]etThreadQueue and [GS]etFastQueue (KERNEL.463/4, 624/5).
* [if1632/gdi.spec] [objects/dc.c] [objects/dib.c]
[objects/bitmap.c] [include/windows.h]
Bugfix: fixed wrong parameter for CreateDIBSection16.
Added [GS]etDIBColorTable16, stub for GetBoundsRect16.
Partially implemented BITMAP_GetObject16 for DIBs.
* [if1632/gdi.spec] [relay32/gdi32.spec] [objects/palette.c]
Added some GDI stubs.
* [if1632/Makefile.in] [if1632/display.spec] [if1632/mouse.spec]
[if1632/keyboard.spec] [if1632/builtin.c] [windows/keyboard.c]
Added some stubs for Win16 drivers: KEYBOARD, MOUSE, DISPLAY.
* [if1632/wprocs.spec] [msdos/vxd.c]
Added some stubs for VxDs: VMM, ConfigMG, TimerAPI.
* [msdos/int2f.c]
Added some stubs for real-mode network drivers.
Sat Sep 26 18:18:18 1998 Marcus Meissner <marcus@jet.franken.de>
* [configure.in]
Merged in some more of the FreeBSD ports/emulators/wine patches.
(Maintainer(s) of this port: You can just submit these
patches to Alexandre directly.)
* [loader/pe_image.c]
Check filesize of image against size derived from header
to spot truncated executeables without crashing.
* [files/directory.c]
Set envvar "COMSPEC". One win32(!!) program crashes without it.
* [multimedia/mmio.c]
Added mmioSetInfo32.
* [include/file.h]
Return STD_ERROR_HANDLE for AUX and PRT dos handles.
* [loader/module.c]
Handle executeables with spaces in their names a bit better in
CreateProcess.
* [relay32/msvfw32.spec][if1632/msvideo.spec][multimedia/msvideo.c][include/vfw.h]
Started on MS Video support (can load Win32 ICMs).
* [tools/testrun]
A bit smarter use of ps.
* [memory/virtual.c]
Report PAGE_GUARDed pages as PAGE_PROTECTED (AutoCAD LT R17 fails
without that check (since Win95 doesn't know about PAGE_GUARD)).
Sat Sep 26 15:04:05 1998 Ove Kaaven <ovek@arcticnet.no>
* [include/miscemu.h] [if1632/builtin.c] [loader/task.c]
[miscemu/instr.c] [msdos/dpmi.c] [msdos/int21.c]
[msdos/interrupts.c] [windows/user.c]
INT_[S|G]etHandler was renamed to INT_[S|G]etPMHandler.
Added handlers to deal with real-mode interrupts; DOS
programs are now able to hook real-mode interrupts.
* [loader/dos/module.c] [msdos/dosmem.c] [msdos/int21.c]
Moved real-mode interrupt table initialization to
msdos/dosmem.c, and made new V86 tasks get a full copy
of the existing "system memory" instead of almost empty
space. Misc fixes.
* [include/dosexe.h] [loader/dos/module.c] [msdos/dpmi.c]
[msdos/int2f.c]
First shot at letting DOS programs start up DPMI (but DPMI
is still disabled for DOS programs, for pkunzip's sake).
* [include/debugger.h] [debugger/break.c] [debugger/dbg.y]
[debugger/registers.c] [debugger/memory.c] [debugger/info.c]
[loader/dos/dosvm.c]
First shot at making Wine's debugger work for DOS programs.
The -debug flag works, as do "nexti" and "stepi".
Sat Sep 26 13:13:13 1998 Juergen Schmied <juergen.schmied@metronet.de>
* [dlls/shell32/dataobject.c]
New classes IEnumFORMATETC implemented, IDataObject stubs.
* [dlls/shell32/*.*][relay32/shell32.spec]
Bugfixes.
New: ICM_InsertItem(), ILCreateFromPath().
Implemented: ILCloneFirst().
Stubs: ILIsEqual(), ILFindChild(), SHLogILFromFSIL(),
PathMatchSpec(), PathIsExe().
Changed: ILGetSize(), _ILIsDesktop(), PathCombine().
* [include/shlobj.h]
New SHLGUID's
New structures: DVTARGETDEVICE32, STGMEDIUM32, FORMATETC32,
CLIPFORMAT32.
New interfaces: IEnumFORMATETC, IDataObject, ICommDlgBrowser
IDockingWindowFrame, IServiceProvider.
* [dlls/shell32/folders.c]
Stubs for IShellLink.
* [loader/resource.c]
Small fixes.
* [misc/crtdll.c][relay32/crtdll.spec]
New __dllonexit().
* [windows/message.c]
SendNotifyMessageA, SendMessageCallBack32A half implemented.
* [controls/edit.c]
EDIT_WM_SetText set EF_UPDATE flag not for ES_MULTILINE.
* [files/file.c]
Handling of fileposition fixed.
Fri Sep 25 18:13:30 1998 Patrik Stridvall <ps@leissner.se>
* [include/windows.h] [include/wintypes.h]
[ole/ole2nls.h] [relay32/kernel32.spec]
Implemented EnumDateFormats and EnumTimeFormats.
Only adds US English support.
* [Makefile.in] [configure.in]
[dlls/Makefile.in] [dlls/psapi/Makefile.in]
[dlls/psapi/psapi_main.c]
New files to implement stubs for PSAPI.DLL (NT only).
* [relay32/Makefile.in] [relay32/builtin32.c]
[relay32/psapi.spec]
New spec file for PSAPI.DLL (NT only).
* [scheduler/handle.c]
HANDLE_GetObjPtr should only interpret the pseudo handles as the
current thread or the current process if a thread or a process is
requested.
* [include/winversion.h] [misc/version.c]
Adds the global function VERSION_GetVersion() so functions can
have different behavior depending on the -winver flag.
* [include/oledlg.h] [ole/oledlg.c]
Minor fixes.
* [windows/winproc.c]
Minor changes.
* [include/imm.h] [misc/imm.c]
Now returns correct values under both Windows 95 and NT 4.0.
Thu Sep 24 22:11:44 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [configure.in] [include/acconfig.h] [include/thread.h]
[scheduler/sysdeps.c]
Autoconfig test for non-reentrant libc.
Wed Sep 23 19:52:12 1998 Matthew Becker <mbecker@glasscity.net>
* [*/*.c]
Miscellaneous documentation updates and debugging output
standardizations.
* [objects/clipping.c]
Added ExtSelectClipRgn.
Wed Sep 23 00:03:28 EDT 1998 Pete Ratzlaff <pratzlaff@cfa.harvard.edu>
* [include/windows.h] [if1632/user.spec] [relay32/user32.spec]
[windows/keyboard.c]
Added, marginally implemented, GetKeyboardLayoutName().
Only returns US English keyboard name.
Tue Sep 22 16:32:41 1998 Marcel Baur <mbaur@iiic.ethz.ch>
* [programs/control/*]
New Winelib application.
Mon Sep 21 00:29:18 1998 Peter Hunnisett <hunnise@nortel.ca>
* [include/dplay.h][multimedia/dplay.c][ole/compobj.c]
Added all DirectPlayLobby interfaces and enhanced DirectPlay
and DirectPlayLobby support. Still not all that much. Useful
enough if you just need to start a program, don't try any
real dplay/lobby stuff.
* [documentation/status/directplay]
Added a very little bit.
* [graphics/ddraw.c]
- Call to SetWindowLong32A wasn't working because there was no
memory set aside when the window class was registered.
- Fixed some xlib reference counting and change the behaviour
of DirectDrawSurface3_SetPalette to mimic observed behaviour
(palette is associated will all backbuffers)
- Also stored all palette colour fields and spit back our saved
colour fields rather than query X for them.
- Added plenty of AddRef and Release traces.
- Added Xlib support for using -desktop option.
- Fixed Xlib message handling. Messages weren't being passed to
the application. Fixes mouse movements in some xlib DDraw games.
- Added a few stubs.
* [windows/win.c][include/winerror.h]
Fixed up some error handling in WIN_SetWindowLong. SetLastError
wasn't being used. Could cause problems with 0 return codes.
Added new error in winerror (1400).
* [AUTHORS] [include/authors.h]
Added myself as a Wine author.
Sun Sep 20 21:22:44 1998 Alexander Larsson <alla@lysator.liu.se>
* [loader/module.c]
Changed GetModuleFileName32A so that is returns the
long version of the filename. Note that just the name
is long, not the directories.
Sat Sep 19 20:05:30 1998 Per Ångström <pang@mind.nu>
* [controls/menu.c]
Made a couple of fixes to make life easier for applications that alter
their menus at runtime.
* [windows/defdlg.c]
Removed the cast of the return value from dialog procedures to a 16-bit
bool. The return value needs to retain all its 32 bits, since it is not
always a bool, such as when responding to the WM_NCHITTEST message.
Fri Sep 18 11:30:38 1998 Sergey Turchanov <turchanov@usa.net>
* [loader/resource.c]
Fixed very funny bug (though gravely affecting further excecution)
with FindResource[Ex]32 functions.
* [include/multimon.h] [windows/multimon.c] [relay32/user32.spec]
[include/windows.h] [windows/sysmetrics.c]
Default implementation for Multimonitor API.
* [include/windows.h] [windows/winpos.c]
Fixed incorrect declaration (and behaviour) of GetWindowRect32.
Wed Sep 16 10:21:15 1998 Gerard Patel <G.Patel@Wanadoo.fr>
* [controls/edit.c]
Fixed EDIT_EM_GetLine to use correctly length of lines.
Tue Sep 15 20:40:16 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [misc/tweak.c][include/tweak.h][controls/menu.c]
Replaced the tweak graphic routines by calls to DrawEdge32().
* [misc/tweak.c][include/tweak.h][documentation/win95look]
[wine.ini][*/*]
Changed "look and feel" selection. Allows Win3.1, Win95 and
Win98 (no GUI code implemented) look and feel.
* [dlls/comctl32/header.c][include/header.h][include/commctrl.h]
Started callback item support and did some minor improvements.
* [dlls/comctl32/imagelist.c]
Fixed bug in transparent image display.
ImageList_GetIcon is still buggy :-(
* [dlls/comctl32/toolbar.c]
Fixed button drawing (partial hack).
* [dlls/comctl32/commctrl.c]
Fixed MenuHelp().
* [controls/button.c]
Added 3d effect for groupbox.
* [windows/msgbox.c]
Added font support for message boxes.
* [windows/nonclient.c]
Fixed window moving bug.
* [dlls/comctl32/*.c]
Various improvements.
* [dlls/comctl32/listview.c][dlls/comctl32/rebar.c]
[include/commctrl.h]
More messages.
* [windows/syscolor.c][include/windows.h]
Introduced new Win98 system colors.
Tue Sep 15 18:29:45 1998 Wesley Filardo <eightknots@aol.com>
* [files/profile.c]
Added support in PROFILE_LoadWineIni for -config option
* [misc/main.c] [include/options.h]
Added -config option.
Tue Sep 15 18:22:26 1998 Petter Reinholdtsen <pere@td.org.uit.no>
* [documentation/Makefile.in]
Make sure directory exists before installing into it.
Tue Sep 15 01:47:33 1998 Pablo Saratxaga <pablo.sarachaga@ping.be>
* [ole/nls/*] [ole/ole2nls.c] [include/winnls.h]
Fixed a few errors and completed some NLS files.
Mon Sep 14 01:23:45 1998 Joseph Pranevich <knight@baltimore.wwaves.com>
* [include/miscemu.h] [msdos/interrupts.c]
Removed a compilation warning, added INT 25 to the list of interrupts
callable from DOS applications, added a debug message when unsupported
interrupts are used.
Sun Sep 13 19:55:22 1998 Lawson Whitney <lawson_whitney@juno.com>
* [if1632/relay.c]
CallProcEx32W should not reverse arguments.
Sun Aug 17 21:18:12 1998 Eric Pouech <eric.pouech@lemel.fr>
* [multimedia/midi.c] [multimedia/init.c] [multimedia/mmsys.c]
[include/multimedia.h] [include/mmsystem.h]
[multimedia/Makefile.in] [multimedia/midipatch.c]
[if1632/multimedia.spec]
Made MIDI input and output functional on OSS capable systems.
* [multimedia/timer.c]
Changes to trigger callbacks at the accurate pace even when
fake timers are used.
diff --git a/loader/dos/Makefile.in b/loader/dos/Makefile.in
index 257425d..20f7f9f 100644
--- a/loader/dos/Makefile.in
+++ b/loader/dos/Makefile.in
@@ -14,7 +14,7 @@
all: $(MODULE).o $(PROGRAMS)
dosmod: dosmod.c
- $(CC) $(ALLCFLAGS) -o dosmod dosmod.c
+ $(CC) $(ALLCFLAGS) -o dosmod $(SRCDIR)/dosmod.c
@MAKE_RULES@
diff --git a/loader/dos/dosvm.c b/loader/dos/dosvm.c
index 9b4abb8..2223a08 100644
--- a/loader/dos/dosvm.c
+++ b/loader/dos/dosvm.c
@@ -91,8 +91,9 @@
case VM86_SIGNAL:
printf("Trapped signal\n");
ret=-1; break;
- case VM86_UNKNOWN:
+ case VM86_UNKNOWN: /* unhandled GPF */
DOSVM_Dump(lpDosTask);
+ ctx_debug(SIGSEGV,&context);
break;
case VM86_INTx:
TRACE(int,"DOS EXE calls INT %02x with AX=%04lx\n",VM86_ARG(lpDosTask->fn),context.Eax);
@@ -102,7 +103,8 @@
case VM86_PICRETURN:
printf("Trapped due to pending PIC request\n"); break;
case VM86_TRAP:
- printf("Trapped debug request\n"); break;
+ ctx_debug(SIGTRAP,&context);
+ break;
default:
DOSVM_Dump(lpDosTask);
}
diff --git a/loader/dos/module.c b/loader/dos/module.c
index 2494135..c0f7e85 100644
--- a/loader/dos/module.c
+++ b/loader/dos/module.c
@@ -19,12 +19,14 @@
#include "winbase.h"
#include "module.h"
#include "task.h"
+#include "selectors.h"
#include "file.h"
#include "ldt.h"
#include "process.h"
#include "miscemu.h"
#include "debug.h"
#include "dosexe.h"
+#include "options.h"
#ifdef MZ_SUPPORTED
@@ -36,35 +38,12 @@
#undef MZ_MAPSELF
#define BIOS_DATA_SEGMENT 0x40
-#define BIOS_SEGMENT BIOSSEG /* BIOSSEG is defined to 0xf000 in sys/vm86.h */
-#define STUB_SEGMENT BIOS_SEGMENT
#define START_OFFSET 0
#define PSP_SIZE 0x10
#define SEG16(ptr,seg) ((LPVOID)((BYTE*)ptr+((DWORD)(seg)<<4)))
#define SEGPTR16(ptr,segptr) ((LPVOID)((BYTE*)ptr+((DWORD)SELECTOROF(segptr)<<4)+OFFSETOF(segptr)))
-#define STUB(x) (0x90CF00CD|(x<<8)) /* INT x; IRET; NOP */
-
-static void MZ_InitSystem( LPVOID lpImage )
-{
- SEGPTR*isr=lpImage;
- DWORD*stub=SEG16(lpImage,STUB_SEGMENT);
- int x;
-
- /* initialize ISR table to make it point to INT stubs in BIOSSEG;
- Linux only sends INTs performed from or destined to BIOSSEG at us,
- if the int_revectored table is empty.
- This allows DOS programs to hook interrupts, as well as use their
- familiar retf tricks to call them... */
- /* (note that the hooking might not actually work since DOS3Call stuff
- isn't fully integrated with the DOS VM yet...) */
- TRACE(module,"Initializing interrupt vector table\n");
- for (x=0; x<256; x++) isr[x]=PTR_SEG_OFF_TO_SEGPTR(STUB_SEGMENT,x*4);
- TRACE(module,"Initializing interrupt stub table\n");
- for (x=0; x<256; x++) stub[x]=STUB(x);
-}
-
static void MZ_InitPSP( LPVOID lpPSP, LPCSTR cmdline, LPCSTR env )
{
PDB*psp=lpPSP;
@@ -87,6 +66,36 @@
/* FIXME: integrate the PDB stuff from Wine (loader/task.c) */
}
+static char enter_pm[]={
+ 0x50, /* pushw %ax */
+ 0x52, /* pushw %dx */
+ 0x55, /* pushw %bp */
+ 0x89,0xE5, /* movw %sp,%bp */
+/* get return CS */
+ 0x8B,0x56,0x08, /* movw 8(%bp),%dx */
+/* just call int 31 here to get into protected mode... */
+/* it'll check whether it was called from dpmi_seg... */
+ 0xCD,0x31, /* int 0x31 */
+/* fixup our stack; return address will be lost, but we won't worry quite yet */
+ 0x8E,0xD0, /* movw %ax,%ss */
+ 0x89,0xEC, /* movw %bp,%sp */
+/* set return CS */
+ 0x89,0x56,0x08, /* movw %dx,8(%bp) */
+ 0x5D, /* popw %bp */
+ 0x5A, /* popw %dx */
+ 0x58, /* popw %ax */
+ 0xCB /* retf */
+};
+
+static void MZ_InitDPMI( LPDOSTASK lpDosTask )
+{
+ LPBYTE start=DOSMEM_GetBlock(lpDosTask->hModule,sizeof(enter_pm),&(lpDosTask->dpmi_seg));
+
+ lpDosTask->dpmi_sel = SELECTOR_AllocBlock( start, sizeof(enter_pm), SEGMENT_CODE, FALSE, TRUE );
+
+ memcpy(start,enter_pm,sizeof(enter_pm));
+}
+
int MZ_InitMemory( LPDOSTASK lpDosTask, NE_MODULE *pModule )
{
int x;
@@ -118,10 +127,9 @@
pModule->dos_image=lpDosTask->img;
/* initialize the memory */
- MZ_InitSystem(lpDosTask->img);
TRACE(module,"Initializing DOS memory structures\n");
- /* FIXME: make DOSMEM_Init copy static dosmem memory into newly allocated shared memory */
DOSMEM_Init(lpDosTask->hModule);
+ MZ_InitDPMI(lpDosTask);
return 32;
}
@@ -195,7 +203,18 @@
}
}
+ /* initialize module variables */
+ pModule->cs=lpDosTask->load_seg+mz_header.e_cs;
+ pModule->ip=mz_header.e_ip;
+ pModule->ss=lpDosTask->load_seg+mz_header.e_ss;
+ pModule->sp=mz_header.e_sp;
+ pModule->self_loading_sel=lpDosTask->psp_seg;
+
+ TRACE(module,"entry point: %04x:%04x\n",pModule->cs,pModule->ip);
+
/* initialize vm86 struct */
+ /* note: this may be moved soon, to be able to remove VM86 from lpDosTask
+ (got tired of all those compiler warnings, and don't like the system dependency) */
memset(&lpDosTask->VM86,0,sizeof(lpDosTask->VM86));
lpDosTask->VM86.regs.cs=lpDosTask->load_seg+mz_header.e_cs;
lpDosTask->VM86.regs.eip=mz_header.e_ip;
@@ -210,7 +229,6 @@
int MZ_InitTask( LPDOSTASK lpDosTask )
{
- extern char * DEBUG_argv0;
int read_fd[2],write_fd[2];
pid_t child;
char *fname,*farg,arg[16],fproc[64],path[256],*fpath;
@@ -250,9 +268,13 @@
if ((errno==EINTR)||(errno==EAGAIN)) continue;
/* failure */
ERR(module,"dosmod has failed to initialize\n");
+ if (lpDosTask->mm_name[0]!=0) unlink(lpDosTask->mm_name);
return 0;
}
} while (0);
+ /* the child has now mmaped the temp file, it's now safe to unlink.
+ * do it here to avoid leaving a mess in /tmp if/when Wine crashes... */
+ if (lpDosTask->mm_name[0]!=0) unlink(lpDosTask->mm_name);
/* all systems are now go */
} else {
/* child process */
@@ -266,7 +288,7 @@
/* hmm, they didn't install properly */
execl("loader/dos/dosmod",fname,farg,NULL);
/* last resort, try to find it through argv[0] */
- fpath=strrchr(strcpy(path,DEBUG_argv0),'/');
+ fpath=strrchr(strcpy(path,Options.argv0),'/');
if (fpath) {
strcpy(fpath,"/loader/dos/dosmod");
execl(path,fname,farg,NULL);
@@ -323,11 +345,6 @@
return err;
}
err = MZ_InitTask( lpDosTask );
- if (lpDosTask->mm_name[0]!=0) {
- /* we unlink the temp file here to avoid leaving a mess in /tmp
- if/when Wine crashes; the mapping still remains open, though */
- unlink(lpDosTask->mm_name);
- }
if (err<32) {
MZ_KillModule( lpDosTask );
/* FIXME: cleanup hModule */
@@ -351,6 +368,8 @@
close(lpDosTask->read_pipe);
close(lpDosTask->write_pipe);
kill(lpDosTask->task,SIGTERM);
+ if (lpDosTask->dpmi_sel)
+ UnMapLS(PTR_SEG_OFF_TO_SEGPTR(lpDosTask->dpmi_sel,0));
}
int MZ_RunModule( LPDOSTASK lpDosTask )
diff --git a/loader/module.c b/loader/module.c
index 1bbe11a..1a4764a 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -456,12 +456,35 @@
if (lpApplicationName)
lstrcpyn32A(name, lpApplicationName, sizeof(name) - 4);
- else
- {
- char *ptr = strchr(lpCommandLine, ' ');
- int len = (ptr? ptr-lpCommandLine : strlen(lpCommandLine)) + 1;
- if (len > sizeof(name) - 4) len = sizeof(name) - 4;
- lstrcpyn32A(name, lpCommandLine, len);
+ else {
+ char *ptr;
+ int len;
+
+ /* Take care off .exes with spaces in their names */
+ ptr = strchr(lpCommandLine, ' ');
+ do {
+ len = (ptr? ptr-lpCommandLine : strlen(lpCommandLine)) + 1;
+ if (len > sizeof(name) - 4) len = sizeof(name) - 4;
+ lstrcpyn32A(name, lpCommandLine, len);
+ if (!strchr(name, '\\') && !strchr(name, '.'))
+ strcat(name, ".exe");
+ fprintf(stderr,"looking for: %s\n",name);
+ if (GetFileAttributes32A(name)!=-1)
+ break;
+ /* if there is a space and no file found yet, include the word
+ * up to the next space too. If there is no next space, just
+ * use the first word.
+ */
+ if (ptr) {
+ ptr = strchr(ptr+1, ' ');
+ } else {
+ ptr = strchr(lpCommandLine, ' ');
+ len = (ptr? ptr-lpCommandLine : strlen(lpCommandLine)) + 1;
+ if (len > sizeof(name) - 4) len = sizeof(name) - 4;
+ lstrcpyn32A(name, lpCommandLine, len);
+ break;
+ }
+ } while (1);
}
if (!strchr(name, '\\') && !strchr(name, '.'))
@@ -613,14 +636,22 @@
DWORD size /* [in] size of filenamebuffer */
) {
WINE_MODREF *wm = MODULE32_LookupHMODULE(PROCESS_Current(),hModule);
+ char *p;
if (!wm) /* can happen on start up or the like */
return 0;
/* FIXME: we should probably get a real long name, but wm->longname
* is currently a UNIX filename!
+ * Use the module name to at least get the long version of the filename.
*/
lstrcpyn32A( lpFileName, wm->shortname, size );
+ if ( (p = strrchr( lpFileName, '\\' )) ) {
+ p++;
+ size -= (p-lpFileName);
+ lstrcpyn32A( p, wm->modname, size);
+ }
+
TRACE(module, "%s\n", lpFileName );
return strlen(lpFileName);
}
@@ -704,7 +735,7 @@
*/
BOOL32 WINAPI FreeLibrary32(HINSTANCE32 hLibModule)
{
- FIXME(module,"(%08x): stub\n", hLibModule);
+ FIXME(module,"(0x%08x): stub\n", hLibModule);
return TRUE; /* FIXME */
}
@@ -1008,3 +1039,44 @@
if (!wm || (wm->type != MODULE32_PE)) return (LPIMAGE_NT_HEADERS)0;
return PE_HEADER(wm->module);
}
+
+
+/***************************************************************************
+ * HasGPHandler (KERNEL.338)
+ */
+
+#pragma pack(1)
+typedef struct _GPHANDLERDEF
+{
+ WORD selector;
+ WORD rangeStart;
+ WORD rangeEnd;
+ WORD handler;
+} GPHANDLERDEF;
+#pragma pack(4)
+
+SEGPTR WINAPI HasGPHandler( SEGPTR address )
+{
+ HMODULE16 hModule;
+ SEGPTR gpPtr;
+ GPHANDLERDEF *gpHandler;
+
+ if ( (hModule = FarGetOwner( SELECTOROF(address) )) != 0
+ && (gpPtr = (SEGPTR)WIN32_GetProcAddress16( hModule, "__GP" )) != 0
+ && !IsBadReadPtr16( gpPtr, sizeof(GPHANDLERDEF) )
+ && (gpHandler = PTR_SEG_TO_LIN( gpPtr )) != NULL )
+ {
+ while (gpHandler->selector)
+ {
+ if ( SELECTOROF(address) == gpHandler->selector
+ && OFFSETOF(address) >= gpHandler->rangeStart
+ && OFFSETOF(address) < gpHandler->rangeEnd )
+ return PTR_SEG_OFF_TO_SEGPTR( gpHandler->selector,
+ gpHandler->handler );
+ gpHandler++;
+ }
+ }
+
+ return 0;
+}
+
diff --git a/loader/ne/module.c b/loader/ne/module.c
index fb3b168..3e193ac 100644
--- a/loader/ne/module.c
+++ b/loader/ne/module.c
@@ -83,9 +83,9 @@
DUMP( "Segment table:\n" );
pSeg = NE_SEG_TABLE( pModule );
for (i = 0; i < pModule->seg_count; i++, pSeg++)
- DUMP( "%02x: pos=%d size=%d flags=%04x minsize=%d sel=%04x\n",
+ DUMP( "%02x: pos=%d size=%d flags=%04x minsize=%d hSeg=%04x\n",
i + 1, pSeg->filepos, pSeg->size, pSeg->flags,
- pSeg->minsize, pSeg->selector );
+ pSeg->minsize, pSeg->hSeg );
/* Dump the resource table */
DUMP( "---\n" );
@@ -332,7 +332,7 @@
}
if (sel == 0xfe) sel = 0xffff; /* constant entry */
- else sel = (WORD)(DWORD)NE_SEG_TABLE(pModule)[sel-1].selector;
+ else sel = GlobalHandleToSel(NE_SEG_TABLE(pModule)[sel-1].hSeg);
if (sel==0xffff)
return (FARPROC16)PTR_SEG_OFF_TO_SEGPTR( sel, offset );
if (!fnSNOOP16_GetProcAddress16)
@@ -1170,3 +1170,17 @@
REGS_ENTRYPOINT(MapHInstSL) {
EAX_reg(context) = MapHModuleSL(EAX_reg(context));
}
+
+/***************************************************************************
+ * WIN16_MapHInstLS (KERNEL.472)
+ */
+VOID WINAPI WIN16_MapHInstLS( CONTEXT *context ) {
+ EAX_reg(context) = MapHModuleLS(EAX_reg(context));
+}
+
+/***************************************************************************
+ * WIN16_MapHInstSL (KERNEL.473)
+ */
+VOID WINAPI WIN16_MapHInstSL( CONTEXT *context ) {
+ EAX_reg(context) = MapHModuleSL(EAX_reg(context));
+}
diff --git a/loader/ne/segment.c b/loader/ne/segment.c
index 8215c30..31c8522 100644
--- a/loader/ne/segment.c
+++ b/loader/ne/segment.c
@@ -27,6 +27,7 @@
#include "debug.h"
#include "xmalloc.h"
+#define SEL(x) GlobalHandleToSel(x)
/***********************************************************************
* NE_GetRelocAddrName
@@ -73,27 +74,27 @@
if (!pSeg->filepos) return TRUE; /* No file image, just return */
fd = NE_OpenFile( pModule );
- TRACE(module, "Loading segment %d, selector=%04x, flags=%04x\n",
- segnum, pSeg->selector, pSeg->flags );
+ TRACE(module, "Loading segment %d, hSeg=%04x, flags=%04x\n",
+ segnum, pSeg->hSeg, pSeg->flags );
lseek( fd, pSeg->filepos << pModule->alignment, SEEK_SET );
if (pSeg->size) size = pSeg->size;
else if (pSeg->minsize) size = pSeg->minsize;
else size = 0x10000;
- mem = GlobalLock16(pSeg->selector);
+ mem = GlobalLock16(pSeg->hSeg);
if (pModule->flags & NE_FFLAGS_SELFLOAD && segnum > 1)
{
/* Implement self loading segments */
SELFLOADHEADER *selfloadheader;
STACK16FRAME *stack16Top;
DWORD oldstack;
- WORD oldselector, newselector;
+ WORD old_hSeg, new_hSeg;
THDB *thdb = THREAD_Current();
HFILE32 hf = FILE_DupUnixHandle( fd );
selfloadheader = (SELFLOADHEADER *)
- PTR_SEG_OFF_TO_LIN(pSegTable->selector,0);
+ PTR_SEG_OFF_TO_LIN(SEL(pSegTable->hSeg),0);
oldstack = thdb->cur_stack;
- oldselector = pSeg->selector;
+ old_hSeg = pSeg->hSeg;
thdb->cur_stack = PTR_SEG_OFF_TO_SEGPTR(pModule->self_loading_sel,
0xff00 - sizeof(*stack16Top));
stack16Top = (STACK16FRAME *)PTR_SEG_TO_LIN(thdb->cur_stack);
@@ -107,27 +108,27 @@
stack16Top->cs = 0;
TRACE(dll,"CallLoadAppSegProc(hmodule=0x%04x,hf=0x%04x,segnum=%d\n",
pModule->self,hf,segnum );
- newselector = Callbacks->CallLoadAppSegProc(selfloadheader->LoadAppSeg,
+ new_hSeg = Callbacks->CallLoadAppSegProc(selfloadheader->LoadAppSeg,
pModule->self,
HFILE32_TO_HFILE16(hf),
segnum );
- TRACE(dll,"Ret CallLoadAppSegProc: selector = 0x%04x\n",newselector);
+ TRACE(dll,"Ret CallLoadAppSegProc: hSeg = 0x%04x\n",new_hSeg);
_lclose32( hf );
- if (newselector != oldselector) {
+ if (SEL(new_hSeg) != SEL(old_hSeg)) {
/* Self loaders like creating their own selectors;
* they love asking for trouble to Wine developers
*/
if (segnum == pModule->dgroup) {
- memcpy(PTR_SEG_OFF_TO_LIN(oldselector,0),
- PTR_SEG_OFF_TO_LIN(newselector,0),
+ memcpy(PTR_SEG_OFF_TO_LIN(SEL(old_hSeg),0),
+ PTR_SEG_OFF_TO_LIN(SEL(new_hSeg),0),
pSeg->minsize ? pSeg->minsize : 0x10000);
- FreeSelector(newselector);
- pSeg->selector = oldselector;
- TRACE(module, "New selector allocated for dgroup segment:Old=%d,New=%d\n",
- oldselector, newselector);
+ FreeSelector(SEL(new_hSeg));
+ pSeg->hSeg = old_hSeg;
+ TRACE(module, "New hSeg allocated for dgroup segment:Old=%d,New=%d\n",
+ old_hSeg, new_hSeg);
} else {
- FreeSelector(pSeg->selector);
- pSeg->selector = newselector;
+ FreeSelector(SEL(pSeg->hSeg));
+ pSeg->hSeg = new_hSeg;
}
}
@@ -166,14 +167,14 @@
read( fd, &count, sizeof(count) );
if (!count) return TRUE;
- TRACE(fixup, "Fixups for %.*s, segment %d, selector %04x\n",
+ TRACE(fixup, "Fixups for %.*s, segment %d, hSeg %04x\n",
*((BYTE *)pModule + pModule->name_table),
(char *)pModule + pModule->name_table + 1,
- segnum, pSeg->selector );
- TRACE(segment, "Fixups for %.*s, segment %d, selector %04x\n",
+ segnum, pSeg->hSeg );
+ TRACE(segment, "Fixups for %.*s, segment %d, hSeg %04x\n",
*((BYTE *)pModule + pModule->name_table),
(char *)pModule + pModule->name_table + 1,
- segnum, pSeg->selector );
+ segnum, pSeg->hSeg );
reloc_entries = (struct relocation_entry_s *)xmalloc(count * sizeof(struct relocation_entry_s));
if (read( fd, reloc_entries, count * sizeof(struct relocation_entry_s)) !=
@@ -268,7 +269,7 @@
}
else
{
- address = (FARPROC16)PTR_SEG_OFF_TO_SEGPTR( pSegTable[rep->target1-1].selector, rep->target2 );
+ address = (FARPROC16)PTR_SEG_OFF_TO_SEGPTR( SEL(pSegTable[rep->target1-1].hSeg), rep->target2 );
}
TRACE( fixup,"%d: %04x:%04x %s\n",
@@ -306,7 +307,7 @@
if (additive)
{
- sp = PTR_SEG_OFF_TO_LIN( pSeg->selector, offset );
+ sp = PTR_SEG_OFF_TO_LIN( SEL(pSeg->hSeg), offset );
TRACE( fixup," %04x:%04x\n", offset, *sp );
switch (rep->address_type & 0x7f)
{
@@ -335,7 +336,7 @@
{
do
{
- sp = PTR_SEG_OFF_TO_LIN( pSeg->selector, offset );
+ sp = PTR_SEG_OFF_TO_LIN( SEL(pSeg->hSeg), offset );
next_offset = *sp;
TRACE( fixup," %04x:%04x\n", offset, *sp );
switch (rep->address_type & 0x7f)
@@ -356,7 +357,7 @@
goto unknown;
}
if (next_offset == offset) break; /* avoid infinite loop */
- if (next_offset >= GlobalSize16(pSeg->selector)) break;
+ if (next_offset >= GlobalSize16(pSeg->hSeg)) break;
offset = next_offset;
} while (offset != 0xffff);
}
@@ -392,14 +393,14 @@
THDB *thdb = THREAD_Current();
HMODULE16 hselfload = GetModuleHandle16("WPROCS");
DWORD oldstack;
- WORD saved_dgroup = pSegTable[pModule->dgroup - 1].selector;
+ WORD saved_hSeg = pSegTable[pModule->dgroup - 1].hSeg;
TRACE(module, "%.*s is a self-loading module!\n",
*((BYTE*)pModule + pModule->name_table),
(char *)pModule + pModule->name_table + 1);
if (!NE_LoadSegment( pModule, 1 )) return FALSE;
selfloadheader = (SELFLOADHEADER *)
- PTR_SEG_OFF_TO_LIN(pSegTable->selector, 0);
+ PTR_SEG_OFF_TO_LIN(SEL(pSegTable->hSeg), 0);
selfloadheader->EntryAddrProc = NE_GetEntryPoint(hselfload,27);
selfloadheader->MyAlloc = NE_GetEntryPoint(hselfload,28);
selfloadheader->SetOwner = NE_GetEntryPoint(GetModuleHandle16("KERNEL"),403);
@@ -425,8 +426,8 @@
HFILE32_TO_HFILE16(hf));
TRACE(dll,"Return from CallBootAppProc\n");
_lclose32(hf);
- /* some BootApp procs overwrite the selector of dgroup */
- pSegTable[pModule->dgroup - 1].selector = saved_dgroup;
+ /* some BootApp procs overwrite the segment handle of dgroup */
+ pSegTable[pModule->dgroup - 1].hSeg = saved_hSeg;
thdb->cur_stack = oldstack;
/* FIXME
@@ -460,7 +461,7 @@
pSegTable = NE_SEG_TABLE(pModule);
if (pModule->flags & NE_FFLAGS_SINGLEDATA)
- dgroup = pSegTable[pModule->dgroup-1].selector;
+ dgroup = SEL(pSegTable[pModule->dgroup-1].hSeg);
TRACE(module, "(%04x)\n", pModule->self );
p = (BYTE *)pModule + pModule->entry_table;
@@ -491,10 +492,10 @@
*/
if (sel == 0xff) { /* moveable */
dsprintf(module, "(%02x) o %04x", p[3], *(WORD *)(p+4) );
- fixup_ptr = (char *)GET_SEL_BASE(pSegTable[p[3]-1].selector) + *(WORD *)(p + 4);
+ fixup_ptr = (char *)GET_SEL_BASE(SEL(pSegTable[p[3]-1].hSeg)) + *(WORD *)(p + 4);
} else { /* fixed */
dsprintf(module, "offset %04x", *(WORD *)(p+1) );
- fixup_ptr = (char *)GET_SEL_BASE(pSegTable[sel-1].selector) +
+ fixup_ptr = (char *)GET_SEL_BASE(SEL(pSegTable[sel-1].hSeg)) +
*(WORD *)(p + 1);
}
TRACE(module, "%s Signature: %02x %02x %02x,ff %x\n",
@@ -564,7 +565,7 @@
else /* DATA SINGLE DLL */
{
if (pModule->dgroup) {
- *ds = pSegTable[pModule->dgroup-1].selector;
+ *ds = SEL(pSegTable[pModule->dgroup-1].hSeg);
*heap = pModule->heap_size;
}
else /* hmm, DLL has no dgroup,
@@ -625,7 +626,7 @@
DS_reg(&context) = ds;
ES_reg(&context) = ds; /* who knows ... */
- CS_reg(&context) = pSegTable[pModule->cs-1].selector;
+ CS_reg(&context) = SEL(pSegTable[pModule->cs-1].hSeg);
EIP_reg(&context) = pModule->ip;
EBP_reg(&context) = OFFSETOF(THREAD_Current()->cur_stack)
+ (WORD)&((STACK16FRAME*)0)->bp;
@@ -733,13 +734,13 @@
}
pSegment = NE_SEG_TABLE( pModule ) + pModule->dgroup - 1;
- if (prev) *prev = pSegment->selector;
+ if (prev) *prev = SEL(pSegment->hSeg);
/* if it's a library, create a new instance only the first time */
- if (pSegment->selector)
+ if (pSegment->hSeg)
{
- if (pModule->flags & NE_FFLAGS_LIBMODULE) return pSegment->selector;
- if (lib_only) return pSegment->selector;
+ if (pModule->flags & NE_FFLAGS_LIBMODULE) return SEL(pSegment->hSeg);
+ if (lib_only) return SEL(pSegment->hSeg);
}
minsize = pSegment->minsize ? pSegment->minsize : 0x10000;
@@ -748,7 +749,7 @@
hNewInstance = GLOBAL_Alloc( GMEM_ZEROINIT | GMEM_FIXED, minsize,
pModule->self, FALSE, FALSE, FALSE );
if (!hNewInstance) return 0;
- pSegment->selector = hNewInstance;
+ pSegment->hSeg = hNewInstance;
pSegment->flags |= NE_SEGFLAGS_ALLOCATED;
return hNewInstance;
}
@@ -775,7 +776,7 @@
static WORD NE_Ne2MemFlags(WORD flags)
{
WORD memflags = 0;
-#if 0
+#if 1
if (flags & NE_SEGFLAGS_DISCARDABLE)
memflags |= GMEM_DISCARDABLE;
if (flags & NE_SEGFLAGS_MOVEABLE ||
@@ -788,8 +789,8 @@
memflags |= GMEM_ZEROINIT;
#else
memflags = GMEM_ZEROINIT | GMEM_FIXED;
- return memflags;
#endif
+ return memflags;
}
/***********************************************************************
@@ -820,12 +821,12 @@
if (i == pModule->ss) minsize += pModule->stack_size;
/* The DGROUP is allocated by NE_CreateInstance */
if (i == pModule->dgroup) continue;
- pSegment->selector = GLOBAL_Alloc( NE_Ne2MemFlags(pSegment->flags),
+ pSegment->hSeg = GLOBAL_Alloc( NE_Ne2MemFlags(pSegment->flags),
minsize, pModule->self,
!(pSegment->flags & NE_SEGFLAGS_DATA),
FALSE,
FALSE /*pSegment->flags & NE_SEGFLAGS_READONLY*/ );
- if (!pSegment->selector) return FALSE;
+ if (!pSegment->hSeg) return FALSE;
pSegment->flags |= NE_SEGFLAGS_ALLOCATED;
}
diff --git a/loader/pe_image.c b/loader/pe_image.c
index dd26b2b..942e5a3 100644
--- a/loader/pe_image.c
+++ b/loader/pe_image.c
@@ -474,8 +474,12 @@
*/
static HMODULE32 PE_LoadImage( HFILE32 hFile )
{
- HMODULE32 hModule;
- HANDLE32 mapping;
+ HMODULE32 hModule;
+ HANDLE32 mapping;
+ int i,rawsize = 0;
+ IMAGE_SECTION_HEADER *pe_sec;
+ BY_HANDLE_FILE_INFORMATION bhfi;
+
/* map the PE file somewhere */
mapping = CreateFileMapping32A( hFile, NULL, PAGE_READONLY | SEC_COMMIT,
@@ -519,6 +523,24 @@
}
goto error;
}
+ /* find out how large this executeable should be */
+ pe_sec = PE_SECTIONS(hModule);
+ for (i=0;i<PE_HEADER(hModule)->FileHeader.NumberOfSections;i++) {
+ if (pe_sec[i].Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA)
+ continue;
+ if (pe_sec[i].PointerToRawData+pe_sec[i].SizeOfRawData > rawsize)
+ rawsize = pe_sec[i].PointerToRawData+pe_sec[i].SizeOfRawData;
+ }
+ if (GetFileInformationByHandle(hFile,&bhfi)) {
+ /* FIXME: 64 bit */
+ if (bhfi.nFileSizeLow < rawsize) {
+ ERR(win32,"PE module is too small (header: %d, filesize: %d), probably truncated download?\n",rawsize,bhfi.nFileSizeLow);
+ goto error;
+ }
+ }
+ /* Else ... Hmm, we have opened it, so we should be able to get info?
+ * Anyway, don't care in this case
+ */
return hModule;
error:
diff --git a/loader/resource.c b/loader/resource.c
index 6d11b55..a873076 100644
--- a/loader/resource.c
+++ b/loader/resource.c
@@ -34,13 +34,13 @@
*/
HANDLE32 WINAPI FindResource32A( HMODULE32 hModule, LPCSTR name, LPCSTR type)
{
- return FindResourceEx32A(hModule,name,type,WINE_LanguageId);
+ return FindResourceEx32A(hModule,type,name,WINE_LanguageId);
}
/**********************************************************************
* FindResourceEx32A (KERNEL32.129)
*/
-HANDLE32 WINAPI FindResourceEx32A( HMODULE32 hModule, LPCSTR name, LPCSTR type,
+HANDLE32 WINAPI FindResourceEx32A( HMODULE32 hModule, LPCSTR type, LPCSTR name,
WORD lang
) {
LPWSTR xname,xtype;
@@ -54,7 +54,7 @@
xtype = HEAP_strdupAtoW( GetProcessHeap(), 0, type);
else
xtype = (LPWSTR)type;
- ret = FindResourceEx32W( hModule, xname, xtype, lang );
+ ret = FindResourceEx32W( hModule, xtype, xname, lang );
if (HIWORD((DWORD)name)) HeapFree( GetProcessHeap(), 0, xname );
if (HIWORD((DWORD)type)) HeapFree( GetProcessHeap(), 0, xtype );
return ret;
@@ -64,14 +64,14 @@
/**********************************************************************
* FindResourceEx32W (KERNEL32.130)
*/
-HRSRC32 WINAPI FindResourceEx32W( HMODULE32 hModule, LPCWSTR name,
- LPCWSTR type, WORD lang )
+HRSRC32 WINAPI FindResourceEx32W( HMODULE32 hModule, LPCWSTR type,
+ LPCWSTR name, WORD lang )
{ HRSRC32 ret;
WINE_MODREF *wm = MODULE32_LookupHMODULE(PROCESS_Current(),hModule);
HRSRC32 hrsrc;
- TRACE(resource, "module=%08x type=%s name=%s\n",
- hModule,
+ TRACE(resource, "module=%08x(%s) type=%s name=%s\n",
+ hModule, wm->modname,
debugres_w (type),
debugres_w (name));
@@ -85,7 +85,7 @@
case MODULE32_PE:
ret = PE_FindResourceEx32W(wm,name,type,lang);
if ( ret==0 )
- ERR(resource,"(0x%08lx(%s),%s not found!\n",hModule,wm->modname,debugres_w (name));
+ ERR(resource,"(0x%08x(%s),%s not found!\n",hModule,wm->modname,debugres_w (name));
return ret;
default:
ERR(module,"unknown module type %d\n",wm->type);
@@ -101,7 +101,7 @@
*/
HRSRC32 WINAPI FindResource32W(HINSTANCE32 hModule, LPCWSTR name, LPCWSTR type)
{
- return FindResourceEx32W(hModule,name,type,WINE_LanguageId);
+ return FindResourceEx32W(hModule,type,name,WINE_LanguageId);
}
@@ -457,7 +457,7 @@
}
FreeResource16( hmem );
- TRACE(resource,"'%s' copied !\n", buffer);
+ TRACE(resource,"'%s' loaded !\n", buffer);
return i;
}
@@ -507,7 +507,7 @@
#endif
}
- TRACE(resource,"'%s' copied !\n", (char *)buffer);
+ TRACE(resource,"%s loaded !\n", debugstr_w(buffer));
return i;
}
@@ -582,7 +582,7 @@
TRACE(resource, "instance = %08lx, id = %08lx, buffer = %p, length = %ld\n", (DWORD)instance, (DWORD)id, buffer, (DWORD)buflen);
/*FIXME: I am not sure about the '1' ... But I've only seen those entries*/
- hrsrc = FindResourceEx32W(instance,(LPWSTR)1,RT_MESSAGELIST32W,lang);
+ hrsrc = FindResourceEx32W(instance,RT_MESSAGELIST32W,(LPWSTR)1,lang);
if (!hrsrc) return 0;
hmem = LoadResource32( instance, hrsrc );
if (!hmem) return 0;
diff --git a/loader/task.c b/loader/task.c
index df06353..e55207e 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -290,8 +290,8 @@
CONTEXT context;
memset( &context, 0, sizeof(context) );
- CS_reg(&context) = pSegTable[pModule->cs - 1].selector;
- DS_reg(&context) = pSegTable[pModule->dgroup - 1].selector;
+ CS_reg(&context) = GlobalHandleToSel(pSegTable[pModule->cs - 1].hSeg);
+ DS_reg(&context) = GlobalHandleToSel(pSegTable[pModule->dgroup - 1].hSeg);
ES_reg(&context) = pTask->hPDB;
EIP_reg(&context) = pModule->ip;
EBX_reg(&context) = pModule->stack_size;
@@ -383,9 +383,9 @@
pTask->pdb.dispatcher[0] = 0x9a; /* ljmp */
PUT_DWORD(&pTask->pdb.dispatcher[1], (DWORD)NE_GetEntryPoint(
GetModuleHandle16("KERNEL"), 102 )); /* KERNEL.102 is DOS3Call() */
- pTask->pdb.savedint22 = INT_GetHandler( 0x22 );
- pTask->pdb.savedint23 = INT_GetHandler( 0x23 );
- pTask->pdb.savedint24 = INT_GetHandler( 0x24 );
+ pTask->pdb.savedint22 = INT_GetPMHandler( 0x22 );
+ pTask->pdb.savedint23 = INT_GetPMHandler( 0x23 );
+ pTask->pdb.savedint24 = INT_GetPMHandler( 0x24 );
pTask->pdb.fileHandlesPtr =
PTR_SEG_OFF_TO_SEGPTR( GlobalHandleToSel(pTask->hPDB),
(int)&((PDB *)0)->fileHandles );
@@ -1091,6 +1091,53 @@
return handle;
}
+/**********************************************************************
+ * GetCodeInfo (KERNEL.104)
+ */
+VOID WINAPI GetCodeInfo( FARPROC16 proc, SEGINFO *segInfo )
+{
+ BYTE *thunk = (BYTE *)PTR_SEG_TO_LIN( proc );
+ NE_MODULE *pModule = NULL;
+ SEGTABLEENTRY *pSeg = NULL;
+ WORD segNr;
+
+ /* proc is either a thunk, or else a pair of module handle
+ and segment number. In the first case, we also need to
+ extract module and segment number. */
+
+ if ((thunk[0] == 0xb8) && (thunk[3] == 0xea))
+ {
+ WORD selector = thunk[6] + (thunk[7] << 8);
+ pModule = NE_GetPtr( GlobalHandle16( selector ) );
+ pSeg = pModule? NE_SEG_TABLE( pModule ) : NULL;
+
+ if ( pModule )
+ for ( segNr = 0; segNr < pModule->seg_count; segNr++, pSeg++ )
+ if ( GlobalHandleToSel(pSeg->hSeg) == selector )
+ break;
+
+ if ( pModule && segNr >= pModule->seg_count )
+ pSeg = NULL;
+ }
+ else
+ {
+ pModule = NE_GetPtr( HIWORD( proc ) );
+ segNr = LOWORD( proc );
+
+ if ( pModule && segNr < pModule->seg_count )
+ pSeg = NE_SEG_TABLE( pModule ) + segNr;
+ }
+
+ /* fill in segment information */
+
+ segInfo->offSegment = pSeg? pSeg->filepos : 0;
+ segInfo->cbSegment = pSeg? pSeg->size : 0;
+ segInfo->flags = pSeg? pSeg->flags : 0;
+ segInfo->cbAlloc = pSeg? pSeg->minsize : 0;
+ segInfo->h = pSeg? pSeg->hSeg : 0;
+ segInfo->alignShift = pModule? pModule->alignment : 0;
+}
+
/**********************************************************************
* DefineHandleTable16 (KERNEL.94)
@@ -1133,6 +1180,56 @@
return pTask->hQueue;
}
+/***********************************************************************
+ * SetThreadQueue (KERNEL.463)
+ */
+HQUEUE16 WINAPI SetThreadQueue( DWORD thread, HQUEUE16 hQueue )
+{
+ THDB *thdb = THREAD_IdToTHDB( thread );
+ HQUEUE16 oldQueue = thdb? thdb->teb.queue : 0;
+
+ if ( thdb )
+ {
+ thdb->teb.queue = hQueue;
+
+ if ( GetTaskQueue( thdb->process->task ) == oldQueue )
+ SetTaskQueue( thdb->process->task, hQueue );
+ }
+
+ return oldQueue;
+}
+
+/***********************************************************************
+ * GetThreadQueue (KERNEL.464)
+ */
+HQUEUE16 WINAPI GetThreadQueue( DWORD thread )
+{
+ THDB *thdb = THREAD_IdToTHDB( thread );
+ return (HQUEUE16)(thdb? thdb->teb.queue : 0);
+}
+
+/***********************************************************************
+ * SetFastQueue (KERNEL.624)
+ */
+VOID WINAPI SetFastQueue( DWORD thread, HANDLE32 hQueue )
+{
+ THDB *thdb = THREAD_IdToTHDB( thread );
+ if ( thdb ) thdb->teb.queue = (HQUEUE16) hQueue;
+}
+
+/***********************************************************************
+ * GetFastQueue (KERNEL.625)
+ */
+HANDLE32 WINAPI GetFastQueue( void )
+{
+ THDB *thdb = THREAD_Current();
+ if (!thdb) return 0;
+
+ if (!(thdb->teb.queue))
+ FIXME( task, "(): should initialize thread-local queue, expect failure!\n" );
+
+ return (HANDLE32)thdb->teb.queue;
+}
/***********************************************************************
* SwitchStackTo (KERNEL.108)
