ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

krnl386: The 16bit system directory is <windir>\SYSTEM.

This commit is contained in:
Detlef Riekenberg 2010-01-06 14:37:52 +01:00 committed by Alexandre Julliard
parent 69bf18567f
commit 220af426b3
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/krnl386.exe16/file.c
View File

@ -190,14 +190,14 @@ static char *get_search_path(void)
} }
len = (2 + /* search order: first current dir */ len = (2 + /* search order: first current dir */
GetSystemDirectoryA( NULL, 0 ) + 1 + /* then system dir */ GetSystemDirectory16( NULL, 0 ) + 1 + /* then system dir */
GetWindowsDirectoryA( NULL, 0 ) + 1 + /* then windows dir */ GetWindowsDirectoryA( NULL, 0 ) + 1 + /* then windows dir */
strlen( module ) + 1 + /* then module path */ strlen( module ) + 1 + /* then module path */
GetEnvironmentVariableA( "PATH", NULL, 0 ) + 1); /* then look in PATH */ GetEnvironmentVariableA( "PATH", NULL, 0 ) + 1); /* then look in PATH */
if (!(ret = HeapAlloc( GetProcessHeap(), 0, len ))) return NULL; if (!(ret = HeapAlloc( GetProcessHeap(), 0, len ))) return NULL;
strcpy( ret, ".;" ); strcpy( ret, ".;" );
p = ret + 2; p = ret + 2;
GetSystemDirectoryA( p, ret + len - p ); GetSystemDirectory16( p, ret + len - p );
p += strlen( p ); p += strlen( p );
*p++ = ';'; *p++ = ';';
GetWindowsDirectoryA( p, ret + len - p ); GetWindowsDirectoryA( p, ret + len - p );
@ -629,7 +629,18 @@ UINT16 WINAPI GetWindowsDirectory16( LPSTR path, UINT16 count )
*/ */
UINT16 WINAPI GetSystemDirectory16( LPSTR path, UINT16 count ) UINT16 WINAPI GetSystemDirectory16( LPSTR path, UINT16 count )
{ {
return GetSystemDirectoryA( path, count ); static const char * system16 = "\\SYSTEM";
char windir[MAX_PATH];
UINT16 len;
len = GetWindowsDirectory16(windir, sizeof(windir) - sizeof(system16)) + sizeof(system16);
if (count >= len)
{
lstrcpyA(path, windir);
lstrcatA(path, system16);
len--; /* space for the terminating zero is not included on success */
}
return len;
} }