ntdll: Store the windows directory too.

This commit is contained in:
Jacek Caban 2007-07-19 18:05:59 +02:00 committed by Alexandre Julliard
parent 63e4b943a9
commit 125e710ff1
2 changed files with 3 additions and 0 deletions

View File

@ -91,6 +91,7 @@ static UINT tls_module_count; /* number of modules with TLS directory */
static UINT tls_total_size; /* total size of TLS storage */ static UINT tls_total_size; /* total size of TLS storage */
static const IMAGE_TLS_DIRECTORY **tls_dirs; /* array of TLS directories */ static const IMAGE_TLS_DIRECTORY **tls_dirs; /* array of TLS directories */
UNICODE_STRING windows_dir = { 0, 0, NULL }; /* windows directory */
UNICODE_STRING system_dir = { 0, 0, NULL }; /* system directory */ UNICODE_STRING system_dir = { 0, 0, NULL }; /* system directory */
static RTL_CRITICAL_SECTION loader_section; static RTL_CRITICAL_SECTION loader_section;
@ -2312,6 +2313,7 @@ void __wine_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir )
PLIST_ENTRY mark, entry; PLIST_ENTRY mark, entry;
LPWSTR buffer, p; LPWSTR buffer, p;
RtlCreateUnicodeString( &windows_dir, windir );
RtlCreateUnicodeString( &system_dir, sysdir ); RtlCreateUnicodeString( &system_dir, sysdir );
strcpyW( user_shared_data->NtSystemRoot, windir ); strcpyW( user_shared_data->NtSystemRoot, windir );

View File

@ -76,6 +76,7 @@ extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY
FARPROC origfun, DWORD ordinal, const WCHAR *user ); FARPROC origfun, DWORD ordinal, const WCHAR *user );
extern void RELAY_SetupDLL( HMODULE hmod ); extern void RELAY_SetupDLL( HMODULE hmod );
extern void SNOOP_SetupDLL( HMODULE hmod ); extern void SNOOP_SetupDLL( HMODULE hmod );
extern UNICODE_STRING windows_dir;
extern UNICODE_STRING system_dir; extern UNICODE_STRING system_dir;
/* redefine these to make sure we don't reference kernel symbols */ /* redefine these to make sure we don't reference kernel symbols */