Release 980822
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.
diff --git a/loader/module.c b/loader/module.c
index 21d5665..0804df3 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -11,6 +11,7 @@
#include <sys/types.h>
#include <unistd.h>
#include "windows.h"
+#include "winerror.h"
#include "class.h"
#include "file.h"
#include "global.h"
@@ -284,16 +285,11 @@
/**********************************************************************
- * MODULE_Load
- *
- * 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
+ * NE_CreateProcess
*/
-HINSTANCE16 MODULE_Load( LPCSTR name, BOOL32 implicit,
- LPCSTR cmd_line, LPCSTR env, UINT32 show_cmd )
+static HINSTANCE16 NE_CreateProcess( LPCSTR name, LPCSTR cmd_line, LPCSTR env,
+ LPSTARTUPINFO32A startup,
+ LPPROCESS_INFORMATION info )
{
HMODULE16 hModule;
HINSTANCE16 hInstance, hPrevInstance;
@@ -305,38 +301,24 @@
lstrcpyn32A( ofs.szPathName, name, sizeof(ofs.szPathName) );
if ((hModule = MODULE_CreateDummyModule( &ofs )) < 32) return hModule;
pModule = (NE_MODULE *)GlobalLock16( hModule );
- hInstance = NE_CreateInstance( pModule, &hPrevInstance,
- (cmd_line == NULL) );
+ hInstance = NE_CreateInstance( pModule, &hPrevInstance, FALSE );
}
else
{
- hInstance = NE_LoadModule( name, &hPrevInstance, implicit,
- (cmd_line == NULL) );
- if ((hInstance == 21) && cmd_line)
- return PE_LoadModule( name, cmd_line, env, show_cmd );
-#ifdef linux
- if (hInstance == 11)
- return MZ_LoadModule(name, cmd_line, env, show_cmd );
-#endif
+ hInstance = NE_LoadModule( name, &hPrevInstance, FALSE, FALSE );
+ pModule = hInstance >= 32 ? NE_GetPtr( hInstance ) : NULL;
}
/* Create a task for this instance */
- if (hInstance < 32) return hInstance;
- pModule = NE_GetPtr( hInstance );
- if (cmd_line && !(pModule->flags & NE_FFLAGS_LIBMODULE))
+ if (pModule && !(pModule->flags & NE_FFLAGS_LIBMODULE))
{
PDB32 *pdb;
- PROCESS_INFORMATION info;
pModule->flags |= NE_FFLAGS_GUI;
pdb = PROCESS_Create( pModule, cmd_line, env, hInstance,
- hPrevInstance, show_cmd, &info );
- /* we don't need the handles for now */
- CloseHandle( info.hThread );
- CloseHandle( info.hProcess );
- if (pdb && (GetNumTasks() > 1)) Yield16();
+ hPrevInstance, startup, info );
}
return hInstance;
@@ -349,77 +331,239 @@
HINSTANCE16 WINAPI LoadModule16( LPCSTR name, LPVOID paramBlock )
{
LOADPARAMS *params;
- LPSTR cmd_line, new_cmd_line;
- UINT16 show_cmd = 0;
- LPCVOID env = NULL;
+ LOADPARAMS32 params32;
HINSTANCE16 hInstance;
+ LPSTR cmd_line;
if (!paramBlock || (paramBlock == (LPVOID)-1))
return LoadLibrary16( name );
+ /* Transfer arguments to 32-bit param-block */
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);
+ memset( ¶ms32, '\0', sizeof(params32) );
+ cmd_line = (LPSTR)PTR_SEG_TO_LIN( params->cmdLine );
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 )))
+ if (!(params32.lpCmdLine = 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 );
+ strcpy( params32.lpCmdLine, name );
+ strcat( params32.lpCmdLine, " " );
+ strcat( params32.lpCmdLine, cmd_line );
- if (params->hEnvironment) env = GlobalLock16( params->hEnvironment );
- hInstance = MODULE_Load( name, FALSE, new_cmd_line, env, show_cmd );
+ if (params->hEnvironment)
+ params32.lpEnvAddress = GlobalLock16( params->hEnvironment );
+ if (params->showCmd)
+ params32.lpCmdShow = PTR_SEG_TO_LIN( params->showCmd );
+
+ /* Call LoadModule32 */
+ hInstance = LoadModule32( name, ¶ms32 );
+
+ /* Clean up */
if (params->hEnvironment) GlobalUnlock16( params->hEnvironment );
- HeapFree( GetProcessHeap(), 0, new_cmd_line );
+ HeapFree( GetProcessHeap(), 0, params32.lpCmdLine );
+
return hInstance;
}
/**********************************************************************
* LoadModule32 (KERNEL32.499)
- *
- * FIXME
- *
- * This should get implemented via CreateProcess -- MODULE_Load
- * is resolutely 16-bit.
*/
-DWORD WINAPI LoadModule32( LPCSTR name, LPVOID paramBlock )
+HINSTANCE32 WINAPI LoadModule32( LPCSTR name, LPVOID paramBlock )
{
LOADPARAMS32 *params = (LOADPARAMS32 *)paramBlock;
-#if 0
- STARTUPINFO st;
- PROCESSINFORMATION pi;
- st.cb = sizeof(STARTUPINFO);
- st.wShowWindow = p->lpCmdShow[2] ; WRONG
+ PROCESS_INFORMATION info;
+ STARTUPINFO32A startup;
+ HINSTANCE32 hInstance;
+ PDB32 *pdb;
+ TDB *tdb;
- BOOL32 ret = CreateProcess32A( name, p->lpCmdLine,
- NULL, NULL, FALSE, 0, p->lpEnvAddress,
- NULL, &st, &pi);
- if (!ret) {
- /* handle errors appropriately */
- }
- CloseHandle32(pi.hProcess);
- CloseHandle32(pi.hThread);
+ memset( &startup, '\0', sizeof(startup) );
+ startup.cb = sizeof(startup);
+ startup.dwFlags = STARTF_USESHOWWINDOW;
+ startup.wShowWindow = params->lpCmdShow? params->lpCmdShow[1] : 0;
-#else
- return MODULE_Load( name, FALSE, params->lpCmdLine, params->lpEnvAddress,
- *((UINT16 *)params->lpCmdShow + 1) );
-#endif
+ if (!CreateProcess32A( name, params->lpCmdLine,
+ NULL, NULL, FALSE, 0, params->lpEnvAddress,
+ NULL, &startup, &info ))
+ return GetLastError(); /* guaranteed to be < 32 */
+
+ /* Get hInstance from process */
+ pdb = PROCESS_IdToPDB( info.dwProcessId );
+ tdb = pdb? (TDB *)GlobalLock16( pdb->task ) : NULL;
+ hInstance = tdb? tdb->hInstance : 0;
+
+ /* Close off the handles */
+ CloseHandle( info.hThread );
+ CloseHandle( info.hProcess );
+
+ return hInstance;
}
+/**********************************************************************
+ * CreateProcess32A (KERNEL32.171)
+ */
+BOOL32 WINAPI CreateProcess32A( LPCSTR lpApplicationName, LPSTR lpCommandLine,
+ LPSECURITY_ATTRIBUTES lpProcessAttributes,
+ LPSECURITY_ATTRIBUTES lpThreadAttributes,
+ BOOL32 bInheritHandles, DWORD dwCreationFlags,
+ LPVOID lpEnvironment, LPCSTR lpCurrentDirectory,
+ LPSTARTUPINFO32A lpStartupInfo,
+ LPPROCESS_INFORMATION lpProcessInfo )
+{
+ HINSTANCE16 hInstance;
+ LPCSTR cmdline;
+ PDB32 *pdb;
+ char name[256];
+
+ /* Get name and command line */
+
+ if (!lpApplicationName && !lpCommandLine)
+ {
+ SetLastError( ERROR_FILE_NOT_FOUND );
+ return FALSE;
+ }
+
+ cmdline = lpCommandLine? lpCommandLine : lpApplicationName;
+
+ 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);
+ }
+
+ if (!strchr(name, '\\') && !strchr(name, '.'))
+ strcat(name, ".exe");
+
+
+ /* Warn if unsupported features are used */
+
+ if (lpProcessAttributes)
+ FIXME(module, "(%s,...): lpProcessAttributes ignored\n", name);
+ if (lpThreadAttributes)
+ FIXME(module, "(%s,...): lpThreadAttributes ignored\n", name);
+ if (bInheritHandles)
+ FIXME(module, "(%s,...): bInheritHandles ignored\n", name);
+ if (dwCreationFlags & DEBUG_PROCESS)
+ FIXME(module, "(%s,...): DEBUG_PROCESS ignored\n", name);
+ if (dwCreationFlags & DEBUG_ONLY_THIS_PROCESS)
+ FIXME(module, "(%s,...): DEBUG_ONLY_THIS_PROCESS ignored\n", name);
+ if (dwCreationFlags & CREATE_SUSPENDED)
+ FIXME(module, "(%s,...): CREATE_SUSPENDED ignored\n", name);
+ if (dwCreationFlags & DETACHED_PROCESS)
+ FIXME(module, "(%s,...): DETACHED_PROCESS ignored\n", name);
+ if (dwCreationFlags & CREATE_NEW_CONSOLE)
+ FIXME(module, "(%s,...): CREATE_NEW_CONSOLE ignored\n", name);
+ if (dwCreationFlags & NORMAL_PRIORITY_CLASS)
+ FIXME(module, "(%s,...): NORMAL_PRIORITY_CLASS ignored\n", name);
+ if (dwCreationFlags & IDLE_PRIORITY_CLASS)
+ FIXME(module, "(%s,...): IDLE_PRIORITY_CLASS ignored\n", name);
+ if (dwCreationFlags & HIGH_PRIORITY_CLASS)
+ FIXME(module, "(%s,...): HIGH_PRIORITY_CLASS ignored\n", name);
+ if (dwCreationFlags & REALTIME_PRIORITY_CLASS)
+ FIXME(module, "(%s,...): REALTIME_PRIORITY_CLASS ignored\n", name);
+ if (dwCreationFlags & CREATE_NEW_PROCESS_GROUP)
+ FIXME(module, "(%s,...): CREATE_NEW_PROCESS_GROUP ignored\n", name);
+ if (dwCreationFlags & CREATE_UNICODE_ENVIRONMENT)
+ FIXME(module, "(%s,...): CREATE_UNICODE_ENVIRONMENT ignored\n", name);
+ if (dwCreationFlags & CREATE_SEPARATE_WOW_VDM)
+ FIXME(module, "(%s,...): CREATE_SEPARATE_WOW_VDM ignored\n", name);
+ if (dwCreationFlags & CREATE_SHARED_WOW_VDM)
+ FIXME(module, "(%s,...): CREATE_SHARED_WOW_VDM ignored\n", name);
+ if (dwCreationFlags & CREATE_DEFAULT_ERROR_MODE)
+ FIXME(module, "(%s,...): CREATE_DEFAULT_ERROR_MODE ignored\n", name);
+ if (dwCreationFlags & CREATE_NO_WINDOW)
+ FIXME(module, "(%s,...): CREATE_NO_WINDOW ignored\n", name);
+ if (dwCreationFlags & PROFILE_USER)
+ FIXME(module, "(%s,...): PROFILE_USER ignored\n", name);
+ if (dwCreationFlags & PROFILE_KERNEL)
+ FIXME(module, "(%s,...): PROFILE_KERNEL ignored\n", name);
+ if (dwCreationFlags & PROFILE_SERVER)
+ FIXME(module, "(%s,...): PROFILE_SERVER ignored\n", name);
+ if (lpCurrentDirectory)
+ FIXME(module, "(%s,...): lpCurrentDirectory %s ignored\n",
+ name, lpCurrentDirectory);
+ if (lpStartupInfo->lpDesktop)
+ FIXME(module, "(%s,...): lpStartupInfo->lpDesktop %s ignored\n",
+ name, lpStartupInfo->lpDesktop);
+ if (lpStartupInfo->lpTitle)
+ FIXME(module, "(%s,...): lpStartupInfo->lpTitle %s ignored\n",
+ name, lpStartupInfo->lpTitle);
+ if (lpStartupInfo->dwFlags & STARTF_USECOUNTCHARS)
+ FIXME(module, "(%s,...): STARTF_USECOUNTCHARS (%ld,%ld) ignored\n",
+ name, lpStartupInfo->dwXCountChars, lpStartupInfo->dwYCountChars);
+ if (lpStartupInfo->dwFlags & STARTF_USEFILLATTRIBUTE)
+ FIXME(module, "(%s,...): STARTF_USEFILLATTRIBUTE %lx ignored\n",
+ name, lpStartupInfo->dwFillAttribute);
+ if (lpStartupInfo->dwFlags & STARTF_RUNFULLSCREEN)
+ FIXME(module, "(%s,...): STARTF_RUNFULLSCREEN ignored\n", name);
+ if (lpStartupInfo->dwFlags & STARTF_FORCEONFEEDBACK)
+ FIXME(module, "(%s,...): STARTF_FORCEONFEEDBACK ignored\n", name);
+ if (lpStartupInfo->dwFlags & STARTF_FORCEOFFFEEDBACK)
+ FIXME(module, "(%s,...): STARTF_FORCEOFFFEEDBACK ignored\n", name);
+ if (lpStartupInfo->dwFlags & STARTF_USEHOTKEY)
+ FIXME(module, "(%s,...): STARTF_USEHOTKEY ignored\n", name);
+
+
+ /* Try NE (or winelib) module */
+ hInstance = NE_CreateProcess( name, cmdline, lpEnvironment,
+ lpStartupInfo, lpProcessInfo );
+
+ /* Try PE module */
+ if (hInstance == 21)
+ hInstance = PE_CreateProcess( name, cmdline, lpEnvironment,
+ lpStartupInfo, lpProcessInfo );
+
+ /* Try DOS module */
+#ifdef linux
+ if (hInstance == 11)
+ hInstance = MZ_CreateProcess( name, cmdline, lpEnvironment,
+ lpStartupInfo, lpProcessInfo );
+#endif
+
+ if (hInstance < 32)
+ {
+ SetLastError( hInstance );
+ return FALSE;
+ }
+
+ /* Get hTask from process and start the task */
+ pdb = PROCESS_IdToPDB( lpProcessInfo->dwProcessId );
+ if (pdb) TASK_StartTask( pdb->task );
+
+ return TRUE;
+}
+
+/**********************************************************************
+ * CreateProcess32W (KERNEL32.172)
+ */
+BOOL32 WINAPI CreateProcess32W( LPCWSTR lpApplicationName, LPWSTR lpCommandLine,
+ LPSECURITY_ATTRIBUTES lpProcessAttributes,
+ LPSECURITY_ATTRIBUTES lpThreadAttributes,
+ BOOL32 bInheritHandles, DWORD dwCreationFlags,
+ LPVOID lpEnvironment, LPCWSTR lpCurrentDirectory,
+ LPSTARTUPINFO32W lpStartupInfo,
+ LPPROCESS_INFORMATION lpProcessInfo )
+{
+ FIXME(win32, "(%s,%s,...): stub\n", debugstr_w(lpApplicationName),
+ debugstr_w(lpCommandLine));
+
+ /* make from lcc uses system as fallback if CreateProcess returns
+ FALSE, so return false */
+ return FALSE;
+}
/***********************************************************************
* GetModuleHandle (KERNEL32.237)
*/
HMODULE32 WINAPI GetModuleHandle32A(LPCSTR module)
{
-
- TRACE(win32, "%s\n", module ? module : "NULL");
if (module == NULL)
return PROCESS_Current()->exe_modref->module;
else
@@ -582,10 +726,21 @@
char *p, filename[256];
static int use_load_module = 1;
int spacelimit = 0, exhausted = 0;
+ LOADPARAMS32 params;
+ UINT16 paramCmdShow[2];
if (!lpCmdLine)
return 2; /* File not found */
+ /* Set up LOADPARAMS32 buffer for LoadModule32 */
+
+ memset( ¶ms, '\0', sizeof(params) );
+ params.lpCmdLine = (LPSTR)lpCmdLine;
+ params.lpCmdShow = paramCmdShow;
+ params.lpCmdShow[0] = 2;
+ params.lpCmdShow[1] = nCmdShow;
+
+
/* Keep trying to load a file by trying different filenames; e.g.,
for the cmdline "abcd efg hij", try "abcd" with args "efg hij",
then "abcd efg" with arg "hij", and finally "abcd efg hij" with
@@ -625,7 +780,7 @@
{
/* Winelib: Use LoadModule() only for the program itself */
if (__winelib) use_load_module = 0;
- handle = MODULE_Load( filename, FALSE, lpCmdLine, NULL, nCmdShow );
+ handle = LoadModule32( filename, ¶ms );
if (handle == 2) /* file not found */
{
/* Check that the original file name did not have a suffix */
@@ -635,8 +790,7 @@
{
p = filename + strlen(filename);
strcpy( p, ".exe" );
- handle = MODULE_Load( filename, FALSE, lpCmdLine,
- NULL, nCmdShow );
+ handle = LoadModule32( filename, ¶ms );
*p = '\0'; /* Remove extension */
}
}
