diff options
Diffstat (limited to 'setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx')
-rw-r--r-- | setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx index f983338936f0..5f8b15e83dd2 100644 --- a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx +++ b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx @@ -67,11 +67,17 @@ extern "C" UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle ) std::_tstring sDesktopFile = sOfficeMenuFolder + TEXT("Desktop.ini"); std::_tstring sIconFile = GetMsiProperty( handle, TEXT("INSTALLLOCATION") ) + TEXT("program\\soffice.exe"); +// the Win32 SDK 8.1 deprecates GetVersionEx() +#ifdef _WIN32_WINNT_WINBLUE + bool const bIsVistaOrLater = IsWindowsVistaOrGreater() ? true : false; +#else OSVERSIONINFO osverinfo; osverinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); GetVersionEx( &osverinfo ); + bool const bIsVistaOrLater = (osverinfo.dwMajorVersion >= 6); +#endif - if (osverinfo.dwMajorVersion < 6 /* && osverinfo.dwMinorVersion */ ) + if (!bIsVistaOrLater) { WritePrivateProfileString( TEXT(".ShellClassInfo"), |