Release 980413
Sun Apr 12 12:22:23 1997 Andreas Mohr <100.30936@germany.net>
* [files/drive.c]
Fixed "no free space" problem with partition sizes between 1 and 2 GB
(cluster_sectors may not exceed 0x40).
* [windows/msgbox.c] [if1632/user.spec] [include/windows.h]
Implemented MessageBoxIndirect16, corrected MSGBOXPARAMS16.
* [loader/task.c]
DOS environment strings may never exceed 127 chars
-> truncate Unix environment strings if necessary.
Sun Apr 12 02:51:44 1998 Dimitrie O. Paun <dimi@mail.cs.toronto.edu>
* [files/*.c]
All fprintf statements were converted to appropriate debug
messages.
* [tools/find_debug_channels]
Updated comments at the beginning of the file.
Sat Apr 11 15:27:21 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [loader/module.c] [loader/task.c] [scheduler/process.c]
Moved some code around to prepare the ground for CreateProcess().
* [memory/environ.c] [loader/task.c]
Moved Win32 environment strings functions to environ.c.
Unified Win16 and Win32 environment management.
* [scheduler/handle.c] [scheduler/k32obj.c] [scheduler/*.c]
Implemented handle inheritance and DuplicateHandle().
* [scheduler/thread.c]
Create a 16-bit stack for all threads.
* [windows/dialog.c]
Implemented DIALOGEX resource format.
Fri Apr 10 20:21:51 1998 Marcus Meissner <marcus@mud.de>
* [configure.in][include/acconfig.h][*/*][multimedia/*]
Cleaned up the OSS detection stuff, added some more checks for
headerfiles/functions.
Removed a lot of OS specific #ifdefs.
Lots of dependend multimedia cleanups.
* [loader/pe_image.c]
Enhanced comment, added missing reference count increase.
* [ole/compobj.c]
Replaced broken StringFromGUID2 by working one.
* [misc/winsock.c]
SO_LINGER uses unsigned 16 bit in Win16 and Win32, but unsigned
int (32bit) for UNIX.
* [memory/global.c]
Allow realloc for lockcount 1 too.
Fri Apr 10 15:27:34 1998 Morten Welinder <terra@diku.dk>
* [graphics/x11drv/text.c]
Handle control characters in trace. Ignore terminating newline.
* [multimedia/init.c]
(MULTIMEDIA_Init): Correct allocations.
* [tools/examine-relay]
Tidy up.
* [windows/syscolor.c]
Change highlight colour from lightblue to lightgray. This
looks correct for menus.
Fri Apr 10 01:49:58 1998 Douglas Ridgway <ridgway@winehq.com>
* [configure.in] [Make.rules.in]
Add check for c2man before using it.
Fri Apr 10 02:59:21 1998 Douglas Ridgway <ridgway@winehq.com>
* [DEVELOPERS-HINTS]
Simple description of adding API calls.
* [include/wintypes.h] [include/windows.h]
Get rid of Winelib16, avoid declaring some illegal functions in
Winelib, add prototypes for some enhanced metafile functions, fix
GetTextExtentPoint32 declarations.
* [relay32/gdi32.spec] [objects/enhmetafile.c]
Cosmetic and functional improvements.
* [include/wincon.h] [programs/view/*]
Fixes, improved compatibility with native compilers.
Thu Apr 9 15:48:49 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [win32/kernel32.c]
Implemented FT_Thunk / FT_Prolog / FT_Exit / FT_PrologPrime.
Fixed Common32ThkLS thunk function.
* [tools/build.c] [relay32/relay386.c] [if1632/relay.c]
Changed relay code to allow register functions to modify stack layout.
* [memory/selector.c]
Implemented AllocMappedBuffer / FreeMappedBuffer.
* [relay32/kernel32.spec] [if1632/kernel.spec] [win32/ordinals.c]
Added names for undocumented functions.
* [loader/module.c]
Bugfix: LoadLibrary16 should *not* silently load 32-bit DLL.
Thu Apr 9 03:54:58 1998 Jim Peterson <jspeter@birch.ee.vt.edu>
* [windows/keyboard.c]
Fix an erroneous test in TranslateAccelerator{16,32} for the end
of the accelerator table.
Thu Apr 8 20:36:28 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* [misc/crtdll.c]
Implement getenv.
* [misc/commdlg.c]
Make Get[Save/Open]FileName work in most situations.
* [misc/lstr.c]
Use wvsprintf32A instead of vsprintf in FormatMessage32X
* [misc/version]
Make NT3.50 a recognised version
* [graphics/x11drv/graphics.c]
Change the algorithme to draw arcs
* [loader/resource.c]
Return an empty buffer in LoadString32A if no resource found.
* [win32/code_page.c]
Try harder to get the right size in MultiByteToWideChar.
* [win32/process.c]
Call WinExec32 for CreateProcess32A.
* [windows/user.c]
Install default Int0 Handler in InitApp().
Thu Apr 8 19:29:48 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [misc/imagelist.c]
Preliminary fix for drawing selected images.
Various improvements.
* [controls/progress.c][include/progress.c][include/commctrl.h]
Added progress bar messages and styles for IE4.01 (dll version 4.72)
compatibility.
Fixed led size problem.
* [controls/updown.c][include/commctrl.h]
Added UDM_GETRANGE32 and UDM_SETRANGE32.
* [objects/oembitmaps.c][include/windows.h][include/bitmaps/*]
Added Win95 icons and fixed Win95 cursor and restore button bug.
Now they should be visible. Sorry!!!
* [relay32/comctl32.spec]
Added most missing function names.
Tue Apr 6 18:48:36 1998 Matthew Becker <mbecker@glasscity.net>
* [objects/font.c] [if1632/gdi.spec]
GetOutlineTextMetrics: stub
* [objects/text.c]
GetTextCharset should just call GetTextCharsetInfo.
* [misc/mpr.c] [relay32/mpr.spec]
WNetCachePassword: stub
* [scheduler/thread.c] [relay32/user32.spec]
AttachThreadInput: stub
Updated documentation.
* [objects/palette.c]
Updated documentation.
Tue Mar 31 17:06:30 1998 James Juran <jrj120@psu.edu>
* [*/*.c]
Finished fixing USER32 ordinal numbers in function documentation.
Mon Mar 30 20:27:38 1998 Morten Welinder <terra@diku.dk>
* [misc/debugstr.c] [include/debugstr.h]
Moved _dumpstr from relay32/relay386.c. Improved control
character handling.
* [msdos/int21.c]
Implement 215E00 -- get machine name.
* [windows/winpos.c]
SetWindowPos32: Make an extra sync when mapping managed
windows. This makes sure the reconfigure event has been
handled. See Mshearts' what's-your-name window.
Mon Mar 30 01:13:50 1998 Alexander V. Lukyanov <lav@long.yar.ru>
* [Makefile.in]
Install includes from TOPSRCDIR.
diff --git a/loader/module.c b/loader/module.c
index 6482610..1e1db94 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -18,6 +18,7 @@
#include "heap.h"
#include "module.h"
#include "neexe.h"
+#include "pe_image.h"
#include "process.h"
#include "thread.h"
#include "resource.h"
@@ -28,8 +29,6 @@
#include "debug.h"
#include "callback.h"
-extern HINSTANCE16 PE_LoadModule( HFILE32 hf, OFSTRUCT *ofs, LOADPARAMS* params );
-
extern BOOL32 THREAD_InitDone;
static HMODULE16 hFirstModule = 0;
@@ -375,8 +374,10 @@
/***********************************************************************
* MODULE_CreateInstance
+ *
+ * If lib_only is TRUE, handle the module like a library even if it is a .EXE
*/
-HINSTANCE16 MODULE_CreateInstance( HMODULE16 hModule, LOADPARAMS *params )
+HINSTANCE16 MODULE_CreateInstance( HMODULE16 hModule, BOOL32 lib_only )
{
SEGTABLEENTRY *pSegment;
NE_MODULE *pModule;
@@ -393,7 +394,7 @@
if (hPrevInstance)
{
if (pModule->flags & NE_FFLAGS_LIBMODULE) return hPrevInstance;
- if (params == (LOADPARAMS*)-1) return hPrevInstance;
+ if (lib_only) return hPrevInstance;
}
minsize = pSegment->minsize ? pSegment->minsize : 0x10000;
@@ -533,6 +534,7 @@
fprintf(stderr, "Sorry, this is an OS/2 linear executable (LX) file !\n");
return (HMODULE32)12;
}
+
/* We now have a valid NE header */
size = sizeof(NE_MODULE) +
@@ -929,10 +931,10 @@
extern LRESULT ColorDlgProc(HWND16,UINT16,WPARAM16,LPARAM);
extern LRESULT FileOpenDlgProc(HWND16,UINT16,WPARAM16,LPARAM);
extern LRESULT FileSaveDlgProc(HWND16,UINT16,WPARAM16,LPARAM);
- extern LRESULT FindTextDlgProc(HWND16,UINT16,WPARAM16,LPARAM);
+ extern LRESULT FindTextDlgProc16(HWND16,UINT16,WPARAM16,LPARAM);
extern LRESULT PrintDlgProc(HWND16,UINT16,WPARAM16,LPARAM);
extern LRESULT PrintSetupDlgProc(HWND16,UINT16,WPARAM16,LPARAM);
- extern LRESULT ReplaceTextDlgProc(HWND16,UINT16,WPARAM16,LPARAM);
+ extern LRESULT ReplaceTextDlgProc16(HWND16,UINT16,WPARAM16,LPARAM);
if (!strcmp(name,"ColorDlgProc"))
return (FARPROC16)ColorDlgProc;
@@ -941,13 +943,13 @@
if (!strcmp(name,"FileSaveDlgProc"))
return (FARPROC16)FileSaveDlgProc;
if (!strcmp(name,"FindTextDlgProc"))
- return (FARPROC16)FindTextDlgProc;
+ return (FARPROC16)FindTextDlgProc16;
if (!strcmp(name,"PrintDlgProc"))
return (FARPROC16)PrintDlgProc;
if (!strcmp(name,"PrintSetupDlgProc"))
return (FARPROC16)PrintSetupDlgProc;
if (!strcmp(name,"ReplaceTextDlgProc"))
- return (FARPROC16)ReplaceTextDlgProc;
+ return (FARPROC16)ReplaceTextDlgProc16;
fprintf(stderr,"warning: No mapping for %s(), add one in library/miscstubs.c\n",name);
assert( FALSE );
return NULL;
@@ -1135,14 +1137,18 @@
/**********************************************************************
* MODULE_Load
*
- * Implementation of LoadModule()
+ * Implementation of LoadModule().
+ *
+ * cmd_line must contain the whole command-line, including argv[0] (and
+ * without a preceding length byte).
+ * If cmd_line is NULL, the module is loaded as a library even if it is a .exe
*/
-HINSTANCE16 MODULE_Load( LPCSTR name, LPVOID paramBlock, UINT16 uFlags)
+HINSTANCE16 MODULE_Load( LPCSTR name, UINT16 uFlags,
+ LPCSTR cmd_line, LPCSTR env, UINT32 show_cmd )
{
HMODULE32 hModule;
HINSTANCE16 hInstance, hPrevInstance;
NE_MODULE *pModule;
- LOADPARAMS *params = (LOADPARAMS *)paramBlock;
OFSTRUCT ofs;
HFILE32 hFile;
@@ -1152,7 +1158,7 @@
if ((hModule = MODULE_CreateDummyModule( &ofs )) < 32) return hModule;
pModule = (NE_MODULE *)GlobalLock16( hModule );
hPrevInstance = 0;
- hInstance = MODULE_CreateInstance( hModule, params );
+ hInstance = MODULE_CreateInstance( hModule, (cmd_line == NULL) );
}
else
{
@@ -1180,9 +1186,10 @@
hModule = MODULE_LoadExeHeader( hFile, &ofs );
if (hModule < 32)
{
- if (hModule == 21)
- hModule = PE_LoadModule( hFile, &ofs, paramBlock );
- else _lclose32( hFile );
+ if ((hModule == 21) && cmd_line)
+ hModule = PE_LoadModule( hFile, &ofs, cmd_line,
+ env, show_cmd );
+ _lclose32( hFile );
if (hModule < 32)
fprintf( stderr, "LoadModule: can't load '%s', error=%d\n",
@@ -1197,7 +1204,7 @@
MODULE_CreateSegments( hModule );
hPrevInstance = 0;
- hInstance = MODULE_CreateInstance(hModule,(LOADPARAMS*)paramBlock);
+ hInstance = MODULE_CreateInstance( hModule, (cmd_line == NULL) );
/* Load the referenced DLLs */
@@ -1228,7 +1235,7 @@
{
pModule = MODULE_GetPtr( hModule );
hPrevInstance = MODULE_GetInstance( hModule );
- hInstance = MODULE_CreateInstance( hModule, params );
+ hInstance = MODULE_CreateInstance( hModule, (cmd_line == NULL) );
if (hInstance != hPrevInstance) /* not a library */
NE_LoadSegment( pModule, pModule->dgroup );
pModule->count++;
@@ -1237,25 +1244,15 @@
/* Create a task for this instance */
- if (!(pModule->flags & NE_FFLAGS_LIBMODULE) && (paramBlock != (LPVOID)-1))
+ if (cmd_line && !(pModule->flags & NE_FFLAGS_LIBMODULE))
{
- HTASK16 hTask;
- WORD showcmd;
+ PDB32 *pdb;
pModule->flags |= NE_FFLAGS_GUI;
- /* PowerPoint passes NULL as showCmd */
- if (params->showCmd)
- showcmd = *((WORD *)PTR_SEG_TO_LIN(params->showCmd)+1);
- else
- showcmd = 0; /* FIXME: correct */
-
- hTask = TASK_CreateTask( hModule, hInstance, hPrevInstance,
- params->hEnvironment,
- (LPSTR)PTR_SEG_TO_LIN( params->cmdLine ),
- showcmd );
-
- if( hTask && TASK_GetNextTask(hTask)) Yield16();
+ pdb = PROCESS_Create( pModule, cmd_line, env, hInstance,
+ hPrevInstance, show_cmd );
+ if (pdb && (GetNumTasks() > 1)) Yield16();
}
return hInstance;
@@ -1267,7 +1264,37 @@
*/
HINSTANCE16 LoadModule16( LPCSTR name, LPVOID paramBlock )
{
- return MODULE_Load( name, paramBlock, 0 );
+ LOADPARAMS *params = (LOADPARAMS *)paramBlock;
+ LPSTR cmd_line = (LPSTR)PTR_SEG_TO_LIN( params->cmdLine );
+ LPSTR new_cmd_line;
+ UINT16 show_cmd = 0;
+ LPCVOID env = NULL;
+ HINSTANCE16 hInstance;
+
+ if (!paramBlock || (paramBlock == (LPVOID)-1))
+ return LoadLibrary16( name );
+
+ params = (LOADPARAMS *)paramBlock;
+ cmd_line = (LPSTR)PTR_SEG_TO_LIN( params->cmdLine );
+ /* PowerPoint passes NULL as showCmd */
+ if (params->showCmd)
+ show_cmd = *((UINT16 *)PTR_SEG_TO_LIN(params->showCmd)+1);
+
+ if (!cmd_line) cmd_line = "";
+ else if (*cmd_line) cmd_line++; /* skip the length byte */
+
+ if (!(new_cmd_line = HeapAlloc( GetProcessHeap(), 0,
+ strlen(cmd_line) + strlen(name) + 2 )))
+ return 0;
+ strcpy( new_cmd_line, name );
+ strcat( new_cmd_line, " " );
+ strcat( new_cmd_line, cmd_line );
+
+ if (params->hEnvironment) env = GlobalLock16( params->hEnvironment );
+ hInstance = MODULE_Load( name, 0, new_cmd_line, env, show_cmd );
+ if (params->hEnvironment) GlobalUnlock16( params->hEnvironment );
+ HeapFree( GetProcessHeap(), 0, new_cmd_line );
+ return hInstance;
}
/**********************************************************************
@@ -1280,8 +1307,8 @@
*/
DWORD LoadModule32( LPCSTR name, LPVOID paramBlock )
{
-#ifdef 0
- LOADPARAMS32 *p = paramBlock;
+ LOADPARAMS32 *params = (LOADPARAMS32 *)paramBlock;
+#if 0
STARTUPINFO st;
PROCESSINFORMATION pi;
st.cb = sizeof(STARTUPINFO);
@@ -1297,7 +1324,8 @@
CloseHandle32(pi.hThread);
#else
- return MODULE_Load( name, paramBlock, 0 );
+ return MODULE_Load( name, 0, params->lpCmdLine, params->lpEnvAddress,
+ *((UINT16 *)params->lpCmdShow + 1) );
#endif
}
@@ -1455,7 +1483,7 @@
HMODULE32 hmod;
hmod = PE_LoadLibraryEx32A(libname,PROCESS_Current(),hfile,flags);
- if (hmod <= 32) {
+ if (hmod < 32) {
char buffer[256];
strcpy( buffer, libname );
@@ -1463,7 +1491,8 @@
hmod = PE_LoadLibraryEx32A(buffer,PROCESS_Current(),hfile,flags);
}
/* initialize all DLLs, which haven't been initialized yet. */
- PE_InitializeDLLs( PROCESS_Current(), DLL_PROCESS_ATTACH, NULL);
+ if (hmod >= 32)
+ PE_InitializeDLLs( PROCESS_Current(), DLL_PROCESS_ATTACH, NULL);
return hmod;
}
@@ -1519,13 +1548,13 @@
}
TRACE(module, "(%08x) %s\n", (int)libname, libname);
- handle = MODULE_Load( libname, (LPVOID)-1, 0 );
+ handle = MODULE_Load( libname, 0, NULL, NULL, 0 );
if (handle == (HINSTANCE16)2) /* file not found */
{
char buffer[256];
lstrcpyn32A( buffer, libname, 252 );
strcat( buffer, ".dll" );
- handle = MODULE_Load( buffer, (LPVOID)-1, 0 );
+ handle = MODULE_Load( buffer, 0, NULL, NULL, 0 );
}
return handle;
}
@@ -1577,23 +1606,13 @@
*/
HINSTANCE32 WINAPI WinExec32( LPCSTR lpCmdLine, UINT32 nCmdShow )
{
- LOADPARAMS params;
- HGLOBAL16 cmdShowHandle, cmdLineHandle;
HINSTANCE32 handle = 2;
- WORD *cmdShowPtr;
- char *p, *cmdline, filename[256];
+ char *p, filename[256];
static int use_load_module = 1;
int spacelimit = 0, exhausted = 0;
if (!lpCmdLine)
return 2; /* File not found */
- if (!(cmdShowHandle = GlobalAlloc16( 0, 2 * sizeof(WORD) )))
- return 8; /* Out of memory */
- if (!(cmdLineHandle = GlobalAlloc16( 0, 2048 )))
- {
- GlobalFree16( cmdShowHandle );
- return 8; /* Out of memory */
- }
/* Keep trying to load a file by trying different filenames; e.g.,
for the cmdline "abcd efg hij", try "abcd" with args "efg hij",
@@ -1603,15 +1622,8 @@
while(!exhausted && handle == 2) {
int spacecount = 0;
- /* Store nCmdShow */
-
- cmdShowPtr = (WORD *)GlobalLock16( cmdShowHandle );
- cmdShowPtr[0] = 2;
- cmdShowPtr[1] = nCmdShow;
-
/* Build the filename and command-line */
- cmdline = (char *)GlobalLock16( cmdLineHandle );
lstrcpyn32A(filename, lpCmdLine,
sizeof(filename) - 4 /* for extension */);
@@ -1633,18 +1645,7 @@
}
}
- if (*p)
- lstrcpyn32A( cmdline + 1, p + 1, 255 );
- else
- cmdline[1] = '\0';
-
- cmdline[0] = strlen( cmdline + 1 );
*p = '\0';
- /* this is a (hopefully acceptable hack to get the whole
- commandline for PROCESS_Create
- we put it after the processed one */
- lstrcpyn32A(cmdline + (unsigned char)cmdline[0] +2,
- lpCmdLine, 2048 - 256);
/* Now load the executable file */
@@ -1652,11 +1653,7 @@
{
/* Winelib: Use LoadModule() only for the program itself */
if (__winelib) use_load_module = 0;
- params.hEnvironment = (HGLOBAL16)SELECTOROF( GetDOSEnvironment() );
- params.cmdLine = (SEGPTR)WIN16_GlobalLock16( cmdLineHandle );
- params.showCmd = (SEGPTR)WIN16_GlobalLock16( cmdShowHandle );
- params.reserved = 0;
- handle = LoadModule32( filename, ¶ms );
+ handle = MODULE_Load( filename, 0, lpCmdLine, NULL, nCmdShow );
if (handle == 2) /* file not found */
{
/* Check that the original file name did not have a suffix */
@@ -1666,8 +1663,9 @@
{
p = filename + strlen(filename);
strcpy( p, ".exe" );
- handle = LoadModule16( filename, ¶ms );
- *p = '\0'; /* Remove extension */
+ handle = MODULE_Load( filename, 0, lpCmdLine,
+ NULL, nCmdShow );
+ *p = '\0'; /* Remove extension */
}
}
}
@@ -1703,7 +1701,7 @@
argptr = argv;
if (iconic) *argptr++ = "-iconic";
*argptr++ = unixfilename;
- p = cmdline + 1;
+ p = strdup(lpCmdLine);
while (1)
{
while (*p && (*p == ' ' || *p == '\t')) *p++ = '\0';
@@ -1740,8 +1738,6 @@
}
} /* while (!exhausted && handle < 32) */
- GlobalFree16( cmdShowHandle );
- GlobalFree16( cmdLineHandle );
return handle;
}
