1998-04-13 14:21:30 +02:00
|
|
|
/*
|
|
|
|
* Process environment management
|
|
|
|
*
|
|
|
|
* Copyright 1996, 1998 Alexandre Julliard
|
2002-03-10 00:29:33 +01:00
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
1998-04-13 14:21:30 +02:00
|
|
|
*/
|
|
|
|
|
2001-07-18 23:04:23 +02:00
|
|
|
#include "config.h"
|
|
|
|
#include "wine/port.h"
|
|
|
|
|
1998-04-13 14:21:30 +02:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2001-07-18 23:04:23 +02:00
|
|
|
|
2000-02-10 20:03:02 +01:00
|
|
|
#include "windef.h"
|
2000-11-28 23:40:56 +01:00
|
|
|
#include "winerror.h"
|
2001-07-18 23:04:23 +02:00
|
|
|
|
|
|
|
#include "wine/winbase16.h"
|
2002-03-29 19:28:56 +01:00
|
|
|
#include "wine/server.h"
|
1998-04-13 14:21:30 +02:00
|
|
|
#include "heap.h"
|
2001-07-18 23:04:23 +02:00
|
|
|
#include "ntddk.h"
|
1998-04-13 14:21:30 +02:00
|
|
|
#include "selectors.h"
|
|
|
|
|
2000-12-11 04:48:15 +01:00
|
|
|
/* Win32 process environment database */
|
|
|
|
typedef struct _ENVDB
|
|
|
|
{
|
|
|
|
LPSTR environ; /* 00 Process environment strings */
|
|
|
|
DWORD unknown1; /* 04 Unknown */
|
|
|
|
LPSTR cmd_line; /* 08 Command line */
|
|
|
|
LPSTR cur_dir; /* 0c Current directory */
|
|
|
|
STARTUPINFOA *startup_info; /* 10 Startup information */
|
|
|
|
HANDLE hStdin; /* 14 Handle for standard input */
|
|
|
|
HANDLE hStdout; /* 18 Handle for standard output */
|
|
|
|
HANDLE hStderr; /* 1c Handle for standard error */
|
|
|
|
DWORD unknown2; /* 20 Unknown */
|
|
|
|
DWORD inherit_console; /* 24 Inherit console flag */
|
|
|
|
DWORD break_type; /* 28 Console events flag */
|
|
|
|
void *break_sem; /* 2c SetConsoleCtrlHandler semaphore */
|
|
|
|
void *break_event; /* 30 SetConsoleCtrlHandler event */
|
|
|
|
void *break_thread; /* 34 SetConsoleCtrlHandler thread */
|
|
|
|
void *break_handlers; /* 38 List of console handlers */
|
|
|
|
} ENVDB;
|
|
|
|
|
|
|
|
|
1998-04-13 14:21:30 +02:00
|
|
|
/* Format of an environment block:
|
|
|
|
* ASCIIZ string 1 (xx=yy format)
|
|
|
|
* ...
|
|
|
|
* ASCIIZ string n
|
|
|
|
* BYTE 0
|
|
|
|
* WORD 1
|
|
|
|
* ASCIIZ program name (e.g. C:\WINDOWS\SYSTEM\KRNL386.EXE)
|
|
|
|
*
|
|
|
|
* Notes:
|
|
|
|
* - contrary to Microsoft docs, the environment strings do not appear
|
|
|
|
* to be sorted on Win95 (although they are on NT); so we don't bother
|
|
|
|
* to sort them either.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static const char ENV_program_name[] = "C:\\WINDOWS\\SYSTEM\\KRNL386.EXE";
|
|
|
|
|
Release 980503
Thu Apr 30 16:28:12 1998 James Juran <jrj120@psu.edu>
* [scheduler/process.c]
Implemented GetExitCodeProcess. The code is a direct translation
of GetExitCodeThread.
Mon Apr 27 22:20:25 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* [loader/pe_image.c]
Unload dummy module when PE_LoadLibraryEx32A fails with
PE_LoadImage (makes Encarta 98 installer proceed).
* [files/drive.c]
Make GetDriveType16 return DRIVE_REMOVABLE for TYPE_CDROM.
Make GetCurrentDirectory32 behave like the code does and not
like the help describes.
* [files/profile.c]
Revoke recent change in PROFILE_GetSection and try better
handling of special case.
* [include/windows.h]
Change definition of ACCEL32.
* [misc/commdlg.c]
Replace the GetXXXFilename32 macros by normal code.
Fix two reported bugs in my changes to commdlg.
* [windows/win.c]
Add a hook to catch bogus WM_SIZE messages by emitting a warning
in the appropriate case.
* [objects/bitmap.c]
Reject unreasonbable large size arguments in
CreateCompatibleBitmap32 and add an fixme for that situation.
Sun Apr 26 18:30:07 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [include/ldt.h] [debugger/*.c] [miscemu/instr.c]
Added IS_SELECTOR_SYSTEM and IS_SELECTOR_32BIT macros.
Make instruction emulation support system selectors.
* [loader/*.c]
Started moving NE specific functions to the new loader/ne
directory.
* [memory/environ.c]
Enforce the 127 chars limit only when creating the environment of
a Win16 process.
Sun Apr 26 12:22:23 1998 Andreas Mohr <100.30936@germany.net>
* [files/file.c]
Fixed an incredible typo in CopyFile32A that made it unusable
since a rewrite in 970112 (!!).
* [files/directory.c]
Fixed GetTempPath32A/W to include trailing backslash.
* [misc/ver.c]
Make find_pe_resource "work" with corrupt files.
* [misc/wsprintf.c]
Altered WPRINTF_ParseFormatA/W to treat invalid format chars
as normal output, too.
* [msdos/dpmi.c]
Implemented "Allocate/Free real mode callback" (0x0303/0x0304).
Cross your fingers if you need to use it ;) (completely untested)
Implemented "Call real mode proc with far return" (0x0301, tested).
* [msdos/int21.c]
Fixed ioctlGenericBlkDevReq/0x60.
* [relay32/dplayx.spec] [relay32/builtin32.c] [relay32/Makefile.in]
Added built-in DPLAYX.DLL.
* [windows/win.c]
Fixed GetWindowWord()/GWW_HWNDPARENT to return the window's owner
if it has no parent (SDK).
Sat Apr 25 15:09:53 1998 M.T.Fortescue <mark@mtfhpc.demon.co.uk>
* [debugger/db_disasm.c]
Fixed disassemble bug for no-display option and 'lock',
'repne' and 'repe' prefixes.
* [debugger/registers.c]
Added textual flag description output on 'info regs'.
Sat Apr 25 14:18:26 1998 Matthew Becker <mbecker@glasscity.net>
* [*/*.c]
Added stubs and/or documentation for the following functions:
LookupPrivilegeValue, OpenService, ControlService, RegGetKeySecurity,
StartService, SetComputerName, DeleteService, CloseServiceHandle,
OpenProcessToken, OpenSCManager, DeregisterEventSource,
WaitForDebugEvent, WaitForInputIdle, RegisterEventSource,
SetDebugErrorLevel, SetConsoleCursorPosition, ChoosePixelFormat,
SetPixelFormat, GetPixelFormat, DescribePixelFormat, SwapBuffers,
PolyBezier, AbortPath, DestroyAcceleratorTable, HeapWalk,
DdeInitialize, DdeUninitialize, DdeConnectList, DdeDisconnectList,
DdeCreateStringHandle, DdePostAdvise, DdeGetData, DdeNameService,
DdeGetLastError, WNetGetDirectoryType, EnumPrinters, RegFlushKey,
RegGetKeySecurity, DllGetClassObject, DllCanUnloadNow, CreateBitmap,
CreateCompatibleBitmap, CreateBitmapIndirect, GetBitmapBits,
SetBitmapBits, LoadImage, CopyImage, LoadBitmap, DrawIcon,
CreateDiscardableBitmap, SetDIBits, GetCharABCWidths, LoadTypeLib,
SetConsoleCtrlHandler, CreateConsoleScreenBuffer, ReadConsoleInput,
GetConsoleCursorInfo, SetConsoleCursorInfo, SetConsoleWindowInfo,
SetConsoleTextAttribute, SetConsoleScreenBufferSize,
FillConsoleOutputCharacter, FillConsoleOutputAttribute,
CreateMailslot, GetMailslotInfo, GetCompressedFileSize,
GetProcessWindowStation, GetThreadDesktop, SetDebugErrorLevel,
WaitForDebugEvent, SetComputerName, CreateMDIWindow.
Thu Apr 23 23:54:04 1998 Douglas Ridgway <ridgway@winehq.com>
* [include/windows.h] [objects/enhmetafile.c] [relay32/gdi32.spec]
Implement CopyEnhMetaFile, Get/SetEnhMetaFileBits, other fixes.
* [include/windows.h] [objects/metafile.c] [relay32/gdi32.spec]
32-bit metafile fixes, implement EnumMetaFile32, GetMetaFileBitsEx.
* [objects/font.c] [graphics/x11drv/xfont.c] [graphics/x11drv/text.c]
Some rotated text support for X11R6 displays.
* [win32/newfns.c] [ole/ole2nls.c]
Moved GetNumberFormat32A.
Wed Apr 22 17:38:20 1998 David Lee Lambert <lamber45@egr.msu.edu>
* [ole/ole2nls.c] [misc/network.c]
Changed some function documentation to the new style.
* [misc/network.c] [include/windows.h] [if1632/user.spec]
[relay32/mpr.spec] [misc/mpr.c]
Added stubs for some Win32 network functions; renamed some
16-bit ones with 32-bit counterparts, as well as
WNetGetDirectoryType; moved the stubs in misc/mpr.c (three of
them!) to misc/network.c.
* [ole/compobj.c] [ole/storage.c] [ole/ole2disp.c]
[ole/ole2nls.c] [ole/folders.c] [ole/moniker.c] [ole/ole2.c]
[graphics/fontengine.c] [graphics/ddraw.c] [graphics/env.c]
[graphics/driver.c] [graphics/escape.c]
Changed fprintf's to proper debug-macros.
* [include/winnls.h]
Added some flags (for internal use).
* [ole/ole2nls.c]
Added the Unicode core function, and worked out a way to hide
the commonality of the core.
* [relay32/kernel32.spec]
Added support for GetDate/Time32A/W.
Wed Apr 22 09:16:03 1998 Gordon Chaffee <chaffee@cs.berkeley.edu>
* [win32/code_page.c]
Fixed problem with MultiByteToWideChar that was introduced in
last release. Made MultiByteToWideChar more compatible with Win32.
* [graphics/x11drv/graphics.c]
Fixed problem with drawing arcs.
Tue Apr 21 11:24:58 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [ole/ole2nls.c]
Move stuff from 0x409 case to Lang_En.
* [relay32/user32.spec] [windows/winpos.c]
Added stubs for GetWindowRgn32 and SetWindowRgn32. Makes Office
Paperclip happy.
Tue Apr 21 11:16:16 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [loader/pe_image.c]
If image is relocated, TLS addresses need to be adjusted.
* [debugger/*.c]
Generalized tests for 32-bit segments.
Tue Apr 21 02:04:59 1998 James Juran <jrj120@psu.edu>
* [misc/*.c] [miscemu/*.c] [msdos/*.c] [if1632/*.c]
[include/*.h] [loader/*.c] [memory/*.c] [multimedia/*.c]
[objects/*.c]
Almost all fprintf statements converted to appropriate
debug messages.
* [README]
Updated "GETTING MORE INFORMATION" section to include WineHQ.
* [documentation/debugger]
Fixed typo.
* [windows/defwnd.c]
Added function documentation.
Sun Apr 19 16:30:58 1998 Marcus Meissner <marcus@mud.de>
* [Make.rules.in]
Added lint target (using lclint).
* [relay32/oleaut32.spec][relay32/Makefile.in][ole/typelib.c]
[ole/ole2disp.c]
Added oleaut32 spec, added some SysString functions.
* [if1632/signal.c]
Added printing of faultaddress in Linux (using CR2 debug register).
* [configure.in]
Added <sys/types.h> for statfs checks.
* [loader/*.c][debugger/break.c][debugger/hash.c]
Started to split win32/win16 module handling, preparing support
for other binary formats (like ELF).
Sat Apr 18 10:07:41 1998 Rein Klazes <rklazes@casema.net>
* [misc/registry.c]
Fixed a bug that made RegQueryValuexxx returning
incorrect registry values.
Fri Apr 17 22:59:22 1998 Alexander V. Lukyanov <lav@long.yar.ru>
* [misc/lstr.c]
FormatMessage32*: remove linefeed when nolinefeed set;
check for target underflow.
Fri Apr 17 00:38:14 1998 Alexander V. Lukyanov <lav@long.yar.ru>
* [misc/crtdll.c]
Implement xlat_file_ptr for CRT stdin/stdout/stderr address
translation.
Wed Apr 15 20:43:56 1998 Jim Peterson <jspeter@birch.ee.vt.edu>
* [controls/menu.c]
Added 'odaction' parameter to MENU_DrawMenuItem() and redirected
WM_DRAWITEM messages to GetWindow(hwnd,GW_OWNER).
Tue Apr 14 16:17:55 1998 Berend Reitsma <berend@united-info.com>
* [graphics/metafiledrv/init.c] [graphics/painting.c]
[graphics/win16drv/init.c] [graphics/x11drv/graphics.c]
[graphics/x11drv/init.c] [include/gdi.h] [include/x11drv.h]
[relay32/gdi32.spec]
Added PolyPolyline routine.
* [windows/winproc.c]
Changed WINPROC_GetProc() to return proc instead of &(jmp proc).
1998-05-03 21:01:20 +02:00
|
|
|
/* Maximum length of a Win16 environment string (including NULL) */
|
|
|
|
#define MAX_WIN16_LEN 128
|
1998-04-13 14:21:30 +02:00
|
|
|
|
|
|
|
/* Extra bytes to reserve at the end of an environment */
|
|
|
|
#define EXTRA_ENV_SIZE (sizeof(BYTE) + sizeof(WORD) + sizeof(ENV_program_name))
|
|
|
|
|
|
|
|
/* Fill the extra bytes with the program name and stuff */
|
|
|
|
#define FILL_EXTRA_ENV(p) \
|
|
|
|
*(p) = '\0'; \
|
2000-12-27 05:18:26 +01:00
|
|
|
PUT_UA_WORD( (p) + 1, 1 ); \
|
1998-04-13 14:21:30 +02:00
|
|
|
strcpy( (p) + 3, ENV_program_name );
|
|
|
|
|
2000-08-10 00:33:42 +02:00
|
|
|
STARTUPINFOA current_startupinfo =
|
|
|
|
{
|
|
|
|
sizeof(STARTUPINFOA), /* cb */
|
|
|
|
0, /* lpReserved */
|
|
|
|
0, /* lpDesktop */
|
|
|
|
0, /* lpTitle */
|
|
|
|
0, /* dwX */
|
|
|
|
0, /* dwY */
|
|
|
|
0, /* dwXSize */
|
|
|
|
0, /* dwYSize */
|
|
|
|
0, /* dwXCountChars */
|
|
|
|
0, /* dwYCountChars */
|
|
|
|
0, /* dwFillAttribute */
|
|
|
|
0, /* dwFlags */
|
|
|
|
0, /* wShowWindow */
|
|
|
|
0, /* cbReserved2 */
|
|
|
|
0, /* lpReserved2 */
|
|
|
|
0, /* hStdInput */
|
|
|
|
0, /* hStdOutput */
|
|
|
|
0 /* hStdError */
|
|
|
|
};
|
|
|
|
|
|
|
|
ENVDB current_envdb =
|
|
|
|
{
|
|
|
|
0, /* environ */
|
|
|
|
0, /* unknown1 */
|
|
|
|
0, /* cmd_line */
|
|
|
|
0, /* cur_dir */
|
|
|
|
¤t_startupinfo, /* startup_info */
|
|
|
|
0, /* hStdin */
|
|
|
|
0, /* hStdout */
|
|
|
|
0, /* hStderr */
|
|
|
|
0, /* unknown2 */
|
|
|
|
0, /* inherit_console */
|
|
|
|
0, /* break_type */
|
|
|
|
0, /* break_sem */
|
|
|
|
0, /* break_event */
|
|
|
|
0, /* break_thread */
|
2000-12-11 04:48:15 +01:00
|
|
|
0 /* break_handlers */
|
2000-08-10 00:33:42 +02:00
|
|
|
};
|
1998-04-13 14:21:30 +02:00
|
|
|
|
2000-12-11 04:48:15 +01:00
|
|
|
|
|
|
|
static WCHAR *cmdlineW; /* Unicode command line */
|
|
|
|
static WORD env_sel; /* selector to the environment */
|
|
|
|
|
1998-04-13 14:21:30 +02:00
|
|
|
/***********************************************************************
|
|
|
|
* ENV_FindVariable
|
|
|
|
*
|
|
|
|
* Find a variable in the environment and return a pointer to the value.
|
|
|
|
* Helper function for GetEnvironmentVariable and ExpandEnvironmentStrings.
|
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
static LPCSTR ENV_FindVariable( LPCSTR env, LPCSTR name, INT len )
|
1998-04-13 14:21:30 +02:00
|
|
|
{
|
|
|
|
while (*env)
|
|
|
|
{
|
2000-09-26 01:30:56 +02:00
|
|
|
if (!strncasecmp( name, env, len ) && (env[len] == '='))
|
1998-04-13 14:21:30 +02:00
|
|
|
return env + len + 1;
|
|
|
|
env += strlen(env) + 1;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2002-03-29 19:28:56 +01:00
|
|
|
* build_environment
|
1998-04-13 14:21:30 +02:00
|
|
|
*
|
|
|
|
* Build the environment for the initial process
|
|
|
|
*/
|
2002-03-29 19:28:56 +01:00
|
|
|
static BOOL build_environment(void)
|
1998-04-13 14:21:30 +02:00
|
|
|
{
|
|
|
|
extern char **environ;
|
|
|
|
LPSTR p, *e;
|
Release 980503
Thu Apr 30 16:28:12 1998 James Juran <jrj120@psu.edu>
* [scheduler/process.c]
Implemented GetExitCodeProcess. The code is a direct translation
of GetExitCodeThread.
Mon Apr 27 22:20:25 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* [loader/pe_image.c]
Unload dummy module when PE_LoadLibraryEx32A fails with
PE_LoadImage (makes Encarta 98 installer proceed).
* [files/drive.c]
Make GetDriveType16 return DRIVE_REMOVABLE for TYPE_CDROM.
Make GetCurrentDirectory32 behave like the code does and not
like the help describes.
* [files/profile.c]
Revoke recent change in PROFILE_GetSection and try better
handling of special case.
* [include/windows.h]
Change definition of ACCEL32.
* [misc/commdlg.c]
Replace the GetXXXFilename32 macros by normal code.
Fix two reported bugs in my changes to commdlg.
* [windows/win.c]
Add a hook to catch bogus WM_SIZE messages by emitting a warning
in the appropriate case.
* [objects/bitmap.c]
Reject unreasonbable large size arguments in
CreateCompatibleBitmap32 and add an fixme for that situation.
Sun Apr 26 18:30:07 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [include/ldt.h] [debugger/*.c] [miscemu/instr.c]
Added IS_SELECTOR_SYSTEM and IS_SELECTOR_32BIT macros.
Make instruction emulation support system selectors.
* [loader/*.c]
Started moving NE specific functions to the new loader/ne
directory.
* [memory/environ.c]
Enforce the 127 chars limit only when creating the environment of
a Win16 process.
Sun Apr 26 12:22:23 1998 Andreas Mohr <100.30936@germany.net>
* [files/file.c]
Fixed an incredible typo in CopyFile32A that made it unusable
since a rewrite in 970112 (!!).
* [files/directory.c]
Fixed GetTempPath32A/W to include trailing backslash.
* [misc/ver.c]
Make find_pe_resource "work" with corrupt files.
* [misc/wsprintf.c]
Altered WPRINTF_ParseFormatA/W to treat invalid format chars
as normal output, too.
* [msdos/dpmi.c]
Implemented "Allocate/Free real mode callback" (0x0303/0x0304).
Cross your fingers if you need to use it ;) (completely untested)
Implemented "Call real mode proc with far return" (0x0301, tested).
* [msdos/int21.c]
Fixed ioctlGenericBlkDevReq/0x60.
* [relay32/dplayx.spec] [relay32/builtin32.c] [relay32/Makefile.in]
Added built-in DPLAYX.DLL.
* [windows/win.c]
Fixed GetWindowWord()/GWW_HWNDPARENT to return the window's owner
if it has no parent (SDK).
Sat Apr 25 15:09:53 1998 M.T.Fortescue <mark@mtfhpc.demon.co.uk>
* [debugger/db_disasm.c]
Fixed disassemble bug for no-display option and 'lock',
'repne' and 'repe' prefixes.
* [debugger/registers.c]
Added textual flag description output on 'info regs'.
Sat Apr 25 14:18:26 1998 Matthew Becker <mbecker@glasscity.net>
* [*/*.c]
Added stubs and/or documentation for the following functions:
LookupPrivilegeValue, OpenService, ControlService, RegGetKeySecurity,
StartService, SetComputerName, DeleteService, CloseServiceHandle,
OpenProcessToken, OpenSCManager, DeregisterEventSource,
WaitForDebugEvent, WaitForInputIdle, RegisterEventSource,
SetDebugErrorLevel, SetConsoleCursorPosition, ChoosePixelFormat,
SetPixelFormat, GetPixelFormat, DescribePixelFormat, SwapBuffers,
PolyBezier, AbortPath, DestroyAcceleratorTable, HeapWalk,
DdeInitialize, DdeUninitialize, DdeConnectList, DdeDisconnectList,
DdeCreateStringHandle, DdePostAdvise, DdeGetData, DdeNameService,
DdeGetLastError, WNetGetDirectoryType, EnumPrinters, RegFlushKey,
RegGetKeySecurity, DllGetClassObject, DllCanUnloadNow, CreateBitmap,
CreateCompatibleBitmap, CreateBitmapIndirect, GetBitmapBits,
SetBitmapBits, LoadImage, CopyImage, LoadBitmap, DrawIcon,
CreateDiscardableBitmap, SetDIBits, GetCharABCWidths, LoadTypeLib,
SetConsoleCtrlHandler, CreateConsoleScreenBuffer, ReadConsoleInput,
GetConsoleCursorInfo, SetConsoleCursorInfo, SetConsoleWindowInfo,
SetConsoleTextAttribute, SetConsoleScreenBufferSize,
FillConsoleOutputCharacter, FillConsoleOutputAttribute,
CreateMailslot, GetMailslotInfo, GetCompressedFileSize,
GetProcessWindowStation, GetThreadDesktop, SetDebugErrorLevel,
WaitForDebugEvent, SetComputerName, CreateMDIWindow.
Thu Apr 23 23:54:04 1998 Douglas Ridgway <ridgway@winehq.com>
* [include/windows.h] [objects/enhmetafile.c] [relay32/gdi32.spec]
Implement CopyEnhMetaFile, Get/SetEnhMetaFileBits, other fixes.
* [include/windows.h] [objects/metafile.c] [relay32/gdi32.spec]
32-bit metafile fixes, implement EnumMetaFile32, GetMetaFileBitsEx.
* [objects/font.c] [graphics/x11drv/xfont.c] [graphics/x11drv/text.c]
Some rotated text support for X11R6 displays.
* [win32/newfns.c] [ole/ole2nls.c]
Moved GetNumberFormat32A.
Wed Apr 22 17:38:20 1998 David Lee Lambert <lamber45@egr.msu.edu>
* [ole/ole2nls.c] [misc/network.c]
Changed some function documentation to the new style.
* [misc/network.c] [include/windows.h] [if1632/user.spec]
[relay32/mpr.spec] [misc/mpr.c]
Added stubs for some Win32 network functions; renamed some
16-bit ones with 32-bit counterparts, as well as
WNetGetDirectoryType; moved the stubs in misc/mpr.c (three of
them!) to misc/network.c.
* [ole/compobj.c] [ole/storage.c] [ole/ole2disp.c]
[ole/ole2nls.c] [ole/folders.c] [ole/moniker.c] [ole/ole2.c]
[graphics/fontengine.c] [graphics/ddraw.c] [graphics/env.c]
[graphics/driver.c] [graphics/escape.c]
Changed fprintf's to proper debug-macros.
* [include/winnls.h]
Added some flags (for internal use).
* [ole/ole2nls.c]
Added the Unicode core function, and worked out a way to hide
the commonality of the core.
* [relay32/kernel32.spec]
Added support for GetDate/Time32A/W.
Wed Apr 22 09:16:03 1998 Gordon Chaffee <chaffee@cs.berkeley.edu>
* [win32/code_page.c]
Fixed problem with MultiByteToWideChar that was introduced in
last release. Made MultiByteToWideChar more compatible with Win32.
* [graphics/x11drv/graphics.c]
Fixed problem with drawing arcs.
Tue Apr 21 11:24:58 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [ole/ole2nls.c]
Move stuff from 0x409 case to Lang_En.
* [relay32/user32.spec] [windows/winpos.c]
Added stubs for GetWindowRgn32 and SetWindowRgn32. Makes Office
Paperclip happy.
Tue Apr 21 11:16:16 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [loader/pe_image.c]
If image is relocated, TLS addresses need to be adjusted.
* [debugger/*.c]
Generalized tests for 32-bit segments.
Tue Apr 21 02:04:59 1998 James Juran <jrj120@psu.edu>
* [misc/*.c] [miscemu/*.c] [msdos/*.c] [if1632/*.c]
[include/*.h] [loader/*.c] [memory/*.c] [multimedia/*.c]
[objects/*.c]
Almost all fprintf statements converted to appropriate
debug messages.
* [README]
Updated "GETTING MORE INFORMATION" section to include WineHQ.
* [documentation/debugger]
Fixed typo.
* [windows/defwnd.c]
Added function documentation.
Sun Apr 19 16:30:58 1998 Marcus Meissner <marcus@mud.de>
* [Make.rules.in]
Added lint target (using lclint).
* [relay32/oleaut32.spec][relay32/Makefile.in][ole/typelib.c]
[ole/ole2disp.c]
Added oleaut32 spec, added some SysString functions.
* [if1632/signal.c]
Added printing of faultaddress in Linux (using CR2 debug register).
* [configure.in]
Added <sys/types.h> for statfs checks.
* [loader/*.c][debugger/break.c][debugger/hash.c]
Started to split win32/win16 module handling, preparing support
for other binary formats (like ELF).
Sat Apr 18 10:07:41 1998 Rein Klazes <rklazes@casema.net>
* [misc/registry.c]
Fixed a bug that made RegQueryValuexxx returning
incorrect registry values.
Fri Apr 17 22:59:22 1998 Alexander V. Lukyanov <lav@long.yar.ru>
* [misc/lstr.c]
FormatMessage32*: remove linefeed when nolinefeed set;
check for target underflow.
Fri Apr 17 00:38:14 1998 Alexander V. Lukyanov <lav@long.yar.ru>
* [misc/crtdll.c]
Implement xlat_file_ptr for CRT stdin/stdout/stderr address
translation.
Wed Apr 15 20:43:56 1998 Jim Peterson <jspeter@birch.ee.vt.edu>
* [controls/menu.c]
Added 'odaction' parameter to MENU_DrawMenuItem() and redirected
WM_DRAWITEM messages to GetWindow(hwnd,GW_OWNER).
Tue Apr 14 16:17:55 1998 Berend Reitsma <berend@united-info.com>
* [graphics/metafiledrv/init.c] [graphics/painting.c]
[graphics/win16drv/init.c] [graphics/x11drv/graphics.c]
[graphics/x11drv/init.c] [include/gdi.h] [include/x11drv.h]
[relay32/gdi32.spec]
Added PolyPolyline routine.
* [windows/winproc.c]
Changed WINPROC_GetProc() to return proc instead of &(jmp proc).
1998-05-03 21:01:20 +02:00
|
|
|
int size;
|
1998-04-13 14:21:30 +02:00
|
|
|
|
|
|
|
/* Compute the total size of the Unix environment */
|
|
|
|
|
|
|
|
size = EXTRA_ENV_SIZE;
|
Release 980503
Thu Apr 30 16:28:12 1998 James Juran <jrj120@psu.edu>
* [scheduler/process.c]
Implemented GetExitCodeProcess. The code is a direct translation
of GetExitCodeThread.
Mon Apr 27 22:20:25 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* [loader/pe_image.c]
Unload dummy module when PE_LoadLibraryEx32A fails with
PE_LoadImage (makes Encarta 98 installer proceed).
* [files/drive.c]
Make GetDriveType16 return DRIVE_REMOVABLE for TYPE_CDROM.
Make GetCurrentDirectory32 behave like the code does and not
like the help describes.
* [files/profile.c]
Revoke recent change in PROFILE_GetSection and try better
handling of special case.
* [include/windows.h]
Change definition of ACCEL32.
* [misc/commdlg.c]
Replace the GetXXXFilename32 macros by normal code.
Fix two reported bugs in my changes to commdlg.
* [windows/win.c]
Add a hook to catch bogus WM_SIZE messages by emitting a warning
in the appropriate case.
* [objects/bitmap.c]
Reject unreasonbable large size arguments in
CreateCompatibleBitmap32 and add an fixme for that situation.
Sun Apr 26 18:30:07 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [include/ldt.h] [debugger/*.c] [miscemu/instr.c]
Added IS_SELECTOR_SYSTEM and IS_SELECTOR_32BIT macros.
Make instruction emulation support system selectors.
* [loader/*.c]
Started moving NE specific functions to the new loader/ne
directory.
* [memory/environ.c]
Enforce the 127 chars limit only when creating the environment of
a Win16 process.
Sun Apr 26 12:22:23 1998 Andreas Mohr <100.30936@germany.net>
* [files/file.c]
Fixed an incredible typo in CopyFile32A that made it unusable
since a rewrite in 970112 (!!).
* [files/directory.c]
Fixed GetTempPath32A/W to include trailing backslash.
* [misc/ver.c]
Make find_pe_resource "work" with corrupt files.
* [misc/wsprintf.c]
Altered WPRINTF_ParseFormatA/W to treat invalid format chars
as normal output, too.
* [msdos/dpmi.c]
Implemented "Allocate/Free real mode callback" (0x0303/0x0304).
Cross your fingers if you need to use it ;) (completely untested)
Implemented "Call real mode proc with far return" (0x0301, tested).
* [msdos/int21.c]
Fixed ioctlGenericBlkDevReq/0x60.
* [relay32/dplayx.spec] [relay32/builtin32.c] [relay32/Makefile.in]
Added built-in DPLAYX.DLL.
* [windows/win.c]
Fixed GetWindowWord()/GWW_HWNDPARENT to return the window's owner
if it has no parent (SDK).
Sat Apr 25 15:09:53 1998 M.T.Fortescue <mark@mtfhpc.demon.co.uk>
* [debugger/db_disasm.c]
Fixed disassemble bug for no-display option and 'lock',
'repne' and 'repe' prefixes.
* [debugger/registers.c]
Added textual flag description output on 'info regs'.
Sat Apr 25 14:18:26 1998 Matthew Becker <mbecker@glasscity.net>
* [*/*.c]
Added stubs and/or documentation for the following functions:
LookupPrivilegeValue, OpenService, ControlService, RegGetKeySecurity,
StartService, SetComputerName, DeleteService, CloseServiceHandle,
OpenProcessToken, OpenSCManager, DeregisterEventSource,
WaitForDebugEvent, WaitForInputIdle, RegisterEventSource,
SetDebugErrorLevel, SetConsoleCursorPosition, ChoosePixelFormat,
SetPixelFormat, GetPixelFormat, DescribePixelFormat, SwapBuffers,
PolyBezier, AbortPath, DestroyAcceleratorTable, HeapWalk,
DdeInitialize, DdeUninitialize, DdeConnectList, DdeDisconnectList,
DdeCreateStringHandle, DdePostAdvise, DdeGetData, DdeNameService,
DdeGetLastError, WNetGetDirectoryType, EnumPrinters, RegFlushKey,
RegGetKeySecurity, DllGetClassObject, DllCanUnloadNow, CreateBitmap,
CreateCompatibleBitmap, CreateBitmapIndirect, GetBitmapBits,
SetBitmapBits, LoadImage, CopyImage, LoadBitmap, DrawIcon,
CreateDiscardableBitmap, SetDIBits, GetCharABCWidths, LoadTypeLib,
SetConsoleCtrlHandler, CreateConsoleScreenBuffer, ReadConsoleInput,
GetConsoleCursorInfo, SetConsoleCursorInfo, SetConsoleWindowInfo,
SetConsoleTextAttribute, SetConsoleScreenBufferSize,
FillConsoleOutputCharacter, FillConsoleOutputAttribute,
CreateMailslot, GetMailslotInfo, GetCompressedFileSize,
GetProcessWindowStation, GetThreadDesktop, SetDebugErrorLevel,
WaitForDebugEvent, SetComputerName, CreateMDIWindow.
Thu Apr 23 23:54:04 1998 Douglas Ridgway <ridgway@winehq.com>
* [include/windows.h] [objects/enhmetafile.c] [relay32/gdi32.spec]
Implement CopyEnhMetaFile, Get/SetEnhMetaFileBits, other fixes.
* [include/windows.h] [objects/metafile.c] [relay32/gdi32.spec]
32-bit metafile fixes, implement EnumMetaFile32, GetMetaFileBitsEx.
* [objects/font.c] [graphics/x11drv/xfont.c] [graphics/x11drv/text.c]
Some rotated text support for X11R6 displays.
* [win32/newfns.c] [ole/ole2nls.c]
Moved GetNumberFormat32A.
Wed Apr 22 17:38:20 1998 David Lee Lambert <lamber45@egr.msu.edu>
* [ole/ole2nls.c] [misc/network.c]
Changed some function documentation to the new style.
* [misc/network.c] [include/windows.h] [if1632/user.spec]
[relay32/mpr.spec] [misc/mpr.c]
Added stubs for some Win32 network functions; renamed some
16-bit ones with 32-bit counterparts, as well as
WNetGetDirectoryType; moved the stubs in misc/mpr.c (three of
them!) to misc/network.c.
* [ole/compobj.c] [ole/storage.c] [ole/ole2disp.c]
[ole/ole2nls.c] [ole/folders.c] [ole/moniker.c] [ole/ole2.c]
[graphics/fontengine.c] [graphics/ddraw.c] [graphics/env.c]
[graphics/driver.c] [graphics/escape.c]
Changed fprintf's to proper debug-macros.
* [include/winnls.h]
Added some flags (for internal use).
* [ole/ole2nls.c]
Added the Unicode core function, and worked out a way to hide
the commonality of the core.
* [relay32/kernel32.spec]
Added support for GetDate/Time32A/W.
Wed Apr 22 09:16:03 1998 Gordon Chaffee <chaffee@cs.berkeley.edu>
* [win32/code_page.c]
Fixed problem with MultiByteToWideChar that was introduced in
last release. Made MultiByteToWideChar more compatible with Win32.
* [graphics/x11drv/graphics.c]
Fixed problem with drawing arcs.
Tue Apr 21 11:24:58 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [ole/ole2nls.c]
Move stuff from 0x409 case to Lang_En.
* [relay32/user32.spec] [windows/winpos.c]
Added stubs for GetWindowRgn32 and SetWindowRgn32. Makes Office
Paperclip happy.
Tue Apr 21 11:16:16 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [loader/pe_image.c]
If image is relocated, TLS addresses need to be adjusted.
* [debugger/*.c]
Generalized tests for 32-bit segments.
Tue Apr 21 02:04:59 1998 James Juran <jrj120@psu.edu>
* [misc/*.c] [miscemu/*.c] [msdos/*.c] [if1632/*.c]
[include/*.h] [loader/*.c] [memory/*.c] [multimedia/*.c]
[objects/*.c]
Almost all fprintf statements converted to appropriate
debug messages.
* [README]
Updated "GETTING MORE INFORMATION" section to include WineHQ.
* [documentation/debugger]
Fixed typo.
* [windows/defwnd.c]
Added function documentation.
Sun Apr 19 16:30:58 1998 Marcus Meissner <marcus@mud.de>
* [Make.rules.in]
Added lint target (using lclint).
* [relay32/oleaut32.spec][relay32/Makefile.in][ole/typelib.c]
[ole/ole2disp.c]
Added oleaut32 spec, added some SysString functions.
* [if1632/signal.c]
Added printing of faultaddress in Linux (using CR2 debug register).
* [configure.in]
Added <sys/types.h> for statfs checks.
* [loader/*.c][debugger/break.c][debugger/hash.c]
Started to split win32/win16 module handling, preparing support
for other binary formats (like ELF).
Sat Apr 18 10:07:41 1998 Rein Klazes <rklazes@casema.net>
* [misc/registry.c]
Fixed a bug that made RegQueryValuexxx returning
incorrect registry values.
Fri Apr 17 22:59:22 1998 Alexander V. Lukyanov <lav@long.yar.ru>
* [misc/lstr.c]
FormatMessage32*: remove linefeed when nolinefeed set;
check for target underflow.
Fri Apr 17 00:38:14 1998 Alexander V. Lukyanov <lav@long.yar.ru>
* [misc/crtdll.c]
Implement xlat_file_ptr for CRT stdin/stdout/stderr address
translation.
Wed Apr 15 20:43:56 1998 Jim Peterson <jspeter@birch.ee.vt.edu>
* [controls/menu.c]
Added 'odaction' parameter to MENU_DrawMenuItem() and redirected
WM_DRAWITEM messages to GetWindow(hwnd,GW_OWNER).
Tue Apr 14 16:17:55 1998 Berend Reitsma <berend@united-info.com>
* [graphics/metafiledrv/init.c] [graphics/painting.c]
[graphics/win16drv/init.c] [graphics/x11drv/graphics.c]
[graphics/x11drv/init.c] [include/gdi.h] [include/x11drv.h]
[relay32/gdi32.spec]
Added PolyPolyline routine.
* [windows/winproc.c]
Changed WINPROC_GetProc() to return proc instead of &(jmp proc).
1998-05-03 21:01:20 +02:00
|
|
|
for (e = environ; *e; e++) size += strlen(*e) + 1;
|
1998-04-13 14:21:30 +02:00
|
|
|
|
|
|
|
/* Now allocate the environment */
|
|
|
|
|
2002-03-29 19:28:56 +01:00
|
|
|
if (!(p = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE;
|
2000-08-10 00:33:42 +02:00
|
|
|
current_envdb.environ = p;
|
2000-12-11 04:48:15 +01:00
|
|
|
env_sel = SELECTOR_AllocBlock( p, 0x10000, WINE_LDT_FLAGS_DATA );
|
1998-04-13 14:21:30 +02:00
|
|
|
|
|
|
|
/* And fill it with the Unix environment */
|
|
|
|
|
|
|
|
for (e = environ; *e; e++)
|
|
|
|
{
|
Release 980503
Thu Apr 30 16:28:12 1998 James Juran <jrj120@psu.edu>
* [scheduler/process.c]
Implemented GetExitCodeProcess. The code is a direct translation
of GetExitCodeThread.
Mon Apr 27 22:20:25 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* [loader/pe_image.c]
Unload dummy module when PE_LoadLibraryEx32A fails with
PE_LoadImage (makes Encarta 98 installer proceed).
* [files/drive.c]
Make GetDriveType16 return DRIVE_REMOVABLE for TYPE_CDROM.
Make GetCurrentDirectory32 behave like the code does and not
like the help describes.
* [files/profile.c]
Revoke recent change in PROFILE_GetSection and try better
handling of special case.
* [include/windows.h]
Change definition of ACCEL32.
* [misc/commdlg.c]
Replace the GetXXXFilename32 macros by normal code.
Fix two reported bugs in my changes to commdlg.
* [windows/win.c]
Add a hook to catch bogus WM_SIZE messages by emitting a warning
in the appropriate case.
* [objects/bitmap.c]
Reject unreasonbable large size arguments in
CreateCompatibleBitmap32 and add an fixme for that situation.
Sun Apr 26 18:30:07 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [include/ldt.h] [debugger/*.c] [miscemu/instr.c]
Added IS_SELECTOR_SYSTEM and IS_SELECTOR_32BIT macros.
Make instruction emulation support system selectors.
* [loader/*.c]
Started moving NE specific functions to the new loader/ne
directory.
* [memory/environ.c]
Enforce the 127 chars limit only when creating the environment of
a Win16 process.
Sun Apr 26 12:22:23 1998 Andreas Mohr <100.30936@germany.net>
* [files/file.c]
Fixed an incredible typo in CopyFile32A that made it unusable
since a rewrite in 970112 (!!).
* [files/directory.c]
Fixed GetTempPath32A/W to include trailing backslash.
* [misc/ver.c]
Make find_pe_resource "work" with corrupt files.
* [misc/wsprintf.c]
Altered WPRINTF_ParseFormatA/W to treat invalid format chars
as normal output, too.
* [msdos/dpmi.c]
Implemented "Allocate/Free real mode callback" (0x0303/0x0304).
Cross your fingers if you need to use it ;) (completely untested)
Implemented "Call real mode proc with far return" (0x0301, tested).
* [msdos/int21.c]
Fixed ioctlGenericBlkDevReq/0x60.
* [relay32/dplayx.spec] [relay32/builtin32.c] [relay32/Makefile.in]
Added built-in DPLAYX.DLL.
* [windows/win.c]
Fixed GetWindowWord()/GWW_HWNDPARENT to return the window's owner
if it has no parent (SDK).
Sat Apr 25 15:09:53 1998 M.T.Fortescue <mark@mtfhpc.demon.co.uk>
* [debugger/db_disasm.c]
Fixed disassemble bug for no-display option and 'lock',
'repne' and 'repe' prefixes.
* [debugger/registers.c]
Added textual flag description output on 'info regs'.
Sat Apr 25 14:18:26 1998 Matthew Becker <mbecker@glasscity.net>
* [*/*.c]
Added stubs and/or documentation for the following functions:
LookupPrivilegeValue, OpenService, ControlService, RegGetKeySecurity,
StartService, SetComputerName, DeleteService, CloseServiceHandle,
OpenProcessToken, OpenSCManager, DeregisterEventSource,
WaitForDebugEvent, WaitForInputIdle, RegisterEventSource,
SetDebugErrorLevel, SetConsoleCursorPosition, ChoosePixelFormat,
SetPixelFormat, GetPixelFormat, DescribePixelFormat, SwapBuffers,
PolyBezier, AbortPath, DestroyAcceleratorTable, HeapWalk,
DdeInitialize, DdeUninitialize, DdeConnectList, DdeDisconnectList,
DdeCreateStringHandle, DdePostAdvise, DdeGetData, DdeNameService,
DdeGetLastError, WNetGetDirectoryType, EnumPrinters, RegFlushKey,
RegGetKeySecurity, DllGetClassObject, DllCanUnloadNow, CreateBitmap,
CreateCompatibleBitmap, CreateBitmapIndirect, GetBitmapBits,
SetBitmapBits, LoadImage, CopyImage, LoadBitmap, DrawIcon,
CreateDiscardableBitmap, SetDIBits, GetCharABCWidths, LoadTypeLib,
SetConsoleCtrlHandler, CreateConsoleScreenBuffer, ReadConsoleInput,
GetConsoleCursorInfo, SetConsoleCursorInfo, SetConsoleWindowInfo,
SetConsoleTextAttribute, SetConsoleScreenBufferSize,
FillConsoleOutputCharacter, FillConsoleOutputAttribute,
CreateMailslot, GetMailslotInfo, GetCompressedFileSize,
GetProcessWindowStation, GetThreadDesktop, SetDebugErrorLevel,
WaitForDebugEvent, SetComputerName, CreateMDIWindow.
Thu Apr 23 23:54:04 1998 Douglas Ridgway <ridgway@winehq.com>
* [include/windows.h] [objects/enhmetafile.c] [relay32/gdi32.spec]
Implement CopyEnhMetaFile, Get/SetEnhMetaFileBits, other fixes.
* [include/windows.h] [objects/metafile.c] [relay32/gdi32.spec]
32-bit metafile fixes, implement EnumMetaFile32, GetMetaFileBitsEx.
* [objects/font.c] [graphics/x11drv/xfont.c] [graphics/x11drv/text.c]
Some rotated text support for X11R6 displays.
* [win32/newfns.c] [ole/ole2nls.c]
Moved GetNumberFormat32A.
Wed Apr 22 17:38:20 1998 David Lee Lambert <lamber45@egr.msu.edu>
* [ole/ole2nls.c] [misc/network.c]
Changed some function documentation to the new style.
* [misc/network.c] [include/windows.h] [if1632/user.spec]
[relay32/mpr.spec] [misc/mpr.c]
Added stubs for some Win32 network functions; renamed some
16-bit ones with 32-bit counterparts, as well as
WNetGetDirectoryType; moved the stubs in misc/mpr.c (three of
them!) to misc/network.c.
* [ole/compobj.c] [ole/storage.c] [ole/ole2disp.c]
[ole/ole2nls.c] [ole/folders.c] [ole/moniker.c] [ole/ole2.c]
[graphics/fontengine.c] [graphics/ddraw.c] [graphics/env.c]
[graphics/driver.c] [graphics/escape.c]
Changed fprintf's to proper debug-macros.
* [include/winnls.h]
Added some flags (for internal use).
* [ole/ole2nls.c]
Added the Unicode core function, and worked out a way to hide
the commonality of the core.
* [relay32/kernel32.spec]
Added support for GetDate/Time32A/W.
Wed Apr 22 09:16:03 1998 Gordon Chaffee <chaffee@cs.berkeley.edu>
* [win32/code_page.c]
Fixed problem with MultiByteToWideChar that was introduced in
last release. Made MultiByteToWideChar more compatible with Win32.
* [graphics/x11drv/graphics.c]
Fixed problem with drawing arcs.
Tue Apr 21 11:24:58 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [ole/ole2nls.c]
Move stuff from 0x409 case to Lang_En.
* [relay32/user32.spec] [windows/winpos.c]
Added stubs for GetWindowRgn32 and SetWindowRgn32. Makes Office
Paperclip happy.
Tue Apr 21 11:16:16 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [loader/pe_image.c]
If image is relocated, TLS addresses need to be adjusted.
* [debugger/*.c]
Generalized tests for 32-bit segments.
Tue Apr 21 02:04:59 1998 James Juran <jrj120@psu.edu>
* [misc/*.c] [miscemu/*.c] [msdos/*.c] [if1632/*.c]
[include/*.h] [loader/*.c] [memory/*.c] [multimedia/*.c]
[objects/*.c]
Almost all fprintf statements converted to appropriate
debug messages.
* [README]
Updated "GETTING MORE INFORMATION" section to include WineHQ.
* [documentation/debugger]
Fixed typo.
* [windows/defwnd.c]
Added function documentation.
Sun Apr 19 16:30:58 1998 Marcus Meissner <marcus@mud.de>
* [Make.rules.in]
Added lint target (using lclint).
* [relay32/oleaut32.spec][relay32/Makefile.in][ole/typelib.c]
[ole/ole2disp.c]
Added oleaut32 spec, added some SysString functions.
* [if1632/signal.c]
Added printing of faultaddress in Linux (using CR2 debug register).
* [configure.in]
Added <sys/types.h> for statfs checks.
* [loader/*.c][debugger/break.c][debugger/hash.c]
Started to split win32/win16 module handling, preparing support
for other binary formats (like ELF).
Sat Apr 18 10:07:41 1998 Rein Klazes <rklazes@casema.net>
* [misc/registry.c]
Fixed a bug that made RegQueryValuexxx returning
incorrect registry values.
Fri Apr 17 22:59:22 1998 Alexander V. Lukyanov <lav@long.yar.ru>
* [misc/lstr.c]
FormatMessage32*: remove linefeed when nolinefeed set;
check for target underflow.
Fri Apr 17 00:38:14 1998 Alexander V. Lukyanov <lav@long.yar.ru>
* [misc/crtdll.c]
Implement xlat_file_ptr for CRT stdin/stdout/stderr address
translation.
Wed Apr 15 20:43:56 1998 Jim Peterson <jspeter@birch.ee.vt.edu>
* [controls/menu.c]
Added 'odaction' parameter to MENU_DrawMenuItem() and redirected
WM_DRAWITEM messages to GetWindow(hwnd,GW_OWNER).
Tue Apr 14 16:17:55 1998 Berend Reitsma <berend@united-info.com>
* [graphics/metafiledrv/init.c] [graphics/painting.c]
[graphics/win16drv/init.c] [graphics/x11drv/graphics.c]
[graphics/x11drv/init.c] [include/gdi.h] [include/x11drv.h]
[relay32/gdi32.spec]
Added PolyPolyline routine.
* [windows/winproc.c]
Changed WINPROC_GetProc() to return proc instead of &(jmp proc).
1998-05-03 21:01:20 +02:00
|
|
|
strcpy( p, *e );
|
1998-04-13 14:21:30 +02:00
|
|
|
p += strlen(p) + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now add the program name */
|
|
|
|
|
|
|
|
FILL_EXTRA_ENV( p );
|
2002-03-29 19:28:56 +01:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* copy_str
|
|
|
|
*
|
|
|
|
* Small helper for ENV_InitStartupInfo.
|
|
|
|
*/
|
|
|
|
inline static char *copy_str( char **dst, const char **src, size_t len )
|
|
|
|
{
|
|
|
|
char *ret;
|
|
|
|
|
|
|
|
if (!len) return NULL;
|
|
|
|
ret = *dst;
|
|
|
|
memcpy( ret, *src, len );
|
|
|
|
ret[len] = 0;
|
|
|
|
*dst += len + 1;
|
|
|
|
*src += len;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* ENV_InitStartupInfo
|
|
|
|
*
|
|
|
|
* Fill the startup info structure from the server.
|
|
|
|
*/
|
|
|
|
ENVDB *ENV_InitStartupInfo( handle_t info_handle, size_t info_size,
|
|
|
|
char *main_exe_name, size_t main_exe_size )
|
|
|
|
{
|
|
|
|
startup_info_t info;
|
|
|
|
void *data;
|
|
|
|
char *dst;
|
|
|
|
const char *src;
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
if (!build_environment()) return NULL;
|
|
|
|
if (!info_size) return ¤t_envdb; /* nothing to retrieve */
|
|
|
|
|
|
|
|
if (!(data = HeapAlloc( GetProcessHeap(), 0, info_size ))) return NULL;
|
|
|
|
|
|
|
|
SERVER_START_REQ( get_startup_info )
|
|
|
|
{
|
|
|
|
req->info = info_handle;
|
|
|
|
req->close = TRUE;
|
|
|
|
wine_server_set_reply( req, data, info_size );
|
|
|
|
wine_server_call( req );
|
|
|
|
info_size = wine_server_reply_size( reply );
|
|
|
|
}
|
|
|
|
SERVER_END_REQ;
|
|
|
|
if (info_size < sizeof(info.size)) goto done;
|
|
|
|
len = min( info_size, ((startup_info_t *)data)->size );
|
|
|
|
memset( &info, 0, sizeof(info) );
|
|
|
|
memcpy( &info, data, len );
|
|
|
|
src = (char *)data + len;
|
|
|
|
info_size -= len;
|
|
|
|
|
|
|
|
/* fixup the lengths */
|
|
|
|
if (info.filename_len > info_size) info.filename_len = info_size;
|
|
|
|
info_size -= info.filename_len;
|
|
|
|
if (info.cmdline_len > info_size) info.cmdline_len = info_size;
|
|
|
|
info_size -= info.cmdline_len;
|
|
|
|
if (info.desktop_len > info_size) info.desktop_len = info_size;
|
|
|
|
info_size -= info.desktop_len;
|
|
|
|
if (info.title_len > info_size) info.title_len = info_size;
|
|
|
|
|
|
|
|
/* store the filename */
|
|
|
|
if (info.filename_len)
|
|
|
|
{
|
|
|
|
len = min( info.filename_len, main_exe_size-1 );
|
|
|
|
memcpy( main_exe_name, src, len );
|
|
|
|
main_exe_name[len] = 0;
|
|
|
|
src += info.filename_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* copy the other strings */
|
|
|
|
len = info.cmdline_len + info.desktop_len + info.title_len;
|
|
|
|
if (len && (dst = HeapAlloc( GetProcessHeap(), 0, len + 3 )))
|
|
|
|
{
|
|
|
|
current_envdb.cmd_line = copy_str( &dst, &src, info.cmdline_len );
|
|
|
|
current_startupinfo.lpDesktop = copy_str( &dst, &src, info.desktop_len );
|
|
|
|
current_startupinfo.lpTitle = copy_str( &dst, &src, info.title_len );
|
|
|
|
}
|
|
|
|
|
|
|
|
current_startupinfo.dwX = info.x;
|
|
|
|
current_startupinfo.dwY = info.y;
|
|
|
|
current_startupinfo.dwXSize = info.cx;
|
|
|
|
current_startupinfo.dwYSize = info.cy;
|
|
|
|
current_startupinfo.dwXCountChars = info.x_chars;
|
|
|
|
current_startupinfo.dwYCountChars = info.y_chars;
|
|
|
|
current_startupinfo.dwFillAttribute = info.attribute;
|
|
|
|
current_startupinfo.wShowWindow = info.cmd_show;
|
|
|
|
current_startupinfo.dwFlags = info.flags;
|
|
|
|
done:
|
|
|
|
HeapFree( GetProcessHeap(), 0, data );
|
2000-12-11 04:48:15 +01:00
|
|
|
return ¤t_envdb;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* ENV_BuildCommandLine
|
|
|
|
*
|
|
|
|
* Build the command line of a process from the argv array.
|
|
|
|
*
|
|
|
|
* Note that it does NOT necessarily include the file name.
|
|
|
|
* Sometimes we don't even have any command line options at all.
|
2001-09-20 21:05:11 +02:00
|
|
|
*
|
|
|
|
* We must quote and escape characters so that the argv array can be rebuilt
|
|
|
|
* from the command line:
|
|
|
|
* - spaces and tabs must be quoted
|
|
|
|
* 'a b' -> '"a b"'
|
|
|
|
* - quotes must be escaped
|
|
|
|
* '"' -> '\"'
|
|
|
|
* - if '\'s are followed by a '"', they must be doubled and followed by '\"',
|
|
|
|
* resulting in an odd number of '\' followed by a '"'
|
|
|
|
* '\"' -> '\\\"'
|
|
|
|
* '\\"' -> '\\\\\"'
|
|
|
|
* - '\'s that are not followed by a '"' can be left as is
|
|
|
|
* 'a\b' == 'a\b'
|
|
|
|
* 'a\\b' == 'a\\b'
|
2000-12-11 04:48:15 +01:00
|
|
|
*/
|
|
|
|
BOOL ENV_BuildCommandLine( char **argv )
|
|
|
|
{
|
2001-09-20 21:05:11 +02:00
|
|
|
int len;
|
2000-12-11 04:48:15 +01:00
|
|
|
char *p, **arg;
|
|
|
|
|
2002-03-29 19:28:56 +01:00
|
|
|
if (current_envdb.cmd_line) goto done; /* already got it from the server */
|
|
|
|
|
2001-09-20 21:05:11 +02:00
|
|
|
len = 0;
|
|
|
|
for (arg = argv; *arg; arg++)
|
2000-12-11 04:48:15 +01:00
|
|
|
{
|
2001-09-20 21:05:11 +02:00
|
|
|
int has_space,bcount;
|
|
|
|
char* a;
|
|
|
|
|
|
|
|
has_space=0;
|
|
|
|
bcount=0;
|
|
|
|
a=*arg;
|
|
|
|
while (*a!='\0') {
|
|
|
|
if (*a=='\\') {
|
|
|
|
bcount++;
|
|
|
|
} else {
|
|
|
|
if (*a==' ' || *a=='\t') {
|
|
|
|
has_space=1;
|
|
|
|
} else if (*a=='"') {
|
|
|
|
/* doubling of '\' preceeding a '"',
|
|
|
|
* plus escaping of said '"'
|
|
|
|
*/
|
|
|
|
len+=2*bcount+1;
|
|
|
|
}
|
|
|
|
bcount=0;
|
|
|
|
}
|
|
|
|
a++;
|
|
|
|
}
|
|
|
|
len+=(a-*arg)+1 /* for the separating space */;
|
|
|
|
if (has_space)
|
|
|
|
len+=2; /* for the quotes */
|
2000-12-11 04:48:15 +01:00
|
|
|
}
|
2001-09-20 21:05:11 +02:00
|
|
|
|
|
|
|
if (!(current_envdb.cmd_line = HeapAlloc( GetProcessHeap(), 0, len )))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
p = current_envdb.cmd_line;
|
|
|
|
for (arg = argv; *arg; arg++)
|
2000-12-11 04:48:15 +01:00
|
|
|
{
|
2001-09-20 21:05:11 +02:00
|
|
|
int has_space,has_quote;
|
|
|
|
char* a;
|
|
|
|
|
|
|
|
/* Check for quotes and spaces in this argument */
|
|
|
|
has_space=has_quote=0;
|
|
|
|
a=*arg;
|
|
|
|
while (*a!='\0') {
|
|
|
|
if (*a==' ' || *a=='\t') {
|
|
|
|
has_space=1;
|
|
|
|
if (has_quote)
|
|
|
|
break;
|
|
|
|
} else if (*a=='"') {
|
|
|
|
has_quote=1;
|
|
|
|
if (has_space)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
a++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now transfer it to the command line */
|
|
|
|
if (has_space)
|
|
|
|
*p++='"';
|
|
|
|
if (has_quote) {
|
|
|
|
int bcount;
|
|
|
|
char* a;
|
|
|
|
|
|
|
|
bcount=0;
|
|
|
|
a=*arg;
|
|
|
|
while (*a!='\0') {
|
|
|
|
if (*a=='\\') {
|
|
|
|
*p++=*a;
|
|
|
|
bcount++;
|
|
|
|
} else {
|
|
|
|
if (*a=='"') {
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Double all the '\\' preceeding this '"', plus one */
|
|
|
|
for (i=0;i<=bcount;i++)
|
|
|
|
*p++='\\';
|
|
|
|
*p++='"';
|
|
|
|
} else {
|
|
|
|
*p++=*a;
|
|
|
|
}
|
|
|
|
bcount=0;
|
|
|
|
}
|
|
|
|
a++;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
strcpy(p,*arg);
|
|
|
|
p+=strlen(*arg);
|
|
|
|
}
|
|
|
|
if (has_space)
|
|
|
|
*p++='"';
|
|
|
|
*p++=' ';
|
2000-12-11 04:48:15 +01:00
|
|
|
}
|
2001-09-20 21:05:11 +02:00
|
|
|
if (p > current_envdb.cmd_line)
|
|
|
|
p--; /* remove last space */
|
|
|
|
*p = '\0';
|
|
|
|
|
2000-12-11 04:48:15 +01:00
|
|
|
/* now allocate the Unicode version */
|
2002-03-29 19:28:56 +01:00
|
|
|
done:
|
2000-12-11 04:48:15 +01:00
|
|
|
len = MultiByteToWideChar( CP_ACP, 0, current_envdb.cmd_line, -1, NULL, 0 );
|
|
|
|
if (!(cmdlineW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) )))
|
|
|
|
return FALSE;
|
|
|
|
MultiByteToWideChar( CP_ACP, 0, current_envdb.cmd_line, -1, cmdlineW, len );
|
1998-04-13 14:21:30 +02:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-06-13 22:13:18 +02:00
|
|
|
* GetCommandLineA (KERNEL32.@)
|
2001-10-02 19:49:20 +02:00
|
|
|
*
|
|
|
|
* WARNING: there's a Windows incompatibility lurking here !
|
|
|
|
* Win32s always includes the full path of the program file,
|
|
|
|
* whereas Windows NT only returns the full file path plus arguments
|
|
|
|
* in case the program has been started with a full path.
|
|
|
|
* Win9x seems to have inherited NT behaviour.
|
|
|
|
*
|
|
|
|
* Note that both Start Menu Execute and Explorer start programs with
|
|
|
|
* fully specified quoted app file paths, which is why probably the only case
|
|
|
|
* where you'll see single file names is in case of direct launch
|
|
|
|
* via CreateProcess or WinExec.
|
|
|
|
*
|
|
|
|
* Perhaps we should take care of Win3.1 programs here (Win32s "feature").
|
|
|
|
*
|
|
|
|
* References: MS KB article q102762.txt (special Win32s handling)
|
1998-04-13 14:21:30 +02:00
|
|
|
*/
|
2000-06-24 15:37:05 +02:00
|
|
|
LPSTR WINAPI GetCommandLineA(void)
|
1998-04-13 14:21:30 +02:00
|
|
|
{
|
2000-08-10 00:33:42 +02:00
|
|
|
return current_envdb.cmd_line;
|
1998-04-13 14:21:30 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-06-13 22:13:18 +02:00
|
|
|
* GetCommandLineW (KERNEL32.@)
|
1998-04-13 14:21:30 +02:00
|
|
|
*/
|
2000-06-24 15:37:05 +02:00
|
|
|
LPWSTR WINAPI GetCommandLineW(void)
|
1998-04-13 14:21:30 +02:00
|
|
|
{
|
2000-12-11 04:48:15 +01:00
|
|
|
return cmdlineW;
|
1998-04-13 14:21:30 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-07-11 20:56:41 +02:00
|
|
|
* GetEnvironmentStrings (KERNEL32.@)
|
2001-06-13 22:13:18 +02:00
|
|
|
* GetEnvironmentStringsA (KERNEL32.@)
|
1998-04-13 14:21:30 +02:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
LPSTR WINAPI GetEnvironmentStringsA(void)
|
1998-04-13 14:21:30 +02:00
|
|
|
{
|
2000-08-10 00:33:42 +02:00
|
|
|
return current_envdb.environ;
|
1998-04-13 14:21:30 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-06-13 22:13:18 +02:00
|
|
|
* GetEnvironmentStringsW (KERNEL32.@)
|
1998-04-13 14:21:30 +02:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
LPWSTR WINAPI GetEnvironmentStringsW(void)
|
1998-04-13 14:21:30 +02:00
|
|
|
{
|
1999-02-26 12:11:13 +01:00
|
|
|
INT size;
|
1998-04-13 14:21:30 +02:00
|
|
|
LPWSTR ret;
|
|
|
|
|
2000-12-11 04:48:15 +01:00
|
|
|
RtlAcquirePebLock();
|
2000-08-10 00:33:42 +02:00
|
|
|
size = HeapSize( GetProcessHeap(), 0, current_envdb.environ );
|
2000-01-25 02:41:35 +01:00
|
|
|
if ((ret = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) )) != NULL)
|
1998-04-13 14:21:30 +02:00
|
|
|
{
|
2000-08-10 00:33:42 +02:00
|
|
|
LPSTR pA = current_envdb.environ;
|
1998-04-13 14:21:30 +02:00
|
|
|
LPWSTR pW = ret;
|
|
|
|
while (size--) *pW++ = (WCHAR)(BYTE)*pA++;
|
|
|
|
}
|
2000-12-11 04:48:15 +01:00
|
|
|
RtlReleasePebLock();
|
1998-04-13 14:21:30 +02:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-06-13 22:13:18 +02:00
|
|
|
* FreeEnvironmentStringsA (KERNEL32.@)
|
1998-04-13 14:21:30 +02:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
BOOL WINAPI FreeEnvironmentStringsA( LPSTR ptr )
|
1998-04-13 14:21:30 +02:00
|
|
|
{
|
2000-08-10 00:33:42 +02:00
|
|
|
if (ptr != current_envdb.environ)
|
1998-04-13 14:21:30 +02:00
|
|
|
{
|
|
|
|
SetLastError( ERROR_INVALID_PARAMETER );
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-06-13 22:13:18 +02:00
|
|
|
* FreeEnvironmentStringsW (KERNEL32.@)
|
1998-04-13 14:21:30 +02:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
BOOL WINAPI FreeEnvironmentStringsW( LPWSTR ptr )
|
1998-04-13 14:21:30 +02:00
|
|
|
{
|
|
|
|
return HeapFree( GetProcessHeap(), 0, ptr );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-06-13 22:13:18 +02:00
|
|
|
* GetEnvironmentVariableA (KERNEL32.@)
|
1998-04-13 14:21:30 +02:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
DWORD WINAPI GetEnvironmentVariableA( LPCSTR name, LPSTR value, DWORD size )
|
1998-04-13 14:21:30 +02:00
|
|
|
{
|
|
|
|
LPCSTR p;
|
1999-02-26 12:11:13 +01:00
|
|
|
INT ret = 0;
|
1998-04-13 14:21:30 +02:00
|
|
|
|
|
|
|
if (!name || !*name)
|
|
|
|
{
|
|
|
|
SetLastError( ERROR_INVALID_PARAMETER );
|
|
|
|
return 0;
|
|
|
|
}
|
2000-12-11 04:48:15 +01:00
|
|
|
RtlAcquirePebLock();
|
2000-08-10 00:33:42 +02:00
|
|
|
if ((p = ENV_FindVariable( current_envdb.environ, name, strlen(name) )))
|
1998-04-13 14:21:30 +02:00
|
|
|
{
|
|
|
|
ret = strlen(p);
|
|
|
|
if (size <= ret)
|
|
|
|
{
|
|
|
|
/* If not enough room, include the terminating null
|
|
|
|
* in the returned size and return an empty string */
|
|
|
|
ret++;
|
|
|
|
if (value) *value = '\0';
|
|
|
|
}
|
|
|
|
else if (value) strcpy( value, p );
|
|
|
|
}
|
2000-12-11 04:48:15 +01:00
|
|
|
RtlReleasePebLock();
|
2000-09-22 22:58:23 +02:00
|
|
|
if (!ret)
|
|
|
|
SetLastError( ERROR_ENVVAR_NOT_FOUND );
|
|
|
|
return ret;
|
1998-04-13 14:21:30 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-06-13 22:13:18 +02:00
|
|
|
* GetEnvironmentVariableW (KERNEL32.@)
|
1998-04-13 14:21:30 +02:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
DWORD WINAPI GetEnvironmentVariableW( LPCWSTR nameW, LPWSTR valW, DWORD size)
|
1998-04-13 14:21:30 +02:00
|
|
|
{
|
|
|
|
LPSTR name = HEAP_strdupWtoA( GetProcessHeap(), 0, nameW );
|
|
|
|
LPSTR val = valW ? HeapAlloc( GetProcessHeap(), 0, size ) : NULL;
|
1999-02-26 12:11:13 +01:00
|
|
|
DWORD res = GetEnvironmentVariableA( name, val, size );
|
1998-04-13 14:21:30 +02:00
|
|
|
HeapFree( GetProcessHeap(), 0, name );
|
|
|
|
if (val)
|
|
|
|
{
|
2000-11-28 23:40:56 +01:00
|
|
|
if (size > 0 && !MultiByteToWideChar( CP_ACP, 0, val, -1, valW, size ))
|
|
|
|
valW[size-1] = 0;
|
1998-04-13 14:21:30 +02:00
|
|
|
HeapFree( GetProcessHeap(), 0, val );
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-06-13 22:13:18 +02:00
|
|
|
* SetEnvironmentVariableA (KERNEL32.@)
|
1998-04-13 14:21:30 +02:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
BOOL WINAPI SetEnvironmentVariableA( LPCSTR name, LPCSTR value )
|
1998-04-13 14:21:30 +02:00
|
|
|
{
|
1999-02-26 12:11:13 +01:00
|
|
|
INT old_size, len, res;
|
1998-04-13 14:21:30 +02:00
|
|
|
LPSTR p, env, new_env;
|
1999-02-26 12:11:13 +01:00
|
|
|
BOOL ret = FALSE;
|
1998-04-13 14:21:30 +02:00
|
|
|
|
2000-12-11 04:48:15 +01:00
|
|
|
RtlAcquirePebLock();
|
2000-08-10 00:33:42 +02:00
|
|
|
env = p = current_envdb.environ;
|
1998-04-13 14:21:30 +02:00
|
|
|
|
|
|
|
/* Find a place to insert the string */
|
|
|
|
|
|
|
|
res = -1;
|
|
|
|
len = strlen(name);
|
|
|
|
while (*p)
|
|
|
|
{
|
2000-09-26 01:30:56 +02:00
|
|
|
if (!strncasecmp( name, p, len ) && (p[len] == '=')) break;
|
1998-04-13 14:21:30 +02:00
|
|
|
p += strlen(p) + 1;
|
|
|
|
}
|
|
|
|
if (!value && !*p) goto done; /* Value to remove doesn't exist */
|
|
|
|
|
|
|
|
/* Realloc the buffer */
|
|
|
|
|
|
|
|
len = value ? strlen(name) + strlen(value) + 2 : 0;
|
|
|
|
if (*p) len -= strlen(p) + 1; /* The name already exists */
|
2000-01-25 02:41:35 +01:00
|
|
|
old_size = HeapSize( GetProcessHeap(), 0, env );
|
1998-04-13 14:21:30 +02:00
|
|
|
if (len < 0)
|
|
|
|
{
|
|
|
|
LPSTR next = p + strlen(p) + 1; /* We know there is a next one */
|
|
|
|
memmove( next + len, next, old_size - (next - env) );
|
|
|
|
}
|
2000-01-25 02:41:35 +01:00
|
|
|
if (!(new_env = HeapReAlloc( GetProcessHeap(), 0, env, old_size + len )))
|
1998-04-13 14:21:30 +02:00
|
|
|
goto done;
|
2000-12-11 04:48:15 +01:00
|
|
|
if (env_sel) env_sel = SELECTOR_ReallocBlock( env_sel, new_env, old_size + len );
|
1998-04-13 14:21:30 +02:00
|
|
|
p = new_env + (p - env);
|
|
|
|
if (len > 0) memmove( p + len, p, old_size - (p - new_env) );
|
|
|
|
|
|
|
|
/* Set the new string */
|
|
|
|
|
|
|
|
if (value)
|
|
|
|
{
|
|
|
|
strcpy( p, name );
|
|
|
|
strcat( p, "=" );
|
|
|
|
strcat( p, value );
|
|
|
|
}
|
2000-08-10 00:33:42 +02:00
|
|
|
current_envdb.environ = new_env;
|
1998-04-13 14:21:30 +02:00
|
|
|
ret = TRUE;
|
|
|
|
|
|
|
|
done:
|
2000-12-11 04:48:15 +01:00
|
|
|
RtlReleasePebLock();
|
1998-04-13 14:21:30 +02:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-06-13 22:13:18 +02:00
|
|
|
* SetEnvironmentVariableW (KERNEL32.@)
|
1998-04-13 14:21:30 +02:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
BOOL WINAPI SetEnvironmentVariableW( LPCWSTR name, LPCWSTR value )
|
1998-04-13 14:21:30 +02:00
|
|
|
{
|
|
|
|
LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
|
|
|
|
LPSTR valueA = HEAP_strdupWtoA( GetProcessHeap(), 0, value );
|
1999-02-26 12:11:13 +01:00
|
|
|
BOOL ret = SetEnvironmentVariableA( nameA, valueA );
|
1998-04-13 14:21:30 +02:00
|
|
|
HeapFree( GetProcessHeap(), 0, nameA );
|
|
|
|
HeapFree( GetProcessHeap(), 0, valueA );
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-06-13 22:13:18 +02:00
|
|
|
* ExpandEnvironmentStringsA (KERNEL32.@)
|
1998-04-13 14:21:30 +02:00
|
|
|
*
|
|
|
|
* Note: overlapping buffers are not supported; this is how it should be.
|
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
DWORD WINAPI ExpandEnvironmentStringsA( LPCSTR src, LPSTR dst, DWORD count )
|
1998-04-13 14:21:30 +02:00
|
|
|
{
|
|
|
|
DWORD len, total_size = 1; /* 1 for terminating '\0' */
|
|
|
|
LPCSTR p, var;
|
|
|
|
|
|
|
|
if (!count) dst = NULL;
|
2000-12-11 04:48:15 +01:00
|
|
|
RtlAcquirePebLock();
|
1998-04-13 14:21:30 +02:00
|
|
|
|
|
|
|
while (*src)
|
|
|
|
{
|
|
|
|
if (*src != '%')
|
|
|
|
{
|
|
|
|
if ((p = strchr( src, '%' ))) len = p - src;
|
|
|
|
else len = strlen(src);
|
|
|
|
var = src;
|
|
|
|
src += len;
|
|
|
|
}
|
|
|
|
else /* we are at the start of a variable */
|
|
|
|
{
|
|
|
|
if ((p = strchr( src + 1, '%' )))
|
|
|
|
{
|
|
|
|
len = p - src - 1; /* Length of the variable name */
|
2000-08-10 00:33:42 +02:00
|
|
|
if ((var = ENV_FindVariable( current_envdb.environ,
|
1998-04-13 14:21:30 +02:00
|
|
|
src + 1, len )))
|
|
|
|
{
|
|
|
|
src += len + 2; /* Skip the variable name */
|
|
|
|
len = strlen(var);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
var = src; /* Copy original name instead */
|
|
|
|
len += 2;
|
|
|
|
src += len;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else /* unfinished variable name, ignore it */
|
|
|
|
{
|
|
|
|
var = src;
|
|
|
|
len = strlen(src); /* Copy whole string */
|
|
|
|
src += len;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
total_size += len;
|
|
|
|
if (dst)
|
|
|
|
{
|
|
|
|
if (count < len) len = count;
|
|
|
|
memcpy( dst, var, len );
|
|
|
|
dst += len;
|
|
|
|
count -= len;
|
|
|
|
}
|
|
|
|
}
|
2000-12-11 04:48:15 +01:00
|
|
|
RtlReleasePebLock();
|
1998-04-13 14:21:30 +02:00
|
|
|
|
|
|
|
/* Null-terminate the string */
|
|
|
|
if (dst)
|
|
|
|
{
|
|
|
|
if (!count) dst--;
|
|
|
|
*dst = '\0';
|
|
|
|
}
|
|
|
|
return total_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-06-13 22:13:18 +02:00
|
|
|
* ExpandEnvironmentStringsW (KERNEL32.@)
|
1998-04-13 14:21:30 +02:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
DWORD WINAPI ExpandEnvironmentStringsW( LPCWSTR src, LPWSTR dst, DWORD len )
|
1998-04-13 14:21:30 +02:00
|
|
|
{
|
|
|
|
LPSTR srcA = HEAP_strdupWtoA( GetProcessHeap(), 0, src );
|
|
|
|
LPSTR dstA = dst ? HeapAlloc( GetProcessHeap(), 0, len ) : NULL;
|
1999-02-26 12:11:13 +01:00
|
|
|
DWORD ret = ExpandEnvironmentStringsA( srcA, dstA, len );
|
1998-04-13 14:21:30 +02:00
|
|
|
if (dstA)
|
|
|
|
{
|
2000-11-28 23:40:56 +01:00
|
|
|
ret = MultiByteToWideChar( CP_ACP, 0, dstA, -1, dst, len );
|
1998-04-13 14:21:30 +02:00
|
|
|
HeapFree( GetProcessHeap(), 0, dstA );
|
|
|
|
}
|
|
|
|
HeapFree( GetProcessHeap(), 0, srcA );
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2000-08-10 00:33:42 +02:00
|
|
|
|
2000-12-11 04:48:15 +01:00
|
|
|
/***********************************************************************
|
2001-07-11 20:56:41 +02:00
|
|
|
* GetDOSEnvironment (KERNEL.131)
|
|
|
|
* GetDOSEnvironment16 (KERNEL32.@)
|
2000-12-11 04:48:15 +01:00
|
|
|
*/
|
|
|
|
SEGPTR WINAPI GetDOSEnvironment16(void)
|
|
|
|
{
|
2000-12-13 21:20:09 +01:00
|
|
|
return MAKESEGPTR( env_sel, 0 );
|
2000-12-11 04:48:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-08-10 00:33:42 +02:00
|
|
|
/***********************************************************************
|
2001-06-13 22:13:18 +02:00
|
|
|
* GetStdHandle (KERNEL32.@)
|
2000-08-10 00:33:42 +02:00
|
|
|
*/
|
|
|
|
HANDLE WINAPI GetStdHandle( DWORD std_handle )
|
|
|
|
{
|
|
|
|
switch(std_handle)
|
|
|
|
{
|
|
|
|
case STD_INPUT_HANDLE: return current_envdb.hStdin;
|
|
|
|
case STD_OUTPUT_HANDLE: return current_envdb.hStdout;
|
|
|
|
case STD_ERROR_HANDLE: return current_envdb.hStderr;
|
|
|
|
}
|
|
|
|
SetLastError( ERROR_INVALID_PARAMETER );
|
|
|
|
return INVALID_HANDLE_VALUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-06-13 22:13:18 +02:00
|
|
|
* SetStdHandle (KERNEL32.@)
|
2000-08-10 00:33:42 +02:00
|
|
|
*/
|
|
|
|
BOOL WINAPI SetStdHandle( DWORD std_handle, HANDLE handle )
|
|
|
|
{
|
|
|
|
switch(std_handle)
|
|
|
|
{
|
|
|
|
case STD_INPUT_HANDLE: current_envdb.hStdin = handle; return TRUE;
|
|
|
|
case STD_OUTPUT_HANDLE: current_envdb.hStdout = handle; return TRUE;
|
|
|
|
case STD_ERROR_HANDLE: current_envdb.hStderr = handle; return TRUE;
|
|
|
|
}
|
|
|
|
SetLastError( ERROR_INVALID_PARAMETER );
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-06-13 22:13:18 +02:00
|
|
|
* GetStartupInfoA (KERNEL32.@)
|
2000-08-10 00:33:42 +02:00
|
|
|
*/
|
|
|
|
VOID WINAPI GetStartupInfoA( LPSTARTUPINFOA info )
|
|
|
|
{
|
|
|
|
*info = current_startupinfo;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-06-13 22:13:18 +02:00
|
|
|
* GetStartupInfoW (KERNEL32.@)
|
2000-08-10 00:33:42 +02:00
|
|
|
*/
|
|
|
|
VOID WINAPI GetStartupInfoW( LPSTARTUPINFOW info )
|
|
|
|
{
|
|
|
|
info->cb = sizeof(STARTUPINFOW);
|
|
|
|
info->dwX = current_startupinfo.dwX;
|
|
|
|
info->dwY = current_startupinfo.dwY;
|
|
|
|
info->dwXSize = current_startupinfo.dwXSize;
|
|
|
|
info->dwXCountChars = current_startupinfo.dwXCountChars;
|
|
|
|
info->dwYCountChars = current_startupinfo.dwYCountChars;
|
|
|
|
info->dwFillAttribute = current_startupinfo.dwFillAttribute;
|
|
|
|
info->dwFlags = current_startupinfo.dwFlags;
|
|
|
|
info->wShowWindow = current_startupinfo.wShowWindow;
|
|
|
|
info->cbReserved2 = current_startupinfo.cbReserved2;
|
|
|
|
info->lpReserved2 = current_startupinfo.lpReserved2;
|
|
|
|
info->hStdInput = current_startupinfo.hStdInput;
|
|
|
|
info->hStdOutput = current_startupinfo.hStdOutput;
|
|
|
|
info->hStdError = current_startupinfo.hStdError;
|
|
|
|
info->lpReserved = HEAP_strdupAtoW (GetProcessHeap(), 0, current_startupinfo.lpReserved );
|
|
|
|
info->lpDesktop = HEAP_strdupAtoW (GetProcessHeap(), 0, current_startupinfo.lpDesktop );
|
|
|
|
info->lpTitle = HEAP_strdupAtoW (GetProcessHeap(), 0, current_startupinfo.lpTitle );
|
|
|
|
}
|