strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS hr39 (1.27.26); FILE MERGED

Browse source 
2006/10/11 12:24:36 hr 1.27.26.1: #i70157#: check if the system is a single processor, singe core, non HT x86 system
This commit is contained in:
Rüdiger Timm 2006-10-27 11:00:10 +00:00
parent 37889c81b9
commit 69df370546
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sal/osl/w32/dllentry.c
View file

@ -4,9 +4,9 @@
*
* $RCSfile: dllentry.c,v $
*
* $Revision: 1.27 $
* $Revision: 1.28 $
*
* last change: $Author: ihi $ $Date: 2006-08-04 11:12:33 $
* last change: $Author: rt $ $Date: 2006-10-27 12:00:10 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -156,6 +156,9 @@ static void InitDCOM(void)
//------------------------------------------------------------------------------
// DllMain
//------------------------------------------------------------------------------
#ifdef _M_IX86
int osl_isSingleCPU = 0;
#endif
static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
{
@ -180,6 +183,16 @@ static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvR
if ((SystemInfo.dwProcessorType != PROCESSOR_INTEL_486) &&
(SystemInfo.dwProcessorType != PROCESSOR_INTEL_PENTIUM))
showMessage(ERR_GENERAL_WRONG_CPU);
/* Determine if we are on a multiprocessor/multicore/HT x86/x64 system
*
* The lock prefix for atomic operations in osl_[inc|de]crementInterlockedCount()
* comes with a cost and is especially expensive on pre HT x86 single processor
* systems, where it isn't needed at all.
*/
if ( SystemInfo.dwNumberOfProcessors == 1 ) {
osl_isSingleCPU = 1;
}
#endif
/* Suppress file error messages from system like "Floppy A: not inserted" */
SetErrorMode( SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS );