From: Vitaly Lipatov <lav@etersoft.ru>
Date: Mon, 28 Apr 2008 14:41:29 +0000 (+0400)
Subject: Fix eterbug #648 (aside patch)
X-Git-Tag: school-0.7~202^2~1
X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=016573383b288d02b27c3f962c0510549ccd40db;p=wine%2Feterwine.git

Fix eterbug #648 (aside patch)
---

diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index ad9373de4f..6c194f5570 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -2569,7 +2569,9 @@ void __wine_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir )
 
     RtlCreateUnicodeString( &windows_dir, windir );
     RtlCreateUnicodeString( &system_dir, sysdir );
+#if !defined(__FreeBSD__)
     strcpyW( user_shared_data->NtSystemRoot, windir );
+#endif
 
     /* prepend the system dir to the name of the already created modules */
     mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList;
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index 45700442da..7f77c4e9b3 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -343,12 +343,15 @@ HANDLE thread_init(void)
 
     /* initialize time values in user_shared_data */
     NtQuerySystemTime( &now );
+
+#if !defined(__FreeBSD__)
     user_shared_data->SystemTime.LowPart = now.u.LowPart;
     user_shared_data->SystemTime.High1Time = user_shared_data->SystemTime.High2Time = now.u.HighPart;
     user_shared_data->u.TickCountQuad = (now.QuadPart - server_start_time) / 10000;
     user_shared_data->u.TickCount.High2Time = user_shared_data->u.TickCount.High1Time;
     user_shared_data->TickCountLowDeprecated = user_shared_data->u.TickCount.LowPart;
     user_shared_data->TickCountMultiplier = 1 << 24;
+#endif
 
     return exe_file;
 }
diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c
index 0ea1e520ed..95b59118ef 100644
--- a/dlls/ntdll/version.c
+++ b/dlls/ntdll/version.c
@@ -572,12 +572,14 @@ done:
     NtCurrentTeb()->Peb->OSBuildNumber  = current_version->dwBuildNumber;
     NtCurrentTeb()->Peb->OSPlatformId   = current_version->dwPlatformId;
 
+#if ! defined(__FreeBSD__)
     user_shared_data->NtProductType      = current_version->wProductType;
     user_shared_data->ProductTypeIsValid = TRUE;
     user_shared_data->MajorNtVersion     = current_version->dwMajorVersion;
     user_shared_data->MinorNtVersion     = current_version->dwMinorVersion;
     user_shared_data->MinorNtVersion     = current_version->dwMinorVersion;
     user_shared_data->SuiteMask          = current_version->wSuiteMask;
+#endif
 
     TRACE( "got %d.%d plaform %d build %x name %s service pack %d.%d product %d\n",
            current_version->dwMajorVersion, current_version->dwMinorVersion,