commit 72b279236e425f7c3373f21af6e53369d2e1318d
author Ove Kaaven <ovek@arcticnet.no> Fri Oct 23 16:20:12 1998 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Oct 23 16:20:12 1998 +0000
tree f094769026e93f5043d54b6bfac3fe23202f530e
parent 4659741056f14a7f6e3c641530cccaef703884b6

Fixed DOS environment passing.

loader/dos/module.c

diff --git a/loader/dos/module.c b/loader/dos/module.c
index 4a7471d..fa88004 100644
--- a/loader/dos/module.c
+++ b/loader/dos/module.c
@@ -131,7 +131,7 @@
 
  if (env) {
   /* get size of environment block */
-  while (env[sz++]) sz+=strlen(env+sz);
+  while (env[sz++]) sz+=strlen(env+sz)+1;
  } else sz++;
  /* allocate it */
  envblk=DOSMEM_GetBlock(lpDosTask->hModule,sz+sizeof(WORD)+strlen(name)+1,&seg);
@@ -364,6 +364,7 @@
  LPDOSTASK lpDosTask = NULL; /* keep gcc from complaining */
  HMODULE16 hModule;
  HINSTANCE16 hInstance;
+ PDB32 *pdb = PROCESS_Current();
  TDB *pTask = (TDB*)GlobalLock16( GetCurrentTask() );
  NE_MODULE *pModule = pTask ? NE_GetPtr( pTask->hModule ) : NULL;
  HFILE16 hFile;
@@ -378,6 +379,7 @@
  if ((hFile = OpenFile16( name, &ofs, OF_READ )) == HFILE_ERROR16)
   return 2; /* File not found */
 
+ if ((!env)&&pdb) env = pdb->env_db->environ;
  if (alloc) {
   if ((hModule = MODULE_CreateDummyModule(&ofs)) < 32)
    return hModule;