Release 980601 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.
diff --git a/if1632/thunk.c b/if1632/thunk.c index c4740d4..fec3b9e 100644 --- a/if1632/thunk.c +++ b/if1632/thunk.c
@@ -2,9 +2,9 @@ * Emulator thunks * * Copyright 1996, 1997 Alexandre Julliard + * Copyright 1998 Ulrich Weigand */ -#include <stdio.h> #include "windows.h" #include "callback.h" #include "resource.h" @@ -13,12 +13,14 @@ #include "heap.h" #include "hook.h" #include "module.h" +#include "process.h" #include "stackframe.h" #include "selectors.h" #include "task.h" #include "except.h" #include "win.h" #include "debug.h" +#include "flatthunk.h" /* List of the 16-bit callback functions. This list is used */ @@ -710,3 +712,238 @@ *pdwret = ret; return TRUE; } + + +/*********************************************************************** + * 16->32 Flat Thunk routines: + */ + +/*********************************************************************** + * ThunkConnect16 (KERNEL.651) + * Connects a 32bit and a 16bit thunkbuffer. + */ +UINT32 WINAPI ThunkConnect16( + LPSTR module16, /* [in] name of win16 dll */ + LPSTR module32, /* [in] name of win32 dll */ + HINSTANCE16 hInst16, /* [in] hInst of win16 dll */ + DWORD dwReason, /* [in] initialisation argument */ + struct ThunkDataCommon *TD, /* [in/out] thunkbuffer */ + LPSTR thunkfun32, /* [in] win32 thunkfunction */ + WORD CS /* [in] CS of win16 dll */ +) { + BOOL32 directionSL; + + if (!lstrncmp32A(TD->magic, "SL01", 4)) + { + directionSL = TRUE; + + TRACE(thunk, "SL01 thunk %s (%lx) -> %s (%s), Reason: %ld\n", + module16, (DWORD)TD, module32, thunkfun32, dwReason); + } + else if (!lstrncmp32A(TD->magic, "LS01", 4)) + { + directionSL = FALSE; + + TRACE(thunk, "LS01 thunk %s (%lx) <- %s (%s), Reason: %ld\n", + module16, (DWORD)TD, module32, thunkfun32, dwReason); + } + else + { + ERR(thunk, "Invalid magic %c%c%c%c\n", + TD->magic[0], TD->magic[1], TD->magic[2], TD->magic[3]); + return 0; + } + + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + if (directionSL) + { + struct ThunkDataSL16 *SL16 = (struct ThunkDataSL16 *)TD; + struct ThunkDataSL *SL = SL16->fpData; + + if (SL == NULL) + { + SL = HeapAlloc(GetProcessHeap(), 0, sizeof(*SL)); + + SL->common = SL16->common; + SL->flags1 = SL16->flags1; + SL->flags2 = SL16->flags2; + + SL->apiDB = PTR_SEG_TO_LIN(SL16->apiDatabase); + SL->targetDB = NULL; + + lstrcpyn32A(SL->pszDll16, module16, 255); + lstrcpyn32A(SL->pszDll32, module32, 255); + + /* We should create a SEGPTR to the ThunkDataSL, + but since the contents are not in the original format, + any access to this by 16-bit code would crash anyway. */ + SL16->spData = 0; + SL16->fpData = SL; + } + + + if (SL->flags2 & 0x80000000) + { + TRACE(thunk, "Preloading 32-bit library\n"); + LoadLibrary32A(module32); + } + } + else + { + /* nothing to do */ + } + break; + + case DLL_PROCESS_DETACH: + /* FIXME: cleanup */ + break; + } + + return 1; +} + + +/*********************************************************************** + * C16ThkSL (KERNEL.630) + */ + +void WINAPI C16ThkSL(CONTEXT *context) +{ + extern void CallFrom16_t_long_(void); + LPBYTE stub = PTR_SEG_TO_LIN(EAX_reg(context)), x = stub; + WORD cs, ds; + GET_CS(cs); + GET_DS(ds); + + /* We produce the following code: + * + * mov ax, __FLATDS + * mov es, ax + * movzx ecx, cx + * mov edx, es:[ecx + $EDX] + * push bp + * push edx + * call __FLATCS:CallFrom16_t_long_ + */ + + *x++ = 0xB8; *((WORD *)x)++ = ds; + *x++ = 0x8E; *x++ = 0xC0; + *x++ = 0x60; *x++ = 0x0F; *x++ = 0xB7; *x++ = 0xC9; + *x++ = 0x67; *x++ = 0x66; *x++ = 0x26; *x++ = 0x8B; + *x++ = 0x91; *((DWORD *)x)++ = EDX_reg(context); + + *x++ = 0x55; + *x++ = 0x66; *x++ = 0x52; + *x++ = 0x66; *x++ = 0x9A; *((DWORD *)x)++ = (DWORD)CallFrom16_t_long_; + *((WORD *)x)++ = cs; + + /* Jump to the stub code just created */ + IP_reg(context) = LOWORD(EAX_reg(context)); + CS_reg(context) = HIWORD(EAX_reg(context)); + + /* Since C16ThkSL got called by a jmp, we need to leave the + orginal return address on the stack */ + SP_reg(context) -= 4; +} + +/*********************************************************************** + * C16ThkSL01 (KERNEL.631) + */ + +void WINAPI C16ThkSL01(CONTEXT *context) +{ + LPBYTE stub = PTR_SEG_TO_LIN(EAX_reg(context)), x = stub; + + if (stub) + { + struct ThunkDataSL16 *SL16 = PTR_SEG_TO_LIN(EDX_reg(context)); + struct ThunkDataSL *td = SL16->fpData; + + extern void CallFrom16_t_long_(void); + DWORD procAddress = (DWORD)GetProcAddress16(GetModuleHandle16("KERNEL"), 631); + WORD cs; + GET_CS(cs); + + if (!td) + { + ERR(thunk, "ThunkConnect16 was not called!\n"); + return; + } + + TRACE(thunk, "Creating stub for ThunkDataSL %08lx\n", (DWORD)td); + + + /* We produce the following code: + * + * xor eax, eax + * mov edx, $td + * call C16ThkSL01 + * push bp + * push edx + * call __FLATCS:CallFrom16_t_long_ + */ + + *x++ = 0x66; *x++ = 0x33; *x++ = 0xC0; + *x++ = 0x66; *x++ = 0xBA; *((DWORD *)x)++ = (DWORD)td; + *x++ = 0x9A; *((DWORD *)x)++ = procAddress; + + *x++ = 0x55; + *x++ = 0x66; *x++ = 0x52; + *x++ = 0x66; *x++ = 0x9A; *((DWORD *)x)++ = (DWORD)CallFrom16_t_long_; + *((WORD *)x)++ = cs; + + /* Jump to the stub code just created */ + IP_reg(context) = LOWORD(EAX_reg(context)); + CS_reg(context) = HIWORD(EAX_reg(context)); + + /* Since C16ThkSL01 got called by a jmp, we need to leave the + orginal return address on the stack */ + SP_reg(context) -= 4; + } + else + { + struct ThunkDataSL *td = (struct ThunkDataSL *)EDX_reg(context); + DWORD targetNr = CX_reg(context) / 4; + struct SLTargetDB *tdb; + + TRACE(thunk, "Process %08lx calling target %ld of ThunkDataSL %08lx\n", + (DWORD)PROCESS_Current(), targetNr, (DWORD)td); + + for (tdb = td->targetDB; tdb; tdb = tdb->next) + if (tdb->process == PROCESS_Current()) + break; + + if (!tdb) + { + TRACE(thunk, "Loading 32-bit library %s\n", td->pszDll32); + LoadLibrary32A(td->pszDll32); + + for (tdb = td->targetDB; tdb; tdb = tdb->next) + if (tdb->process == PROCESS_Current()) + break; + } + + if (tdb) + { + EDX_reg(context) = tdb->targetTable[targetNr]; + + TRACE(thunk, "Call target is %08lx\n", EDX_reg(context)); + } + else + { + WORD *stack = PTR_SEG_OFF_TO_LIN(SS_reg(context), SP_reg(context)); + DX_reg(context) = HIWORD(td->apiDB[targetNr].errorReturnValue); + AX_reg(context) = LOWORD(td->apiDB[targetNr].errorReturnValue); + IP_reg(context) = stack[2]; + CS_reg(context) = stack[3]; + SP_reg(context) += td->apiDB[targetNr].nrArgBytes + 4; + + /* Win95 allows delayed loading of the 32-bit DLL. + We don't do that at the moment. */ + ERR(thunk, "Process %08lx did not ThunkConnect32 %s to %s\n", + (DWORD)PROCESS_Current(), td->pszDll32, td->pszDll16); + } + } +}