mirror of
https://github.com/chibicitiberiu/rainmeter-studio.git
synced 2024-02-24 04:33:31 +00:00
Remove Platform version helpers and use <VersionHelpers.h> per http://msdn.microsoft.com/en-us/library/windows/desktop/dn424972%28v=vs.85%29.aspx
This commit is contained in:
@@ -22,7 +22,6 @@
|
||||
#include "Resource.h"
|
||||
#include "Util.h"
|
||||
#include "../Common/ControlTemplate.h"
|
||||
#include "../Common/Platform.h"
|
||||
|
||||
#define APPNAME L"Rainmeter"
|
||||
|
||||
@@ -176,7 +175,7 @@ INT_PTR CDialogInstall::OnInitDialog(WPARAM wParam, LPARAM lParam)
|
||||
|
||||
item = GetControl(Id_InstallButton);
|
||||
SendMessage(m_Window, WM_NEXTDLGCTL, (WPARAM)item, TRUE);
|
||||
if (Platform::IsAtLeastWinVista() && !Util::IsProcessUserAdmin())
|
||||
if (IsWindowsVistaOrGreater() && !Util::IsProcessUserAdmin())
|
||||
{
|
||||
Button_SetElevationRequiredState(item, TRUE);
|
||||
}
|
||||
@@ -211,7 +210,7 @@ INT_PTR CDialogInstall::OnNotify(WPARAM wParam, LPARAM lParam)
|
||||
void CDialogInstall::LaunchInstallProcess()
|
||||
{
|
||||
const bool isProcsesUserAdmin = Util::IsProcessUserAdmin();
|
||||
if (!isProcsesUserAdmin && (Platform::IsAtLeastWinVista() && !Util::CanProcessUserElevate()))
|
||||
if (!isProcsesUserAdmin && (IsWindowsVistaOrGreater() && !Util::CanProcessUserElevate()))
|
||||
{
|
||||
MessageBox(
|
||||
m_Window,
|
||||
|
||||
@@ -32,7 +32,6 @@
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\Common\ControlTemplate.cpp" />
|
||||
<ClCompile Include="..\Common\Dialog.cpp" />
|
||||
<ClCompile Include="..\Common\Platform.cpp" />
|
||||
<ClCompile Include="Application.cpp" />
|
||||
<ClCompile Include="DialogInstall.cpp" />
|
||||
<ClCompile Include="Install.cpp" />
|
||||
|
||||
@@ -81,9 +81,6 @@
|
||||
<ClCompile Include="DialogInstall.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Common\Platform.cpp">
|
||||
<Filter>Common</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Common\ControlTemplate.cpp">
|
||||
<Filter>Common</Filter>
|
||||
</ClCompile>
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <shlobj.h>
|
||||
#include <shlwapi.h>
|
||||
#include <wininet.h>
|
||||
#include <VersionHelpers.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <malloc.h>
|
||||
|
||||
Reference in New Issue
Block a user