This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-native-installers.git
commit 8188a1476db8db5ea58925aec9271967137459d4 Author: Brad Walker <bwal...@musings.com> AuthorDate: Sun Apr 24 18:49:57 2022 -0600 Open clean up code base to remove Windows 95 & 98 support.. Windows 95 & Windows 98 support is no longer provided by the base JVM. Matter of fact, support ended in Java 5 for these platforms. This cleans up the code base to no longer support these obsolete platforms. --- launcher/windows/src/ExtractUtils.c | 1 - launcher/windows/src/Main.c | 31 +++++++++++++------------------ launcher/windows/src/SystemUtils.c | 5 ----- launcher/windows/src/SystemUtils.h | 1 - 4 files changed, 13 insertions(+), 25 deletions(-) diff --git a/launcher/windows/src/ExtractUtils.c b/launcher/windows/src/ExtractUtils.c index edbfa55..5eb8316 100644 --- a/launcher/windows/src/ExtractUtils.c +++ b/launcher/windows/src/ExtractUtils.c @@ -60,7 +60,6 @@ void skipStub(LauncherProperties * props) { WCHAR * os; props->status = EXIT_CODE_STUB; os = appendStringW(NULL, L"It`s only the launcher stub.\nOS: "); - if(is9x()) os = appendStringW(os, L"Windows 9x"); if(isNT()) os = appendStringW(os, L"Windows NT"); if(is2k()) os = appendStringW(os, L"Windows 2000"); if(isXP()) os = appendStringW(os, L"Windows XP"); diff --git a/launcher/windows/src/Main.c b/launcher/windows/src/Main.c index 5a819ee..e7b7b75 100644 --- a/launcher/windows/src/Main.c +++ b/launcher/windows/src/Main.c @@ -634,27 +634,22 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hi, LPSTR lpCmdLine, int nCmd globalInstance = hInstance; UNREFERENCED_PARAMETER(lpCmdLine); initWow64(); - if(is9x()) { - MessageBoxA(0, "Windows 9X platform is not supported", "Message", MB_OK); - status = EXIT_CODE_SYSTEM_ERROR; + if(!createEvents()) { + status = EXIT_CODE_EVENTS_INITIALIZATION_ERROR; } else { - if(!createEvents()) { - status = EXIT_CODE_EVENTS_INITIALIZATION_ERROR; + LauncherProperties * props = createLauncherProperties(); + createLauncherThread(props); + if(!createGui(props, hInstance, hi, nCmdShow)) { + status = EXIT_CODE_GUI_INITIALIZATION_ERROR; } else { - LauncherProperties * props = createLauncherProperties(); - createLauncherThread(props); - if(!createGui(props, hInstance, hi, nCmdShow)) { - status = EXIT_CODE_GUI_INITIALIZATION_ERROR; - } else { - messageLoop(props); - WaitForSingleObject(closingWindowsConfirmed, INFINITE); - } - - status = props->status; - exitCode = props->exitCode; - printStatus(props); - freeLauncherProperties(&props); + messageLoop(props); + WaitForSingleObject(closingWindowsConfirmed, INFINITE); } + + status = props->status; + exitCode = props->exitCode; + printStatus(props); + freeLauncherProperties(&props); } FREE(currentProgressSize); FREE(totalProgressSize); diff --git a/launcher/windows/src/SystemUtils.c b/launcher/windows/src/SystemUtils.c index c8b423e..983ea13 100644 --- a/launcher/windows/src/SystemUtils.c +++ b/launcher/windows/src/SystemUtils.c @@ -36,11 +36,6 @@ void getOSVersion(DWORD *id, DWORD *major, DWORD *minor, DWORD *productType) { return; } -DWORD is9x() { - DWORD id, major, minor, type; - getOSVersion(& id, & major, & minor, & type); - return (id == VER_PLATFORM_WIN32_WINDOWS) ? 1 : 0; -} DWORD isNT() { DWORD id, major, minor, type; getOSVersion(& id, & major, & minor, & type); diff --git a/launcher/windows/src/SystemUtils.h b/launcher/windows/src/SystemUtils.h index 69437f8..bdbffc5 100644 --- a/launcher/windows/src/SystemUtils.h +++ b/launcher/windows/src/SystemUtils.h @@ -24,7 +24,6 @@ extern "C" { #endif -DWORD is9x(); DWORD isNT(); DWORD isXP(); DWORD is2k(); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists