salframe.cxx (79aad27f) | salframe.cxx (aa150a94) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 350 unchanged lines hidden (view full) --- 359 360 static int bLayeredAPI = -1; 361 if( bLayeredAPI == -1 ) 362 { 363 bLayeredAPI = 0; 364 // check for W2k and XP 365 if ( aSalShlData.maVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT && aSalShlData.maVersionInfo.dwMajorVersion >= 5 ) 366 { | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 350 unchanged lines hidden (view full) --- 359 360 static int bLayeredAPI = -1; 361 if( bLayeredAPI == -1 ) 362 { 363 bLayeredAPI = 0; 364 // check for W2k and XP 365 if ( aSalShlData.maVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT && aSalShlData.maVersionInfo.dwMajorVersion >= 5 ) 366 { |
367 OUString aLibraryName( RTL_CONSTASCII_USTRINGPARAM( "user32" ) ); 368 oslModule pLib = osl_loadModule( aLibraryName.pData, SAL_LOADMODULE_DEFAULT ); | 367 oslModule pLib = osl_loadAsciiModule( "user32", SAL_LOADMODULE_DEFAULT ); |
369 oslGenericFunction pFunc = NULL; 370 if( pLib ) 371 pFunc = osl_getAsciiFunctionSymbol( pLib, "SetLayeredWindowAttributes" ); 372 373 lpfnSetLayeredWindowAttributes = ( SetLayeredWindowAttributes_Proc_T ) pFunc; 374 375 bLayeredAPI = pFunc ? 1 : 0; 376 } --- 1741 unchanged lines hidden (view full) --- 2118 { 2119 if ( pSalData->mnSageStatus != DISABLE_AGENT ) 2120 { 2121 OFSTRUCT aOS; 2122 OpenFile( "SAGE.DLL", &aOS, OF_EXIST ); 2123 2124 if ( !aOS.nErrCode ) 2125 { | 368 oslGenericFunction pFunc = NULL; 369 if( pLib ) 370 pFunc = osl_getAsciiFunctionSymbol( pLib, "SetLayeredWindowAttributes" ); 371 372 lpfnSetLayeredWindowAttributes = ( SetLayeredWindowAttributes_Proc_T ) pFunc; 373 374 bLayeredAPI = pFunc ? 1 : 0; 375 } --- 1741 unchanged lines hidden (view full) --- 2117 { 2118 if ( pSalData->mnSageStatus != DISABLE_AGENT ) 2119 { 2120 OFSTRUCT aOS; 2121 OpenFile( "SAGE.DLL", &aOS, OF_EXIST ); 2122 2123 if ( !aOS.nErrCode ) 2124 { |
2126 OUString aLibraryName( OUString::createFromAscii( aOS.szPathName ) ); 2127 oslModule mhSageInst = osl_loadModule( aLibraryName.pData, SAL_LOADMODULE_DEFAULT ); | 2125 oslModule mhSageInst = osl_loadAsciiModule( aOS.szPathName, SAL_LOADMODULE_DEFAULT ); |
2128 pSalData->mpSageEnableProc = (SysAgt_Enable_PROC)osl_getAsciiFunctionSymbol( mhSageInst, "System_Agent_Enable" ); 2129 } 2130 else 2131 pSalData->mnSageStatus = DISABLE_AGENT; 2132 } 2133 } 2134 2135 if ( pSalData->mpSageEnableProc ) --- 718 unchanged lines hidden (view full) --- 2854 return S_OK; 2855} 2856 2857static BOOL ImplDwmIsCompositionEnabled() 2858{ 2859 SalData* pSalData = GetSalData(); 2860 if( ! pSalData->mpDwmIsCompositionEnabled ) 2861 { | 2126 pSalData->mpSageEnableProc = (SysAgt_Enable_PROC)osl_getAsciiFunctionSymbol( mhSageInst, "System_Agent_Enable" ); 2127 } 2128 else 2129 pSalData->mnSageStatus = DISABLE_AGENT; 2130 } 2131 } 2132 2133 if ( pSalData->mpSageEnableProc ) --- 718 unchanged lines hidden (view full) --- 2852 return S_OK; 2853} 2854 2855static BOOL ImplDwmIsCompositionEnabled() 2856{ 2857 SalData* pSalData = GetSalData(); 2858 if( ! pSalData->mpDwmIsCompositionEnabled ) 2859 { |
2862 rtl::OUString aLibraryName( RTL_CONSTASCII_USTRINGPARAM( "Dwmapi.dll" ) ); 2863 pSalData->maDwmLib = osl_loadModule( aLibraryName.pData, SAL_LOADMODULE_DEFAULT ); | 2860 pSalData->maDwmLib = osl_loadAsciiModule( "Dwmapi.dll", SAL_LOADMODULE_DEFAULT ); |
2864 if( pSalData->maDwmLib ) 2865 pSalData->mpDwmIsCompositionEnabled = (DwmIsCompositionEnabled_ptr)osl_getAsciiFunctionSymbol( pSalData->maDwmLib, "DwmIsCompositionEnabled" ); 2866 if( ! pSalData->mpDwmIsCompositionEnabled ) // something failed 2867 pSalData->mpDwmIsCompositionEnabled = backwardCompatibleDwmIsCompositionEnabled; 2868 } 2869 BOOL aResult = FALSE; 2870 HRESULT nError = pSalData->mpDwmIsCompositionEnabled( &aResult ); 2871 return nError == S_OK && aResult; --- 3532 unchanged lines hidden --- | 2861 if( pSalData->maDwmLib ) 2862 pSalData->mpDwmIsCompositionEnabled = (DwmIsCompositionEnabled_ptr)osl_getAsciiFunctionSymbol( pSalData->maDwmLib, "DwmIsCompositionEnabled" ); 2863 if( ! pSalData->mpDwmIsCompositionEnabled ) // something failed 2864 pSalData->mpDwmIsCompositionEnabled = backwardCompatibleDwmIsCompositionEnabled; 2865 } 2866 BOOL aResult = FALSE; 2867 HRESULT nError = pSalData->mpDwmIsCompositionEnabled( &aResult ); 2868 return nError == S_OK && aResult; --- 3532 unchanged lines hidden --- |