diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2008-03-07 11:24:51 +0000 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2008-03-07 11:24:51 +0000 |
commit | 752b16ce359bb46948b8aa2bc88f7c32bf2cc95b (patch) | |
tree | 1ed3d9abb89e7e21ee47faf099632cf05b3a05be /winsup/cygwin/registry.cc | |
parent | d8e218442b004997287aaf202af88d9f1f86074e (diff) | |
download | cygnal-752b16ce359bb46948b8aa2bc88f7c32bf2cc95b.tar.gz cygnal-752b16ce359bb46948b8aa2bc88f7c32bf2cc95b.tar.bz2 cygnal-752b16ce359bb46948b8aa2bc88f7c32bf2cc95b.zip |
* Makefile.in (DLL_OFILES): Add tls_pbuf.o.
* autoload.cc (CreateDesktopW): Replace CreateDesktopA.
(CreateWindowStationW): Replace CreateWindowStationA.
(GetUserObjectInformationW): Replace GetUserObjectInformationA.
* cygheap.h (cwdstuff::get): Assume default buffer size NT_MAX_PATH.
* cygtls.cc (_cygtls::remove): Free temporary TLS path buffers.
* cygtls.h (TP_NUM_C_BUFS): Define.
(TP_NUM_W_BUFS): Define.
(class tls_pathbuf): New class to store pointers to thread local
temporary path buffers.
(_local_storage::pathbufs): New member.
* environ.cc (win_env::add_cache): Use temporary TLS path buffer instead
of stack based buffer.
(posify): Get temporary outenv buffer from calling function.
(environ_init): Create temporary TLS path buffer for posify.
(build_env): Create Windows environment block as WCHAR buffer.
* environ.h (build_env): Change declaration accordingly.
* external.cc (sync_winenv): Accommodate build_env change.
* fhandler_console.cc (fhandler_console::need_invisible): Use
GetUserObjectInformationW and CreateWindowStationW.
* fhandler_process.cc (format_process_maps): Use temporary TLS path
buffer instead of stack based buffer.
* fork.cc (frok::parent): Convert to use CreateProcessW.
* path.cc: Throughout use temporary TLS path buffers instead of stack
based buffer. Replace checks for CYG_MAX_PATH by checks for
NT_MAX_PATH.
(getfileattr): New function to replace GetFileAttributesA.
(normalize_win32_path): Remove Win32 and NT long path prefixes.
(getwd): Assume PATH_MAX + 1 buffer per SUSv3.
* path.h (class path_conv): Set path buffer to size NT_MAX_PATH.
(iswdrive): Define.
* pinfo.cc (commune_process): Use temporary TLS path buffer instead of
stack based buffer.
* registry.cc (get_registry_hive_path): Ditto.
(load_registry_hive): Ditto.
* spawn.cc (spawn_guts): Convert to use CreateProcessW and
CreateProcessAsUserW.
(av::fixup): Open/close file using NtOpenFile/NtClose.
* syscalls.cc (mknod_worker): Allow PATH_MAX file name.
(mknod32): Ditto.
(getusershell): Ditto.
* tls_pbuf.cc: New file implementing tls_pathbuf and tmp_pathbuf
methods.
* tls_pbuf.h: New header for files using tmp_pathbuf.
* tlsoffsets.h: Regenerate.
* winsup.h (NT_MAX_PATH): Define as 32767 to avoid USHORT overflow.
Diffstat (limited to 'winsup/cygwin/registry.cc')
-rw-r--r-- | winsup/cygwin/registry.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/winsup/cygwin/registry.cc b/winsup/cygwin/registry.cc index 8316551a5..ce0987502 100644 --- a/winsup/cygwin/registry.cc +++ b/winsup/cygwin/registry.cc @@ -19,6 +19,7 @@ details. */ #include "fhandler.h" #include "dtable.h" #include "cygheap.h" +#include "tls_pbuf.h" #include <wchar.h> static const char cygnus_class[] = "cygnus"; @@ -220,12 +221,13 @@ get_registry_hive_path (const PWCHAR name, PWCHAR path) wcpcpy (kend, name); if (!RegOpenKeyExW (HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hkey)) { - WCHAR buf[NT_MAX_PATH]; + tmp_pathbuf tp; + PWCHAR buf = tp.w_get (); DWORD type, siz; path[0] = L'\0'; if (!RegQueryValueExW (hkey, L"ProfileImagePath", 0, &type, - (BYTE *)buf, (siz = sizeof (buf), &siz))) + (BYTE *)buf, (siz = NT_MAX_PATH, &siz))) ExpandEnvironmentStringsW (buf, path, NT_MAX_PATH); RegCloseKey (hkey); if (path[0]) @@ -238,7 +240,8 @@ get_registry_hive_path (const PWCHAR name, PWCHAR path) void load_registry_hive (const PWCHAR name) { - WCHAR path[NT_MAX_PATH]; + tmp_pathbuf tp; + PWCHAR path = tp.w_get (); HKEY hkey; LONG ret; |