mirror of
https://github.com/openjdk/jdk.git
synced 2026-07-22 08:58:58 +00:00
8387674: Remove isXP() function from jabswitch.cpp
Reviewed-by: prr, clanger
This commit is contained in:
parent
160382009f
commit
2278ade4e8
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -53,23 +53,6 @@ static LPCTSTR STR_ACCESSBRIDGE =
|
||||
FILE* origFile;
|
||||
FILE* tempFile;
|
||||
|
||||
bool isXP()
|
||||
{
|
||||
static bool isXPFlag = false;
|
||||
OSVERSIONINFO osvi;
|
||||
|
||||
// Initialize the OSVERSIONINFO structure.
|
||||
ZeroMemory( &osvi, sizeof( osvi ) );
|
||||
osvi.dwOSVersionInfoSize = sizeof( osvi );
|
||||
|
||||
GetVersionEx( &osvi );
|
||||
|
||||
if ( osvi.dwMajorVersion == 5 ) // For Windows XP and Windows 2000
|
||||
isXPFlag = true;
|
||||
|
||||
return isXPFlag ;
|
||||
}
|
||||
|
||||
void enableJAB() {
|
||||
// Copy lines from orig to temp modifying the line containing
|
||||
// assistive_technologies=
|
||||
@ -458,16 +441,14 @@ int main(int argc, char* argv[]) {
|
||||
enableWasRequested = true;
|
||||
error = modify(true);
|
||||
if (error == 0) {
|
||||
if( !isXP() )
|
||||
regEnable();
|
||||
regEnable();
|
||||
}
|
||||
} else if (_stricmp(argv[1], "-disable") == 0 || _stricmp(argv[1], "/disable") == 0) {
|
||||
badParams = false;
|
||||
disableWasRequested = true;
|
||||
error = modify(false);
|
||||
if (error == 0) {
|
||||
if( !isXP() )
|
||||
regDisable();
|
||||
regDisable();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user