From f32dfaf4e3fdf80214ba4a53f04e0709d62b4b03 Mon Sep 17 00:00:00 2001 From: horsicq Date: Mon, 28 Jan 2019 18:53:07 +0100 Subject: [PATCH] Fix --- build.pri | 7 ++++++- build32.bat | 2 ++ build64.bat | 2 ++ gui_source/_version.h | 4 ++-- gui_source/about.cpp | 4 ++-- gui_source/about.h | 2 +- gui_source/dialogmemorymap.cpp | 2 +- gui_source/dialogmemorymap.h | 2 +- gui_source/history.cpp | 2 +- gui_source/history.h | 2 +- gui_source/htmltable.cpp | 2 +- gui_source/htmltable.h | 2 +- gui_source/main.cpp | 10 ++++++---- gui_source/mainwindow.cpp | 8 ++++---- gui_source/mainwindow.h | 2 +- gui_source/prototype.cpp | 2 +- gui_source/prototype.h | 2 +- release_version.txt | 2 +- 18 files changed, 35 insertions(+), 24 deletions(-) diff --git a/build.pri b/build.pri index 2fa974a40..1bd55f01d 100644 --- a/build.pri +++ b/build.pri @@ -1 +1,6 @@ -# For additional build parameters \ No newline at end of file +# For additional build parameters +CONFIG(debug, debug|release) { + DESTDIR = ../build/debug +} else { + DESTDIR = ../build/release +} \ No newline at end of file diff --git a/build32.bat b/build32.bat index 6b9b032db..3b07d7c09 100755 --- a/build32.bat +++ b/build32.bat @@ -20,6 +20,7 @@ rm -f %SOURCE_PATH%\release\%BUILD_NAME% mkdir %SOURCE_PATH%\release\%BUILD_NAME% mkdir %SOURCE_PATH%\release\%BUILD_NAME%\plugins mkdir %SOURCE_PATH%\release\%BUILD_NAME%\plugins\platforms +mkdir %SOURCE_PATH%\release\%BUILD_NAME%\sqldrivers copy %SOURCE_PATH%\build\release\xntsv32.exe %SOURCE_PATH%\release\%BUILD_NAME%\ copy %SOURCE_PATH%\build\gpm32.dll %SOURCE_PATH%\release\%BUILD_NAME%\ @@ -31,6 +32,7 @@ copy %QT_PATH32%\bin\Qt5Gui.dll %SOURCE_PATH%\release\%BUILD_NAME%\ copy %QT_PATH32%\bin\Qt5Core.dll %SOURCE_PATH%\release\%BUILD_NAME%\ copy %QT_PATH32%\bin\Qt5Sql.dll %SOURCE_PATH%\release\%BUILD_NAME%\ copy %QT_PATH32%\plugins\platforms\qwindows.dll %SOURCE_PATH%\release\%BUILD_NAME%\plugins\platforms\ +copy %QT_PATH32%\plugins\sqldrivers\qsqlite.dll %SOURCE_PATH%\release\%BUILD_NAME%\sqldrivers\ cd %SOURCE_PATH%\release if exist %BUILD_NAME%_%XNTSV_VERSION%.zip del %BUILD_NAME%_%XNTSV_VERSION%.zip diff --git a/build64.bat b/build64.bat index 0db3d5a83..d1389dedc 100755 --- a/build64.bat +++ b/build64.bat @@ -20,6 +20,7 @@ rm -f %SOURCE_PATH%\release\%BUILD_NAME% mkdir %SOURCE_PATH%\release\%BUILD_NAME% mkdir %SOURCE_PATH%\release\%BUILD_NAME%\plugins mkdir %SOURCE_PATH%\release\%BUILD_NAME%\plugins\platforms +mkdir %SOURCE_PATH%\release\%BUILD_NAME%\sqldrivers copy %SOURCE_PATH%\build\release\xntsv64.exe %SOURCE_PATH%\release\%BUILD_NAME%\ copy %SOURCE_PATH%\build\gpm64.dll %SOURCE_PATH%\release\%BUILD_NAME%\ @@ -31,6 +32,7 @@ copy %QT_PATH64%\bin\Qt5Gui.dll %SOURCE_PATH%\release\%BUILD_NAME%\ copy %QT_PATH64%\bin\Qt5Core.dll %SOURCE_PATH%\release\%BUILD_NAME%\ copy %QT_PATH64%\bin\Qt5Sql.dll %SOURCE_PATH%\release\%BUILD_NAME%\ copy %QT_PATH64%\plugins\platforms\qwindows.dll %SOURCE_PATH%\release\%BUILD_NAME%\plugins\platforms\ +copy %QT_PATH64%\plugins\sqldrivers\qsqlite.dll %SOURCE_PATH%\release\%BUILD_NAME%\sqldrivers\ cd %SOURCE_PATH%\release if exist %BUILD_NAME%_%XNTSV_VERSION%.zip del %BUILD_NAME%_%XNTSV_VERSION%.zip diff --git a/gui_source/_version.h b/gui_source/_version.h index 843f88d68..b3e1b1a7d 100644 --- a/gui_source/_version.h +++ b/gui_source/_version.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 hors +// Copyright (c) 2017-2019 hors // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ #define XNTSV_VERSION_H #define XNTSV_APPLICATIONNAME "XNTSV" -#define XNTSV_APPLICATIONVERSION "2.00" +#define XNTSV_APPLICATIONVERSION "2.01" #define XNTSV_ORGANIZATIONNAME "NTInfo" #define XNTSV_ORGANIZATIONDOMAIN "ntinfo.biz" diff --git a/gui_source/about.cpp b/gui_source/about.cpp index ae6fbdac3..f014221bd 100644 --- a/gui_source/about.cpp +++ b/gui_source/about.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 hors +// Copyright (c) 2017-2019 hors // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -27,7 +27,7 @@ About::About(QWidget *parent) : { ui->setupUi(this); - ui->labelVersion->setText(QString("XNTSV ver %1").arg(XNTSV_APPLICATIONVERSION)); + ui->labelVersion->setText(QString("XNTSV v%1").arg(XNTSV_APPLICATIONVERSION)); } About::~About() diff --git a/gui_source/about.h b/gui_source/about.h index b47222588..90c7a132f 100644 --- a/gui_source/about.h +++ b/gui_source/about.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 hors +// Copyright (c) 2017-2019 hors // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/gui_source/dialogmemorymap.cpp b/gui_source/dialogmemorymap.cpp index ebe5508a8..9cf21e52e 100644 --- a/gui_source/dialogmemorymap.cpp +++ b/gui_source/dialogmemorymap.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 hors +// Copyright (c) 2017-2019 hors // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/gui_source/dialogmemorymap.h b/gui_source/dialogmemorymap.h index 8de190ae7..0fa0cb9e7 100644 --- a/gui_source/dialogmemorymap.h +++ b/gui_source/dialogmemorymap.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 hors +// Copyright (c) 2017-2019 hors // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/gui_source/history.cpp b/gui_source/history.cpp index 4a9ba2d8f..5cefa3758 100644 --- a/gui_source/history.cpp +++ b/gui_source/history.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 hors +// Copyright (c) 2017-2019 hors // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/gui_source/history.h b/gui_source/history.h index dff516f10..2767832f4 100644 --- a/gui_source/history.h +++ b/gui_source/history.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 hors +// Copyright (c) 2017-2019 hors // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/gui_source/htmltable.cpp b/gui_source/htmltable.cpp index c1f0eed6e..017193c2c 100644 --- a/gui_source/htmltable.cpp +++ b/gui_source/htmltable.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 hors +// Copyright (c) 2017-2019 hors // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/gui_source/htmltable.h b/gui_source/htmltable.h index 613ab67f6..66548a847 100644 --- a/gui_source/htmltable.h +++ b/gui_source/htmltable.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 hors +// Copyright (c) 2017-2019 hors // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/gui_source/main.cpp b/gui_source/main.cpp index cc87beecd..486a1f5b7 100644 --- a/gui_source/main.cpp +++ b/gui_source/main.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 hors +// Copyright (c) 2017-2019 hors // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -24,15 +24,17 @@ int main(int argc, char *argv[]) { - QCoreApplication::addLibraryPath("plugins"); + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + + QString sLibraryPath=QString(argv[0]).replace("\\","/"); + sLibraryPath=sLibraryPath.section("/",0,-2)+QDir::separator()+"plugins"; + QCoreApplication::addLibraryPath(sLibraryPath); QCoreApplication::setOrganizationName(XNTSV_ORGANIZATIONNAME); QCoreApplication::setOrganizationDomain(XNTSV_ORGANIZATIONDOMAIN); QCoreApplication::setApplicationName(XNTSV_APPLICATIONNAME); QCoreApplication::setApplicationVersion(XNTSV_APPLICATIONVERSION); - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QApplication a(argc, argv); a.setStyle(QStyleFactory::create("Fusion")); diff --git a/gui_source/mainwindow.cpp b/gui_source/mainwindow.cpp index cf5c81198..0e111775f 100644 --- a/gui_source/mainwindow.cpp +++ b/gui_source/mainwindow.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 hors +// Copyright (c) 2017-2019 hors // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -29,11 +29,11 @@ MainWindow::MainWindow(QWidget *parent) : ui->setupUi(this); - setWindowTitle(QString("XNTSV ver %1").arg(XNTSV_APPLICATIONVERSION)); + setWindowTitle(QString("XNTSV v%1").arg(XNTSV_APPLICATIONVERSION)); // ui->textBrowserResult->setStyleSheet("background-color:rgb(150,147,88);"); - hPID=0; + hPID=nullptr; bKernel=false; //bIsProcess64=false; @@ -211,7 +211,7 @@ void MainWindow::getProcesses() // ui->tableProcesses->clearContents(); - baProcesses.resize(100000); + baProcesses.resize(200000); baProcesses.fill(0); nDataSize=_GetProcesses(baProcesses.data(),baProcesses.size()); diff --git a/gui_source/mainwindow.h b/gui_source/mainwindow.h index 431f75380..e88cd064c 100644 --- a/gui_source/mainwindow.h +++ b/gui_source/mainwindow.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 hors +// Copyright (c) 2017-2019 hors // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/gui_source/prototype.cpp b/gui_source/prototype.cpp index 6b54f7f11..f2e5af9eb 100644 --- a/gui_source/prototype.cpp +++ b/gui_source/prototype.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 hors +// Copyright (c) 2017-2019 hors // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/gui_source/prototype.h b/gui_source/prototype.h index 6c0866c9d..ef7f53305 100644 --- a/gui_source/prototype.h +++ b/gui_source/prototype.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 hors +// Copyright (c) 2017-2019 hors // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/release_version.txt b/release_version.txt index 8ac712fad..509b24471 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -2.00 \ No newline at end of file +2.01 \ No newline at end of file