JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* autoload.cc (GetConsoleWindow): Drop.

Browse Source 
(GetSystemWindowsDirectoryW): Drop.
	* fhandler_console.cc (beep): Call GetSystemWindowsDirectoryW instead of
	GetWindowsDirectoryW.
	* uinfo.cc (cygheap_user::env_systemroot): Call
	GetSystemWindowsDirectoryW and convert to multibyte on the fly.
	* winlean.h (GetWindowsDirectoryW): Redefine to something invalid.
	Explain why.
This commit is contained in:
Corinna Vinschen
2011-04-19 10:15:09 +00:00
parent b18cb86be7
commit ba6aad1d73
5 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
winsup/cygwin/uinfo.cc
View File

@@ -454,19 +454,16 @@ cygheap_user::env_systemroot (const char *name, size_t namelen)
{
if (!psystemroot)
{
int size = GetWindowsDirectory (NULL, 0);
int size = GetSystemWindowsDirectoryW (NULL, 0);
if (size > 0)
{
psystemroot = (char *) cmalloc_abort (HEAP_STR, ++size);
size = GetWindowsDirectory (psystemroot, size);
if (size <= 0)
{
cfree (psystemroot);
psystemroot = NULL;
}
WCHAR wsystemroot[size];
size = GetSystemWindowsDirectoryW (wsystemroot, size);
if (size > 0)
sys_wcstombs_alloc (&psystemroot, HEAP_STR, wsystemroot);
}
if (size <= 0)
debug_printf ("GetWindowsDirectory(), %E");
debug_printf ("GetSystemWindowsDirectoryW(), %E");
}
return psystemroot;
}