mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-24 13:21:05 +00:00
Bug 925599 - Replace other GetVersionEx() uses. r=jimm
This commit is contained in:
parent
76985474ec
commit
8cb6d4b7ee
@ -27,6 +27,7 @@
|
||||
#include "nsISupportsPrimitives.h"
|
||||
#include "nsThreadUtils.h"
|
||||
#include "nsXULAppAPI.h"
|
||||
#include "mozilla/WindowsVersion.h"
|
||||
|
||||
#include "windows.h"
|
||||
#include "shellapi.h"
|
||||
@ -53,6 +54,8 @@
|
||||
|
||||
#define NS_TASKBAR_CONTRACTID "@mozilla.org/windows-taskbar;1"
|
||||
|
||||
using mozilla::IsWin8OrLater;
|
||||
|
||||
NS_IMPL_ISUPPORTS2(nsWindowsShellService, nsIWindowsShellService, nsIShellService)
|
||||
|
||||
static nsresult
|
||||
@ -314,16 +317,6 @@ nsWindowsShellService::ShortcutMaintenance()
|
||||
return LaunchHelper(appHelperPath);
|
||||
}
|
||||
|
||||
static bool
|
||||
IsWin8OrLater()
|
||||
{
|
||||
OSVERSIONINFOW osInfo;
|
||||
osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
|
||||
GetVersionExW(&osInfo);
|
||||
return osInfo.dwMajorVersion > 6 ||
|
||||
(osInfo.dwMajorVersion >= 6 && osInfo.dwMinorVersion >= 2);
|
||||
}
|
||||
|
||||
static bool
|
||||
IsAARDefaultHTTP(IApplicationAssociationRegistration* pAAR,
|
||||
bool* aIsDefaultBrowser)
|
||||
|
Loading…
Reference in New Issue
Block a user